Merge branch 'master' of git://git.eclipse.org/gitroot/papyrus/org.eclipse.papyrus

2750 files changed, 108386 insertions, 17961 deletions

diff --git a/deprecated/deprecated-plugins/core.deprecated/org.eclipse.papyrus.views.properties.tabbed.core/src/org/eclipse/papyrus/views/properties/tabbed/core/view/StatesStore.java b/deprecated/deprecated-plugins/core.deprecated/org.eclipse.papyrus.views.properties.tabbed.core/src/org/eclipse/papyrus/views/properties/tabbed/core/view/StatesStore.java
index 7cb4f231d3e..d90486ffd59 100644
--- a/deprecated/deprecated-plugins/core.deprecated/org.eclipse.papyrus.views.properties.tabbed.core/src/org/eclipse/papyrus/views/properties/tabbed/core/view/StatesStore.java
+++ b/deprecated/deprecated-plugins/core.deprecated/org.eclipse.papyrus.views.properties.tabbed.core/src/org/eclipse/papyrus/views/properties/tabbed/core/view/StatesStore.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *  Florian Noyrit (CEA LIST) florian.noyrit@cea.fr - Initial API and implementation

+ *  CEA LIST - Initial API and implementation

  *****************************************************************************/

 package org.eclipse.papyrus.views.properties.tabbed.core.view;

 

diff --git a/deprecated/deprecated-plugins/core.deprecated/org.eclipse.papyrus.views.properties.tabbed.customization/src/org/eclipse/papyrus/views/properties/tabbed/customization/dialog/AbstractValidationProblem.java b/deprecated/deprecated-plugins/core.deprecated/org.eclipse.papyrus.views.properties.tabbed.customization/src/org/eclipse/papyrus/views/properties/tabbed/customization/dialog/AbstractValidationProblem.java
index 227c8f2e579..fc071397f67 100644
--- a/deprecated/deprecated-plugins/core.deprecated/org.eclipse.papyrus.views.properties.tabbed.customization/src/org/eclipse/papyrus/views/properties/tabbed/customization/dialog/AbstractValidationProblem.java
+++ b/deprecated/deprecated-plugins/core.deprecated/org.eclipse.papyrus.views.properties.tabbed.customization/src/org/eclipse/papyrus/views/properties/tabbed/customization/dialog/AbstractValidationProblem.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *  Florian Noyrit (CEA LIST) florian.noyrit@cea.fr - Initial API and implementation

+ *  CEA LIST - Initial API and implementation

  *****************************************************************************/

 package org.eclipse.papyrus.views.properties.tabbed.customization.dialog;

 

diff --git a/deprecated/deprecated-plugins/core.deprecated/org.eclipse.papyrus.views.properties.tabbed.customization/src/org/eclipse/papyrus/views/properties/tabbed/customization/dialog/ConfigurationValidator.java b/deprecated/deprecated-plugins/core.deprecated/org.eclipse.papyrus.views.properties.tabbed.customization/src/org/eclipse/papyrus/views/properties/tabbed/customization/dialog/ConfigurationValidator.java
index a40e96eace4..f81db3f2218 100644
--- a/deprecated/deprecated-plugins/core.deprecated/org.eclipse.papyrus.views.properties.tabbed.customization/src/org/eclipse/papyrus/views/properties/tabbed/customization/dialog/ConfigurationValidator.java
+++ b/deprecated/deprecated-plugins/core.deprecated/org.eclipse.papyrus.views.properties.tabbed.customization/src/org/eclipse/papyrus/views/properties/tabbed/customization/dialog/ConfigurationValidator.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *  Florian Noyrit (CEA LIST) florian.noyrit@cea.fr - Initial API and implementation

+ *  CEA LIST - Initial API and implementation

  *****************************************************************************/

 package org.eclipse.papyrus.views.properties.tabbed.customization.dialog;

 

diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/.classpath b/deprecated/org.eclipse.papyrus.infra.table.common/.classpath
index 2d1a4302f04..2d1a4302f04 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/.classpath
+++ b/deprecated/org.eclipse.papyrus.infra.table.common/.classpath
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/.project b/deprecated/org.eclipse.papyrus.infra.table.common/.project
index 7605b36adae..7605b36adae 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/.project
+++ b/deprecated/org.eclipse.papyrus.infra.table.common/.project
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/.settings/org.eclipse.core.resources.prefs b/deprecated/org.eclipse.papyrus.infra.table.common/.settings/org.eclipse.core.resources.prefs
index e2ae99e6efc..e2ae99e6efc 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/.settings/org.eclipse.core.resources.prefs
+++ b/deprecated/org.eclipse.papyrus.infra.table.common/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/.settings/org.eclipse.jdt.core.prefs b/deprecated/org.eclipse.papyrus.infra.table.common/.settings/org.eclipse.jdt.core.prefs
index 498b15f69f9..498b15f69f9 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/.settings/org.eclipse.jdt.core.prefs
+++ b/deprecated/org.eclipse.papyrus.infra.table.common/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/META-INF/MANIFEST.MF b/deprecated/org.eclipse.papyrus.infra.table.common/META-INF/MANIFEST.MF
index 5ed1bfcafe1..5a88a76b83b 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/META-INF/MANIFEST.MF
+++ b/deprecated/org.eclipse.papyrus.infra.table.common/META-INF/MANIFEST.MF
@@ -28,7 +28,7 @@ Require-Bundle: org.eclipse.emf.facet.widgets.nattable.instance,
  org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0",

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

  org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel;bundle-version="1.0.0",

- com.google.guava;bundle-version="10.0.1"

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

 Export-Package: org.eclipse.papyrus.infra.table.common,

  org.eclipse.papyrus.infra.table.common.advice,

  org.eclipse.papyrus.infra.table.common.dialog,

diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/about.html b/deprecated/org.eclipse.papyrus.infra.table.common/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/about.html
+++ b/deprecated/org.eclipse.papyrus.infra.table.common/about.html
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/build.properties b/deprecated/org.eclipse.papyrus.infra.table.common/build.properties
index 0845977ec69..0845977ec69 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/build.properties
+++ b/deprecated/org.eclipse.papyrus.infra.table.common/build.properties
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/icons/select_columns_to_show.png b/deprecated/org.eclipse.papyrus.infra.table.common/icons/select_columns_to_show.png
index 5a2446c88ef..5a2446c88ef 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/icons/select_columns_to_show.png
+++ b/deprecated/org.eclipse.papyrus.infra.table.common/icons/select_columns_to_show.png
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/icons/table.gif b/deprecated/org.eclipse.papyrus.infra.table.common/icons/table.gif
index 4c9048708b0..4c9048708b0 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/icons/table.gif
+++ b/deprecated/org.eclipse.papyrus.infra.table.common/icons/table.gif
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/icons/table.png b/deprecated/org.eclipse.papyrus.infra.table.common/icons/table.png
index 2a979527f4a..2a979527f4a 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/icons/table.png
+++ b/deprecated/org.eclipse.papyrus.infra.table.common/icons/table.png
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/icons/table_green.gif b/deprecated/org.eclipse.papyrus.infra.table.common/icons/table_green.gif
index b75d2dc269d..b75d2dc269d 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/icons/table_green.gif
+++ b/deprecated/org.eclipse.papyrus.infra.table.common/icons/table_green.gif
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/icons/table_green.png b/deprecated/org.eclipse.papyrus.infra.table.common/icons/table_green.png
index 16dcb3e4716..16dcb3e4716 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/icons/table_green.png
+++ b/deprecated/org.eclipse.papyrus.infra.table.common/icons/table_green.png
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/plugin.properties b/deprecated/org.eclipse.papyrus.infra.table.common/plugin.properties
index 236e6df956a..236e6df956a 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/plugin.properties
+++ b/deprecated/org.eclipse.papyrus.infra.table.common/plugin.properties
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/plugin.xml b/deprecated/org.eclipse.papyrus.infra.table.common/plugin.xml
index bd0eb3fc2b3..bd0eb3fc2b3 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/plugin.xml
+++ b/deprecated/org.eclipse.papyrus.infra.table.common/plugin.xml
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/resources/table_Ecore_hideEAnnotationFeature.uiCustom b/deprecated/org.eclipse.papyrus.infra.table.common/resources/table_Ecore_hideEAnnotationFeature.uiCustom
index 79a0cc69a63..79a0cc69a63 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/resources/table_Ecore_hideEAnnotationFeature.uiCustom
+++ b/deprecated/org.eclipse.papyrus.infra.table.common/resources/table_Ecore_hideEAnnotationFeature.uiCustom
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/Activator.java b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/Activator.java
index d9496b16e90..d9496b16e90 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/Activator.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/Activator.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/adapters/TableAdapterFactory.java b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/adapters/TableAdapterFactory.java
index 69190f2f14d..69190f2f14d 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/adapters/TableAdapterFactory.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/adapters/TableAdapterFactory.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/adapters/TableOpenable.java b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/adapters/TableOpenable.java
index 0bfbd265913..0bfbd265913 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/adapters/TableOpenable.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/adapters/TableOpenable.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/advice/DeletePapyrusTableInstanceAdvice.java b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/advice/DeletePapyrusTableInstanceAdvice.java
index cdabb59384a..cdabb59384a 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/advice/DeletePapyrusTableInstanceAdvice.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/advice/DeletePapyrusTableInstanceAdvice.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/advice/TableDuplicateEditHelperAdvice.java b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/advice/TableDuplicateEditHelperAdvice.java
index b1ffe031e2a..b1ffe031e2a 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/advice/TableDuplicateEditHelperAdvice.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/advice/TableDuplicateEditHelperAdvice.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/dialog/TwoInputDialog.java b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/dialog/TwoInputDialog.java
index 2c2f14a47d2..2c2f14a47d2 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/dialog/TwoInputDialog.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/dialog/TwoInputDialog.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/editor/AbstractNattableEditor.java b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/editor/AbstractNattableEditor.java
index a785c0bb4d6..a785c0bb4d6 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/editor/AbstractNattableEditor.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/editor/AbstractNattableEditor.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/exceptions/ErrorInPastePreparationException.java b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/exceptions/ErrorInPastePreparationException.java
index 1020724ed1b..1020724ed1b 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/exceptions/ErrorInPastePreparationException.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/exceptions/ErrorInPastePreparationException.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/factory/AbstractNattableEditorFactory.java b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/factory/AbstractNattableEditorFactory.java
index 469081b7a74..469081b7a74 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/factory/AbstractNattableEditorFactory.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/factory/AbstractNattableEditorFactory.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/factory/PapyrusCommandFactory.java b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/factory/PapyrusCommandFactory.java
index 27f1c609f39..27f1c609f39 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/factory/PapyrusCommandFactory.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/factory/PapyrusCommandFactory.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/handlers/AbstractCreateNattableEditorCommand.java b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/handlers/AbstractCreateNattableEditorCommand.java
index 33c7822d58c..33c7822d58c 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/handlers/AbstractCreateNattableEditorCommand.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/handlers/AbstractCreateNattableEditorCommand.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/internal/IPapyrusNatTableWidget.java b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/internal/IPapyrusNatTableWidget.java
index 1edf41bb452..1edf41bb452 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/internal/IPapyrusNatTableWidget.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/internal/IPapyrusNatTableWidget.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/internal/NatTableEditor.java b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/internal/NatTableEditor.java
index ec2093aa269..ec2093aa269 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/internal/NatTableEditor.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/internal/NatTableEditor.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/internal/PapyrusNatTableWidget.java b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/internal/PapyrusNatTableWidget.java
index eaf569aa2d4..eaf569aa2d4 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/internal/PapyrusNatTableWidget.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/internal/PapyrusNatTableWidget.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/internal/TableEditorInput.java b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/internal/TableEditorInput.java
index 621e09c3891..621e09c3891 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/internal/TableEditorInput.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/internal/TableEditorInput.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/listener/AbstractSynchronizedTableTriggerListener.java b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/listener/AbstractSynchronizedTableTriggerListener.java
index e3190ce7795..e3190ce7795 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/listener/AbstractSynchronizedTableTriggerListener.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/listener/AbstractSynchronizedTableTriggerListener.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/listener/ModelTriggerListener.java b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/listener/ModelTriggerListener.java
index 78a985ca387..78a985ca387 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/listener/ModelTriggerListener.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/listener/ModelTriggerListener.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/listener/TableTriggerListener.java b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/listener/TableTriggerListener.java
index 423fffede80..423fffede80 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/listener/TableTriggerListener.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/listener/TableTriggerListener.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/messages/Messages.java b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/messages/Messages.java
index ea598f974a1..ea598f974a1 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/messages/Messages.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/messages/Messages.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/messages/messages.properties b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/messages/messages.properties
index 4a229edb74b..4a229edb74b 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/messages/messages.properties
+++ b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/messages/messages.properties
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/modelresource/EMFFacetNattableModel.java b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/modelresource/EMFFacetNattableModel.java
index df44916fee1..df44916fee1 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/modelresource/EMFFacetNattableModel.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/modelresource/EMFFacetNattableModel.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/modelresource/PapyrusNattableModel.java b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/modelresource/PapyrusNattableModel.java
index aed70db5dd5..aed70db5dd5 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/modelresource/PapyrusNattableModel.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/modelresource/PapyrusNattableModel.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/providers/FilteredTableLabelProvider.java b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/providers/FilteredTableLabelProvider.java
index 8f474a2549a..8f474a2549a 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/providers/FilteredTableLabelProvider.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/providers/FilteredTableLabelProvider.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/providers/TableLabelProvider.java b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/providers/TableLabelProvider.java
index 5ae80d192db..5ae80d192db 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/providers/TableLabelProvider.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/providers/TableLabelProvider.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/util/FillingQueriesUtil.java b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/util/FillingQueriesUtil.java
index 5b9ef95c86d..5b9ef95c86d 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/util/FillingQueriesUtil.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/util/FillingQueriesUtil.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/util/QueryRepresentation.java b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/util/QueryRepresentation.java
index 24ccc28fba2..24ccc28fba2 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/util/QueryRepresentation.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/infra/table/common/util/QueryRepresentation.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.controlmode/.classpath b/deprecated/org.eclipse.papyrus.infra.table.controlmode/.classpath
index 2d1a4302f04..2d1a4302f04 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.controlmode/.classpath
+++ b/deprecated/org.eclipse.papyrus.infra.table.controlmode/.classpath
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.controlmode/.project b/deprecated/org.eclipse.papyrus.infra.table.controlmode/.project
index ff00eace11e..ff00eace11e 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.controlmode/.project
+++ b/deprecated/org.eclipse.papyrus.infra.table.controlmode/.project
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.controlmode/META-INF/MANIFEST.MF b/deprecated/org.eclipse.papyrus.infra.table.controlmode/META-INF/MANIFEST.MF
index b38c7cdbb87..ebdb50332a1 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.controlmode/META-INF/MANIFEST.MF
+++ b/deprecated/org.eclipse.papyrus.infra.table.controlmode/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Require-Bundle: org.eclipse.papyrus.infra.services.controlmode;bundle-version="1
  org.eclipse.gmf.runtime.emf.commands.core,

  org.eclipse.emf.facet.widgets.nattable.instance,

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

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

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

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

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

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

diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.controlmode/about.html b/deprecated/org.eclipse.papyrus.infra.table.controlmode/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.controlmode/about.html
+++ b/deprecated/org.eclipse.papyrus.infra.table.controlmode/about.html
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.controlmode/build.properties b/deprecated/org.eclipse.papyrus.infra.table.controlmode/build.properties
index 30e2cedf44d..30e2cedf44d 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.controlmode/build.properties
+++ b/deprecated/org.eclipse.papyrus.infra.table.controlmode/build.properties
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.controlmode/plugin.properties b/deprecated/org.eclipse.papyrus.infra.table.controlmode/plugin.properties
index 300c952e6b7..300c952e6b7 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.controlmode/plugin.properties
+++ b/deprecated/org.eclipse.papyrus.infra.table.controlmode/plugin.properties
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.controlmode/plugin.xml b/deprecated/org.eclipse.papyrus.infra.table.controlmode/plugin.xml
index 8d61608de75..8d61608de75 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.controlmode/plugin.xml
+++ b/deprecated/org.eclipse.papyrus.infra.table.controlmode/plugin.xml
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.controlmode/src/org/eclipse/papyrus/infra/table/controlmode/Activator.java b/deprecated/org.eclipse.papyrus.infra.table.controlmode/src/org/eclipse/papyrus/infra/table/controlmode/Activator.java
index 833d9e8d7ee..833d9e8d7ee 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.controlmode/src/org/eclipse/papyrus/infra/table/controlmode/Activator.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.controlmode/src/org/eclipse/papyrus/infra/table/controlmode/Activator.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.controlmode/src/org/eclipse/papyrus/infra/table/controlmode/ControlTableCommand.java b/deprecated/org.eclipse.papyrus.infra.table.controlmode/src/org/eclipse/papyrus/infra/table/controlmode/ControlTableCommand.java
index e7544a20820..e7544a20820 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.controlmode/src/org/eclipse/papyrus/infra/table/controlmode/ControlTableCommand.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.controlmode/src/org/eclipse/papyrus/infra/table/controlmode/ControlTableCommand.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.controlmode/src/org/eclipse/papyrus/infra/table/controlmode/TableControlParticipant.java b/deprecated/org.eclipse.papyrus.infra.table.controlmode/src/org/eclipse/papyrus/infra/table/controlmode/TableControlParticipant.java
index c7254614441..c7254614441 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.controlmode/src/org/eclipse/papyrus/infra/table/controlmode/TableControlParticipant.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.controlmode/src/org/eclipse/papyrus/infra/table/controlmode/TableControlParticipant.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/.classpath b/deprecated/org.eclipse.papyrus.infra.table.menu/.classpath
index 2d1a4302f04..2d1a4302f04 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/.classpath
+++ b/deprecated/org.eclipse.papyrus.infra.table.menu/.classpath
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/.project b/deprecated/org.eclipse.papyrus.infra.table.menu/.project
index 2db93db7442..2db93db7442 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/.project
+++ b/deprecated/org.eclipse.papyrus.infra.table.menu/.project
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/.settings/org.eclipse.core.resources.prefs b/deprecated/org.eclipse.papyrus.infra.table.menu/.settings/org.eclipse.core.resources.prefs
index f6b3322e995..f6b3322e995 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/.settings/org.eclipse.core.resources.prefs
+++ b/deprecated/org.eclipse.papyrus.infra.table.menu/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/.settings/org.eclipse.jdt.core.prefs b/deprecated/org.eclipse.papyrus.infra.table.menu/.settings/org.eclipse.jdt.core.prefs
index 62e64d3aa81..62e64d3aa81 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/.settings/org.eclipse.jdt.core.prefs
+++ b/deprecated/org.eclipse.papyrus.infra.table.menu/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/META-INF/MANIFEST.MF b/deprecated/org.eclipse.papyrus.infra.table.menu/META-INF/MANIFEST.MF
index abb0bda1320..896f3742600 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/META-INF/MANIFEST.MF
+++ b/deprecated/org.eclipse.papyrus.infra.table.menu/META-INF/MANIFEST.MF
@@ -1,6 +1,5 @@
 Manifest-Version: 1.0

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

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

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

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

  org.eclipse.emf.facet.infra.common.core;bundle-version="0.1.0",

diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/about.html b/deprecated/org.eclipse.papyrus.infra.table.menu/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/about.html
+++ b/deprecated/org.eclipse.papyrus.infra.table.menu/about.html
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/build.properties b/deprecated/org.eclipse.papyrus.infra.table.menu/build.properties
index 16e737b65fa..16e737b65fa 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/build.properties
+++ b/deprecated/org.eclipse.papyrus.infra.table.menu/build.properties
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/icons/empty.gif b/deprecated/org.eclipse.papyrus.infra.table.menu/icons/empty.gif
index 30c569ad03e..30c569ad03e 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/icons/empty.gif
+++ b/deprecated/org.eclipse.papyrus.infra.table.menu/icons/empty.gif
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/icons/empty.png b/deprecated/org.eclipse.papyrus.infra.table.menu/icons/empty.png
index 91e5ec5fa2d..91e5ec5fa2d 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/icons/empty.png
+++ b/deprecated/org.eclipse.papyrus.infra.table.menu/icons/empty.png
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/icons/not_NA.gif b/deprecated/org.eclipse.papyrus.infra.table.menu/icons/not_NA.gif
index 125919fbd84..125919fbd84 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/icons/not_NA.gif
+++ b/deprecated/org.eclipse.papyrus.infra.table.menu/icons/not_NA.gif
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/icons/not_NA.png b/deprecated/org.eclipse.papyrus.infra.table.menu/icons/not_NA.png
index 7e2aeeeb7ed..7e2aeeeb7ed 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/icons/not_NA.png
+++ b/deprecated/org.eclipse.papyrus.infra.table.menu/icons/not_NA.png
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/icons/rename.gif b/deprecated/org.eclipse.papyrus.infra.table.menu/icons/rename.gif
index e6f786eca9a..e6f786eca9a 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/icons/rename.gif
+++ b/deprecated/org.eclipse.papyrus.infra.table.menu/icons/rename.gif
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/icons/select_column_to_hide.gif b/deprecated/org.eclipse.papyrus.infra.table.menu/icons/select_column_to_hide.gif
index 4df20a606f6..4df20a606f6 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/icons/select_column_to_hide.gif
+++ b/deprecated/org.eclipse.papyrus.infra.table.menu/icons/select_column_to_hide.gif
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/icons/select_column_to_hide.png b/deprecated/org.eclipse.papyrus.infra.table.menu/icons/select_column_to_hide.png
index 9202230bd24..9202230bd24 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/icons/select_column_to_hide.png
+++ b/deprecated/org.eclipse.papyrus.infra.table.menu/icons/select_column_to_hide.png
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/icons/select_column_to_hide_2.gif b/deprecated/org.eclipse.papyrus.infra.table.menu/icons/select_column_to_hide_2.gif
index d046cff4062..d046cff4062 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/icons/select_column_to_hide_2.gif
+++ b/deprecated/org.eclipse.papyrus.infra.table.menu/icons/select_column_to_hide_2.gif
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/icons/select_column_to_hide_2.png b/deprecated/org.eclipse.papyrus.infra.table.menu/icons/select_column_to_hide_2.png
index 64e9d00387c..64e9d00387c 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/icons/select_column_to_hide_2.png
+++ b/deprecated/org.eclipse.papyrus.infra.table.menu/icons/select_column_to_hide_2.png
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/icons/table.gif b/deprecated/org.eclipse.papyrus.infra.table.menu/icons/table.gif
index 4c9048708b0..4c9048708b0 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/icons/table.gif
+++ b/deprecated/org.eclipse.papyrus.infra.table.menu/icons/table.gif
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/plugin.properties b/deprecated/org.eclipse.papyrus.infra.table.menu/plugin.properties
index 596bb8a7d4d..596bb8a7d4d 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/plugin.properties
+++ b/deprecated/org.eclipse.papyrus.infra.table.menu/plugin.properties
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/plugin.xml b/deprecated/org.eclipse.papyrus.infra.table.menu/plugin.xml
index 8ec17253a83..8ec17253a83 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/plugin.xml
+++ b/deprecated/org.eclipse.papyrus.infra.table.menu/plugin.xml
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/Activator.java b/deprecated/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/Activator.java
index 4db2eb8032c..4db2eb8032c 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/Activator.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/Activator.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/handler/AbstractTableExtensionContributionFactory.java b/deprecated/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/handler/AbstractTableExtensionContributionFactory.java
index cf94a5db334..cf94a5db334 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/handler/AbstractTableExtensionContributionFactory.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/handler/AbstractTableExtensionContributionFactory.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/handler/CommonColumnHandler.java b/deprecated/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/handler/CommonColumnHandler.java
index d8dc8a0008a..d8dc8a0008a 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/handler/CommonColumnHandler.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/handler/CommonColumnHandler.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/handler/CreateNewElementInPopupContributionItem.java b/deprecated/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/handler/CreateNewElementInPopupContributionItem.java
index 916dfd3ac1a..916dfd3ac1a 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/handler/CreateNewElementInPopupContributionItem.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/handler/CreateNewElementInPopupContributionItem.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/handler/CreateNewElementInTableMenuContributionItem.java b/deprecated/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/handler/CreateNewElementInTableMenuContributionItem.java
index 39bee33f3a1..39bee33f3a1 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/handler/CreateNewElementInTableMenuContributionItem.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/handler/CreateNewElementInTableMenuContributionItem.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/handler/HideEmptyColumnsHandler.java b/deprecated/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/handler/HideEmptyColumnsHandler.java
index 662c29687ac..662c29687ac 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/handler/HideEmptyColumnsHandler.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/handler/HideEmptyColumnsHandler.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/messages/Messages.java b/deprecated/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/messages/Messages.java
index d6efab40964..d6efab40964 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/messages/Messages.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/messages/Messages.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/messages/messages.properties b/deprecated/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/messages/messages.properties
index 6bd6c4265d8..6bd6c4265d8 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/messages/messages.properties
+++ b/deprecated/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/messages/messages.properties
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/providers/TableTester.java b/deprecated/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/providers/TableTester.java
index bc42f8e2f28..bc42f8e2f28 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/providers/TableTester.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/providers/TableTester.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/.classpath b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/.classpath
index cedf0d0d0b5..cedf0d0d0b5 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/.classpath
+++ b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/.classpath
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/.project b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/.project
index 5646775400f..5646775400f 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/.project
+++ b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/.project
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/META-INF/MANIFEST.MF b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/META-INF/MANIFEST.MF
index 38625d92c7a..38625d92c7a 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/META-INF/MANIFEST.MF
+++ b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/META-INF/MANIFEST.MF
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/about.html b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/about.html
index 34ab520eed4..34ab520eed4 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/about.html
+++ b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/about.html
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/build.properties b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/build.properties
index 7210f8c2809..7210f8c2809 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/build.properties
+++ b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/build.properties
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/icons/full/ctool16/CreatePapyrusTableConfiguration_TableConfiguration_TableConfiguration2.gif b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/icons/full/ctool16/CreatePapyrusTableConfiguration_TableConfiguration_TableConfiguration2.gif
index 7f00aa632e4..7f00aa632e4 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/icons/full/ctool16/CreatePapyrusTableConfiguration_TableConfiguration_TableConfiguration2.gif
+++ b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/icons/full/ctool16/CreatePapyrusTableConfiguration_TableConfiguration_TableConfiguration2.gif
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/icons/full/obj16/PapyrusTableConfiguration.gif b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/icons/full/obj16/PapyrusTableConfiguration.gif
index 48e3cf22687..48e3cf22687 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/icons/full/obj16/PapyrusTableConfiguration.gif
+++ b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/icons/full/obj16/PapyrusTableConfiguration.gif
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/plugin.properties b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/plugin.properties
index edcb7e4fbeb..edcb7e4fbeb 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/plugin.properties
+++ b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/plugin.properties
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/plugin.xml b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/plugin.xml
index 73d6ee4b4eb..73d6ee4b4eb 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/plugin.xml
+++ b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/plugin.xml
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/provider/PapyrusTableConfigurationItemProvider.java b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/provider/PapyrusTableConfigurationItemProvider.java
index 389438a9588..389438a9588 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/provider/PapyrusTableConfigurationItemProvider.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/provider/PapyrusTableConfigurationItemProvider.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/provider/PapyrusTableConfigurationItemProviderAdapterFactory.java b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/provider/PapyrusTableConfigurationItemProviderAdapterFactory.java
index 14dde339df1..14dde339df1 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/provider/PapyrusTableConfigurationItemProviderAdapterFactory.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/provider/PapyrusTableConfigurationItemProviderAdapterFactory.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/provider/PapyrustableconfigurationEditPlugin.java b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/provider/PapyrustableconfigurationEditPlugin.java
index e78d5d875a9..e78d5d875a9 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/provider/PapyrustableconfigurationEditPlugin.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/provider/PapyrustableconfigurationEditPlugin.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/.classpath b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/.classpath
index cedf0d0d0b5..cedf0d0d0b5 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/.classpath
+++ b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/.classpath
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/.project b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/.project
index 955e6ad71fa..955e6ad71fa 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/.project
+++ b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/.project
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/META-INF/MANIFEST.MF b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/META-INF/MANIFEST.MF
index 609e4c07426..609e4c07426 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/META-INF/MANIFEST.MF
+++ b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/META-INF/MANIFEST.MF
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/about.html b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/about.html
index 34ab520eed4..34ab520eed4 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/about.html
+++ b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/about.html
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/build.properties b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/build.properties
index 451b968fb97..451b968fb97 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/build.properties
+++ b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/build.properties
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/icons/full/obj16/PapyrusTableConfigurationModelFile.gif b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/icons/full/obj16/PapyrusTableConfigurationModelFile.gif
index a99fd8140c4..a99fd8140c4 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/icons/full/obj16/PapyrusTableConfigurationModelFile.gif
+++ b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/icons/full/obj16/PapyrusTableConfigurationModelFile.gif
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/icons/full/wizban/NewPapyrusTableConfiguration.gif b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/icons/full/wizban/NewPapyrusTableConfiguration.gif
index 897c9baa83c..897c9baa83c 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/icons/full/wizban/NewPapyrusTableConfiguration.gif
+++ b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/icons/full/wizban/NewPapyrusTableConfiguration.gif
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/plugin.properties b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/plugin.properties
index af09d5f1d87..af09d5f1d87 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/plugin.properties
+++ b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/plugin.properties
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/plugin.xml b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/plugin.xml
index 0d083f9e01b..0d083f9e01b 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/plugin.xml
+++ b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/plugin.xml
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/presentation/PapyrusTableConfigurationActionBarContributor.java b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/presentation/PapyrusTableConfigurationActionBarContributor.java
index 3431e7f0656..3431e7f0656 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/presentation/PapyrusTableConfigurationActionBarContributor.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/presentation/PapyrusTableConfigurationActionBarContributor.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/presentation/PapyrusTableConfigurationEditor.java b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/presentation/PapyrusTableConfigurationEditor.java
index 6e5cc78c160..6e5cc78c160 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/presentation/PapyrusTableConfigurationEditor.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/presentation/PapyrusTableConfigurationEditor.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/presentation/PapyrusTableConfigurationModelWizard.java b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/presentation/PapyrusTableConfigurationModelWizard.java
index 86b328011fc..86b328011fc 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/presentation/PapyrusTableConfigurationModelWizard.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/presentation/PapyrusTableConfigurationModelWizard.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/presentation/PapyrustableconfigurationEditorPlugin.java b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/presentation/PapyrustableconfigurationEditorPlugin.java
index ae893079366..ae893079366 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/presentation/PapyrustableconfigurationEditorPlugin.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/presentation/PapyrustableconfigurationEditorPlugin.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/.classpath b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/.classpath
index cedf0d0d0b5..cedf0d0d0b5 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/.classpath
+++ b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/.classpath
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/.project b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/.project
index e7563facb15..e7563facb15 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/.project
+++ b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/.project
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/META-INF/MANIFEST.MF b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/META-INF/MANIFEST.MF
index b06a43b68f3..b06a43b68f3 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/META-INF/MANIFEST.MF
+++ b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/META-INF/MANIFEST.MF
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/about.html b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/about.html
index 34ab520eed4..34ab520eed4 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/about.html
+++ b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/about.html
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/build.properties b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/build.properties
index 26368867730..26368867730 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/build.properties
+++ b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/build.properties
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/model/papyrustableconfiguration.ecore b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/model/papyrustableconfiguration.ecore
index d338d13d561..d338d13d561 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/model/papyrustableconfiguration.ecore
+++ b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/model/papyrustableconfiguration.ecore
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/model/papyrustableconfiguration.genmodel b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/model/papyrustableconfiguration.genmodel
index 821d9ef67e7..821d9ef67e7 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/model/papyrustableconfiguration.genmodel
+++ b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/model/papyrustableconfiguration.genmodel
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/plugin.properties b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/plugin.properties
index 4707953b474..4707953b474 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/plugin.properties
+++ b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/plugin.properties
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/plugin.xml b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/plugin.xml
index 33fe77a3dd1..33fe77a3dd1 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/plugin.xml
+++ b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/plugin.xml
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/PapyrusTableConfiguration.java b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/PapyrusTableConfiguration.java
index f663c468e59..f663c468e59 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/PapyrusTableConfiguration.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/PapyrusTableConfiguration.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/PapyrusTableConfigurationFactory.java b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/PapyrusTableConfigurationFactory.java
index 9a247ad9767..9a247ad9767 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/PapyrusTableConfigurationFactory.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/PapyrusTableConfigurationFactory.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/PapyrusTableConfigurationPackage.java b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/PapyrusTableConfigurationPackage.java
index 2905a69c2ff..2905a69c2ff 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/PapyrusTableConfigurationPackage.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/PapyrusTableConfigurationPackage.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/impl/PapyrusTableConfigurationFactoryImpl.java b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/impl/PapyrusTableConfigurationFactoryImpl.java
index caead4c87d7..caead4c87d7 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/impl/PapyrusTableConfigurationFactoryImpl.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/impl/PapyrusTableConfigurationFactoryImpl.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/impl/PapyrusTableConfigurationImpl.java b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/impl/PapyrusTableConfigurationImpl.java
index 895789137e7..895789137e7 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/impl/PapyrusTableConfigurationImpl.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/impl/PapyrusTableConfigurationImpl.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/impl/PapyrusTableConfigurationPackageImpl.java b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/impl/PapyrusTableConfigurationPackageImpl.java
index 3a4bd875d25..3a4bd875d25 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/impl/PapyrusTableConfigurationPackageImpl.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/impl/PapyrusTableConfigurationPackageImpl.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/util/PapyrusTableConfigurationAdapterFactory.java b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/util/PapyrusTableConfigurationAdapterFactory.java
index 2b615b2046d..2b615b2046d 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/util/PapyrusTableConfigurationAdapterFactory.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/util/PapyrusTableConfigurationAdapterFactory.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/util/PapyrusTableConfigurationSwitch.java b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/util/PapyrusTableConfigurationSwitch.java
index 610136a9f48..610136a9f48 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/util/PapyrusTableConfigurationSwitch.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/PapyrusTableConfiguration/util/PapyrusTableConfigurationSwitch.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/.classpath b/deprecated/org.eclipse.papyrus.infra.table.properties/.classpath
index 2d1a4302f04..2d1a4302f04 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/.classpath
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/.classpath
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/.project b/deprecated/org.eclipse.papyrus.infra.table.properties/.project
index 7232286a2cb..7232286a2cb 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/.project
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/.project
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/.settings/org.eclipse.jdt.core.prefs b/deprecated/org.eclipse.papyrus.infra.table.properties/.settings/org.eclipse.jdt.core.prefs
index 46f774520ba..46f774520ba 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/.settings/org.eclipse.jdt.core.prefs
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/META-INF/MANIFEST.MF b/deprecated/org.eclipse.papyrus.infra.table.properties/META-INF/MANIFEST.MF
index 17bc0b91d92..17bc0b91d92 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/META-INF/MANIFEST.MF
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/META-INF/MANIFEST.MF
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/about.html b/deprecated/org.eclipse.papyrus.infra.table.properties/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/about.html
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/about.html
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/build.properties b/deprecated/org.eclipse.papyrus.infra.table.properties/build.properties
index 4ff9a36ff5a..4ff9a36ff5a 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/build.properties
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/build.properties
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/Environment.xmi b/deprecated/org.eclipse.papyrus.infra.table.properties/model/Environment.xmi
index 3261d8ce5ed..3261d8ce5ed 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/Environment.xmi
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/Environment.xmi
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/papyrustableinstance.ctx b/deprecated/org.eclipse.papyrus.infra.table.properties/model/papyrustableinstance.ctx
index 9c641424e97..9c641424e97 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/papyrustableinstance.ctx
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/papyrustableinstance.ctx
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/papyrustableinstanceFieldSelection.xmi b/deprecated/org.eclipse.papyrus.infra.table.properties/model/papyrustableinstanceFieldSelection.xmi
index 9ffca51ce04..9ffca51ce04 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/papyrustableinstanceFieldSelection.xmi
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/papyrustableinstanceFieldSelection.xmi
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/tableinstance.ctx b/deprecated/org.eclipse.papyrus.infra.table.properties/model/tableinstance.ctx
index b83450c6a11..b83450c6a11 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/tableinstance.ctx
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/tableinstance.ctx
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/tableinstance2.ctx b/deprecated/org.eclipse.papyrus.infra.table.properties/model/tableinstance2.ctx
index ee9663fdb97..ee9663fdb97 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/tableinstance2.ctx
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/tableinstance2.ctx
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/tableinstance2FieldSelection.xmi b/deprecated/org.eclipse.papyrus.infra.table.properties/model/tableinstance2FieldSelection.xmi
index e9d9acb7c79..e9d9acb7c79 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/tableinstance2FieldSelection.xmi
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/tableinstance2FieldSelection.xmi
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/tableinstanceFieldSelection.xmi b/deprecated/org.eclipse.papyrus.infra.table.properties/model/tableinstanceFieldSelection.xmi
index d3b2c00f81b..d3b2c00f81b 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/tableinstanceFieldSelection.xmi
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/tableinstanceFieldSelection.xmi
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/Description.xwt b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/Description.xwt
index 0bd60d339d4..0bd60d339d4 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/Description.xwt
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/Description.xwt
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleAttributeColumn.xwt b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleAttributeColumn.xwt
index a2ae62ef794..a2ae62ef794 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleAttributeColumn.xwt
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleAttributeColumn.xwt
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleColumn.xwt b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleColumn.xwt
index a6d30c037c5..a6d30c037c5 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleColumn.xwt
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleColumn.xwt
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleContextColumn.xwt b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleContextColumn.xwt
index a2ae62ef794..a2ae62ef794 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleContextColumn.xwt
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleContextColumn.xwt
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleDefaultLabelColumn.xwt b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleDefaultLabelColumn.xwt
index a2ae62ef794..a2ae62ef794 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleDefaultLabelColumn.xwt
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleDefaultLabelColumn.xwt
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleEContainerColumn.xwt b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleEContainerColumn.xwt
index a2ae62ef794..a2ae62ef794 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleEContainerColumn.xwt
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleEContainerColumn.xwt
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleEObjectQueryRow.xwt b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleEObjectQueryRow.xwt
index a2ae62ef794..a2ae62ef794 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleEObjectQueryRow.xwt
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleEObjectQueryRow.xwt
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleFacetAttributeColumn.xwt b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleFacetAttributeColumn.xwt
index a2ae62ef794..a2ae62ef794 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleFacetAttributeColumn.xwt
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleFacetAttributeColumn.xwt
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleFacetFeatureColumn.xwt b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleFacetFeatureColumn.xwt
index a2ae62ef794..a2ae62ef794 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleFacetFeatureColumn.xwt
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleFacetFeatureColumn.xwt
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleFacetReferenceColumn.xwt b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleFacetReferenceColumn.xwt
index a2ae62ef794..a2ae62ef794 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleFacetReferenceColumn.xwt
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleFacetReferenceColumn.xwt
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleFeatureColumn.xwt b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleFeatureColumn.xwt
index a2ae62ef794..a2ae62ef794 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleFeatureColumn.xwt
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleFeatureColumn.xwt
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleMetaClassColumn.xwt b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleMetaClassColumn.xwt
index a2ae62ef794..a2ae62ef794 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleMetaClassColumn.xwt
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleMetaClassColumn.xwt
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultiplePapyrusTableInstance.xwt b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/MultiplePapyrusTableInstance.xwt
index 35e6683e2d3..35e6683e2d3 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultiplePapyrusTableInstance.xwt
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/MultiplePapyrusTableInstance.xwt
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultiplePrimitiveTypeQueryRow.xwt b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/MultiplePrimitiveTypeQueryRow.xwt
index a2ae62ef794..a2ae62ef794 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultiplePrimitiveTypeQueryRow.xwt
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/MultiplePrimitiveTypeQueryRow.xwt
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleQueryColumn.xwt b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleQueryColumn.xwt
index a2ae62ef794..a2ae62ef794 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleQueryColumn.xwt
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleQueryColumn.xwt
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleQueryRow.xwt b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleQueryRow.xwt
index a2ae62ef794..a2ae62ef794 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleQueryRow.xwt
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleQueryRow.xwt
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleQueryTableInstance.xwt b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleQueryTableInstance.xwt
index a2ae62ef794..a2ae62ef794 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleQueryTableInstance.xwt
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleQueryTableInstance.xwt
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleQueryTableInstance2.xwt b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleQueryTableInstance2.xwt
index ad504480cfd..ad504480cfd 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleQueryTableInstance2.xwt
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleQueryTableInstance2.xwt
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleReferenceColumn.xwt b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleReferenceColumn.xwt
index a2ae62ef794..a2ae62ef794 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleReferenceColumn.xwt
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleReferenceColumn.xwt
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleRow.xwt b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleRow.xwt
index 7b8b905d447..7b8b905d447 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleRow.xwt
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleRow.xwt
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleTableInstance.xwt b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleTableInstance.xwt
index a2ae62ef794..a2ae62ef794 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleTableInstance.xwt
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleTableInstance.xwt
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleTableInstance2.xwt b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleTableInstance2.xwt
index a2ae62ef794..a2ae62ef794 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleTableInstance2.xwt
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleTableInstance2.xwt
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleValueColumn.xwt b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleValueColumn.xwt
index a2ae62ef794..a2ae62ef794 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleValueColumn.xwt
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/MultipleValueColumn.xwt
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleAttributeColumn.xwt b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/SingleAttributeColumn.xwt
index a2ae62ef794..a2ae62ef794 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleAttributeColumn.xwt
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/SingleAttributeColumn.xwt
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleColumn.xwt b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/SingleColumn.xwt
index a2ae62ef794..a2ae62ef794 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleColumn.xwt
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/SingleColumn.xwt
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleContextColumn.xwt b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/SingleContextColumn.xwt
index a2ae62ef794..a2ae62ef794 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleContextColumn.xwt
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/SingleContextColumn.xwt
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleDefaultLabelColumn.xwt b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/SingleDefaultLabelColumn.xwt
index a2ae62ef794..a2ae62ef794 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleDefaultLabelColumn.xwt
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/SingleDefaultLabelColumn.xwt
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleEContainerColumn.xwt b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/SingleEContainerColumn.xwt
index a2ae62ef794..a2ae62ef794 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleEContainerColumn.xwt
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/SingleEContainerColumn.xwt
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleEObjectQueryRow.xwt b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/SingleEObjectQueryRow.xwt
index a2ae62ef794..a2ae62ef794 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleEObjectQueryRow.xwt
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/SingleEObjectQueryRow.xwt
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleFacetAttributeColumn.xwt b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/SingleFacetAttributeColumn.xwt
index a2ae62ef794..a2ae62ef794 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleFacetAttributeColumn.xwt
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/SingleFacetAttributeColumn.xwt
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleFacetFeatureColumn.xwt b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/SingleFacetFeatureColumn.xwt
index a2ae62ef794..a2ae62ef794 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleFacetFeatureColumn.xwt
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/SingleFacetFeatureColumn.xwt
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleFacetReferenceColumn.xwt b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/SingleFacetReferenceColumn.xwt
index a2ae62ef794..a2ae62ef794 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleFacetReferenceColumn.xwt
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/SingleFacetReferenceColumn.xwt
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleFeatureColumn.xwt b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/SingleFeatureColumn.xwt
index a2ae62ef794..a2ae62ef794 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleFeatureColumn.xwt
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/SingleFeatureColumn.xwt
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleMetaClassColumn.xwt b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/SingleMetaClassColumn.xwt
index a2ae62ef794..a2ae62ef794 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleMetaClassColumn.xwt
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/SingleMetaClassColumn.xwt
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SinglePapyrusTableInstance.xwt b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/SinglePapyrusTableInstance.xwt
index f070f9e2677..f070f9e2677 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SinglePapyrusTableInstance.xwt
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/SinglePapyrusTableInstance.xwt
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SinglePrimitiveTypeQueryRow.xwt b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/SinglePrimitiveTypeQueryRow.xwt
index a2ae62ef794..a2ae62ef794 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SinglePrimitiveTypeQueryRow.xwt
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/SinglePrimitiveTypeQueryRow.xwt
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleQueryColumn.xwt b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/SingleQueryColumn.xwt
index a2ae62ef794..a2ae62ef794 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleQueryColumn.xwt
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/SingleQueryColumn.xwt
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleQueryRow.xwt b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/SingleQueryRow.xwt
index a2ae62ef794..a2ae62ef794 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleQueryRow.xwt
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/SingleQueryRow.xwt
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleQueryTableInstance.xwt b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/SingleQueryTableInstance.xwt
index a2ae62ef794..a2ae62ef794 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleQueryTableInstance.xwt
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/SingleQueryTableInstance.xwt
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleQueryTableInstance2.xwt b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/SingleQueryTableInstance2.xwt
index a2ae62ef794..a2ae62ef794 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleQueryTableInstance2.xwt
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/SingleQueryTableInstance2.xwt
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleReferenceColumn.xwt b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/SingleReferenceColumn.xwt
index a2ae62ef794..a2ae62ef794 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleReferenceColumn.xwt
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/SingleReferenceColumn.xwt
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleRow.xwt b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/SingleRow.xwt
index a2ae62ef794..a2ae62ef794 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleRow.xwt
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/SingleRow.xwt
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleTableInstance.xwt b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/SingleTableInstance.xwt
index 8d6757fd352..8d6757fd352 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleTableInstance.xwt
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/SingleTableInstance.xwt
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleTableInstance2.xwt b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/SingleTableInstance2.xwt
index 491cbc46f17..491cbc46f17 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleTableInstance2.xwt
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/SingleTableInstance2.xwt
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleValueColumn.xwt b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/SingleValueColumn.xwt
index a2ae62ef794..a2ae62ef794 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/model/ui/SingleValueColumn.xwt
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/model/ui/SingleValueColumn.xwt
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/plugin.properties b/deprecated/org.eclipse.papyrus.infra.table.properties/plugin.properties
index 0b6f48cf843..0b6f48cf843 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/plugin.properties
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/plugin.properties
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/plugin.xml b/deprecated/org.eclipse.papyrus.infra.table.properties/plugin.xml
index b9d68cf73c7..b9d68cf73c7 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/plugin.xml
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/plugin.xml
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/Activator.java b/deprecated/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/Activator.java
index 7d655b26980..7d655b26980 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/Activator.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/Activator.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/messages/Messages.java b/deprecated/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/messages/Messages.java
index ba166b9f37d..ba166b9f37d 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/messages/Messages.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/messages/Messages.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/messages/messages.properties b/deprecated/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/messages/messages.properties
index d29d940cb36..d29d940cb36 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/messages/messages.properties
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/messages/messages.properties
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/modelelement/PapyrusTableFactory.java b/deprecated/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/modelelement/PapyrusTableFactory.java
index 75875548fb4..75875548fb4 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/modelelement/PapyrusTableFactory.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/modelelement/PapyrusTableFactory.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/modelelement/PapyrusTableModelElement.java b/deprecated/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/modelelement/PapyrusTableModelElement.java
index 7732a6fc141..7732a6fc141 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/modelelement/PapyrusTableModelElement.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/modelelement/PapyrusTableModelElement.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/provider/CustomizationContentProvider.java b/deprecated/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/provider/CustomizationContentProvider.java
index e5f2e99fc0b..e5f2e99fc0b 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/provider/CustomizationContentProvider.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/provider/CustomizationContentProvider.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/provider/CustomizationLabelProvider.java b/deprecated/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/provider/CustomizationLabelProvider.java
index 4c60d0bf35f..4c60d0bf35f 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/provider/CustomizationLabelProvider.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/provider/CustomizationLabelProvider.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/provider/ElementTypeContentProvider.java b/deprecated/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/provider/ElementTypeContentProvider.java
index a6d6f0eda9d..a6d6f0eda9d 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/provider/ElementTypeContentProvider.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/provider/ElementTypeContentProvider.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/provider/FacetLabelProvider.java b/deprecated/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/provider/FacetLabelProvider.java
index 3c4872d0ab2..3c4872d0ab2 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/provider/FacetLabelProvider.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/provider/FacetLabelProvider.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/provider/FillingQueriesContentProvider.java b/deprecated/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/provider/FillingQueriesContentProvider.java
index 2c78d470d45..2c78d470d45 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/provider/FillingQueriesContentProvider.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/provider/FillingQueriesContentProvider.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/provider/PasteElementContainmentFeatureContentProvider.java b/deprecated/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/provider/PasteElementContainmentFeatureContentProvider.java
index 7dd29503fb4..7dd29503fb4 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/provider/PasteElementContainmentFeatureContentProvider.java
+++ b/deprecated/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/infra/table/properties/provider/PasteElementContainmentFeatureContentProvider.java
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/.classpath b/deprecated/org.eclipse.papyrus.sysml.facets/.classpath
index 45f024e850e..45f024e850e 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/.classpath
+++ b/deprecated/org.eclipse.papyrus.sysml.facets/.classpath
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/.project b/deprecated/org.eclipse.papyrus.sysml.facets/.project
index df39881e32a..df39881e32a 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/.project
+++ b/deprecated/org.eclipse.papyrus.sysml.facets/.project
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/META-INF/MANIFEST.MF b/deprecated/org.eclipse.papyrus.sysml.facets/META-INF/MANIFEST.MF
index 29da509e8f9..29da509e8f9 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/META-INF/MANIFEST.MF
+++ b/deprecated/org.eclipse.papyrus.sysml.facets/META-INF/MANIFEST.MF
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/README.txt b/deprecated/org.eclipse.papyrus.sysml.facets/README.txt
index 51c4cbfeaf5..51c4cbfeaf5 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/README.txt
+++ b/deprecated/org.eclipse.papyrus.sysml.facets/README.txt
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/about.html b/deprecated/org.eclipse.papyrus.sysml.facets/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/about.html
+++ b/deprecated/org.eclipse.papyrus.sysml.facets/about.html
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/build.properties b/deprecated/org.eclipse.papyrus.sysml.facets/build.properties
index ec9877ca04a..ec9877ca04a 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/build.properties
+++ b/deprecated/org.eclipse.papyrus.sysml.facets/build.properties
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/plugin.properties b/deprecated/org.eclipse.papyrus.sysml.facets/plugin.properties
index 4b1ed988b60..4b1ed988b60 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/plugin.properties
+++ b/deprecated/org.eclipse.papyrus.sysml.facets/plugin.properties
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/plugin.xml b/deprecated/org.eclipse.papyrus.sysml.facets/plugin.xml
index 7f2b95565b0..7f2b95565b0 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/plugin.xml
+++ b/deprecated/org.eclipse.papyrus.sysml.facets/plugin.xml
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/extendedsysml.genmodel b/deprecated/org.eclipse.papyrus.sysml.facets/resources/extendedsysml.genmodel
index ba39a559190..ba39a559190 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/extendedsysml.genmodel
+++ b/deprecated/org.eclipse.papyrus.sysml.facets/resources/extendedsysml.genmodel
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/extentedsysml.ecore b/deprecated/org.eclipse.papyrus.sysml.facets/resources/extentedsysml.ecore
index 154a23ae23d..154a23ae23d 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/extentedsysml.ecore
+++ b/deprecated/org.eclipse.papyrus.sysml.facets/resources/extentedsysml.ecore
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/portAndFlowsFacets.facetSet b/deprecated/org.eclipse.papyrus.sysml.facets/resources/portAndFlowsFacets.facetSet
index ab24bf55d01..ab24bf55d01 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/portAndFlowsFacets.facetSet
+++ b/deprecated/org.eclipse.papyrus.sysml.facets/resources/portAndFlowsFacets.facetSet
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/portAndFlowsQueries.querySet b/deprecated/org.eclipse.papyrus.sysml.facets/resources/portAndFlowsQueries.querySet
index de8e0bcf4a9..de8e0bcf4a9 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/portAndFlowsQueries.querySet
+++ b/deprecated/org.eclipse.papyrus.sysml.facets/resources/portAndFlowsQueries.querySet
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/requirementsFacets.facetSet b/deprecated/org.eclipse.papyrus.sysml.facets/resources/requirementsFacets.facetSet
index 8e7cded63a0..8e7cded63a0 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/requirementsFacets.facetSet
+++ b/deprecated/org.eclipse.papyrus.sysml.facets/resources/requirementsFacets.facetSet
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/requirementsQueries.querySet b/deprecated/org.eclipse.papyrus.sysml.facets/resources/requirementsQueries.querySet
index bdf14ce2ef7..bdf14ce2ef7 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/requirementsQueries.querySet
+++ b/deprecated/org.eclipse.papyrus.sysml.facets/resources/requirementsQueries.querySet
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/sysml_profilefacet.facetSet b/deprecated/org.eclipse.papyrus.sysml.facets/resources/sysml_profilefacet.facetSet
index c8d6ea1cbf8..c8d6ea1cbf8 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/sysml_profilefacet.facetSet
+++ b/deprecated/org.eclipse.papyrus.sysml.facets/resources/sysml_profilefacet.facetSet
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/sysml_profilefacet.querySet b/deprecated/org.eclipse.papyrus.sysml.facets/resources/sysml_profilefacet.querySet
index 048bc4e9c75..048bc4e9c75 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/sysml_profilefacet.querySet
+++ b/deprecated/org.eclipse.papyrus.sysml.facets/resources/sysml_profilefacet.querySet
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/Activator.java b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/Activator.java
index b0b5e972881..b0b5e972881 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/Activator.java
+++ b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/Activator.java
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/extendedsysml/extendedsysml/portandflows/NAFlowPortDirection.java b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/extendedsysml/extendedsysml/portandflows/NAFlowPortDirection.java
index fa4ef9b6907..fa4ef9b6907 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/extendedsysml/extendedsysml/portandflows/NAFlowPortDirection.java
+++ b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/extendedsysml/extendedsysml/portandflows/NAFlowPortDirection.java
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/extendedsysml/extendedsysml/portandflows/PortandflowsFactory.java b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/extendedsysml/extendedsysml/portandflows/PortandflowsFactory.java
index 8517e729810..8517e729810 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/extendedsysml/extendedsysml/portandflows/PortandflowsFactory.java
+++ b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/extendedsysml/extendedsysml/portandflows/PortandflowsFactory.java
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/extendedsysml/extendedsysml/portandflows/PortandflowsPackage.java b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/extendedsysml/extendedsysml/portandflows/PortandflowsPackage.java
index d29c765c961..d29c765c961 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/extendedsysml/extendedsysml/portandflows/PortandflowsPackage.java
+++ b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/extendedsysml/extendedsysml/portandflows/PortandflowsPackage.java
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/extendedsysml/extendedsysml/portandflows/impl/PortandflowsFactoryImpl.java b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/extendedsysml/extendedsysml/portandflows/impl/PortandflowsFactoryImpl.java
index 37cb7a4d18d..37cb7a4d18d 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/extendedsysml/extendedsysml/portandflows/impl/PortandflowsFactoryImpl.java
+++ b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/extendedsysml/extendedsysml/portandflows/impl/PortandflowsFactoryImpl.java
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/extendedsysml/extendedsysml/portandflows/impl/PortandflowsPackageImpl.java b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/extendedsysml/extendedsysml/portandflows/impl/PortandflowsPackageImpl.java
index 81111ed61fa..81111ed61fa 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/extendedsysml/extendedsysml/portandflows/impl/PortandflowsPackageImpl.java
+++ b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/extendedsysml/extendedsysml/portandflows/impl/PortandflowsPackageImpl.java
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/messages/Messages.java b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/messages/Messages.java
index fe75aa339c7..fe75aa339c7 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/messages/Messages.java
+++ b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/messages/Messages.java
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/messages/messages.properties b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/messages/messages.properties
index ab7c93339f5..ab7c93339f5 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/messages/messages.properties
+++ b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/messages/messages.properties
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/portandflows/query/value/getter/GetFlowPortDirectionQuery.java b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/portandflows/query/value/getter/GetFlowPortDirectionQuery.java
index 636ee52d23c..636ee52d23c 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/portandflows/query/value/getter/GetFlowPortDirectionQuery.java
+++ b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/portandflows/query/value/getter/GetFlowPortDirectionQuery.java
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/portandflows/query/value/getter/GetFlowPortIsAtomicQuery.java b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/portandflows/query/value/getter/GetFlowPortIsAtomicQuery.java
index bd305a936c1..bd305a936c1 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/portandflows/query/value/getter/GetFlowPortIsAtomicQuery.java
+++ b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/portandflows/query/value/getter/GetFlowPortIsAtomicQuery.java
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/portandflows/query/value/setter/SetFlowPortDirectionQuery.java b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/portandflows/query/value/setter/SetFlowPortDirectionQuery.java
index 3517b252da2..3517b252da2 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/portandflows/query/value/setter/SetFlowPortDirectionQuery.java
+++ b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/portandflows/query/value/setter/SetFlowPortDirectionQuery.java
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/getter/GetRequirementBase_ClassQuery.java b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/getter/GetRequirementBase_ClassQuery.java
index 025ba56a8d6..025ba56a8d6 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/getter/GetRequirementBase_ClassQuery.java
+++ b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/getter/GetRequirementBase_ClassQuery.java
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/getter/GetRequirementDerivedFromQuery.java b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/getter/GetRequirementDerivedFromQuery.java
index 83b1f1db01c..83b1f1db01c 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/getter/GetRequirementDerivedFromQuery.java
+++ b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/getter/GetRequirementDerivedFromQuery.java
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/getter/GetRequirementDerivedQuery.java b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/getter/GetRequirementDerivedQuery.java
index 63eb8e4b9e5..63eb8e4b9e5 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/getter/GetRequirementDerivedQuery.java
+++ b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/getter/GetRequirementDerivedQuery.java
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/getter/GetRequirementIdQuery.java b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/getter/GetRequirementIdQuery.java
index 7103bc1f514..7103bc1f514 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/getter/GetRequirementIdQuery.java
+++ b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/getter/GetRequirementIdQuery.java
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/getter/GetRequirementMasterQuery.java b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/getter/GetRequirementMasterQuery.java
index 55baa02992d..55baa02992d 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/getter/GetRequirementMasterQuery.java
+++ b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/getter/GetRequirementMasterQuery.java
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/getter/GetRequirementRefinedByQuery.java b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/getter/GetRequirementRefinedByQuery.java
index e3d080fc385..e3d080fc385 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/getter/GetRequirementRefinedByQuery.java
+++ b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/getter/GetRequirementRefinedByQuery.java
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/getter/GetRequirementSatifiedByQuery.java b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/getter/GetRequirementSatifiedByQuery.java
index aba70bf3670..aba70bf3670 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/getter/GetRequirementSatifiedByQuery.java
+++ b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/getter/GetRequirementSatifiedByQuery.java
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/getter/GetRequirementTextQuery.java b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/getter/GetRequirementTextQuery.java
index c9f3020182f..c9f3020182f 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/getter/GetRequirementTextQuery.java
+++ b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/getter/GetRequirementTextQuery.java
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/getter/GetRequirementTracedToQuery.java b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/getter/GetRequirementTracedToQuery.java
index c454df504f5..c454df504f5 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/getter/GetRequirementTracedToQuery.java
+++ b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/getter/GetRequirementTracedToQuery.java
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/getter/GetRequirementVerifiedByQuery.java b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/getter/GetRequirementVerifiedByQuery.java
index e1119eeb045..e1119eeb045 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/getter/GetRequirementVerifiedByQuery.java
+++ b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/getter/GetRequirementVerifiedByQuery.java
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/setter/SetRequirementDerivedFromQuery.java b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/setter/SetRequirementDerivedFromQuery.java
index afb3a5f9fb7..afb3a5f9fb7 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/setter/SetRequirementDerivedFromQuery.java
+++ b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/setter/SetRequirementDerivedFromQuery.java
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/setter/SetRequirementDerivedQuery.java b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/setter/SetRequirementDerivedQuery.java
index 6dcb8676ce5..6dcb8676ce5 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/setter/SetRequirementDerivedQuery.java
+++ b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/setter/SetRequirementDerivedQuery.java
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/setter/SetRequirementIdQuery.java b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/setter/SetRequirementIdQuery.java
index d83a07373e0..d83a07373e0 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/setter/SetRequirementIdQuery.java
+++ b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/setter/SetRequirementIdQuery.java
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/setter/SetRequirementMasterQuery.java b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/setter/SetRequirementMasterQuery.java
index b118e058fe7..b118e058fe7 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/setter/SetRequirementMasterQuery.java
+++ b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/setter/SetRequirementMasterQuery.java
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/setter/SetRequirementRefinedByQuery.java b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/setter/SetRequirementRefinedByQuery.java
index 12e6ed4fe41..12e6ed4fe41 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/setter/SetRequirementRefinedByQuery.java
+++ b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/setter/SetRequirementRefinedByQuery.java
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/setter/SetRequirementSatisfiedByQuery.java b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/setter/SetRequirementSatisfiedByQuery.java
index 6aa6cc7a233..6aa6cc7a233 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/setter/SetRequirementSatisfiedByQuery.java
+++ b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/setter/SetRequirementSatisfiedByQuery.java
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/setter/SetRequirementTextQuery.java b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/setter/SetRequirementTextQuery.java
index bc87bed3aaa..bc87bed3aaa 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/setter/SetRequirementTextQuery.java
+++ b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/setter/SetRequirementTextQuery.java
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/setter/SetRequirementTracedToQuery.java b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/setter/SetRequirementTracedToQuery.java
index 590f09c7c5f..590f09c7c5f 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/setter/SetRequirementTracedToQuery.java
+++ b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/setter/SetRequirementTracedToQuery.java
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/setter/SetRequirementVerifiedByQuery.java b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/setter/SetRequirementVerifiedByQuery.java
index a6894ffcd9e..a6894ffcd9e 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/setter/SetRequirementVerifiedByQuery.java
+++ b/deprecated/org.eclipse.papyrus.sysml.facets/src/org/eclipse/papyrus/sysml/facets/query/value/setter/SetRequirementVerifiedByQuery.java
diff --git a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/.classpath b/deprecated/org.eclipse.papyrus.sysml.table.allocation/.classpath
index 45f024e850e..45f024e850e 100644
--- a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/.classpath
+++ b/deprecated/org.eclipse.papyrus.sysml.table.allocation/.classpath
diff --git a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/.project b/deprecated/org.eclipse.papyrus.sysml.table.allocation/.project
index eee04871a33..eee04871a33 100644
--- a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/.project
+++ b/deprecated/org.eclipse.papyrus.sysml.table.allocation/.project
diff --git a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/META-INF/MANIFEST.MF b/deprecated/org.eclipse.papyrus.sysml.table.allocation/META-INF/MANIFEST.MF
index 5d9a820e72b..5d9a820e72b 100644
--- a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/META-INF/MANIFEST.MF
+++ b/deprecated/org.eclipse.papyrus.sysml.table.allocation/META-INF/MANIFEST.MF
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/about.html b/deprecated/org.eclipse.papyrus.sysml.table.allocation/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/about.html
+++ b/deprecated/org.eclipse.papyrus.sysml.table.allocation/about.html
diff --git a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/build.properties b/deprecated/org.eclipse.papyrus.sysml.table.allocation/build.properties
index a5b8aba17eb..a5b8aba17eb 100644
--- a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/build.properties
+++ b/deprecated/org.eclipse.papyrus.sysml.table.allocation/build.properties
diff --git a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/icons/allocation_table.gif b/deprecated/org.eclipse.papyrus.sysml.table.allocation/icons/allocation_table.gif
index 01476ab60c0..01476ab60c0 100644
--- a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/icons/allocation_table.gif
+++ b/deprecated/org.eclipse.papyrus.sysml.table.allocation/icons/allocation_table.gif
diff --git a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/icons/allocation_table.png b/deprecated/org.eclipse.papyrus.sysml.table.allocation/icons/allocation_table.png
index 757b31ce86b..757b31ce86b 100644
--- a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/icons/allocation_table.png
+++ b/deprecated/org.eclipse.papyrus.sysml.table.allocation/icons/allocation_table.png
diff --git a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/icons/table_SysML_Allocation.gif b/deprecated/org.eclipse.papyrus.sysml.table.allocation/icons/table_SysML_Allocation.gif
index da218ead152..da218ead152 100644
--- a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/icons/table_SysML_Allocation.gif
+++ b/deprecated/org.eclipse.papyrus.sysml.table.allocation/icons/table_SysML_Allocation.gif
diff --git a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/icons/table_SysML_Allocation.png b/deprecated/org.eclipse.papyrus.sysml.table.allocation/icons/table_SysML_Allocation.png
index 761ea002323..761ea002323 100644
--- a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/icons/table_SysML_Allocation.png
+++ b/deprecated/org.eclipse.papyrus.sysml.table.allocation/icons/table_SysML_Allocation.png
diff --git a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/plugin.properties b/deprecated/org.eclipse.papyrus.sysml.table.allocation/plugin.properties
index c20559ab717..c20559ab717 100644
--- a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/plugin.properties
+++ b/deprecated/org.eclipse.papyrus.sysml.table.allocation/plugin.properties
diff --git a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/plugin.xml b/deprecated/org.eclipse.papyrus.sysml.table.allocation/plugin.xml
index f953d368abf..f953d368abf 100644
--- a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/plugin.xml
+++ b/deprecated/org.eclipse.papyrus.sysml.table.allocation/plugin.xml
diff --git a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/resources/allocate.querySet b/deprecated/org.eclipse.papyrus.sysml.table.allocation/resources/allocate.querySet
index 11d4bbe34c7..11d4bbe34c7 100644
--- a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/resources/allocate.querySet
+++ b/deprecated/org.eclipse.papyrus.sysml.table.allocation/resources/allocate.querySet
diff --git a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/resources/allocate.tableconfiguration2 b/deprecated/org.eclipse.papyrus.sysml.table.allocation/resources/allocate.tableconfiguration2
index 25bdafe1803..25bdafe1803 100644
--- a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/resources/allocate.tableconfiguration2
+++ b/deprecated/org.eclipse.papyrus.sysml.table.allocation/resources/allocate.tableconfiguration2
diff --git a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/resources/table_SysML_Allocation_showOnlyClientAndSupplier.uiCustom b/deprecated/org.eclipse.papyrus.sysml.table.allocation/resources/table_SysML_Allocation_showOnlyClientAndSupplier.uiCustom
index b445216d4cc..b445216d4cc 100644
--- a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/resources/table_SysML_Allocation_showOnlyClientAndSupplier.uiCustom
+++ b/deprecated/org.eclipse.papyrus.sysml.table.allocation/resources/table_SysML_Allocation_showOnlyClientAndSupplier.uiCustom
diff --git a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/src/org/eclipse/papyrus/sysml/table/allocation/Activator.java b/deprecated/org.eclipse.papyrus.sysml.table.allocation/src/org/eclipse/papyrus/sysml/table/allocation/Activator.java
index 5f829acfd95..5f829acfd95 100644
--- a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/src/org/eclipse/papyrus/sysml/table/allocation/Activator.java
+++ b/deprecated/org.eclipse.papyrus.sysml.table.allocation/src/org/eclipse/papyrus/sysml/table/allocation/Activator.java
diff --git a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/src/org/eclipse/papyrus/sysml/table/allocation/CreateAllocationTableCommand.java b/deprecated/org.eclipse.papyrus.sysml.table.allocation/src/org/eclipse/papyrus/sysml/table/allocation/CreateAllocationTableCommand.java
index 2c16e537bf8..2c16e537bf8 100644
--- a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/src/org/eclipse/papyrus/sysml/table/allocation/CreateAllocationTableCommand.java
+++ b/deprecated/org.eclipse.papyrus.sysml.table.allocation/src/org/eclipse/papyrus/sysml/table/allocation/CreateAllocationTableCommand.java
diff --git a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/src/org/eclipse/papyrus/sysml/table/allocation/CreateAllocationTableFactory.java b/deprecated/org.eclipse.papyrus.sysml.table.allocation/src/org/eclipse/papyrus/sysml/table/allocation/CreateAllocationTableFactory.java
index 388f82acffc..388f82acffc 100644
--- a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/src/org/eclipse/papyrus/sysml/table/allocation/CreateAllocationTableFactory.java
+++ b/deprecated/org.eclipse.papyrus.sysml.table.allocation/src/org/eclipse/papyrus/sysml/table/allocation/CreateAllocationTableFactory.java
diff --git a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/src/org/eclipse/papyrus/sysml/table/allocation/editor/AllocationTableEditor.java b/deprecated/org.eclipse.papyrus.sysml.table.allocation/src/org/eclipse/papyrus/sysml/table/allocation/editor/AllocationTableEditor.java
index a92a748f433..a92a748f433 100644
--- a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/src/org/eclipse/papyrus/sysml/table/allocation/editor/AllocationTableEditor.java
+++ b/deprecated/org.eclipse.papyrus.sysml.table.allocation/src/org/eclipse/papyrus/sysml/table/allocation/editor/AllocationTableEditor.java
diff --git a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/src/org/eclipse/papyrus/sysml/table/allocation/queries/CreateAbstractionQuery.java b/deprecated/org.eclipse.papyrus.sysml.table.allocation/src/org/eclipse/papyrus/sysml/table/allocation/queries/CreateAbstractionQuery.java
index 4daac093705..4daac093705 100644
--- a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/src/org/eclipse/papyrus/sysml/table/allocation/queries/CreateAbstractionQuery.java
+++ b/deprecated/org.eclipse.papyrus.sysml.table.allocation/src/org/eclipse/papyrus/sysml/table/allocation/queries/CreateAbstractionQuery.java
diff --git a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/src/org/eclipse/papyrus/sysml/table/allocation/queries/CreateAllocateQuery.java b/deprecated/org.eclipse.papyrus.sysml.table.allocation/src/org/eclipse/papyrus/sysml/table/allocation/queries/CreateAllocateQuery.java
index 0c4bcfff47a..0c4bcfff47a 100644
--- a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/src/org/eclipse/papyrus/sysml/table/allocation/queries/CreateAllocateQuery.java
+++ b/deprecated/org.eclipse.papyrus.sysml.table.allocation/src/org/eclipse/papyrus/sysml/table/allocation/queries/CreateAllocateQuery.java
diff --git a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/src/org/eclipse/papyrus/sysml/table/allocation/queries/IsAllocateQuery.java b/deprecated/org.eclipse.papyrus.sysml.table.allocation/src/org/eclipse/papyrus/sysml/table/allocation/queries/IsAllocateQuery.java
index b03802e2afb..b03802e2afb 100644
--- a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/src/org/eclipse/papyrus/sysml/table/allocation/queries/IsAllocateQuery.java
+++ b/deprecated/org.eclipse.papyrus.sysml.table.allocation/src/org/eclipse/papyrus/sysml/table/allocation/queries/IsAllocateQuery.java
diff --git a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/src/org/eclipse/papyrus/sysml/table/allocation/tester/AllocationPropertyTester.java b/deprecated/org.eclipse.papyrus.sysml.table.allocation/src/org/eclipse/papyrus/sysml/table/allocation/tester/AllocationPropertyTester.java
index 3677994f225..3677994f225 100644
--- a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/src/org/eclipse/papyrus/sysml/table/allocation/tester/AllocationPropertyTester.java
+++ b/deprecated/org.eclipse.papyrus.sysml.table.allocation/src/org/eclipse/papyrus/sysml/table/allocation/tester/AllocationPropertyTester.java
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sysml.table.feature/.project b/deprecated/org.eclipse.papyrus.sysml.table.feature/.project
index 3a2b6dcb6df..3a2b6dcb6df 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.sysml.table.feature/.project
+++ b/deprecated/org.eclipse.papyrus.sysml.table.feature/.project
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.infra.gmfdiag.css.feature/build.properties b/deprecated/org.eclipse.papyrus.sysml.table.feature/build.properties
index 128baaa4d3b..128baaa4d3b 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.infra.gmfdiag.css.feature/build.properties
+++ b/deprecated/org.eclipse.papyrus.sysml.table.feature/build.properties
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.infra.gmfdiag.css.feature/epl-v10.html b/deprecated/org.eclipse.papyrus.sysml.table.feature/epl-v10.html
index cb1073a4bad..cb1073a4bad 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.infra.gmfdiag.css.feature/epl-v10.html
+++ b/deprecated/org.eclipse.papyrus.sysml.table.feature/epl-v10.html
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sysml.table.feature/feature.properties b/deprecated/org.eclipse.papyrus.sysml.table.feature/feature.properties
index a630891ba6a..a630891ba6a 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.sysml.table.feature/feature.properties
+++ b/deprecated/org.eclipse.papyrus.sysml.table.feature/feature.properties
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sysml.table.feature/feature.xml b/deprecated/org.eclipse.papyrus.sysml.table.feature/feature.xml
index 2b536b87660..2b536b87660 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.sysml.table.feature/feature.xml
+++ b/deprecated/org.eclipse.papyrus.sysml.table.feature/feature.xml
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.infra.gmfdiag.css.feature/license.html b/deprecated/org.eclipse.papyrus.sysml.table.feature/license.html
index f19c483b9c8..f19c483b9c8 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.infra.gmfdiag.css.feature/license.html
+++ b/deprecated/org.eclipse.papyrus.sysml.table.feature/license.html
diff --git a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/.classpath b/deprecated/org.eclipse.papyrus.sysml.table.requirement/.classpath
index 45f024e850e..45f024e850e 100644
--- a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/.classpath
+++ b/deprecated/org.eclipse.papyrus.sysml.table.requirement/.classpath
diff --git a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/.project b/deprecated/org.eclipse.papyrus.sysml.table.requirement/.project
index 606bd416f06..606bd416f06 100644
--- a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/.project
+++ b/deprecated/org.eclipse.papyrus.sysml.table.requirement/.project
diff --git a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/META-INF/MANIFEST.MF b/deprecated/org.eclipse.papyrus.sysml.table.requirement/META-INF/MANIFEST.MF
index cbfc076b4a9..cbfc076b4a9 100644
--- a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/META-INF/MANIFEST.MF
+++ b/deprecated/org.eclipse.papyrus.sysml.table.requirement/META-INF/MANIFEST.MF
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/about.html b/deprecated/org.eclipse.papyrus.sysml.table.requirement/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/about.html
+++ b/deprecated/org.eclipse.papyrus.sysml.table.requirement/about.html
diff --git a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/build.properties b/deprecated/org.eclipse.papyrus.sysml.table.requirement/build.properties
index e164411e90e..e164411e90e 100644
--- a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/build.properties
+++ b/deprecated/org.eclipse.papyrus.sysml.table.requirement/build.properties
diff --git a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/icons/table_SysML_Requirement.gif b/deprecated/org.eclipse.papyrus.sysml.table.requirement/icons/table_SysML_Requirement.gif
index 426869ed0ff..426869ed0ff 100644
--- a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/icons/table_SysML_Requirement.gif
+++ b/deprecated/org.eclipse.papyrus.sysml.table.requirement/icons/table_SysML_Requirement.gif
diff --git a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/icons/table_SysML_Requirement.png b/deprecated/org.eclipse.papyrus.sysml.table.requirement/icons/table_SysML_Requirement.png
index c671f9e6440..c671f9e6440 100644
--- a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/icons/table_SysML_Requirement.png
+++ b/deprecated/org.eclipse.papyrus.sysml.table.requirement/icons/table_SysML_Requirement.png
diff --git a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/icons/table_requirement.gif b/deprecated/org.eclipse.papyrus.sysml.table.requirement/icons/table_requirement.gif
index 15a4cd2889b..15a4cd2889b 100644
--- a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/icons/table_requirement.gif
+++ b/deprecated/org.eclipse.papyrus.sysml.table.requirement/icons/table_requirement.gif
diff --git a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/icons/table_requirement.png b/deprecated/org.eclipse.papyrus.sysml.table.requirement/icons/table_requirement.png
index b074f330444..b074f330444 100644
--- a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/icons/table_requirement.png
+++ b/deprecated/org.eclipse.papyrus.sysml.table.requirement/icons/table_requirement.png
diff --git a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/plugin.properties b/deprecated/org.eclipse.papyrus.sysml.table.requirement/plugin.properties
index 131c3128599..131c3128599 100644
--- a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/plugin.properties
+++ b/deprecated/org.eclipse.papyrus.sysml.table.requirement/plugin.properties
diff --git a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/plugin.xml b/deprecated/org.eclipse.papyrus.sysml.table.requirement/plugin.xml
index 5a65f35aa77..5a65f35aa77 100644
--- a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/plugin.xml
+++ b/deprecated/org.eclipse.papyrus.sysml.table.requirement/plugin.xml
diff --git a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/resources/requirement.papyrustableconfiguration b/deprecated/org.eclipse.papyrus.sysml.table.requirement/resources/requirement.papyrustableconfiguration
index c34e1141683..c34e1141683 100644
--- a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/resources/requirement.papyrustableconfiguration
+++ b/deprecated/org.eclipse.papyrus.sysml.table.requirement/resources/requirement.papyrustableconfiguration
diff --git a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/resources/requirements.tableconfiguration2 b/deprecated/org.eclipse.papyrus.sysml.table.requirement/resources/requirements.tableconfiguration2
index e3895e3f7c7..e3895e3f7c7 100644
--- a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/resources/requirements.tableconfiguration2
+++ b/deprecated/org.eclipse.papyrus.sysml.table.requirement/resources/requirements.tableconfiguration2
diff --git a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/resources/requirementsTable.querySet b/deprecated/org.eclipse.papyrus.sysml.table.requirement/resources/requirementsTable.querySet
index 9bf233e3d56..9bf233e3d56 100644
--- a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/resources/requirementsTable.querySet
+++ b/deprecated/org.eclipse.papyrus.sysml.table.requirement/resources/requirementsTable.querySet
diff --git a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/resources/table_UML_Class_hideAllClassFeatures.uiCustom b/deprecated/org.eclipse.papyrus.sysml.table.requirement/resources/table_UML_Class_hideAllClassFeatures.uiCustom
index 2c4fc5c4e33..2c4fc5c4e33 100644
--- a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/resources/table_UML_Class_hideAllClassFeatures.uiCustom
+++ b/deprecated/org.eclipse.papyrus.sysml.table.requirement/resources/table_UML_Class_hideAllClassFeatures.uiCustom
diff --git a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/src/org/eclipse/papyrus/sysml/table/requirement/Activator.java b/deprecated/org.eclipse.papyrus.sysml.table.requirement/src/org/eclipse/papyrus/sysml/table/requirement/Activator.java
index bf6ad48cd11..bf6ad48cd11 100644
--- a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/src/org/eclipse/papyrus/sysml/table/requirement/Activator.java
+++ b/deprecated/org.eclipse.papyrus.sysml.table.requirement/src/org/eclipse/papyrus/sysml/table/requirement/Activator.java
diff --git a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/src/org/eclipse/papyrus/sysml/table/requirement/CreateRequirementTableCommand.java b/deprecated/org.eclipse.papyrus.sysml.table.requirement/src/org/eclipse/papyrus/sysml/table/requirement/CreateRequirementTableCommand.java
index 32ca56a1bc5..32ca56a1bc5 100644
--- a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/src/org/eclipse/papyrus/sysml/table/requirement/CreateRequirementTableCommand.java
+++ b/deprecated/org.eclipse.papyrus.sysml.table.requirement/src/org/eclipse/papyrus/sysml/table/requirement/CreateRequirementTableCommand.java
diff --git a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/src/org/eclipse/papyrus/sysml/table/requirement/CreateRequirementTableFactory.java b/deprecated/org.eclipse.papyrus.sysml.table.requirement/src/org/eclipse/papyrus/sysml/table/requirement/CreateRequirementTableFactory.java
index 3836797e135..3836797e135 100644
--- a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/src/org/eclipse/papyrus/sysml/table/requirement/CreateRequirementTableFactory.java
+++ b/deprecated/org.eclipse.papyrus.sysml.table.requirement/src/org/eclipse/papyrus/sysml/table/requirement/CreateRequirementTableFactory.java
diff --git a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/src/org/eclipse/papyrus/sysml/table/requirement/editor/RequirementTableEditor.java b/deprecated/org.eclipse.papyrus.sysml.table.requirement/src/org/eclipse/papyrus/sysml/table/requirement/editor/RequirementTableEditor.java
index 4340942dde7..4340942dde7 100644
--- a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/src/org/eclipse/papyrus/sysml/table/requirement/editor/RequirementTableEditor.java
+++ b/deprecated/org.eclipse.papyrus.sysml.table.requirement/src/org/eclipse/papyrus/sysml/table/requirement/editor/RequirementTableEditor.java
diff --git a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/src/org/eclipse/papyrus/sysml/table/requirement/queries/CreateRequirement.java b/deprecated/org.eclipse.papyrus.sysml.table.requirement/src/org/eclipse/papyrus/sysml/table/requirement/queries/CreateRequirement.java
index 12e2dcceb5a..12e2dcceb5a 100644
--- a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/src/org/eclipse/papyrus/sysml/table/requirement/queries/CreateRequirement.java
+++ b/deprecated/org.eclipse.papyrus.sysml.table.requirement/src/org/eclipse/papyrus/sysml/table/requirement/queries/CreateRequirement.java
diff --git a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/src/org/eclipse/papyrus/sysml/table/requirement/queries/IsRequirement.java b/deprecated/org.eclipse.papyrus.sysml.table.requirement/src/org/eclipse/papyrus/sysml/table/requirement/queries/IsRequirement.java
index 895bb06a4f4..895bb06a4f4 100644
--- a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/src/org/eclipse/papyrus/sysml/table/requirement/queries/IsRequirement.java
+++ b/deprecated/org.eclipse.papyrus.sysml.table.requirement/src/org/eclipse/papyrus/sysml/table/requirement/queries/IsRequirement.java
diff --git a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/src/org/eclipse/papyrus/sysml/table/requirement/tester/RequirementPropertyTester.java b/deprecated/org.eclipse.papyrus.sysml.table.requirement/src/org/eclipse/papyrus/sysml/table/requirement/tester/RequirementPropertyTester.java
index b60ac2ac388..b60ac2ac388 100644
--- a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/src/org/eclipse/papyrus/sysml/table/requirement/tester/RequirementPropertyTester.java
+++ b/deprecated/org.eclipse.papyrus.sysml.table.requirement/src/org/eclipse/papyrus/sysml/table/requirement/tester/RequirementPropertyTester.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/.classpath b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/.classpath
index cedf0d0d0b5..cedf0d0d0b5 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/.classpath
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/.classpath
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/.project b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/.project
index 2065cc68951..2065cc68951 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/.project
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/.project
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/META-INF/MANIFEST.MF b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/META-INF/MANIFEST.MF
index bb16adcd2dd..bb16adcd2dd 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/META-INF/MANIFEST.MF
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/META-INF/MANIFEST.MF
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.generation/about.html b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/about.html
index 34ab520eed4..34ab520eed4 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.generation/about.html
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/about.html
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/build.properties b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/build.properties
index 072b7359b96..072b7359b96 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/build.properties
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/build.properties
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/model/profilefacet.ecore b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/model/profilefacet.ecore
index 0788230c297..0788230c297 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/model/profilefacet.ecore
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/model/profilefacet.ecore
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/model/profilefacet.genmodel b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/model/profilefacet.genmodel
index 6d2dd2fc2de..6d2dd2fc2de 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/model/profilefacet.genmodel
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/model/profilefacet.genmodel
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/plugin.pdoc b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/plugin.pdoc
index b302b5b13b7..b302b5b13b7 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/plugin.pdoc
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/plugin.pdoc
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/plugin.properties b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/plugin.properties
index 7115b05cbf4..7115b05cbf4 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/plugin.properties
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/plugin.properties
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/plugin.xml b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/plugin.xml
index 9429e85b09e..9429e85b09e 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/plugin.xml
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/plugin.xml
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/EObjectFacetRepresentation.java b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/EObjectFacetRepresentation.java
index 1492367f4e2..1492367f4e2 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/EObjectFacetRepresentation.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/EObjectFacetRepresentation.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/ProfileFacetFactory.java b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/ProfileFacetFactory.java
index d76e525a093..d76e525a093 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/ProfileFacetFactory.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/ProfileFacetFactory.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/ProfileFacetPackage.java b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/ProfileFacetPackage.java
index a5c1a43cee4..a5c1a43cee4 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/ProfileFacetPackage.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/ProfileFacetPackage.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/ProfileFacetSet.java b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/ProfileFacetSet.java
index 7da843f21aa..7da843f21aa 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/ProfileFacetSet.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/ProfileFacetSet.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/StereotypeFacet.java b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/StereotypeFacet.java
index d8abfc7952d..d8abfc7952d 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/StereotypeFacet.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/StereotypeFacet.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/StereotypePropertyElement.java b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/StereotypePropertyElement.java
index d9e284ab705..d9e284ab705 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/StereotypePropertyElement.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/StereotypePropertyElement.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/StereotypePropertyFacetAttribute.java b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/StereotypePropertyFacetAttribute.java
index 79101204f41..79101204f41 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/StereotypePropertyFacetAttribute.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/StereotypePropertyFacetAttribute.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/StereotypePropertyFacetReference.java b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/StereotypePropertyFacetReference.java
index be33afc4371..be33afc4371 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/StereotypePropertyFacetReference.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/StereotypePropertyFacetReference.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/impl/ProfileFacetFactoryImpl.java b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/impl/ProfileFacetFactoryImpl.java
index 60fda9323de..60fda9323de 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/impl/ProfileFacetFactoryImpl.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/impl/ProfileFacetFactoryImpl.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/impl/ProfileFacetPackageImpl.java b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/impl/ProfileFacetPackageImpl.java
index 253ee7a226a..253ee7a226a 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/impl/ProfileFacetPackageImpl.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/impl/ProfileFacetPackageImpl.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/impl/ProfileFacetSetImpl.java b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/impl/ProfileFacetSetImpl.java
index 006cc119066..006cc119066 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/impl/ProfileFacetSetImpl.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/impl/ProfileFacetSetImpl.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/impl/StereotypeFacetImpl.java b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/impl/StereotypeFacetImpl.java
index 94939c180d3..94939c180d3 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/impl/StereotypeFacetImpl.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/impl/StereotypeFacetImpl.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/impl/StereotypePropertyElementImpl.java b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/impl/StereotypePropertyElementImpl.java
index 72f386fa7a5..72f386fa7a5 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/impl/StereotypePropertyElementImpl.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/impl/StereotypePropertyElementImpl.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/impl/StereotypePropertyFacetAttributeImpl.java b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/impl/StereotypePropertyFacetAttributeImpl.java
index 27628dca9fb..27628dca9fb 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/impl/StereotypePropertyFacetAttributeImpl.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/impl/StereotypePropertyFacetAttributeImpl.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/impl/StereotypePropertyFacetReferenceImpl.java b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/impl/StereotypePropertyFacetReferenceImpl.java
index 0c7ffd6a3cf..0c7ffd6a3cf 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/impl/StereotypePropertyFacetReferenceImpl.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/impl/StereotypePropertyFacetReferenceImpl.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/util/ProfileFacetAdapterFactory.java b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/util/ProfileFacetAdapterFactory.java
index 103e49eb0f1..103e49eb0f1 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/util/ProfileFacetAdapterFactory.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/util/ProfileFacetAdapterFactory.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/util/ProfileFacetSwitch.java b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/util/ProfileFacetSwitch.java
index c59438d91ae..c59438d91ae 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/util/ProfileFacetSwitch.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet.metamodel/src-gen/org/eclipse/papyrus/uml/profilefacet/metamodel/profilefacet/util/ProfileFacetSwitch.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/.classpath b/deprecated/org.eclipse.papyrus.uml.profilefacet/.classpath
index 8031177be12..8031177be12 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/.classpath
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/.classpath
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/.project b/deprecated/org.eclipse.papyrus.uml.profilefacet/.project
index ac03ef4651b..ac03ef4651b 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/.project
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/.project
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/.settings/org.eclipse.jdt.core.prefs b/deprecated/org.eclipse.papyrus.uml.profilefacet/.settings/org.eclipse.jdt.core.prefs
index 44217f8c068..44217f8c068 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/.settings/org.eclipse.jdt.core.prefs
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/META-INF/MANIFEST.MF b/deprecated/org.eclipse.papyrus.uml.profilefacet/META-INF/MANIFEST.MF
index d5ad030c71d..1a89f31de42 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/META-INF/MANIFEST.MF
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.0",

  org.eclipse.emf.facet.widgets.nattable.instance,

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

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

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

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

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

  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0"

diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/OSGI-INF/l10n/bundle.properties b/deprecated/org.eclipse.papyrus.uml.profilefacet/OSGI-INF/l10n/bundle.properties
index 75497b08193..75497b08193 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/OSGI-INF/l10n/bundle.properties
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/OSGI-INF/l10n/bundle.properties
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/about.html b/deprecated/org.eclipse.papyrus.uml.profilefacet/about.html
index 34ab520eed4..34ab520eed4 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.metamodel/about.html
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/about.html
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/build.properties b/deprecated/org.eclipse.papyrus.uml.profilefacet/build.properties
index 873b1f3d4d8..873b1f3d4d8 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/build.properties
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/build.properties
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/plugin.pdoc b/deprecated/org.eclipse.papyrus.uml.profilefacet/plugin.pdoc
index 7f68b8c1e49..7f68b8c1e49 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/plugin.pdoc
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/plugin.pdoc
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/plugin.xml b/deprecated/org.eclipse.papyrus.uml.profilefacet/plugin.xml
index b8b515f2c62..b8b515f2c62 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/plugin.xml
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/plugin.xml
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/resources/uml_stereotype_queries.querySet b/deprecated/org.eclipse.papyrus.uml.profilefacet/resources/uml_stereotype_queries.querySet
index 9dcc15672ad..9dcc15672ad 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/resources/uml_stereotype_queries.querySet
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/resources/uml_stereotype_queries.querySet
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/Activator.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/Activator.java
index bd900da8945..bd900da8945 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/Activator.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/Activator.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/advice/DeleteProfileFacetSetAdvice.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/advice/DeleteProfileFacetSetAdvice.java
index 7f890451ea6..7f890451ea6 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/advice/DeleteProfileFacetSetAdvice.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/advice/DeleteProfileFacetSetAdvice.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/controlmode/ProfileFacetSetControlParticipant.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/controlmode/ProfileFacetSetControlParticipant.java
index bec00a68b7b..bec00a68b7b 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/controlmode/ProfileFacetSetControlParticipant.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/controlmode/ProfileFacetSetControlParticipant.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/listener/ReapplyProfileTriggerListener.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/listener/ReapplyProfileTriggerListener.java
index 60fe4c5d8e0..60fe4c5d8e0 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/listener/ReapplyProfileTriggerListener.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/listener/ReapplyProfileTriggerListener.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/messages/Messages.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/messages/Messages.java
index 9a500d348e3..9a500d348e3 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/messages/Messages.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/messages/Messages.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/messages/messages.properties b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/messages/messages.properties
index c5b4918fa15..c5b4918fa15 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/messages/messages.properties
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/messages/messages.properties
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetBooleanMultiValue.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetBooleanMultiValue.java
index cd7ea447e37..cd7ea447e37 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetBooleanMultiValue.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetBooleanMultiValue.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetBooleanSingleValue.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetBooleanSingleValue.java
index 040cc853f79..040cc853f79 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetBooleanSingleValue.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetBooleanSingleValue.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetDatatypeMultiValue.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetDatatypeMultiValue.java
index aa7837e843a..aa7837e843a 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetDatatypeMultiValue.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetDatatypeMultiValue.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetDatatypeSingleValue.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetDatatypeSingleValue.java
index bd4c8f5cb3e..bd4c8f5cb3e 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetDatatypeSingleValue.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetDatatypeSingleValue.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetEObjectMultiReference.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetEObjectMultiReference.java
index 4e28941e9e8..4e28941e9e8 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetEObjectMultiReference.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetEObjectMultiReference.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetEObjectSingleReference.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetEObjectSingleReference.java
index 5c99cac1606..5c99cac1606 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetEObjectSingleReference.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetEObjectSingleReference.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetGenericMultiValue.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetGenericMultiValue.java
index f5d7d5fac11..f5d7d5fac11 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetGenericMultiValue.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetGenericMultiValue.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetGenericSingleValue.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetGenericSingleValue.java
index cd06b36c10d..cd06b36c10d 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetGenericSingleValue.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetGenericSingleValue.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetIntMultiValue.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetIntMultiValue.java
index 4ffbe2fc1d1..4ffbe2fc1d1 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetIntMultiValue.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetIntMultiValue.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetIntSingleValue.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetIntSingleValue.java
index c89af9653ae..c89af9653ae 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetIntSingleValue.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetIntSingleValue.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetPrimitiveTypeMultiValue.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetPrimitiveTypeMultiValue.java
index 2593587c6ab..2593587c6ab 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetPrimitiveTypeMultiValue.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetPrimitiveTypeMultiValue.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetPrimitiveTypeSingleValue.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetPrimitiveTypeSingleValue.java
index 85f9199e4b3..85f9199e4b3 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetPrimitiveTypeSingleValue.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetPrimitiveTypeSingleValue.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetRealMultiValue.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetRealMultiValue.java
index 47387465905..47387465905 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetRealMultiValue.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetRealMultiValue.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetRealSingleValue.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetRealSingleValue.java
index f979471e186..f979471e186 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetRealSingleValue.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetRealSingleValue.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetStringMultiValue.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetStringMultiValue.java
index 37c8818bbec..37c8818bbec 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetStringMultiValue.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetStringMultiValue.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetStringSingleValue.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetStringSingleValue.java
index 71e7ea9db67..71e7ea9db67 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetStringSingleValue.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetStringSingleValue.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetUMLEnumerationMultiValue.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetUMLEnumerationMultiValue.java
index d8c8b7d6a48..d8c8b7d6a48 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetUMLEnumerationMultiValue.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetUMLEnumerationMultiValue.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetUMLEnumerationSingleValue.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetUMLEnumerationSingleValue.java
index a51f417ce17..a51f417ce17 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetUMLEnumerationSingleValue.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetUMLEnumerationSingleValue.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetUnlimitedNaturalMultiValue.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetUnlimitedNaturalMultiValue.java
index b7870313589..b7870313589 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetUnlimitedNaturalMultiValue.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetUnlimitedNaturalMultiValue.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetUnlimitedNaturalSingleValue.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetUnlimitedNaturalSingleValue.java
index 5bfe0d2f4bf..5bfe0d2f4bf 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetUnlimitedNaturalSingleValue.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/getter/GetUnlimitedNaturalSingleValue.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/registry/QueryRegistry.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/registry/QueryRegistry.java
index 6abae052b4f..6abae052b4f 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/registry/QueryRegistry.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/registry/QueryRegistry.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetBooleanMultiValue.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetBooleanMultiValue.java
index eed77a249af..eed77a249af 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetBooleanMultiValue.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetBooleanMultiValue.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetBooleanSingleValue.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetBooleanSingleValue.java
index d2f1e65beb1..d2f1e65beb1 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetBooleanSingleValue.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetBooleanSingleValue.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetDatatypeMultiValue.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetDatatypeMultiValue.java
index 1d06e35c043..1d06e35c043 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetDatatypeMultiValue.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetDatatypeMultiValue.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetDatatypeSingleValue.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetDatatypeSingleValue.java
index abe30c874cb..abe30c874cb 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetDatatypeSingleValue.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetDatatypeSingleValue.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetEObjectMultiReference.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetEObjectMultiReference.java
index 407fadca449..407fadca449 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetEObjectMultiReference.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetEObjectMultiReference.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetEObjectSingleReference.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetEObjectSingleReference.java
index f80f51ab346..f80f51ab346 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetEObjectSingleReference.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetEObjectSingleReference.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetGenericMultiValue.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetGenericMultiValue.java
index 3385d558b87..3385d558b87 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetGenericMultiValue.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetGenericMultiValue.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetGenericSingleValue.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetGenericSingleValue.java
index f85709b9730..f85709b9730 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetGenericSingleValue.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetGenericSingleValue.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetIntMultiValue.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetIntMultiValue.java
index 7c8d659d0e8..7c8d659d0e8 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetIntMultiValue.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetIntMultiValue.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetIntSingleValue.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetIntSingleValue.java
index a24f3582391..a24f3582391 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetIntSingleValue.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetIntSingleValue.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetPrimitiveTypeMultiValue.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetPrimitiveTypeMultiValue.java
index 3fb1716e709..3fb1716e709 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetPrimitiveTypeMultiValue.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetPrimitiveTypeMultiValue.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetPrimitiveTypeSingleValue.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetPrimitiveTypeSingleValue.java
index 2553d413936..2553d413936 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetPrimitiveTypeSingleValue.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetPrimitiveTypeSingleValue.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetRealMultiValue.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetRealMultiValue.java
index 45313508b2b..45313508b2b 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetRealMultiValue.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetRealMultiValue.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetRealSingleValue.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetRealSingleValue.java
index e5f202e753d..e5f202e753d 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetRealSingleValue.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetRealSingleValue.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetStringMultiValue.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetStringMultiValue.java
index 9ff244769e1..9ff244769e1 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetStringMultiValue.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetStringMultiValue.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetStringSingleValue.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetStringSingleValue.java
index 6c4a8254131..6c4a8254131 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetStringSingleValue.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetStringSingleValue.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetUMLEnumerationMultiValue.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetUMLEnumerationMultiValue.java
index 954f0e96628..954f0e96628 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetUMLEnumerationMultiValue.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetUMLEnumerationMultiValue.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetUMLEnumerationSingleValue.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetUMLEnumerationSingleValue.java
index 53cd9df2e19..53cd9df2e19 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetUMLEnumerationSingleValue.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetUMLEnumerationSingleValue.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetUnlimitedNaturalMultiValue.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetUnlimitedNaturalMultiValue.java
index 35745fbedac..35745fbedac 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetUnlimitedNaturalMultiValue.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetUnlimitedNaturalMultiValue.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetUnlimitedNaturalSingleValue.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetUnlimitedNaturalSingleValue.java
index fca13676106..fca13676106 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetUnlimitedNaturalSingleValue.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/setter/SetUnlimitedNaturalSingleValue.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/tester/IsAppliedRequiredStereotype.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/tester/IsAppliedRequiredStereotype.java
index 294b12f4031..294b12f4031 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/tester/IsAppliedRequiredStereotype.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/queries/tester/IsAppliedRequiredStereotype.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/utils/AdditionalContentsUtils.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/utils/AdditionalContentsUtils.java
index d476ed0aea8..d476ed0aea8 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/utils/AdditionalContentsUtils.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/utils/AdditionalContentsUtils.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/utils/ArgumentUtils.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/utils/ArgumentUtils.java
index 0bd18765c6f..0bd18765c6f 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/utils/ArgumentUtils.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/utils/ArgumentUtils.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/utils/ModelQuerySetUtil.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/utils/ModelQuerySetUtil.java
index 3d91238f683..3d91238f683 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/utils/ModelQuerySetUtil.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/utils/ModelQuerySetUtil.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/utils/ProfileFacetSetDestroyer.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/utils/ProfileFacetSetDestroyer.java
index 4cffad68a4f..4cffad68a4f 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/utils/ProfileFacetSetDestroyer.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/utils/ProfileFacetSetDestroyer.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/utils/ProfileFacetSetMoveHelper.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/utils/ProfileFacetSetMoveHelper.java
index d98dcf83666..d98dcf83666 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/utils/ProfileFacetSetMoveHelper.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/utils/ProfileFacetSetMoveHelper.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/utils/ProfileFacetSetUpdater.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/utils/ProfileFacetSetUpdater.java
index 517833a45e5..517833a45e5 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/utils/ProfileFacetSetUpdater.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/utils/ProfileFacetSetUpdater.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/utils/StereotypePropertyUtils.java b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/utils/StereotypePropertyUtils.java
index 8fbf0fd4916..8fbf0fd4916 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/utils/StereotypePropertyUtils.java
+++ b/deprecated/org.eclipse.papyrus.uml.profilefacet/src/org/eclipse/papyrus/uml/profilefacet/utils/StereotypePropertyUtils.java
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/.classpath b/deprecated/org.eclipse.papyrus.uml.table.common/.classpath
index 058117a6391..058117a6391 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/.classpath
+++ b/deprecated/org.eclipse.papyrus.uml.table.common/.classpath
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/.project b/deprecated/org.eclipse.papyrus.uml.table.common/.project
index 7fee8904a11..7fee8904a11 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/.project
+++ b/deprecated/org.eclipse.papyrus.uml.table.common/.project
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.generation/.settings/org.eclipse.jdt.core.prefs b/deprecated/org.eclipse.papyrus.uml.table.common/.settings/org.eclipse.jdt.core.prefs
index 44217f8c068..44217f8c068 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.generation/.settings/org.eclipse.jdt.core.prefs
+++ b/deprecated/org.eclipse.papyrus.uml.table.common/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/META-INF/MANIFEST.MF b/deprecated/org.eclipse.papyrus.uml.table.common/META-INF/MANIFEST.MF
index 8082aab0da1..8082aab0da1 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/META-INF/MANIFEST.MF
+++ b/deprecated/org.eclipse.papyrus.uml.table.common/META-INF/MANIFEST.MF
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/OSGI-INF/l10n/bundle.properties b/deprecated/org.eclipse.papyrus.uml.table.common/OSGI-INF/l10n/bundle.properties
index f207b1e9cc5..f207b1e9cc5 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/OSGI-INF/l10n/bundle.properties
+++ b/deprecated/org.eclipse.papyrus.uml.table.common/OSGI-INF/l10n/bundle.properties
diff --git a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/about.html b/deprecated/org.eclipse.papyrus.uml.table.common/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/about.html
+++ b/deprecated/org.eclipse.papyrus.uml.table.common/about.html
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/build.properties b/deprecated/org.eclipse.papyrus.uml.table.common/build.properties
index 7602c3aec3e..7602c3aec3e 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/build.properties
+++ b/deprecated/org.eclipse.papyrus.uml.table.common/build.properties
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/plugin.pdoc b/deprecated/org.eclipse.papyrus.uml.table.common/plugin.pdoc
index 6a720e9b804..6a720e9b804 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/plugin.pdoc
+++ b/deprecated/org.eclipse.papyrus.uml.table.common/plugin.pdoc
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/plugin.xml b/deprecated/org.eclipse.papyrus.uml.table.common/plugin.xml
index 0491e4d2b4c..0491e4d2b4c 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/plugin.xml
+++ b/deprecated/org.eclipse.papyrus.uml.table.common/plugin.xml
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/Activator.java b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/Activator.java
index 314bcc1b09a..314bcc1b09a 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/Activator.java
+++ b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/Activator.java
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/dialog/ColumnsToShowDialog.java b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/dialog/ColumnsToShowDialog.java
index 07c1126c4c4..07c1126c4c4 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/dialog/ColumnsToShowDialog.java
+++ b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/dialog/ColumnsToShowDialog.java
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/editor/AbstractUMLTableEditor.java b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/editor/AbstractUMLTableEditor.java
index a979e9f0a77..a979e9f0a77 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/editor/AbstractUMLTableEditor.java
+++ b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/editor/AbstractUMLTableEditor.java
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/factory/PapyrusTableInstanceCommandFactory.java b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/factory/PapyrusTableInstanceCommandFactory.java
index f82beb8c7ee..f82beb8c7ee 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/factory/PapyrusTableInstanceCommandFactory.java
+++ b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/factory/PapyrusTableInstanceCommandFactory.java
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/handler/PasteInTableHandler.java b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/handler/PasteInTableHandler.java
index 5f8c4cd3b4b..5f8c4cd3b4b 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/handler/PasteInTableHandler.java
+++ b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/handler/PasteInTableHandler.java
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/handler/SelectAdditionColumnsPopupUpHandler.java b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/handler/SelectAdditionColumnsPopupUpHandler.java
index 47f269cb620..47f269cb620 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/handler/SelectAdditionColumnsPopupUpHandler.java
+++ b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/handler/SelectAdditionColumnsPopupUpHandler.java
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/handler/SelectColumnsHandler.java b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/handler/SelectColumnsHandler.java
index 9a8ced5cd01..9a8ced5cd01 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/handler/SelectColumnsHandler.java
+++ b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/handler/SelectColumnsHandler.java
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/listener/ApplyProfileTriggerListener.java b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/listener/ApplyProfileTriggerListener.java
index 1ce7d7923c9..1ce7d7923c9 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/listener/ApplyProfileTriggerListener.java
+++ b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/listener/ApplyProfileTriggerListener.java
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/menu/ContributionFactory.java b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/menu/ContributionFactory.java
index 66f424f0783..66f424f0783 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/menu/ContributionFactory.java
+++ b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/menu/ContributionFactory.java
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/messages/Messages.java b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/messages/Messages.java
index 42eb095a310..42eb095a310 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/messages/Messages.java
+++ b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/messages/Messages.java
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/messages/messages.properties b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/messages/messages.properties
index 957725b7cad..957725b7cad 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/messages/messages.properties
+++ b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/messages/messages.properties
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/provider/AbstractAdditionalContentsProvider.java b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/provider/AbstractAdditionalContentsProvider.java
index d5b5d476eee..d5b5d476eee 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/provider/AbstractAdditionalContentsProvider.java
+++ b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/provider/AbstractAdditionalContentsProvider.java
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/provider/AbstractPasteInTableCommandProvider.java b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/provider/AbstractPasteInTableCommandProvider.java
index 9db7cdeafea..9db7cdeafea 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/provider/AbstractPasteInTableCommandProvider.java
+++ b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/provider/AbstractPasteInTableCommandProvider.java
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/provider/EMFFacetColumnsProvider.java b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/provider/EMFFacetColumnsProvider.java
index 6486489e4d7..6486489e4d7 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/provider/EMFFacetColumnsProvider.java
+++ b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/provider/EMFFacetColumnsProvider.java
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/provider/IPasteInTableCommandProvider.java b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/provider/IPasteInTableCommandProvider.java
index c32b98ee7f8..c32b98ee7f8 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/provider/IPasteInTableCommandProvider.java
+++ b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/provider/IPasteInTableCommandProvider.java
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/provider/PasteInPapyrusTableCommandProvider.java b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/provider/PasteInPapyrusTableCommandProvider.java
index 2e41ae25736..2e41ae25736 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/provider/PasteInPapyrusTableCommandProvider.java
+++ b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/provider/PasteInPapyrusTableCommandProvider.java
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/provider/ProfileFacetSetProvider.java b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/provider/ProfileFacetSetProvider.java
index 8bf2cee9eec..8bf2cee9eec 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/provider/ProfileFacetSetProvider.java
+++ b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/provider/ProfileFacetSetProvider.java
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/provider/SortedFeaturesContentProvider.java b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/provider/SortedFeaturesContentProvider.java
index 5e7bbd835c7..5e7bbd835c7 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/provider/SortedFeaturesContentProvider.java
+++ b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/provider/SortedFeaturesContentProvider.java
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/provider/UMLTablePropertyTester.java b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/provider/UMLTablePropertyTester.java
index 93e289d39bc..d7c4ae0a94c 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/provider/UMLTablePropertyTester.java
+++ b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/provider/UMLTablePropertyTester.java
@@ -18,6 +18,7 @@ import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;
 import org.eclipse.papyrus.uml.table.common.editor.AbstractUMLTableEditor;

 import org.eclipse.ui.IEditorPart;

 import org.eclipse.ui.IWorkbenchPart;

+import org.eclipse.ui.IWorkbenchWindow;

 import org.eclipse.ui.PlatformUI;

 

 

@@ -26,7 +27,12 @@ public class UMLTablePropertyTester extends PropertyTester {
 	private static final String IS_UML_TABLE = "isUMLTable"; //$NON-NLS-1$

 

 	public boolean test(final Object receiver, final String property, final Object[] args, final Object expectedValue) {

-		final IWorkbenchPart activePart = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart();

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

+		if(activeWindow == null || activeWindow.getActivePage() == null) {

+			return false;

+		}

+

+		final IWorkbenchPart activePart = activeWindow.getActivePage().getActivePart();

 		if(IS_UML_TABLE.equals(property) && activePart instanceof IMultiDiagramEditor) {

 			final IEditorPart editor = ((IMultiDiagramEditor)activePart).getActiveEditor();

 			return expectedValue.equals(new Boolean(editor instanceof AbstractUMLTableEditor));

diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/status/AbstractWarningPasteResultStatus.java b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/status/AbstractWarningPasteResultStatus.java
index 221e9dfb72d..221e9dfb72d 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/status/AbstractWarningPasteResultStatus.java
+++ b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/status/AbstractWarningPasteResultStatus.java
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/status/PasteWarningStatus.java b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/status/PasteWarningStatus.java
index f0f78e7cee4..f0f78e7cee4 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/status/PasteWarningStatus.java
+++ b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/status/PasteWarningStatus.java
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/status/StereotypeApplicationErrorStatus.java b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/status/StereotypeApplicationErrorStatus.java
index 2394199b43d..2394199b43d 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/status/StereotypeApplicationErrorStatus.java
+++ b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/status/StereotypeApplicationErrorStatus.java
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/status/UnresolvedReferenceErrorInPasteStatus.java b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/status/UnresolvedReferenceErrorInPasteStatus.java
index fbe77374f34..fbe77374f34 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/status/UnresolvedReferenceErrorInPasteStatus.java
+++ b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/status/UnresolvedReferenceErrorInPasteStatus.java
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/utils/MultiValueContainer.java b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/utils/MultiValueContainer.java
index bab41e10e98..bab41e10e98 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/utils/MultiValueContainer.java
+++ b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/utils/MultiValueContainer.java
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/utils/ValueContainer.java b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/utils/ValueContainer.java
index c3816a5f197..c3816a5f197 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/utils/ValueContainer.java
+++ b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/utils/ValueContainer.java
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/widget/FilteredCheckboxTree.java b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/widget/FilteredCheckboxTree.java
index 29bd57762b0..29bd57762b0 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/widget/FilteredCheckboxTree.java
+++ b/deprecated/org.eclipse.papyrus.uml.table.common/src/org/eclipse/papyrus/uml/table/common/widget/FilteredCheckboxTree.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/.classpath b/deprecated/org.eclipse.papyrus.uml.table.default/.classpath
index 2d1a4302f04..2d1a4302f04 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/.classpath
+++ b/deprecated/org.eclipse.papyrus.uml.table.default/.classpath
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.default/.project b/deprecated/org.eclipse.papyrus.uml.table.default/.project
index 9d38ffd9417..9d38ffd9417 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.default/.project
+++ b/deprecated/org.eclipse.papyrus.uml.table.default/.project
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.default/.settings/org.eclipse.jdt.core.prefs b/deprecated/org.eclipse.papyrus.uml.table.default/.settings/org.eclipse.jdt.core.prefs
index 7dc5fb2632c..7dc5fb2632c 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.default/.settings/org.eclipse.jdt.core.prefs
+++ b/deprecated/org.eclipse.papyrus.uml.table.default/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.default/META-INF/MANIFEST.MF b/deprecated/org.eclipse.papyrus.uml.table.default/META-INF/MANIFEST.MF
index bf9eca4e4bf..bf9eca4e4bf 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.default/META-INF/MANIFEST.MF
+++ b/deprecated/org.eclipse.papyrus.uml.table.default/META-INF/MANIFEST.MF
diff --git a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/about.html b/deprecated/org.eclipse.papyrus.uml.table.default/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/about.html
+++ b/deprecated/org.eclipse.papyrus.uml.table.default/about.html
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.default/build.properties b/deprecated/org.eclipse.papyrus.uml.table.default/build.properties
index 58db1c21f49..58db1c21f49 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.default/build.properties
+++ b/deprecated/org.eclipse.papyrus.uml.table.default/build.properties
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.default/icons/table.gif b/deprecated/org.eclipse.papyrus.uml.table.default/icons/table.gif
index 4c9048708b0..4c9048708b0 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.default/icons/table.gif
+++ b/deprecated/org.eclipse.papyrus.uml.table.default/icons/table.gif
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.default/icons/table.png b/deprecated/org.eclipse.papyrus.uml.table.default/icons/table.png
index 2a979527f4a..2a979527f4a 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.default/icons/table.png
+++ b/deprecated/org.eclipse.papyrus.uml.table.default/icons/table.png
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.default/icons/table_UML_default.gif b/deprecated/org.eclipse.papyrus.uml.table.default/icons/table_UML_default.gif
index 7dba0a044de..7dba0a044de 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.default/icons/table_UML_default.gif
+++ b/deprecated/org.eclipse.papyrus.uml.table.default/icons/table_UML_default.gif
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.default/icons/table_UML_default.png b/deprecated/org.eclipse.papyrus.uml.table.default/icons/table_UML_default.png
index 4bec73c4147..4bec73c4147 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.default/icons/table_UML_default.png
+++ b/deprecated/org.eclipse.papyrus.uml.table.default/icons/table_UML_default.png
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.default/plugin.properties b/deprecated/org.eclipse.papyrus.uml.table.default/plugin.properties
index fe62ba45c8b..fe62ba45c8b 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.default/plugin.properties
+++ b/deprecated/org.eclipse.papyrus.uml.table.default/plugin.properties
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.default/plugin.xml b/deprecated/org.eclipse.papyrus.uml.table.default/plugin.xml
index 5584625c329..5584625c329 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.default/plugin.xml
+++ b/deprecated/org.eclipse.papyrus.uml.table.default/plugin.xml
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.default/resources/default.tableconfiguration2 b/deprecated/org.eclipse.papyrus.uml.table.default/resources/default.tableconfiguration2
index 36619b4a402..36619b4a402 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.default/resources/default.tableconfiguration2
+++ b/deprecated/org.eclipse.papyrus.uml.table.default/resources/default.tableconfiguration2
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.default/src/org/eclipse/papyrus/uml/table/defaultt/Activator.java b/deprecated/org.eclipse.papyrus.uml.table.default/src/org/eclipse/papyrus/uml/table/defaultt/Activator.java
index 62a73a257dc..62a73a257dc 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.default/src/org/eclipse/papyrus/uml/table/defaultt/Activator.java
+++ b/deprecated/org.eclipse.papyrus.uml.table.default/src/org/eclipse/papyrus/uml/table/defaultt/Activator.java
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.default/src/org/eclipse/papyrus/uml/table/defaultt/editor/DefaultNattableEditor.java b/deprecated/org.eclipse.papyrus.uml.table.default/src/org/eclipse/papyrus/uml/table/defaultt/editor/DefaultNattableEditor.java
index e7ef60c558a..e7ef60c558a 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.default/src/org/eclipse/papyrus/uml/table/defaultt/editor/DefaultNattableEditor.java
+++ b/deprecated/org.eclipse.papyrus.uml.table.default/src/org/eclipse/papyrus/uml/table/defaultt/editor/DefaultNattableEditor.java
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.default/src/org/eclipse/papyrus/uml/table/defaultt/factory/NattableEditorFactory.java b/deprecated/org.eclipse.papyrus.uml.table.default/src/org/eclipse/papyrus/uml/table/defaultt/factory/NattableEditorFactory.java
index 686cade560a..686cade560a 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.default/src/org/eclipse/papyrus/uml/table/defaultt/factory/NattableEditorFactory.java
+++ b/deprecated/org.eclipse.papyrus.uml.table.default/src/org/eclipse/papyrus/uml/table/defaultt/factory/NattableEditorFactory.java
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.default/src/org/eclipse/papyrus/uml/table/defaultt/handlers/CreateNattableEditorCommand.java b/deprecated/org.eclipse.papyrus.uml.table.default/src/org/eclipse/papyrus/uml/table/defaultt/handlers/CreateNattableEditorCommand.java
index cd5ebf2f753..cd5ebf2f753 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.default/src/org/eclipse/papyrus/uml/table/defaultt/handlers/CreateNattableEditorCommand.java
+++ b/deprecated/org.eclipse.papyrus.uml.table.default/src/org/eclipse/papyrus/uml/table/defaultt/handlers/CreateNattableEditorCommand.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.generation/.classpath b/deprecated/org.eclipse.papyrus.uml.table.widgets.celleditors/.classpath
index 2d1a4302f04..2d1a4302f04 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.generation/.classpath
+++ b/deprecated/org.eclipse.papyrus.uml.table.widgets.celleditors/.classpath
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/.project b/deprecated/org.eclipse.papyrus.uml.table.widgets.celleditors/.project
index c94ccff2566..c94ccff2566 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/.project
+++ b/deprecated/org.eclipse.papyrus.uml.table.widgets.celleditors/.project
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/.settings/org.eclipse.jdt.core.prefs b/deprecated/org.eclipse.papyrus.uml.table.widgets.celleditors/.settings/org.eclipse.jdt.core.prefs
index 945dfdfa7d8..945dfdfa7d8 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/.settings/org.eclipse.jdt.core.prefs
+++ b/deprecated/org.eclipse.papyrus.uml.table.widgets.celleditors/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/META-INF/MANIFEST.MF b/deprecated/org.eclipse.papyrus.uml.table.widgets.celleditors/META-INF/MANIFEST.MF
index ff99f85367e..ff99f85367e 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/META-INF/MANIFEST.MF
+++ b/deprecated/org.eclipse.papyrus.uml.table.widgets.celleditors/META-INF/MANIFEST.MF
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/about.html b/deprecated/org.eclipse.papyrus.uml.table.widgets.celleditors/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/about.html
+++ b/deprecated/org.eclipse.papyrus.uml.table.widgets.celleditors/about.html
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/build.properties b/deprecated/org.eclipse.papyrus.uml.table.widgets.celleditors/build.properties
index 5674ff81066..5674ff81066 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/build.properties
+++ b/deprecated/org.eclipse.papyrus.uml.table.widgets.celleditors/build.properties
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/plugin.properties b/deprecated/org.eclipse.papyrus.uml.table.widgets.celleditors/plugin.properties
index d470be8f4fa..d470be8f4fa 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/plugin.properties
+++ b/deprecated/org.eclipse.papyrus.uml.table.widgets.celleditors/plugin.properties
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/plugin.xml b/deprecated/org.eclipse.papyrus.uml.table.widgets.celleditors/plugin.xml
index d6997f190f0..d6997f190f0 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/plugin.xml
+++ b/deprecated/org.eclipse.papyrus.uml.table.widgets.celleditors/plugin.xml
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/resources/umlCellEditors.modelcelleditors b/deprecated/org.eclipse.papyrus.uml.table.widgets.celleditors/resources/umlCellEditors.modelcelleditors
index 68ecb177710..68ecb177710 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/resources/umlCellEditors.modelcelleditors
+++ b/deprecated/org.eclipse.papyrus.uml.table.widgets.celleditors/resources/umlCellEditors.modelcelleditors
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/Activator.java b/deprecated/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/Activator.java
index ccae3aecc76..ccae3aecc76 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/Activator.java
+++ b/deprecated/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/Activator.java
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/composite/EnumComposite.java b/deprecated/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/composite/EnumComposite.java
index 3f81fbe565a..3f81fbe565a 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/composite/EnumComposite.java
+++ b/deprecated/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/composite/EnumComposite.java
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/composite/EnumerationComposite.java b/deprecated/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/composite/EnumerationComposite.java
index c64fdb37fca..c64fdb37fca 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/composite/EnumerationComposite.java
+++ b/deprecated/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/composite/EnumerationComposite.java
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/composite/PapyrusEnumeratorComposite.java b/deprecated/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/composite/PapyrusEnumeratorComposite.java
index 0377bada669..0377bada669 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/composite/PapyrusEnumeratorComposite.java
+++ b/deprecated/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/composite/PapyrusEnumeratorComposite.java
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/composite/UnaryReferencePapyrusCellEditorComposite.java b/deprecated/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/composite/UnaryReferencePapyrusCellEditorComposite.java
index 9b90f50877f..9b90f50877f 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/composite/UnaryReferencePapyrusCellEditorComposite.java
+++ b/deprecated/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/composite/UnaryReferencePapyrusCellEditorComposite.java
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/editors/BooleanCellEditor.java b/deprecated/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/editors/BooleanCellEditor.java
index 3731a1921a8..3731a1921a8 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/editors/BooleanCellEditor.java
+++ b/deprecated/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/editors/BooleanCellEditor.java
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/editors/EnumerationLiteralCellEditor.java b/deprecated/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/editors/EnumerationLiteralCellEditor.java
index bd14a5aa810..bd14a5aa810 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/editors/EnumerationLiteralCellEditor.java
+++ b/deprecated/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/editors/EnumerationLiteralCellEditor.java
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/editors/EnumeratorEditor.java b/deprecated/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/editors/EnumeratorEditor.java
index 144e0a8d537..144e0a8d537 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/editors/EnumeratorEditor.java
+++ b/deprecated/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/editors/EnumeratorEditor.java
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/editors/IntCellEditor.java b/deprecated/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/editors/IntCellEditor.java
index 93579c68e73..93579c68e73 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/editors/IntCellEditor.java
+++ b/deprecated/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/editors/IntCellEditor.java
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/editors/LiteralUnlimitedNaturalCellEditor.java b/deprecated/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/editors/LiteralUnlimitedNaturalCellEditor.java
index 54ed998f99d..54ed998f99d 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/editors/LiteralUnlimitedNaturalCellEditor.java
+++ b/deprecated/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/editors/LiteralUnlimitedNaturalCellEditor.java
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/editors/NaryReferencePapyrusCellEditor.java b/deprecated/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/editors/NaryReferencePapyrusCellEditor.java
index 9cc1063f794..9cc1063f794 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/editors/NaryReferencePapyrusCellEditor.java
+++ b/deprecated/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/editors/NaryReferencePapyrusCellEditor.java
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/editors/StringMultiCellEditor.java b/deprecated/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/editors/StringMultiCellEditor.java
index 2653a9766d6..2653a9766d6 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/editors/StringMultiCellEditor.java
+++ b/deprecated/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/editors/StringMultiCellEditor.java
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/editors/UnaryReferencePapyrusCellEditor.java b/deprecated/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/editors/UnaryReferencePapyrusCellEditor.java
index 23e775aa274..23e775aa274 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/editors/UnaryReferencePapyrusCellEditor.java
+++ b/deprecated/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/editors/UnaryReferencePapyrusCellEditor.java
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/utils/NoReferencedElement.java b/deprecated/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/utils/NoReferencedElement.java
index a2f0d7ab48e..a2f0d7ab48e 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/utils/NoReferencedElement.java
+++ b/deprecated/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/utils/NoReferencedElement.java
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/utils/StereotypePropertyFacetElementUtils.java b/deprecated/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/utils/StereotypePropertyFacetElementUtils.java
index 4e5dfea8c77..4e5dfea8c77 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/utils/StereotypePropertyFacetElementUtils.java
+++ b/deprecated/org.eclipse.papyrus.uml.table.widgets.celleditors/src/org/eclipse/papyrus/uml/table/widget/celleditors/utils/StereotypePropertyFacetElementUtils.java
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.table.feature/.project b/deprecated/papyrus-main-features/org.eclipse.papyrus.uml.table.feature/.project
index bd485ca4a46..bd485ca4a46 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.table.feature/.project
+++ b/deprecated/papyrus-main-features/org.eclipse.papyrus.uml.table.feature/.project
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.table.feature/build.properties b/deprecated/papyrus-main-features/org.eclipse.papyrus.uml.table.feature/build.properties
index 128baaa4d3b..128baaa4d3b 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.table.feature/build.properties
+++ b/deprecated/papyrus-main-features/org.eclipse.papyrus.uml.table.feature/build.properties
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.uml.diagram.css.feature/epl-v10.html b/deprecated/papyrus-main-features/org.eclipse.papyrus.uml.table.feature/epl-v10.html
index cb1073a4bad..cb1073a4bad 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.uml.diagram.css.feature/epl-v10.html
+++ b/deprecated/papyrus-main-features/org.eclipse.papyrus.uml.table.feature/epl-v10.html
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.table.feature/feature.properties b/deprecated/papyrus-main-features/org.eclipse.papyrus.uml.table.feature/feature.properties
index 8eac1d889cd..8eac1d889cd 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.table.feature/feature.properties
+++ b/deprecated/papyrus-main-features/org.eclipse.papyrus.uml.table.feature/feature.properties
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.table.feature/feature.xml b/deprecated/papyrus-main-features/org.eclipse.papyrus.uml.table.feature/feature.xml
index 3e0ca227246..3e0ca227246 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.table.feature/feature.xml
+++ b/deprecated/papyrus-main-features/org.eclipse.papyrus.uml.table.feature/feature.xml
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.uml.diagram.css.feature/license.html b/deprecated/papyrus-main-features/org.eclipse.papyrus.uml.table.feature/license.html
index f19c483b9c8..f19c483b9c8 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.uml.diagram.css.feature/license.html
+++ b/deprecated/papyrus-main-features/org.eclipse.papyrus.uml.table.feature/license.html
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.default/.classpath b/deprecated/profilefacet/org.eclipse.papyrus.uml.profilefacet.generation/.classpath
index 2d1a4302f04..2d1a4302f04 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.default/.classpath
+++ b/deprecated/profilefacet/org.eclipse.papyrus.uml.profilefacet.generation/.classpath
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.generation/.project b/deprecated/profilefacet/org.eclipse.papyrus.uml.profilefacet.generation/.project
index 09d4b80b940..09d4b80b940 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.generation/.project
+++ b/deprecated/profilefacet/org.eclipse.papyrus.uml.profilefacet.generation/.project
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/.settings/org.eclipse.jdt.core.prefs b/deprecated/profilefacet/org.eclipse.papyrus.uml.profilefacet.generation/.settings/org.eclipse.jdt.core.prefs
index 44217f8c068..44217f8c068 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/.settings/org.eclipse.jdt.core.prefs
+++ b/deprecated/profilefacet/org.eclipse.papyrus.uml.profilefacet.generation/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.generation/META-INF/MANIFEST.MF b/deprecated/profilefacet/org.eclipse.papyrus.uml.profilefacet.generation/META-INF/MANIFEST.MF
index a2b04b09e46..a2b04b09e46 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.generation/META-INF/MANIFEST.MF
+++ b/deprecated/profilefacet/org.eclipse.papyrus.uml.profilefacet.generation/META-INF/MANIFEST.MF
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.generation/OSGI-INF/l10n/bundle.properties b/deprecated/profilefacet/org.eclipse.papyrus.uml.profilefacet.generation/OSGI-INF/l10n/bundle.properties
index 3acb2dcd43e..3acb2dcd43e 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.generation/OSGI-INF/l10n/bundle.properties
+++ b/deprecated/profilefacet/org.eclipse.papyrus.uml.profilefacet.generation/OSGI-INF/l10n/bundle.properties
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/about.html b/deprecated/profilefacet/org.eclipse.papyrus.uml.profilefacet.generation/about.html
index 34ab520eed4..34ab520eed4 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet/about.html
+++ b/deprecated/profilefacet/org.eclipse.papyrus.uml.profilefacet.generation/about.html
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.generation/build.properties b/deprecated/profilefacet/org.eclipse.papyrus.uml.profilefacet.generation/build.properties
index ceacf492bf7..ceacf492bf7 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.generation/build.properties
+++ b/deprecated/profilefacet/org.eclipse.papyrus.uml.profilefacet.generation/build.properties
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.generation/plugin.pdoc b/deprecated/profilefacet/org.eclipse.papyrus.uml.profilefacet.generation/plugin.pdoc
index 8d5b69da5d7..8d5b69da5d7 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.generation/plugin.pdoc
+++ b/deprecated/profilefacet/org.eclipse.papyrus.uml.profilefacet.generation/plugin.pdoc
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.generation/src/org/eclipse/papyrus/uml/profilefacet/generation/Activator.java b/deprecated/profilefacet/org.eclipse.papyrus.uml.profilefacet.generation/src/org/eclipse/papyrus/uml/profilefacet/generation/Activator.java
index ab8c3e9559f..ab8c3e9559f 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.generation/src/org/eclipse/papyrus/uml/profilefacet/generation/Activator.java
+++ b/deprecated/profilefacet/org.eclipse.papyrus.uml.profilefacet.generation/src/org/eclipse/papyrus/uml/profilefacet/generation/Activator.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.generation/src/org/eclipse/papyrus/uml/profilefacet/generation/factory/ProfileFacetGenericFactory.java b/deprecated/profilefacet/org.eclipse.papyrus.uml.profilefacet.generation/src/org/eclipse/papyrus/uml/profilefacet/generation/factory/ProfileFacetGenericFactory.java
index a7da783ece4..a7da783ece4 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.generation/src/org/eclipse/papyrus/uml/profilefacet/generation/factory/ProfileFacetGenericFactory.java
+++ b/deprecated/profilefacet/org.eclipse.papyrus.uml.profilefacet.generation/src/org/eclipse/papyrus/uml/profilefacet/generation/factory/ProfileFacetGenericFactory.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.generation/src/org/eclipse/papyrus/uml/profilefacet/generation/messages/Messages.java b/deprecated/profilefacet/org.eclipse.papyrus.uml.profilefacet.generation/src/org/eclipse/papyrus/uml/profilefacet/generation/messages/Messages.java
index c7a50777ac3..c7a50777ac3 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.generation/src/org/eclipse/papyrus/uml/profilefacet/generation/messages/Messages.java
+++ b/deprecated/profilefacet/org.eclipse.papyrus.uml.profilefacet.generation/src/org/eclipse/papyrus/uml/profilefacet/generation/messages/Messages.java
diff --git a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.generation/src/org/eclipse/papyrus/uml/profilefacet/generation/messages/messages.properties b/deprecated/profilefacet/org.eclipse.papyrus.uml.profilefacet.generation/src/org/eclipse/papyrus/uml/profilefacet/generation/messages/messages.properties
index 32a641cbf08..32a641cbf08 100644
--- a/plugins/uml/profilefacet/org.eclipse.papyrus.uml.profilefacet.generation/src/org/eclipse/papyrus/uml/profilefacet/generation/messages/messages.properties
+++ b/deprecated/profilefacet/org.eclipse.papyrus.uml.profilefacet.generation/src/org/eclipse/papyrus/uml/profilefacet/generation/messages/messages.properties
diff --git a/doc/DevelopperDocuments/extraplugins/ADL4eclipse/docs/ADL4EclipseDevelopperDoc.docx b/doc/DevelopperDocuments/extraplugins/ADL4eclipse/docs/ADL4EclipseDevelopperDoc.docx
index abda766ff83..48591d02f44 100644
--- a/doc/DevelopperDocuments/extraplugins/ADL4eclipse/docs/ADL4EclipseDevelopperDoc.docx
+++ b/doc/DevelopperDocuments/extraplugins/ADL4eclipse/docs/ADL4EclipseDevelopperDoc.docx
diff --git a/doc/DevelopperDocuments/extraplugins/ADL4eclipse/model/adl4eclipse.notation b/doc/DevelopperDocuments/extraplugins/ADL4eclipse/model/adl4eclipse.notation
index 7eb1128e74b..52f269a7ee3 100644
--- a/doc/DevelopperDocuments/extraplugins/ADL4eclipse/model/adl4eclipse.notation
+++ b/doc/DevelopperDocuments/extraplugins/ADL4eclipse/model/adl4eclipse.notation
@@ -36,7 +36,7 @@
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZJQ2gg74EeORvsuYlq1ltw"/>

           </children>

           <element xmi:type="uml:UseCase" href="adl4eclipse.uml#_ZHCB4A74EeORvsuYlq1ltw"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZINtoQ74EeORvsuYlq1ltw" x="170" y="32"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZINtoQ74EeORvsuYlq1ltw" x="194" y="32"/>

         </children>

         <children xmi:type="notation:Shape" xmi:id="_bUzhAA74EeORvsuYlq1ltw" type="3009" fillColor="8454016">

           <children xmi:type="notation:DecorationNode" xmi:id="_bUzhAg74EeORvsuYlq1ltw" type="5018"/>

@@ -87,7 +87,7 @@
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gUqtQg74EeORvsuYlq1ltw"/>

           </children>

           <element xmi:type="uml:UseCase" href="adl4eclipse.uml#_gToLcA74EeORvsuYlq1ltw"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gT7GYQ74EeORvsuYlq1ltw" x="165" y="367"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gT7GYQ74EeORvsuYlq1ltw" x="186" y="367"/>

         </children>

         <children xmi:type="notation:Shape" xmi:id="_kBqjcA74EeORvsuYlq1ltw" type="3009" fillColor="8454016">

           <children xmi:type="notation:DecorationNode" xmi:id="_kBqjcg74EeORvsuYlq1ltw" type="5018"/>

@@ -104,7 +104,7 @@
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kCaKUg74EeORvsuYlq1ltw"/>

           </children>

           <element xmi:type="uml:UseCase" href="adl4eclipse.uml#_kBXogA74EeORvsuYlq1ltw"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kBqjcQ74EeORvsuYlq1ltw" x="175" y="132"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kBqjcQ74EeORvsuYlq1ltw" x="194" y="132"/>

         </children>

         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Pg5OFA74EeORvsuYlq1ltw"/>

       </children>

@@ -129,7 +129,7 @@
         <layoutConstraint xmi:type="notation:Location" xmi:id="_UuSgBw74EeORvsuYlq1ltw" x="20" y="80"/>

       </children>

       <element xmi:type="uml:Actor" href="adl4eclipse.uml#_UtP-MA74EeORvsuYlq1ltw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UuSgAQ74EeORvsuYlq1ltw" x="325" y="165"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UuSgAQ74EeORvsuYlq1ltw" x="399" y="206"/>

     </children>

     <children xmi:type="notation:Shape" xmi:id="_XK8vsA74EeORvsuYlq1ltw" type="2011">

       <children xmi:type="notation:DecorationNode" xmi:id="_XK8vsg74EeORvsuYlq1ltw" type="5014">

@@ -142,7 +142,7 @@
         <layoutConstraint xmi:type="notation:Location" xmi:id="_XK8vtw74EeORvsuYlq1ltw" x="20" y="80"/>

       </children>

       <element xmi:type="uml:Actor" href="adl4eclipse.uml#_XKzlwA74EeORvsuYlq1ltw"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XK8vsQ74EeORvsuYlq1ltw" x="310" y="320"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XK8vsQ74EeORvsuYlq1ltw" x="399" y="410"/>

     </children>

     <styles xmi:type="notation:DiagramStyle" xmi:id="_OPhFwQ74EeORvsuYlq1ltw"/>

     <element xmi:type="uml:Package" href="adl4eclipse.uml#_vHt8wA72EeORvsuYlq1ltw"/>

diff --git a/doc/DevelopperDocuments/plugins/uml/diagram/DiagramEditorFunctionalities/model.di b/doc/DevelopperDocuments/plugins/uml/diagram/DiagramEditorFunctionalities/model.di
index 69e175a7aec..c046fe1ad73 100644
--- a/doc/DevelopperDocuments/plugins/uml/diagram/DiagramEditorFunctionalities/model.di
+++ b/doc/DevelopperDocuments/plugins/uml/diagram/DiagramEditorFunctionalities/model.di
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ASCII"?>

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

 <di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

   <pageList>

     <availablePage>

diff --git a/doc/DevelopperDocuments/plugins/uml/diagram/DiagramEditorFunctionalities/model.notation b/doc/DevelopperDocuments/plugins/uml/diagram/DiagramEditorFunctionalities/model.notation
index ddbe4c2acf6..35c1f5ca4b7 100644
--- a/doc/DevelopperDocuments/plugins/uml/diagram/DiagramEditorFunctionalities/model.notation
+++ b/doc/DevelopperDocuments/plugins/uml/diagram/DiagramEditorFunctionalities/model.notation
@@ -164,7 +164,85 @@
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TWfFsXaUEeKemeMpJaVA3A"/>

       </children>

       <element xmi:type="uml:Class" href="model.uml#__iyRoHaTEeKemeMpJaVA3A"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TWfFoXaUEeKemeMpJaVA3A" x="100" y="470" width="776" height="141"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TWfFoXaUEeKemeMpJaVA3A" x="100" y="470" width="761" height="141"/>

+    </children>

+    <children xmi:type="notation:Shape" xmi:id="_doIqcGP7EeOq0pDGL_YBMA" type="2008">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qGF_8GP7EeOq0pDGL_YBMA" source="Stereotype_Annotation">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8ihfAGP7EeOq0pDGL_YBMA" key="StereotypeWithQualifiedNameList" value="SysML::Requirements::Requirement"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8ihfAWP7EeOq0pDGL_YBMA" key="StereotypeList" value="SysML::Requirements::Requirement"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8ihfAmP7EeOq0pDGL_YBMA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8ihfA2P7EeOq0pDGL_YBMA" key="PropStereoDisplay" value=",SysML::Requirements::Requirement.text,SysML::Requirements::Requirement.id"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8ihfBGP7EeOq0pDGL_YBMA" key="StereotypePropertyLocation" value="Compartment"/>

+      </eAnnotations>

+      <children xmi:type="notation:DecorationNode" xmi:id="_doJRgGP7EeOq0pDGL_YBMA" type="5029"/>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_doJRgWP7EeOq0pDGL_YBMA" visible="false" type="7017">

+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_doJ4kGP7EeOq0pDGL_YBMA" source="PapyrusCSSForceValue">

+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_doJ4kWP7EeOq0pDGL_YBMA" key="showTitle" value="true"/>

+        </eAnnotations>

+        <styles xmi:type="notation:TitleStyle" xmi:id="_doJRgmP7EeOq0pDGL_YBMA"/>

+        <styles xmi:type="notation:SortingStyle" xmi:id="_doJRg2P7EeOq0pDGL_YBMA"/>

+        <styles xmi:type="notation:FilteringStyle" xmi:id="_doJRhGP7EeOq0pDGL_YBMA"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_doJRhWP7EeOq0pDGL_YBMA"/>

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_doJRhmP7EeOq0pDGL_YBMA" visible="false" type="7018">

+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_doKfoGP7EeOq0pDGL_YBMA" source="PapyrusCSSForceValue">

+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_doKfoWP7EeOq0pDGL_YBMA" key="showTitle" value="true"/>

+        </eAnnotations>

+        <styles xmi:type="notation:TitleStyle" xmi:id="_doJRh2P7EeOq0pDGL_YBMA"/>

+        <styles xmi:type="notation:SortingStyle" xmi:id="_doJRiGP7EeOq0pDGL_YBMA"/>

+        <styles xmi:type="notation:FilteringStyle" xmi:id="_doJRiWP7EeOq0pDGL_YBMA"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_doJRimP7EeOq0pDGL_YBMA"/>

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_doJRi2P7EeOq0pDGL_YBMA" visible="false" type="7019">

+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_doKfomP7EeOq0pDGL_YBMA" source="PapyrusCSSForceValue">

+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_doKfo2P7EeOq0pDGL_YBMA" key="showTitle" value="true"/>

+        </eAnnotations>

+        <styles xmi:type="notation:TitleStyle" xmi:id="_doJRjGP7EeOq0pDGL_YBMA"/>

+        <styles xmi:type="notation:SortingStyle" xmi:id="_doJRjWP7EeOq0pDGL_YBMA"/>

+        <styles xmi:type="notation:FilteringStyle" xmi:id="_doJRjmP7EeOq0pDGL_YBMA"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_doJRj2P7EeOq0pDGL_YBMA"/>

+      </children>

+      <element xmi:type="uml:Class" href="model.uml#_seSb0GP6EeOq0pDGL_YBMA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_doIqcWP7EeOq0pDGL_YBMA" x="100" y="645" width="761" height="171"/>

+    </children>

+    <children xmi:type="notation:Shape" xmi:id="_doZJIGP7EeOq0pDGL_YBMA" type="2008">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_nYACAGP7EeOq0pDGL_YBMA" source="Stereotype_Annotation">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZfVEGP7EeOq0pDGL_YBMA" key="StereotypeWithQualifiedNameList" value=""/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZfVEWP7EeOq0pDGL_YBMA" key="StereotypeList" value="SysML::Requirements::Requirement"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZf8IGP7EeOq0pDGL_YBMA" key="PropStereoDisplay" value="SysML::Requirements::Requirement.id,SysML::Requirements::Requirement.text"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZf8IWP7EeOq0pDGL_YBMA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZf8ImP7EeOq0pDGL_YBMA" key="StereotypePropertyLocation" value="Compartment"/>

+      </eAnnotations>

+      <children xmi:type="notation:DecorationNode" xmi:id="_doZwMGP7EeOq0pDGL_YBMA" type="5029"/>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_doZwMWP7EeOq0pDGL_YBMA" visible="false" type="7017">

+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_doaXQGP7EeOq0pDGL_YBMA" source="PapyrusCSSForceValue">

+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_doaXQWP7EeOq0pDGL_YBMA" key="showTitle" value="true"/>

+        </eAnnotations>

+        <styles xmi:type="notation:TitleStyle" xmi:id="_doZwMmP7EeOq0pDGL_YBMA"/>

+        <styles xmi:type="notation:SortingStyle" xmi:id="_doZwM2P7EeOq0pDGL_YBMA"/>

+        <styles xmi:type="notation:FilteringStyle" xmi:id="_doZwNGP7EeOq0pDGL_YBMA"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_doZwNWP7EeOq0pDGL_YBMA"/>

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_doZwNmP7EeOq0pDGL_YBMA" visible="false" type="7018">

+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_doaXQmP7EeOq0pDGL_YBMA" source="PapyrusCSSForceValue">

+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_doaXQ2P7EeOq0pDGL_YBMA" key="showTitle" value="true"/>

+        </eAnnotations>

+        <styles xmi:type="notation:TitleStyle" xmi:id="_doZwN2P7EeOq0pDGL_YBMA"/>

+        <styles xmi:type="notation:SortingStyle" xmi:id="_doZwOGP7EeOq0pDGL_YBMA"/>

+        <styles xmi:type="notation:FilteringStyle" xmi:id="_doZwOWP7EeOq0pDGL_YBMA"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_doZwOmP7EeOq0pDGL_YBMA"/>

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_doZwO2P7EeOq0pDGL_YBMA" visible="false" type="7019">

+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_doa-UGP7EeOq0pDGL_YBMA" source="PapyrusCSSForceValue">

+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_doa-UWP7EeOq0pDGL_YBMA" key="showTitle" value="true"/>

+        </eAnnotations>

+        <styles xmi:type="notation:TitleStyle" xmi:id="_doZwPGP7EeOq0pDGL_YBMA"/>

+        <styles xmi:type="notation:SortingStyle" xmi:id="_doZwPWP7EeOq0pDGL_YBMA"/>

+        <styles xmi:type="notation:FilteringStyle" xmi:id="_doZwPmP7EeOq0pDGL_YBMA"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_doZwP2P7EeOq0pDGL_YBMA"/>

+      </children>

+      <element xmi:type="uml:Class" href="model.uml#_uKPAQGP6EeOq0pDGL_YBMA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_doZJIWP7EeOq0pDGL_YBMA" x="100" y="830" width="761"/>

     </children>

     <styles xmi:type="notation:DiagramStyle" xmi:id="_-p5JgXaNEeKemeMpJaVA3A"/>

     <element xmi:type="uml:Package" href="model.uml#_2hdp0HaNEeKemeMpJaVA3A"/>

diff --git a/doc/DevelopperDocuments/plugins/uml/diagram/DiagramEditorFunctionalities/model.uml b/doc/DevelopperDocuments/plugins/uml/diagram/DiagramEditorFunctionalities/model.uml
index 5d2395e4c1d..a6a3346d520 100644
--- a/doc/DevelopperDocuments/plugins/uml/diagram/DiagramEditorFunctionalities/model.uml
+++ b/doc/DevelopperDocuments/plugins/uml/diagram/DiagramEditorFunctionalities/model.uml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <xmi:XMI xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements http://www.eclipse.org/papyrus/0.7.0/SysML#//requirements">

   <uml:Model xmi:id="_v2A68HaMEeKemeMpJaVA3A" name="DiagramEditorFunctionalities">

-    <ownedComment xmi:id="_xpU2MHaNEeKemeMpJaVA3A" annotatedElement="_v2A68HaMEeKemeMpJaVA3A">

+    <ownedComment xmi:type="uml:Comment" xmi:id="_xpU2MHaNEeKemeMpJaVA3A" annotatedElement="_v2A68HaMEeKemeMpJaVA3A">

       <body>The purpose of this document is to explain basic functionalities intra diagram, i.e. how element in the diagram can be manipulated without taking in account link with model explorer, and properties view </body>

     </ownedComment>

-    <packageImport xmi:id="_v2A68XaMEeKemeMpJaVA3A">

+    <packageImport xmi:type="uml:PackageImport" xmi:id="_v2A68XaMEeKemeMpJaVA3A">

       <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>

     </packageImport>

     <packagedElement xmi:type="uml:Package" xmi:id="_2hdp0HaNEeKemeMpJaVA3A" name="Requirements">

@@ -12,16 +12,20 @@
       <packagedElement xmi:type="uml:Class" xmi:id="_u6MhAHaOEeKemeMpJaVA3A" name="DisplayElementAtFirstLevel_+1"/>

       <packagedElement xmi:type="uml:Class" xmi:id="_4PBJEHaTEeKemeMpJaVA3A" name="MoveElementIntoAnother"/>

       <packagedElement xmi:type="uml:Class" xmi:id="__iyRoHaTEeKemeMpJaVA3A" name="MoveElementIntoADiagram"/>

+      <packagedElement xmi:type="uml:Class" xmi:id="_seSb0GP6EeOq0pDGL_YBMA" name="Edit Grid and Ruler Property"/>

+      <packagedElement xmi:type="uml:Class" xmi:id="_uKPAQGP6EeOq0pDGL_YBMA" name="Snap To Grid Behavior"/>

     </packagedElement>

-    <profileApplication xmi:id="_V0CKUHaNEeKemeMpJaVA3A">

-      <eAnnotations xmi:id="_V1EsIHaNEeKemeMpJaVA3A" source="http://www.eclipse.org/uml2/2.0.0/UML">

+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_V0CKUHaNEeKemeMpJaVA3A">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_V1EsIHaNEeKemeMpJaVA3A" source="http://www.eclipse.org/uml2/2.0.0/UML">

         <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//requirements"/>

       </eAnnotations>

-      <appliedProfile href="pathmap://SysML_PROFILES/SysML.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

+      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

     </profileApplication>

   </uml:Model>

   <Requirements:Requirement xmi:id="_6u56oHaNEeKemeMpJaVA3A" text="Papyrus shall let display every elements at first layer even if the namespace is not respected" id="Req_001" base_Class="_6udOsHaNEeKemeMpJaVA3A"/>

   <Requirements:Requirement xmi:id="_u6MhAXaOEeKemeMpJaVA3A" text="Papyrus shall display element by respected namespace when they are contained graphically by other elements " id="Req_002" base_Class="_u6MhAHaOEeKemeMpJaVA3A"/>

   <Requirements:Requirement xmi:id="_4PBJEXaTEeKemeMpJaVA3A" text="When an element is moved into another element, the container has to change, i.e. the qualified name change" id="Req_003" base_Class="_4PBJEHaTEeKemeMpJaVA3A"/>

   <Requirements:Requirement xmi:id="__iyRoXaTEeKemeMpJaVA3A" text="When an element move from an element to the diagram, two options can be applied:&#xD;&#xA;- The container change and the namespace has to be adapted, so a clean into diagrams has to be done to respect Req_002&#xD;&#xA;- The container does not change; this is only a graphical move, as described by the req_001" id="Req_004" base_Class="__iyRoHaTEeKemeMpJaVA3A"/>

+  <Requirements:Requirement xmi:id="_tDokkGP6EeOq0pDGL_YBMA" text="The user must be able to change the Diagram Viewer properties (Snap To Grid/To Geometry, Show Rulers, Show Grid, Grid Style, Grid Color, Grid Order, Ruler Units, Grid Spacing )" id="Req_005" base_Class="_seSb0GP6EeOq0pDGL_YBMA"/>

+  <Requirements:Requirement xmi:id="_u_1LgGP6EeOq0pDGL_YBMA" text="Snap To Grid must be able to snap on : &#xD;&#xA;- 4 corners of rectangle&#xD;&#xA;- 4 middles of side of a rectangle&#xD;&#xA;- anchors of link&#xD;&#xA;- bendpoints" id="Req_005" base_Class="_uKPAQGP6EeOq0pDGL_YBMA"/>

 </xmi:XMI>

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable.converter/.classpath b/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/.classpath
index 8a8f1668cdc..8a8f1668cdc 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable.converter/.classpath
+++ b/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/.classpath
diff --git a/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/.project b/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/.project
new file mode 100644
index 00000000000..41dd6dd726f
--- /dev/null
+++ b/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.jdt.core.javabuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.ManifestBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.SchemaBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.pde.PluginNature</nature>

+		<nature>org.eclipse.jdt.core.javanature</nature>

+	</natures>

+</projectDescription>

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable.converter/.settings/org.eclipse.jdt.core.prefs b/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/.settings/org.eclipse.jdt.core.prefs
index f287d53cf45..f287d53cf45 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable.converter/.settings/org.eclipse.jdt.core.prefs
+++ b/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/.settings/org.eclipse.jdt.core.prefs
diff --git a/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/META-INF/MANIFEST.MF b/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..92db7d01f19
--- /dev/null
+++ b/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/META-INF/MANIFEST.MF
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences;singleton:=true
+Bundle-Version: 0.10.1.qualifier
+Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences.Activator
+Bundle-Vendor: %Bundle-Vendor
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="0.10.1",
+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="0.10.1"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy
diff --git a/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/OSGI-INF/l10n/bundle.properties b/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 00000000000..41a059f9863
--- /dev/null
+++ b/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,3 @@
+#Properties file for org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences

+Bundle-Vendor = Eclipse Modeling Project

+Bundle-Name = ConnectionPoint Preferences (Incubation)
\ No newline at end of file
diff --git a/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/about.html b/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/about.html
new file mode 100644
index 00000000000..209103075a7
--- /dev/null
+++ b/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

+<title>About</title>

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>November 14, 2008</p>	

+<h3>License</h3>

+

+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

+indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

+apply to your use of any object code in the Content.  Check the Redistributor's license that was 

+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

+indicated below, the terms and conditions of the EPL still apply to any source code in the Content

+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>

+

+</body>

+</html>
\ No newline at end of file
diff --git a/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/build.properties b/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/build.properties
new file mode 100644
index 00000000000..d16b1200471
--- /dev/null
+++ b/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/build.properties
@@ -0,0 +1,9 @@
+source.. = src/

+output.. = bin/

+bin.includes = META-INF/,\

+               .,\

+               plugin.xml,\

+               build.properties,\

+               OSGI-INF/,\

+               about.html

+src.includes = about.html

diff --git a/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/plugin.xml b/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/plugin.xml
new file mode 100644
index 00000000000..855bbcc82b5
--- /dev/null
+++ b/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/plugin.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<?eclipse version="3.4"?>

+<plugin>

+   <extension

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

+      <initializer

+            class="org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences.CustomPreferenceInitializer">

+      </initializer>

+   </extension>

+   <extension

+         point="org.eclipse.ui.startup">

+      <startup></startup>

+   </extension>

+

+</plugin>

diff --git a/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/src/org/eclipse/papyrus/infra/gmfdiag/connectionpoint/preferences/Activator.java b/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/src/org/eclipse/papyrus/infra/gmfdiag/connectionpoint/preferences/Activator.java
new file mode 100644
index 00000000000..54bf01264cc
--- /dev/null
+++ b/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/src/org/eclipse/papyrus/infra/gmfdiag/connectionpoint/preferences/Activator.java
@@ -0,0 +1,71 @@
+/*****************************************************************************

+ * 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.infra.gmfdiag.connectionpoint.preferences;

+

+import org.eclipse.ui.IStartup;

+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 implements IStartup {

+

+	// The plug-in ID

+	public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences"; //$NON-NLS-1$

+

+	// The shared instance

+	private static Activator plugin;

+

+	/**

+	 * The constructor

+	 */

+	public Activator() {

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * 

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

+	 */

+	public void start(BundleContext context) throws Exception {

+		super.start(context);

+		plugin = this;

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * 

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

+	 */

+	public void stop(BundleContext context) throws Exception {

+		plugin = null;

+		super.stop(context);

+	}

+

+	/**

+	 * Returns the shared instance

+	 * 

+	 * @return the shared instance

+	 */

+	public static Activator getDefault() {

+		return plugin;

+	}

+

+	@Override

+	public void earlyStartup() {

+		new CustomPreferenceInitializer().initializeDefaultPreferences();

+	}

+

+}

diff --git a/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/src/org/eclipse/papyrus/infra/gmfdiag/connectionpoint/preferences/CustomPreferenceInitializer.java b/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/src/org/eclipse/papyrus/infra/gmfdiag/connectionpoint/preferences/CustomPreferenceInitializer.java
new file mode 100644
index 00000000000..55ac4ed58cb
--- /dev/null
+++ b/examples/infra/org.eclipse.papyrus.infra.gmfdiag.connectionpoint.preferences/src/org/eclipse/papyrus/infra/gmfdiag/connectionpoint/preferences/CustomPreferenceInitializer.java
@@ -0,0 +1,38 @@
+/*****************************************************************************

+ * 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.infra.gmfdiag.connectionpoint.preferences;

+

+import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;

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

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

+

+

+

+public class CustomPreferenceInitializer extends AbstractPreferenceInitializer {

+

+	private IPreferenceStore store;

+

+	/**

+	 * constructor of this class

+	 */

+	public CustomPreferenceInitializer() {

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

+	}

+

+	@Override

+	public void initializeDefaultPreferences() {

+		store.setDefault(PreferencesConstantsHelper.getPapyrusEditorConstant(PreferencesConstantsHelper.DRAW_CONNECTION_POINT), true);

+	}

+

+}

diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/img/adl.png b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/img/adl.png
new file mode 100644
index 00000000000..597790b0c2d
--- /dev/null
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/img/adl.png
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/img/adl.svg b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/img/adl.svg
new file mode 100644
index 00000000000..bffe0c3e0f5
--- /dev/null
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/img/adl.svg
@@ -0,0 +1,355 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.2"
+   width="460.62991"
+   height="283.46457"
+   id="svg2"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="papyrus.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1306"
+     inkscape:window-height="767"
+     id="namedview53"
+     showgrid="false"
+     inkscape:zoom="0.76200001"
+     inkscape:cx="176.05836"
+     inkscape:cy="233.31647"
+     inkscape:window-x="493"
+     inkscape:window-y="93"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3908">
+      <stop
+         style="stop-color:#1a171a;stop-opacity:1;"
+         offset="0"
+         id="stop3910" />
+      <stop
+         style="stop-color:#9c9e9f;stop-opacity:1;"
+         offset="1"
+         id="stop3912" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3818">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3820" />
+      <stop
+         style="stop-color:#98bf06;stop-opacity:1;"
+         offset="1"
+         id="stop3822" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3818"
+       id="radialGradient3832"
+       cx="622.66229"
+       cy="107.15185"
+       fx="622.66229"
+       fy="107.15185"
+       r="125.38313"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3818-1"
+       id="radialGradient3832-3"
+       cx="622.66229"
+       cy="107.15185"
+       fx="622.66229"
+       fy="107.15185"
+       r="125.38313"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3818-1">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3820-6" />
+      <stop
+         style="stop-color:#009bba;stop-opacity:1;"
+         offset="1"
+         id="stop3822-8" />
+    </linearGradient>
+    <radialGradient
+       r="125.38313"
+       fy="107.15185"
+       fx="622.66229"
+       cy="107.15185"
+       cx="622.66229"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3849"
+       xlink:href="#linearGradient3818-1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3908"
+       id="linearGradient3914"
+       x1="549.05366"
+       y1="177.90893"
+       x2="824.32955"
+       y2="177.90893"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3908"
+       id="linearGradient3916"
+       gradientUnits="userSpaceOnUse"
+       x1="549.05366"
+       y1="177.90893"
+       x2="824.32955"
+       y2="177.90893" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3908"
+       id="linearGradient3918"
+       gradientUnits="userSpaceOnUse"
+       x1="549.05366"
+       y1="177.90893"
+       x2="824.32955"
+       y2="177.90893" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3908"
+       id="linearGradient3920"
+       gradientUnits="userSpaceOnUse"
+       x1="549.05366"
+       y1="177.90893"
+       x2="824.32955"
+       y2="177.90893" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3908"
+       id="linearGradient3922"
+       gradientUnits="userSpaceOnUse"
+       x1="549.05366"
+       y1="177.90893"
+       x2="824.32955"
+       y2="177.90893" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3908"
+       id="linearGradient3925"
+       gradientUnits="userSpaceOnUse"
+       x1="549.05366"
+       y1="177.90893"
+       x2="824.32955"
+       y2="177.90893"
+       gradientTransform="matrix(-1,0,0,-1,1373.3832,351.87403)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3908"
+       id="linearGradient3928"
+       gradientUnits="userSpaceOnUse"
+       x1="549.05366"
+       y1="177.90893"
+       x2="824.32955"
+       y2="177.90893"
+       gradientTransform="matrix(-1,0,0,-1,1373.3832,351.87403)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3908"
+       id="linearGradient3931"
+       gradientUnits="userSpaceOnUse"
+       x1="549.05366"
+       y1="177.90893"
+       x2="824.32955"
+       y2="177.90893"
+       gradientTransform="matrix(-1,0,0,-1,1373.3832,351.87403)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3908"
+       id="linearGradient3934"
+       gradientUnits="userSpaceOnUse"
+       x1="549.05366"
+       y1="177.90893"
+       x2="824.32955"
+       y2="177.90893"
+       gradientTransform="matrix(-1,0,0,-1,1373.3832,351.87403)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3908"
+       id="linearGradient3940"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,-1,945.59288,317.53945)"
+       x1="549.05366"
+       y1="177.90893"
+       x2="824.32955"
+       y2="177.90893" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3908"
+       id="linearGradient3946"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,-1,945.59288,317.53945)"
+       x1="549.05366"
+       y1="177.90893"
+       x2="824.32955"
+       y2="177.90893" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3908"
+       id="linearGradient3952"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,-1,945.59288,317.53945)"
+       x1="549.05366"
+       y1="177.90893"
+       x2="824.32955"
+       y2="177.90893" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3908"
+       id="linearGradient3958"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,-1,945.59288,317.53945)"
+       x1="549.05366"
+       y1="177.90893"
+       x2="824.32955"
+       y2="177.90893" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3818-1"
+       id="radialGradient3970"
+       gradientUnits="userSpaceOnUse"
+       cx="622.66229"
+       cy="107.15185"
+       fx="622.66229"
+       fy="107.15185"
+       r="125.38313" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3818"
+       id="radialGradient3972"
+       gradientUnits="userSpaceOnUse"
+       cx="622.66229"
+       cy="107.15185"
+       fx="622.66229"
+       fy="107.15185"
+       r="125.38313" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3908"
+       id="linearGradient3974"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,-1,945.59288,317.53945)"
+       x1="549.05366"
+       y1="177.90893"
+       x2="824.32955"
+       y2="177.90893" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3908"
+       id="linearGradient3976"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,-1,945.59288,317.53945)"
+       x1="549.05366"
+       y1="177.90893"
+       x2="824.32955"
+       y2="177.90893" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3908"
+       id="linearGradient3978"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,-1,945.59288,317.53945)"
+       x1="549.05366"
+       y1="177.90893"
+       x2="824.32955"
+       y2="177.90893" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3908"
+       id="linearGradient3980"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,-1,945.59288,317.53945)"
+       x1="549.05366"
+       y1="177.90893"
+       x2="824.32955"
+       y2="177.90893" />
+  </defs>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-768.89631)"
+     id="layer2" />
+  <g
+     id="g3960"
+     transform="matrix(0.93318676,0,0,0.93318676,8.4148818,11.649074)"
+     inkscape:export-xdpi="5.8753209"
+     inkscape:export-ydpi="5.8753209">
+    <path
+       d="m 796.19109,174.89305 c 0,65.08738 -52.76374,117.85113 -117.85112,117.85113 -65.08738,0 -117.85113,-52.76375 -117.85113,-117.85113 0,-65.08738 52.76375,-117.851126 117.85113,-117.851126 65.08738,0 117.85112,52.763746 117.85112,117.851126 z"
+       sodipodi:ry="117.85113"
+       sodipodi:rx="117.85113"
+       sodipodi:cy="174.89305"
+       sodipodi:cx="678.33997"
+       id="path3030-8"
+       style="opacity:0.98999999;fill:url(#radialGradient3970);fill-opacity:1;stroke:none"
+       sodipodi:type="arc"
+       transform="translate(-451.91733,-35.262539)" />
+    <path
+       transform="translate(-437.79032,-35.262539)"
+       d="m 796.19109,174.89305 c 0,65.08738 -52.76374,117.85113 -117.85112,117.85113 -65.08738,0 -117.85113,-52.76375 -117.85113,-117.85113 0,-65.08738 52.76375,-117.851126 117.85113,-117.851126 65.08738,0 117.85112,52.763746 117.85112,117.851126 z"
+       sodipodi:ry="117.85113"
+       sodipodi:rx="117.85113"
+       sodipodi:cy="174.89305"
+       sodipodi:cx="678.33997"
+       id="path3030"
+       style="opacity:0.98999999;fill:url(#radialGradient3972);fill-opacity:1;stroke:none"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path3868"
+       d="m 125.32217,164.47792 c 0.48084,2.47664 1.1607,4.92485 1.82692,7.375 l 244.0633,0 0,-7.375 z"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient3974);fill-opacity:1;stroke:none;stroke-width:7.36382484;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path3868-2"
+       d="m 122.84277,145.44667 c 0.0647,2.45833 0.31139,4.91667 0.56547,7.375 l 247.80415,0 0,-7.375 z"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient3976);fill-opacity:1;stroke:none;stroke-width:7.36382484;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path3868-7"
+       d="m 123.42274,126.44667 c -0.33255,2.44792 -0.44679,4.89583 -0.59447,7.34375 l 248.38412,0 0,-7.34375 z"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient3978);fill-opacity:1;stroke:none;stroke-width:7.36382484;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path3868-71"
+       d="m 127.14909,107.41542 c -0.76224,2.48347 -1.29841,4.92927 -1.83417,7.375 l 245.89747,0 0,-7.375 z"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient3980);fill-opacity:1;stroke:none;stroke-width:7.36382484;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+  </g>
+</svg>
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/plugin.xml b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/plugin.xml
index def080bbc37..5c136eb316b 100644
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/plugin.xml
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/plugin.xml
@@ -14,9 +14,10 @@
          point="org.eclipse.papyrus.uml.extensionpoints.UMLProfile">

       <profile

             description="ADL4Eclipse profile"

+            iconpath="img/adl.png"

             name="ADL4Eclipse"

             path="pathmap://ADL4ECLIPSE_PROFILES/adl4eclipse.profile.uml"

             provider="Eclipse.org">

       </profile>

    </extension>

-</plugin>
\ No newline at end of file
+</plugin>

diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/plugin.xml b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/plugin.xml
index 3ba9bd4b24c..bc567661bd3 100644
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/plugin.xml
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/plugin.xml
@@ -85,7 +85,7 @@
            point="org.eclipse.ui.importWizards">

         <category

               id="org.eclipse.papyrus.editor.category"

-              name="papyrus">

+              name="Papyrus">

         </category>

         <wizard

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

@@ -96,6 +96,13 @@
         </wizard>

         <wizard

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

+              class="org.eclipse.papyrus.adl4eclipsetool.assistant.AdvancePluginImport"

+              icon="img/adl.png"

+              id="org.eclipse.papyrus.adl4eclipsetool.assistant.wizard1"

+              name="Advanced Plugins architecture snapshot">

+        </wizard>

+        <wizard

+              category="org.eclipse.papyrus.editor.category"

               class="org.eclipse.papyrus.adl4eclipsetool.assistant.SimpleFeatureImport"

               icon="img/adl.png"

               id="org.eclipse.papyrus.adl4eclipsetool.assistant.wizard1"

diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adl4eclipsetool/assistant/AdvancePluginImport.java b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adl4eclipsetool/assistant/AdvancePluginImport.java
new file mode 100644
index 00000000000..6bc31b2c56f
--- /dev/null
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/src/org/eclipse/papyrus/adl4eclipsetool/assistant/AdvancePluginImport.java
@@ -0,0 +1,149 @@
+/*****************************************************************************

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

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

+ *

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

+package org.eclipse.papyrus.adl4eclipsetool.assistant;

+

+import java.util.ArrayList;

+import java.util.Iterator;

+

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

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

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

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

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

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

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

+import org.eclipse.jface.wizard.Wizard;

+import org.eclipse.papyrus.adltool.command.CompletePluginsArchitectureSnapshotCommand;

+import org.eclipse.papyrus.adltool.command.SimplePluginsArchitectureSnapshotCommand;

+import org.eclipse.papyrus.adltool.designer.ArchitectureSnapshotDesigner;

+import org.eclipse.papyrus.adltool.designer.wizard.BundleSelectionPage;

+import org.eclipse.papyrus.editor.PapyrusMultiDiagramEditor;

+import org.eclipse.papyrus.infra.core.resource.ModelSet;

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

+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForSelection;

+import org.eclipse.ui.IImportWizard;

+import org.eclipse.ui.ISelectionService;

+import org.eclipse.ui.IWorkbench;

+import org.eclipse.ui.PlatformUI;

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

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

+

+/**

+ * this class is used to do the retro engineering from workspaceplugin. It adds only in the platform dependencies.

+ *

+ */

+public class AdvancePluginImport extends Wizard implements IImportWizard {

+

+	protected BundleSelectionPage bundleSelectionPage;

+	protected TransactionalEditingDomain transactionalEditingDomain=null;

+	protected PapyrusMultiDiagramEditor papyrusEditor;

+	protected ModelSet modelSet;

+

+	/**

+	 * 

+	 * Constructor.

+	 *

+	 */

+	public AdvancePluginImport() {

+		super();

+		setNeedsProgressMonitor(true);

+	}

+

+	@Override

+	public void addPages() {

+		//look for all plugins from the workspace

+		ArrayList<Object> bundleList= new ArrayList<Object>();

+		bundleList.addAll(ArchitectureSnapshotDesigner.getLoadedBundles());

+		bundleSelectionPage = new BundleSelectionPage(bundleList);

+		addPage(bundleSelectionPage);

+	}

+

+	/**

+	 * 

+	 * @return the list of selected bundle from the page

+	 */

+	public ArrayList<Object> getSelectedBundle(){

+		return bundleSelectionPage.getResult();

+	}

+	@Override

+	public boolean performFinish() {

+		

+		// one bundle must be selected

+		if(getSelectedBundle().size()>0){

+			// get the domain in order to launche the command

+			TransactionalEditingDomain dom = modelSet.getTransactionalEditingDomain();

+			ArrayList<Element> selection=getSelectionSet();

+			

+			if( (selection.size()==1) &&(selection.get(0)instanceof Package)){

+				//launch the simple retro engineering

+				CompletePluginsArchitectureSnapshotCommand comd= new CompletePluginsArchitectureSnapshotCommand(dom, (Package)selection.get(0), getSelectedBundle());

+				dom.getCommandStack().execute(comd);

+			}

+			return true;

+		}

+		return false;

+	}

+

+	public void init(IWorkbench workbench, IStructuredSelection selection) {

+		

+		//get the service registry of papyrus from the selection

+		ServicesRegistry registry=null;

+		try {

+			registry = ServiceUtilsForSelection.getInstance().getServiceRegistry(selection);

+		} catch (ServiceException e1) {

+			e1.printStackTrace();

+		}

+		try {

+			modelSet = registry.getService(ModelSet.class);

+		} catch (ServiceException e) {

+			e.printStackTrace();

+		}

+		

+	}

+	

+	/**

+	 * getSelected element in the diagram or in the model explorer

+	 * @return Element or null

+	 */

+	protected ArrayList<Element> getSelectionSet(){

+		ArrayList<Element> selectedSet =new ArrayList<Element>();

+		ISelectionService selectionService = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService();

+		ISelection selection = selectionService.getSelection();

+

+

+		if(selection instanceof IStructuredSelection) {

+			@SuppressWarnings("rawtypes")

+			Iterator selectedobjectIteractor = ((IStructuredSelection)selection).iterator();

+			while (selectedobjectIteractor.hasNext()) {

+				Object currentSelection = selectedobjectIteractor.next();

+				if(currentSelection instanceof GraphicalEditPart) {

+					Object graphicalElement = ((GraphicalEditPart)currentSelection).getModel();

+					if((graphicalElement instanceof View) && ((View)graphicalElement).getElement() instanceof org.eclipse.uml2.uml.Element) {

+						selectedSet.add( (org.eclipse.uml2.uml.Element)((View)graphicalElement).getElement());

+					}

+				}

+				else if(currentSelection instanceof IAdaptable) {

+					EObject selectedEObject = (EObject)((IAdaptable)currentSelection).getAdapter(EObject.class);

+					if (selectedEObject instanceof org.eclipse.uml2.uml.Element){

+						selectedSet.add((Element)selectedEObject);

+					}

+				}

+			}

+

+		}

+		return selectedSet;

+	}

+

+}

diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/ArchitectureSnapshotDesigner.java b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/ArchitectureSnapshotDesigner.java
index 2f43ecd34d9..313b3f69519 100644
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/ArchitectureSnapshotDesigner.java
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/ArchitectureSnapshotDesigner.java
@@ -63,7 +63,7 @@ public abstract class ArchitectureSnapshotDesigner{
 	protected BundleDesignerRegistry bundleDesignerRegistry=null;

 	protected int dependenciesN=0;

 	protected ArrayList<Object>bundleInitialList=null;

-	protected int dependencyLevelMax=15; 

+	protected int dependencyLevelMax=1; 

 

 

 

diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/CompleteArchitectureSnapshotDesigner.java b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/CompleteArchitectureSnapshotDesigner.java
index ad342151c70..73a714482ce 100644
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/CompleteArchitectureSnapshotDesigner.java
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/src/org/eclipse/papyrus/adltool/designer/CompleteArchitectureSnapshotDesigner.java
@@ -33,6 +33,7 @@ import org.eclipse.uml2.uml.Package;
 	 */

 	public CompleteArchitectureSnapshotDesigner(Package rootPackage, ArrayList<Object>bundleInitialList) {

 		super(rootPackage, bundleInitialList);

+		dependencyLevelMax=30;

 	}

 	@Override

 	protected void initModel() {

diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.core/META-INF/MANIFEST.MF b/extraplugins/cdo/org.eclipse.papyrus.cdo.core/META-INF/MANIFEST.MF
index 514c6b8739f..ad2a18cef65 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.core/META-INF/MANIFEST.MF
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.core/META-INF/MANIFEST.MF
@@ -46,7 +46,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.gmf.runtime.notation;bundle-version="[1.5.0,2.0.0)",

  org.eclipse.equinox.security;bundle-version="[1.1.100,2.0.0)",

  org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",

- com.google.guava;bundle-version="[11.0.2,12.0.0)",

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

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

  org.eclipse.gmf.runtime.emf.commands.core;bundle-version="[1.7.0,2.0.0)",

  org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.7.0,2.0.0)",

diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/META-INF/MANIFEST.MF b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/META-INF/MANIFEST.MF
index 4c20dd45e60..005867d19c9 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/META-INF/MANIFEST.MF
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.emf.edit.ui;bundle-version="2.8.0",

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

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

- com.google.guava;bundle-version="[11.0.2,12.0.0)"

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

 Export-Package: org.eclipse.papyrus.cdo.internal.ui.customization.properties;x-internal:=true,

  org.eclipse.papyrus.cdo.internal.ui.customization.properties.messages;x-internal:=true,

  org.eclipse.papyrus.cdo.internal.ui.customization.properties.storage;x-internal:=true,

diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/META-INF/MANIFEST.MF b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/META-INF/MANIFEST.MF
index ffc0d354603..deb42190269 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/META-INF/MANIFEST.MF
@@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.papyrus.cdo.validation.problems.edit;bundle-version="1.0.0",

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

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

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

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

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

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

  org.eclipse.ui.navigator;bundle-version="3.5.300",

diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/META-INF/MANIFEST.MF b/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/META-INF/MANIFEST.MF
index f224092f44a..01768f13c09 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.cdo.core;bundle-version="1.0.0",

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

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

- com.google.guava;bundle-version="[11.0.2,12.0.0)"

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

 Export-Package: org.eclipse.papyrus.cdo.uml.diagram.internal.ui;x-internal:=true,

  org.eclipse.papyrus.cdo.uml.diagram.internal.ui.handlers;x-internal:=true,

  org.eclipse.papyrus.cdo.uml.diagram.internal.ui.l10n;x-internal:=true,

diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui/META-INF/MANIFEST.MF b/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui/META-INF/MANIFEST.MF
index 2d3f9fe26b9..dd7d9916a4a 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.uml.tools;bundle-version="1.0.0",

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

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

- com.google.guava;bundle-version="[11.0.2,12.0.0)"

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

 Export-Package: org.eclipse.papyrus.cdo.uml.internal.ui;x-friends:="org.eclipse.papyrus.cdo.uml.ui.tests",

  org.eclipse.papyrus.cdo.uml.internal.ui.importsources;x-friends:="org.eclipse.papyrus.cdo.uml.ui.tests",

  org.eclipse.papyrus.cdo.uml.internal.ui.l10n;x-internal:=true

diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/.classpath b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/.classpath
index 64c5e31b7a2..ad32c83a788 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/.classpath
+++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/META-INF/MANIFEST.MF b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/META-INF/MANIFEST.MF
index 663015a1a72..86e6151d55d 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/META-INF/MANIFEST.MF
+++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo.debug/META-INF/MANIFEST.MF
@@ -16,5 +16,5 @@ Bundle-Localization: plugin
 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.acceleo.debug.Activator

 Bundle-SymbolicName: org.eclipse.papyrus.acceleo.debug;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

 

diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo/.classpath b/extraplugins/codegen/org.eclipse.papyrus.acceleo/.classpath
index 64c5e31b7a2..ad32c83a788 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo/.classpath
+++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo/META-INF/MANIFEST.MF b/extraplugins/codegen/org.eclipse.papyrus.acceleo/META-INF/MANIFEST.MF
index 5f57aa5e78e..499998899e0 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo/META-INF/MANIFEST.MF
+++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo/META-INF/MANIFEST.MF
@@ -13,5 +13,5 @@ Bundle-Localization: plugin
 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.acceleo.Activator

 Bundle-SymbolicName: org.eclipse.papyrus.acceleo

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

 

diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/GenUtils.java b/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/GenUtils.java
index 9377370ea35..7fff24f5e75 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/GenUtils.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/GenUtils.java
@@ -607,7 +607,8 @@ public class GenUtils {
 	/**
 	 * Return the relative path of ne2 as seen from ne1
 	 * (might not always be useful, if includes are always done from a common root)
-	 *
+	 * TODO: incomplete, currently unused
+	 * 
 	 * @param ne1 a named element
 	 * @param ne2 a named element
 	 * @return
@@ -615,15 +616,15 @@ public class GenUtils {
 	public static String getRelativePath(NamedElement ne1, NamedElement ne2) {
 		// get common prefix
 		EList<Namespace> ne1namespaces = ne1.allNamespaces();
-		String path = "";
+		String path = ""; //$NON-NLS-1$
 		for (Namespace ns : ne2.allNamespaces()) {
 			if (ne1namespaces.contains(ns)) {
 				// ns is a common prefix
 				return ne2.getName();
 			}
-			path += "../";
+			path += "../"; //$NON-NLS-1$
 		}
-		return null;
+		return path;
 	}
 	
 	/**
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/Messages.java b/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/Messages.java
new file mode 100644
index 00000000000..a3867d5466d
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/Messages.java
@@ -0,0 +1,15 @@
+package org.eclipse.papyrus.acceleo;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.acceleo.messages"; //$NON-NLS-1$
+	public static String ModelElementsCreator_UnsupportedModelElement;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/ModelElementsCreator.java b/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/ModelElementsCreator.java
index 63180eb5ace..bcd1e2a6c19 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/ModelElementsCreator.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/ModelElementsCreator.java
@@ -28,12 +28,15 @@ import org.eclipse.emf.common.util.EList;
 import org.eclipse.uml2.uml.Classifier;

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.Enumeration;

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

 import org.eclipse.uml2.uml.NamedElement;

 import org.eclipse.uml2.uml.Namespace;

 import org.eclipse.uml2.uml.Package;

 import org.eclipse.uml2.uml.PackageableElement;

 import org.eclipse.uml2.uml.PrimitiveType;

 import org.eclipse.uml2.uml.Relationship;

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

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

 import org.eclipse.uml2.uml.Usage;

 

 

@@ -136,8 +139,18 @@ abstract public class ModelElementsCreator {
 		}

 		else if(element instanceof Relationship) {

 			// no code generation for relationships

-		} else {

-			throw new RuntimeException("C++ code generator: unsupported model element " + element); //$NON-NLS-1$

+		}

+		else if(element instanceof Signal) {

+			// TODO: not supported, but do nothing 

+		}

+		else if(element instanceof SignalEvent) {

+			// TODO: not supported, but do nothing 

+		}

+		else if(element instanceof InstanceSpecification) {

+			// TODO: not supported, but do nothing 

+		}

+		else {

+			throw new RuntimeException(String.format(Messages.ModelElementsCreator_UnsupportedModelElement, element));

 		}

 	}

 

diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/messages.properties b/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/messages.properties
new file mode 100644
index 00000000000..ad6e5a9fa79
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.acceleo/src/org/eclipse/papyrus/acceleo/messages.properties
@@ -0,0 +1 @@
+ModelElementsCreator_UnsupportedModelElement=code generator: unsupported model element %s
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/.classpath b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/.classpath
index 64c5e31b7a2..ad32c83a788 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/.classpath
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/META-INF/MANIFEST.MF b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/META-INF/MANIFEST.MF
index 0b09718ae8c..0cd45562962 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/META-INF/MANIFEST.MF
@@ -22,5 +22,5 @@ Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.cpp.codegen.ui.Activator

 Bundle-SymbolicName: org.eclipse.papyrus.cpp.codegen.ui;singleton:=tru

  e

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

 

diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/.classpath b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/.classpath
index 64c5e31b7a2..ad32c83a788 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/.classpath
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/META-INF/MANIFEST.MF b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/META-INF/MANIFEST.MF
index 95054e461c8..c403755bd37 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/META-INF/MANIFEST.MF
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/META-INF/MANIFEST.MF
@@ -27,5 +27,5 @@ Bundle-Localization: plugin
 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.cpp.codegen.Activator

 Bundle-SymbolicName: org.eclipse.papyrus.cpp.codegen;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

 

diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/build.properties b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/build.properties
index 1a5433d5c75..4054b530c9f 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/build.properties
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/build.properties
@@ -3,7 +3,6 @@
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               templates/,\
                plugin.properties,\
                about.html,\
                build.acceleo,\
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/Constants.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/Constants.java
index 34ebf025224..ff479ae30f3 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/Constants.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/Constants.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006 - 2012 CEA LIST.
+ * Copyright (c) 2006 - 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
@@ -18,21 +18,22 @@ package org.eclipse.papyrus.cpp.codegen;
  */
 public class Constants {
 
-	public static final String includeHFile = "// include associated header file";
+	public static final String includeHFile = "// include associated header file"; //$NON-NLS-1$
 
-	public static final String cppIncPreBodyStart = "// Include from CppInclude stereotype (pre-body)";
+	public static final String cppIncPreBodyStart = "// Include from CppInclude stereotype (pre-body)"; //$NON-NLS-1$
 
-	public static final String cppIncPreBodyEnd = "// End of CppInclude stereotype (pre-body)";
+	public static final String cppIncPreBodyEnd = "// End of CppInclude stereotype (pre-body)"; //$NON-NLS-1$
 
-	public static final String cppIncBodyStart = "// Include from CppInclude declaration (body)";
+	public static final String cppIncBodyStart = "// Include from CppInclude declaration (body)"; //$NON-NLS-1$
 
-	public static final String cppIncBodyEnd = "// End of CppInclude stereotype (body)";
+	public static final String cppIncBodyEnd = "// End of CppInclude stereotype (body)";//$NON-NLS-1$
 
-	public static final String derivedIncludes = "// Derived includes directives";
+	public static final String derivedIncludes = "// Derived includes directives";//$NON-NLS-1$
 
-	public static final String forwardDecl = "// forward declarations";
+	public static final String forwardDecl = "// forward declarations"; //$NON-NLS-1$
 
-	public static final String staticAttributes = "// static attributes (if any)";
+	public static final String staticAttributes = "// static attributes (if any)"; //$NON-NLS-1$
+
+	public static final String undefinedType = "undefined"; //$NON-NLS-1$
 
-	public static final String undefinedType = "undefined";
 }
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/Messages.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/Messages.java
new file mode 100644
index 00000000000..3260b816524
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/Messages.java
@@ -0,0 +1,15 @@
+package org.eclipse.papyrus.cpp.codegen;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.cpp.codegen.messages"; //$NON-NLS-1$
+	public static String CppModelElementsCreator_CannotFormatContent;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/StdStereo.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/StdStereo.java
index 16e8aec7fed..e70c7807870 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/StdStereo.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/StdStereo.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006 - 2012 CEA LIST.
+ * Copyright (c) 2006 - 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
@@ -13,17 +13,22 @@ package org.eclipse.papyrus.cpp.codegen;
 
 import org.eclipse.papyrus.acceleo.GenUtils;
 import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Namespace;
 
 public class StdStereo {
 
-	public final static String create = "Create";
+	public final static String create = "Create"; //$NON-NLS-1$
 
-	public final static String destroy = "Destroy";
+
+	public final static String destroy = "Destroy"; //$NON-NLS-1$
 
 	/**
 	 * In the UML 2.4 plugin, the Standard profile is split into an L2 and an L3 profile
 	 */
-	public final static String[] namespaces = { "Standard", "StandardProfileL2" };
+	public final static String[] namespaces = {
+		"Standard", //$NON-NLS-1$
+		"StandardProfileL2" //$NON-NLS-1$
+	};
 
 	/**
 	 * Check whether a stereotype of the standard profile is applied
@@ -37,7 +42,7 @@ public class StdStereo {
 	 */
 	public static boolean isApplied(Element element, String stdName) {
 		for(String namespace : namespaces) {
-			if(GenUtils.hasStereotype(element, namespace + "::" + stdName)) {
+			if(GenUtils.hasStereotype(element, namespace + Namespace.SEPARATOR + stdName)) {
 				return true;
 			}
 		}
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl
index dce9463f9ea..ede664e1865 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl
@@ -19,6 +19,7 @@
     <imports href="util/clazz/CppClassAttributesDeclaration.emtl#/0"/>
     <imports href="util/clazz/CppClassOperationsDeclaration.emtl#/0"/>
     <imports href="util/clazz/CppClassOperationsImplementation.emtl#/0"/>
+    <imports href="util/operation/CppOperations.emtl#/0"/>
     <imports href="util/CppTemplates.emtl#/0"/>
     <imports href="util/CppDocumentation.emtl#/0"/>
     <ownedModuleElement xsi:type="mtl:Template" name="classUnionOrStruct" visibility="Public">
@@ -76,127 +77,158 @@
       </parameter>
     </ownedModuleElement>
     <ownedModuleElement xsi:type="mtl:Comment">
-      <body startPosition="1590" endPosition="1758" value=" default initializer for non-static attributes with a default value&#xA;TODO: should be disabled by default, since non-static members can be initialized directly&#xA;in C++ 011"/>
+      <body startPosition="1676" endPosition="1844" value=" default initializer for non-static attributes with a default value&#xA;TODO: should be disabled by default, since non-static members can be initialized directly&#xA;in C++ 011"/>
     </ownedModuleElement>
     <ownedModuleElement xsi:type="mtl:Template" name="defaultInitializer" visibility="Public">
-      <body xsi:type="mtl:LetBlock">
-        <body xsi:type="mtl:IfBlock">
-          <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#x9;"/>
-          <body xsi:type="ocl.ecore:PropertyCallExp">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <source xsi:type="ocl.ecore:VariableExp" name="classifier" referredVariable="/0/defaultInitializer/classifier">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
-            </source>
-            <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
-          </body>
-          <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="() : "/>
-          <body xsi:type="mtl:ForBlock">
+      <body xsi:type="mtl:IfBlock">
+        <body xsi:type="mtl:LetBlock">
+          <body xsi:type="mtl:IfBlock">
+            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="    &#x9;"/>
             <body xsi:type="ocl.ecore:PropertyCallExp">
               <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-              <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/23">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
+              <source xsi:type="ocl.ecore:VariableExp" name="classifier" referredVariable="/0/defaultInitializer/classifier">
+                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
               </source>
               <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
             </body>
-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="("/>
-            <body xsi:type="ocl.ecore:OperationCallExp">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-              <source xsi:type="ocl.ecore:PropertyCallExp">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//ValueSpecification"/>
+            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="() : "/>
+            <body xsi:type="mtl:ForBlock">
+              <body xsi:type="ocl.ecore:PropertyCallExp">
+                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
                 <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/24">
                   <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
                 </source>
-                <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/defaultValue"/>
-              </source>
-              <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/uml2/4.0.0/UML#//ValueSpecification/stringValue"/>
+                <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
+              </body>
+              <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="("/>
+              <body xsi:type="ocl.ecore:OperationCallExp">
+                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
+                <source xsi:type="ocl.ecore:PropertyCallExp">
+                  <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//ValueSpecification"/>
+                  <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/25">
+                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
+                  </source>
+                  <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/defaultValue"/>
+                </source>
+                <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/uml2/4.0.0/UML#//ValueSpecification/stringValue"/>
+              </body>
+              <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=")"/>
+              <loopVariable name="a">
+                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
+              </loopVariable>
+              <iterSet xsi:type="ocl.ecore:VariableExp" name="attributeList" eType="/16/Set(Property)" referredVariable="/0/defaultInitializer/%/%/attributeList"/>
+              <each xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=", ">
+                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
+              </each>
             </body>
-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=")"/>
-            <loopVariable name="a">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
-            </loopVariable>
-            <iterSet xsi:type="ocl.ecore:VariableExp" name="attributeList" eType="/16/Set(Property)" referredVariable="/0/defaultInitializer/%/attributeList"/>
-            <each xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=", ">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            </each>
-          </body>
-          <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" {}&#xA;"/>
-          <ifExpr xsi:type="ocl.ecore:OperationCallExp">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-            <source xsi:type="ocl.ecore:OperationCallExp">
-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-              <source xsi:type="ocl.ecore:VariableExp" name="attributeList" eType="/16/Set(Property)" referredVariable="/0/defaultInitializer/%/attributeList"/>
-              <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Set(T)_Class/isEmpty"/>
-            </source>
-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/not"/>
-          </ifExpr>
-        </body>
-        <letVariable name="attributeList" eType="/16/Set(Property)">
-          <initExpression xsi:type="ocl.ecore:IteratorExp" name="select" eType="/16/Set(Property)">
-            <source xsi:type="ocl.ecore:PropertyCallExp" eType="/16/Set(Property)">
-              <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/17">
-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
-              </source>
-              <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/attribute"/>
-            </source>
-            <body xsi:type="ocl.ecore:OperationCallExp">
+            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" {}&#xA;"/>
+            <ifExpr xsi:type="ocl.ecore:OperationCallExp">
               <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
               <source xsi:type="ocl.ecore:OperationCallExp">
                 <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
+                <source xsi:type="ocl.ecore:VariableExp" name="attributeList" eType="/16/Set(Property)" referredVariable="/0/defaultInitializer/%/%/attributeList"/>
+                <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Set(T)_Class/isEmpty"/>
+              </source>
+              <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/not"/>
+            </ifExpr>
+          </body>
+          <letVariable name="attributeList" eType="/16/Set(Property)">
+            <initExpression xsi:type="ocl.ecore:IteratorExp" name="select" eType="/16/Set(Property)">
+              <source xsi:type="ocl.ecore:PropertyCallExp" eType="/16/Set(Property)">
+                <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/18">
+                  <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
+                </source>
+                <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/attribute"/>
+              </source>
+              <body xsi:type="ocl.ecore:OperationCallExp">
+                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
                 <source xsi:type="ocl.ecore:OperationCallExp">
                   <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-                  <source xsi:type="ocl.ecore:PropertyCallExp">
+                  <source xsi:type="ocl.ecore:OperationCallExp">
                     <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-                    <source xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/defaultInitializer/%/attributeList/select/temp1">
-                      <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
+                    <source xsi:type="ocl.ecore:PropertyCallExp">
+                      <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
+                      <source xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/defaultInitializer/%/%/attributeList/select/temp1">
+                        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
+                      </source>
+                      <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Feature/isStatic"/>
                     </source>
-                    <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Feature/isStatic"/>
+                    <argument xsi:type="ocl.ecore:BooleanLiteralExp" booleanSymbol="false">
+                      <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
+                    </argument>
+                    <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/="/>
                   </source>
-                  <argument xsi:type="ocl.ecore:BooleanLiteralExp" booleanSymbol="false">
+                  <argument xsi:type="ocl.ecore:OperationCallExp">
                     <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
+                    <source xsi:type="ocl.ecore:PropertyCallExp">
+                      <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//ValueSpecification"/>
+                      <source xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/defaultInitializer/%/%/attributeList/select/temp1">
+                        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
+                      </source>
+                      <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/defaultValue"/>
+                    </source>
+                    <argument xsi:type="ocl.ecore:NullLiteralExp">
+                      <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/>
+                    </argument>
+                    <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/%3C%3E"/>
                   </argument>
-                  <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/="/>
+                  <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/and"/>
                 </source>
                 <argument xsi:type="ocl.ecore:OperationCallExp">
                   <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-                  <source xsi:type="ocl.ecore:PropertyCallExp">
-                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//ValueSpecification"/>
-                    <source xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/defaultInitializer/%/attributeList/select/temp1">
-                      <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
+                  <source xsi:type="ocl.ecore:OperationCallExp">
+                    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
+                    <source xsi:type="ocl.ecore:PropertyCallExp">
+                      <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//ValueSpecification"/>
+                      <source xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/defaultInitializer/%/%/attributeList/select/temp1">
+                        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
+                      </source>
+                      <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/defaultValue"/>
                     </source>
-                    <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/defaultValue"/>
+                    <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/uml2/4.0.0/UML#//ValueSpecification/stringValue"/>
                   </source>
                   <argument xsi:type="ocl.ecore:NullLiteralExp">
                     <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/>
                   </argument>
-                  <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/%3C%3E"/>
+                  <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String_Class/%3C%3E"/>
                 </argument>
                 <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/and"/>
-              </source>
-              <argument xsi:type="ocl.ecore:OperationCallExp">
-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-                <source xsi:type="ocl.ecore:OperationCallExp">
-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-                  <source xsi:type="ocl.ecore:PropertyCallExp">
-                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//ValueSpecification"/>
-                    <source xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/defaultInitializer/%/attributeList/select/temp1">
-                      <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
-                    </source>
-                    <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property/defaultValue"/>
-                  </source>
-                  <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/uml2/4.0.0/UML#//ValueSpecification/stringValue"/>
-                </source>
-                <argument xsi:type="ocl.ecore:NullLiteralExp">
-                  <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/>
-                </argument>
-                <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String_Class/%3C%3E"/>
+              </body>
+              <iterator xsi:type="ocl.ecore:Variable" name="temp1">
+                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
+              </iterator>
+            </initExpression>
+          </letVariable>
+        </body>
+        <ifExpr xsi:type="ocl.ecore:OperationCallExp">
+          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
+          <source xsi:type="ocl.ecore:IteratorExp" name="any">
+            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
+            <source xsi:type="mtl:QueryInvocation" eType="/16/Sequence(Operation)">
+              <definition href="util/operation/CppOperations.emtl#/0/getOwnedOperations"/>
+              <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/17">
+                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
+              </argument>
+            </source>
+            <body xsi:type="mtl:QueryInvocation">
+              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
+              <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
+              <argument xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/defaultInitializer/%/%.1/any/temp2">
+                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
+              </argument>
+              <argument xsi:type="ocl.ecore:TypeExp" eType="/6/Create">
+                <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2#//Create"/>
               </argument>
-              <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/and"/>
             </body>
-            <iterator xsi:type="ocl.ecore:Variable" name="temp1">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
+            <iterator xsi:type="ocl.ecore:Variable" name="temp2">
+              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
             </iterator>
-          </initExpression>
-        </letVariable>
+          </source>
+          <argument xsi:type="ocl.ecore:NullLiteralExp">
+            <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/>
+          </argument>
+          <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/="/>
+        </ifExpr>
       </body>
       <parameter name="classifier">
         <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
@@ -214,7 +246,7 @@
       <body xsi:type="mtl:QueryInvocation">
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
         <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getFullNameUC"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/31">
+        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/32">
           <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
         </argument>
       </body>
@@ -222,7 +254,7 @@
       <body xsi:type="mtl:QueryInvocation">
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
         <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getFullNameUC"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/32">
+        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/33">
           <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
         </argument>
       </body>
@@ -240,7 +272,7 @@
         <definition href="util/clazz/CppClassIncludeClassDeclaration.emtl#/0/CppOwnerPackageIncludeDeclaration"/>
         <argument xsi:type="ocl.ecore:PropertyCallExp">
           <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package"/>
-          <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/34">
+          <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/35">
             <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
           </source>
           <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Type/package"/>
@@ -250,7 +282,7 @@
       <body xsi:type="mtl:TemplateInvocation">
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
         <definition href="util/clazz/CppClassIncludeClassDeclaration.emtl#/0/CppClassAllIncludesDeclaration"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/35">
+        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/36">
           <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
         </argument>
       </body>
@@ -258,7 +290,7 @@
       <body xsi:type="mtl:TemplateInvocation">
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
         <definition href="CppIncludeUtils.emtl#/0/CppIncludeHeader"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/36">
+        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/37">
           <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
         </argument>
       </body>
@@ -266,7 +298,7 @@
       <body xsi:type="mtl:QueryInvocation">
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
         <definition href="../utils/CppGenUtils.emtl#/0/openNS"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/37">
+        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/38">
           <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
         </argument>
       </body>
@@ -274,7 +306,7 @@
       <body xsi:type="mtl:TemplateInvocation">
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
         <definition href="util/CppDocumentation.emtl#/0/CppElementDoc"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/38">
+        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/39">
           <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
         </argument>
       </body>
@@ -282,13 +314,13 @@
       <body xsi:type="mtl:TemplateInvocation">
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
         <definition href="util/CppTemplates.emtl#/0/templateSignature"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/39">
+        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/40">
           <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
         </argument>
       </body>
       <body xsi:type="mtl:TemplateInvocation" definition="/0/classUnionOrStruct">
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/40">
+        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/41">
           <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
         </argument>
       </body>
@@ -303,7 +335,7 @@
       <body xsi:type="mtl:TemplateInvocation">
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
         <definition href="util/clazz/CppClassInheritedDeclarations.emtl#/0/CppClassInheritedDeclarations"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/42">
+        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/43">
           <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
         </argument>
       </body>
@@ -311,14 +343,14 @@
       <body xsi:type="mtl:TemplateInvocation">
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
         <definition href="util/clazz/CppClassFriendDeclaration.emtl#/0/CppClassIncludeFriendDeclaration"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/43">
+        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/44">
           <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
         </argument>
       </body>
       <body xsi:type="mtl:TemplateInvocation">
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
         <definition href="util/clazz/CppClassTypeAndEnum.emtl#/0/CppClassTypeAndEnum"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/44">
+        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/45">
           <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
         </argument>
       </body>
@@ -332,7 +364,7 @@
         </argument>
         <argument xsi:type="mtl:TemplateInvocation" definition="/0/defaultInitializer">
           <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/45">
+          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/46">
             <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
           </argument>
         </argument>
@@ -348,7 +380,7 @@
         <argument xsi:type="mtl:TemplateInvocation">
           <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
           <definition href="util/clazz/CppClassAttributesDeclaration.emtl#/0/CppClassAttributesDeclaration"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/46">
+          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/47">
             <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
           </argument>
           <argument xsi:type="ocl.ecore:EnumLiteralExp">
@@ -368,7 +400,7 @@
         <argument xsi:type="mtl:TemplateInvocation">
           <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
           <definition href="util/clazz/CppClassOperationsDeclaration.emtl#/0/CppClassOperationsDeclaration"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/47">
+          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/48">
             <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
           </argument>
           <argument xsi:type="ocl.ecore:EnumLiteralExp">
@@ -388,7 +420,7 @@
         <argument xsi:type="mtl:TemplateInvocation">
           <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
           <definition href="util/clazz/CppClassAttributesDeclaration.emtl#/0/CppClassAttributesDeclaration"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/48">
+          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/49">
             <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
           </argument>
           <argument xsi:type="ocl.ecore:EnumLiteralExp">
@@ -408,7 +440,7 @@
         <argument xsi:type="mtl:TemplateInvocation">
           <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
           <definition href="util/clazz/CppClassOperationsDeclaration.emtl#/0/CppClassOperationsDeclaration"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/49">
+          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/50">
             <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
           </argument>
           <argument xsi:type="ocl.ecore:EnumLiteralExp">
@@ -428,7 +460,7 @@
         <argument xsi:type="mtl:TemplateInvocation">
           <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
           <definition href="util/clazz/CppClassAttributesDeclaration.emtl#/0/CppClassAttributesDeclaration"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/50">
+          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/51">
             <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
           </argument>
           <argument xsi:type="ocl.ecore:EnumLiteralExp">
@@ -448,7 +480,7 @@
         <argument xsi:type="mtl:TemplateInvocation">
           <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
           <definition href="util/clazz/CppClassOperationsDeclaration.emtl#/0/CppClassOperationsDeclaration"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/51">
+          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/52">
             <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
           </argument>
           <argument xsi:type="ocl.ecore:EnumLiteralExp">
@@ -461,7 +493,7 @@
       <body xsi:type="mtl:TemplateInvocation">
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
         <definition href="util/clazz/CppClassAttributesDeclaration.emtl#/0/CppClassAttributesDeclaration"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/52">
+        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/53">
           <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
         </argument>
         <argument xsi:type="ocl.ecore:EnumLiteralExp">
@@ -473,7 +505,7 @@
       <body xsi:type="mtl:TemplateInvocation">
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
         <definition href="util/clazz/CppClassOperationsDeclaration.emtl#/0/CppClassOperationsDeclaration"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/53">
+        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/54">
           <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
         </argument>
         <argument xsi:type="ocl.ecore:EnumLiteralExp">
@@ -487,7 +519,7 @@
         <body xsi:type="mtl:TemplateInvocation">
           <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
           <definition href="util/clazz/CppClassOperationsImplementation.emtl#/0/CppClassOperationsImplementation"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/55">
+          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/56">
             <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
           </argument>
           <argument xsi:type="ocl.ecore:BooleanLiteralExp" booleanSymbol="false">
@@ -498,7 +530,7 @@
         <ifExpr xsi:type="mtl:QueryInvocation">
           <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
           <definition href="util/CppTemplates.emtl#/0/isTemplate"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/54">
+          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/55">
             <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
           </argument>
         </ifExpr>
@@ -507,7 +539,7 @@
       <body xsi:type="mtl:TemplateInvocation">
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
         <definition href="util/clazz/CppClassOperationsImplementation.emtl#/0/CppClassOperationsImplementation"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/56">
+        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/57">
           <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
         </argument>
         <argument xsi:type="ocl.ecore:BooleanLiteralExp" booleanSymbol="true">
@@ -518,7 +550,7 @@
       <body xsi:type="mtl:QueryInvocation">
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
         <definition href="../utils/CppGenUtils.emtl#/0/closeNS"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/57">
+        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/58">
           <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
         </argument>
       </body>
@@ -781,6 +813,18 @@
           <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
         </eParameters>
       </eOperations>
+      <eOperations name="getOwnedOperations">
+        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
+          <contents xsi:type="ocl.ecore:Constraint"/>
+        </eAnnotations>
+        <eAnnotations source="MTL">
+          <references href="util/operation/CppOperations.emtl#/0/getOwnedOperations"/>
+        </eAnnotations>
+        <eType xsi:type="ocl.ecore:SequenceType" href="util/operation/CppOperations.emtl#/3/Sequence(Operation)"/>
+        <eParameters name="cl">
+          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
+        </eParameters>
+      </eOperations>
       <eOperations name="isTemplate">
         <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
           <contents xsi:type="ocl.ecore:Constraint"/>
@@ -933,6 +977,9 @@
     <eClassifiers xsi:type="ocl.ecore:TypeType" name="DataType">
       <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//DataType"/>
     </eClassifiers>
+    <eClassifiers xsi:type="ocl.ecore:TypeType" name="Create">
+      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2#//Create"/>
+    </eClassifiers>
   </ecore:EPackage>
   <ocl.ecore:Variable name="self">
     <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
@@ -962,6 +1009,9 @@
     <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
   </ocl.ecore:Variable>
   <ecore:EPackage name="collections">
+    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(Operation)" instanceClassName="java.util.List">
+      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
+    </eClassifiers>
     <eClassifiers xsi:type="ocl.ecore:SetType" name="Set(Property)" instanceClassName="java.util.Set">
       <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
     </eClassifiers>
@@ -982,6 +1032,9 @@
     <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
   </ocl.ecore:Variable>
   <ocl.ecore:Variable name="self">
+    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
+  </ocl.ecore:Variable>
+  <ocl.ecore:Variable name="self">
     <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Property"/>
   </ocl.ecore:Variable>
   <ocl.ecore:Variable name="self">
@@ -1097,23 +1150,23 @@
   </ocl.ecore:Variable>
   <ecore:EAnnotation source="positions">
     <eAnnotations source="positions.0" references="/0/classUnionOrStruct">
-      <details key="start" value="1268"/>
-      <details key="end" value="1580"/>
+      <details key="start" value="1354"/>
+      <details key="end" value="1666"/>
       <details key="line" value="18"/>
     </eAnnotations>
     <eAnnotations source="positions.1" references="/0/classUnionOrStruct/%">
-      <details key="start" value="1330"/>
-      <details key="end" value="1568"/>
+      <details key="start" value="1416"/>
+      <details key="end" value="1654"/>
       <details key="line" value="19"/>
     </eAnnotations>
     <eAnnotations source="positions.2" references="/0/classUnionOrStruct/%/%">
-      <details key="start" value="1365"/>
-      <details key="end" value="1377"/>
+      <details key="start" value="1451"/>
+      <details key="end" value="1463"/>
       <details key="line" value="20"/>
     </eAnnotations>
     <eAnnotations source="positions.3" references="/0/classUnionOrStruct/%/%.1">
-      <details key="start" value="1334"/>
-      <details key="end" value="1363"/>
+      <details key="start" value="1420"/>
+      <details key="end" value="1449"/>
       <details key="line" value="0"/>
     </eAnnotations>
     <eAnnotations source="positions.4" references="/0/classUnionOrStruct/%/%.1/self">
@@ -1122,43 +1175,43 @@
       <details key="line" value="0"/>
     </eAnnotations>
     <eAnnotations source="positions.5" references="/0/classUnionOrStruct/%/%.1/%">
-      <details key="start" value="1349"/>
-      <details key="end" value="1361"/>
+      <details key="start" value="1435"/>
+      <details key="end" value="1447"/>
       <details key="line" value="0"/>
     </eAnnotations>
     <eAnnotations source="positions.6" references="/0/classUnionOrStruct/%/%.2">
-      <details key="start" value="1377"/>
-      <details key="end" value="1563"/>
+      <details key="start" value="1463"/>
+      <details key="end" value="1649"/>
       <details key="line" value="21"/>
     </eAnnotations>
     <eAnnotations source="positions.7" references="/0/classUnionOrStruct/%/%.2/%">
-      <details key="start" value="1385"/>
-      <details key="end" value="1562"/>
+      <details key="start" value="1471"/>
+      <details key="end" value="1648"/>
       <details key="line" value="22"/>
     </eAnnotations>
     <eAnnotations source="positions.8" references="/0/classUnionOrStruct/%/%.2/%/%">
-      <details key="start" value="1414"/>
-      <details key="end" value="1422"/>
+      <details key="start" value="1500"/>
+      <details key="end" value="1508"/>
       <details key="line" value="23"/>
     </eAnnotations>
     <eAnnotations source="positions.9" references="/0/classUnionOrStruct/%/%.2/%/%.1">
-      <details key="start" value="1423"/>
-      <details key="end" value="1463"/>
+      <details key="start" value="1509"/>
+      <details key="end" value="1549"/>
       <details key="line" value="0"/>
     </eAnnotations>
     <eAnnotations source="positions.10" references="/0/classUnionOrStruct/%/%.2/%/%.1/%">
-      <details key="start" value="1423"/>
-      <details key="end" value="1445"/>
+      <details key="start" value="1509"/>
+      <details key="end" value="1531"/>
       <details key="line" value="0"/>
     </eAnnotations>
     <eAnnotations source="positions.11" references="/0/classUnionOrStruct/%/%.2/%/%.2">
-      <details key="start" value="1465"/>
-      <details key="end" value="1481"/>
+      <details key="start" value="1551"/>
+      <details key="end" value="1567"/>
       <details key="line" value="24"/>
     </eAnnotations>
     <eAnnotations source="positions.12" references="/0/classUnionOrStruct/%/%.2/%/%.3">
-      <details key="start" value="1389"/>
-      <details key="end" value="1412"/>
+      <details key="start" value="1475"/>
+      <details key="end" value="1498"/>
       <details key="line" value="0"/>
     </eAnnotations>
     <eAnnotations source="positions.13" references="/0/classUnionOrStruct/%/%.2/%/%.3/self">
@@ -1167,824 +1220,874 @@
       <details key="line" value="0"/>
     </eAnnotations>
     <eAnnotations source="positions.14" references="/0/classUnionOrStruct/%/%.2/%/%.3/%">
-      <details key="start" value="1402"/>
-      <details key="end" value="1410"/>
+      <details key="start" value="1488"/>
+      <details key="end" value="1496"/>
       <details key="line" value="0"/>
     </eAnnotations>
     <eAnnotations source="positions.15" references="/0/classUnionOrStruct/%/%.2/%/%.4">
-      <details key="start" value="1482"/>
-      <details key="end" value="1557"/>
+      <details key="start" value="1568"/>
+      <details key="end" value="1643"/>
       <details key="line" value="25"/>
     </eAnnotations>
     <eAnnotations source="positions.16" references="/0/classUnionOrStruct/%/%.2/%/%.4/%">
-      <details key="start" value="1489"/>
-      <details key="end" value="1497"/>
+      <details key="start" value="1575"/>
+      <details key="end" value="1583"/>
       <details key="line" value="26"/>
     </eAnnotations>
     <eAnnotations source="positions.17" references="/0/classUnionOrStruct/%/%.2/%/%.4/%.1">
-      <details key="start" value="1498"/>
-      <details key="end" value="1539"/>
+      <details key="start" value="1584"/>
+      <details key="end" value="1625"/>
       <details key="line" value="0"/>
     </eAnnotations>
     <eAnnotations source="positions.18" references="/0/classUnionOrStruct/%/%.2/%/%.4/%.1/%">
-      <details key="start" value="1498"/>
-      <details key="end" value="1521"/>
+      <details key="start" value="1584"/>
+      <details key="end" value="1607"/>
       <details key="line" value="0"/>
     </eAnnotations>
     <eAnnotations source="positions.19" references="/0/classUnionOrStruct/%/%.2/%/%.4/%.2">
-      <details key="start" value="1541"/>
-      <details key="end" value="1556"/>
+      <details key="start" value="1627"/>
+      <details key="end" value="1642"/>
       <details key="line" value="27"/>
     </eAnnotations>
     <eAnnotations source="positions.20" references="/0/classUnionOrStruct/classifier">
-      <details key="start" value="1304"/>
-      <details key="end" value="1327"/>
+      <details key="start" value="1390"/>
+      <details key="end" value="1413"/>
       <details key="line" value="18"/>
     </eAnnotations>
     <eAnnotations source="positions.21" references="/0/%">
-      <details key="start" value="1582"/>
-      <details key="end" value="1760"/>
+      <details key="start" value="1668"/>
+      <details key="end" value="1846"/>
       <details key="line" value="0"/>
     </eAnnotations>
     <eAnnotations source="positions.22" references="/0/defaultInitializer">
-      <details key="start" value="1761"/>
-      <details key="end" value="2169"/>
+      <details key="start" value="1847"/>
+      <details key="end" value="3384"/>
       <details key="line" value="35"/>
     </eAnnotations>
     <eAnnotations source="positions.23" references="/0/defaultInitializer/%">
-      <details key="start" value="1836"/>
-      <details key="end" value="2157"/>
-      <details key="line" value="36"/>
+      <details key="start" value="2948"/>
+      <details key="end" value="3372"/>
+      <details key="line" value="54"/>
     </eAnnotations>
     <eAnnotations source="positions.24" references="/0/defaultInitializer/%/%">
-      <details key="start" value="1985"/>
-      <details key="end" value="2151"/>
-      <details key="line" value="40"/>
+      <details key="start" value="3017"/>
+      <details key="end" value="3366"/>
+      <details key="line" value="55"/>
     </eAnnotations>
     <eAnnotations source="positions.25" references="/0/defaultInitializer/%/%/%">
-      <details key="start" value="2019"/>
-      <details key="end" value="2020"/>
-      <details key="line" value="41"/>
+      <details key="start" value="3182"/>
+      <details key="end" value="3360"/>
+      <details key="line" value="59"/>
     </eAnnotations>
-    <eAnnotations source="positions.26" references="/0/defaultInitializer/%/%/%.1">
-      <details key="start" value="2021"/>
-      <details key="end" value="2036"/>
+    <eAnnotations source="positions.26" references="/0/defaultInitializer/%/%/%/%">
+      <details key="start" value="3216"/>
+      <details key="end" value="3221"/>
+      <details key="line" value="60"/>
+    </eAnnotations>
+    <eAnnotations source="positions.27" references="/0/defaultInitializer/%/%/%/%.1">
+      <details key="start" value="3222"/>
+      <details key="end" value="3237"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.27" references="/0/defaultInitializer/%/%/%.1/classifier">
-      <details key="start" value="2021"/>
-      <details key="end" value="2031"/>
+    <eAnnotations source="positions.28" references="/0/defaultInitializer/%/%/%/%.1/classifier">
+      <details key="start" value="3222"/>
+      <details key="end" value="3232"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.28" references="/0/defaultInitializer/%/%/%.2">
-      <details key="start" value="2038"/>
-      <details key="end" value="2043"/>
-      <details key="line" value="41"/>
+    <eAnnotations source="positions.29" references="/0/defaultInitializer/%/%/%/%.2">
+      <details key="start" value="3239"/>
+      <details key="end" value="3244"/>
+      <details key="line" value="60"/>
     </eAnnotations>
-    <eAnnotations source="positions.29" references="/0/defaultInitializer/%/%/%.3">
-      <details key="start" value="2043"/>
-      <details key="end" value="2142"/>
-      <details key="line" value="41"/>
+    <eAnnotations source="positions.30" references="/0/defaultInitializer/%/%/%/%.3">
+      <details key="start" value="3244"/>
+      <details key="end" value="3347"/>
+      <details key="line" value="60"/>
     </eAnnotations>
-    <eAnnotations source="positions.30" references="/0/defaultInitializer/%/%/%.3/%">
-      <details key="start" value="2099"/>
-      <details key="end" value="2103"/>
+    <eAnnotations source="positions.31" references="/0/defaultInitializer/%/%/%/%.3/%">
+      <details key="start" value="3304"/>
+      <details key="end" value="3308"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.31" references="/0/defaultInitializer/%/%/%.3/%/self">
+    <eAnnotations source="positions.32" references="/0/defaultInitializer/%/%/%/%.3/%/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.32" references="/0/defaultInitializer/%/%/%.3/%.1">
-      <details key="start" value="2105"/>
-      <details key="end" value="2106"/>
-      <details key="line" value="42"/>
+    <eAnnotations source="positions.33" references="/0/defaultInitializer/%/%/%/%.3/%.1">
+      <details key="start" value="3310"/>
+      <details key="end" value="3311"/>
+      <details key="line" value="61"/>
     </eAnnotations>
-    <eAnnotations source="positions.33" references="/0/defaultInitializer/%/%/%.3/%.2">
-      <details key="start" value="2107"/>
-      <details key="end" value="2133"/>
+    <eAnnotations source="positions.34" references="/0/defaultInitializer/%/%/%/%.3/%.2">
+      <details key="start" value="3312"/>
+      <details key="end" value="3338"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.34" references="/0/defaultInitializer/%/%/%.3/%.2/%">
-      <details key="start" value="2107"/>
-      <details key="end" value="2119"/>
+    <eAnnotations source="positions.35" references="/0/defaultInitializer/%/%/%/%.3/%.2/%">
+      <details key="start" value="3312"/>
+      <details key="end" value="3324"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.35" references="/0/defaultInitializer/%/%/%.3/%.2/%/self">
+    <eAnnotations source="positions.36" references="/0/defaultInitializer/%/%/%/%.3/%.2/%/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.36" references="/0/defaultInitializer/%/%/%.3/%.3">
-      <details key="start" value="2135"/>
-      <details key="end" value="2136"/>
-      <details key="line" value="42"/>
+    <eAnnotations source="positions.37" references="/0/defaultInitializer/%/%/%/%.3/%.3">
+      <details key="start" value="3340"/>
+      <details key="end" value="3341"/>
+      <details key="line" value="61"/>
     </eAnnotations>
-    <eAnnotations source="positions.37" references="/0/defaultInitializer/%/%/%.3/a">
-      <details key="start" value="2049"/>
-      <details key="end" value="2061"/>
-      <details key="line" value="41"/>
+    <eAnnotations source="positions.38" references="/0/defaultInitializer/%/%/%/%.3/a">
+      <details key="start" value="3250"/>
+      <details key="end" value="3262"/>
+      <details key="line" value="60"/>
     </eAnnotations>
-    <eAnnotations source="positions.38" references="/0/defaultInitializer/%/%/%.3/attributeList">
-      <details key="start" value="2064"/>
-      <details key="end" value="2077"/>
+    <eAnnotations source="positions.39" references="/0/defaultInitializer/%/%/%/%.3/attributeList">
+      <details key="start" value="3265"/>
+      <details key="end" value="3278"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.39" references="/0/defaultInitializer/%/%/%.3/%.4">
-      <details key="start" value="2089"/>
-      <details key="end" value="2093"/>
+    <eAnnotations source="positions.40" references="/0/defaultInitializer/%/%/%/%.3/%.4">
+      <details key="start" value="3290"/>
+      <details key="end" value="3294"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.40" references="/0/defaultInitializer/%/%/%.4">
-      <details key="start" value="2142"/>
-      <details key="end" value="2146"/>
-      <details key="line" value="42"/>
+    <eAnnotations source="positions.41" references="/0/defaultInitializer/%/%/%/%.4">
+      <details key="start" value="3347"/>
+      <details key="end" value="3351"/>
+      <details key="line" value="61"/>
     </eAnnotations>
-    <eAnnotations source="positions.41" references="/0/defaultInitializer/%/%/%.5">
-      <details key="start" value="1989"/>
-      <details key="end" value="2017"/>
+    <eAnnotations source="positions.42" references="/0/defaultInitializer/%/%/%/%.5">
+      <details key="start" value="3186"/>
+      <details key="end" value="3214"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.42" references="/0/defaultInitializer/%/%/%.5/%">
-      <details key="start" value="1993"/>
-      <details key="end" value="2017"/>
+    <eAnnotations source="positions.43" references="/0/defaultInitializer/%/%/%/%.5/%">
+      <details key="start" value="3190"/>
+      <details key="end" value="3214"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.43" references="/0/defaultInitializer/%/%/%.5/%/attributeList">
-      <details key="start" value="1993"/>
-      <details key="end" value="2006"/>
+    <eAnnotations source="positions.44" references="/0/defaultInitializer/%/%/%/%.5/%/attributeList">
+      <details key="start" value="3190"/>
+      <details key="end" value="3203"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.44" references="/0/defaultInitializer/%/attributeList">
-      <details key="start" value="1841"/>
-      <details key="end" value="1983"/>
-      <details key="line" value="36"/>
+    <eAnnotations source="positions.45" references="/0/defaultInitializer/%/%/attributeList">
+      <details key="start" value="3022"/>
+      <details key="end" value="3176"/>
+      <details key="line" value="55"/>
     </eAnnotations>
-    <eAnnotations source="positions.45" references="/0/defaultInitializer/%/attributeList/select">
-      <details key="start" value="1874"/>
-      <details key="end" value="1984"/>
+    <eAnnotations source="positions.46" references="/0/defaultInitializer/%/%/attributeList/select">
+      <details key="start" value="3055"/>
+      <details key="end" value="3177"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.46" references="/0/defaultInitializer/%/attributeList/select/%">
-      <details key="start" value="1874"/>
-      <details key="end" value="1883"/>
+    <eAnnotations source="positions.47" references="/0/defaultInitializer/%/%/attributeList/select/%">
+      <details key="start" value="3055"/>
+      <details key="end" value="3064"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.47" references="/0/defaultInitializer/%/attributeList/select/%/self">
+    <eAnnotations source="positions.48" references="/0/defaultInitializer/%/%/attributeList/select/%/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.48" references="/0/defaultInitializer/%/attributeList/select/%.1">
-      <details key="start" value="1895"/>
-      <details key="end" value="1983"/>
+    <eAnnotations source="positions.49" references="/0/defaultInitializer/%/%/attributeList/select/%.1">
+      <details key="start" value="3080"/>
+      <details key="end" value="3176"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.49" references="/0/defaultInitializer/%/attributeList/select/%.1/%">
-      <details key="start" value="1895"/>
-      <details key="end" value="1941"/>
+    <eAnnotations source="positions.50" references="/0/defaultInitializer/%/%/attributeList/select/%.1/%">
+      <details key="start" value="3080"/>
+      <details key="end" value="3130"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.50" references="/0/defaultInitializer/%/attributeList/select/%.1/%/%">
-      <details key="start" value="1895"/>
-      <details key="end" value="1913"/>
+    <eAnnotations source="positions.51" references="/0/defaultInitializer/%/%/attributeList/select/%.1/%/%">
+      <details key="start" value="3080"/>
+      <details key="end" value="3098"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.51" references="/0/defaultInitializer/%/attributeList/select/%.1/%/%/%">
-      <details key="start" value="1896"/>
-      <details key="end" value="1904"/>
+    <eAnnotations source="positions.52" references="/0/defaultInitializer/%/%/attributeList/select/%.1/%/%/%">
+      <details key="start" value="3081"/>
+      <details key="end" value="3089"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.52" references="/0/defaultInitializer/%/attributeList/select/%.1/%/%/%/temp1">
+    <eAnnotations source="positions.53" references="/0/defaultInitializer/%/%/attributeList/select/%.1/%/%/%/temp1">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.53" references="/0/defaultInitializer/%/attributeList/select/%.1/%/%/%.1">
-      <details key="start" value="1907"/>
-      <details key="end" value="1912"/>
+    <eAnnotations source="positions.54" references="/0/defaultInitializer/%/%/attributeList/select/%.1/%/%/%.1">
+      <details key="start" value="3092"/>
+      <details key="end" value="3097"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.54" references="/0/defaultInitializer/%/attributeList/select/%.1/%/%.1">
-      <details key="start" value="1919"/>
-      <details key="end" value="1941"/>
+    <eAnnotations source="positions.55" references="/0/defaultInitializer/%/%/attributeList/select/%.1/%/%.1">
+      <details key="start" value="3108"/>
+      <details key="end" value="3130"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.55" references="/0/defaultInitializer/%/attributeList/select/%.1/%/%.1/%">
-      <details key="start" value="1920"/>
-      <details key="end" value="1932"/>
+    <eAnnotations source="positions.56" references="/0/defaultInitializer/%/%/attributeList/select/%.1/%/%.1/%">
+      <details key="start" value="3109"/>
+      <details key="end" value="3121"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.56" references="/0/defaultInitializer/%/attributeList/select/%.1/%/%.1/%/temp1">
+    <eAnnotations source="positions.57" references="/0/defaultInitializer/%/%/attributeList/select/%.1/%/%.1/%/temp1">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.57" references="/0/defaultInitializer/%/attributeList/select/%.1/%/%.1/%.1">
-      <details key="start" value="1936"/>
-      <details key="end" value="1940"/>
+    <eAnnotations source="positions.58" references="/0/defaultInitializer/%/%/attributeList/select/%.1/%/%.1/%.1">
+      <details key="start" value="3125"/>
+      <details key="end" value="3129"/>
+      <details key="line" value="0"/>
+    </eAnnotations>
+    <eAnnotations source="positions.59" references="/0/defaultInitializer/%/%/attributeList/select/%.1/%.1">
+      <details key="start" value="3140"/>
+      <details key="end" value="3176"/>
+      <details key="line" value="0"/>
+    </eAnnotations>
+    <eAnnotations source="positions.60" references="/0/defaultInitializer/%/%/attributeList/select/%.1/%.1/%">
+      <details key="start" value="3141"/>
+      <details key="end" value="3167"/>
+      <details key="line" value="0"/>
+    </eAnnotations>
+    <eAnnotations source="positions.61" references="/0/defaultInitializer/%/%/attributeList/select/%.1/%.1/%/%">
+      <details key="start" value="3141"/>
+      <details key="end" value="3153"/>
+      <details key="line" value="0"/>
+    </eAnnotations>
+    <eAnnotations source="positions.62" references="/0/defaultInitializer/%/%/attributeList/select/%.1/%.1/%/%/temp1">
+      <details key="start" value="-1"/>
+      <details key="end" value="-1"/>
+      <details key="line" value="0"/>
+    </eAnnotations>
+    <eAnnotations source="positions.63" references="/0/defaultInitializer/%/%/attributeList/select/%.1/%.1/%.1">
+      <details key="start" value="3171"/>
+      <details key="end" value="3175"/>
+      <details key="line" value="0"/>
+    </eAnnotations>
+    <eAnnotations source="positions.64" references="/0/defaultInitializer/%/%/attributeList/select/temp1">
+      <details key="start" value="-1"/>
+      <details key="end" value="-1"/>
+      <details key="line" value="0"/>
+    </eAnnotations>
+    <eAnnotations source="positions.65" references="/0/defaultInitializer/%/%.1">
+      <details key="start" value="2952"/>
+      <details key="end" value="3011"/>
+      <details key="line" value="0"/>
+    </eAnnotations>
+    <eAnnotations source="positions.66" references="/0/defaultInitializer/%/%.1/any">
+      <details key="start" value="2952"/>
+      <details key="end" value="3004"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.58" references="/0/defaultInitializer/%/attributeList/select/%.1/%.1">
-      <details key="start" value="1947"/>
-      <details key="end" value="1983"/>
+    <eAnnotations source="positions.67" references="/0/defaultInitializer/%/%.1/any/%">
+      <details key="start" value="2952"/>
+      <details key="end" value="2972"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.59" references="/0/defaultInitializer/%/attributeList/select/%.1/%.1/%">
-      <details key="start" value="1948"/>
-      <details key="end" value="1974"/>
+    <eAnnotations source="positions.68" references="/0/defaultInitializer/%/%.1/any/%/self">
+      <details key="start" value="-1"/>
+      <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.60" references="/0/defaultInitializer/%/attributeList/select/%.1/%.1/%/%">
-      <details key="start" value="1948"/>
-      <details key="end" value="1960"/>
+    <eAnnotations source="positions.69" references="/0/defaultInitializer/%/%.1/any/%.1">
+      <details key="start" value="2978"/>
+      <details key="end" value="3003"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.61" references="/0/defaultInitializer/%/attributeList/select/%.1/%.1/%/%/temp1">
+    <eAnnotations source="positions.70" references="/0/defaultInitializer/%/%.1/any/%.1/temp1">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.62" references="/0/defaultInitializer/%/attributeList/select/%.1/%.1/%.1">
-      <details key="start" value="1978"/>
-      <details key="end" value="1982"/>
+    <eAnnotations source="positions.71" references="/0/defaultInitializer/%/%.1/any/%.1/%">
+      <details key="start" value="2992"/>
+      <details key="end" value="3002"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.63" references="/0/defaultInitializer/%/attributeList/select/temp1">
+    <eAnnotations source="positions.72" references="/0/defaultInitializer/%/%.1/any/temp2">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.64" references="/0/defaultInitializer/classifier">
-      <details key="start" value="1797"/>
-      <details key="end" value="1820"/>
+    <eAnnotations source="positions.73" references="/0/defaultInitializer/%/%.1/%">
+      <details key="start" value="3007"/>
+      <details key="end" value="3011"/>
+      <details key="line" value="0"/>
+    </eAnnotations>
+    <eAnnotations source="positions.74" references="/0/defaultInitializer/classifier">
+      <details key="start" value="1883"/>
+      <details key="end" value="1906"/>
       <details key="line" value="35"/>
     </eAnnotations>
-    <eAnnotations source="positions.65" references="/0/defaultInitializer/%.1">
-      <details key="start" value="1827"/>
-      <details key="end" value="1833"/>
+    <eAnnotations source="positions.75" references="/0/defaultInitializer/%.1">
+      <details key="start" value="1913"/>
+      <details key="end" value="1919"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.66" references="/0/defaultInitializer/%.1/self">
+    <eAnnotations source="positions.76" references="/0/defaultInitializer/%.1/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.67" references="/0/CppClassHeader">
-      <details key="start" value="2172"/>
-      <details key="end" value="4287"/>
-      <details key="line" value="47"/>
+    <eAnnotations source="positions.77" references="/0/CppClassHeader">
+      <details key="start" value="3387"/>
+      <details key="end" value="5502"/>
+      <details key="line" value="67"/>
     </eAnnotations>
-    <eAnnotations source="positions.68" references="/0/CppClassHeader/%">
-      <details key="start" value="2225"/>
-      <details key="end" value="2233"/>
-      <details key="line" value="48"/>
+    <eAnnotations source="positions.78" references="/0/CppClassHeader/%">
+      <details key="start" value="3440"/>
+      <details key="end" value="3448"/>
+      <details key="line" value="68"/>
     </eAnnotations>
-    <eAnnotations source="positions.69" references="/0/CppClassHeader/%.1">
-      <details key="start" value="2234"/>
-      <details key="end" value="2249"/>
+    <eAnnotations source="positions.79" references="/0/CppClassHeader/%.1">
+      <details key="start" value="3449"/>
+      <details key="end" value="3464"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.70" references="/0/CppClassHeader/%.1/self">
+    <eAnnotations source="positions.80" references="/0/CppClassHeader/%.1/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.71" references="/0/CppClassHeader/%.2">
-      <details key="start" value="2251"/>
-      <details key="end" value="2262"/>
-      <details key="line" value="48"/>
+    <eAnnotations source="positions.81" references="/0/CppClassHeader/%.2">
+      <details key="start" value="3466"/>
+      <details key="end" value="3477"/>
+      <details key="line" value="68"/>
     </eAnnotations>
-    <eAnnotations source="positions.72" references="/0/CppClassHeader/%.3">
-      <details key="start" value="2263"/>
-      <details key="end" value="2278"/>
+    <eAnnotations source="positions.82" references="/0/CppClassHeader/%.3">
+      <details key="start" value="3478"/>
+      <details key="end" value="3493"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.73" references="/0/CppClassHeader/%.3/self">
+    <eAnnotations source="positions.83" references="/0/CppClassHeader/%.3/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.74" references="/0/CppClassHeader/%.4">
-      <details key="start" value="2280"/>
-      <details key="end" value="2360"/>
-      <details key="line" value="49"/>
+    <eAnnotations source="positions.84" references="/0/CppClassHeader/%.4">
+      <details key="start" value="3495"/>
+      <details key="end" value="3575"/>
+      <details key="line" value="69"/>
     </eAnnotations>
-    <eAnnotations source="positions.75" references="/0/CppClassHeader/%.5">
-      <details key="start" value="2361"/>
-      <details key="end" value="2371"/>
+    <eAnnotations source="positions.85" references="/0/CppClassHeader/%.5">
+      <details key="start" value="3576"/>
+      <details key="end" value="3586"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.76" references="/0/CppClassHeader/%.5/class">
-      <details key="start" value="2361"/>
-      <details key="end" value="2366"/>
+    <eAnnotations source="positions.86" references="/0/CppClassHeader/%.5/class">
+      <details key="start" value="3576"/>
+      <details key="end" value="3581"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.77" references="/0/CppClassHeader/%.6">
-      <details key="start" value="2373"/>
-      <details key="end" value="2451"/>
-      <details key="line" value="52"/>
+    <eAnnotations source="positions.87" references="/0/CppClassHeader/%.6">
+      <details key="start" value="3588"/>
+      <details key="end" value="3666"/>
+      <details key="line" value="72"/>
     </eAnnotations>
-    <eAnnotations source="positions.78" references="/0/CppClassHeader/%.7">
-      <details key="start" value="2452"/>
-      <details key="end" value="2496"/>
+    <eAnnotations source="positions.88" references="/0/CppClassHeader/%.7">
+      <details key="start" value="3667"/>
+      <details key="end" value="3711"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.79" references="/0/CppClassHeader/%.7/%">
-      <details key="start" value="2452"/>
-      <details key="end" value="2460"/>
+    <eAnnotations source="positions.89" references="/0/CppClassHeader/%.7/%">
+      <details key="start" value="3667"/>
+      <details key="end" value="3675"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.80" references="/0/CppClassHeader/%.7/%/self">
+    <eAnnotations source="positions.90" references="/0/CppClassHeader/%.7/%/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.81" references="/0/CppClassHeader/%.8">
-      <details key="start" value="2498"/>
-      <details key="end" value="2500"/>
-      <details key="line" value="56"/>
+    <eAnnotations source="positions.91" references="/0/CppClassHeader/%.8">
+      <details key="start" value="3713"/>
+      <details key="end" value="3715"/>
+      <details key="line" value="76"/>
     </eAnnotations>
-    <eAnnotations source="positions.82" references="/0/CppClassHeader/%.9">
-      <details key="start" value="2501"/>
-      <details key="end" value="2533"/>
+    <eAnnotations source="positions.92" references="/0/CppClassHeader/%.9">
+      <details key="start" value="3716"/>
+      <details key="end" value="3748"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.83" references="/0/CppClassHeader/%.9/self">
+    <eAnnotations source="positions.93" references="/0/CppClassHeader/%.9/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.84" references="/0/CppClassHeader/%.10">
-      <details key="start" value="2535"/>
-      <details key="end" value="2537"/>
-      <details key="line" value="58"/>
+    <eAnnotations source="positions.94" references="/0/CppClassHeader/%.10">
+      <details key="start" value="3750"/>
+      <details key="end" value="3752"/>
+      <details key="line" value="78"/>
     </eAnnotations>
-    <eAnnotations source="positions.85" references="/0/CppClassHeader/%.11">
-      <details key="start" value="2538"/>
-      <details key="end" value="2556"/>
+    <eAnnotations source="positions.95" references="/0/CppClassHeader/%.11">
+      <details key="start" value="3753"/>
+      <details key="end" value="3771"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.86" references="/0/CppClassHeader/%.11/self">
+    <eAnnotations source="positions.96" references="/0/CppClassHeader/%.11/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.87" references="/0/CppClassHeader/%.12">
-      <details key="start" value="2558"/>
-      <details key="end" value="2560"/>
-      <details key="line" value="60"/>
+    <eAnnotations source="positions.97" references="/0/CppClassHeader/%.12">
+      <details key="start" value="3773"/>
+      <details key="end" value="3775"/>
+      <details key="line" value="80"/>
     </eAnnotations>
-    <eAnnotations source="positions.88" references="/0/CppClassHeader/%.13">
-      <details key="start" value="2561"/>
-      <details key="end" value="2569"/>
+    <eAnnotations source="positions.98" references="/0/CppClassHeader/%.13">
+      <details key="start" value="3776"/>
+      <details key="end" value="3784"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.89" references="/0/CppClassHeader/%.13/self">
+    <eAnnotations source="positions.99" references="/0/CppClassHeader/%.13/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.90" references="/0/CppClassHeader/%.14">
-      <details key="start" value="2571"/>
-      <details key="end" value="2637"/>
-      <details key="line" value="61"/>
+    <eAnnotations source="positions.100" references="/0/CppClassHeader/%.14">
+      <details key="start" value="3786"/>
+      <details key="end" value="3852"/>
+      <details key="line" value="81"/>
     </eAnnotations>
-    <eAnnotations source="positions.91" references="/0/CppClassHeader/%.15">
-      <details key="start" value="2638"/>
-      <details key="end" value="2653"/>
+    <eAnnotations source="positions.101" references="/0/CppClassHeader/%.15">
+      <details key="start" value="3853"/>
+      <details key="end" value="3868"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.92" references="/0/CppClassHeader/%.15/self">
+    <eAnnotations source="positions.102" references="/0/CppClassHeader/%.15/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.93" references="/0/CppClassHeader/%.16">
-      <details key="start" value="2655"/>
-      <details key="end" value="2656"/>
-      <details key="line" value="65"/>
+    <eAnnotations source="positions.103" references="/0/CppClassHeader/%.16">
+      <details key="start" value="3870"/>
+      <details key="end" value="3871"/>
+      <details key="line" value="85"/>
     </eAnnotations>
-    <eAnnotations source="positions.94" references="/0/CppClassHeader/%.17">
-      <details key="start" value="2657"/>
-      <details key="end" value="2676"/>
+    <eAnnotations source="positions.104" references="/0/CppClassHeader/%.17">
+      <details key="start" value="3872"/>
+      <details key="end" value="3891"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.95" references="/0/CppClassHeader/%.17/self">
+    <eAnnotations source="positions.105" references="/0/CppClassHeader/%.17/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.96" references="/0/CppClassHeader/%.18">
-      <details key="start" value="2679"/>
-      <details key="end" value="2699"/>
+    <eAnnotations source="positions.106" references="/0/CppClassHeader/%.18">
+      <details key="start" value="3894"/>
+      <details key="end" value="3914"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.97" references="/0/CppClassHeader/%.18/self">
+    <eAnnotations source="positions.107" references="/0/CppClassHeader/%.18/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.98" references="/0/CppClassHeader/%.19">
-      <details key="start" value="2701"/>
-      <details key="end" value="2702"/>
-      <details key="line" value="65"/>
+    <eAnnotations source="positions.108" references="/0/CppClassHeader/%.19">
+      <details key="start" value="3916"/>
+      <details key="end" value="3917"/>
+      <details key="line" value="85"/>
     </eAnnotations>
-    <eAnnotations source="positions.99" references="/0/CppClassHeader/%.20">
-      <details key="start" value="2703"/>
-      <details key="end" value="2713"/>
+    <eAnnotations source="positions.109" references="/0/CppClassHeader/%.20">
+      <details key="start" value="3918"/>
+      <details key="end" value="3928"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.100" references="/0/CppClassHeader/%.20/class">
-      <details key="start" value="2703"/>
-      <details key="end" value="2708"/>
+    <eAnnotations source="positions.110" references="/0/CppClassHeader/%.20/class">
+      <details key="start" value="3918"/>
+      <details key="end" value="3923"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.101" references="/0/CppClassHeader/%.21">
-      <details key="start" value="2716"/>
-      <details key="end" value="2747"/>
+    <eAnnotations source="positions.111" references="/0/CppClassHeader/%.21">
+      <details key="start" value="3931"/>
+      <details key="end" value="3962"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.102" references="/0/CppClassHeader/%.21/self">
+    <eAnnotations source="positions.112" references="/0/CppClassHeader/%.21/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.103" references="/0/CppClassHeader/%.22">
-      <details key="start" value="2749"/>
-      <details key="end" value="2752"/>
-      <details key="line" value="65"/>
+    <eAnnotations source="positions.113" references="/0/CppClassHeader/%.22">
+      <details key="start" value="3964"/>
+      <details key="end" value="3967"/>
+      <details key="line" value="85"/>
     </eAnnotations>
-    <eAnnotations source="positions.104" references="/0/CppClassHeader/%.23">
-      <details key="start" value="2753"/>
-      <details key="end" value="2787"/>
+    <eAnnotations source="positions.114" references="/0/CppClassHeader/%.23">
+      <details key="start" value="3968"/>
+      <details key="end" value="4002"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.105" references="/0/CppClassHeader/%.23/self">
+    <eAnnotations source="positions.115" references="/0/CppClassHeader/%.23/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.106" references="/0/CppClassHeader/%.24">
-      <details key="start" value="2790"/>
-      <details key="end" value="2811"/>
+    <eAnnotations source="positions.116" references="/0/CppClassHeader/%.24">
+      <details key="start" value="4005"/>
+      <details key="end" value="4026"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.107" references="/0/CppClassHeader/%.24/self">
+    <eAnnotations source="positions.117" references="/0/CppClassHeader/%.24/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.108" references="/0/CppClassHeader/%.25">
-      <details key="start" value="2813"/>
-      <details key="end" value="2818"/>
-      <details key="line" value="67"/>
+    <eAnnotations source="positions.118" references="/0/CppClassHeader/%.25">
+      <details key="start" value="4028"/>
+      <details key="end" value="4033"/>
+      <details key="line" value="87"/>
     </eAnnotations>
-    <eAnnotations source="positions.109" references="/0/CppClassHeader/%.26">
-      <details key="start" value="2819"/>
-      <details key="end" value="2874"/>
+    <eAnnotations source="positions.119" references="/0/CppClassHeader/%.26">
+      <details key="start" value="4034"/>
+      <details key="end" value="4089"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.110" references="/0/CppClassHeader/%.26/%">
-      <details key="start" value="2819"/>
-      <details key="end" value="2841"/>
+    <eAnnotations source="positions.120" references="/0/CppClassHeader/%.26/%">
+      <details key="start" value="4034"/>
+      <details key="end" value="4056"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.111" references="/0/CppClassHeader/%.26/%.1">
-      <details key="start" value="2853"/>
-      <details key="end" value="2873"/>
+    <eAnnotations source="positions.121" references="/0/CppClassHeader/%.26/%.1">
+      <details key="start" value="4068"/>
+      <details key="end" value="4088"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.112" references="/0/CppClassHeader/%.26/%.1/self">
+    <eAnnotations source="positions.122" references="/0/CppClassHeader/%.26/%.1/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.113" references="/0/CppClassHeader/%.27">
-      <details key="start" value="2876"/>
-      <details key="end" value="2881"/>
-      <details key="line" value="68"/>
+    <eAnnotations source="positions.123" references="/0/CppClassHeader/%.27">
+      <details key="start" value="4091"/>
+      <details key="end" value="4096"/>
+      <details key="line" value="88"/>
     </eAnnotations>
-    <eAnnotations source="positions.114" references="/0/CppClassHeader/%.28">
-      <details key="start" value="2882"/>
-      <details key="end" value="2970"/>
+    <eAnnotations source="positions.124" references="/0/CppClassHeader/%.28">
+      <details key="start" value="4097"/>
+      <details key="end" value="4185"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.115" references="/0/CppClassHeader/%.28/%">
-      <details key="start" value="2882"/>
-      <details key="end" value="2904"/>
+    <eAnnotations source="positions.125" references="/0/CppClassHeader/%.28/%">
+      <details key="start" value="4097"/>
+      <details key="end" value="4119"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.116" references="/0/CppClassHeader/%.28/%.1">
-      <details key="start" value="2916"/>
-      <details key="end" value="2969"/>
+    <eAnnotations source="positions.126" references="/0/CppClassHeader/%.28/%.1">
+      <details key="start" value="4131"/>
+      <details key="end" value="4184"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.117" references="/0/CppClassHeader/%.28/%.1/self">
+    <eAnnotations source="positions.127" references="/0/CppClassHeader/%.28/%.1/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.118" references="/0/CppClassHeader/%.28/%.1/%">
-      <details key="start" value="2946"/>
-      <details key="end" value="2968"/>
+    <eAnnotations source="positions.128" references="/0/CppClassHeader/%.28/%.1/%">
+      <details key="start" value="4161"/>
+      <details key="end" value="4183"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.119" references="/0/CppClassHeader/%.29">
-      <details key="start" value="2972"/>
-      <details key="end" value="2977"/>
-      <details key="line" value="69"/>
+    <eAnnotations source="positions.129" references="/0/CppClassHeader/%.29">
+      <details key="start" value="4187"/>
+      <details key="end" value="4192"/>
+      <details key="line" value="89"/>
     </eAnnotations>
-    <eAnnotations source="positions.120" references="/0/CppClassHeader/%.30">
-      <details key="start" value="2978"/>
-      <details key="end" value="3066"/>
+    <eAnnotations source="positions.130" references="/0/CppClassHeader/%.30">
+      <details key="start" value="4193"/>
+      <details key="end" value="4281"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.121" references="/0/CppClassHeader/%.30/%">
-      <details key="start" value="2978"/>
-      <details key="end" value="3000"/>
+    <eAnnotations source="positions.131" references="/0/CppClassHeader/%.30/%">
+      <details key="start" value="4193"/>
+      <details key="end" value="4215"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.122" references="/0/CppClassHeader/%.30/%.1">
-      <details key="start" value="3012"/>
-      <details key="end" value="3065"/>
+    <eAnnotations source="positions.132" references="/0/CppClassHeader/%.30/%.1">
+      <details key="start" value="4227"/>
+      <details key="end" value="4280"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.123" references="/0/CppClassHeader/%.30/%.1/self">
+    <eAnnotations source="positions.133" references="/0/CppClassHeader/%.30/%.1/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.124" references="/0/CppClassHeader/%.30/%.1/%">
-      <details key="start" value="3042"/>
-      <details key="end" value="3064"/>
+    <eAnnotations source="positions.134" references="/0/CppClassHeader/%.30/%.1/%">
+      <details key="start" value="4257"/>
+      <details key="end" value="4279"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.125" references="/0/CppClassHeader/%.31">
-      <details key="start" value="3068"/>
-      <details key="end" value="3074"/>
-      <details key="line" value="70"/>
+    <eAnnotations source="positions.135" references="/0/CppClassHeader/%.31">
+      <details key="start" value="4283"/>
+      <details key="end" value="4289"/>
+      <details key="line" value="90"/>
     </eAnnotations>
-    <eAnnotations source="positions.126" references="/0/CppClassHeader/%.32">
-      <details key="start" value="3075"/>
-      <details key="end" value="3169"/>
+    <eAnnotations source="positions.136" references="/0/CppClassHeader/%.32">
+      <details key="start" value="4290"/>
+      <details key="end" value="4384"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.127" references="/0/CppClassHeader/%.32/%">
-      <details key="start" value="3075"/>
-      <details key="end" value="3100"/>
+    <eAnnotations source="positions.137" references="/0/CppClassHeader/%.32/%">
+      <details key="start" value="4290"/>
+      <details key="end" value="4315"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.128" references="/0/CppClassHeader/%.32/%.1">
-      <details key="start" value="3112"/>
-      <details key="end" value="3168"/>
+    <eAnnotations source="positions.138" references="/0/CppClassHeader/%.32/%.1">
+      <details key="start" value="4327"/>
+      <details key="end" value="4383"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.129" references="/0/CppClassHeader/%.32/%.1/self">
+    <eAnnotations source="positions.139" references="/0/CppClassHeader/%.32/%.1/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.130" references="/0/CppClassHeader/%.32/%.1/%">
-      <details key="start" value="3142"/>
-      <details key="end" value="3167"/>
+    <eAnnotations source="positions.140" references="/0/CppClassHeader/%.32/%.1/%">
+      <details key="start" value="4357"/>
+      <details key="end" value="4382"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.131" references="/0/CppClassHeader/%.33">
-      <details key="start" value="3171"/>
-      <details key="end" value="3176"/>
-      <details key="line" value="72"/>
+    <eAnnotations source="positions.141" references="/0/CppClassHeader/%.33">
+      <details key="start" value="4386"/>
+      <details key="end" value="4391"/>
+      <details key="line" value="92"/>
     </eAnnotations>
-    <eAnnotations source="positions.132" references="/0/CppClassHeader/%.34">
-      <details key="start" value="3177"/>
-      <details key="end" value="3271"/>
+    <eAnnotations source="positions.142" references="/0/CppClassHeader/%.34">
+      <details key="start" value="4392"/>
+      <details key="end" value="4486"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.133" references="/0/CppClassHeader/%.34/%">
-      <details key="start" value="3177"/>
-      <details key="end" value="3202"/>
+    <eAnnotations source="positions.143" references="/0/CppClassHeader/%.34/%">
+      <details key="start" value="4392"/>
+      <details key="end" value="4417"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.134" references="/0/CppClassHeader/%.34/%.1">
-      <details key="start" value="3214"/>
-      <details key="end" value="3270"/>
+    <eAnnotations source="positions.144" references="/0/CppClassHeader/%.34/%.1">
+      <details key="start" value="4429"/>
+      <details key="end" value="4485"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.135" references="/0/CppClassHeader/%.34/%.1/self">
+    <eAnnotations source="positions.145" references="/0/CppClassHeader/%.34/%.1/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.136" references="/0/CppClassHeader/%.34/%.1/%">
-      <details key="start" value="3244"/>
-      <details key="end" value="3269"/>
+    <eAnnotations source="positions.146" references="/0/CppClassHeader/%.34/%.1/%">
+      <details key="start" value="4459"/>
+      <details key="end" value="4484"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.137" references="/0/CppClassHeader/%.35">
-      <details key="start" value="3273"/>
-      <details key="end" value="3279"/>
-      <details key="line" value="73"/>
+    <eAnnotations source="positions.147" references="/0/CppClassHeader/%.35">
+      <details key="start" value="4488"/>
+      <details key="end" value="4494"/>
+      <details key="line" value="93"/>
     </eAnnotations>
-    <eAnnotations source="positions.138" references="/0/CppClassHeader/%.36">
-      <details key="start" value="3280"/>
-      <details key="end" value="3370"/>
+    <eAnnotations source="positions.148" references="/0/CppClassHeader/%.36">
+      <details key="start" value="4495"/>
+      <details key="end" value="4585"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.139" references="/0/CppClassHeader/%.36/%">
-      <details key="start" value="3280"/>
-      <details key="end" value="3303"/>
+    <eAnnotations source="positions.149" references="/0/CppClassHeader/%.36/%">
+      <details key="start" value="4495"/>
+      <details key="end" value="4518"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.140" references="/0/CppClassHeader/%.36/%.1">
-      <details key="start" value="3315"/>
-      <details key="end" value="3369"/>
+    <eAnnotations source="positions.150" references="/0/CppClassHeader/%.36/%.1">
+      <details key="start" value="4530"/>
+      <details key="end" value="4584"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.141" references="/0/CppClassHeader/%.36/%.1/self">
+    <eAnnotations source="positions.151" references="/0/CppClassHeader/%.36/%.1/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.142" references="/0/CppClassHeader/%.36/%.1/%">
-      <details key="start" value="3345"/>
-      <details key="end" value="3368"/>
+    <eAnnotations source="positions.152" references="/0/CppClassHeader/%.36/%.1/%">
+      <details key="start" value="4560"/>
+      <details key="end" value="4583"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.143" references="/0/CppClassHeader/%.37">
-      <details key="start" value="3372"/>
-      <details key="end" value="3377"/>
-      <details key="line" value="75"/>
+    <eAnnotations source="positions.153" references="/0/CppClassHeader/%.37">
+      <details key="start" value="4587"/>
+      <details key="end" value="4592"/>
+      <details key="line" value="95"/>
     </eAnnotations>
-    <eAnnotations source="positions.144" references="/0/CppClassHeader/%.38">
-      <details key="start" value="3378"/>
-      <details key="end" value="3468"/>
+    <eAnnotations source="positions.154" references="/0/CppClassHeader/%.38">
+      <details key="start" value="4593"/>
+      <details key="end" value="4683"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.145" references="/0/CppClassHeader/%.38/%">
-      <details key="start" value="3378"/>
-      <details key="end" value="3401"/>
+    <eAnnotations source="positions.155" references="/0/CppClassHeader/%.38/%">
+      <details key="start" value="4593"/>
+      <details key="end" value="4616"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.146" references="/0/CppClassHeader/%.38/%.1">
-      <details key="start" value="3413"/>
-      <details key="end" value="3467"/>
+    <eAnnotations source="positions.156" references="/0/CppClassHeader/%.38/%.1">
+      <details key="start" value="4628"/>
+      <details key="end" value="4682"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.147" references="/0/CppClassHeader/%.38/%.1/self">
+    <eAnnotations source="positions.157" references="/0/CppClassHeader/%.38/%.1/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.148" references="/0/CppClassHeader/%.38/%.1/%">
-      <details key="start" value="3443"/>
-      <details key="end" value="3466"/>
+    <eAnnotations source="positions.158" references="/0/CppClassHeader/%.38/%.1/%">
+      <details key="start" value="4658"/>
+      <details key="end" value="4681"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.149" references="/0/CppClassHeader/%.39">
-      <details key="start" value="3470"/>
-      <details key="end" value="3600"/>
-      <details key="line" value="76"/>
+    <eAnnotations source="positions.159" references="/0/CppClassHeader/%.39">
+      <details key="start" value="4685"/>
+      <details key="end" value="4815"/>
+      <details key="line" value="96"/>
     </eAnnotations>
-    <eAnnotations source="positions.150" references="/0/CppClassHeader/%.40">
-      <details key="start" value="3601"/>
-      <details key="end" value="3656"/>
+    <eAnnotations source="positions.160" references="/0/CppClassHeader/%.40">
+      <details key="start" value="4816"/>
+      <details key="end" value="4871"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.151" references="/0/CppClassHeader/%.40/self">
+    <eAnnotations source="positions.161" references="/0/CppClassHeader/%.40/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.152" references="/0/CppClassHeader/%.40/%">
-      <details key="start" value="3631"/>
-      <details key="end" value="3655"/>
+    <eAnnotations source="positions.162" references="/0/CppClassHeader/%.40/%">
+      <details key="start" value="4846"/>
+      <details key="end" value="4870"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.153" references="/0/CppClassHeader/%.41">
-      <details key="start" value="3658"/>
-      <details key="end" value="3659"/>
-      <details key="line" value="80"/>
+    <eAnnotations source="positions.163" references="/0/CppClassHeader/%.41">
+      <details key="start" value="4873"/>
+      <details key="end" value="4874"/>
+      <details key="line" value="100"/>
     </eAnnotations>
-    <eAnnotations source="positions.154" references="/0/CppClassHeader/%.42">
-      <details key="start" value="3660"/>
-      <details key="end" value="3715"/>
+    <eAnnotations source="positions.164" references="/0/CppClassHeader/%.42">
+      <details key="start" value="4875"/>
+      <details key="end" value="4930"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.155" references="/0/CppClassHeader/%.42/self">
+    <eAnnotations source="positions.165" references="/0/CppClassHeader/%.42/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.156" references="/0/CppClassHeader/%.42/%">
-      <details key="start" value="3690"/>
-      <details key="end" value="3714"/>
+    <eAnnotations source="positions.166" references="/0/CppClassHeader/%.42/%">
+      <details key="start" value="4905"/>
+      <details key="end" value="4929"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.157" references="/0/CppClassHeader/%.43">
-      <details key="start" value="3717"/>
-      <details key="end" value="3782"/>
-      <details key="line" value="81"/>
+    <eAnnotations source="positions.167" references="/0/CppClassHeader/%.43">
+      <details key="start" value="4932"/>
+      <details key="end" value="4997"/>
+      <details key="line" value="101"/>
     </eAnnotations>
-    <eAnnotations source="positions.158" references="/0/CppClassHeader/%.44">
-      <details key="start" value="3782"/>
-      <details key="end" value="3974"/>
-      <details key="line" value="83"/>
+    <eAnnotations source="positions.168" references="/0/CppClassHeader/%.44">
+      <details key="start" value="4997"/>
+      <details key="end" value="5189"/>
+      <details key="line" value="103"/>
     </eAnnotations>
-    <eAnnotations source="positions.159" references="/0/CppClassHeader/%.44/%">
-      <details key="start" value="3800"/>
-      <details key="end" value="3926"/>
-      <details key="line" value="84"/>
+    <eAnnotations source="positions.169" references="/0/CppClassHeader/%.44/%">
+      <details key="start" value="5015"/>
+      <details key="end" value="5141"/>
+      <details key="line" value="104"/>
     </eAnnotations>
-    <eAnnotations source="positions.160" references="/0/CppClassHeader/%.44/%.1">
-      <details key="start" value="3927"/>
-      <details key="end" value="3966"/>
+    <eAnnotations source="positions.170" references="/0/CppClassHeader/%.44/%.1">
+      <details key="start" value="5142"/>
+      <details key="end" value="5181"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.161" references="/0/CppClassHeader/%.44/%.1/self">
+    <eAnnotations source="positions.171" references="/0/CppClassHeader/%.44/%.1/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.162" references="/0/CppClassHeader/%.44/%.1/%">
-      <details key="start" value="3960"/>
-      <details key="end" value="3965"/>
+    <eAnnotations source="positions.172" references="/0/CppClassHeader/%.44/%.1/%">
+      <details key="start" value="5175"/>
+      <details key="end" value="5180"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.163" references="/0/CppClassHeader/%.44/%.2">
-      <details key="start" value="3968"/>
-      <details key="end" value="3969"/>
-      <details key="line" value="87"/>
+    <eAnnotations source="positions.173" references="/0/CppClassHeader/%.44/%.2">
+      <details key="start" value="5183"/>
+      <details key="end" value="5184"/>
+      <details key="line" value="107"/>
     </eAnnotations>
-    <eAnnotations source="positions.164" references="/0/CppClassHeader/%.44/%.3">
-      <details key="start" value="3786"/>
-      <details key="end" value="3798"/>
+    <eAnnotations source="positions.174" references="/0/CppClassHeader/%.44/%.3">
+      <details key="start" value="5001"/>
+      <details key="end" value="5013"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.165" references="/0/CppClassHeader/%.44/%.3/self">
+    <eAnnotations source="positions.175" references="/0/CppClassHeader/%.44/%.3/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.166" references="/0/CppClassHeader/%.45">
-      <details key="start" value="3975"/>
-      <details key="end" value="4039"/>
-      <details key="line" value="88"/>
+    <eAnnotations source="positions.176" references="/0/CppClassHeader/%.45">
+      <details key="start" value="5190"/>
+      <details key="end" value="5254"/>
+      <details key="line" value="108"/>
     </eAnnotations>
-    <eAnnotations source="positions.167" references="/0/CppClassHeader/%.46">
-      <details key="start" value="4040"/>
-      <details key="end" value="4078"/>
+    <eAnnotations source="positions.177" references="/0/CppClassHeader/%.46">
+      <details key="start" value="5255"/>
+      <details key="end" value="5293"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.168" references="/0/CppClassHeader/%.46/self">
+    <eAnnotations source="positions.178" references="/0/CppClassHeader/%.46/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.169" references="/0/CppClassHeader/%.46/%">
-      <details key="start" value="4073"/>
-      <details key="end" value="4077"/>
+    <eAnnotations source="positions.179" references="/0/CppClassHeader/%.46/%">
+      <details key="start" value="5288"/>
+      <details key="end" value="5292"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.170" references="/0/CppClassHeader/%.47">
-      <details key="start" value="4080"/>
-      <details key="end" value="4081"/>
-      <details key="line" value="91"/>
+    <eAnnotations source="positions.180" references="/0/CppClassHeader/%.47">
+      <details key="start" value="5295"/>
+      <details key="end" value="5296"/>
+      <details key="line" value="111"/>
     </eAnnotations>
-    <eAnnotations source="positions.171" references="/0/CppClassHeader/%.48">
-      <details key="start" value="4082"/>
-      <details key="end" value="4091"/>
+    <eAnnotations source="positions.181" references="/0/CppClassHeader/%.48">
+      <details key="start" value="5297"/>
+      <details key="end" value="5306"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.172" references="/0/CppClassHeader/%.48/self">
+    <eAnnotations source="positions.182" references="/0/CppClassHeader/%.48/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.173" references="/0/CppClassHeader/%.49">
-      <details key="start" value="4093"/>
-      <details key="end" value="4178"/>
-      <details key="line" value="92"/>
+    <eAnnotations source="positions.183" references="/0/CppClassHeader/%.49">
+      <details key="start" value="5308"/>
+      <details key="end" value="5393"/>
+      <details key="line" value="112"/>
     </eAnnotations>
-    <eAnnotations source="positions.174" references="/0/CppClassHeader/%.50">
-      <details key="start" value="4179"/>
-      <details key="end" value="4189"/>
+    <eAnnotations source="positions.184" references="/0/CppClassHeader/%.50">
+      <details key="start" value="5394"/>
+      <details key="end" value="5404"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.175" references="/0/CppClassHeader/%.50/class">
-      <details key="start" value="4179"/>
-      <details key="end" value="4184"/>
+    <eAnnotations source="positions.185" references="/0/CppClassHeader/%.50/class">
+      <details key="start" value="5394"/>
+      <details key="end" value="5399"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.176" references="/0/CppClassHeader/%.51">
-      <details key="start" value="4191"/>
-      <details key="end" value="4275"/>
-      <details key="line" value="94"/>
+    <eAnnotations source="positions.186" references="/0/CppClassHeader/%.51">
+      <details key="start" value="5406"/>
+      <details key="end" value="5490"/>
+      <details key="line" value="114"/>
     </eAnnotations>
-    <eAnnotations source="positions.177" references="/0/CppClassHeader/class">
-      <details key="start" value="2204"/>
-      <details key="end" value="2222"/>
-      <details key="line" value="47"/>
+    <eAnnotations source="positions.187" references="/0/CppClassHeader/class">
+      <details key="start" value="3419"/>
+      <details key="end" value="3437"/>
+      <details key="line" value="67"/>
     </eAnnotations>
   </ecore:EAnnotation>
 </xmi:XMI>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.mtl
index 227947b9fd0..d9b6372d9ed 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.mtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.mtl
@@ -11,10 +11,10 @@
 [import org::eclipse::papyrus::cpp::codegen::acceleo::util::clazz::CppClassAttributesDeclaration/]
 [import org::eclipse::papyrus::cpp::codegen::acceleo::util::clazz::CppClassOperationsDeclaration/]
 [import org::eclipse::papyrus::cpp::codegen::acceleo::util::clazz::CppClassOperationsImplementation/]
+[import org::eclipse::papyrus::cpp::codegen::acceleo::util::operation::CppOperations/]
 [import org::eclipse::papyrus::cpp::codegen::acceleo::util::CppTemplates/]
 [import org::eclipse::papyrus::cpp::codegen::acceleo::util::CppDocumentation/]
 
-
 [template public classUnionOrStruct(classifier : Classifier)]
 [if (hasStereotype(C_Cpp::Union))]
     'union'
@@ -33,14 +33,34 @@
 TODO: should be disabled by default, since non-static members can be initialized directly
 in C++ 011/]
 [template public defaultInitializer(classifier : Classifier) post(trim())]
-[let attributeList : Set(Property) = attribute->select(	
-	(isStatic = false) and
-	(defaultValue <> null) and
-	(defaultValue.stringValue() <> null))]
-[if not attributeList->isEmpty()]
-	[classifier.name/]() : [for (a : Property | attributeList) separator(', ')
-		][name/]([defaultValue.stringValue()/])[/for] {}
-[/if][/let]
+[comment
+Bug 422373: The default initializer should not be generated if there are any user-defined
+            constructors.  In plain C++ code, the existence of a constructor with parameters
+            means that the compiler will not synthesize a default one.
+
+            E.g., this would be invalid in plain C++ code:
+            class T1 { };
+            class T2 { public: T(int); };
+            T1 * t1 = new T1;     // OK, sythesized default constructor used
+            T2 * t2a = new T2(5); // OK, user-defined constructor used
+            T2 * t2b = new T2; // ERROR, default constructor was not synthesized
+
+            Also, if the user has provided a default constructor in the code, we don't need
+            to generate a second copy here.  A default constructor should only be generated
+            here if the compiler would have synthesized one anyhow.  Otherwise the default
+            property values should be set in the constructors that are generated by
+            CppClassOperationsDeclaration.
+/]
+[if getOwnedOperations()->any(hasStereotype(l2::Create)) = null]
+    [let attributeList : Set(Property) = attribute->select(	
+    	(isStatic = false) and
+    	(defaultValue <> null) and
+    	(defaultValue.stringValue() <> null))]
+    [if not attributeList->isEmpty()]
+    	[classifier.name/]() : [for (a : Property | attributeList) separator(', ')
+    		][name/]([defaultValue.stringValue()/])[/for] {}
+    [/if][/let]
+[/if]
 [/template]
 
 
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.mtl
index 4e9c816f748..68cfba58136 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.mtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppAttribute.mtl
@@ -36,16 +36,20 @@
 [comment
 return a list of owned attributes, since this is not supported directly on a classifier/]
 [query public getOwnedAttributes(cl : Classifier) : Sequence(Property) =
-	if (cl.oclIsKindOf(Class)) then
+	if cl.oclIsKindOf(Class) then
 		oclAsType(Class).ownedAttribute
 	else
-		if (cl.oclIsKindOf(DataType)) then
+		if cl.oclIsKindOf(DataType) then
 			oclAsType(DataType).ownedAttribute
 		else
-			if (cl.oclIsKindOf(Interface)) then
+			if cl.oclIsKindOf(Interface) then
 				oclAsType(Interface).ownedAttribute
 			else
-				Sequence{}
+				if cl.oclIsKindOf(Signal) then
+					oclAsType(Signal).ownedAttribute
+				else
+					Sequence{}
+				endif
 			endif
 		endif
 	endif
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassFriendDeclaration.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassFriendDeclaration.emtl
index 66d52bdae88..d97b19eb266 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassFriendDeclaration.emtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassFriendDeclaration.emtl
@@ -8,12 +8,12 @@
       <takesTypesFrom href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/>
     </input>
     <imports href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0"/>
-    <imports href="platform:/plugin/utils/CppGenUtils.emtl#/0"/>
+    <imports href="../../../utils/CppGenUtils.emtl#/0"/>
     <ownedModuleElement xsi:type="mtl:Template" name="CppClassFriendDeclaration" visibility="Public">
       <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="friend class "/>
       <body xsi:type="mtl:QueryInvocation">
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="platform:/plugin/utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
+        <definition href="../../../utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
         <argument xsi:type="ocl.ecore:VariableExp" name="friend" referredVariable="/0/CppClassFriendDeclaration/friend">
           <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
         </argument>
@@ -147,7 +147,7 @@
           <contents xsi:type="ocl.ecore:Constraint"/>
         </eAnnotations>
         <eAnnotations source="MTL">
-          <references href="platform:/plugin/utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
+          <references href="../../../utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
         </eAnnotations>
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
         <eParameters name="arg0">
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeClassDeclaration.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeClassDeclaration.emtl
index 182fe336b92..616afb82cc8 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeClassDeclaration.emtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeClassDeclaration.emtl
@@ -8,8 +8,8 @@
       <takesTypesFrom href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/>
     </input>
     <imports href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0"/>
-    <imports href="platform:/plugin/utils/CppGenUtils.emtl#/0"/>
-    <imports href="platform:/plugin/utils/ClassUtils.emtl#/0"/>
+    <imports href="../../../utils/CppGenUtils.emtl#/0"/>
+    <imports href="../../../utils/ClassUtils.emtl#/0"/>
     <imports href="CppClassIncludeDeclaration.emtl#/0"/>
     <ownedModuleElement xsi:type="mtl:Comment">
       <body startPosition="412" endPosition="421" value=" USED??? "/>
@@ -17,7 +17,7 @@
     <ownedModuleElement xsi:type="mtl:Template" name="CppClassIncludeClassDeclarationTemplate" visibility="Public">
       <body xsi:type="mtl:QueryInvocation">
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="platform:/plugin/utils/CppGenUtils.emtl#/0/openNS"/>
+        <definition href="../../../utils/CppGenUtils.emtl#/0/openNS"/>
         <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/7">
           <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
         </argument>
@@ -47,7 +47,7 @@
       <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=";&#xA;"/>
       <body xsi:type="mtl:QueryInvocation">
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="platform:/plugin/utils/CppGenUtils.emtl#/0/closeNS"/>
+        <definition href="../../../utils/CppGenUtils.emtl#/0/closeNS"/>
         <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/11">
           <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
         </argument>
@@ -115,7 +115,7 @@
           <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
         </argument>
         <argument xsi:type="mtl:QueryInvocation" eType="/3/Sequence(Classifier)">
-          <definition href="platform:/plugin/utils/ClassUtils.emtl#/0/includedClassifiers"/>
+          <definition href="../../../utils/ClassUtils.emtl#/0/includedClassifiers"/>
           <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/23">
             <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
           </argument>
@@ -167,17 +167,35 @@
               <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
               <ifExpr xsi:type="ocl.ecore:OperationCallExp">
                 <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-                <source xsi:type="ocl.ecore:PropertyCallExp">
-                  <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
-                  <source xsi:type="ocl.ecore:VariableExp" name="cl" referredVariable="/0/CppClassAllIncludesDeclaration.1/%/cl">
-                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
+                <source xsi:type="ocl.ecore:OperationCallExp">
+                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
+                  <source xsi:type="ocl.ecore:PropertyCallExp">
+                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
+                    <source xsi:type="ocl.ecore:VariableExp" name="cl" referredVariable="/0/CppClassAllIncludesDeclaration.1/%/cl">
+                      <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
+                    </source>
+                    <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/owner"/>
                   </source>
-                  <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/owner"/>
+                  <argument xsi:type="ocl.ecore:NullLiteralExp">
+                    <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/>
+                  </argument>
+                  <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/%3C%3E"/>
                 </source>
-                <argument xsi:type="ocl.ecore:TypeExp" eType="/8/Package">
-                  <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package"/>
+                <argument xsi:type="ocl.ecore:OperationCallExp">
+                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
+                  <source xsi:type="ocl.ecore:PropertyCallExp">
+                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
+                    <source xsi:type="ocl.ecore:VariableExp" name="cl" referredVariable="/0/CppClassAllIncludesDeclaration.1/%/cl">
+                      <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
+                    </source>
+                    <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/owner"/>
+                  </source>
+                  <argument xsi:type="ocl.ecore:TypeExp" eType="/8/Package">
+                    <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package"/>
+                  </argument>
+                  <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclIsKindOf"/>
                 </argument>
-                <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclIsKindOf"/>
+                <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/and"/>
               </ifExpr>
             </body>
             <ifExpr xsi:type="ocl.ecore:OperationCallExp">
@@ -384,7 +402,7 @@
           <contents xsi:type="ocl.ecore:Constraint"/>
         </eAnnotations>
         <eAnnotations source="MTL">
-          <references href="platform:/plugin/utils/CppGenUtils.emtl#/0/openNS"/>
+          <references href="../../../utils/CppGenUtils.emtl#/0/openNS"/>
         </eAnnotations>
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
         <eParameters name="arg0">
@@ -396,7 +414,7 @@
           <contents xsi:type="ocl.ecore:Constraint"/>
         </eAnnotations>
         <eAnnotations source="MTL">
-          <references href="platform:/plugin/utils/CppGenUtils.emtl#/0/closeNS"/>
+          <references href="../../../utils/CppGenUtils.emtl#/0/closeNS"/>
         </eAnnotations>
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
         <eParameters name="arg0">
@@ -408,9 +426,9 @@
           <contents xsi:type="ocl.ecore:Constraint"/>
         </eAnnotations>
         <eAnnotations source="MTL">
-          <references href="platform:/plugin/utils/ClassUtils.emtl#/0/includedClassifiers"/>
+          <references href="../../../utils/ClassUtils.emtl#/0/includedClassifiers"/>
         </eAnnotations>
-        <eType xsi:type="ocl.ecore:SequenceType" href="platform:/plugin/utils/ClassUtils.emtl#/3/Sequence(Classifier)"/>
+        <eType xsi:type="ocl.ecore:SequenceType" href="../../../utils/ClassUtils.emtl#/3/Sequence(Classifier)"/>
         <eParameters name="cl">
           <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
         </eParameters>
@@ -887,210 +905,235 @@
     </eAnnotations>
     <eAnnotations source="positions.47" references="/0/CppClassAllIncludesDeclaration.1">
       <details key="start" value="1204"/>
-      <details key="end" value="2101"/>
+      <details key="end" value="2122"/>
       <details key="line" value="32"/>
     </eAnnotations>
     <eAnnotations source="positions.48" references="/0/CppClassAllIncludesDeclaration.1/%">
       <details key="start" value="1303"/>
-      <details key="end" value="2089"/>
+      <details key="end" value="2110"/>
       <details key="line" value="33"/>
     </eAnnotations>
     <eAnnotations source="positions.49" references="/0/CppClassAllIncludesDeclaration.1/%/%">
       <details key="start" value="1498"/>
-      <details key="end" value="2082"/>
+      <details key="end" value="2103"/>
       <details key="line" value="36"/>
     </eAnnotations>
     <eAnnotations source="positions.50" references="/0/CppClassAllIncludesDeclaration.1/%/%/%">
       <details key="start" value="1582"/>
-      <details key="end" value="2075"/>
+      <details key="end" value="2096"/>
       <details key="line" value="37"/>
     </eAnnotations>
     <eAnnotations source="positions.51" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%">
       <details key="start" value="1855"/>
-      <details key="end" value="1967"/>
+      <details key="end" value="1988"/>
       <details key="line" value="40"/>
     </eAnnotations>
     <eAnnotations source="positions.52" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%/%">
-      <details key="start" value="1893"/>
-      <details key="end" value="1956"/>
+      <details key="start" value="1914"/>
+      <details key="end" value="1977"/>
       <details key="line" value="0"/>
     </eAnnotations>
     <eAnnotations source="positions.53" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%/%/%">
-      <details key="start" value="1893"/>
-      <details key="end" value="1920"/>
+      <details key="start" value="1914"/>
+      <details key="end" value="1941"/>
       <details key="line" value="0"/>
     </eAnnotations>
     <eAnnotations source="positions.54" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%/%/%/%">
-      <details key="start" value="1893"/>
-      <details key="end" value="1901"/>
+      <details key="start" value="1914"/>
+      <details key="end" value="1922"/>
       <details key="line" value="0"/>
     </eAnnotations>
     <eAnnotations source="positions.55" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%/%/%/%/cl">
-      <details key="start" value="1893"/>
-      <details key="end" value="1895"/>
+      <details key="start" value="1914"/>
+      <details key="end" value="1916"/>
       <details key="line" value="0"/>
     </eAnnotations>
     <eAnnotations source="positions.56" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%/%/%/%.1">
-      <details key="start" value="1912"/>
-      <details key="end" value="1919"/>
+      <details key="start" value="1933"/>
+      <details key="end" value="1940"/>
       <details key="line" value="0"/>
     </eAnnotations>
     <eAnnotations source="positions.57" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%/%.1">
-      <details key="start" value="1958"/>
-      <details key="end" value="1959"/>
+      <details key="start" value="1979"/>
+      <details key="end" value="1980"/>
       <details key="line" value="42"/>
     </eAnnotations>
     <eAnnotations source="positions.58" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%/%.2">
       <details key="start" value="1859"/>
-      <details key="end" value="1890"/>
+      <details key="end" value="1911"/>
       <details key="line" value="0"/>
     </eAnnotations>
     <eAnnotations source="positions.59" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%/%.2/%">
       <details key="start" value="1860"/>
+      <details key="end" value="1876"/>
+      <details key="line" value="0"/>
+    </eAnnotations>
+    <eAnnotations source="positions.60" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%/%.2/%/%">
+      <details key="start" value="1860"/>
       <details key="end" value="1868"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.60" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%/%.2/%/cl">
+    <eAnnotations source="positions.61" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%/%.2/%/%/cl">
       <details key="start" value="1860"/>
       <details key="end" value="1862"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.61" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%/%.2/%.1">
+    <eAnnotations source="positions.62" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%/%.2/%/%.1">
+      <details key="start" value="1872"/>
+      <details key="end" value="1876"/>
+      <details key="line" value="0"/>
+    </eAnnotations>
+    <eAnnotations source="positions.63" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%/%.2/%.1">
       <details key="start" value="1881"/>
-      <details key="end" value="1888"/>
+      <details key="end" value="1910"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.62" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.1">
+    <eAnnotations source="positions.64" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%/%.2/%.1/%">
+      <details key="start" value="1881"/>
+      <details key="end" value="1889"/>
+      <details key="line" value="0"/>
+    </eAnnotations>
+    <eAnnotations source="positions.65" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%/%.2/%.1/%/cl">
+      <details key="start" value="1881"/>
+      <details key="end" value="1883"/>
+      <details key="line" value="0"/>
+    </eAnnotations>
+    <eAnnotations source="positions.66" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%/%.2/%.1/%.1">
+      <details key="start" value="1902"/>
+      <details key="end" value="1909"/>
+      <details key="line" value="0"/>
+    </eAnnotations>
+    <eAnnotations source="positions.67" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.1">
       <details key="start" value="1585"/>
       <details key="end" value="1641"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.63" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.1/%">
+    <eAnnotations source="positions.68" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.1/%">
       <details key="start" value="1586"/>
       <details key="end" value="1610"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.64" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.1/%/self">
+    <eAnnotations source="positions.69" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.1/%/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.65" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.1/%/%">
+    <eAnnotations source="positions.70" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.1/%/%">
       <details key="start" value="1598"/>
       <details key="end" value="1609"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.66" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.1/%.1">
+    <eAnnotations source="positions.71" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.1/%.1">
       <details key="start" value="1614"/>
       <details key="end" value="1640"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.67" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.1/%.1/self">
+    <eAnnotations source="positions.72" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.1/%.1/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.68" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.1/%.1/%">
+    <eAnnotations source="positions.73" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.1/%.1/%">
       <details key="start" value="1626"/>
       <details key="end" value="1639"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.69" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.2">
-      <details key="start" value="1970"/>
-      <details key="end" value="2070"/>
+    <eAnnotations source="positions.74" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.2">
+      <details key="start" value="1991"/>
+      <details key="end" value="2091"/>
       <details key="line" value="43"/>
     </eAnnotations>
-    <eAnnotations source="positions.70" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.2/%">
-      <details key="start" value="2037"/>
-      <details key="end" value="2065"/>
+    <eAnnotations source="positions.75" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.2/%">
+      <details key="start" value="2058"/>
+      <details key="end" value="2086"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.71" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.2/%/self">
+    <eAnnotations source="positions.76" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.2/%/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.72" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.2/%.1">
-      <details key="start" value="2067"/>
-      <details key="end" value="2068"/>
+    <eAnnotations source="positions.77" references="/0/CppClassAllIncludesDeclaration.1/%/%/%/%.2/%.1">
+      <details key="start" value="2088"/>
+      <details key="end" value="2089"/>
       <details key="line" value="46"/>
     </eAnnotations>
-    <eAnnotations source="positions.73" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1">
+    <eAnnotations source="positions.78" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1">
       <details key="start" value="1501"/>
       <details key="end" value="1578"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.74" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%">
+    <eAnnotations source="positions.79" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%">
       <details key="start" value="1502"/>
       <details key="end" value="1550"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.75" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%/%">
+    <eAnnotations source="positions.80" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%/%">
       <details key="start" value="1502"/>
       <details key="end" value="1515"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.76" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%/%/cl">
+    <eAnnotations source="positions.81" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%/%/cl">
       <details key="start" value="1503"/>
       <details key="end" value="1505"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.77" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%/%/class">
+    <eAnnotations source="positions.82" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%/%/class">
       <details key="start" value="1509"/>
       <details key="end" value="1514"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.78" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%/%.1">
+    <eAnnotations source="positions.83" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%/%.1">
       <details key="start" value="1520"/>
       <details key="end" value="1550"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.79" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%/%.1/%">
+    <eAnnotations source="positions.84" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%/%.1/%">
       <details key="start" value="1525"/>
       <details key="end" value="1549"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.80" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%/%.1/%/self">
+    <eAnnotations source="positions.85" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%/%.1/%/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.81" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%/%.1/%/%">
+    <eAnnotations source="positions.86" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%/%.1/%/%">
       <details key="start" value="1539"/>
       <details key="end" value="1548"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.82" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%.1">
+    <eAnnotations source="positions.87" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%.1">
       <details key="start" value="1554"/>
       <details key="end" value="1577"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.83" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%.1/self">
+    <eAnnotations source="positions.88" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%.1/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.84" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%.1/%">
+    <eAnnotations source="positions.89" references="/0/CppClassAllIncludesDeclaration.1/%/%/%.1/%.1/%">
       <details key="start" value="1568"/>
       <details key="end" value="1576"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.85" references="/0/CppClassAllIncludesDeclaration.1/%/cl">
+    <eAnnotations source="positions.90" references="/0/CppClassAllIncludesDeclaration.1/%/cl">
       <details key="start" value="1309"/>
       <details key="end" value="1324"/>
       <details key="line" value="33"/>
     </eAnnotations>
-    <eAnnotations source="positions.86" references="/0/CppClassAllIncludesDeclaration.1/%/list">
+    <eAnnotations source="positions.91" references="/0/CppClassAllIncludesDeclaration.1/%/list">
       <details key="start" value="1327"/>
       <details key="end" value="1331"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.87" references="/0/CppClassAllIncludesDeclaration.1/class">
+    <eAnnotations source="positions.92" references="/0/CppClassAllIncludesDeclaration.1/class">
       <details key="start" value="1252"/>
       <details key="end" value="1270"/>
       <details key="line" value="32"/>
     </eAnnotations>
-    <eAnnotations source="positions.88" references="/0/CppClassAllIncludesDeclaration.1/list">
+    <eAnnotations source="positions.93" references="/0/CppClassAllIncludesDeclaration.1/list">
       <details key="start" value="1272"/>
       <details key="end" value="1299"/>
       <details key="line" value="32"/>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeClassDeclaration.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeClassDeclaration.mtl
index 29b005e41a8..0cf24ac0874 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeClassDeclaration.mtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeClassDeclaration.mtl
@@ -37,7 +37,7 @@
 		[if(oclIsKindOf(Enumeration) or oclIsKindOf(PrimitiveType))]
 			[comment Enumeration is not defined in a separate file, but in the package that owns it
 				=> include the owning package (might be a duplicate input, if owning package is also the owner of current class/]
-			[if (cl.owner.oclIsKindOf(Package))]
+			[if (cl.owner <> null and cl.owner.oclIsKindOf(Package))]
 [cl.owner.oclAsType(Package).CppOwnerPackageIncludeDeclaration()/]
 			[/if]
 		[else]
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeDeclaration.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeDeclaration.emtl
index 24d14dd0bdb..706b27a273b 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeDeclaration.emtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassIncludeDeclaration.emtl
@@ -8,7 +8,7 @@
       <takesTypesFrom href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/>
     </input>
     <imports href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0"/>
-    <imports href="platform:/plugin/preferences/CppCodeGenUtils.emtl#/0"/>
+    <imports href="../../../preferences/CppCodeGenUtils.emtl#/0"/>
     <ownedModuleElement xsi:type="mtl:Query" name="includeName" visibility="Public">
       <parameter name="ne">
         <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/>
@@ -119,7 +119,7 @@
             </source>
             <argument xsi:type="mtl:QueryInvocation">
               <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-              <definition href="platform:/plugin/preferences/CppCodeGenUtils.emtl#/0/getHeaderSuffix"/>
+              <definition href="../../../preferences/CppCodeGenUtils.emtl#/0/getHeaderSuffix"/>
               <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/5">
                 <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/>
               </argument>
@@ -308,7 +308,7 @@
           <contents xsi:type="ocl.ecore:Constraint"/>
         </eAnnotations>
         <eAnnotations source="MTL">
-          <references href="platform:/plugin/preferences/CppCodeGenUtils.emtl#/0/getHeaderSuffix"/>
+          <references href="../../../preferences/CppCodeGenUtils.emtl#/0/getHeaderSuffix"/>
         </eAnnotations>
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
       </eOperations>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassInheritedDeclarations.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassInheritedDeclarations.emtl
index 08f2e3c32d2..0dbc6af346a 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassInheritedDeclarations.emtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassInheritedDeclarations.emtl
@@ -8,7 +8,7 @@
       <takesTypesFrom href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/>
     </input>
     <imports href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0"/>
-    <imports href="platform:/plugin/utils/CppGenUtils.emtl#/0"/>
+    <imports href="../../../utils/CppGenUtils.emtl#/0"/>
     <ownedModuleElement xsi:type="mtl:Comment">
       <body startPosition="249" endPosition="516" value="&#xA;Return a list of relationships that are either Generalizations or InterfaceRealiazations&#xA;and the target does not point to a classifier that has the no-code-gen Stereotype&#xA;TODO: not sure if it makes sense NOT to declare an inheritance, since we do not generate code.&#xA;"/>
     </ownedModuleElement>
@@ -155,7 +155,7 @@
         <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" "/>
         <body xsi:type="mtl:QueryInvocation">
           <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <definition href="platform:/plugin/utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
+          <definition href="../../../utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
           <argument xsi:type="ocl.ecore:OperationCallExp">
             <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier"/>
             <source xsi:type="ocl.ecore:OperationCallExp">
@@ -275,7 +275,7 @@
           <contents xsi:type="ocl.ecore:Constraint"/>
         </eAnnotations>
         <eAnnotations source="MTL">
-          <references href="platform:/plugin/utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
+          <references href="../../../utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
         </eAnnotations>
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
         <eParameters name="arg0">
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.emtl
index 3f959ab9cf8..bdf0e257ca7 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.emtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.emtl
@@ -8,7 +8,7 @@
       <takesTypesFrom href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/>
     </input>
     <imports href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0"/>
-    <imports href="platform:/plugin/utils/CppGenUtils.emtl#/0"/>
+    <imports href="../../../utils/CppGenUtils.emtl#/0"/>
     <imports href="../CppPrimitiveTypes.emtl#/0"/>
     <imports href="../CppEnumerations.emtl#/0"/>
     <ownedModuleElement xsi:type="mtl:Template" name="TypeAndEnumForVisibility" visibility="Public">
@@ -157,7 +157,7 @@
       <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="    "/>
       <body xsi:type="mtl:QueryInvocation">
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="platform:/plugin/utils/CppGenUtils.emtl#/0/getSection"/>
+        <definition href="../../../utils/CppGenUtils.emtl#/0/getSection"/>
         <argument xsi:type="ocl.ecore:EnumLiteralExp">
           <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind"/>
           <referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind/public"/>
@@ -176,7 +176,7 @@
       <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;    "/>
       <body xsi:type="mtl:QueryInvocation">
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="platform:/plugin/utils/CppGenUtils.emtl#/0/getSection"/>
+        <definition href="../../../utils/CppGenUtils.emtl#/0/getSection"/>
         <argument xsi:type="ocl.ecore:EnumLiteralExp">
           <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind"/>
           <referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind/protected"/>
@@ -195,7 +195,7 @@
       <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;    "/>
       <body xsi:type="mtl:QueryInvocation">
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="platform:/plugin/utils/CppGenUtils.emtl#/0/getSection"/>
+        <definition href="../../../utils/CppGenUtils.emtl#/0/getSection"/>
         <argument xsi:type="ocl.ecore:EnumLiteralExp">
           <eType xsi:type="ecore:EEnum" href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind"/>
           <referredEnumLiteral xsi:type="ecore:EEnumLiteral" href="http://www.eclipse.org/uml2/4.0.0/UML#//VisibilityKind/private"/>
@@ -328,7 +328,7 @@
           <contents xsi:type="ocl.ecore:Constraint"/>
         </eAnnotations>
         <eAnnotations source="MTL">
-          <references href="platform:/plugin/utils/CppGenUtils.emtl#/0/getSection"/>
+          <references href="../../../utils/CppGenUtils.emtl#/0/getSection"/>
         </eAnnotations>
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
         <eParameters name="arg0">
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.emtl
index a737be04e7c..7fe38baaebb 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.emtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.emtl
@@ -11,8 +11,8 @@
       <takesTypesFrom href="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2#/"/>
     </input>
     <imports href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0"/>
-    <imports href="platform:/plugin/utils/CppGenUtils.emtl#/0"/>
-    <imports href="platform:/plugin/utils/Modifier.emtl#/0"/>
+    <imports href="../../../utils/CppGenUtils.emtl#/0"/>
+    <imports href="../../../utils/Modifier.emtl#/0"/>
     <imports href="../CppDocumentation.emtl#/0"/>
     <imports href="CppParameter.emtl#/0"/>
     <imports href="../CppTemplates.emtl#/0"/>
@@ -180,35 +180,47 @@
         <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
       </parameter>
     </ownedModuleElement>
+    <ownedModuleElement xsi:type="mtl:Query" name="isConsOrDestructor" visibility="Public">
+      <parameter name="operation">
+        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
+      </parameter>
+      <expression xsi:type="ocl.ecore:OperationCallExp">
+        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
+        <source xsi:type="mtl:QueryInvocation">
+          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
+          <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
+          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/19">
+            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
+          </argument>
+          <argument xsi:type="ocl.ecore:TypeExp" eType="/5/Create">
+            <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2#//Create"/>
+          </argument>
+        </source>
+        <argument xsi:type="mtl:QueryInvocation">
+          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
+          <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
+          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/19">
+            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
+          </argument>
+          <argument xsi:type="ocl.ecore:TypeExp" eType="/5/Destroy">
+            <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2#//Destroy"/>
+          </argument>
+        </argument>
+        <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/or"/>
+      </expression>
+      <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
+    </ownedModuleElement>
     <ownedModuleElement xsi:type="mtl:Query" name="ConsDestructorOrVoid" visibility="Public">
       <parameter name="operation">
         <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
       </parameter>
       <expression xsi:type="ocl.ecore:IfExp">
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <condition xsi:type="ocl.ecore:OperationCallExp">
+        <condition xsi:type="mtl:QueryInvocation" definition="/0/isConsOrDestructor">
           <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-          <source xsi:type="mtl:QueryInvocation">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-            <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/19">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
-            </argument>
-            <argument xsi:type="ocl.ecore:TypeExp" eType="/5/Create">
-              <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2#//Create"/>
-            </argument>
-          </source>
-          <argument xsi:type="mtl:QueryInvocation">
-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-            <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/19">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
-            </argument>
-            <argument xsi:type="ocl.ecore:TypeExp" eType="/5/Destroy">
-              <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2#//Destroy"/>
-            </argument>
+          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/22">
+            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
           </argument>
-          <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/or"/>
         </condition>
         <thenExpression xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="">
           <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
@@ -225,15 +237,37 @@
       </parameter>
       <expression xsi:type="ocl.ecore:IfExp">
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <condition xsi:type="mtl:QueryInvocation">
+        <condition xsi:type="ocl.ecore:OperationCallExp">
           <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-          <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/22">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
-          </argument>
-          <argument xsi:type="ocl.ecore:TypeExp" eType="/5/Destroy">
-            <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2#//Destroy"/>
+          <source xsi:type="mtl:QueryInvocation">
+            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
+            <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
+            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/25">
+              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
+            </argument>
+            <argument xsi:type="ocl.ecore:TypeExp" eType="/5/Destroy">
+              <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2#//Destroy"/>
+            </argument>
+          </source>
+          <argument xsi:type="ocl.ecore:OperationCallExp">
+            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
+            <source xsi:type="ocl.ecore:OperationCallExp">
+              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
+              <source xsi:type="ocl.ecore:PropertyCallExp">
+                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
+                <source xsi:type="ocl.ecore:VariableExp" name="operation" referredVariable="/0/destructor/operation">
+                  <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
+                </source>
+                <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
+              </source>
+              <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="~">
+                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
+              </argument>
+              <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String_Class/startsWith"/>
+            </source>
+            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/not"/>
           </argument>
+          <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/and"/>
         </condition>
         <thenExpression xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="~">
           <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
@@ -248,35 +282,45 @@
       <body xsi:type="mtl:IfBlock">
         <body xsi:type="mtl:QueryInvocation" definition="/0/ConsDestructorOrVoid">
           <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/28">
+          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/31">
             <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
           </argument>
         </body>
         <ifExpr xsi:type="ocl.ecore:OperationCallExp">
           <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-          <source xsi:type="ocl.ecore:PropertyCallExp">
-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Type"/>
-            <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/27">
-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
+          <source xsi:type="ocl.ecore:OperationCallExp">
+            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
+            <source xsi:type="ocl.ecore:PropertyCallExp">
+              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Type"/>
+              <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/30">
+                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
+              </source>
+              <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation/type"/>
             </source>
-            <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation/type"/>
+            <argument xsi:type="ocl.ecore:NullLiteralExp">
+              <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/>
+            </argument>
+            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/="/>
           </source>
-          <argument xsi:type="ocl.ecore:NullLiteralExp">
-            <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/>
+          <argument xsi:type="mtl:QueryInvocation" definition="/0/isConsOrDestructor">
+            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
+            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/30">
+              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
+            </argument>
           </argument>
-          <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/="/>
+          <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/or"/>
         </ifExpr>
         <else>
           <body xsi:type="ocl.ecore:IteratorExp" name="collect" eType="/3/Bag(String)">
             <source xsi:type="ocl.ecore:OperationCallExp" eType="/3/Set(Parameter)">
-              <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/29">
+              <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/32">
                 <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
               </source>
               <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation/returnResult"/>
             </source>
             <body xsi:type="mtl:QueryInvocation">
               <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-              <definition href="platform:/plugin/utils/Modifier.emtl#/0/modConst"/>
+              <definition href="../../../utils/Modifier.emtl#/0/modConst"/>
               <argument xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/CppReturnSpec/%/%.2/collect/temp1">
                 <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Parameter"/>
               </argument>
@@ -288,10 +332,10 @@
           <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" "/>
           <body xsi:type="mtl:QueryInvocation">
             <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <definition href="platform:/plugin/utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
+            <definition href="../../../utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
             <argument xsi:type="ocl.ecore:PropertyCallExp">
               <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Type"/>
-              <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/30">
+              <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/33">
                 <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
               </source>
               <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation/type"/>
@@ -299,14 +343,14 @@
           </body>
           <body xsi:type="ocl.ecore:IteratorExp" name="collect" eType="/3/Bag(String)">
             <source xsi:type="ocl.ecore:OperationCallExp" eType="/3/Set(Parameter)">
-              <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/31">
+              <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/34">
                 <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
               </source>
               <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation/returnResult"/>
             </source>
             <body xsi:type="mtl:QueryInvocation">
               <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-              <definition href="platform:/plugin/utils/Modifier.emtl#/0/modPtr"/>
+              <definition href="../../../utils/Modifier.emtl#/0/modPtr"/>
               <argument xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/CppReturnSpec/%/%.2/collect.1/temp2">
                 <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Parameter"/>
               </argument>
@@ -317,14 +361,14 @@
           </body>
           <body xsi:type="ocl.ecore:IteratorExp" name="collect" eType="/3/Bag(String)">
             <source xsi:type="ocl.ecore:OperationCallExp" eType="/3/Set(Parameter)">
-              <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/32">
+              <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/35">
                 <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
               </source>
               <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation/returnResult"/>
             </source>
             <body xsi:type="mtl:QueryInvocation">
               <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-              <definition href="platform:/plugin/utils/Modifier.emtl#/0/modRef"/>
+              <definition href="../../../utils/Modifier.emtl#/0/modRef"/>
               <argument xsi:type="ocl.ecore:VariableExp" name="temp1" referredVariable="/0/CppReturnSpec/%/%.2/collect.2/temp3">
                 <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Parameter"/>
               </argument>
@@ -348,7 +392,7 @@
           <source xsi:type="mtl:QueryInvocation">
             <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Parameter"/>
             <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/returnResult"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/37">
+            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/40">
               <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/>
             </argument>
           </source>
@@ -360,11 +404,11 @@
         <else>
           <body xsi:type="mtl:QueryInvocation">
             <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <definition href="platform:/plugin/utils/Modifier.emtl#/0/modConst"/>
+            <definition href="../../../utils/Modifier.emtl#/0/modConst"/>
             <argument xsi:type="mtl:QueryInvocation">
               <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Parameter"/>
               <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/returnResult"/>
-              <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/38">
+              <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/41">
                 <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/>
               </argument>
             </argument>
@@ -372,13 +416,13 @@
           <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" "/>
           <body xsi:type="mtl:QueryInvocation">
             <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <definition href="platform:/plugin/utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
+            <definition href="../../../utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
             <argument xsi:type="ocl.ecore:PropertyCallExp">
               <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Type"/>
               <source xsi:type="mtl:QueryInvocation">
                 <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Parameter"/>
                 <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/returnResult"/>
-                <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/39">
+                <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/42">
                   <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/>
                 </argument>
               </source>
@@ -387,22 +431,22 @@
           </body>
           <body xsi:type="mtl:QueryInvocation">
             <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <definition href="platform:/plugin/utils/Modifier.emtl#/0/modPtr"/>
+            <definition href="../../../utils/Modifier.emtl#/0/modPtr"/>
             <argument xsi:type="mtl:QueryInvocation">
               <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Parameter"/>
               <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/returnResult"/>
-              <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/40">
+              <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/43">
                 <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/>
               </argument>
             </argument>
           </body>
           <body xsi:type="mtl:QueryInvocation">
             <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <definition href="platform:/plugin/utils/Modifier.emtl#/0/modRef"/>
+            <definition href="../../../utils/Modifier.emtl#/0/modRef"/>
             <argument xsi:type="mtl:QueryInvocation">
               <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Parameter"/>
               <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/returnResult"/>
-              <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/41">
+              <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/44">
                 <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/>
               </argument>
             </argument>
@@ -420,7 +464,7 @@
         <ifExpr xsi:type="mtl:QueryInvocation">
           <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
           <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/46">
+          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/49">
             <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
           </argument>
           <argument xsi:type="ocl.ecore:TypeExp" eType="/5/Inline">
@@ -437,7 +481,7 @@
         <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="static "/>
         <ifExpr xsi:type="ocl.ecore:PropertyCallExp">
           <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
-          <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/51">
+          <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/54">
             <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
           </source>
           <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Feature/isStatic"/>
@@ -451,38 +495,38 @@
       <body xsi:type="mtl:TemplateInvocation">
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
         <definition href="../CppDocumentation.emtl#/0/CppOperationDoc"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/56">
+        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/59">
           <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
         </argument>
       </body>
       <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
       <body xsi:type="mtl:TemplateInvocation" definition="/0/InlineTxt">
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/57">
+        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/60">
           <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
         </argument>
       </body>
       <body xsi:type="mtl:TemplateInvocation" definition="/0/virtualTxt">
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/58">
+        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/61">
           <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
         </argument>
       </body>
       <body xsi:type="mtl:TemplateInvocation" definition="/0/staticTxt">
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/59">
+        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/62">
           <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
         </argument>
       </body>
       <body xsi:type="mtl:TemplateInvocation" definition="/0/CppReturnSpec">
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/60">
+        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/63">
           <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
         </argument>
       </body>
       <body xsi:type="mtl:QueryInvocation" definition="/0/destructor">
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/61">
+        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/64">
           <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
         </argument>
       </body>
@@ -497,7 +541,7 @@
       <body xsi:type="mtl:TemplateInvocation">
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
         <definition href="CppParameter.emtl#/0/CppOperationParameters"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/63">
+        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/66">
           <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
         </argument>
         <argument xsi:type="ocl.ecore:BooleanLiteralExp" booleanSymbol="true">
@@ -507,14 +551,14 @@
       <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=")"/>
       <body xsi:type="mtl:QueryInvocation">
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="platform:/plugin/utils/Modifier.emtl#/0/modConst"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/64">
+        <definition href="../../../utils/Modifier.emtl#/0/modConst"/>
+        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/67">
           <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
         </argument>
       </body>
       <body xsi:type="mtl:TemplateInvocation" definition="/0/virtualSuffix">
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/65">
+        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/68">
           <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
         </argument>
       </body>
@@ -527,20 +571,20 @@
       <body xsi:type="mtl:TemplateInvocation">
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
         <definition href="../CppDocumentation.emtl#/0/CppBehaviorDoc"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/70">
+        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/73">
           <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/>
         </argument>
       </body>
       <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
       <body xsi:type="mtl:TemplateInvocation" definition="/0/InlineTxt">
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/71">
+        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/74">
           <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/>
         </argument>
       </body>
       <body xsi:type="mtl:TemplateInvocation" definition="/0/CppReturnSpec.1">
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/72">
+        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/75">
           <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/>
         </argument>
       </body>
@@ -555,7 +599,7 @@
       <body xsi:type="mtl:TemplateInvocation">
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
         <definition href="CppParameter.emtl#/0/CppBehaviorParameters"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/74">
+        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/77">
           <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/>
         </argument>
         <argument xsi:type="ocl.ecore:BooleanLiteralExp" booleanSymbol="true">
@@ -565,8 +609,8 @@
       <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=")"/>
       <body xsi:type="mtl:QueryInvocation">
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="platform:/plugin/utils/Modifier.emtl#/0/modConst"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/75">
+        <definition href="../../../utils/Modifier.emtl#/0/modConst"/>
+        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/78">
           <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Behavior"/>
         </argument>
       </body>
@@ -585,7 +629,7 @@
             <source xsi:type="mtl:QueryInvocation">
               <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>
               <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getApplication"/>
-              <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/81">
+              <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/84">
                 <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
               </argument>
               <argument xsi:type="ocl.ecore:TypeExp" eType="/5/ConstInit">
@@ -604,7 +648,7 @@
           <source xsi:type="mtl:QueryInvocation">
             <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
             <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/80">
+            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/83">
               <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
             </argument>
             <argument xsi:type="ocl.ecore:TypeExp" eType="/5/ConstInit">
@@ -614,7 +658,7 @@
           <argument xsi:type="mtl:QueryInvocation">
             <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
             <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/hasStereotype.1"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/80">
+            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/83">
               <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
             </argument>
             <argument xsi:type="ocl.ecore:TypeExp" eType="/5/Create">
@@ -629,7 +673,7 @@
       </parameter>
     </ownedModuleElement>
     <ownedModuleElement xsi:type="mtl:Comment">
-      <body startPosition="2955" endPosition="3025" value=" wrapper for native query (otherwise Acceleo does not indent properly)"/>
+      <body startPosition="3111" endPosition="3181" value=" wrapper for native query (otherwise Acceleo does not indent properly)"/>
     </ownedModuleElement>
     <ownedModuleElement xsi:type="mtl:Template" name="getBodyInTemplate" visibility="Public">
       <body xsi:type="ocl.ecore:OperationCallExp">
@@ -637,7 +681,7 @@
         <source xsi:type="mtl:QueryInvocation">
           <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
           <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getBody"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/86">
+          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/89">
             <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
           </argument>
           <argument xsi:type="ocl.ecore:VariableExp" name="language" referredVariable="/0/getBodyInTemplate/language">
@@ -659,13 +703,13 @@
         <body xsi:type="mtl:ForBlock">
           <body xsi:type="ocl.ecore:PropertyCallExp">
             <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/95">
+            <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/98">
               <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Type"/>
             </source>
             <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
           </body>
           <iterSet xsi:type="ocl.ecore:PropertyCallExp" eType="/3/Set(Type)">
-            <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/92">
+            <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/95">
               <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
             </source>
             <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioralFeature/raisedException"/>
@@ -701,7 +745,7 @@
       <body xsi:type="mtl:TemplateInvocation">
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
         <definition href="../CppDocumentation.emtl#/0/CppOperationDoc"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/102">
+        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/105">
           <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
         </argument>
       </body>
@@ -709,7 +753,7 @@
       <body xsi:type="mtl:IfBlock">
         <body xsi:type="mtl:TemplateInvocation" definition="/0/CppReturnSpec">
           <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/104">
+          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/107">
             <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
           </argument>
         </body>
@@ -724,7 +768,7 @@
         <body xsi:type="mtl:TemplateInvocation">
           <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
           <definition href="CppParameter.emtl#/0/CppOperationParameters"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/106">
+          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/109">
             <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
           </argument>
           <argument xsi:type="ocl.ecore:BooleanLiteralExp" booleanSymbol="false">
@@ -735,7 +779,7 @@
         <body xsi:type="mtl:QueryInvocation">
           <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
           <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getBody"/>
-          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/107">
+          <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/110">
             <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
           </argument>
           <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="C/C++">
@@ -761,19 +805,19 @@
           <body xsi:type="mtl:TemplateInvocation">
             <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
             <definition href="../CppTemplates.emtl#/0/templateSignature.1"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/108">
+            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/111">
               <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
             </argument>
           </body>
           <body xsi:type="mtl:TemplateInvocation" definition="/0/InlineTxt">
             <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/109">
+            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/112">
               <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
             </argument>
           </body>
           <body xsi:type="mtl:TemplateInvocation" definition="/0/CppReturnSpec">
             <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/110">
+            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/113">
               <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
             </argument>
           </body>
@@ -798,14 +842,14 @@
           <body xsi:type="mtl:TemplateInvocation">
             <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
             <definition href="../CppTemplates.emtl#/0/templateShortSignature.1"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/112">
+            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/115">
               <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
             </argument>
           </body>
           <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="::"/>
           <body xsi:type="mtl:QueryInvocation" definition="/0/destructor">
             <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/113">
+            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/116">
               <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
             </argument>
           </body>
@@ -820,7 +864,7 @@
           <body xsi:type="mtl:TemplateInvocation">
             <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
             <definition href="CppParameter.emtl#/0/CppOperationParameters"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/115">
+            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/118">
               <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
             </argument>
             <argument xsi:type="ocl.ecore:BooleanLiteralExp" booleanSymbol="false">
@@ -830,27 +874,27 @@
           <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=")"/>
           <body xsi:type="mtl:TemplateInvocation" definition="/0/throws">
             <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/116">
+            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/119">
               <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
             </argument>
           </body>
           <body xsi:type="mtl:QueryInvocation">
             <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <definition href="platform:/plugin/utils/Modifier.emtl#/0/modConst"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/117">
+            <definition href="../../../utils/Modifier.emtl#/0/modConst"/>
+            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/120">
               <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
             </argument>
           </body>
           <body xsi:type="mtl:TemplateInvocation" definition="/0/CppConstInit">
             <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/118">
+            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/121">
               <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
             </argument>
           </body>
           <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" {&#xA;&#x9;"/>
           <body xsi:type="mtl:TemplateInvocation" definition="/0/getBodyInTemplate">
             <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/119">
+            <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/122">
               <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
             </argument>
             <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="C/C++">
@@ -868,14 +912,14 @@
       <body xsi:type="mtl:TemplateInvocation">
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
         <definition href="../CppDocumentation.emtl#/0/CppBehaviorDoc"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/124">
+        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/127">
           <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//OpaqueBehavior"/>
         </argument>
       </body>
       <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>
       <body xsi:type="mtl:TemplateInvocation" definition="/0/CppReturnSpec.1">
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/125">
+        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/128">
           <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//OpaqueBehavior"/>
         </argument>
       </body>
@@ -902,7 +946,7 @@
       <body xsi:type="mtl:TemplateInvocation">
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
         <definition href="CppParameter.emtl#/0/CppBehaviorParameters"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/128">
+        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/131">
           <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//OpaqueBehavior"/>
         </argument>
         <argument xsi:type="ocl.ecore:BooleanLiteralExp" booleanSymbol="false">
@@ -912,8 +956,8 @@
       <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=")"/>
       <body xsi:type="mtl:QueryInvocation">
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="platform:/plugin/utils/Modifier.emtl#/0/modConst"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/129">
+        <definition href="../../../utils/Modifier.emtl#/0/modConst"/>
+        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/132">
           <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//OpaqueBehavior"/>
         </argument>
       </body>
@@ -921,7 +965,7 @@
       <body xsi:type="mtl:QueryInvocation">
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
         <definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getBodyFromOB"/>
-        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/130">
+        <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/133">
           <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//OpaqueBehavior"/>
         </argument>
         <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="C/C++">
@@ -983,6 +1027,16 @@
           <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
         </eParameters>
       </eOperations>
+      <eOperations name="isConsOrDestructor">
+        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
+          <contents xsi:type="ocl.ecore:Constraint"/>
+        </eAnnotations>
+        <eAnnotations source="MTL" references="/0/isConsOrDestructor"/>
+        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>
+        <eParameters name="operation">
+          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
+        </eParameters>
+      </eOperations>
       <eOperations name="ConsDestructorOrVoid">
         <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">
           <contents xsi:type="ocl.ecore:Constraint"/>
@@ -1193,7 +1247,7 @@
           <contents xsi:type="ocl.ecore:Constraint"/>
         </eAnnotations>
         <eAnnotations source="MTL">
-          <references href="platform:/plugin/utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
+          <references href="../../../utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
         </eAnnotations>
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
         <eParameters name="arg0">
@@ -1205,7 +1259,7 @@
           <contents xsi:type="ocl.ecore:Constraint"/>
         </eAnnotations>
         <eAnnotations source="MTL">
-          <references href="platform:/plugin/utils/Modifier.emtl#/0/modPtr"/>
+          <references href="../../../utils/Modifier.emtl#/0/modPtr"/>
         </eAnnotations>
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
         <eParameters name="propertyOrParameter">
@@ -1217,7 +1271,7 @@
           <contents xsi:type="ocl.ecore:Constraint"/>
         </eAnnotations>
         <eAnnotations source="MTL">
-          <references href="platform:/plugin/utils/Modifier.emtl#/0/modRef"/>
+          <references href="../../../utils/Modifier.emtl#/0/modRef"/>
         </eAnnotations>
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
         <eParameters name="propertyOrParameter">
@@ -1229,7 +1283,7 @@
           <contents xsi:type="ocl.ecore:Constraint"/>
         </eAnnotations>
         <eAnnotations source="MTL">
-          <references href="platform:/plugin/utils/Modifier.emtl#/0/modConst"/>
+          <references href="../../../utils/Modifier.emtl#/0/modConst"/>
         </eAnnotations>
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
         <eParameters name="propertyOrParameter">
@@ -1517,6 +1571,15 @@
     <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
   </ocl.ecore:Variable>
   <ocl.ecore:Variable name="self">
+    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
+  </ocl.ecore:Variable>
+  <ocl.ecore:Variable name="self">
+    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
+  </ocl.ecore:Variable>
+  <ocl.ecore:Variable name="self">
+    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Operation"/>
+  </ocl.ecore:Variable>
+  <ocl.ecore:Variable name="self">
     <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
   </ocl.ecore:Variable>
   <ocl.ecore:Variable name="self">
@@ -2108,1310 +2171,1375 @@
       <details key="end" value="1270"/>
       <details key="line" value="33"/>
     </eAnnotations>
-    <eAnnotations source="positions.54" references="/0/ConsDestructorOrVoid">
+    <eAnnotations source="positions.54" references="/0/isConsOrDestructor">
       <details key="start" value="1358"/>
-      <details key="end" value="1516"/>
+      <details key="end" value="1484"/>
       <details key="line" value="38"/>
     </eAnnotations>
-    <eAnnotations source="positions.55" references="/0/ConsDestructorOrVoid/operation">
-      <details key="start" value="1393"/>
-      <details key="end" value="1414"/>
+    <eAnnotations source="positions.55" references="/0/isConsOrDestructor/operation">
+      <details key="start" value="1391"/>
+      <details key="end" value="1412"/>
       <details key="line" value="38"/>
     </eAnnotations>
-    <eAnnotations source="positions.56" references="/0/ConsDestructorOrVoid/%">
-      <details key="start" value="1427"/>
-      <details key="end" value="1514"/>
+    <eAnnotations source="positions.56" references="/0/isConsOrDestructor/%">
+      <details key="start" value="1426"/>
+      <details key="end" value="1481"/>
+      <details key="line" value="0"/>
+    </eAnnotations>
+    <eAnnotations source="positions.57" references="/0/isConsOrDestructor/%/%">
+      <details key="start" value="1426"/>
+      <details key="end" value="1451"/>
+      <details key="line" value="0"/>
+    </eAnnotations>
+    <eAnnotations source="positions.58" references="/0/isConsOrDestructor/%/%/self">
+      <details key="start" value="-1"/>
+      <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.57" references="/0/ConsDestructorOrVoid/%/%">
-      <details key="start" value="1430"/>
-      <details key="end" value="1485"/>
+    <eAnnotations source="positions.59" references="/0/isConsOrDestructor/%/%/%">
+      <details key="start" value="1440"/>
+      <details key="end" value="1450"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.58" references="/0/ConsDestructorOrVoid/%/%/%">
-      <details key="start" value="1430"/>
-      <details key="end" value="1455"/>
+    <eAnnotations source="positions.60" references="/0/isConsOrDestructor/%/%.1">
+      <details key="start" value="1455"/>
+      <details key="end" value="1481"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.59" references="/0/ConsDestructorOrVoid/%/%/%/self">
+    <eAnnotations source="positions.61" references="/0/isConsOrDestructor/%/%.1/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.60" references="/0/ConsDestructorOrVoid/%/%/%/%">
-      <details key="start" value="1444"/>
-      <details key="end" value="1454"/>
+    <eAnnotations source="positions.62" references="/0/isConsOrDestructor/%/%.1/%">
+      <details key="start" value="1469"/>
+      <details key="end" value="1480"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.61" references="/0/ConsDestructorOrVoid/%/%/%.1">
-      <details key="start" value="1459"/>
-      <details key="end" value="1485"/>
+    <eAnnotations source="positions.63" references="/0/ConsDestructorOrVoid">
+      <details key="start" value="1486"/>
+      <details key="end" value="1609"/>
+      <details key="line" value="42"/>
+    </eAnnotations>
+    <eAnnotations source="positions.64" references="/0/ConsDestructorOrVoid/operation">
+      <details key="start" value="1521"/>
+      <details key="end" value="1542"/>
+      <details key="line" value="42"/>
+    </eAnnotations>
+    <eAnnotations source="positions.65" references="/0/ConsDestructorOrVoid/%">
+      <details key="start" value="1555"/>
+      <details key="end" value="1607"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.62" references="/0/ConsDestructorOrVoid/%/%/%.1/self">
+    <eAnnotations source="positions.66" references="/0/ConsDestructorOrVoid/%/%">
+      <details key="start" value="1558"/>
+      <details key="end" value="1578"/>
+      <details key="line" value="0"/>
+    </eAnnotations>
+    <eAnnotations source="positions.67" references="/0/ConsDestructorOrVoid/%/%/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.63" references="/0/ConsDestructorOrVoid/%/%/%.1/%">
-      <details key="start" value="1473"/>
-      <details key="end" value="1484"/>
+    <eAnnotations source="positions.68" references="/0/ConsDestructorOrVoid/%/%.1">
+      <details key="start" value="1585"/>
+      <details key="end" value="1587"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.64" references="/0/ConsDestructorOrVoid/%/%.1">
-      <details key="start" value="1492"/>
-      <details key="end" value="1494"/>
+    <eAnnotations source="positions.69" references="/0/ConsDestructorOrVoid/%/%.2">
+      <details key="start" value="1594"/>
+      <details key="end" value="1601"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.65" references="/0/ConsDestructorOrVoid/%/%.2">
-      <details key="start" value="1501"/>
-      <details key="end" value="1508"/>
-      <details key="line" value="0"/>
+    <eAnnotations source="positions.70" references="/0/destructor">
+      <details key="start" value="1612"/>
+      <details key="end" value="1766"/>
+      <details key="line" value="50"/>
     </eAnnotations>
-    <eAnnotations source="positions.66" references="/0/destructor">
-      <details key="start" value="1519"/>
-      <details key="end" value="1634"/>
-      <details key="line" value="46"/>
+    <eAnnotations source="positions.71" references="/0/destructor/operation">
+      <details key="start" value="1637"/>
+      <details key="end" value="1658"/>
+      <details key="line" value="50"/>
     </eAnnotations>
-    <eAnnotations source="positions.67" references="/0/destructor/operation">
-      <details key="start" value="1544"/>
-      <details key="end" value="1565"/>
-      <details key="line" value="46"/>
+    <eAnnotations source="positions.72" references="/0/destructor/%">
+      <details key="start" value="1671"/>
+      <details key="end" value="1764"/>
+      <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.68" references="/0/destructor/%">
-      <details key="start" value="1578"/>
-      <details key="end" value="1632"/>
+    <eAnnotations source="positions.73" references="/0/destructor/%/%">
+      <details key="start" value="1674"/>
+      <details key="end" value="1739"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.69" references="/0/destructor/%/%">
-      <details key="start" value="1581"/>
-      <details key="end" value="1607"/>
+    <eAnnotations source="positions.74" references="/0/destructor/%/%/%">
+      <details key="start" value="1674"/>
+      <details key="end" value="1700"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.70" references="/0/destructor/%/%/self">
+    <eAnnotations source="positions.75" references="/0/destructor/%/%/%/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.71" references="/0/destructor/%/%/%">
-      <details key="start" value="1595"/>
-      <details key="end" value="1606"/>
+    <eAnnotations source="positions.76" references="/0/destructor/%/%/%/%">
+      <details key="start" value="1688"/>
+      <details key="end" value="1699"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.72" references="/0/destructor/%/%.1">
-      <details key="start" value="1614"/>
-      <details key="end" value="1617"/>
+    <eAnnotations source="positions.77" references="/0/destructor/%/%/%.1">
+      <details key="start" value="1705"/>
+      <details key="end" value="1739"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.73" references="/0/destructor/%/%.2">
-      <details key="start" value="1624"/>
-      <details key="end" value="1626"/>
+    <eAnnotations source="positions.78" references="/0/destructor/%/%/%.1/%">
+      <details key="start" value="1709"/>
+      <details key="end" value="1739"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.74" references="/0/CppReturnSpec">
-      <details key="start" value="1636"/>
-      <details key="end" value="1865"/>
-      <details key="line" value="53"/>
+    <eAnnotations source="positions.79" references="/0/destructor/%/%/%.1/%/%">
+      <details key="start" value="1709"/>
+      <details key="end" value="1723"/>
+      <details key="line" value="0"/>
+    </eAnnotations>
+    <eAnnotations source="positions.80" references="/0/destructor/%/%/%.1/%/%/operation">
+      <details key="start" value="1709"/>
+      <details key="end" value="1718"/>
+      <details key="line" value="0"/>
+    </eAnnotations>
+    <eAnnotations source="positions.81" references="/0/destructor/%/%/%.1/%/%.1">
+      <details key="start" value="1735"/>
+      <details key="end" value="1738"/>
+      <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.75" references="/0/CppReturnSpec/%">
-      <details key="start" value="1691"/>
-      <details key="end" value="1853"/>
-      <details key="line" value="54"/>
+    <eAnnotations source="positions.82" references="/0/destructor/%/%.1">
+      <details key="start" value="1746"/>
+      <details key="end" value="1749"/>
+      <details key="line" value="0"/>
+    </eAnnotations>
+    <eAnnotations source="positions.83" references="/0/destructor/%/%.2">
+      <details key="start" value="1756"/>
+      <details key="end" value="1758"/>
+      <details key="line" value="0"/>
+    </eAnnotations>
+    <eAnnotations source="positions.84" references="/0/CppReturnSpec">
+      <details key="start" value="1768"/>
+      <details key="end" value="2021"/>
+      <details key="line" value="57"/>
+    </eAnnotations>
+    <eAnnotations source="positions.85" references="/0/CppReturnSpec/%">
+      <details key="start" value="1823"/>
+      <details key="end" value="2009"/>
+      <details key="line" value="58"/>
     </eAnnotations>
-    <eAnnotations source="positions.76" references="/0/CppReturnSpec/%/%">
-      <details key="start" value="1710"/>
-      <details key="end" value="1732"/>
+    <eAnnotations source="positions.86" references="/0/CppReturnSpec/%/%">
+      <details key="start" value="1866"/>
+      <details key="end" value="1888"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.77" references="/0/CppReturnSpec/%/%/self">
+    <eAnnotations source="positions.87" references="/0/CppReturnSpec/%/%/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.78" references="/0/CppReturnSpec/%/%.1">
-      <details key="start" value="1695"/>
-      <details key="end" value="1708"/>
+    <eAnnotations source="positions.88" references="/0/CppReturnSpec/%/%.1">
+      <details key="start" value="1827"/>
+      <details key="end" value="1864"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.79" references="/0/CppReturnSpec/%/%.1/%">
-      <details key="start" value="1696"/>
-      <details key="end" value="1700"/>
+    <eAnnotations source="positions.89" references="/0/CppReturnSpec/%/%.1/%">
+      <details key="start" value="1827"/>
+      <details key="end" value="1840"/>
+      <details key="line" value="0"/>
+    </eAnnotations>
+    <eAnnotations source="positions.90" references="/0/CppReturnSpec/%/%.1/%/%">
+      <details key="start" value="1828"/>
+      <details key="end" value="1832"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.80" references="/0/CppReturnSpec/%/%.1/%/self">
+    <eAnnotations source="positions.91" references="/0/CppReturnSpec/%/%.1/%/%/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.81" references="/0/CppReturnSpec/%/%.1/%.1">
-      <details key="start" value="1703"/>
-      <details key="end" value="1707"/>
+    <eAnnotations source="positions.92" references="/0/CppReturnSpec/%/%.1/%/%.1">
+      <details key="start" value="1835"/>
+      <details key="end" value="1839"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.82" references="/0/CppReturnSpec/%/%.2">
-      <details key="start" value="1734"/>
-      <details key="end" value="1848"/>
-      <details key="line" value="54"/>
+    <eAnnotations source="positions.93" references="/0/CppReturnSpec/%/%.1/%.1">
+      <details key="start" value="1844"/>
+      <details key="end" value="1864"/>
+      <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.83" references="/0/CppReturnSpec/%/%.2/collect">
-      <details key="start" value="1741"/>
-      <details key="end" value="1766"/>
+    <eAnnotations source="positions.94" references="/0/CppReturnSpec/%/%.1/%.1/self">
+      <details key="start" value="-1"/>
+      <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.84" references="/0/CppReturnSpec/%/%.2/collect/%">
-      <details key="start" value="1741"/>
-      <details key="end" value="1755"/>
+    <eAnnotations source="positions.95" references="/0/CppReturnSpec/%/%.2">
+      <details key="start" value="1890"/>
+      <details key="end" value="2004"/>
+      <details key="line" value="58"/>
+    </eAnnotations>
+    <eAnnotations source="positions.96" references="/0/CppReturnSpec/%/%.2/collect">
+      <details key="start" value="1897"/>
+      <details key="end" value="1922"/>
+      <details key="line" value="0"/>
+    </eAnnotations>
+    <eAnnotations source="positions.97" references="/0/CppReturnSpec/%/%.2/collect/%">
+      <details key="start" value="1897"/>
+      <details key="end" value="1911"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.85" references="/0/CppReturnSpec/%/%.2/collect/%/self">
+    <eAnnotations source="positions.98" references="/0/CppReturnSpec/%/%.2/collect/%/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.86" references="/0/CppReturnSpec/%/%.2/collect/%.1">
+    <eAnnotations source="positions.99" references="/0/CppReturnSpec/%/%.2/collect/%.1">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.87" references="/0/CppReturnSpec/%/%.2/collect/%.1/temp1">
+    <eAnnotations source="positions.100" references="/0/CppReturnSpec/%/%.2/collect/%.1/temp1">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.88" references="/0/CppReturnSpec/%/%.2/collect/temp1">
+    <eAnnotations source="positions.101" references="/0/CppReturnSpec/%/%.2/collect/temp1">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.89" references="/0/CppReturnSpec/%/%.2/%">
-      <details key="start" value="1768"/>
-      <details key="end" value="1769"/>
-      <details key="line" value="54"/>
+    <eAnnotations source="positions.102" references="/0/CppReturnSpec/%/%.2/%">
+      <details key="start" value="1924"/>
+      <details key="end" value="1925"/>
+      <details key="line" value="58"/>
     </eAnnotations>
-    <eAnnotations source="positions.90" references="/0/CppReturnSpec/%/%.2/%.1">
-      <details key="start" value="1770"/>
-      <details key="end" value="1793"/>
+    <eAnnotations source="positions.103" references="/0/CppReturnSpec/%/%.2/%.1">
+      <details key="start" value="1926"/>
+      <details key="end" value="1949"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.91" references="/0/CppReturnSpec/%/%.2/%.1/%">
-      <details key="start" value="1770"/>
-      <details key="end" value="1774"/>
+    <eAnnotations source="positions.104" references="/0/CppReturnSpec/%/%.2/%.1/%">
+      <details key="start" value="1926"/>
+      <details key="end" value="1930"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.92" references="/0/CppReturnSpec/%/%.2/%.1/%/self">
+    <eAnnotations source="positions.105" references="/0/CppReturnSpec/%/%.2/%.1/%/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.93" references="/0/CppReturnSpec/%/%.2/collect.1">
-      <details key="start" value="1796"/>
-      <details key="end" value="1819"/>
+    <eAnnotations source="positions.106" references="/0/CppReturnSpec/%/%.2/collect.1">
+      <details key="start" value="1952"/>
+      <details key="end" value="1975"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.94" references="/0/CppReturnSpec/%/%.2/collect.1/%">
-      <details key="start" value="1796"/>
-      <details key="end" value="1810"/>
+    <eAnnotations source="positions.107" references="/0/CppReturnSpec/%/%.2/collect.1/%">
+      <details key="start" value="1952"/>
+      <details key="end" value="1966"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.95" references="/0/CppReturnSpec/%/%.2/collect.1/%/self">
+    <eAnnotations source="positions.108" references="/0/CppReturnSpec/%/%.2/collect.1/%/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.96" references="/0/CppReturnSpec/%/%.2/collect.1/%.1">
+    <eAnnotations source="positions.109" references="/0/CppReturnSpec/%/%.2/collect.1/%.1">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.97" references="/0/CppReturnSpec/%/%.2/collect.1/%.1/temp1">
+    <eAnnotations source="positions.110" references="/0/CppReturnSpec/%/%.2/collect.1/%.1/temp1">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.98" references="/0/CppReturnSpec/%/%.2/collect.1/temp2">
+    <eAnnotations source="positions.111" references="/0/CppReturnSpec/%/%.2/collect.1/temp2">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.99" references="/0/CppReturnSpec/%/%.2/collect.2">
-      <details key="start" value="1822"/>
-      <details key="end" value="1845"/>
+    <eAnnotations source="positions.112" references="/0/CppReturnSpec/%/%.2/collect.2">
+      <details key="start" value="1978"/>
+      <details key="end" value="2001"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.100" references="/0/CppReturnSpec/%/%.2/collect.2/%">
-      <details key="start" value="1822"/>
-      <details key="end" value="1836"/>
+    <eAnnotations source="positions.113" references="/0/CppReturnSpec/%/%.2/collect.2/%">
+      <details key="start" value="1978"/>
+      <details key="end" value="1992"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.101" references="/0/CppReturnSpec/%/%.2/collect.2/%/self">
+    <eAnnotations source="positions.114" references="/0/CppReturnSpec/%/%.2/collect.2/%/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.102" references="/0/CppReturnSpec/%/%.2/collect.2/%.1">
+    <eAnnotations source="positions.115" references="/0/CppReturnSpec/%/%.2/collect.2/%.1">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.103" references="/0/CppReturnSpec/%/%.2/collect.2/%.1/temp1">
+    <eAnnotations source="positions.116" references="/0/CppReturnSpec/%/%.2/collect.2/%.1/temp1">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.104" references="/0/CppReturnSpec/%/%.2/collect.2/temp3">
+    <eAnnotations source="positions.117" references="/0/CppReturnSpec/%/%.2/collect.2/temp3">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.105" references="/0/CppReturnSpec/%/%.2/%.2">
-      <details key="start" value="1847"/>
-      <details key="end" value="1848"/>
-      <details key="line" value="54"/>
+    <eAnnotations source="positions.118" references="/0/CppReturnSpec/%/%.2/%.2">
+      <details key="start" value="2003"/>
+      <details key="end" value="2004"/>
+      <details key="line" value="58"/>
     </eAnnotations>
-    <eAnnotations source="positions.106" references="/0/CppReturnSpec/operation">
-      <details key="start" value="1667"/>
-      <details key="end" value="1688"/>
-      <details key="line" value="53"/>
+    <eAnnotations source="positions.119" references="/0/CppReturnSpec/operation">
+      <details key="start" value="1799"/>
+      <details key="end" value="1820"/>
+      <details key="line" value="57"/>
     </eAnnotations>
-    <eAnnotations source="positions.107" references="/0/CppReturnSpec.1">
-      <details key="start" value="1868"/>
-      <details key="end" value="2100"/>
-      <details key="line" value="58"/>
+    <eAnnotations source="positions.120" references="/0/CppReturnSpec.1">
+      <details key="start" value="2024"/>
+      <details key="end" value="2256"/>
+      <details key="line" value="62"/>
     </eAnnotations>
-    <eAnnotations source="positions.108" references="/0/CppReturnSpec.1/%">
-      <details key="start" value="1921"/>
-      <details key="end" value="2088"/>
-      <details key="line" value="59"/>
+    <eAnnotations source="positions.121" references="/0/CppReturnSpec.1/%">
+      <details key="start" value="2077"/>
+      <details key="end" value="2244"/>
+      <details key="line" value="63"/>
     </eAnnotations>
-    <eAnnotations source="positions.109" references="/0/CppReturnSpec.1/%/%">
-      <details key="start" value="1949"/>
-      <details key="end" value="1954"/>
-      <details key="line" value="59"/>
+    <eAnnotations source="positions.122" references="/0/CppReturnSpec.1/%/%">
+      <details key="start" value="2105"/>
+      <details key="end" value="2110"/>
+      <details key="line" value="63"/>
     </eAnnotations>
-    <eAnnotations source="positions.110" references="/0/CppReturnSpec.1/%/%.1">
-      <details key="start" value="1925"/>
-      <details key="end" value="1948"/>
+    <eAnnotations source="positions.123" references="/0/CppReturnSpec.1/%/%.1">
+      <details key="start" value="2081"/>
+      <details key="end" value="2104"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.111" references="/0/CppReturnSpec.1/%/%.1/%">
-      <details key="start" value="1926"/>
-      <details key="end" value="1940"/>
+    <eAnnotations source="positions.124" references="/0/CppReturnSpec.1/%/%.1/%">
+      <details key="start" value="2082"/>
+      <details key="end" value="2096"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.112" references="/0/CppReturnSpec.1/%/%.1/%/self">
+    <eAnnotations source="positions.125" references="/0/CppReturnSpec.1/%/%.1/%/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.113" references="/0/CppReturnSpec.1/%/%.1/%.1">
-      <details key="start" value="1943"/>
-      <details key="end" value="1947"/>
+    <eAnnotations source="positions.126" references="/0/CppReturnSpec.1/%/%.1/%.1">
+      <details key="start" value="2099"/>
+      <details key="end" value="2103"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.114" references="/0/CppReturnSpec.1/%/%.2">
-      <details key="start" value="1954"/>
-      <details key="end" value="2083"/>
-      <details key="line" value="59"/>
+    <eAnnotations source="positions.127" references="/0/CppReturnSpec.1/%/%.2">
+      <details key="start" value="2110"/>
+      <details key="end" value="2239"/>
+      <details key="line" value="63"/>
     </eAnnotations>
-    <eAnnotations source="positions.115" references="/0/CppReturnSpec.1/%/%.2/%">
-      <details key="start" value="1961"/>
-      <details key="end" value="1986"/>
+    <eAnnotations source="positions.128" references="/0/CppReturnSpec.1/%/%.2/%">
+      <details key="start" value="2117"/>
+      <details key="end" value="2142"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.116" references="/0/CppReturnSpec.1/%/%.2/%/%">
-      <details key="start" value="1961"/>
-      <details key="end" value="1975"/>
+    <eAnnotations source="positions.129" references="/0/CppReturnSpec.1/%/%.2/%/%">
+      <details key="start" value="2117"/>
+      <details key="end" value="2131"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.117" references="/0/CppReturnSpec.1/%/%.2/%/%/self">
+    <eAnnotations source="positions.130" references="/0/CppReturnSpec.1/%/%.2/%/%/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.118" references="/0/CppReturnSpec.1/%/%.2/%.1">
-      <details key="start" value="1988"/>
-      <details key="end" value="1989"/>
-      <details key="line" value="59"/>
+    <eAnnotations source="positions.131" references="/0/CppReturnSpec.1/%/%.2/%.1">
+      <details key="start" value="2144"/>
+      <details key="end" value="2145"/>
+      <details key="line" value="63"/>
     </eAnnotations>
-    <eAnnotations source="positions.119" references="/0/CppReturnSpec.1/%/%.2/%.2">
-      <details key="start" value="1990"/>
-      <details key="end" value="2028"/>
+    <eAnnotations source="positions.132" references="/0/CppReturnSpec.1/%/%.2/%.2">
+      <details key="start" value="2146"/>
+      <details key="end" value="2184"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.120" references="/0/CppReturnSpec.1/%/%.2/%.2/%">
-      <details key="start" value="1990"/>
-      <details key="end" value="2009"/>
+    <eAnnotations source="positions.133" references="/0/CppReturnSpec.1/%/%.2/%.2/%">
+      <details key="start" value="2146"/>
+      <details key="end" value="2165"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.121" references="/0/CppReturnSpec.1/%/%.2/%.2/%/%">
-      <details key="start" value="1990"/>
-      <details key="end" value="2004"/>
+    <eAnnotations source="positions.134" references="/0/CppReturnSpec.1/%/%.2/%.2/%/%">
+      <details key="start" value="2146"/>
+      <details key="end" value="2160"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.122" references="/0/CppReturnSpec.1/%/%.2/%.2/%/%/self">
+    <eAnnotations source="positions.135" references="/0/CppReturnSpec.1/%/%.2/%.2/%/%/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.123" references="/0/CppReturnSpec.1/%/%.2/%.3">
-      <details key="start" value="2031"/>
-      <details key="end" value="2054"/>
+    <eAnnotations source="positions.136" references="/0/CppReturnSpec.1/%/%.2/%.3">
+      <details key="start" value="2187"/>
+      <details key="end" value="2210"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.124" references="/0/CppReturnSpec.1/%/%.2/%.3/%">
-      <details key="start" value="2031"/>
-      <details key="end" value="2045"/>
+    <eAnnotations source="positions.137" references="/0/CppReturnSpec.1/%/%.2/%.3/%">
+      <details key="start" value="2187"/>
+      <details key="end" value="2201"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.125" references="/0/CppReturnSpec.1/%/%.2/%.3/%/self">
+    <eAnnotations source="positions.138" references="/0/CppReturnSpec.1/%/%.2/%.3/%/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.126" references="/0/CppReturnSpec.1/%/%.2/%.4">
-      <details key="start" value="2057"/>
-      <details key="end" value="2080"/>
+    <eAnnotations source="positions.139" references="/0/CppReturnSpec.1/%/%.2/%.4">
+      <details key="start" value="2213"/>
+      <details key="end" value="2236"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.127" references="/0/CppReturnSpec.1/%/%.2/%.4/%">
-      <details key="start" value="2057"/>
-      <details key="end" value="2071"/>
+    <eAnnotations source="positions.140" references="/0/CppReturnSpec.1/%/%.2/%.4/%">
+      <details key="start" value="2213"/>
+      <details key="end" value="2227"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.128" references="/0/CppReturnSpec.1/%/%.2/%.4/%/self">
+    <eAnnotations source="positions.141" references="/0/CppReturnSpec.1/%/%.2/%.4/%/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.129" references="/0/CppReturnSpec.1/%/%.2/%.5">
-      <details key="start" value="2082"/>
-      <details key="end" value="2083"/>
-      <details key="line" value="59"/>
+    <eAnnotations source="positions.142" references="/0/CppReturnSpec.1/%/%.2/%.5">
+      <details key="start" value="2238"/>
+      <details key="end" value="2239"/>
+      <details key="line" value="63"/>
     </eAnnotations>
-    <eAnnotations source="positions.130" references="/0/CppReturnSpec.1/behavior">
-      <details key="start" value="1899"/>
-      <details key="end" value="1918"/>
-      <details key="line" value="58"/>
+    <eAnnotations source="positions.143" references="/0/CppReturnSpec.1/behavior">
+      <details key="start" value="2055"/>
+      <details key="end" value="2074"/>
+      <details key="line" value="62"/>
     </eAnnotations>
-    <eAnnotations source="positions.131" references="/0/InlineTxt">
-      <details key="start" value="2103"/>
-      <details key="end" value="2202"/>
-      <details key="line" value="63"/>
+    <eAnnotations source="positions.144" references="/0/InlineTxt">
+      <details key="start" value="2259"/>
+      <details key="end" value="2358"/>
+      <details key="line" value="67"/>
     </eAnnotations>
-    <eAnnotations source="positions.132" references="/0/InlineTxt/%">
-      <details key="start" value="2150"/>
-      <details key="end" value="2190"/>
-      <details key="line" value="64"/>
+    <eAnnotations source="positions.145" references="/0/InlineTxt/%">
+      <details key="start" value="2306"/>
+      <details key="end" value="2346"/>
+      <details key="line" value="68"/>
     </eAnnotations>
-    <eAnnotations source="positions.133" references="/0/InlineTxt/%/%">
-      <details key="start" value="2178"/>
-      <details key="end" value="2185"/>
-      <details key="line" value="64"/>
+    <eAnnotations source="positions.146" references="/0/InlineTxt/%/%">
+      <details key="start" value="2334"/>
+      <details key="end" value="2341"/>
+      <details key="line" value="68"/>
     </eAnnotations>
-    <eAnnotations source="positions.134" references="/0/InlineTxt/%/%.1">
-      <details key="start" value="2154"/>
-      <details key="end" value="2177"/>
+    <eAnnotations source="positions.147" references="/0/InlineTxt/%/%.1">
+      <details key="start" value="2310"/>
+      <details key="end" value="2333"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.135" references="/0/InlineTxt/%/%.1/self">
+    <eAnnotations source="positions.148" references="/0/InlineTxt/%/%.1/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.136" references="/0/InlineTxt/%/%.1/%">
-      <details key="start" value="2169"/>
-      <details key="end" value="2175"/>
+    <eAnnotations source="positions.149" references="/0/InlineTxt/%/%.1/%">
+      <details key="start" value="2325"/>
+      <details key="end" value="2331"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.137" references="/0/InlineTxt/element">
-      <details key="start" value="2130"/>
-      <details key="end" value="2147"/>
-      <details key="line" value="63"/>
+    <eAnnotations source="positions.150" references="/0/InlineTxt/element">
+      <details key="start" value="2286"/>
+      <details key="end" value="2303"/>
+      <details key="line" value="67"/>
     </eAnnotations>
-    <eAnnotations source="positions.138" references="/0/staticTxt">
-      <details key="start" value="2205"/>
-      <details key="end" value="2295"/>
-      <details key="line" value="68"/>
+    <eAnnotations source="positions.151" references="/0/staticTxt">
+      <details key="start" value="2361"/>
+      <details key="end" value="2451"/>
+      <details key="line" value="72"/>
     </eAnnotations>
-    <eAnnotations source="positions.139" references="/0/staticTxt/%">
-      <details key="start" value="2256"/>
-      <details key="end" value="2283"/>
-      <details key="line" value="69"/>
+    <eAnnotations source="positions.152" references="/0/staticTxt/%">
+      <details key="start" value="2412"/>
+      <details key="end" value="2439"/>
+      <details key="line" value="73"/>
     </eAnnotations>
-    <eAnnotations source="positions.140" references="/0/staticTxt/%/%">
-      <details key="start" value="2271"/>
-      <details key="end" value="2278"/>
-      <details key="line" value="69"/>
+    <eAnnotations source="positions.153" references="/0/staticTxt/%/%">
+      <details key="start" value="2427"/>
+      <details key="end" value="2434"/>
+      <details key="line" value="73"/>
     </eAnnotations>
-    <eAnnotations source="positions.141" references="/0/staticTxt/%/%.1">
-      <details key="start" value="2260"/>
-      <details key="end" value="2270"/>
+    <eAnnotations source="positions.154" references="/0/staticTxt/%/%.1">
+      <details key="start" value="2416"/>
+      <details key="end" value="2426"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.142" references="/0/staticTxt/%/%.1/self">
+    <eAnnotations source="positions.155" references="/0/staticTxt/%/%.1/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.143" references="/0/staticTxt/operation">
-      <details key="start" value="2232"/>
-      <details key="end" value="2253"/>
-      <details key="line" value="68"/>
-    </eAnnotations>
-    <eAnnotations source="positions.144" references="/0/CppOperationDeclaration">
-      <details key="start" value="2297"/>
-      <details key="end" value="2553"/>
+    <eAnnotations source="positions.156" references="/0/staticTxt/operation">
+      <details key="start" value="2388"/>
+      <details key="end" value="2409"/>
       <details key="line" value="72"/>
     </eAnnotations>
-    <eAnnotations source="positions.145" references="/0/CppOperationDeclaration/%">
-      <details key="start" value="2363"/>
-      <details key="end" value="2380"/>
+    <eAnnotations source="positions.157" references="/0/CppOperationDeclaration">
+      <details key="start" value="2453"/>
+      <details key="end" value="2709"/>
+      <details key="line" value="76"/>
+    </eAnnotations>
+    <eAnnotations source="positions.158" references="/0/CppOperationDeclaration/%">
+      <details key="start" value="2519"/>
+      <details key="end" value="2536"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.146" references="/0/CppOperationDeclaration/%/self">
+    <eAnnotations source="positions.159" references="/0/CppOperationDeclaration/%/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.147" references="/0/CppOperationDeclaration/%.1">
-      <details key="start" value="2382"/>
-      <details key="end" value="2383"/>
-      <details key="line" value="74"/>
+    <eAnnotations source="positions.160" references="/0/CppOperationDeclaration/%.1">
+      <details key="start" value="2538"/>
+      <details key="end" value="2539"/>
+      <details key="line" value="78"/>
     </eAnnotations>
-    <eAnnotations source="positions.148" references="/0/CppOperationDeclaration/%.2">
-      <details key="start" value="2384"/>
-      <details key="end" value="2395"/>
+    <eAnnotations source="positions.161" references="/0/CppOperationDeclaration/%.2">
+      <details key="start" value="2540"/>
+      <details key="end" value="2551"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.149" references="/0/CppOperationDeclaration/%.2/self">
+    <eAnnotations source="positions.162" references="/0/CppOperationDeclaration/%.2/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.150" references="/0/CppOperationDeclaration/%.3">
-      <details key="start" value="2398"/>
-      <details key="end" value="2410"/>
+    <eAnnotations source="positions.163" references="/0/CppOperationDeclaration/%.3">
+      <details key="start" value="2554"/>
+      <details key="end" value="2566"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.151" references="/0/CppOperationDeclaration/%.3/self">
+    <eAnnotations source="positions.164" references="/0/CppOperationDeclaration/%.3/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.152" references="/0/CppOperationDeclaration/%.4">
-      <details key="start" value="2413"/>
-      <details key="end" value="2424"/>
+    <eAnnotations source="positions.165" references="/0/CppOperationDeclaration/%.4">
+      <details key="start" value="2569"/>
+      <details key="end" value="2580"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.153" references="/0/CppOperationDeclaration/%.4/self">
+    <eAnnotations source="positions.166" references="/0/CppOperationDeclaration/%.4/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.154" references="/0/CppOperationDeclaration/%.5">
-      <details key="start" value="2427"/>
-      <details key="end" value="2442"/>
+    <eAnnotations source="positions.167" references="/0/CppOperationDeclaration/%.5">
+      <details key="start" value="2583"/>
+      <details key="end" value="2598"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.155" references="/0/CppOperationDeclaration/%.5/self">
+    <eAnnotations source="positions.168" references="/0/CppOperationDeclaration/%.5/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.156" references="/0/CppOperationDeclaration/%.6">
-      <details key="start" value="2445"/>
-      <details key="end" value="2457"/>
+    <eAnnotations source="positions.169" references="/0/CppOperationDeclaration/%.6">
+      <details key="start" value="2601"/>
+      <details key="end" value="2613"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.157" references="/0/CppOperationDeclaration/%.6/self">
+    <eAnnotations source="positions.170" references="/0/CppOperationDeclaration/%.6/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.158" references="/0/CppOperationDeclaration/%.7">
-      <details key="start" value="2460"/>
-      <details key="end" value="2474"/>
+    <eAnnotations source="positions.171" references="/0/CppOperationDeclaration/%.7">
+      <details key="start" value="2616"/>
+      <details key="end" value="2630"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.159" references="/0/CppOperationDeclaration/%.7/operation">
-      <details key="start" value="2460"/>
-      <details key="end" value="2469"/>
+    <eAnnotations source="positions.172" references="/0/CppOperationDeclaration/%.7/operation">
+      <details key="start" value="2616"/>
+      <details key="end" value="2625"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.160" references="/0/CppOperationDeclaration/%.8">
-      <details key="start" value="2476"/>
-      <details key="end" value="2477"/>
-      <details key="line" value="74"/>
+    <eAnnotations source="positions.173" references="/0/CppOperationDeclaration/%.8">
+      <details key="start" value="2632"/>
+      <details key="end" value="2633"/>
+      <details key="line" value="78"/>
     </eAnnotations>
-    <eAnnotations source="positions.161" references="/0/CppOperationDeclaration/%.9">
-      <details key="start" value="2478"/>
-      <details key="end" value="2506"/>
+    <eAnnotations source="positions.174" references="/0/CppOperationDeclaration/%.9">
+      <details key="start" value="2634"/>
+      <details key="end" value="2662"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.162" references="/0/CppOperationDeclaration/%.9/self">
+    <eAnnotations source="positions.175" references="/0/CppOperationDeclaration/%.9/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.163" references="/0/CppOperationDeclaration/%.9/%">
-      <details key="start" value="2501"/>
-      <details key="end" value="2505"/>
+    <eAnnotations source="positions.176" references="/0/CppOperationDeclaration/%.9/%">
+      <details key="start" value="2657"/>
+      <details key="end" value="2661"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.164" references="/0/CppOperationDeclaration/%.10">
-      <details key="start" value="2508"/>
-      <details key="end" value="2509"/>
-      <details key="line" value="74"/>
+    <eAnnotations source="positions.177" references="/0/CppOperationDeclaration/%.10">
+      <details key="start" value="2664"/>
+      <details key="end" value="2665"/>
+      <details key="line" value="78"/>
     </eAnnotations>
-    <eAnnotations source="positions.165" references="/0/CppOperationDeclaration/%.11">
-      <details key="start" value="2510"/>
-      <details key="end" value="2520"/>
+    <eAnnotations source="positions.178" references="/0/CppOperationDeclaration/%.11">
+      <details key="start" value="2666"/>
+      <details key="end" value="2676"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.166" references="/0/CppOperationDeclaration/%.11/self">
+    <eAnnotations source="positions.179" references="/0/CppOperationDeclaration/%.11/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.167" references="/0/CppOperationDeclaration/%.12">
-      <details key="start" value="2523"/>
-      <details key="end" value="2538"/>
+    <eAnnotations source="positions.180" references="/0/CppOperationDeclaration/%.12">
+      <details key="start" value="2679"/>
+      <details key="end" value="2694"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.168" references="/0/CppOperationDeclaration/%.12/self">
+    <eAnnotations source="positions.181" references="/0/CppOperationDeclaration/%.12/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.169" references="/0/CppOperationDeclaration/%.13">
-      <details key="start" value="2540"/>
-      <details key="end" value="2541"/>
-      <details key="line" value="74"/>
+    <eAnnotations source="positions.182" references="/0/CppOperationDeclaration/%.13">
+      <details key="start" value="2696"/>
+      <details key="end" value="2697"/>
+      <details key="line" value="78"/>
     </eAnnotations>
-    <eAnnotations source="positions.170" references="/0/CppOperationDeclaration/operation">
-      <details key="start" value="2338"/>
-      <details key="end" value="2359"/>
-      <details key="line" value="72"/>
+    <eAnnotations source="positions.183" references="/0/CppOperationDeclaration/operation">
+      <details key="start" value="2494"/>
+      <details key="end" value="2515"/>
+      <details key="line" value="76"/>
     </eAnnotations>
-    <eAnnotations source="positions.171" references="/0/CppBehaviorDeclaration">
-      <details key="start" value="2555"/>
-      <details key="end" value="2743"/>
-      <details key="line" value="77"/>
+    <eAnnotations source="positions.184" references="/0/CppBehaviorDeclaration">
+      <details key="start" value="2711"/>
+      <details key="end" value="2899"/>
+      <details key="line" value="81"/>
     </eAnnotations>
-    <eAnnotations source="positions.172" references="/0/CppBehaviorDeclaration/%">
-      <details key="start" value="2618"/>
-      <details key="end" value="2634"/>
+    <eAnnotations source="positions.185" references="/0/CppBehaviorDeclaration/%">
+      <details key="start" value="2774"/>
+      <details key="end" value="2790"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.173" references="/0/CppBehaviorDeclaration/%/self">
+    <eAnnotations source="positions.186" references="/0/CppBehaviorDeclaration/%/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.174" references="/0/CppBehaviorDeclaration/%.1">
-      <details key="start" value="2636"/>
-      <details key="end" value="2637"/>
-      <details key="line" value="79"/>
+    <eAnnotations source="positions.187" references="/0/CppBehaviorDeclaration/%.1">
+      <details key="start" value="2792"/>
+      <details key="end" value="2793"/>
+      <details key="line" value="83"/>
     </eAnnotations>
-    <eAnnotations source="positions.175" references="/0/CppBehaviorDeclaration/%.2">
-      <details key="start" value="2638"/>
-      <details key="end" value="2649"/>
+    <eAnnotations source="positions.188" references="/0/CppBehaviorDeclaration/%.2">
+      <details key="start" value="2794"/>
+      <details key="end" value="2805"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.176" references="/0/CppBehaviorDeclaration/%.2/self">
+    <eAnnotations source="positions.189" references="/0/CppBehaviorDeclaration/%.2/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.177" references="/0/CppBehaviorDeclaration/%.3">
-      <details key="start" value="2652"/>
-      <details key="end" value="2667"/>
+    <eAnnotations source="positions.190" references="/0/CppBehaviorDeclaration/%.3">
+      <details key="start" value="2808"/>
+      <details key="end" value="2823"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.178" references="/0/CppBehaviorDeclaration/%.3/self">
+    <eAnnotations source="positions.191" references="/0/CppBehaviorDeclaration/%.3/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.179" references="/0/CppBehaviorDeclaration/%.4">
-      <details key="start" value="2670"/>
-      <details key="end" value="2683"/>
+    <eAnnotations source="positions.192" references="/0/CppBehaviorDeclaration/%.4">
+      <details key="start" value="2826"/>
+      <details key="end" value="2839"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.180" references="/0/CppBehaviorDeclaration/%.4/behavior">
-      <details key="start" value="2670"/>
-      <details key="end" value="2678"/>
+    <eAnnotations source="positions.193" references="/0/CppBehaviorDeclaration/%.4/behavior">
+      <details key="start" value="2826"/>
+      <details key="end" value="2834"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.181" references="/0/CppBehaviorDeclaration/%.5">
-      <details key="start" value="2685"/>
-      <details key="end" value="2686"/>
-      <details key="line" value="79"/>
+    <eAnnotations source="positions.194" references="/0/CppBehaviorDeclaration/%.5">
+      <details key="start" value="2841"/>
+      <details key="end" value="2842"/>
+      <details key="line" value="83"/>
     </eAnnotations>
-    <eAnnotations source="positions.182" references="/0/CppBehaviorDeclaration/%.6">
-      <details key="start" value="2687"/>
-      <details key="end" value="2714"/>
+    <eAnnotations source="positions.195" references="/0/CppBehaviorDeclaration/%.6">
+      <details key="start" value="2843"/>
+      <details key="end" value="2870"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.183" references="/0/CppBehaviorDeclaration/%.6/self">
+    <eAnnotations source="positions.196" references="/0/CppBehaviorDeclaration/%.6/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.184" references="/0/CppBehaviorDeclaration/%.6/%">
-      <details key="start" value="2709"/>
-      <details key="end" value="2713"/>
+    <eAnnotations source="positions.197" references="/0/CppBehaviorDeclaration/%.6/%">
+      <details key="start" value="2865"/>
+      <details key="end" value="2869"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.185" references="/0/CppBehaviorDeclaration/%.7">
-      <details key="start" value="2716"/>
-      <details key="end" value="2717"/>
-      <details key="line" value="79"/>
+    <eAnnotations source="positions.198" references="/0/CppBehaviorDeclaration/%.7">
+      <details key="start" value="2872"/>
+      <details key="end" value="2873"/>
+      <details key="line" value="83"/>
     </eAnnotations>
-    <eAnnotations source="positions.186" references="/0/CppBehaviorDeclaration/%.8">
-      <details key="start" value="2718"/>
-      <details key="end" value="2728"/>
+    <eAnnotations source="positions.199" references="/0/CppBehaviorDeclaration/%.8">
+      <details key="start" value="2874"/>
+      <details key="end" value="2884"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.187" references="/0/CppBehaviorDeclaration/%.8/self">
+    <eAnnotations source="positions.200" references="/0/CppBehaviorDeclaration/%.8/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.188" references="/0/CppBehaviorDeclaration/%.9">
-      <details key="start" value="2730"/>
-      <details key="end" value="2731"/>
-      <details key="line" value="79"/>
+    <eAnnotations source="positions.201" references="/0/CppBehaviorDeclaration/%.9">
+      <details key="start" value="2886"/>
+      <details key="end" value="2887"/>
+      <details key="line" value="83"/>
     </eAnnotations>
-    <eAnnotations source="positions.189" references="/0/CppBehaviorDeclaration/behavior">
-      <details key="start" value="2595"/>
-      <details key="end" value="2614"/>
-      <details key="line" value="77"/>
+    <eAnnotations source="positions.202" references="/0/CppBehaviorDeclaration/behavior">
+      <details key="start" value="2751"/>
+      <details key="end" value="2770"/>
+      <details key="line" value="81"/>
     </eAnnotations>
-    <eAnnotations source="positions.190" references="/0/CppConstInit">
-      <details key="start" value="2745"/>
-      <details key="end" value="2944"/>
-      <details key="line" value="82"/>
+    <eAnnotations source="positions.203" references="/0/CppConstInit">
+      <details key="start" value="2901"/>
+      <details key="end" value="3100"/>
+      <details key="line" value="86"/>
     </eAnnotations>
-    <eAnnotations source="positions.191" references="/0/CppConstInit/%">
-      <details key="start" value="2799"/>
-      <details key="end" value="2932"/>
-      <details key="line" value="83"/>
+    <eAnnotations source="positions.204" references="/0/CppConstInit/%">
+      <details key="start" value="2955"/>
+      <details key="end" value="3088"/>
+      <details key="line" value="87"/>
     </eAnnotations>
-    <eAnnotations source="positions.192" references="/0/CppConstInit/%/%">
-      <details key="start" value="2860"/>
-      <details key="end" value="2863"/>
-      <details key="line" value="83"/>
+    <eAnnotations source="positions.205" references="/0/CppConstInit/%/%">
+      <details key="start" value="3016"/>
+      <details key="end" value="3019"/>
+      <details key="line" value="87"/>
     </eAnnotations>
-    <eAnnotations source="positions.193" references="/0/CppConstInit/%/%.1">
-      <details key="start" value="2864"/>
-      <details key="end" value="2925"/>
+    <eAnnotations source="positions.206" references="/0/CppConstInit/%/%.1">
+      <details key="start" value="3020"/>
+      <details key="end" value="3081"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.194" references="/0/CppConstInit/%/%.1/%">
-      <details key="start" value="2864"/>
-      <details key="end" value="2910"/>
+    <eAnnotations source="positions.207" references="/0/CppConstInit/%/%.1/%">
+      <details key="start" value="3020"/>
+      <details key="end" value="3066"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.195" references="/0/CppConstInit/%/%.1/%/%">
-      <details key="start" value="2864"/>
-      <details key="end" value="2889"/>
+    <eAnnotations source="positions.208" references="/0/CppConstInit/%/%.1/%/%">
+      <details key="start" value="3020"/>
+      <details key="end" value="3045"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.196" references="/0/CppConstInit/%/%.1/%/%/self">
+    <eAnnotations source="positions.209" references="/0/CppConstInit/%/%.1/%/%/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.197" references="/0/CppConstInit/%/%.1/%/%/%">
-      <details key="start" value="2879"/>
-      <details key="end" value="2888"/>
+    <eAnnotations source="positions.210" references="/0/CppConstInit/%/%.1/%/%/%">
+      <details key="start" value="3035"/>
+      <details key="end" value="3044"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.198" references="/0/CppConstInit/%/%.1/%/%.1">
-      <details key="start" value="2900"/>
-      <details key="end" value="2909"/>
+    <eAnnotations source="positions.211" references="/0/CppConstInit/%/%.1/%/%.1">
+      <details key="start" value="3056"/>
+      <details key="end" value="3065"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.199" references="/0/CppConstInit/%/%.2">
-      <details key="start" value="2803"/>
-      <details key="end" value="2859"/>
+    <eAnnotations source="positions.212" references="/0/CppConstInit/%/%.2">
+      <details key="start" value="2959"/>
+      <details key="end" value="3015"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.200" references="/0/CppConstInit/%/%.2/%">
-      <details key="start" value="2804"/>
-      <details key="end" value="2828"/>
+    <eAnnotations source="positions.213" references="/0/CppConstInit/%/%.2/%">
+      <details key="start" value="2960"/>
+      <details key="end" value="2984"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.201" references="/0/CppConstInit/%/%.2/%/self">
+    <eAnnotations source="positions.214" references="/0/CppConstInit/%/%.2/%/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.202" references="/0/CppConstInit/%/%.2/%/%">
-      <details key="start" value="2818"/>
-      <details key="end" value="2827"/>
+    <eAnnotations source="positions.215" references="/0/CppConstInit/%/%.2/%/%">
+      <details key="start" value="2974"/>
+      <details key="end" value="2983"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.203" references="/0/CppConstInit/%/%.2/%.1">
-      <details key="start" value="2833"/>
-      <details key="end" value="2858"/>
+    <eAnnotations source="positions.216" references="/0/CppConstInit/%/%.2/%.1">
+      <details key="start" value="2989"/>
+      <details key="end" value="3014"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.204" references="/0/CppConstInit/%/%.2/%.1/self">
+    <eAnnotations source="positions.217" references="/0/CppConstInit/%/%.2/%.1/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.205" references="/0/CppConstInit/%/%.2/%.1/%">
-      <details key="start" value="2847"/>
-      <details key="end" value="2857"/>
+    <eAnnotations source="positions.218" references="/0/CppConstInit/%/%.2/%.1/%">
+      <details key="start" value="3003"/>
+      <details key="end" value="3013"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.206" references="/0/CppConstInit/operation">
-      <details key="start" value="2775"/>
-      <details key="end" value="2796"/>
-      <details key="line" value="82"/>
+    <eAnnotations source="positions.219" references="/0/CppConstInit/operation">
+      <details key="start" value="2931"/>
+      <details key="end" value="2952"/>
+      <details key="line" value="86"/>
     </eAnnotations>
-    <eAnnotations source="positions.207" references="/0/%.1">
-      <details key="start" value="2947"/>
-      <details key="end" value="3027"/>
+    <eAnnotations source="positions.220" references="/0/%.1">
+      <details key="start" value="3103"/>
+      <details key="end" value="3183"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.208" references="/0/getBodyInTemplate">
-      <details key="start" value="3028"/>
-      <details key="end" value="3145"/>
-      <details key="line" value="88"/>
+    <eAnnotations source="positions.221" references="/0/getBodyInTemplate">
+      <details key="start" value="3184"/>
+      <details key="end" value="3301"/>
+      <details key="line" value="92"/>
     </eAnnotations>
-    <eAnnotations source="positions.209" references="/0/getBodyInTemplate/%">
-      <details key="start" value="3107"/>
-      <details key="end" value="3131"/>
+    <eAnnotations source="positions.222" references="/0/getBodyInTemplate/%">
+      <details key="start" value="3263"/>
+      <details key="end" value="3287"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.210" references="/0/getBodyInTemplate/%/%">
-      <details key="start" value="3107"/>
-      <details key="end" value="3124"/>
+    <eAnnotations source="positions.223" references="/0/getBodyInTemplate/%/%">
+      <details key="start" value="3263"/>
+      <details key="end" value="3280"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.211" references="/0/getBodyInTemplate/%/%/self">
+    <eAnnotations source="positions.224" references="/0/getBodyInTemplate/%/%/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.212" references="/0/getBodyInTemplate/%/%/language">
-      <details key="start" value="3115"/>
-      <details key="end" value="3123"/>
+    <eAnnotations source="positions.225" references="/0/getBodyInTemplate/%/%/language">
+      <details key="start" value="3271"/>
+      <details key="end" value="3279"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.213" references="/0/getBodyInTemplate/operation">
-      <details key="start" value="3063"/>
-      <details key="end" value="3084"/>
-      <details key="line" value="88"/>
+    <eAnnotations source="positions.226" references="/0/getBodyInTemplate/operation">
+      <details key="start" value="3219"/>
+      <details key="end" value="3240"/>
+      <details key="line" value="92"/>
     </eAnnotations>
-    <eAnnotations source="positions.214" references="/0/getBodyInTemplate/language">
-      <details key="start" value="3086"/>
-      <details key="end" value="3103"/>
-      <details key="line" value="88"/>
+    <eAnnotations source="positions.227" references="/0/getBodyInTemplate/language">
+      <details key="start" value="3242"/>
+      <details key="end" value="3259"/>
+      <details key="line" value="92"/>
     </eAnnotations>
-    <eAnnotations source="positions.215" references="/0/throws">
-      <details key="start" value="3148"/>
-      <details key="end" value="3316"/>
-      <details key="line" value="93"/>
+    <eAnnotations source="positions.228" references="/0/throws">
+      <details key="start" value="3304"/>
+      <details key="end" value="3472"/>
+      <details key="line" value="97"/>
     </eAnnotations>
-    <eAnnotations source="positions.216" references="/0/throws/%">
-      <details key="start" value="3195"/>
-      <details key="end" value="3304"/>
-      <details key="line" value="94"/>
+    <eAnnotations source="positions.229" references="/0/throws/%">
+      <details key="start" value="3351"/>
+      <details key="end" value="3460"/>
+      <details key="line" value="98"/>
     </eAnnotations>
-    <eAnnotations source="positions.217" references="/0/throws/%/%">
-      <details key="start" value="3240"/>
-      <details key="end" value="3247"/>
-      <details key="line" value="95"/>
+    <eAnnotations source="positions.230" references="/0/throws/%/%">
+      <details key="start" value="3396"/>
+      <details key="end" value="3403"/>
+      <details key="line" value="99"/>
     </eAnnotations>
-    <eAnnotations source="positions.218" references="/0/throws/%/%.1">
-      <details key="start" value="3247"/>
-      <details key="end" value="3298"/>
-      <details key="line" value="95"/>
+    <eAnnotations source="positions.231" references="/0/throws/%/%.1">
+      <details key="start" value="3403"/>
+      <details key="end" value="3454"/>
+      <details key="line" value="99"/>
     </eAnnotations>
-    <eAnnotations source="positions.219" references="/0/throws/%/%.1/%">
-      <details key="start" value="3286"/>
-      <details key="end" value="3290"/>
+    <eAnnotations source="positions.232" references="/0/throws/%/%.1/%">
+      <details key="start" value="3442"/>
+      <details key="end" value="3446"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.220" references="/0/throws/%/%.1/%/self">
+    <eAnnotations source="positions.233" references="/0/throws/%/%.1/%/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.221" references="/0/throws/%/%.1/%.1">
-      <details key="start" value="3253"/>
-      <details key="end" value="3268"/>
+    <eAnnotations source="positions.234" references="/0/throws/%/%.1/%.1">
+      <details key="start" value="3409"/>
+      <details key="end" value="3424"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.222" references="/0/throws/%/%.1/%.1/self">
+    <eAnnotations source="positions.235" references="/0/throws/%/%.1/%.1/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.223" references="/0/throws/%/%.1/%.2">
-      <details key="start" value="3280"/>
-      <details key="end" value="3283"/>
+    <eAnnotations source="positions.236" references="/0/throws/%/%.1/%.2">
+      <details key="start" value="3436"/>
+      <details key="end" value="3439"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.224" references="/0/throws/%/%.2">
-      <details key="start" value="3298"/>
-      <details key="end" value="3299"/>
-      <details key="line" value="96"/>
+    <eAnnotations source="positions.237" references="/0/throws/%/%.2">
+      <details key="start" value="3454"/>
+      <details key="end" value="3455"/>
+      <details key="line" value="100"/>
     </eAnnotations>
-    <eAnnotations source="positions.225" references="/0/throws/%/%.3">
-      <details key="start" value="3199"/>
-      <details key="end" value="3238"/>
+    <eAnnotations source="positions.238" references="/0/throws/%/%.3">
+      <details key="start" value="3355"/>
+      <details key="end" value="3394"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.226" references="/0/throws/%/%.3/%">
-      <details key="start" value="3200"/>
-      <details key="end" value="3233"/>
+    <eAnnotations source="positions.239" references="/0/throws/%/%.3/%">
+      <details key="start" value="3356"/>
+      <details key="end" value="3389"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.227" references="/0/throws/%/%.3/%/%">
-      <details key="start" value="3200"/>
-      <details key="end" value="3225"/>
+    <eAnnotations source="positions.240" references="/0/throws/%/%.3/%/%">
+      <details key="start" value="3356"/>
+      <details key="end" value="3381"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.228" references="/0/throws/%/%.3/%/%/operation">
-      <details key="start" value="3200"/>
-      <details key="end" value="3209"/>
+    <eAnnotations source="positions.241" references="/0/throws/%/%.3/%/%/operation">
+      <details key="start" value="3356"/>
+      <details key="end" value="3365"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.229" references="/0/throws/%/%.3/%.1">
-      <details key="start" value="3236"/>
-      <details key="end" value="3237"/>
+    <eAnnotations source="positions.242" references="/0/throws/%/%.3/%.1">
+      <details key="start" value="3392"/>
+      <details key="end" value="3393"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.230" references="/0/throws/operation">
-      <details key="start" value="3172"/>
-      <details key="end" value="3192"/>
-      <details key="line" value="93"/>
+    <eAnnotations source="positions.243" references="/0/throws/operation">
+      <details key="start" value="3328"/>
+      <details key="end" value="3348"/>
+      <details key="line" value="97"/>
     </eAnnotations>
-    <eAnnotations source="positions.231" references="/0/CppOperationImplementation">
-      <details key="start" value="3319"/>
-      <details key="end" value="3821"/>
-      <details key="line" value="100"/>
+    <eAnnotations source="positions.244" references="/0/CppOperationImplementation">
+      <details key="start" value="3475"/>
+      <details key="end" value="3977"/>
+      <details key="line" value="104"/>
     </eAnnotations>
-    <eAnnotations source="positions.232" references="/0/CppOperationImplementation/%">
-      <details key="start" value="3388"/>
-      <details key="end" value="3405"/>
+    <eAnnotations source="positions.245" references="/0/CppOperationImplementation/%">
+      <details key="start" value="3544"/>
+      <details key="end" value="3561"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.233" references="/0/CppOperationImplementation/%/self">
+    <eAnnotations source="positions.246" references="/0/CppOperationImplementation/%/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.234" references="/0/CppOperationImplementation/%.1">
-      <details key="start" value="3407"/>
-      <details key="end" value="3408"/>
-      <details key="line" value="102"/>
+    <eAnnotations source="positions.247" references="/0/CppOperationImplementation/%.1">
+      <details key="start" value="3563"/>
+      <details key="end" value="3564"/>
+      <details key="line" value="106"/>
     </eAnnotations>
-    <eAnnotations source="positions.235" references="/0/CppOperationImplementation/%.2">
-      <details key="start" value="3408"/>
-      <details key="end" value="3809"/>
-      <details key="line" value="102"/>
+    <eAnnotations source="positions.248" references="/0/CppOperationImplementation/%.2">
+      <details key="start" value="3564"/>
+      <details key="end" value="3965"/>
+      <details key="line" value="106"/>
     </eAnnotations>
-    <eAnnotations source="positions.236" references="/0/CppOperationImplementation/%.2/%">
-      <details key="start" value="3440"/>
-      <details key="end" value="3455"/>
+    <eAnnotations source="positions.249" references="/0/CppOperationImplementation/%.2/%">
+      <details key="start" value="3596"/>
+      <details key="end" value="3611"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.237" references="/0/CppOperationImplementation/%.2/%/self">
+    <eAnnotations source="positions.250" references="/0/CppOperationImplementation/%.2/%/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.238" references="/0/CppOperationImplementation/%.2/%.1">
-      <details key="start" value="3458"/>
-      <details key="end" value="3472"/>
+    <eAnnotations source="positions.251" references="/0/CppOperationImplementation/%.2/%.1">
+      <details key="start" value="3614"/>
+      <details key="end" value="3628"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.239" references="/0/CppOperationImplementation/%.2/%.1/operation">
-      <details key="start" value="3458"/>
-      <details key="end" value="3467"/>
+    <eAnnotations source="positions.252" references="/0/CppOperationImplementation/%.2/%.1/operation">
+      <details key="start" value="3614"/>
+      <details key="end" value="3623"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.240" references="/0/CppOperationImplementation/%.2/%.2">
-      <details key="start" value="3474"/>
-      <details key="end" value="3475"/>
-      <details key="line" value="103"/>
+    <eAnnotations source="positions.253" references="/0/CppOperationImplementation/%.2/%.2">
+      <details key="start" value="3630"/>
+      <details key="end" value="3631"/>
+      <details key="line" value="107"/>
     </eAnnotations>
-    <eAnnotations source="positions.241" references="/0/CppOperationImplementation/%.2/%.3">
-      <details key="start" value="3476"/>
-      <details key="end" value="3505"/>
+    <eAnnotations source="positions.254" references="/0/CppOperationImplementation/%.2/%.3">
+      <details key="start" value="3632"/>
+      <details key="end" value="3661"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.242" references="/0/CppOperationImplementation/%.2/%.3/self">
+    <eAnnotations source="positions.255" references="/0/CppOperationImplementation/%.2/%.3/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.243" references="/0/CppOperationImplementation/%.2/%.3/%">
-      <details key="start" value="3499"/>
-      <details key="end" value="3504"/>
+    <eAnnotations source="positions.256" references="/0/CppOperationImplementation/%.2/%.3/%">
+      <details key="start" value="3655"/>
+      <details key="end" value="3660"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.244" references="/0/CppOperationImplementation/%.2/%.4">
-      <details key="start" value="3507"/>
-      <details key="end" value="3512"/>
-      <details key="line" value="103"/>
+    <eAnnotations source="positions.257" references="/0/CppOperationImplementation/%.2/%.4">
+      <details key="start" value="3663"/>
+      <details key="end" value="3668"/>
+      <details key="line" value="107"/>
     </eAnnotations>
-    <eAnnotations source="positions.245" references="/0/CppOperationImplementation/%.2/%.5">
-      <details key="start" value="3513"/>
-      <details key="end" value="3529"/>
+    <eAnnotations source="positions.258" references="/0/CppOperationImplementation/%.2/%.5">
+      <details key="start" value="3669"/>
+      <details key="end" value="3685"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.246" references="/0/CppOperationImplementation/%.2/%.5/self">
+    <eAnnotations source="positions.259" references="/0/CppOperationImplementation/%.2/%.5/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.247" references="/0/CppOperationImplementation/%.2/%.5/%">
-      <details key="start" value="3521"/>
-      <details key="end" value="3528"/>
+    <eAnnotations source="positions.260" references="/0/CppOperationImplementation/%.2/%.5/%">
+      <details key="start" value="3677"/>
+      <details key="end" value="3684"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.248" references="/0/CppOperationImplementation/%.2/%.6">
-      <details key="start" value="3531"/>
-      <details key="end" value="3534"/>
-      <details key="line" value="105"/>
+    <eAnnotations source="positions.261" references="/0/CppOperationImplementation/%.2/%.6">
+      <details key="start" value="3687"/>
+      <details key="end" value="3690"/>
+      <details key="line" value="109"/>
     </eAnnotations>
-    <eAnnotations source="positions.249" references="/0/CppOperationImplementation/%.2/%.7">
-      <details key="start" value="3412"/>
-      <details key="end" value="3437"/>
+    <eAnnotations source="positions.262" references="/0/CppOperationImplementation/%.2/%.7">
+      <details key="start" value="3568"/>
+      <details key="end" value="3593"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.250" references="/0/CppOperationImplementation/%.2/%.7/%">
-      <details key="start" value="3413"/>
-      <details key="end" value="3427"/>
+    <eAnnotations source="positions.263" references="/0/CppOperationImplementation/%.2/%.7/%">
+      <details key="start" value="3569"/>
+      <details key="end" value="3583"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.251" references="/0/CppOperationImplementation/%.2/%.7/%/operation">
-      <details key="start" value="3413"/>
-      <details key="end" value="3422"/>
+    <eAnnotations source="positions.264" references="/0/CppOperationImplementation/%.2/%.7/%/operation">
+      <details key="start" value="3569"/>
+      <details key="end" value="3578"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.252" references="/0/CppOperationImplementation/%.2/%.7/%.1">
-      <details key="start" value="3430"/>
-      <details key="end" value="3436"/>
+    <eAnnotations source="positions.265" references="/0/CppOperationImplementation/%.2/%.7/%.1">
+      <details key="start" value="3586"/>
+      <details key="end" value="3592"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.253" references="/0/CppOperationImplementation/%.2/%.8">
-      <details key="start" value="3534"/>
-      <details key="end" value="3804"/>
-      <details key="line" value="106"/>
+    <eAnnotations source="positions.266" references="/0/CppOperationImplementation/%.2/%.8">
+      <details key="start" value="3690"/>
+      <details key="end" value="3960"/>
+      <details key="line" value="110"/>
     </eAnnotations>
-    <eAnnotations source="positions.254" references="/0/CppOperationImplementation/%.2/%.8/%">
-      <details key="start" value="3542"/>
-      <details key="end" value="3561"/>
+    <eAnnotations source="positions.267" references="/0/CppOperationImplementation/%.2/%.8/%">
+      <details key="start" value="3698"/>
+      <details key="end" value="3717"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.255" references="/0/CppOperationImplementation/%.2/%.8/%/self">
+    <eAnnotations source="positions.268" references="/0/CppOperationImplementation/%.2/%.8/%/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.256" references="/0/CppOperationImplementation/%.2/%.8/%.1">
-      <details key="start" value="3564"/>
-      <details key="end" value="3575"/>
+    <eAnnotations source="positions.269" references="/0/CppOperationImplementation/%.2/%.8/%.1">
+      <details key="start" value="3720"/>
+      <details key="end" value="3731"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.257" references="/0/CppOperationImplementation/%.2/%.8/%.1/self">
+    <eAnnotations source="positions.270" references="/0/CppOperationImplementation/%.2/%.8/%.1/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.258" references="/0/CppOperationImplementation/%.2/%.8/%.2">
-      <details key="start" value="3578"/>
-      <details key="end" value="3593"/>
+    <eAnnotations source="positions.271" references="/0/CppOperationImplementation/%.2/%.8/%.2">
+      <details key="start" value="3734"/>
+      <details key="end" value="3749"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.259" references="/0/CppOperationImplementation/%.2/%.8/%.2/self">
+    <eAnnotations source="positions.272" references="/0/CppOperationImplementation/%.2/%.8/%.2/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.260" references="/0/CppOperationImplementation/%.2/%.8/collect">
-      <details key="start" value="3596"/>
-      <details key="end" value="3630"/>
+    <eAnnotations source="positions.273" references="/0/CppOperationImplementation/%.2/%.8/collect">
+      <details key="start" value="3752"/>
+      <details key="end" value="3786"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.261" references="/0/CppOperationImplementation/%.2/%.8/collect/%">
-      <details key="start" value="3596"/>
-      <details key="end" value="3625"/>
+    <eAnnotations source="positions.274" references="/0/CppOperationImplementation/%.2/%.8/collect/%">
+      <details key="start" value="3752"/>
+      <details key="end" value="3781"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.262" references="/0/CppOperationImplementation/%.2/%.8/collect/%/operation">
-      <details key="start" value="3596"/>
-      <details key="end" value="3605"/>
+    <eAnnotations source="positions.275" references="/0/CppOperationImplementation/%.2/%.8/collect/%/operation">
+      <details key="start" value="3752"/>
+      <details key="end" value="3761"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.263" references="/0/CppOperationImplementation/%.2/%.8/collect/%.1">
-      <details key="start" value="3626"/>
-      <details key="end" value="3630"/>
+    <eAnnotations source="positions.276" references="/0/CppOperationImplementation/%.2/%.8/collect/%.1">
+      <details key="start" value="3782"/>
+      <details key="end" value="3786"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.264" references="/0/CppOperationImplementation/%.2/%.8/collect/%.1/temp1">
+    <eAnnotations source="positions.277" references="/0/CppOperationImplementation/%.2/%.8/collect/%.1/temp1">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.265" references="/0/CppOperationImplementation/%.2/%.8/collect/temp4">
+    <eAnnotations source="positions.278" references="/0/CppOperationImplementation/%.2/%.8/collect/temp4">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.266" references="/0/CppOperationImplementation/%.2/%.8/%.3">
-      <details key="start" value="3633"/>
-      <details key="end" value="3657"/>
+    <eAnnotations source="positions.279" references="/0/CppOperationImplementation/%.2/%.8/%.3">
+      <details key="start" value="3789"/>
+      <details key="end" value="3813"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.267" references="/0/CppOperationImplementation/%.2/%.8/%.3/self">
+    <eAnnotations source="positions.280" references="/0/CppOperationImplementation/%.2/%.8/%.3/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.268" references="/0/CppOperationImplementation/%.2/%.8/%.4">
-      <details key="start" value="3659"/>
-      <details key="end" value="3661"/>
-      <details key="line" value="107"/>
+    <eAnnotations source="positions.281" references="/0/CppOperationImplementation/%.2/%.8/%.4">
+      <details key="start" value="3815"/>
+      <details key="end" value="3817"/>
+      <details key="line" value="111"/>
     </eAnnotations>
-    <eAnnotations source="positions.269" references="/0/CppOperationImplementation/%.2/%.8/%.5">
-      <details key="start" value="3662"/>
-      <details key="end" value="3674"/>
+    <eAnnotations source="positions.282" references="/0/CppOperationImplementation/%.2/%.8/%.5">
+      <details key="start" value="3818"/>
+      <details key="end" value="3830"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.270" references="/0/CppOperationImplementation/%.2/%.8/%.5/self">
+    <eAnnotations source="positions.283" references="/0/CppOperationImplementation/%.2/%.8/%.5/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.271" references="/0/CppOperationImplementation/%.2/%.8/%.6">
-      <details key="start" value="3677"/>
-      <details key="end" value="3691"/>
+    <eAnnotations source="positions.284" references="/0/CppOperationImplementation/%.2/%.8/%.6">
+      <details key="start" value="3833"/>
+      <details key="end" value="3847"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.272" references="/0/CppOperationImplementation/%.2/%.8/%.6/operation">
-      <details key="start" value="3677"/>
-      <details key="end" value="3686"/>
+    <eAnnotations source="positions.285" references="/0/CppOperationImplementation/%.2/%.8/%.6/operation">
+      <details key="start" value="3833"/>
+      <details key="end" value="3842"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.273" references="/0/CppOperationImplementation/%.2/%.8/%.7">
-      <details key="start" value="3693"/>
-      <details key="end" value="3694"/>
-      <details key="line" value="107"/>
+    <eAnnotations source="positions.286" references="/0/CppOperationImplementation/%.2/%.8/%.7">
+      <details key="start" value="3849"/>
+      <details key="end" value="3850"/>
+      <details key="line" value="111"/>
     </eAnnotations>
-    <eAnnotations source="positions.274" references="/0/CppOperationImplementation/%.2/%.8/%.8">
-      <details key="start" value="3695"/>
-      <details key="end" value="3724"/>
+    <eAnnotations source="positions.287" references="/0/CppOperationImplementation/%.2/%.8/%.8">
+      <details key="start" value="3851"/>
+      <details key="end" value="3880"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.275" references="/0/CppOperationImplementation/%.2/%.8/%.8/self">
+    <eAnnotations source="positions.288" references="/0/CppOperationImplementation/%.2/%.8/%.8/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.276" references="/0/CppOperationImplementation/%.2/%.8/%.8/%">
-      <details key="start" value="3718"/>
-      <details key="end" value="3723"/>
+    <eAnnotations source="positions.289" references="/0/CppOperationImplementation/%.2/%.8/%.8/%">
+      <details key="start" value="3874"/>
+      <details key="end" value="3879"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.277" references="/0/CppOperationImplementation/%.2/%.8/%.9">
-      <details key="start" value="3726"/>
-      <details key="end" value="3727"/>
-      <details key="line" value="107"/>
+    <eAnnotations source="positions.290" references="/0/CppOperationImplementation/%.2/%.8/%.9">
+      <details key="start" value="3882"/>
+      <details key="end" value="3883"/>
+      <details key="line" value="111"/>
     </eAnnotations>
-    <eAnnotations source="positions.278" references="/0/CppOperationImplementation/%.2/%.8/%.10">
-      <details key="start" value="3728"/>
-      <details key="end" value="3736"/>
+    <eAnnotations source="positions.291" references="/0/CppOperationImplementation/%.2/%.8/%.10">
+      <details key="start" value="3884"/>
+      <details key="end" value="3892"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.279" references="/0/CppOperationImplementation/%.2/%.8/%.10/self">
+    <eAnnotations source="positions.292" references="/0/CppOperationImplementation/%.2/%.8/%.10/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.280" references="/0/CppOperationImplementation/%.2/%.8/%.11">
-      <details key="start" value="3739"/>
-      <details key="end" value="3749"/>
+    <eAnnotations source="positions.293" references="/0/CppOperationImplementation/%.2/%.8/%.11">
+      <details key="start" value="3895"/>
+      <details key="end" value="3905"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.281" references="/0/CppOperationImplementation/%.2/%.8/%.11/self">
+    <eAnnotations source="positions.294" references="/0/CppOperationImplementation/%.2/%.8/%.11/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.282" references="/0/CppOperationImplementation/%.2/%.8/%.12">
-      <details key="start" value="3752"/>
-      <details key="end" value="3766"/>
+    <eAnnotations source="positions.295" references="/0/CppOperationImplementation/%.2/%.8/%.12">
+      <details key="start" value="3908"/>
+      <details key="end" value="3922"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.283" references="/0/CppOperationImplementation/%.2/%.8/%.12/self">
+    <eAnnotations source="positions.296" references="/0/CppOperationImplementation/%.2/%.8/%.12/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.284" references="/0/CppOperationImplementation/%.2/%.8/%.13">
-      <details key="start" value="3768"/>
-      <details key="end" value="3772"/>
-      <details key="line" value="107"/>
+    <eAnnotations source="positions.297" references="/0/CppOperationImplementation/%.2/%.8/%.13">
+      <details key="start" value="3924"/>
+      <details key="end" value="3928"/>
+      <details key="line" value="111"/>
     </eAnnotations>
-    <eAnnotations source="positions.285" references="/0/CppOperationImplementation/%.2/%.8/%.14">
-      <details key="start" value="3773"/>
-      <details key="end" value="3799"/>
+    <eAnnotations source="positions.298" references="/0/CppOperationImplementation/%.2/%.8/%.14">
+      <details key="start" value="3929"/>
+      <details key="end" value="3955"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.286" references="/0/CppOperationImplementation/%.2/%.8/%.14/self">
+    <eAnnotations source="positions.299" references="/0/CppOperationImplementation/%.2/%.8/%.14/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.287" references="/0/CppOperationImplementation/%.2/%.8/%.14/%">
-      <details key="start" value="3791"/>
-      <details key="end" value="3798"/>
+    <eAnnotations source="positions.300" references="/0/CppOperationImplementation/%.2/%.8/%.14/%">
+      <details key="start" value="3947"/>
+      <details key="end" value="3954"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.288" references="/0/CppOperationImplementation/%.2/%.8/%.15">
-      <details key="start" value="3801"/>
-      <details key="end" value="3804"/>
-      <details key="line" value="109"/>
+    <eAnnotations source="positions.301" references="/0/CppOperationImplementation/%.2/%.8/%.15">
+      <details key="start" value="3957"/>
+      <details key="end" value="3960"/>
+      <details key="line" value="113"/>
     </eAnnotations>
-    <eAnnotations source="positions.289" references="/0/CppOperationImplementation/operation">
-      <details key="start" value="3363"/>
-      <details key="end" value="3384"/>
-      <details key="line" value="100"/>
+    <eAnnotations source="positions.302" references="/0/CppOperationImplementation/operation">
+      <details key="start" value="3519"/>
+      <details key="end" value="3540"/>
+      <details key="line" value="104"/>
     </eAnnotations>
-    <eAnnotations source="positions.290" references="/0/CppBehaviorImplementation">
-      <details key="start" value="3824"/>
-      <details key="end" value="4065"/>
-      <details key="line" value="114"/>
+    <eAnnotations source="positions.303" references="/0/CppBehaviorImplementation">
+      <details key="start" value="3980"/>
+      <details key="end" value="4221"/>
+      <details key="line" value="118"/>
     </eAnnotations>
-    <eAnnotations source="positions.291" references="/0/CppBehaviorImplementation/%">
-      <details key="start" value="3896"/>
-      <details key="end" value="3912"/>
+    <eAnnotations source="positions.304" references="/0/CppBehaviorImplementation/%">
+      <details key="start" value="4052"/>
+      <details key="end" value="4068"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.292" references="/0/CppBehaviorImplementation/%/self">
+    <eAnnotations source="positions.305" references="/0/CppBehaviorImplementation/%/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.293" references="/0/CppBehaviorImplementation/%.1">
-      <details key="start" value="3914"/>
-      <details key="end" value="3915"/>
-      <details key="line" value="116"/>
+    <eAnnotations source="positions.306" references="/0/CppBehaviorImplementation/%.1">
+      <details key="start" value="4070"/>
+      <details key="end" value="4071"/>
+      <details key="line" value="120"/>
     </eAnnotations>
-    <eAnnotations source="positions.294" references="/0/CppBehaviorImplementation/%.2">
-      <details key="start" value="3916"/>
-      <details key="end" value="3931"/>
+    <eAnnotations source="positions.307" references="/0/CppBehaviorImplementation/%.2">
+      <details key="start" value="4072"/>
+      <details key="end" value="4087"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.295" references="/0/CppBehaviorImplementation/%.2/self">
+    <eAnnotations source="positions.308" references="/0/CppBehaviorImplementation/%.2/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.296" references="/0/CppBehaviorImplementation/%.3">
-      <details key="start" value="3934"/>
-      <details key="end" value="3956"/>
+    <eAnnotations source="positions.309" references="/0/CppBehaviorImplementation/%.3">
+      <details key="start" value="4090"/>
+      <details key="end" value="4112"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.297" references="/0/CppBehaviorImplementation/%.3/%">
-      <details key="start" value="3934"/>
-      <details key="end" value="3951"/>
+    <eAnnotations source="positions.310" references="/0/CppBehaviorImplementation/%.3/%">
+      <details key="start" value="4090"/>
+      <details key="end" value="4107"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.298" references="/0/CppBehaviorImplementation/%.3/%/behavior">
-      <details key="start" value="3934"/>
-      <details key="end" value="3942"/>
+    <eAnnotations source="positions.311" references="/0/CppBehaviorImplementation/%.3/%/behavior">
+      <details key="start" value="4090"/>
+      <details key="end" value="4098"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.299" references="/0/CppBehaviorImplementation/%.4">
-      <details key="start" value="3958"/>
-      <details key="end" value="3960"/>
-      <details key="line" value="116"/>
+    <eAnnotations source="positions.312" references="/0/CppBehaviorImplementation/%.4">
+      <details key="start" value="4114"/>
+      <details key="end" value="4116"/>
+      <details key="line" value="120"/>
     </eAnnotations>
-    <eAnnotations source="positions.300" references="/0/CppBehaviorImplementation/%.5">
-      <details key="start" value="3961"/>
-      <details key="end" value="3974"/>
+    <eAnnotations source="positions.313" references="/0/CppBehaviorImplementation/%.5">
+      <details key="start" value="4117"/>
+      <details key="end" value="4130"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.301" references="/0/CppBehaviorImplementation/%.5/behavior">
-      <details key="start" value="3961"/>
-      <details key="end" value="3969"/>
+    <eAnnotations source="positions.314" references="/0/CppBehaviorImplementation/%.5/behavior">
+      <details key="start" value="4117"/>
+      <details key="end" value="4125"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.302" references="/0/CppBehaviorImplementation/%.6">
-      <details key="start" value="3976"/>
-      <details key="end" value="3977"/>
-      <details key="line" value="116"/>
+    <eAnnotations source="positions.315" references="/0/CppBehaviorImplementation/%.6">
+      <details key="start" value="4132"/>
+      <details key="end" value="4133"/>
+      <details key="line" value="120"/>
     </eAnnotations>
-    <eAnnotations source="positions.303" references="/0/CppBehaviorImplementation/%.7">
-      <details key="start" value="3978"/>
-      <details key="end" value="4006"/>
+    <eAnnotations source="positions.316" references="/0/CppBehaviorImplementation/%.7">
+      <details key="start" value="4134"/>
+      <details key="end" value="4162"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.304" references="/0/CppBehaviorImplementation/%.7/self">
+    <eAnnotations source="positions.317" references="/0/CppBehaviorImplementation/%.7/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.305" references="/0/CppBehaviorImplementation/%.7/%">
-      <details key="start" value="4000"/>
-      <details key="end" value="4005"/>
+    <eAnnotations source="positions.318" references="/0/CppBehaviorImplementation/%.7/%">
+      <details key="start" value="4156"/>
+      <details key="end" value="4161"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.306" references="/0/CppBehaviorImplementation/%.8">
-      <details key="start" value="4008"/>
-      <details key="end" value="4009"/>
-      <details key="line" value="116"/>
+    <eAnnotations source="positions.319" references="/0/CppBehaviorImplementation/%.8">
+      <details key="start" value="4164"/>
+      <details key="end" value="4165"/>
+      <details key="line" value="120"/>
     </eAnnotations>
-    <eAnnotations source="positions.307" references="/0/CppBehaviorImplementation/%.9">
-      <details key="start" value="4010"/>
-      <details key="end" value="4020"/>
+    <eAnnotations source="positions.320" references="/0/CppBehaviorImplementation/%.9">
+      <details key="start" value="4166"/>
+      <details key="end" value="4176"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.308" references="/0/CppBehaviorImplementation/%.9/self">
+    <eAnnotations source="positions.321" references="/0/CppBehaviorImplementation/%.9/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.309" references="/0/CppBehaviorImplementation/%.10">
-      <details key="start" value="4022"/>
-      <details key="end" value="4026"/>
-      <details key="line" value="116"/>
+    <eAnnotations source="positions.322" references="/0/CppBehaviorImplementation/%.10">
+      <details key="start" value="4178"/>
+      <details key="end" value="4182"/>
+      <details key="line" value="120"/>
     </eAnnotations>
-    <eAnnotations source="positions.310" references="/0/CppBehaviorImplementation/%.11">
-      <details key="start" value="4027"/>
-      <details key="end" value="4049"/>
+    <eAnnotations source="positions.323" references="/0/CppBehaviorImplementation/%.11">
+      <details key="start" value="4183"/>
+      <details key="end" value="4205"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.311" references="/0/CppBehaviorImplementation/%.11/self">
+    <eAnnotations source="positions.324" references="/0/CppBehaviorImplementation/%.11/self">
       <details key="start" value="-1"/>
       <details key="end" value="-1"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.312" references="/0/CppBehaviorImplementation/%.11/%">
-      <details key="start" value="4041"/>
-      <details key="end" value="4048"/>
+    <eAnnotations source="positions.325" references="/0/CppBehaviorImplementation/%.11/%">
+      <details key="start" value="4197"/>
+      <details key="end" value="4204"/>
       <details key="line" value="0"/>
     </eAnnotations>
-    <eAnnotations source="positions.313" references="/0/CppBehaviorImplementation/%.12">
-      <details key="start" value="4051"/>
-      <details key="end" value="4053"/>
-      <details key="line" value="118"/>
+    <eAnnotations source="positions.326" references="/0/CppBehaviorImplementation/%.12">
+      <details key="start" value="4207"/>
+      <details key="end" value="4209"/>
+      <details key="line" value="122"/>
     </eAnnotations>
-    <eAnnotations source="positions.314" references="/0/CppBehaviorImplementation/behavior">
-      <details key="start" value="3867"/>
-      <details key="end" value="3892"/>
-      <details key="line" value="114"/>
+    <eAnnotations source="positions.327" references="/0/CppBehaviorImplementation/behavior">
+      <details key="start" value="4023"/>
+      <details key="end" value="4048"/>
+      <details key="line" value="118"/>
     </eAnnotations>
   </ecore:EAnnotation>
 </xmi:XMI>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.mtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.mtl
index 94a303227b6..ca8faf76b87 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.mtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.mtl
@@ -35,8 +35,12 @@ return a list of owned operations, since this is not supported directly on a cla
 [/template]
 
 
+[query public isConsOrDestructor(operation : Operation) : Boolean =
+hasStereotype(l2::Create) or hasStereotype(l2::Destroy)
+/]
+
 [query public ConsDestructorOrVoid(operation : Operation) : String =
-if hasStereotype(l2::Create) or hasStereotype(l2::Destroy) then
+if isConsOrDestructor() then
 	''
 else
 	'void '
@@ -44,14 +48,14 @@ endif/]
 
 
 [query public destructor(operation : Operation) : String =
-if hasStereotype(l2::Destroy) then
+if hasStereotype(l2::Destroy) and not operation.name.startsWith('~') then
 	'~'
 else
 	''
 endif/]
 
 [template public CppReturnSpec(operation : Operation)]
-[if (type = null)][ConsDestructorOrVoid()/][else][returnResult().modConst()/] [type.cppQualifiedName()/][returnResult().modPtr()/][returnResult().modRef()/] [/if]
+[if (type = null) or isConsOrDestructor()][ConsDestructorOrVoid()/][else][returnResult().modConst()/] [type.cppQualifiedName()/][returnResult().modPtr()/][returnResult().modRef()/] [/if]
 [/template]
 
 
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppParameter.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppParameter.emtl
index edfd311aa77..d6ecc01b121 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppParameter.emtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppParameter.emtl
@@ -8,8 +8,8 @@
       <takesTypesFrom href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/>
     </input>
     <imports href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0"/>
-    <imports href="platform:/plugin/utils/CppGenUtils.emtl#/0"/>
-    <imports href="platform:/plugin/utils/Modifier.emtl#/0"/>
+    <imports href="../../../utils/CppGenUtils.emtl#/0"/>
+    <imports href="../../../utils/Modifier.emtl#/0"/>
     <ownedModuleElement xsi:type="mtl:Template" name="defaultValue" visibility="Public">
       <body xsi:type="mtl:IfBlock">
         <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" = "/>
@@ -49,14 +49,14 @@
     <ownedModuleElement xsi:type="mtl:Template" name="CppParameter" visibility="Public">
       <body xsi:type="mtl:QueryInvocation">
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="platform:/plugin/utils/Modifier.emtl#/0/modConst"/>
+        <definition href="../../../utils/Modifier.emtl#/0/modConst"/>
         <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/12">
           <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Parameter"/>
         </argument>
       </body>
       <body xsi:type="mtl:QueryInvocation">
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="platform:/plugin/utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
+        <definition href="../../../utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
         <argument xsi:type="ocl.ecore:PropertyCallExp">
           <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Type"/>
           <source xsi:type="ocl.ecore:VariableExp" name="parameter" referredVariable="/0/CppParameter/parameter">
@@ -67,14 +67,14 @@
       </body>
       <body xsi:type="mtl:QueryInvocation">
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="platform:/plugin/utils/Modifier.emtl#/0/modPtr"/>
+        <definition href="../../../utils/Modifier.emtl#/0/modPtr"/>
         <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/14">
           <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Parameter"/>
         </argument>
       </body>
       <body xsi:type="mtl:QueryInvocation">
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="platform:/plugin/utils/Modifier.emtl#/0/modRef"/>
+        <definition href="../../../utils/Modifier.emtl#/0/modRef"/>
         <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/15">
           <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Parameter"/>
         </argument>
@@ -89,7 +89,7 @@
       </body>
       <body xsi:type="mtl:QueryInvocation">
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
-        <definition href="platform:/plugin/utils/Modifier.emtl#/0/modArray"/>
+        <definition href="../../../utils/Modifier.emtl#/0/modArray"/>
         <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/17">
           <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Parameter"/>
         </argument>
@@ -286,7 +286,7 @@
           <contents xsi:type="ocl.ecore:Constraint"/>
         </eAnnotations>
         <eAnnotations source="MTL">
-          <references href="platform:/plugin/utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
+          <references href="../../../utils/CppGenUtils.emtl#/0/cppQualifiedName"/>
         </eAnnotations>
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
         <eParameters name="arg0">
@@ -298,7 +298,7 @@
           <contents xsi:type="ocl.ecore:Constraint"/>
         </eAnnotations>
         <eAnnotations source="MTL">
-          <references href="platform:/plugin/utils/Modifier.emtl#/0/modPtr"/>
+          <references href="../../../utils/Modifier.emtl#/0/modPtr"/>
         </eAnnotations>
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
         <eParameters name="propertyOrParameter">
@@ -310,7 +310,7 @@
           <contents xsi:type="ocl.ecore:Constraint"/>
         </eAnnotations>
         <eAnnotations source="MTL">
-          <references href="platform:/plugin/utils/Modifier.emtl#/0/modRef"/>
+          <references href="../../../utils/Modifier.emtl#/0/modRef"/>
         </eAnnotations>
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
         <eParameters name="propertyOrParameter">
@@ -322,7 +322,7 @@
           <contents xsi:type="ocl.ecore:Constraint"/>
         </eAnnotations>
         <eAnnotations source="MTL">
-          <references href="platform:/plugin/utils/Modifier.emtl#/0/modArray"/>
+          <references href="../../../utils/Modifier.emtl#/0/modArray"/>
         </eAnnotations>
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
         <eParameters name="propertyOrParameter">
@@ -334,7 +334,7 @@
           <contents xsi:type="ocl.ecore:Constraint"/>
         </eAnnotations>
         <eAnnotations source="MTL">
-          <references href="platform:/plugin/utils/Modifier.emtl#/0/modConst"/>
+          <references href="../../../utils/Modifier.emtl#/0/modConst"/>
         </eAnnotations>
         <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
         <eParameters name="propertyOrParameter">
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/messages.properties b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/messages.properties
new file mode 100644
index 00000000000..0d1e512b8fb
--- /dev/null
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/messages.properties
@@ -0,0 +1 @@
+CppModelElementsCreator_CannotFormatContent=Cannot format content
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/preferences/CppCodeGenConstants.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/preferences/CppCodeGenConstants.java
index 27adfd59abb..6da7ce34190 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/preferences/CppCodeGenConstants.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/preferences/CppCodeGenConstants.java
@@ -16,21 +16,21 @@ public class CppCodeGenConstants {
 	/**
 	 * Suffix for generated header files
 	 */
-	public static final String P_HEADER_SUFFIX = "headSuffix";
+	public static final String P_HEADER_SUFFIX = "headSuffix"; //$NON-NLS-1$
 
 	/**
 	 * Suffix for generated body/implementation files
 	 */
-	public static final String P_IMPLEM_SUFFIX = "implSuffix";
+	public static final String P_IMPLEM_SUFFIX = "implSuffix"; //$NON-NLS-1$
 
 	/**
 	 * Suffix for generated body/implementation files
 	 */
-	public static final String P_OUT_INOUT_OP = "outInoutOp";
+	public static final String P_OUT_INOUT_OP = "outInoutOp"; //$NON-NLS-1$
 
 	/**
 	 * User defined comment header in generated files
 	 */
-	public static final String P_COMMENT_HEADER = "commentHeader";
+	public static final String P_COMMENT_HEADER = "commentHeader"; //$NON-NLS-1$
 
 }
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/preferences/CppCodeGenPreferenceInitializer.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/preferences/CppCodeGenPreferenceInitializer.java
index 0de1976c2a8..86a582619b5 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/preferences/CppCodeGenPreferenceInitializer.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/preferences/CppCodeGenPreferenceInitializer.java
@@ -25,13 +25,16 @@ public class CppCodeGenPreferenceInitializer extends AbstractPreferenceInitializ
 	 */
 	public void initializeDefaultPreferences() {
 		IPreferenceStore store = Activator.getDefault().getPreferenceStore();
-		store.setDefault(CppCodeGenConstants.P_HEADER_SUFFIX, "h");
-		store.setDefault(CppCodeGenConstants.P_IMPLEM_SUFFIX, "cpp");
-		store.setDefault(CppCodeGenConstants.P_OUT_INOUT_OP, "*");
+		store.setDefault(CppCodeGenConstants.P_HEADER_SUFFIX, "h"); //$NON-NLS-1$
+		store.setDefault(CppCodeGenConstants.P_IMPLEM_SUFFIX, "cpp"); //$NON-NLS-1$
+		store.setDefault(CppCodeGenConstants.P_OUT_INOUT_OP, "*"); //$NON-NLS-1$
 
 		// Default value for P_COMMENT_HEADER
-		String NL = System.getProperties().getProperty("line.separator");
-		String defaultValue = "" + "// --------------------------------------------------------" + NL + "// Code generated by Papyrus C++" + NL + "// --------------------------------------------------------" + NL + NL;
+		String NL = System.getProperties().getProperty("line.separator"); //$NON-NLS-1$
+		String defaultValue =
+				"// --------------------------------------------------------" + NL + //$NON-NLS-1$
+				"// Code generated by Papyrus C++" + NL + //$NON-NLS-1$ 
+				"// --------------------------------------------------------" + NL + NL; //$NON-NLS-1$
 		store.setDefault(CppCodeGenConstants.P_COMMENT_HEADER, defaultValue);
 	}
 }
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/transformation/CppModelElementsCreator.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/transformation/CppModelElementsCreator.java
index 754c05c0f1e..30f04b36594 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/transformation/CppModelElementsCreator.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/transformation/CppModelElementsCreator.java
@@ -35,9 +35,11 @@ import org.eclipse.papyrus.acceleo.AcceleoException;
 import org.eclipse.papyrus.acceleo.GenUtils;

 import org.eclipse.papyrus.acceleo.ModelElementsCreator;

 import org.eclipse.papyrus.cpp.codegen.Activator;

+import org.eclipse.papyrus.cpp.codegen.Messages;

 import org.eclipse.papyrus.cpp.codegen.preferences.CppCodeGenUtils;

 import org.eclipse.text.edits.MalformedTreeException;

 import org.eclipse.text.edits.TextEdit;

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

 import org.eclipse.uml2.uml.Class;

 import org.eclipse.uml2.uml.Classifier;

 import org.eclipse.uml2.uml.Element;

@@ -140,11 +142,11 @@ public class CppModelElementsCreator extends ModelElementsCreator {
 

 		// Only generate when no CppNoCodeGen stereotype is applied to the class

 		else if((!noCodeGen(classifier)) &&

-				(!GenUtils.hasStereotype(classifier, Template.class))) {

+				(!GenUtils.hasStereotype(classifier, Template.class)) &&

+				(!(classifier instanceof Association))) {

 

 			// Template Bound Class

 			if(GenUtils.isTemplateBoundElement(classifier)) {

-				// TODO: Acceleo template is only defined for class (not for all classifiers)

 				String fileContent = commentHeader + AcceleoDriver.evaluateURI(CppBindHeader, classifier);

 				createFile(container, classifier.getName() + DOT + hppExt, fileContent, true);

 

@@ -187,7 +189,7 @@ public class CppModelElementsCreator extends ModelElementsCreator {
 		TextEdit edit = codeFormatter.format(CodeFormatter.K_TRANSLATION_UNIT, doc.get(), 0, doc.get().length(), 0, null);

 

 		if (edit == null) {

-			Activator.log.debug("Cannot format content");

+			Activator.log.debug(Messages.CppModelElementsCreator_CannotFormatContent);

 			return content;

 		}

 

diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/CppGenUtils.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/CppGenUtils.java
index 1e8e83c440e..42d87d5fd4d 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/CppGenUtils.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/utils/CppGenUtils.java
@@ -298,7 +298,7 @@ public class CppGenUtils {
 
 	private static boolean visibilityStale = false;
 	private static VisibilityKind currVisibility = null;
-	private static final Pattern EmptySectionRegex = Pattern.compile("^\\s*$");
+	private static final Pattern EmptySectionRegex = Pattern.compile("^\\s*$"); //$NON-NLS-1$
 
 	/**
 	 * Update the current visibility to the specified value without writing this value to
@@ -322,7 +322,7 @@ public class CppGenUtils {
 		// Filter out empty sections.
 		Matcher m = EmptySectionRegex.matcher(content);
 		if (content.isEmpty() || m.matches()) {
-			return "";
+			return ""; //$NON-NLS-1$
 		}
 
 		// Don't write duplicate visibility modifiers.
@@ -331,6 +331,6 @@ public class CppGenUtils {
 		}
 
 		visibilityStale = false;
-		return currVisibility.toString() + ":\n" + content;
+		return currVisibility.toString() + ":\n" + content; //$NON-NLS-1$
 	}
 }
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/.classpath b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/.classpath
index 64c5e31b7a2..ad32c83a788 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/.classpath
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/META-INF/MANIFEST.MF b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/META-INF/MANIFEST.MF
index 8e2d90659f4..71fe671010a 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/META-INF/MANIFEST.MF
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/META-INF/MANIFEST.MF
@@ -18,5 +18,5 @@ Bundle-Localization: plugin
 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.cpp.profile.Activator

 Bundle-SymbolicName: org.eclipse.papyrus.cpp.profile;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

 

diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.genmodel b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.genmodel
index c6277d7e0ae..5699bcbf6af 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.genmodel
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/profiles/C_Cpp.genmodel
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.papyrus.cpp.profile/src" modelPluginID="org.eclipse.papyrus.cpp.profile"
-    modelName="C_Cpp" importerID="org.eclipse.emf.importer.ecore" complianceLevel="6.0"
-    copyrightFields="false" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.uml2.types/model/Types.genmodel#//types platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml">
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2013 CEA LIST&#xA;&#xA;All rights reserved. This program and the accompanying materials are&#xA;made available under the terms of the Eclipse Public License v1.0 which&#xA;accompanies this distribution, and is available at&#xA;http://www.eclipse.org/legal/epl-v10.html&#xA;&#xA;Contributors:&#xA;   CEA LIST - Initial API and implementation&#xA;"
+    modelDirectory="/org.eclipse.papyrus.cpp.profile/src" modelPluginID="org.eclipse.papyrus.cpp.profile"
+    modelName="C_Cpp" nonNLSMarkers="true" importerID="org.eclipse.emf.importer.ecore"
+    complianceLevel="6.0" copyrightFields="false" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.uml2.types/model/Types.genmodel#//types platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml">
   <foreignModel>C_Cpp.ecore</foreignModel>
   <genPackages prefix="C_Cpp" basePackage="org.eclipse.papyrus" resource="XML" disposableProviderFactory="true"
       ecorePackage="C_Cpp.ecore#/">
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Array.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Array.java
index d82c567d1d6..dca4e830bcc 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Array.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Array.java
@@ -1,4 +1,14 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp;
 
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/C_CppFactory.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/C_CppFactory.java
index 2fed909c509..c391b9c0505 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/C_CppFactory.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/C_CppFactory.java
@@ -1,4 +1,14 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp;
 
@@ -49,67 +59,67 @@ public interface C_CppFactory extends EFactory {
 	ManualGeneration createManualGeneration();
 
 	/**
-	 * Returns a new object of class '<em>Array</em>'.
+	 * Returns a new object of class '<em>Extern Library</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Array</em>'.
+	 * @return a new object of class '<em>Extern Library</em>'.
 	 * @generated
 	 */
-	Array createArray();
+	ExternLibrary createExternLibrary();
 
 	/**
-	 * Returns a new object of class '<em>Const</em>'.
+	 * Returns a new object of class '<em>No Code Gen</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Const</em>'.
+	 * @return a new object of class '<em>No Code Gen</em>'.
 	 * @generated
 	 */
-	Const createConst();
+	NoCodeGen createNoCodeGen();
 
 	/**
-	 * Returns a new object of class '<em>Ref</em>'.
+	 * Returns a new object of class '<em>Cpp Root</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Ref</em>'.
+	 * @return a new object of class '<em>Cpp Root</em>'.
 	 * @generated
 	 */
-	Ref createRef();
+	CppRoot createCppRoot();
 
 	/**
-	 * Returns a new object of class '<em>External</em>'.
+	 * Returns a new object of class '<em>Array</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>External</em>'.
+	 * @return a new object of class '<em>Array</em>'.
 	 * @generated
 	 */
-	External createExternal();
+	Array createArray();
 
 	/**
-	 * Returns a new object of class '<em>Extern Library</em>'.
+	 * Returns a new object of class '<em>Const</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Extern Library</em>'.
+	 * @return a new object of class '<em>Const</em>'.
 	 * @generated
 	 */
-	ExternLibrary createExternLibrary();
+	Const createConst();
 
 	/**
-	 * Returns a new object of class '<em>Cpp Root</em>'.
+	 * Returns a new object of class '<em>Ref</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Cpp Root</em>'.
+	 * @return a new object of class '<em>Ref</em>'.
 	 * @generated
 	 */
-	CppRoot createCppRoot();
+	Ref createRef();
 
 	/**
-	 * Returns a new object of class '<em>No Code Gen</em>'.
+	 * Returns a new object of class '<em>External</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>No Code Gen</em>'.
+	 * @return a new object of class '<em>External</em>'.
 	 * @generated
 	 */
-	NoCodeGen createNoCodeGen();
+	External createExternal();
 
 	/**
 	 * Returns a new object of class '<em>Const Init</em>'.
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/C_CppPackage.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/C_CppPackage.java
index 761a1a74679..4fe5f4d9ced 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/C_CppPackage.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/C_CppPackage.java
@@ -1,4 +1,14 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp;
 
@@ -30,7 +40,7 @@ public interface C_CppPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String eNAME = "C_Cpp";
+	String eNAME = "C_Cpp"; //$NON-NLS-1$
 
 	/**
 	 * The package namespace URI.
@@ -38,7 +48,7 @@ public interface C_CppPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String eNS_URI = "http://www.eclipse.org/papyrus/C_Cpp/1";
+	String eNS_URI = "http://www.eclipse.org/papyrus/C_Cpp/1"; //$NON-NLS-1$
 
 	/**
 	 * The package namespace name.
@@ -46,7 +56,7 @@ public interface C_CppPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String eNS_PREFIX = "C_Cpp";
+	String eNS_PREFIX = "C_Cpp"; //$NON-NLS-1$
 
 	/**
 	 * The singleton instance of the package.
@@ -213,36 +223,6 @@ public interface C_CppPackage extends EPackage {
 	int MANUAL_GENERATION_FEATURE_COUNT = 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.ArrayImpl <em>Array</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.C_Cpp.impl.ArrayImpl
-	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getArray()
-	 * @generated
-	 */
-	int ARRAY = 6;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.ConstImpl <em>Const</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.C_Cpp.impl.ConstImpl
-	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getConst()
-	 * @generated
-	 */
-	int CONST = 7;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.RefImpl <em>Ref</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.C_Cpp.impl.RefImpl
-	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getRef()
-	 * @generated
-	 */
-	int REF = 8;
-
-	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.ExternLibraryImpl <em>Extern Library</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -316,16 +296,6 @@ public interface C_CppPackage extends EPackage {
 	int EXTERN_LIBRARY_FEATURE_COUNT = 6;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.CppRootImpl <em>Cpp Root</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.C_Cpp.impl.CppRootImpl
-	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getCppRoot()
-	 * @generated
-	 */
-	int CPP_ROOT = 5;
-
-	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.NoCodeGenImpl <em>No Code Gen</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -354,6 +324,16 @@ public interface C_CppPackage extends EPackage {
 	int NO_CODE_GEN_FEATURE_COUNT = 1;
 
 	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.CppRootImpl <em>Cpp Root</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.C_Cpp.impl.CppRootImpl
+	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getCppRoot()
+	 * @generated
+	 */
+	int CPP_ROOT = 5;
+
+	/**
 	 * The feature id for the '<em><b>Base package</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -372,6 +352,16 @@ public interface C_CppPackage extends EPackage {
 	int CPP_ROOT_FEATURE_COUNT = 1;
 
 	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.ArrayImpl <em>Array</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.C_Cpp.impl.ArrayImpl
+	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getArray()
+	 * @generated
+	 */
+	int ARRAY = 6;
+
+	/**
 	 * The feature id for the '<em><b>Base parameter</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -417,6 +407,16 @@ public interface C_CppPackage extends EPackage {
 	int ARRAY_FEATURE_COUNT = 4;
 
 	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.ConstImpl <em>Const</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.C_Cpp.impl.ConstImpl
+	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getConst()
+	 * @generated
+	 */
+	int CONST = 7;
+
+	/**
 	 * The feature id for the '<em><b>Base parameter</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -453,6 +453,16 @@ public interface C_CppPackage extends EPackage {
 	int CONST_FEATURE_COUNT = 3;
 
 	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.C_Cpp.impl.RefImpl <em>Ref</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.C_Cpp.impl.RefImpl
+	 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getRef()
+	 * @generated
+	 */
+	int REF = 8;
+
+	/**
 	 * The feature id for the '<em><b>Base parameter</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1038,6 +1048,17 @@ public interface C_CppPackage extends EPackage {
 	EAttribute getInclude_Body();
 
 	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.C_Cpp.Include#getPreBody <em>Pre Body</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Pre Body</em>'.
+	 * @see org.eclipse.papyrus.C_Cpp.Include#getPreBody()
+	 * @see #getInclude()
+	 * @generated
+	 */
+	EAttribute getInclude_PreBody();
+
+	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.C_Cpp.Include#getHeader <em>Header</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1082,17 +1103,6 @@ public interface C_CppPackage extends EPackage {
 	EReference getInclude_Base_PackageImport();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.C_Cpp.Include#getPreBody <em>Pre Body</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Pre Body</em>'.
-	 * @see org.eclipse.papyrus.C_Cpp.Include#getPreBody()
-	 * @see #getInclude()
-	 * @generated
-	 */
-	EAttribute getInclude_PreBody();
-
-	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.C_Cpp.ManualGeneration <em>Manual Generation</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1125,6 +1135,124 @@ public interface C_CppPackage extends EPackage {
 	EReference getManualGeneration_Base_Class();
 
 	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.C_Cpp.ExternLibrary <em>Extern Library</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Extern Library</em>'.
+	 * @see org.eclipse.papyrus.C_Cpp.ExternLibrary
+	 * @generated
+	 */
+	EClass getExternLibrary();
+
+	/**
+	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.C_Cpp.ExternLibrary#getIncludePaths <em>Include Paths</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute list '<em>Include Paths</em>'.
+	 * @see org.eclipse.papyrus.C_Cpp.ExternLibrary#getIncludePaths()
+	 * @see #getExternLibrary()
+	 * @generated
+	 */
+	EAttribute getExternLibrary_IncludePaths();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.C_Cpp.ExternLibrary#getBase_package <em>Base package</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Base package</em>'.
+	 * @see org.eclipse.papyrus.C_Cpp.ExternLibrary#getBase_package()
+	 * @see #getExternLibrary()
+	 * @generated
+	 */
+	EReference getExternLibrary_Base_package();
+
+	/**
+	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.C_Cpp.ExternLibrary#getLibPaths <em>Lib Paths</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute list '<em>Lib Paths</em>'.
+	 * @see org.eclipse.papyrus.C_Cpp.ExternLibrary#getLibPaths()
+	 * @see #getExternLibrary()
+	 * @generated
+	 */
+	EAttribute getExternLibrary_LibPaths();
+
+	/**
+	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.C_Cpp.ExternLibrary#getMacros <em>Macros</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute list '<em>Macros</em>'.
+	 * @see org.eclipse.papyrus.C_Cpp.ExternLibrary#getMacros()
+	 * @see #getExternLibrary()
+	 * @generated
+	 */
+	EAttribute getExternLibrary_Macros();
+
+	/**
+	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.C_Cpp.ExternLibrary#getLibs <em>Libs</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute list '<em>Libs</em>'.
+	 * @see org.eclipse.papyrus.C_Cpp.ExternLibrary#getLibs()
+	 * @see #getExternLibrary()
+	 * @generated
+	 */
+	EAttribute getExternLibrary_Libs();
+
+	/**
+	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.C_Cpp.ExternLibrary#getIncludes <em>Includes</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute list '<em>Includes</em>'.
+	 * @see org.eclipse.papyrus.C_Cpp.ExternLibrary#getIncludes()
+	 * @see #getExternLibrary()
+	 * @generated
+	 */
+	EAttribute getExternLibrary_Includes();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.C_Cpp.NoCodeGen <em>No Code Gen</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>No Code Gen</em>'.
+	 * @see org.eclipse.papyrus.C_Cpp.NoCodeGen
+	 * @generated
+	 */
+	EClass getNoCodeGen();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.C_Cpp.NoCodeGen#getBase_element <em>Base element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Base element</em>'.
+	 * @see org.eclipse.papyrus.C_Cpp.NoCodeGen#getBase_element()
+	 * @see #getNoCodeGen()
+	 * @generated
+	 */
+	EReference getNoCodeGen_Base_element();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.C_Cpp.CppRoot <em>Cpp Root</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Cpp Root</em>'.
+	 * @see org.eclipse.papyrus.C_Cpp.CppRoot
+	 * @generated
+	 */
+	EClass getCppRoot();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.C_Cpp.CppRoot#getBase_package <em>Base package</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Base package</em>'.
+	 * @see org.eclipse.papyrus.C_Cpp.CppRoot#getBase_package()
+	 * @see #getCppRoot()
+	 * @generated
+	 */
+	EReference getCppRoot_Base_package();
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.C_Cpp.Array <em>Array</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1286,124 +1414,6 @@ public interface C_CppPackage extends EPackage {
 	EReference getExternal_Base_Classifier();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.C_Cpp.ExternLibrary <em>Extern Library</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Extern Library</em>'.
-	 * @see org.eclipse.papyrus.C_Cpp.ExternLibrary
-	 * @generated
-	 */
-	EClass getExternLibrary();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.C_Cpp.ExternLibrary#getIncludePaths <em>Include Paths</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Include Paths</em>'.
-	 * @see org.eclipse.papyrus.C_Cpp.ExternLibrary#getIncludePaths()
-	 * @see #getExternLibrary()
-	 * @generated
-	 */
-	EAttribute getExternLibrary_IncludePaths();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.C_Cpp.ExternLibrary#getBase_package <em>Base package</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Base package</em>'.
-	 * @see org.eclipse.papyrus.C_Cpp.ExternLibrary#getBase_package()
-	 * @see #getExternLibrary()
-	 * @generated
-	 */
-	EReference getExternLibrary_Base_package();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.C_Cpp.ExternLibrary#getLibPaths <em>Lib Paths</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Lib Paths</em>'.
-	 * @see org.eclipse.papyrus.C_Cpp.ExternLibrary#getLibPaths()
-	 * @see #getExternLibrary()
-	 * @generated
-	 */
-	EAttribute getExternLibrary_LibPaths();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.C_Cpp.ExternLibrary#getMacros <em>Macros</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Macros</em>'.
-	 * @see org.eclipse.papyrus.C_Cpp.ExternLibrary#getMacros()
-	 * @see #getExternLibrary()
-	 * @generated
-	 */
-	EAttribute getExternLibrary_Macros();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.C_Cpp.ExternLibrary#getLibs <em>Libs</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Libs</em>'.
-	 * @see org.eclipse.papyrus.C_Cpp.ExternLibrary#getLibs()
-	 * @see #getExternLibrary()
-	 * @generated
-	 */
-	EAttribute getExternLibrary_Libs();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.C_Cpp.ExternLibrary#getIncludes <em>Includes</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Includes</em>'.
-	 * @see org.eclipse.papyrus.C_Cpp.ExternLibrary#getIncludes()
-	 * @see #getExternLibrary()
-	 * @generated
-	 */
-	EAttribute getExternLibrary_Includes();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.C_Cpp.CppRoot <em>Cpp Root</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Cpp Root</em>'.
-	 * @see org.eclipse.papyrus.C_Cpp.CppRoot
-	 * @generated
-	 */
-	EClass getCppRoot();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.C_Cpp.CppRoot#getBase_package <em>Base package</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Base package</em>'.
-	 * @see org.eclipse.papyrus.C_Cpp.CppRoot#getBase_package()
-	 * @see #getCppRoot()
-	 * @generated
-	 */
-	EReference getCppRoot_Base_package();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.C_Cpp.NoCodeGen <em>No Code Gen</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>No Code Gen</em>'.
-	 * @see org.eclipse.papyrus.C_Cpp.NoCodeGen
-	 * @generated
-	 */
-	EClass getNoCodeGen();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.C_Cpp.NoCodeGen#getBase_element <em>Base element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Base element</em>'.
-	 * @see org.eclipse.papyrus.C_Cpp.NoCodeGen#getBase_element()
-	 * @see #getNoCodeGen()
-	 * @generated
-	 */
-	EReference getNoCodeGen_Base_element();
-
-	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.C_Cpp.ConstInit <em>Const Init</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1870,6 +1880,14 @@ public interface C_CppPackage extends EPackage {
 		EAttribute INCLUDE__BODY = eINSTANCE.getInclude_Body();
 
 		/**
+		 * The meta object literal for the '<em><b>Pre Body</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute INCLUDE__PRE_BODY = eINSTANCE.getInclude_PreBody();
+
+		/**
 		 * The meta object literal for the '<em><b>Header</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -1902,14 +1920,6 @@ public interface C_CppPackage extends EPackage {
 		EReference INCLUDE__BASE_PACKAGE_IMPORT = eINSTANCE.getInclude_Base_PackageImport();
 
 		/**
-		 * The meta object literal for the '<em><b>Pre Body</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute INCLUDE__PRE_BODY = eINSTANCE.getInclude_PreBody();
-
-		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.C_Cpp.impl.ManualGenerationImpl <em>Manual Generation</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -1936,226 +1946,226 @@ public interface C_CppPackage extends EPackage {
 		EReference MANUAL_GENERATION__BASE_CLASS = eINSTANCE.getManualGeneration_Base_Class();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.C_Cpp.impl.ArrayImpl <em>Array</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.C_Cpp.impl.ExternLibraryImpl <em>Extern Library</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.C_Cpp.impl.ArrayImpl
-		 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getArray()
+		 * @see org.eclipse.papyrus.C_Cpp.impl.ExternLibraryImpl
+		 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getExternLibrary()
 		 * @generated
 		 */
-		EClass ARRAY = eINSTANCE.getArray();
+		EClass EXTERN_LIBRARY = eINSTANCE.getExternLibrary();
 
 		/**
-		 * The meta object literal for the '<em><b>Base parameter</b></em>' reference feature.
+		 * The meta object literal for the '<em><b>Include Paths</b></em>' attribute list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference ARRAY__BASE_PARAMETER = eINSTANCE.getArray_Base_parameter();
+		EAttribute EXTERN_LIBRARY__INCLUDE_PATHS = eINSTANCE.getExternLibrary_IncludePaths();
 
 		/**
-		 * The meta object literal for the '<em><b>Definition</b></em>' attribute feature.
+		 * The meta object literal for the '<em><b>Base package</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute ARRAY__DEFINITION = eINSTANCE.getArray_Definition();
+		EReference EXTERN_LIBRARY__BASE_PACKAGE = eINSTANCE.getExternLibrary_Base_package();
 
 		/**
-		 * The meta object literal for the '<em><b>Base property</b></em>' reference feature.
+		 * The meta object literal for the '<em><b>Lib Paths</b></em>' attribute list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference ARRAY__BASE_PROPERTY = eINSTANCE.getArray_Base_property();
+		EAttribute EXTERN_LIBRARY__LIB_PATHS = eINSTANCE.getExternLibrary_LibPaths();
 
 		/**
-		 * The meta object literal for the '<em><b>Base association</b></em>' reference feature.
+		 * The meta object literal for the '<em><b>Macros</b></em>' attribute list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference ARRAY__BASE_ASSOCIATION = eINSTANCE.getArray_Base_association();
+		EAttribute EXTERN_LIBRARY__MACROS = eINSTANCE.getExternLibrary_Macros();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.C_Cpp.impl.ConstImpl <em>Const</em>}' class.
+		 * The meta object literal for the '<em><b>Libs</b></em>' attribute list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.C_Cpp.impl.ConstImpl
-		 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getConst()
 		 * @generated
 		 */
-		EClass CONST = eINSTANCE.getConst();
+		EAttribute EXTERN_LIBRARY__LIBS = eINSTANCE.getExternLibrary_Libs();
 
 		/**
-		 * The meta object literal for the '<em><b>Base parameter</b></em>' reference feature.
+		 * The meta object literal for the '<em><b>Includes</b></em>' attribute list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference CONST__BASE_PARAMETER = eINSTANCE.getConst_Base_parameter();
+		EAttribute EXTERN_LIBRARY__INCLUDES = eINSTANCE.getExternLibrary_Includes();
 
 		/**
-		 * The meta object literal for the '<em><b>Base property</b></em>' reference feature.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.C_Cpp.impl.NoCodeGenImpl <em>No Code Gen</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.C_Cpp.impl.NoCodeGenImpl
+		 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getNoCodeGen()
 		 * @generated
 		 */
-		EReference CONST__BASE_PROPERTY = eINSTANCE.getConst_Base_property();
+		EClass NO_CODE_GEN = eINSTANCE.getNoCodeGen();
 
 		/**
-		 * The meta object literal for the '<em><b>Base operation</b></em>' reference feature.
+		 * The meta object literal for the '<em><b>Base element</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference CONST__BASE_OPERATION = eINSTANCE.getConst_Base_operation();
+		EReference NO_CODE_GEN__BASE_ELEMENT = eINSTANCE.getNoCodeGen_Base_element();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.C_Cpp.impl.RefImpl <em>Ref</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.C_Cpp.impl.CppRootImpl <em>Cpp Root</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.C_Cpp.impl.RefImpl
-		 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getRef()
+		 * @see org.eclipse.papyrus.C_Cpp.impl.CppRootImpl
+		 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getCppRoot()
 		 * @generated
 		 */
-		EClass REF = eINSTANCE.getRef();
+		EClass CPP_ROOT = eINSTANCE.getCppRoot();
 
 		/**
-		 * The meta object literal for the '<em><b>Base parameter</b></em>' reference feature.
+		 * The meta object literal for the '<em><b>Base package</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference REF__BASE_PARAMETER = eINSTANCE.getRef_Base_parameter();
+		EReference CPP_ROOT__BASE_PACKAGE = eINSTANCE.getCppRoot_Base_package();
 
 		/**
-		 * The meta object literal for the '<em><b>Base property</b></em>' reference feature.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.C_Cpp.impl.ArrayImpl <em>Array</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.C_Cpp.impl.ArrayImpl
+		 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getArray()
 		 * @generated
 		 */
-		EReference REF__BASE_PROPERTY = eINSTANCE.getRef_Base_property();
+		EClass ARRAY = eINSTANCE.getArray();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.C_Cpp.impl.ExternalImpl <em>External</em>}' class.
+		 * The meta object literal for the '<em><b>Base parameter</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.C_Cpp.impl.ExternalImpl
-		 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getExternal()
 		 * @generated
 		 */
-		EClass EXTERNAL = eINSTANCE.getExternal();
+		EReference ARRAY__BASE_PARAMETER = eINSTANCE.getArray_Base_parameter();
 
 		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+		 * The meta object literal for the '<em><b>Definition</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute EXTERNAL__NAME = eINSTANCE.getExternal_Name();
+		EAttribute ARRAY__DEFINITION = eINSTANCE.getArray_Definition();
 
 		/**
-		 * The meta object literal for the '<em><b>Base Classifier</b></em>' reference feature.
+		 * The meta object literal for the '<em><b>Base property</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference EXTERNAL__BASE_CLASSIFIER = eINSTANCE.getExternal_Base_Classifier();
+		EReference ARRAY__BASE_PROPERTY = eINSTANCE.getArray_Base_property();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.C_Cpp.impl.ExternLibraryImpl <em>Extern Library</em>}' class.
+		 * The meta object literal for the '<em><b>Base association</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.C_Cpp.impl.ExternLibraryImpl
-		 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getExternLibrary()
 		 * @generated
 		 */
-		EClass EXTERN_LIBRARY = eINSTANCE.getExternLibrary();
+		EReference ARRAY__BASE_ASSOCIATION = eINSTANCE.getArray_Base_association();
 
 		/**
-		 * The meta object literal for the '<em><b>Include Paths</b></em>' attribute list feature.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.C_Cpp.impl.ConstImpl <em>Const</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.C_Cpp.impl.ConstImpl
+		 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getConst()
 		 * @generated
 		 */
-		EAttribute EXTERN_LIBRARY__INCLUDE_PATHS = eINSTANCE.getExternLibrary_IncludePaths();
+		EClass CONST = eINSTANCE.getConst();
 
 		/**
-		 * The meta object literal for the '<em><b>Base package</b></em>' reference feature.
+		 * The meta object literal for the '<em><b>Base parameter</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference EXTERN_LIBRARY__BASE_PACKAGE = eINSTANCE.getExternLibrary_Base_package();
+		EReference CONST__BASE_PARAMETER = eINSTANCE.getConst_Base_parameter();
 
 		/**
-		 * The meta object literal for the '<em><b>Lib Paths</b></em>' attribute list feature.
+		 * The meta object literal for the '<em><b>Base property</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute EXTERN_LIBRARY__LIB_PATHS = eINSTANCE.getExternLibrary_LibPaths();
+		EReference CONST__BASE_PROPERTY = eINSTANCE.getConst_Base_property();
 
 		/**
-		 * The meta object literal for the '<em><b>Macros</b></em>' attribute list feature.
+		 * The meta object literal for the '<em><b>Base operation</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute EXTERN_LIBRARY__MACROS = eINSTANCE.getExternLibrary_Macros();
+		EReference CONST__BASE_OPERATION = eINSTANCE.getConst_Base_operation();
 
 		/**
-		 * The meta object literal for the '<em><b>Libs</b></em>' attribute list feature.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.C_Cpp.impl.RefImpl <em>Ref</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.C_Cpp.impl.RefImpl
+		 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getRef()
 		 * @generated
 		 */
-		EAttribute EXTERN_LIBRARY__LIBS = eINSTANCE.getExternLibrary_Libs();
+		EClass REF = eINSTANCE.getRef();
 
 		/**
-		 * The meta object literal for the '<em><b>Includes</b></em>' attribute list feature.
+		 * The meta object literal for the '<em><b>Base parameter</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute EXTERN_LIBRARY__INCLUDES = eINSTANCE.getExternLibrary_Includes();
+		EReference REF__BASE_PARAMETER = eINSTANCE.getRef_Base_parameter();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.C_Cpp.impl.CppRootImpl <em>Cpp Root</em>}' class.
+		 * The meta object literal for the '<em><b>Base property</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.C_Cpp.impl.CppRootImpl
-		 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getCppRoot()
 		 * @generated
 		 */
-		EClass CPP_ROOT = eINSTANCE.getCppRoot();
+		EReference REF__BASE_PROPERTY = eINSTANCE.getRef_Base_property();
 
 		/**
-		 * The meta object literal for the '<em><b>Base package</b></em>' reference feature.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.C_Cpp.impl.ExternalImpl <em>External</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.C_Cpp.impl.ExternalImpl
+		 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getExternal()
 		 * @generated
 		 */
-		EReference CPP_ROOT__BASE_PACKAGE = eINSTANCE.getCppRoot_Base_package();
+		EClass EXTERNAL = eINSTANCE.getExternal();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.C_Cpp.impl.NoCodeGenImpl <em>No Code Gen</em>}' class.
+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.C_Cpp.impl.NoCodeGenImpl
-		 * @see org.eclipse.papyrus.C_Cpp.impl.C_CppPackageImpl#getNoCodeGen()
 		 * @generated
 		 */
-		EClass NO_CODE_GEN = eINSTANCE.getNoCodeGen();
+		EAttribute EXTERNAL__NAME = eINSTANCE.getExternal_Name();
 
 		/**
-		 * The meta object literal for the '<em><b>Base element</b></em>' reference feature.
+		 * The meta object literal for the '<em><b>Base Classifier</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference NO_CODE_GEN__BASE_ELEMENT = eINSTANCE.getNoCodeGen_Base_element();
+		EReference EXTERNAL__BASE_CLASSIFIER = eINSTANCE.getExternal_Base_Classifier();
 
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.C_Cpp.impl.ConstInitImpl <em>Const Init</em>}' class.
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Const.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Const.java
index 37ee8288e48..1a94d4e1f6d 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Const.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Const.java
@@ -1,4 +1,14 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp;
 
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/ConstInit.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/ConstInit.java
index 3429e05f11f..eb59502f3a4 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/ConstInit.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/ConstInit.java
@@ -1,4 +1,14 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp;
 
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/CppInit.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/CppInit.java
index 34def7d4acb..cdc2dd3587b 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/CppInit.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/CppInit.java
@@ -1,4 +1,14 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp;
 
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/CppRoot.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/CppRoot.java
index c29b1ae046f..49b507eb672 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/CppRoot.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/CppRoot.java
@@ -1,4 +1,14 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp;
 
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Default.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Default.java
deleted file mode 100644
index ce9c8ac4c20..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Default.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/**
- */
-package org.eclipse.papyrus.C_Cpp;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.uml2.uml.Parameter;
-import org.eclipse.uml2.uml.Property;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Default</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.C_Cpp.Default#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.papyrus.C_Cpp.Default#getBase_parameter <em>Base parameter</em>}</li>
- *   <li>{@link org.eclipse.papyrus.C_Cpp.Default#getBase_property <em>Base property</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getDefault()
- * @model
- * @generated
- */
-public interface Default extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see #setValue(String)
-	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getDefault_Value()
-	 * @model unique="false" dataType="org.eclipse.uml2.types.String" required="true" ordered="false"
-	 * @generated
-	 */
-	String getValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.Default#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Base parameter</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Base parameter</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Base parameter</em>' reference.
-	 * @see #setBase_parameter(Parameter)
-	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getDefault_Base_parameter()
-	 * @model required="true" ordered="false"
-	 * @generated
-	 */
-	Parameter getBase_parameter();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.Default#getBase_parameter <em>Base parameter</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base parameter</em>' reference.
-	 * @see #getBase_parameter()
-	 * @generated
-	 */
-	void setBase_parameter(Parameter value);
-
-	/**
-	 * Returns the value of the '<em><b>Base property</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Base property</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Base property</em>' reference.
-	 * @see #setBase_property(Property)
-	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getDefault_Base_property()
-	 * @model required="true" ordered="false"
-	 * @generated
-	 */
-	Property getBase_property();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.Default#getBase_property <em>Base property</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base property</em>' reference.
-	 * @see #getBase_property()
-	 * @generated
-	 */
-	void setBase_property(Property value);
-
-} // Default
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/EAccessKind.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/EAccessKind.java
index 46b01e5dc4b..166f99944c2 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/EAccessKind.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/EAccessKind.java
@@ -1,4 +1,14 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp;
 
@@ -26,7 +36,7 @@ public enum EAccessKind implements Enumerator {
 	 * @generated
 	 * @ordered
 	 */
-	READ(0, "read", "read"),
+	READ(0, "read", "read"), //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
 	 * The '<em><b>Write</b></em>' literal object.
@@ -36,7 +46,7 @@ public enum EAccessKind implements Enumerator {
 	 * @generated
 	 * @ordered
 	 */
-	WRITE(1, "write", "write"),
+	WRITE(1, "write", "write"), //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
 	 * The '<em><b>Read Write</b></em>' literal object.
@@ -46,7 +56,7 @@ public enum EAccessKind implements Enumerator {
 	 * @generated
 	 * @ordered
 	 */
-	READ_WRITE(2, "readWrite", "readWrite");
+	READ_WRITE(2, "readWrite", "readWrite"); //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
 	 * The '<em><b>Read</b></em>' literal value.
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/EStorageClass.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/EStorageClass.java
index 42a7a12d0c6..f46478dcbb1 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/EStorageClass.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/EStorageClass.java
@@ -1,4 +1,14 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp;
 
@@ -26,7 +36,9 @@ public enum EStorageClass implements Enumerator {
 	 * @generated
 	 * @ordered
 	 */
-	VOLATILE(0, "volatile", "volatile"), /**
+	VOLATILE(0, "volatile", "volatile"), //$NON-NLS-1$ //$NON-NLS-2$
+
+	/**
 	 * The '<em><b>Register</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -34,7 +46,7 @@ public enum EStorageClass implements Enumerator {
 	 * @generated
 	 * @ordered
 	 */
-	REGISTER(1, "register", "register"),
+	REGISTER(1, "register", "register"), //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
 	 * The '<em><b>Extern</b></em>' literal object.
@@ -44,7 +56,7 @@ public enum EStorageClass implements Enumerator {
 	 * @generated
 	 * @ordered
 	 */
-	EXTERN(2, "extern", "extern");
+	EXTERN(2, "extern", "extern"); //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
 	 * The '<em><b>Volatile</b></em>' literal value.
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/ExternLibrary.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/ExternLibrary.java
index 92ae55b0fcc..af98a3a56aa 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/ExternLibrary.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/ExternLibrary.java
@@ -1,8 +1,19 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp;
 
 import org.eclipse.emf.common.util.EList;
+
 import org.eclipse.emf.ecore.EObject;
 
 /**
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/External.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/External.java
index 7a785089aff..f48f2e0ba2e 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/External.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/External.java
@@ -1,4 +1,14 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp;
 
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Friend.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Friend.java
index fd2892ddfad..051954b306f 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Friend.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Friend.java
@@ -1,4 +1,14 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp;
 
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Include.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Include.java
index 2b68020c2a3..9cbb3ca9247 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Include.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Include.java
@@ -1,4 +1,14 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp;
 
@@ -61,6 +71,33 @@ public interface Include extends EObject {
 	void setBody(String value);
 
 	/**
+	 * Returns the value of the '<em><b>Pre Body</b></em>' attribute.
+	 * The default value is <code>""</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Pre Body</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Pre Body</em>' attribute.
+	 * @see #setPreBody(String)
+	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getInclude_PreBody()
+	 * @model default="" dataType="org.eclipse.uml2.types.String" ordered="false"
+	 * @generated
+	 */
+	String getPreBody();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.Include#getPreBody <em>Pre Body</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Pre Body</em>' attribute.
+	 * @see #getPreBody()
+	 * @generated
+	 */
+	void setPreBody(String value);
+
+	/**
 	 * Returns the value of the '<em><b>Header</b></em>' attribute.
 	 * The default value is <code>""</code>.
 	 * <!-- begin-user-doc -->
@@ -165,31 +202,4 @@ public interface Include extends EObject {
 	 */
 	void setBase_PackageImport(PackageImport value);
 
-	/**
-	 * Returns the value of the '<em><b>Pre Body</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Pre Body</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Pre Body</em>' attribute.
-	 * @see #setPreBody(String)
-	 * @see org.eclipse.papyrus.C_Cpp.C_CppPackage#getInclude_PreBody()
-	 * @model default="" dataType="org.eclipse.uml2.types.String" ordered="false"
-	 * @generated
-	 */
-	String getPreBody();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.C_Cpp.Include#getPreBody <em>Pre Body</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Pre Body</em>' attribute.
-	 * @see #getPreBody()
-	 * @generated
-	 */
-	void setPreBody(String value);
-
 } // Include
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Inline.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Inline.java
index 9bb30dca888..2544e417edb 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Inline.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Inline.java
@@ -1,4 +1,14 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp;
 
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/ManualGeneration.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/ManualGeneration.java
index 04d0a7e1e11..f0989f3da9b 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/ManualGeneration.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/ManualGeneration.java
@@ -1,4 +1,14 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp;
 
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/NoCodeGen.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/NoCodeGen.java
index 876e3ef859d..7dd4795600d 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/NoCodeGen.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/NoCodeGen.java
@@ -1,4 +1,14 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp;
 
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Ptr.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Ptr.java
index 723fe1072a9..ad8d342b6ca 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Ptr.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Ptr.java
@@ -1,4 +1,14 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp;
 
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Ref.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Ref.java
index 12b31e66c9c..afe8efe151f 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Ref.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Ref.java
@@ -1,4 +1,14 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp;
 
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/StorageClass.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/StorageClass.java
index dbfbabb9dc3..0c71ff03046 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/StorageClass.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/StorageClass.java
@@ -1,8 +1,19 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp;
 
 import org.eclipse.emf.ecore.EObject;
+
 import org.eclipse.uml2.uml.Parameter;
 import org.eclipse.uml2.uml.Property;
 
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Template.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Template.java
index bdaae9efb97..acc61eff621 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Template.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Template.java
@@ -1,4 +1,14 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp;
 
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/TemplateBinding.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/TemplateBinding.java
index 9d0118365fd..f318bdbff14 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/TemplateBinding.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/TemplateBinding.java
@@ -1,4 +1,14 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp;
 
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/TemplateParameter.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/TemplateParameter.java
index 037b47036f8..3f2f28dac34 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/TemplateParameter.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/TemplateParameter.java
@@ -1,4 +1,14 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp;
 
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Typedef.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Typedef.java
index c59acde0ef4..d8da5089c98 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Typedef.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Typedef.java
@@ -1,4 +1,14 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp;
 
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Union.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Union.java
index a07f313835c..2b0d375d5cf 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Union.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Union.java
@@ -1,4 +1,14 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp;
 
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Virtual.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Virtual.java
index 94df87da751..d4726086c3e 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Virtual.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Virtual.java
@@ -1,4 +1,14 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp;
 
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Visibility.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Visibility.java
index a2fb0dd2c19..ec265a1a32e 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Visibility.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/Visibility.java
@@ -1,4 +1,14 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp;
 
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/VisibilityKind.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/VisibilityKind.java
index 969a4647e4e..cefafea34d9 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/VisibilityKind.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/VisibilityKind.java
@@ -1,4 +1,14 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp;
 
@@ -26,7 +36,7 @@ public enum VisibilityKind implements Enumerator {
 	 * @generated
 	 * @ordered
 	 */
-	PRIVATE(0, "private", "private"),
+	PRIVATE(0, "private", "private"), //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
 	 * The '<em><b>Protected</b></em>' literal object.
@@ -36,7 +46,7 @@ public enum VisibilityKind implements Enumerator {
 	 * @generated
 	 * @ordered
 	 */
-	PROTECTED(1, "protected", "protected"),
+	PROTECTED(1, "protected", "protected"), //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
 	 * The '<em><b>Public</b></em>' literal object.
@@ -46,7 +56,7 @@ public enum VisibilityKind implements Enumerator {
 	 * @generated
 	 * @ordered
 	 */
-	PUBLIC(2, "public", "public");
+	PUBLIC(2, "public", "public"); //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
 	 * The '<em><b>Private</b></em>' literal value.
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ArrayImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ArrayImpl.java
index ca94a449db4..7cf2e70faca 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ArrayImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ArrayImpl.java
@@ -1,14 +1,28 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp.impl;
 
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
+
 import org.eclipse.papyrus.C_Cpp.Array;
 import org.eclipse.papyrus.C_Cpp.C_CppPackage;
+
 import org.eclipse.uml2.uml.Association;
 import org.eclipse.uml2.uml.Parameter;
 import org.eclipse.uml2.uml.Property;
@@ -335,7 +349,7 @@ public class ArrayImpl extends EObjectImpl implements Array {
 		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (definition: ");
+		result.append(" (definition: "); //$NON-NLS-1$
 		result.append(definition);
 		result.append(')');
 		return result.toString();
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/C_CppFactoryImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/C_CppFactoryImpl.java
index 11fbbcc6c7c..0124c6aea40 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/C_CppFactoryImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/C_CppFactoryImpl.java
@@ -1,4 +1,14 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp.impl;
 
@@ -6,8 +16,11 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
+
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
+
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
+
 import org.eclipse.papyrus.C_Cpp.*;
 
 /**
@@ -77,7 +90,7 @@ public class C_CppFactoryImpl extends EFactoryImpl implements C_CppFactory {
 			case C_CppPackage.UNION: return createUnion();
 			case C_CppPackage.STORAGE_CLASS: return createStorageClass();
 			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
 		}
 	}
 
@@ -96,7 +109,7 @@ public class C_CppFactoryImpl extends EFactoryImpl implements C_CppFactory {
 			case C_CppPackage.ESTORAGE_CLASS:
 				return createEStorageClassFromString(eDataType, initialValue);
 			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
 		}
 	}
 
@@ -115,7 +128,7 @@ public class C_CppFactoryImpl extends EFactoryImpl implements C_CppFactory {
 			case C_CppPackage.ESTORAGE_CLASS:
 				return convertEStorageClassToString(eDataType, instanceValue);
 			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
 		}
 	}
 
@@ -154,9 +167,9 @@ public class C_CppFactoryImpl extends EFactoryImpl implements C_CppFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Array createArray() {
-		ArrayImpl array = new ArrayImpl();
-		return array;
+	public ExternLibrary createExternLibrary() {
+		ExternLibraryImpl externLibrary = new ExternLibraryImpl();
+		return externLibrary;
 	}
 
 	/**
@@ -164,9 +177,9 @@ public class C_CppFactoryImpl extends EFactoryImpl implements C_CppFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Const createConst() {
-		ConstImpl const_ = new ConstImpl();
-		return const_;
+	public NoCodeGen createNoCodeGen() {
+		NoCodeGenImpl noCodeGen = new NoCodeGenImpl();
+		return noCodeGen;
 	}
 
 	/**
@@ -174,9 +187,9 @@ public class C_CppFactoryImpl extends EFactoryImpl implements C_CppFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Ref createRef() {
-		RefImpl ref = new RefImpl();
-		return ref;
+	public CppRoot createCppRoot() {
+		CppRootImpl cppRoot = new CppRootImpl();
+		return cppRoot;
 	}
 
 	/**
@@ -184,9 +197,9 @@ public class C_CppFactoryImpl extends EFactoryImpl implements C_CppFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public External createExternal() {
-		ExternalImpl external = new ExternalImpl();
-		return external;
+	public Array createArray() {
+		ArrayImpl array = new ArrayImpl();
+		return array;
 	}
 
 	/**
@@ -194,9 +207,9 @@ public class C_CppFactoryImpl extends EFactoryImpl implements C_CppFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public ExternLibrary createExternLibrary() {
-		ExternLibraryImpl externLibrary = new ExternLibraryImpl();
-		return externLibrary;
+	public Const createConst() {
+		ConstImpl const_ = new ConstImpl();
+		return const_;
 	}
 
 	/**
@@ -204,9 +217,9 @@ public class C_CppFactoryImpl extends EFactoryImpl implements C_CppFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public CppRoot createCppRoot() {
-		CppRootImpl cppRoot = new CppRootImpl();
-		return cppRoot;
+	public Ref createRef() {
+		RefImpl ref = new RefImpl();
+		return ref;
 	}
 
 	/**
@@ -214,9 +227,9 @@ public class C_CppFactoryImpl extends EFactoryImpl implements C_CppFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NoCodeGen createNoCodeGen() {
-		NoCodeGenImpl noCodeGen = new NoCodeGenImpl();
-		return noCodeGen;
+	public External createExternal() {
+		ExternalImpl external = new ExternalImpl();
+		return external;
 	}
 
 	/**
@@ -346,7 +359,7 @@ public class C_CppFactoryImpl extends EFactoryImpl implements C_CppFactory {
 	 */
 	public VisibilityKind createVisibilityKindFromString(EDataType eDataType, String initialValue) {
 		VisibilityKind result = VisibilityKind.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		return result;
 	}
 
@@ -366,7 +379,7 @@ public class C_CppFactoryImpl extends EFactoryImpl implements C_CppFactory {
 	 */
 	public EAccessKind createEAccessKindFromString(EDataType eDataType, String initialValue) {
 		EAccessKind result = EAccessKind.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		return result;
 	}
 
@@ -386,7 +399,7 @@ public class C_CppFactoryImpl extends EFactoryImpl implements C_CppFactory {
 	 */
 	public EStorageClass createEStorageClassFromString(EDataType eDataType, String initialValue) {
 		EStorageClass result = EStorageClass.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		return result;
 	}
 
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/C_CppPackageImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/C_CppPackageImpl.java
index 37ae56dd417..3dc29d49efd 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/C_CppPackageImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/C_CppPackageImpl.java
@@ -1,4 +1,14 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp.impl;
 
@@ -7,7 +17,9 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EEnum;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
+
 import org.eclipse.emf.ecore.impl.EPackageImpl;
+
 import org.eclipse.papyrus.C_Cpp.Array;
 import org.eclipse.papyrus.C_Cpp.C_CppFactory;
 import org.eclipse.papyrus.C_Cpp.C_CppPackage;
@@ -15,7 +27,6 @@ import org.eclipse.papyrus.C_Cpp.Const;
 import org.eclipse.papyrus.C_Cpp.ConstInit;
 import org.eclipse.papyrus.C_Cpp.CppInit;
 import org.eclipse.papyrus.C_Cpp.CppRoot;
-import org.eclipse.papyrus.C_Cpp.Default;
 import org.eclipse.papyrus.C_Cpp.EAccessKind;
 import org.eclipse.papyrus.C_Cpp.EStorageClass;
 import org.eclipse.papyrus.C_Cpp.ExternLibrary;
@@ -36,7 +47,9 @@ import org.eclipse.papyrus.C_Cpp.Union;
 import org.eclipse.papyrus.C_Cpp.Virtual;
 import org.eclipse.papyrus.C_Cpp.Visibility;
 import org.eclipse.papyrus.C_Cpp.VisibilityKind;
+
 import org.eclipse.uml2.types.TypesPackage;
+
 import org.eclipse.uml2.uml.UMLPackage;
 
 /**
@@ -72,49 +85,49 @@ public class C_CppPackageImpl extends EPackageImpl implements C_CppPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private EClass arrayEClass = null;
+	private EClass externLibraryEClass = null;
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private EClass constEClass = null;
+	private EClass noCodeGenEClass = null;
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private EClass refEClass = null;
+	private EClass cppRootEClass = null;
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private EClass externalEClass = null;
+	private EClass arrayEClass = null;
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private EClass externLibraryEClass = null;
+	private EClass constEClass = null;
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private EClass cppRootEClass = null;
+	private EClass refEClass = null;
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private EClass noCodeGenEClass = null;
+	private EClass externalEClass = null;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -344,6 +357,15 @@ public class C_CppPackageImpl extends EPackageImpl implements C_CppPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EAttribute getInclude_PreBody() {
+		return (EAttribute)includeEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EAttribute getInclude_Header() {
 		return (EAttribute)includeEClass.getEStructuralFeatures().get(2);
 	}
@@ -380,15 +402,6 @@ public class C_CppPackageImpl extends EPackageImpl implements C_CppPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getInclude_PreBody() {
-		return (EAttribute)includeEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public EClass getManualGeneration() {
 		return manualGenerationEClass;
 	}
@@ -416,8 +429,8 @@ public class C_CppPackageImpl extends EPackageImpl implements C_CppPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EClass getArray() {
-		return arrayEClass;
+	public EClass getExternLibrary() {
+		return externLibraryEClass;
 	}
 
 	/**
@@ -425,8 +438,8 @@ public class C_CppPackageImpl extends EPackageImpl implements C_CppPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getArray_Base_parameter() {
-		return (EReference)arrayEClass.getEStructuralFeatures().get(0);
+	public EAttribute getExternLibrary_IncludePaths() {
+		return (EAttribute)externLibraryEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -434,8 +447,8 @@ public class C_CppPackageImpl extends EPackageImpl implements C_CppPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getArray_Definition() {
-		return (EAttribute)arrayEClass.getEStructuralFeatures().get(1);
+	public EReference getExternLibrary_Base_package() {
+		return (EReference)externLibraryEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -443,8 +456,8 @@ public class C_CppPackageImpl extends EPackageImpl implements C_CppPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getArray_Base_property() {
-		return (EReference)arrayEClass.getEStructuralFeatures().get(2);
+	public EAttribute getExternLibrary_LibPaths() {
+		return (EAttribute)externLibraryEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
@@ -452,8 +465,8 @@ public class C_CppPackageImpl extends EPackageImpl implements C_CppPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getArray_Base_association() {
-		return (EReference)arrayEClass.getEStructuralFeatures().get(3);
+	public EAttribute getExternLibrary_Macros() {
+		return (EAttribute)externLibraryEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
@@ -461,8 +474,8 @@ public class C_CppPackageImpl extends EPackageImpl implements C_CppPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EClass getConst() {
-		return constEClass;
+	public EAttribute getExternLibrary_Libs() {
+		return (EAttribute)externLibraryEClass.getEStructuralFeatures().get(4);
 	}
 
 	/**
@@ -470,8 +483,8 @@ public class C_CppPackageImpl extends EPackageImpl implements C_CppPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getConst_Base_parameter() {
-		return (EReference)constEClass.getEStructuralFeatures().get(0);
+	public EAttribute getExternLibrary_Includes() {
+		return (EAttribute)externLibraryEClass.getEStructuralFeatures().get(5);
 	}
 
 	/**
@@ -479,8 +492,8 @@ public class C_CppPackageImpl extends EPackageImpl implements C_CppPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getConst_Base_property() {
-		return (EReference)constEClass.getEStructuralFeatures().get(1);
+	public EClass getNoCodeGen() {
+		return noCodeGenEClass;
 	}
 
 	/**
@@ -488,8 +501,8 @@ public class C_CppPackageImpl extends EPackageImpl implements C_CppPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getConst_Base_operation() {
-		return (EReference)constEClass.getEStructuralFeatures().get(2);
+	public EReference getNoCodeGen_Base_element() {
+		return (EReference)noCodeGenEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -497,8 +510,8 @@ public class C_CppPackageImpl extends EPackageImpl implements C_CppPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EClass getRef() {
-		return refEClass;
+	public EClass getCppRoot() {
+		return cppRootEClass;
 	}
 
 	/**
@@ -506,8 +519,8 @@ public class C_CppPackageImpl extends EPackageImpl implements C_CppPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getRef_Base_parameter() {
-		return (EReference)refEClass.getEStructuralFeatures().get(0);
+	public EReference getCppRoot_Base_package() {
+		return (EReference)cppRootEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -515,8 +528,8 @@ public class C_CppPackageImpl extends EPackageImpl implements C_CppPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getRef_Base_property() {
-		return (EReference)refEClass.getEStructuralFeatures().get(1);
+	public EClass getArray() {
+		return arrayEClass;
 	}
 
 	/**
@@ -524,8 +537,8 @@ public class C_CppPackageImpl extends EPackageImpl implements C_CppPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EClass getExternal() {
-		return externalEClass;
+	public EReference getArray_Base_parameter() {
+		return (EReference)arrayEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -533,8 +546,8 @@ public class C_CppPackageImpl extends EPackageImpl implements C_CppPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getExternal_Name() {
-		return (EAttribute)externalEClass.getEStructuralFeatures().get(0);
+	public EAttribute getArray_Definition() {
+		return (EAttribute)arrayEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -542,8 +555,8 @@ public class C_CppPackageImpl extends EPackageImpl implements C_CppPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getExternal_Base_Classifier() {
-		return (EReference)externalEClass.getEStructuralFeatures().get(1);
+	public EReference getArray_Base_property() {
+		return (EReference)arrayEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
@@ -551,8 +564,8 @@ public class C_CppPackageImpl extends EPackageImpl implements C_CppPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EClass getExternLibrary() {
-		return externLibraryEClass;
+	public EReference getArray_Base_association() {
+		return (EReference)arrayEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
@@ -560,8 +573,8 @@ public class C_CppPackageImpl extends EPackageImpl implements C_CppPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getExternLibrary_IncludePaths() {
-		return (EAttribute)externLibraryEClass.getEStructuralFeatures().get(0);
+	public EClass getConst() {
+		return constEClass;
 	}
 
 	/**
@@ -569,8 +582,8 @@ public class C_CppPackageImpl extends EPackageImpl implements C_CppPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getExternLibrary_Base_package() {
-		return (EReference)externLibraryEClass.getEStructuralFeatures().get(1);
+	public EReference getConst_Base_parameter() {
+		return (EReference)constEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -578,8 +591,8 @@ public class C_CppPackageImpl extends EPackageImpl implements C_CppPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getExternLibrary_LibPaths() {
-		return (EAttribute)externLibraryEClass.getEStructuralFeatures().get(2);
+	public EReference getConst_Base_property() {
+		return (EReference)constEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -587,8 +600,8 @@ public class C_CppPackageImpl extends EPackageImpl implements C_CppPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getExternLibrary_Macros() {
-		return (EAttribute)externLibraryEClass.getEStructuralFeatures().get(3);
+	public EReference getConst_Base_operation() {
+		return (EReference)constEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
@@ -596,8 +609,8 @@ public class C_CppPackageImpl extends EPackageImpl implements C_CppPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getExternLibrary_Libs() {
-		return (EAttribute)externLibraryEClass.getEStructuralFeatures().get(4);
+	public EClass getRef() {
+		return refEClass;
 	}
 
 	/**
@@ -605,8 +618,8 @@ public class C_CppPackageImpl extends EPackageImpl implements C_CppPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getExternLibrary_Includes() {
-		return (EAttribute)externLibraryEClass.getEStructuralFeatures().get(5);
+	public EReference getRef_Base_parameter() {
+		return (EReference)refEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -614,8 +627,8 @@ public class C_CppPackageImpl extends EPackageImpl implements C_CppPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EClass getCppRoot() {
-		return cppRootEClass;
+	public EReference getRef_Base_property() {
+		return (EReference)refEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -623,8 +636,8 @@ public class C_CppPackageImpl extends EPackageImpl implements C_CppPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getCppRoot_Base_package() {
-		return (EReference)cppRootEClass.getEStructuralFeatures().get(0);
+	public EClass getExternal() {
+		return externalEClass;
 	}
 
 	/**
@@ -632,8 +645,8 @@ public class C_CppPackageImpl extends EPackageImpl implements C_CppPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EClass getNoCodeGen() {
-		return noCodeGenEClass;
+	public EAttribute getExternal_Name() {
+		return (EAttribute)externalEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -641,8 +654,8 @@ public class C_CppPackageImpl extends EPackageImpl implements C_CppPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getNoCodeGen_Base_element() {
-		return (EReference)noCodeGenEClass.getEStructuralFeatures().get(0);
+	public EReference getExternal_Base_Classifier() {
+		return (EReference)externalEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
@@ -1142,114 +1155,114 @@ public class C_CppPackageImpl extends EPackageImpl implements C_CppPackage {
 		// Add supertypes to classes
 
 		// Initialize classes and features; add operations and parameters
-		initEClass(ptrEClass, Ptr.class, "Ptr", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getPtr_Base_parameter(), theUMLPackage.getParameter(), null, "base_parameter", null, 0, 1, Ptr.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getPtr_Base_property(), theUMLPackage.getProperty(), null, "base_property", null, 0, 1, Ptr.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getPtr_Declaration(), theTypesPackage.getString(), "declaration", null, 0, 1, Ptr.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(includeEClass, Include.class, "Include", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getInclude_Body(), theTypesPackage.getString(), "body", "", 0, 1, Include.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getInclude_PreBody(), theTypesPackage.getString(), "preBody", "", 0, 1, Include.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getInclude_Header(), theTypesPackage.getString(), "header", "", 0, 1, Include.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getInclude_Base_package(), theUMLPackage.getPackage(), null, "base_package", null, 0, 1, Include.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getInclude_Base_class(), theUMLPackage.getClass_(), null, "base_class", null, 0, 1, Include.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getInclude_Base_PackageImport(), theUMLPackage.getPackageImport(), null, "base_PackageImport", null, 0, 1, Include.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(manualGenerationEClass, ManualGeneration.class, "ManualGeneration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getManualGeneration_ExtensionBody(), theTypesPackage.getString(), "extensionBody", null, 1, 1, ManualGeneration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getManualGeneration_Base_Class(), theUMLPackage.getClass_(), null, "base_Class", null, 1, 1, ManualGeneration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(externLibraryEClass, ExternLibrary.class, "ExternLibrary", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getExternLibrary_IncludePaths(), theTypesPackage.getString(), "includePaths", null, 0, -1, ExternLibrary.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getExternLibrary_Base_package(), theUMLPackage.getPackage(), null, "base_package", null, 1, 1, ExternLibrary.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getExternLibrary_LibPaths(), theTypesPackage.getString(), "libPaths", null, 0, -1, ExternLibrary.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getExternLibrary_Macros(), theTypesPackage.getString(), "macros", null, 0, -1, ExternLibrary.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getExternLibrary_Libs(), theTypesPackage.getString(), "libs", null, 0, -1, ExternLibrary.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getExternLibrary_Includes(), theTypesPackage.getString(), "includes", null, 0, -1, ExternLibrary.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(noCodeGenEClass, NoCodeGen.class, "NoCodeGen", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getNoCodeGen_Base_element(), theUMLPackage.getElement(), null, "base_element", null, 1, 1, NoCodeGen.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(cppRootEClass, CppRoot.class, "CppRoot", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getCppRoot_Base_package(), theUMLPackage.getPackage(), null, "base_package", null, 1, 1, CppRoot.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(arrayEClass, Array.class, "Array", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getArray_Base_parameter(), theUMLPackage.getParameter(), null, "base_parameter", null, 0, 1, Array.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getArray_Definition(), theTypesPackage.getString(), "definition", null, 1, 1, Array.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getArray_Base_property(), theUMLPackage.getProperty(), null, "base_property", null, 0, 1, Array.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getArray_Base_association(), theUMLPackage.getAssociation(), null, "base_association", null, 0, 1, Array.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(constEClass, Const.class, "Const", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getConst_Base_parameter(), theUMLPackage.getParameter(), null, "base_parameter", null, 0, 1, Const.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getConst_Base_property(), theUMLPackage.getProperty(), null, "base_property", null, 0, 1, Const.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getConst_Base_operation(), theUMLPackage.getOperation(), null, "base_operation", null, 0, 1, Const.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(refEClass, Ref.class, "Ref", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getRef_Base_parameter(), theUMLPackage.getParameter(), null, "base_parameter", null, 0, 1, Ref.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getRef_Base_property(), theUMLPackage.getProperty(), null, "base_property", null, 0, 1, Ref.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(externalEClass, External.class, "External", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getExternal_Name(), theTypesPackage.getString(), "name", null, 0, 1, External.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getExternal_Base_Classifier(), theUMLPackage.getClassifier(), null, "base_Classifier", null, 1, 1, External.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(constInitEClass, ConstInit.class, "ConstInit", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getConstInit_Initialisation(), theTypesPackage.getString(), "initialisation", null, 1, 1, ConstInit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getConstInit_Base_operation(), theUMLPackage.getOperation(), null, "base_operation", null, 1, 1, ConstInit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(friendEClass, Friend.class, "Friend", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getFriend_Base_dependency(), theUMLPackage.getDependency(), null, "base_dependency", null, 0, 1, Friend.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getFriend_Base_operation(), theUMLPackage.getOperation(), null, "base_operation", null, 0, 1, Friend.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(inlineEClass, Inline.class, "Inline", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getInline_Base_operation(), theUMLPackage.getOperation(), null, "base_operation", null, 1, 1, Inline.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(virtualEClass, Virtual.class, "Virtual", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getVirtual_Base_operation(), theUMLPackage.getOperation(), null, "base_operation", null, 1, 1, Virtual.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(typedefEClass, Typedef.class, "Typedef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getTypedef_Definition(), theTypesPackage.getString(), "definition", null, 1, 1, Typedef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getTypedef_Base_primitivetype(), theUMLPackage.getPrimitiveType(), null, "base_primitivetype", null, 1, 1, Typedef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(visibilityEClass, Visibility.class, "Visibility", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getVisibility_Value(), theTypesPackage.getString(), "value", null, 1, 1, Visibility.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getVisibility_Base_generalization(), theUMLPackage.getGeneralization(), null, "base_generalization", null, 1, 1, Visibility.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(cppInitEClass, CppInit.class, "CppInit", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getCppInit_Value(), theTypesPackage.getInteger(), "value", null, 1, 1, CppInit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getCppInit_Base_enumerationliteral(), theUMLPackage.getEnumerationLiteral(), null, "base_enumerationliteral", null, 1, 1, CppInit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(templateEClass, Template.class, "Template", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getTemplate_Declaration(), theTypesPackage.getString(), "declaration", null, 1, 1, Template.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getTemplate_Base_class(), theUMLPackage.getClass_(), null, "base_class", null, 1, 1, Template.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(templateBindingEClass, TemplateBinding.class, "TemplateBinding", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getTemplateBinding_Binding(), theTypesPackage.getString(), "binding", null, 1, 1, TemplateBinding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getTemplateBinding_Base_templatebinding(), theUMLPackage.getTemplateBinding(), null, "base_templatebinding", null, 1, 1, TemplateBinding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(templateParameterEClass, TemplateParameter.class, "TemplateParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getTemplateParameter_Name(), theTypesPackage.getString(), "name", null, 1, 1, TemplateParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getTemplateParameter_Base_templateparameter(), theUMLPackage.getTemplateParameter(), null, "base_templateparameter", null, 1, 1, TemplateParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(unionEClass, Union.class, "Union", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getUnion_Base_DataType(), theUMLPackage.getDataType(), null, "base_DataType", null, 1, 1, Union.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(storageClassEClass, StorageClass.class, "StorageClass", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getStorageClass_StorageClass(), this.getEStorageClass(), "storageClass", null, 1, 1, StorageClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getStorageClass_Base_Parameter(), theUMLPackage.getParameter(), null, "base_Parameter", null, 0, 1, StorageClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getStorageClass_Base_Property(), theUMLPackage.getProperty(), null, "base_Property", null, 0, 1, StorageClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEClass(ptrEClass, Ptr.class, "Ptr", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(getPtr_Base_parameter(), theUMLPackage.getParameter(), null, "base_parameter", null, 0, 1, Ptr.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getPtr_Base_property(), theUMLPackage.getProperty(), null, "base_property", null, 0, 1, Ptr.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getPtr_Declaration(), theTypesPackage.getString(), "declaration", null, 0, 1, Ptr.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(includeEClass, Include.class, "Include", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(getInclude_Body(), theTypesPackage.getString(), "body", "", 0, 1, Include.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEAttribute(getInclude_PreBody(), theTypesPackage.getString(), "preBody", "", 0, 1, Include.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEAttribute(getInclude_Header(), theTypesPackage.getString(), "header", "", 0, 1, Include.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEReference(getInclude_Base_package(), theUMLPackage.getPackage(), null, "base_package", null, 0, 1, Include.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getInclude_Base_class(), theUMLPackage.getClass_(), null, "base_class", null, 0, 1, Include.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getInclude_Base_PackageImport(), theUMLPackage.getPackageImport(), null, "base_PackageImport", null, 0, 1, Include.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(manualGenerationEClass, ManualGeneration.class, "ManualGeneration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(getManualGeneration_ExtensionBody(), theTypesPackage.getString(), "extensionBody", null, 1, 1, ManualGeneration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getManualGeneration_Base_Class(), theUMLPackage.getClass_(), null, "base_Class", null, 1, 1, ManualGeneration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(externLibraryEClass, ExternLibrary.class, "ExternLibrary", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(getExternLibrary_IncludePaths(), theTypesPackage.getString(), "includePaths", null, 0, -1, ExternLibrary.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getExternLibrary_Base_package(), theUMLPackage.getPackage(), null, "base_package", null, 1, 1, ExternLibrary.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getExternLibrary_LibPaths(), theTypesPackage.getString(), "libPaths", null, 0, -1, ExternLibrary.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getExternLibrary_Macros(), theTypesPackage.getString(), "macros", null, 0, -1, ExternLibrary.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getExternLibrary_Libs(), theTypesPackage.getString(), "libs", null, 0, -1, ExternLibrary.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getExternLibrary_Includes(), theTypesPackage.getString(), "includes", null, 0, -1, ExternLibrary.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(noCodeGenEClass, NoCodeGen.class, "NoCodeGen", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(getNoCodeGen_Base_element(), theUMLPackage.getElement(), null, "base_element", null, 1, 1, NoCodeGen.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(cppRootEClass, CppRoot.class, "CppRoot", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(getCppRoot_Base_package(), theUMLPackage.getPackage(), null, "base_package", null, 1, 1, CppRoot.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(arrayEClass, Array.class, "Array", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(getArray_Base_parameter(), theUMLPackage.getParameter(), null, "base_parameter", null, 0, 1, Array.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getArray_Definition(), theTypesPackage.getString(), "definition", null, 1, 1, Array.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getArray_Base_property(), theUMLPackage.getProperty(), null, "base_property", null, 0, 1, Array.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getArray_Base_association(), theUMLPackage.getAssociation(), null, "base_association", null, 0, 1, Array.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(constEClass, Const.class, "Const", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(getConst_Base_parameter(), theUMLPackage.getParameter(), null, "base_parameter", null, 0, 1, Const.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getConst_Base_property(), theUMLPackage.getProperty(), null, "base_property", null, 0, 1, Const.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getConst_Base_operation(), theUMLPackage.getOperation(), null, "base_operation", null, 0, 1, Const.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(refEClass, Ref.class, "Ref", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(getRef_Base_parameter(), theUMLPackage.getParameter(), null, "base_parameter", null, 0, 1, Ref.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getRef_Base_property(), theUMLPackage.getProperty(), null, "base_property", null, 0, 1, Ref.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(externalEClass, External.class, "External", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(getExternal_Name(), theTypesPackage.getString(), "name", null, 0, 1, External.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getExternal_Base_Classifier(), theUMLPackage.getClassifier(), null, "base_Classifier", null, 1, 1, External.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(constInitEClass, ConstInit.class, "ConstInit", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(getConstInit_Initialisation(), theTypesPackage.getString(), "initialisation", null, 1, 1, ConstInit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getConstInit_Base_operation(), theUMLPackage.getOperation(), null, "base_operation", null, 1, 1, ConstInit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(friendEClass, Friend.class, "Friend", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(getFriend_Base_dependency(), theUMLPackage.getDependency(), null, "base_dependency", null, 0, 1, Friend.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getFriend_Base_operation(), theUMLPackage.getOperation(), null, "base_operation", null, 0, 1, Friend.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(inlineEClass, Inline.class, "Inline", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(getInline_Base_operation(), theUMLPackage.getOperation(), null, "base_operation", null, 1, 1, Inline.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(virtualEClass, Virtual.class, "Virtual", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(getVirtual_Base_operation(), theUMLPackage.getOperation(), null, "base_operation", null, 1, 1, Virtual.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(typedefEClass, Typedef.class, "Typedef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(getTypedef_Definition(), theTypesPackage.getString(), "definition", null, 1, 1, Typedef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getTypedef_Base_primitivetype(), theUMLPackage.getPrimitiveType(), null, "base_primitivetype", null, 1, 1, Typedef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(visibilityEClass, Visibility.class, "Visibility", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(getVisibility_Value(), theTypesPackage.getString(), "value", null, 1, 1, Visibility.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getVisibility_Base_generalization(), theUMLPackage.getGeneralization(), null, "base_generalization", null, 1, 1, Visibility.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(cppInitEClass, CppInit.class, "CppInit", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(getCppInit_Value(), theTypesPackage.getInteger(), "value", null, 1, 1, CppInit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getCppInit_Base_enumerationliteral(), theUMLPackage.getEnumerationLiteral(), null, "base_enumerationliteral", null, 1, 1, CppInit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(templateEClass, Template.class, "Template", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(getTemplate_Declaration(), theTypesPackage.getString(), "declaration", null, 1, 1, Template.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getTemplate_Base_class(), theUMLPackage.getClass_(), null, "base_class", null, 1, 1, Template.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(templateBindingEClass, TemplateBinding.class, "TemplateBinding", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(getTemplateBinding_Binding(), theTypesPackage.getString(), "binding", null, 1, 1, TemplateBinding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getTemplateBinding_Base_templatebinding(), theUMLPackage.getTemplateBinding(), null, "base_templatebinding", null, 1, 1, TemplateBinding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(templateParameterEClass, TemplateParameter.class, "TemplateParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(getTemplateParameter_Name(), theTypesPackage.getString(), "name", null, 1, 1, TemplateParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getTemplateParameter_Base_templateparameter(), theUMLPackage.getTemplateParameter(), null, "base_templateparameter", null, 1, 1, TemplateParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(unionEClass, Union.class, "Union", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(getUnion_Base_DataType(), theUMLPackage.getDataType(), null, "base_DataType", null, 1, 1, Union.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(storageClassEClass, StorageClass.class, "StorageClass", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(getStorageClass_StorageClass(), this.getEStorageClass(), "storageClass", null, 1, 1, StorageClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getStorageClass_Base_Parameter(), theUMLPackage.getParameter(), null, "base_Parameter", null, 0, 1, StorageClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getStorageClass_Base_Property(), theUMLPackage.getProperty(), null, "base_Property", null, 0, 1, StorageClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
 		// Initialize enums and add enum literals
-		initEEnum(visibilityKindEEnum, VisibilityKind.class, "VisibilityKind");
+		initEEnum(visibilityKindEEnum, VisibilityKind.class, "VisibilityKind"); //$NON-NLS-1$
 		addEEnumLiteral(visibilityKindEEnum, VisibilityKind.PRIVATE);
 		addEEnumLiteral(visibilityKindEEnum, VisibilityKind.PROTECTED);
 		addEEnumLiteral(visibilityKindEEnum, VisibilityKind.PUBLIC);
 
-		initEEnum(eAccessKindEEnum, EAccessKind.class, "EAccessKind");
+		initEEnum(eAccessKindEEnum, EAccessKind.class, "EAccessKind"); //$NON-NLS-1$
 		addEEnumLiteral(eAccessKindEEnum, EAccessKind.READ);
 		addEEnumLiteral(eAccessKindEEnum, EAccessKind.WRITE);
 		addEEnumLiteral(eAccessKindEEnum, EAccessKind.READ_WRITE);
 
-		initEEnum(eStorageClassEEnum, EStorageClass.class, "EStorageClass");
+		initEEnum(eStorageClassEEnum, EStorageClass.class, "EStorageClass"); //$NON-NLS-1$
 		addEEnumLiteral(eStorageClassEEnum, EStorageClass.VOLATILE);
 		addEEnumLiteral(eStorageClassEEnum, EStorageClass.REGISTER);
 		addEEnumLiteral(eStorageClassEEnum, EStorageClass.EXTERN);
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ConstImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ConstImpl.java
index 76b3021c84e..180684ae7c8 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ConstImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ConstImpl.java
@@ -1,14 +1,28 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp.impl;
 
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
+
 import org.eclipse.papyrus.C_Cpp.C_CppPackage;
 import org.eclipse.papyrus.C_Cpp.Const;
+
 import org.eclipse.uml2.uml.Operation;
 import org.eclipse.uml2.uml.Parameter;
 import org.eclipse.uml2.uml.Property;
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ConstInitImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ConstInitImpl.java
index 0f1796d5091..243c3a89d5b 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ConstInitImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ConstInitImpl.java
@@ -1,14 +1,28 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp.impl;
 
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
+
 import org.eclipse.papyrus.C_Cpp.C_CppPackage;
 import org.eclipse.papyrus.C_Cpp.ConstInit;
+
 import org.eclipse.uml2.uml.Operation;
 
 /**
@@ -213,7 +227,7 @@ public class ConstInitImpl extends EObjectImpl implements ConstInit {
 		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (initialisation: ");
+		result.append(" (initialisation: "); //$NON-NLS-1$
 		result.append(initialisation);
 		result.append(')');
 		return result.toString();
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/CppInitImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/CppInitImpl.java
index cabb69ddc89..3577393c04b 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/CppInitImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/CppInitImpl.java
@@ -1,14 +1,28 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp.impl;
 
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
+
 import org.eclipse.papyrus.C_Cpp.C_CppPackage;
 import org.eclipse.papyrus.C_Cpp.CppInit;
+
 import org.eclipse.uml2.uml.EnumerationLiteral;
 
 /**
@@ -213,7 +227,7 @@ public class CppInitImpl extends EObjectImpl implements CppInit {
 		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (value: ");
+		result.append(" (value: "); //$NON-NLS-1$
 		result.append(value);
 		result.append(')');
 		return result.toString();
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/CppRootImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/CppRootImpl.java
index 3c3b816b575..5ff1611f37f 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/CppRootImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/CppRootImpl.java
@@ -1,12 +1,25 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp.impl;
 
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
+
 import org.eclipse.papyrus.C_Cpp.C_CppPackage;
 import org.eclipse.papyrus.C_Cpp.CppRoot;
 
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ExternLibraryImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ExternLibraryImpl.java
index 99533dfbb81..ec3fd5bd057 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ExternLibraryImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ExternLibraryImpl.java
@@ -1,16 +1,32 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp.impl;
 
 import java.util.Collection;
+
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.common.util.EList;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
+
 import org.eclipse.emf.ecore.util.EDataTypeEList;
 import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
+
 import org.eclipse.papyrus.C_Cpp.C_CppPackage;
 import org.eclipse.papyrus.C_Cpp.ExternLibrary;
 
@@ -335,15 +351,15 @@ public class ExternLibraryImpl extends EObjectImpl implements ExternLibrary {
 		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (includePaths: ");
+		result.append(" (includePaths: "); //$NON-NLS-1$
 		result.append(includePaths);
-		result.append(", libPaths: ");
+		result.append(", libPaths: "); //$NON-NLS-1$
 		result.append(libPaths);
-		result.append(", macros: ");
+		result.append(", macros: "); //$NON-NLS-1$
 		result.append(macros);
-		result.append(", libs: ");
+		result.append(", libs: "); //$NON-NLS-1$
 		result.append(libs);
-		result.append(", includes: ");
+		result.append(", includes: "); //$NON-NLS-1$
 		result.append(includes);
 		result.append(')');
 		return result.toString();
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ExternalImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ExternalImpl.java
index 7d44cc68d1c..445edd26b03 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ExternalImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ExternalImpl.java
@@ -1,4 +1,14 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp.impl;
 
@@ -217,7 +227,7 @@ public class ExternalImpl extends EObjectImpl implements External {
 		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
+		result.append(" (name: "); //$NON-NLS-1$
 		result.append(name);
 		result.append(')');
 		return result.toString();
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/FriendImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/FriendImpl.java
index 9a862cb5536..a706156afd3 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/FriendImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/FriendImpl.java
@@ -1,14 +1,28 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp.impl;
 
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
+
 import org.eclipse.papyrus.C_Cpp.C_CppPackage;
 import org.eclipse.papyrus.C_Cpp.Friend;
+
 import org.eclipse.uml2.uml.Dependency;
 import org.eclipse.uml2.uml.Operation;
 
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/IncludeImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/IncludeImpl.java
index db52dbfcf77..98b1c0f7e65 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/IncludeImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/IncludeImpl.java
@@ -1,14 +1,28 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp.impl;
 
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
+
 import org.eclipse.papyrus.C_Cpp.C_CppPackage;
 import org.eclipse.papyrus.C_Cpp.Include;
+
 import org.eclipse.uml2.uml.PackageImport;
 
 /**
@@ -38,7 +52,7 @@ public class IncludeImpl extends EObjectImpl implements Include {
 	 * @generated
 	 * @ordered
 	 */
-	protected static final String BODY_EDEFAULT = "";
+	protected static final String BODY_EDEFAULT = ""; //$NON-NLS-1$
 
 	/**
 	 * The cached value of the '{@link #getBody() <em>Body</em>}' attribute.
@@ -58,7 +72,7 @@ public class IncludeImpl extends EObjectImpl implements Include {
 	 * @generated
 	 * @ordered
 	 */
-	protected static final String PRE_BODY_EDEFAULT = "";
+	protected static final String PRE_BODY_EDEFAULT = ""; //$NON-NLS-1$
 
 	/**
 	 * The cached value of the '{@link #getPreBody() <em>Pre Body</em>}' attribute.
@@ -78,7 +92,7 @@ public class IncludeImpl extends EObjectImpl implements Include {
 	 * @generated
 	 * @ordered
 	 */
-	protected static final String HEADER_EDEFAULT = "";
+	protected static final String HEADER_EDEFAULT = ""; //$NON-NLS-1$
 
 	/**
 	 * The cached value of the '{@link #getHeader() <em>Header</em>}' attribute.
@@ -165,6 +179,27 @@ public class IncludeImpl extends EObjectImpl implements Include {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public String getPreBody() {
+		return preBody;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setPreBody(String newPreBody) {
+		String oldPreBody = preBody;
+		preBody = newPreBody;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, C_CppPackage.INCLUDE__PRE_BODY, oldPreBody, preBody));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public String getHeader() {
 		return header;
 	}
@@ -300,27 +335,6 @@ public class IncludeImpl extends EObjectImpl implements Include {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public String getPreBody() {
-		return preBody;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPreBody(String newPreBody) {
-		String oldPreBody = preBody;
-		preBody = newPreBody;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, C_CppPackage.INCLUDE__PRE_BODY, oldPreBody, preBody));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
@@ -437,11 +451,11 @@ public class IncludeImpl extends EObjectImpl implements Include {
 		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (body: ");
+		result.append(" (body: "); //$NON-NLS-1$
 		result.append(body);
-		result.append(", preBody: ");
+		result.append(", preBody: "); //$NON-NLS-1$
 		result.append(preBody);
-		result.append(", header: ");
+		result.append(", header: "); //$NON-NLS-1$
 		result.append(header);
 		result.append(')');
 		return result.toString();
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/InlineImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/InlineImpl.java
index ef591a3702f..f19d48ea55f 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/InlineImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/InlineImpl.java
@@ -1,14 +1,28 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp.impl;
 
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
+
 import org.eclipse.papyrus.C_Cpp.C_CppPackage;
 import org.eclipse.papyrus.C_Cpp.Inline;
+
 import org.eclipse.uml2.uml.Operation;
 
 /**
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ManualGenerationImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ManualGenerationImpl.java
index f4230a8f78e..773c700415b 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ManualGenerationImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/ManualGenerationImpl.java
@@ -1,12 +1,25 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp.impl;
 
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
+
 import org.eclipse.papyrus.C_Cpp.C_CppPackage;
 import org.eclipse.papyrus.C_Cpp.ManualGeneration;
 
@@ -212,7 +225,7 @@ public class ManualGenerationImpl extends EObjectImpl implements ManualGeneratio
 		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (extensionBody: ");
+		result.append(" (extensionBody: "); //$NON-NLS-1$
 		result.append(extensionBody);
 		result.append(')');
 		return result.toString();
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/NoCodeGenImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/NoCodeGenImpl.java
index 7a1c06b1396..3d2cd0294b2 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/NoCodeGenImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/NoCodeGenImpl.java
@@ -1,14 +1,28 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp.impl;
 
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
+
 import org.eclipse.papyrus.C_Cpp.C_CppPackage;
 import org.eclipse.papyrus.C_Cpp.NoCodeGen;
+
 import org.eclipse.uml2.uml.Element;
 
 /**
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/PtrImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/PtrImpl.java
index 7cd65b340c1..0baf3316362 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/PtrImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/PtrImpl.java
@@ -1,14 +1,28 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp.impl;
 
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
+
 import org.eclipse.papyrus.C_Cpp.C_CppPackage;
 import org.eclipse.papyrus.C_Cpp.Ptr;
+
 import org.eclipse.uml2.uml.Parameter;
 import org.eclipse.uml2.uml.Property;
 
@@ -274,7 +288,7 @@ public class PtrImpl extends EObjectImpl implements Ptr {
 		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (declaration: ");
+		result.append(" (declaration: "); //$NON-NLS-1$
 		result.append(declaration);
 		result.append(')');
 		return result.toString();
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/RefImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/RefImpl.java
index 74662cf3f81..0bfd518fe31 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/RefImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/RefImpl.java
@@ -1,14 +1,28 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp.impl;
 
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
+
 import org.eclipse.papyrus.C_Cpp.C_CppPackage;
 import org.eclipse.papyrus.C_Cpp.Ref;
+
 import org.eclipse.uml2.uml.Parameter;
 import org.eclipse.uml2.uml.Property;
 
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/StorageClassImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/StorageClassImpl.java
index d3fc67c87d6..da047385df4 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/StorageClassImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/StorageClassImpl.java
@@ -1,15 +1,29 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp.impl;
 
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
+
 import org.eclipse.papyrus.C_Cpp.C_CppPackage;
 import org.eclipse.papyrus.C_Cpp.EStorageClass;
 import org.eclipse.papyrus.C_Cpp.StorageClass;
+
 import org.eclipse.uml2.uml.Parameter;
 import org.eclipse.uml2.uml.Property;
 
@@ -275,7 +289,7 @@ public class StorageClassImpl extends EObjectImpl implements StorageClass {
 		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (storageClass: ");
+		result.append(" (storageClass: "); //$NON-NLS-1$
 		result.append(storageClass);
 		result.append(')');
 		return result.toString();
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TemplateBindingImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TemplateBindingImpl.java
index f2a0bfb4483..31a5eb704bd 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TemplateBindingImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TemplateBindingImpl.java
@@ -1,12 +1,25 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp.impl;
 
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
+
 import org.eclipse.papyrus.C_Cpp.C_CppPackage;
 import org.eclipse.papyrus.C_Cpp.TemplateBinding;
 
@@ -212,7 +225,7 @@ public class TemplateBindingImpl extends EObjectImpl implements TemplateBinding
 		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (binding: ");
+		result.append(" (binding: "); //$NON-NLS-1$
 		result.append(binding);
 		result.append(')');
 		return result.toString();
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TemplateImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TemplateImpl.java
index b6d37f0e520..e08e8191865 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TemplateImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TemplateImpl.java
@@ -1,12 +1,25 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp.impl;
 
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
+
 import org.eclipse.papyrus.C_Cpp.C_CppPackage;
 import org.eclipse.papyrus.C_Cpp.Template;
 
@@ -212,7 +225,7 @@ public class TemplateImpl extends EObjectImpl implements Template {
 		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (declaration: ");
+		result.append(" (declaration: "); //$NON-NLS-1$
 		result.append(declaration);
 		result.append(')');
 		return result.toString();
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TemplateParameterImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TemplateParameterImpl.java
index c1beec5e5b0..be480f86259 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TemplateParameterImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TemplateParameterImpl.java
@@ -1,12 +1,25 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp.impl;
 
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
+
 import org.eclipse.papyrus.C_Cpp.C_CppPackage;
 import org.eclipse.papyrus.C_Cpp.TemplateParameter;
 
@@ -212,7 +225,7 @@ public class TemplateParameterImpl extends EObjectImpl implements TemplateParame
 		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
+		result.append(" (name: "); //$NON-NLS-1$
 		result.append(name);
 		result.append(')');
 		return result.toString();
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TypedefImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TypedefImpl.java
index 88e2c2dd22f..48617d94072 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TypedefImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/TypedefImpl.java
@@ -1,14 +1,28 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp.impl;
 
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
+
 import org.eclipse.papyrus.C_Cpp.C_CppPackage;
 import org.eclipse.papyrus.C_Cpp.Typedef;
+
 import org.eclipse.uml2.uml.PrimitiveType;
 
 /**
@@ -213,7 +227,7 @@ public class TypedefImpl extends EObjectImpl implements Typedef {
 		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (definition: ");
+		result.append(" (definition: "); //$NON-NLS-1$
 		result.append(definition);
 		result.append(')');
 		return result.toString();
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/UnionImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/UnionImpl.java
index 01c35e72f2c..f27e0903b80 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/UnionImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/UnionImpl.java
@@ -1,14 +1,28 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp.impl;
 
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
+
 import org.eclipse.papyrus.C_Cpp.C_CppPackage;
 import org.eclipse.papyrus.C_Cpp.Union;
+
 import org.eclipse.uml2.uml.DataType;
 
 /**
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/VirtualImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/VirtualImpl.java
index 011107fc7fb..b65063e91a2 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/VirtualImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/VirtualImpl.java
@@ -1,14 +1,28 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp.impl;
 
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
+
 import org.eclipse.papyrus.C_Cpp.C_CppPackage;
 import org.eclipse.papyrus.C_Cpp.Virtual;
+
 import org.eclipse.uml2.uml.Operation;
 
 /**
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/VisibilityImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/VisibilityImpl.java
index 8c34f91ab53..2d8a41ef4d8 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/VisibilityImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/impl/VisibilityImpl.java
@@ -1,14 +1,28 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp.impl;
 
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
+
 import org.eclipse.papyrus.C_Cpp.C_CppPackage;
 import org.eclipse.papyrus.C_Cpp.Visibility;
+
 import org.eclipse.uml2.uml.Generalization;
 
 /**
@@ -213,7 +227,7 @@ public class VisibilityImpl extends EObjectImpl implements Visibility {
 		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (value: ");
+		result.append(" (value: "); //$NON-NLS-1$
 		result.append(value);
 		result.append(')');
 		return result.toString();
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppAdapterFactory.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppAdapterFactory.java
index bcb8c44e479..f93fcf99df1 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppAdapterFactory.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppAdapterFactory.java
@@ -1,11 +1,24 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp.util;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
+
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+
 import org.eclipse.emf.ecore.EObject;
+
 import org.eclipse.papyrus.C_Cpp.*;
 
 /**
@@ -215,100 +228,100 @@ public class C_CppAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.C_Cpp.Array <em>Array</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.C_Cpp.ExternLibrary <em>Extern Library</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.C_Cpp.Array
+	 * @see org.eclipse.papyrus.C_Cpp.ExternLibrary
 	 * @generated
 	 */
-	public Adapter createArrayAdapter() {
+	public Adapter createExternLibraryAdapter() {
 		return null;
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.C_Cpp.Const <em>Const</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.C_Cpp.NoCodeGen <em>No Code Gen</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.C_Cpp.Const
+	 * @see org.eclipse.papyrus.C_Cpp.NoCodeGen
 	 * @generated
 	 */
-	public Adapter createConstAdapter() {
+	public Adapter createNoCodeGenAdapter() {
 		return null;
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.C_Cpp.Ref <em>Ref</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.C_Cpp.CppRoot <em>Cpp Root</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.C_Cpp.Ref
+	 * @see org.eclipse.papyrus.C_Cpp.CppRoot
 	 * @generated
 	 */
-	public Adapter createRefAdapter() {
+	public Adapter createCppRootAdapter() {
 		return null;
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.C_Cpp.External <em>External</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.C_Cpp.Array <em>Array</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.C_Cpp.External
+	 * @see org.eclipse.papyrus.C_Cpp.Array
 	 * @generated
 	 */
-	public Adapter createExternalAdapter() {
+	public Adapter createArrayAdapter() {
 		return null;
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.C_Cpp.ExternLibrary <em>Extern Library</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.C_Cpp.Const <em>Const</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.C_Cpp.ExternLibrary
+	 * @see org.eclipse.papyrus.C_Cpp.Const
 	 * @generated
 	 */
-	public Adapter createExternLibraryAdapter() {
+	public Adapter createConstAdapter() {
 		return null;
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.C_Cpp.CppRoot <em>Cpp Root</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.C_Cpp.Ref <em>Ref</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.C_Cpp.CppRoot
+	 * @see org.eclipse.papyrus.C_Cpp.Ref
 	 * @generated
 	 */
-	public Adapter createCppRootAdapter() {
+	public Adapter createRefAdapter() {
 		return null;
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.C_Cpp.NoCodeGen <em>No Code Gen</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.C_Cpp.External <em>External</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.C_Cpp.NoCodeGen
+	 * @see org.eclipse.papyrus.C_Cpp.External
 	 * @generated
 	 */
-	public Adapter createNoCodeGenAdapter() {
+	public Adapter createExternalAdapter() {
 		return null;
 	}
 
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppResourceFactoryImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppResourceFactoryImpl.java
index 605b375a1e2..271b6d3a6e5 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppResourceFactoryImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppResourceFactoryImpl.java
@@ -1,4 +1,14 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp.util;
 
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppResourceImpl.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppResourceImpl.java
index f16bfcc7def..97bb4086b34 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppResourceImpl.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppResourceImpl.java
@@ -1,4 +1,14 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp.util;
 
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppSwitch.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppSwitch.java
index 55314a3e66e..505dbc09bd8 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppSwitch.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppSwitch.java
@@ -1,10 +1,22 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp.util;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
+
 import org.eclipse.emf.ecore.util.Switch;
+
 import org.eclipse.papyrus.C_Cpp.*;
 
 /**
@@ -246,107 +258,107 @@ public class C_CppSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Array</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Extern Library</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Array</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Extern Library</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseArray(Array object) {
+	public T caseExternLibrary(ExternLibrary object) {
 		return null;
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Const</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>No Code Gen</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Const</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>No Code Gen</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseConst(Const object) {
+	public T caseNoCodeGen(NoCodeGen object) {
 		return null;
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ref</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Cpp Root</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ref</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Cpp Root</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseRef(Ref object) {
+	public T caseCppRoot(CppRoot object) {
 		return null;
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>External</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Array</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>External</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Array</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseExternal(External object) {
+	public T caseArray(Array object) {
 		return null;
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Extern Library</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Const</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Extern Library</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Const</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseExternLibrary(ExternLibrary object) {
+	public T caseConst(Const object) {
 		return null;
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Cpp Root</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Ref</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Cpp Root</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Ref</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseCppRoot(CppRoot object) {
+	public T caseRef(Ref object) {
 		return null;
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>No Code Gen</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>External</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>No Code Gen</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>External</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseNoCodeGen(NoCodeGen object) {
+	public T caseExternal(External object) {
 		return null;
 	}
 
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppXMLProcessor.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppXMLProcessor.java
index b97a9a3cb16..28b2b75d379 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppXMLProcessor.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/C_Cpp/util/C_CppXMLProcessor.java
@@ -1,12 +1,25 @@
 /**
+ * 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:
+ *    CEA LIST - Initial API and implementation
+ * 
  */
 package org.eclipse.papyrus.C_Cpp.util;
 
 import java.util.Map;
 
 import org.eclipse.emf.ecore.EPackage;
+
 import org.eclipse.emf.ecore.resource.Resource;
+
 import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
+
 import org.eclipse.papyrus.C_Cpp.C_CppPackage;
 
 /**
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/cpp/profile/StdStereo.java b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/cpp/profile/StdStereo.java
index 8e34f007917..315c1f0fbe3 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/cpp/profile/StdStereo.java
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.profile/src/org/eclipse/papyrus/cpp/profile/StdStereo.java
@@ -12,6 +12,7 @@
 package org.eclipse.papyrus.cpp.profile;
 
 public class StdStereo {
-	public final static String create = "Standard::Create";
-	public final static String destroy = "Standard::Destroy";
+	// CAVEAT: namespace has changed from Standard to StandardProfileL2 (and might change back again)
+	public final static String create = "StandardProfileL2::Create"; //$NON-NLS-1$
+	public final static String destroy = "StandardProfileL2::Destroy"; //$NON-NLS-1$
 }
\ No newline at end of file
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/.gitignore b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/.gitignore
deleted file mode 100644
index 5f376f39c91..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/TestCDTintegration
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/TestCCodeGen/subdir.mk b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/TestCCodeGen/subdir.mk
deleted file mode 100644
index d1ff75c23f8..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/TestCCodeGen/subdir.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-# Add inputs and outputs from these tool invocations to the build variables 
-CPP_SRCS += \
-../TestCCodeGen/Class1.cpp \
-../TestCCodeGen/Class2.cpp \
-../TestCCodeGen/Class3.cpp 
-
-C_SRCS += \
-../TestCCodeGen/Class1.c \
-../TestCCodeGen/Class2.c \
-../TestCCodeGen/Class3.c 
-
-OBJS += \
-./TestCCodeGen/Class1.o \
-./TestCCodeGen/Class2.o \
-./TestCCodeGen/Class3.o 
-
-C_DEPS += \
-./TestCCodeGen/Class1.d \
-./TestCCodeGen/Class2.d \
-./TestCCodeGen/Class3.d 
-
-CPP_DEPS += \
-./TestCCodeGen/Class1.d \
-./TestCCodeGen/Class2.d \
-./TestCCodeGen/Class3.d 
-
-
-# Each subdirectory must supply rules for building sources it contributes
-TestCCodeGen/%.o: ../TestCCodeGen/%.c
-	@echo 'Building file: $<'
-	@echo 'Invoking: GCC C Compiler'
-	gcc -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
-	@echo 'Finished building: $<'
-	@echo ' '
-
-TestCCodeGen/%.o: ../TestCCodeGen/%.cpp
-	@echo 'Building file: $<'
-	@echo 'Invoking: GCC C++ Compiler'
-	g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
-	@echo 'Finished building: $<'
-	@echo ' '
-
-
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/makefile b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/makefile
deleted file mode 100644
index 453585cf42d..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
--include ../makefile.init
-
-RM := rm -rf
-
-# All of the sources participating in the build are defined here
--include sources.mk
--include TestCDTintegration/subdir.mk
--include TestCCodeGen/subdir.mk
--include subdir.mk
--include objects.mk
-
-ifneq ($(MAKECMDGOALS),clean)
-ifneq ($(strip $(C++_DEPS)),)
--include $(C++_DEPS)
-endif
-ifneq ($(strip $(C_DEPS)),)
--include $(C_DEPS)
-endif
-ifneq ($(strip $(CC_DEPS)),)
--include $(CC_DEPS)
-endif
-ifneq ($(strip $(CPP_DEPS)),)
--include $(CPP_DEPS)
-endif
-ifneq ($(strip $(CXX_DEPS)),)
--include $(CXX_DEPS)
-endif
-ifneq ($(strip $(C_UPPER_DEPS)),)
--include $(C_UPPER_DEPS)
-endif
-endif
-
--include ../makefile.defs
-
-# Add inputs and outputs from these tool invocations to the build variables 
-
-# All Target
-all: org.eclipse.papyrus.cpp.test
-
-# Tool invocations
-org.eclipse.papyrus.cpp.test: $(OBJS) $(USER_OBJS)
-	@echo 'Building target: $@'
-	@echo 'Invoking: GCC C++ Linker'
-	g++  -o "org.eclipse.papyrus.cpp.test" $(OBJS) $(USER_OBJS) $(LIBS)
-	@echo 'Finished building target: $@'
-	@echo ' '
-
-# Other Targets
-clean:
-	-$(RM) $(OBJS)$(C++_DEPS)$(C_DEPS)$(CC_DEPS)$(CPP_DEPS)$(EXECUTABLES)$(CXX_DEPS)$(C_UPPER_DEPS) org.eclipse.papyrus.cpp.test
-	-@echo ' '
-
-.PHONY: all clean dependents
-.SECONDARY:
-
--include ../makefile.targets
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/model/Class3/subdir.mk b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/model/Class3/subdir.mk
deleted file mode 100644
index 77ca4e18491..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/model/Class3/subdir.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-# Add inputs and outputs from these tool invocations to the build variables 
-CPP_SRCS += \
-../model/Class3/Operation1.cpp 
-
-OBJS += \
-./model/Class3/Operation1.o 
-
-CPP_DEPS += \
-./model/Class3/Operation1.d 
-
-
-# Each subdirectory must supply rules for building sources it contributes
-model/Class3/%.o: ../model/Class3/%.cpp
-	@echo 'Building file: $<'
-	@echo 'Invoking: GCC C++ Compiler'
-	g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
-	@echo 'Finished building: $<'
-	@echo ' '
-
-
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/model/implementation/Class0/subdir.mk b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/model/implementation/Class0/subdir.mk
deleted file mode 100644
index 7a1f39b054c..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/model/implementation/Class0/subdir.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-# Add inputs and outputs from these tool invocations to the build variables 
-CPP_SRCS += \
-../model/implementation/Class0/operation1.cpp \
-../model/implementation/Class0/operation2.cpp \
-../model/implementation/Class0/operation3.cpp \
-../model/implementation/Class0/unnamed.cpp 
-
-OBJS += \
-./model/implementation/Class0/operation1.o \
-./model/implementation/Class0/operation2.o \
-./model/implementation/Class0/operation3.o \
-./model/implementation/Class0/unnamed.o 
-
-CPP_DEPS += \
-./model/implementation/Class0/operation1.d \
-./model/implementation/Class0/operation2.d \
-./model/implementation/Class0/operation3.d \
-./model/implementation/Class0/unnamed.d 
-
-
-# Each subdirectory must supply rules for building sources it contributes
-model/implementation/Class0/%.o: ../model/implementation/Class0/%.cpp
-	@echo 'Building file: $<'
-	@echo 'Invoking: GCC C++ Compiler'
-	g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
-	@echo 'Finished building: $<'
-	@echo ' '
-
-
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/model/implementation/subdir.mk b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/model/implementation/subdir.mk
deleted file mode 100644
index b6347485406..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/model/implementation/subdir.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-# Add inputs and outputs from these tool invocations to the build variables 
-CPP_SRCS += \
-../model/implementation/Class0.cpp \
-../model/implementation/Class1.cpp 
-
-OBJS += \
-./model/implementation/Class0.o \
-./model/implementation/Class1.o 
-
-CPP_DEPS += \
-./model/implementation/Class0.d \
-./model/implementation/Class1.d 
-
-
-# Each subdirectory must supply rules for building sources it contributes
-model/implementation/%.o: ../model/implementation/%.cpp
-	@echo 'Building file: $<'
-	@echo 'Invoking: GCC C++ Compiler'
-	g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
-	@echo 'Finished building: $<'
-	@echo ' '
-
-
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/model/subdir.mk b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/model/subdir.mk
deleted file mode 100644
index e1a4087402a..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/model/subdir.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-# Add inputs and outputs from these tool invocations to the build variables 
-CPP_SRCS += \
-../model/Class1.cpp \
-../model/Class3.cpp 
-
-OBJS += \
-./model/Class1.o \
-./model/Class3.o 
-
-CPP_DEPS += \
-./model/Class1.d \
-./model/Class3.d 
-
-
-# Each subdirectory must supply rules for building sources it contributes
-model/%.o: ../model/%.cpp
-	@echo 'Building file: $<'
-	@echo 'Invoking: GCC C++ Compiler'
-	g++ -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
-	@echo 'Finished building: $<'
-	@echo ' '
-
-
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/objects.mk b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/objects.mk
deleted file mode 100644
index 742c2da043f..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/objects.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-USER_OBJS :=
-
-LIBS :=
-
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/sources.mk b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/sources.mk
deleted file mode 100644
index 477eca1972c..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/Debug/sources.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-################################################################################
-# Automatically-generated file. Do not edit!
-################################################################################
-
-O_SRCS := 
-CPP_SRCS := 
-C_UPPER_SRCS := 
-C_SRCS := 
-S_UPPER_SRCS := 
-OBJ_SRCS := 
-ASM_SRCS := 
-CXX_SRCS := 
-C++_SRCS := 
-CC_SRCS := 
-OBJS := 
-C++_DEPS := 
-C_DEPS := 
-CC_DEPS := 
-CPP_DEPS := 
-EXECUTABLES := 
-CXX_DEPS := 
-C_UPPER_DEPS := 
-
-# Every subdirectory with source files must be described here
-SUBDIRS := \
-TestCDTintegration \
-TestCCodeGen \
-
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/TestCDTintegration/Class1.cpp b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/TestCDTintegration/Class1.cpp
deleted file mode 100644
index eae7809c990..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/TestCDTintegration/Class1.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-// --------------------------------------------------------
-// Code generated by Papyrus C++
-// --------------------------------------------------------
-
-#define TestCDTintegration_Class1_BODY
-
-/************************************************************
-              Class1 class body
- ************************************************************/
-
-
-
-// include associated header file
-#include <TestCDTintegration/Class1.h>
-
-
-
-// Derived includes directives
-
-
-
-// static attributes (if any)
-
-
-
-
-/************************************************************
-              End of Class1 class body
- ************************************************************/
\ No newline at end of file
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/TestCDTintegration/Class1.h b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/TestCDTintegration/Class1.h
deleted file mode 100644
index eeecc852d10..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/TestCDTintegration/Class1.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// --------------------------------------------------------
-// Code generated by Papyrus C++
-// --------------------------------------------------------
-
-#ifndef TESTCDTINTEGRATION_CLASS1_H
-#define TESTCDTINTEGRATION_CLASS1_H
-
-/************************************************************
-              Class1 class header
- ************************************************************/
-
-/* Owner package header include                             */
-#include <TestCDTintegration/Pkg_TestCDTintegration.h>
-
-
-
-
-
-
- 
-
-/************************************************************/
-/**
- * 
- */
-class Class1
- {
-  public:
-	
-  protected:
-	
-  private:
-	
-
-  public:
-
-
-  protected:
-
-
-  private:
-
-
-};
-/************************************************************/
-/* External declarations (package visibility)               */
-
-
-/************************************************************/
-
-
-/* Inline functions                                         */
-
-
-
-/************************************************************
-              End of Class1 class header
- ************************************************************/
-
-#endif
\ No newline at end of file
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/TestCDTintegration/Class2.cpp b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/TestCDTintegration/Class2.cpp
deleted file mode 100644
index 42a31cf03f3..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/TestCDTintegration/Class2.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-// --------------------------------------------------------
-// Code generated by Papyrus C++
-// --------------------------------------------------------
-
-#define TestCDTintegration_Class2_BODY
-
-/************************************************************
-              Class2 class body
- ************************************************************/
-
-
-
-// include associated header file
-#include <TestCDTintegration/Class2.h>
-
-
-
-// Derived includes directives
-
-
-
-// static attributes (if any)
-
-
-
-
-/************************************************************
-              End of Class2 class body
- ************************************************************/
\ No newline at end of file
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/TestCDTintegration/Class2.h b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/TestCDTintegration/Class2.h
deleted file mode 100644
index 925ad340934..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/TestCDTintegration/Class2.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// --------------------------------------------------------
-// Code generated by Papyrus C++
-// --------------------------------------------------------
-
-#ifndef TESTCDTINTEGRATION_CLASS2_H
-#define TESTCDTINTEGRATION_CLASS2_H
-
-/************************************************************
-              Class2 class header
- ************************************************************/
-
-/* Owner package header include                             */
-#include <TestCDTintegration/Pkg_TestCDTintegration.h>
-
-
-
-
-
-
- 
-
-/************************************************************/
-/**
- * 
- */
-class Class2
- {
-  public:
-	
-  protected:
-	
-  private:
-	
-
-  public:
-
-
-  protected:
-
-
-  private:
-
-
-};
-/************************************************************/
-/* External declarations (package visibility)               */
-
-
-/************************************************************/
-
-
-/* Inline functions                                         */
-
-
-
-/************************************************************
-              End of Class2 class header
- ************************************************************/
-
-#endif
\ No newline at end of file
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/TestCDTintegration/Class3.cpp b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/TestCDTintegration/Class3.cpp
deleted file mode 100644
index 398cd202ba1..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/TestCDTintegration/Class3.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-// --------------------------------------------------------
-// Code generated by Papyrus C++
-// --------------------------------------------------------
-
-#define TestCDTintegration_Class3_BODY
-
-/************************************************************
-              Class3 class body
- ************************************************************/
-
-
-
-// include associated header file
-#include <TestCDTintegration/Class3.h>
-
-
-
-// Derived includes directives
-
-
-
-// static attributes (if any)
-
-
-/**
- * 
- * @param arg 
- */
-void Class3::Operation1(int /*in*/ arg[25]) {
-	// Now let's add some code
-	arg[0] = 1;
-}
-
-
-
-
-/************************************************************
-              End of Class3 class body
- ************************************************************/
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/TestCDTintegration/Class3.h b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/TestCDTintegration/Class3.h
deleted file mode 100644
index 688929af545..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/TestCDTintegration/Class3.h
+++ /dev/null
@@ -1,71 +0,0 @@
-// --------------------------------------------------------
-// Code generated by Papyrus C++
-// --------------------------------------------------------
-
-#ifndef TESTCDTINTEGRATION_CLASS3_H
-#define TESTCDTINTEGRATION_CLASS3_H
-
-/************************************************************
-              Class3 class header
- ************************************************************/
-
-/* Owner package header include                             */
-#include <TestCDTintegration/Pkg_TestCDTintegration.h>
-
-
-/* Owner package header include                             */
-#include <AnsiCLibrary/Pkg_AnsiCLibrary.h>
-
-
-
-
-
- 
-
-/************************************************************/
-/**
- * 
- */
-class Class3
- {
-  public:
-	
-	
-	
-  protected:
-	
-  private:
-	
-
-  public:
-
- 	/**
- 	 * 
- 	 * @param arg 
- 	 */
- 	void  Operation1(int /*in*/ arg[25]);
-
-
-  protected:
-
-
-  private:
-
-
-};
-/************************************************************/
-/* External declarations (package visibility)               */
-
-
-/************************************************************/
-
-
-/* Inline functions                                         */
-
-
-
-/************************************************************
-              End of Class3 class header
- ************************************************************/
-
-#endif
\ No newline at end of file
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/TestCDTintegration/Package1/Pkg_Package1.h b/extraplugins/codegen/org.eclipse.papyrus.cpp.test/TestCDTintegration/Package1/Pkg_Package1.h
deleted file mode 100644
index 3566e1c114a..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.test/TestCDTintegration/Package1/Pkg_Package1.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// --------------------------------------------------------
-// Code generated by Papyrus C++
-// --------------------------------------------------------
-
-#ifndef PKG_TESTCDTINTEGRATION_PACKAGE1
-#define PKG_TESTCDTINTEGRATION_PACKAGE1
-
-/************************************************************
-              Pkg_Package1 package header
- ************************************************************/
-
-/* Owner package header include                             */
-#include <TestCDTintegration/Pkg_TestCDTintegration.h>
-
-
-#ifndef _IN_
-#define _IN_
-#endif
-#ifndef _OUT_
-#define _OUT_
-#endif
-#ifndef _INOUT_
-#define _INOUT_
-#endif
-
-	
-/* Package dependency header include                        */
-
-
-
-namespace Package1 {
-
-// Types defined within the package
-
-
-/**
- * 
- */
-typedef int Test;
-
-
-} // of namespace Package1
-
-
-/************************************************************
-              End of Pkg_Package1 package header
- ************************************************************/
-
-#endif
\ No newline at end of file
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/.classpath b/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/.classpath
index 2d1a4302f04..ad32c83a788 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/.classpath
+++ b/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/META-INF/MANIFEST.MF b/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/META-INF/MANIFEST.MF
index 70e099e37d6..ba493cc2d7e 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/META-INF/MANIFEST.MF
+++ b/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/META-INF/MANIFEST.MF
@@ -36,5 +36,5 @@ Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.texteditor.cdt.Activator

 Bundle-SymbolicName: org.eclipse.papyrus.texteditor.cdt;singleton:=tru

  e

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

 

diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/.classpath b/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/.classpath
index 45f024e850e..ad32c83a788 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/.classpath
+++ b/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/META-INF/MANIFEST.MF b/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/META-INF/MANIFEST.MF
index 62fbef401a4..4988fa7f7b2 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/META-INF/MANIFEST.MF
+++ b/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/META-INF/MANIFEST.MF
@@ -13,5 +13,5 @@ Bundle-Localization: plugin
 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.texteditor.model;singleton:=t

  rue

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

 

diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/.classpath b/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/.classpath
index 64c5e31b7a2..ad32c83a788 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/.classpath
+++ b/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/META-INF/MANIFEST.MF b/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/META-INF/MANIFEST.MF
index a5bdc0ef269..818d1191697 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/META-INF/MANIFEST.MF
+++ b/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/META-INF/MANIFEST.MF
@@ -4,14 +4,14 @@ Export-Package: org.eclipse.papyrus.texteditor.modelexplorer,
 Bundle-ActivationPolicy: lazy

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

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

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

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

  org.eclipse.emf.facet.infra.query.core;bundle-version="0.3.0",

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

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

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

  org.eclipse.emf.facet.widgets.nattable.instance;bundle-version="0.3.0",

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

diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/.classpath b/extraplugins/codegen/org.eclipse.papyrus.views.cpp/.classpath
index 64c5e31b7a2..ad32c83a788 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/.classpath
+++ b/extraplugins/codegen/org.eclipse.papyrus.views.cpp/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/META-INF/MANIFEST.MF b/extraplugins/codegen/org.eclipse.papyrus.views.cpp/META-INF/MANIFEST.MF
index b5e3fd0e0d1..babcbcadd0d 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.views.cpp/META-INF/MANIFEST.MF
+++ b/extraplugins/codegen/org.eclipse.papyrus.views.cpp/META-INF/MANIFEST.MF
@@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.acceleo;bundle-version="1.0.0",

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

 Bundle-Vendor: %providerName

-Eclipse-LazyStart: true

+Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

 Bundle-Version: 1.0.0.qualifier

 Bundle-Name: %pluginName

@@ -31,5 +31,5 @@ Bundle-Localization: plugin
 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.views.cpp.Activator

 Bundle-SymbolicName: org.eclipse.papyrus.views.cpp;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

 

diff --git a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.doc/resources/template-diaGen.pdf b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.doc/resources/template-diaGen.pdf
index 729c17aace5..1bbe3ce2737 100644
--- a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.doc/resources/template-diaGen.pdf
+++ b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.doc/resources/template-diaGen.pdf
diff --git a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.doc/resources/template-diaGen.pptx b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.doc/resources/template-diaGen.pptx
index bf447853259..1328d3e78c7 100644
--- a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.doc/resources/template-diaGen.pptx
+++ b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.doc/resources/template-diaGen.pptx
diff --git a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/DiagramTemplateActionBarContributor.java b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/DiagramTemplateActionBarContributor.java
index da8b9d8db2e..0755d1481e7 100644
--- a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/DiagramTemplateActionBarContributor.java
+++ b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/DiagramTemplateActionBarContributor.java
@@ -8,7 +8,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *  Florian Noyrit - florian.noyrit@cea.fr (CEA LIST) - Initial API and implementation

+ *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

 package org.eclipse.papyrus.diagramtemplate.editor;

diff --git a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/DiagramTemplateEditor.java b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/DiagramTemplateEditor.java
index 05cf38cdecf..61ad60bd1f3 100644
--- a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/DiagramTemplateEditor.java
+++ b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/DiagramTemplateEditor.java
@@ -8,7 +8,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *  Florian Noyrit - florian.noyrit@cea.fr (CEA LIST) - Initial API and implementation

+ *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

 package org.eclipse.papyrus.diagramtemplate.editor;

diff --git a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/DiagramTemplateEditorPlugin.java b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/DiagramTemplateEditorPlugin.java
index 459715e1ba1..8816a182d7b 100644
--- a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/DiagramTemplateEditorPlugin.java
+++ b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/DiagramTemplateEditorPlugin.java
@@ -8,7 +8,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *  Florian Noyrit - florian.noyrit@cea.fr (CEA LIST) - Initial API and implementation

+ *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

 package org.eclipse.papyrus.diagramtemplate.editor;

diff --git a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/DiagramTemplateModelWizard.java b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/DiagramTemplateModelWizard.java
index 2baf3d1cf51..4bb55ed7d2d 100644
--- a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/DiagramTemplateModelWizard.java
+++ b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/DiagramTemplateModelWizard.java
@@ -8,7 +8,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *  Florian Noyrit - florian.noyrit@cea.fr (CEA LIST) - Initial API and implementation

+ *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

 package org.eclipse.papyrus.diagramtemplate.editor;

diff --git a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/DiagramDefinitionContentProvider.java b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/DiagramDefinitionContentProvider.java
index e1ceb6dc213..37d92dd795b 100644
--- a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/DiagramDefinitionContentProvider.java
+++ b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/DiagramDefinitionContentProvider.java
@@ -8,7 +8,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *  Florian Noyrit - florian.noyrit@cea.fr (CEA LIST) - Initial API and implementation

+ *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

 package org.eclipse.papyrus.diagramtemplate.editor.provider;

diff --git a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/DiagramDefinitionLabelProvider.java b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/DiagramDefinitionLabelProvider.java
index 5ab37a1c22b..82936252503 100644
--- a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/DiagramDefinitionLabelProvider.java
+++ b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/DiagramDefinitionLabelProvider.java
@@ -8,7 +8,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *  Florian Noyrit - florian.noyrit@cea.fr (CEA LIST) - Initial API and implementation

+ *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

 package org.eclipse.papyrus.diagramtemplate.editor.provider;

diff --git a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/DiagramKindContentProvider.java b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/DiagramKindContentProvider.java
index e3fd02c03b7..16ae3abbd7d 100644
--- a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/DiagramKindContentProvider.java
+++ b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/DiagramKindContentProvider.java
@@ -8,7 +8,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *  Florian Noyrit - florian.noyrit@cea.fr (CEA LIST) - Initial API and implementation

+ *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

 package org.eclipse.papyrus.diagramtemplate.editor.provider;

diff --git a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/ElementsAvailableContentProvider.java b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/ElementsAvailableContentProvider.java
index 9af233e2af7..73764677f42 100644
--- a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/ElementsAvailableContentProvider.java
+++ b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/ElementsAvailableContentProvider.java
@@ -8,7 +8,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *  Florian Noyrit - florian.noyrit@cea.fr (CEA LIST) - Initial API and implementation

+ *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

 package org.eclipse.papyrus.diagramtemplate.editor.provider;

diff --git a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/ForContentProvider.java b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/ForContentProvider.java
index a588ddbbf06..1a1c587b072 100644
--- a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/ForContentProvider.java
+++ b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/ForContentProvider.java
@@ -8,7 +8,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *  Florian Noyrit - florian.noyrit@cea.fr (CEA LIST) - Initial API and implementation

+ *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

 package org.eclipse.papyrus.diagramtemplate.editor.provider;

diff --git a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/ForLabelProvider.java b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/ForLabelProvider.java
index 4926478ddb5..0861ea91141 100644
--- a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/ForLabelProvider.java
+++ b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/ForLabelProvider.java
@@ -8,7 +8,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *  Florian Noyrit - florian.noyrit@cea.fr (CEA LIST) - Initial API and implementation

+ *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

 package org.eclipse.papyrus.diagramtemplate.editor.provider;

diff --git a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/TypesAvailableFromEReferenceContentProvider.java b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/TypesAvailableFromEReferenceContentProvider.java
index adadfdeb090..8a6cb154128 100644
--- a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/TypesAvailableFromEReferenceContentProvider.java
+++ b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/TypesAvailableFromEReferenceContentProvider.java
@@ -8,7 +8,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *  Florian Noyrit - florian.noyrit@cea.fr (CEA LIST) - Initial API and implementation

+ *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

 package org.eclipse.papyrus.diagramtemplate.editor.provider;

diff --git a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/TypesContentProvider.java b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/TypesContentProvider.java
index eaaa973fc2b..b2e328783ad 100644
--- a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/TypesContentProvider.java
+++ b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/TypesContentProvider.java
@@ -8,7 +8,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *  Florian Noyrit - florian.noyrit@cea.fr (CEA LIST) - Initial API and implementation

+ *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

 package org.eclipse.papyrus.diagramtemplate.editor.provider;

diff --git a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/WhatContentProvider.java b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/WhatContentProvider.java
index 1232575847f..5677e62876f 100644
--- a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/WhatContentProvider.java
+++ b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/editor/provider/WhatContentProvider.java
@@ -8,7 +8,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *  Florian Noyrit - florian.noyrit@cea.fr (CEA LIST) - Initial API and implementation

+ *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

 package org.eclipse.papyrus.diagramtemplate.editor.provider;

diff --git a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/launcher/DiagramTemplateLauncher.java b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/launcher/DiagramTemplateLauncher.java
index 0b668b501b2..7c911454ea3 100644
--- a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/launcher/DiagramTemplateLauncher.java
+++ b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/launcher/DiagramTemplateLauncher.java
@@ -8,7 +8,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *  Florian Noyrit - florian.noyrit@cea.fr (CEA LIST) - Initial API and implementation

+ *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

 package org.eclipse.papyrus.diagramtemplate.launcher;

diff --git a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/launcher/DiagramTemplateLauncherReport.java b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/launcher/DiagramTemplateLauncherReport.java
index 32bf1d17b28..5132b46cb68 100644
--- a/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/launcher/DiagramTemplateLauncherReport.java
+++ b/extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor/src/org/eclipse/papyrus/diagramtemplate/launcher/DiagramTemplateLauncherReport.java
@@ -8,7 +8,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *  Florian Noyrit - florian.noyrit@cea.fr (CEA LIST) - Initial API and implementation

+ *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

 package org.eclipse.papyrus.diagramtemplate.launcher;

diff --git a/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/AssociationPreferencePage.java b/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/AssociationPreferencePage.java
index 6d0036abbd9..cc2a4b1bd86 100644
--- a/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/AssociationPreferencePage.java
+++ b/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/AssociationPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.uml.diagram.domain.provider.ElementTypes;
 
 public class AssociationPreferencePage extends DomainDiagramLinkPreferencePage {
@@ -62,7 +62,7 @@ public class AssociationPreferencePage extends DomainDiagramLinkPreferencePage {
 		// End of user code
 
 		for(String labelName : labelDefaultVisibilityMap.keySet()) {
-			String showLabelKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, labelName, PreferenceConstantHelper.LABEL_VISIBILITY);
+			String showLabelKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, labelName, PreferencesConstantsHelper.LABEL_VISIBILITY);
 			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
 		}
 	}
diff --git a/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/ClassPreferencePage.java b/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/ClassPreferencePage.java
index ad3711dd9a3..ebe2aef31c3 100644
--- a/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/ClassPreferencePage.java
+++ b/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/ClassPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.uml.diagram.domain.provider.ElementTypes;
 
 public class ClassPreferencePage extends DomainDiagramNodePreferencePage {
@@ -68,17 +68,17 @@ public class ClassPreferencePage extends DomainDiagramNodePreferencePage {
 		// Start of user code custom default initializations
 		// End of user code
 
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 100);
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 100);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 100);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100);
 		// Initialize default visibility for compartments in preference page.
 		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
+			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(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			String showCompartmentTitleKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);
+			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
 	}
diff --git a/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/DataTypePreferencePage.java b/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/DataTypePreferencePage.java
index 6bb644ead59..ee6be93e782 100644
--- a/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/DataTypePreferencePage.java
+++ b/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/DataTypePreferencePage.java
@@ -18,7 +18,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.uml.diagram.domain.provider.ElementTypes;
 
 public class DataTypePreferencePage extends DomainDiagramNodePreferencePage {
@@ -66,17 +66,17 @@ public class DataTypePreferencePage extends DomainDiagramNodePreferencePage {
 		// Start of user code custom default initializations
 		// End of user code
 
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 100);
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 100);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 100);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100);
 		// Initialize default visibility for compartments in preference page.
 		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
+			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(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			String showCompartmentTitleKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);
+			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
 	}
diff --git a/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/EnumerationPreferencePage.java b/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/EnumerationPreferencePage.java
index da0991ee98c..e657245d4d6 100644
--- a/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/EnumerationPreferencePage.java
+++ b/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/EnumerationPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.uml.diagram.domain.provider.ElementTypes;
 
 public class EnumerationPreferencePage extends DomainDiagramNodePreferencePage {
@@ -64,17 +64,17 @@ public class EnumerationPreferencePage extends DomainDiagramNodePreferencePage {
 		// Start of user code custom default initializations
 		// End of user code
 
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 100);
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 100);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 100);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100);
 		// Initialize default visibility for compartments in preference page.
 		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
+			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(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			String showCompartmentTitleKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);
+			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
 	}
diff --git a/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/GeneralizationPreferencePage.java b/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/GeneralizationPreferencePage.java
index c71c7e14560..36297a055ff 100644
--- a/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/GeneralizationPreferencePage.java
+++ b/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/GeneralizationPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.uml.diagram.domain.provider.ElementTypes;
 
 public class GeneralizationPreferencePage extends DomainDiagramLinkPreferencePage {
@@ -57,7 +57,7 @@ public class GeneralizationPreferencePage extends DomainDiagramLinkPreferencePag
 		// End of user code
 
 		for(String labelName : labelDefaultVisibilityMap.keySet()) {
-			String showLabelKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, labelName, PreferenceConstantHelper.LABEL_VISIBILITY);
+			String showLabelKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, labelName, PreferencesConstantsHelper.LABEL_VISIBILITY);
 			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
 		}
 	}
diff --git a/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/InstanceSpecificationPreferencePage.java b/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/InstanceSpecificationPreferencePage.java
index 7fb5a04b3c6..ce68d99f86b 100644
--- a/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/InstanceSpecificationPreferencePage.java
+++ b/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/InstanceSpecificationPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.uml.diagram.domain.provider.ElementTypes;
 
 public class InstanceSpecificationPreferencePage extends DomainDiagramNodePreferencePage {
@@ -64,17 +64,17 @@ public class InstanceSpecificationPreferencePage extends DomainDiagramNodePrefer
 		// Start of user code custom default initializations
 		// End of user code
 
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 100);
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 100);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 100);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100);
 		// Initialize default visibility for compartments in preference page.
 		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
+			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(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			String showCompartmentTitleKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);
+			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
 	}
diff --git a/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/PackagePreferencePage.java b/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/PackagePreferencePage.java
index e76ef6f5c42..54c9fef6987 100644
--- a/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/PackagePreferencePage.java
+++ b/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/PackagePreferencePage.java
@@ -18,7 +18,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.uml.diagram.domain.provider.ElementTypes;
 
 public class PackagePreferencePage extends DomainDiagramNodePreferencePage {
@@ -64,17 +64,17 @@ public class PackagePreferencePage extends DomainDiagramNodePreferencePage {
 		// Start of user code custom default initializations
 		// End of user code
 
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 200);
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 100);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 200);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100);
 		// Initialize default visibility for compartments in preference page.
 		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
+			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(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			String showCompartmentTitleKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);
+			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
 	}
diff --git a/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/PrimitiveTypePreferencePage.java b/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/PrimitiveTypePreferencePage.java
index b52978cfa3d..5b75fd61378 100644
--- a/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/PrimitiveTypePreferencePage.java
+++ b/extraplugins/domainmodel/org.eclipse.papyrus.uml.diagram.domain/src-gen/org/eclipse/papyrus/uml/diagram/domain/preferences/PrimitiveTypePreferencePage.java
@@ -18,7 +18,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.uml.diagram.domain.provider.ElementTypes;
 
 public class PrimitiveTypePreferencePage extends DomainDiagramNodePreferencePage {
@@ -66,17 +66,17 @@ public class PrimitiveTypePreferencePage extends DomainDiagramNodePreferencePage
 		// Start of user code custom default initializations
 		// End of user code
 
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 100);
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 50);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 100);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 50);
 		// Initialize default visibility for compartments in preference page.
 		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
+			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(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			String showCompartmentTitleKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);
+			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
 	}
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/.classpath b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/.classpath
new file mode 100644
index 00000000000..5496d8e7f08
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/.classpath
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<classpath>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>

+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

+	<classpathentry kind="src" path="src-templates"/>

+	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="output" path="bin"/>

+</classpath>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/.project b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/.project
new file mode 100644
index 00000000000..b44c0bf785d
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/.project
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.papyrus.facade.codegen</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.jdt.core.javabuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.ManifestBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.SchemaBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.acceleo.ide.ui.acceleoBuilder</name>

+			<arguments>

+				<dictionary>

+					<key>compliance</key>

+					<value>pragmatic</value>

+				</dictionary>

+				<dictionary>

+					<key>resource.kind</key>

+					<value>binary</value>

+				</dictionary>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.pde.PluginNature</nature>

+		<nature>org.eclipse.jdt.core.javanature</nature>

+		<nature>org.eclipse.acceleo.ide.ui.acceleoNature</nature>

+	</natures>

+</projectDescription>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/.settings/org.eclipse.jdt.core.prefs b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..11f6e462df7
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1

+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7

+org.eclipse.jdt.core.compiler.compliance=1.7

+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

+org.eclipse.jdt.core.compiler.source=1.7

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/META-INF/MANIFEST.MF b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..875c37db936
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/META-INF/MANIFEST.MF
@@ -0,0 +1,25 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.facade.codegen;singleton:=true
+Bundle-Version: 0.10.1.qualifier
+Bundle-Activator: org.eclipse.papyrus.facade.codegen.FacadeCodeGenPlugin
+Bundle-Localization: plugin
+Bundle-Vendor: %vendorName
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.emf.eef.codegen.launcher,
+ org.eclipse.core.resources,
+ org.eclipse.emf.common,
+ org.eclipse.emf.codegen.ecore,
+ org.eclipse.acceleo.engine,
+ org.eclipse.emf.eef.codegen.ecore;bundle-version="1.2.0",
+ org.eclipse.papyrus.facade;bundle-version="0.10.1",
+ org.eclipse.uml2.codegen.ecore;bundle-version="1.9.0",
+ org.eclipse.uml2.uml;bundle-version="4.1.0",
+ org.eclipse.papyrus.facade.utils;bundle-version="0.10.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="0.10.1"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-ActivationPolicy: lazy
+Export-Package: org.eclipse.papyrus.facade.codegen.genfacade,
+ org.eclipse.papyrus.facade.codegen.utils
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/build.acceleo b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/build.acceleo
new file mode 100644
index 00000000000..927a3f72b52
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/build.acceleo
@@ -0,0 +1,26 @@
+<!-- ===================================================================== -->
+<!-- Custom targets.                                                       -->
+<!-- Set customBuildCallbacks = build.acceleo in your build.properties.    -->
+<!-- ===================================================================== -->
+<project name="Build Acceleo Module" default="noDefault">    
+    <!-- ================================================================= -->
+    <!-- Default target                                                    -->
+    <!-- ================================================================= -->
+    <target name="noDefault">
+        <echo message="This file must be called with explicit targets" />
+    </target>
+
+    <!-- ================================================================= -->
+    <!-- This will be called automatically after the compilation of each   -->
+    <!-- Bundle... in dependency order.                                    -->
+    <!-- ================================================================= -->
+    <target name="post.compile.@dot">
+        <acceleoCompiler 
+            sourceFolder="${target.folder}"
+            outputFolder="${target.folder}"
+            dependencies="${target.folder}/../../org.eclipse.emf.eef.codegen.ecore;${target.folder}/../../org.eclipse.ui.ide;${target.folder}/../../org.eclipse.papyrus.facade;${target.folder}/../../org.eclipse.uml2.uml;${target.folder}/../../org.eclipse.uml2.codegen.ecore;${target.folder}/../../org.eclipse.papyrus.facade.utils;"
+            binaryResource="false"
+            packagesToRegister="">
+        </acceleoCompiler>
+    </target>    
+</project>
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/build.properties b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/build.properties
new file mode 100644
index 00000000000..e5054e06e6a
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/build.properties
@@ -0,0 +1,9 @@
+source.. = src-templates/,\

+           src/

+output.. = bin/

+bin.includes = META-INF/,\

+               .,\

+               plugin.xml,\

+               bin/,\

+               src/,\

+               icons/

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/icons/facade.png b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/icons/facade.png
new file mode 100644
index 00000000000..779a7b8b123
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/icons/facade.png
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/plugin.properties b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/plugin.properties
new file mode 100644
index 00000000000..f0885250491
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/plugin.properties
@@ -0,0 +1,2 @@
+pluginName=Papyrus Facade (Incubation)

+vendorName=Eclipse Modeling Project
\ No newline at end of file
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/plugin.xml b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/plugin.xml
new file mode 100644
index 00000000000..bda059b0aab
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/plugin.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<?eclipse version="3.4"?>

+<plugin>

+   

+    <extension

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

+      <command

+            categoryId="org.eclipse.papyrus.facade.category"

+            id="org.eclipse.papyrus.facade.codegen.generateFacadeCodeCommand"

+            name="Generate Facade Code">

+      </command>

+   </extension>

+   <extension

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

+      <handler

+            class="org.eclipse.papyrus.facade.codegen.handlers.GenerateFacadeHandler"

+            commandId="org.eclipse.papyrus.facade.codegen.generateFacadeCodeCommand">

+      </handler>

+   </extension>

+ 

+   <extension

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

+      <menuContribution

+            locationURI="popup:org.eclipse.emf.codegen.ecore.genmodel.presentation.GenModelEditorID">

+            <command

+                  commandId="org.eclipse.papyrus.facade.codegen.generateFacadeCodeCommand"

+                  icon="icons/facade.png"

+                  id="org.eclipse.papyrus.facade.codegen.menu.generateFacadeCodeCommand">

+ 

+                    <visibleWhen>

+				           <with variable="activeMenuSelection">

+				            <iterate

+				                 ifEmpty="false">

+				             <adapt type="org.eclipse.emf.codegen.ecore.genmodel.GenModel">

+

+				             </adapt>

+				            </iterate>

+				           </with>

+         			</visibleWhen>

+            </command>

+      </menuContribution>

+   </extension>

+

+</plugin>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genclass/eIsSet.mtl b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genclass/eIsSet.mtl
new file mode 100644
index 00000000000..1c550f7422d
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genclass/eIsSet.mtl
@@ -0,0 +1,130 @@
+[comment]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:
+ Obeo - Initial API and implementation
+ CEA LIST - Modification to support Facade code generation[/comment]
+[comment encoding = UTF-8 /]
+[module eIsSet('http://www.eclipse.org/emf/2002/GenModel')/]
+
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenClass /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenClassifier /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenFeature /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenModel /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenEnum /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenPackage /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenDataType /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenOperation /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenParameter /]
+
+[template public eIsSet(genClass : GenClass, genModel : GenModel, positiveOffsetCorrection : String, negativeOffsetCorrection : String)]
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+  [if (genModel.useGenerics()) ]
+    [if (genClass.getEIsSetGenFeatures()->filter(GenFeature)->select(genFeature : GenFeature | genFeature.isListType() and not genFeature.isUnsettable() and not genFeature.isWrappedFeatureMapType() and not genClass.isField(genFeature) and genFeature.isField() and genClass.getImplementingGenModel(genFeature).isVirtualDelegation()))->notEmpty()]
+	@SuppressWarnings("unchecked")
+    [/if]
+  [/if]
+  [if (genModel.useClassOverrideAnnotation()) ]
+	@Override
+  [/if]
+	public boolean eIsSet(int featureID) {
+		switch (featureID[negativeOffsetCorrection/]) {
+[for (genFeature : GenFeature  | genClass.getEIsSetGenFeatures())]
+  [let safeNameAccessor : String = if (genFeature.getSafeName() = 'featureID') then 'this.' + genFeature.getSafeName() else genFeature.getSafeName() endif]
+			case [genClass.getQualifiedFeatureID(genFeature)/]:
+  [if (genFeature.hasSettingDelegate()) ]
+    [if (genFeature.isUnsettable()) ]
+				return isSet[genFeature.getAccessorName()/]();
+    [else]
+				return [genFeature.getUpperName()/]__ESETTING_DELEGATE.dynamicIsSet(this, null, 0);
+    [/if]
+  [else][if (genFeature.isListType() and not genFeature.isUnsettable()) ]
+    [if (genFeature.isWrappedFeatureMapType()) ]
+      [if (genFeature.isVolatile()) ]
+				return !(([genModel.getImportedName('org.eclipse.emf.ecore.util.FeatureMap')/].Internal.Wrapper)[genFeature.getGetAccessor()/]()).featureMap().isEmpty();
+      [else]
+				return [genFeature.getGetAccessor()/]() != null && ![genFeature.getGetAccessor()/]().featureMap().isEmpty();
+      [/if]
+    [else]
+      [if (genClass.isField(genFeature)) ]
+				return [genFeature.getGetAccessor()/]() != null && ![genFeature.getGetAccessor()/]().isEmpty();
+      [else]
+        [if (genFeature.isField() and genClass.getImplementingGenModel(genFeature).isVirtualDelegation()) ]
+				[genFeature.getImportedType(genClass)/] [safeNameAccessor/] = ([genFeature.getImportedType(genClass)/])eVirtualGet([genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/]);
+				return [safeNameAccessor/] != null && ![safeNameAccessor/].isEmpty();
+        [else]
+				return ![genFeature.getGetAccessor()/]().isEmpty();
+        [/if]
+      [/if]
+    [/if]
+  [else][if (genFeature.isUnsettable()) ]
+				return isSet[genFeature.getAccessorName()/]();
+  [else][if (genFeature.isResolveProxies()) ]
+    [if (genClass.isField(genFeature)) ]
+				return [genFeature.getGetAccessor()/]() != null;
+    [else]
+      [if (genFeature.isField() and genClass.getImplementingGenModel(genFeature).isVirtualDelegation()) ]
+				return eVirtualGet([genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/]) != null;
+      [else]
+				return basicGet[genFeature.getAccessorName()/]() != null;
+      [/if]
+    [/if]
+  [else][if (not genFeature.hasEDefault()) ]
+    [if (genClass.isField(genFeature)) ]
+				return [genFeature.getGetAccessor()/]() != null;
+    [else]
+      [if (genFeature.isField() and genClass.getImplementingGenModel(genFeature).isVirtualDelegation()) ]
+				return eVirtualGet([genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/]) != null;
+      [else]
+				return [genFeature.getGetAccessor()/]() != null;
+      [/if]
+    [/if]
+  [else][if (genFeature.isPrimitiveType() or genFeature.isEnumType()) ]
+    [if (genClass.isField(genFeature)) ]
+      [if (genClass.isFlag(genFeature)) ]
+        [if (genFeature.isBooleanType()) ]
+				return (([genClass.getFlagsField(genFeature)/] & [genFeature.getUpperName()/]_EFLAG) != 0) != [genFeature.getEDefault()/];
+        [else]
+				return ([genClass.getFlagsField(genFeature)/] & [genFeature.getUpperName()/]_EFLAG) != [genFeature.getUpperName()/]_EFLAG_DEFAULT;
+        [/if]
+      [else]
+				return [genFeature.getGetAccessor()/]() != [genFeature.getEDefault()/];
+      [/if]
+    [else]
+      [if (genFeature.isEnumType() and genFeature.isField() and genClass.getImplementingGenModel(genFeature).isVirtualDelegation()) ]
+				return eVirtualGet([genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/], [genFeature.getEDefault()/]) != [genFeature.getEDefault()/];
+      [else]
+				return [genFeature.getGetAccessor()/]() != [genFeature.getEDefault()/];
+      [/if]
+    [/if]
+  [else]
+    [if (genClass.isField(genFeature)) ]
+				return [genFeature.getEDefault()/] == null ? [genFeature.getGetAccessor()/]() != null : ![genFeature.getEDefault()/].equals([genFeature.getGetAccessor()/]());
+    [else]
+      [if (genFeature.isField() and genClass.getImplementingGenModel(genFeature).isVirtualDelegation()) ]
+				[genFeature.getImportedType(genClass)/] [safeNameAccessor/] = ([genFeature.getImportedType(genClass)/])eVirtualGet([genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/], [genFeature.getEDefault()/]);
+				return [genFeature.getEDefault()/] == null ? [safeNameAccessor/] != null : ![genFeature.getEDefault()/].equals([safeNameAccessor/]);
+      [else]
+				return [genFeature.getEDefault()/] == null ? [genFeature.getGetAccessor()/]() != null : ![genFeature.getEDefault()/].equals([genFeature.getGetAccessor()/]());
+      [/if]
+    [/if]
+  [/if][/if][/if][/if][/if][/if]
+  [/let]
+[/for]
+		}
+[if (genModel.minimalReflectiveMethods) ]
+		return super.eIsSet(featureID);
+[else]
+		return eDynamicIsSet(featureID);
+[/if]
+	}
+
+[/template]
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genclass/eUnset.mtl b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genclass/eUnset.mtl
new file mode 100644
index 00000000000..b6d0ecd3c59
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genclass/eUnset.mtl
@@ -0,0 +1,54 @@
+[comment]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:
+ Obeo - Initial API and implementation
+ CEA LIST - Modification to support Facade code generation[/comment]
+[comment encoding = UTF-8 /]
+[module eUnset('http://www.eclipse.org/emf/2002/GenModel')/]
+
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenClass /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenFeature /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenModel /]
+
+[template public eUnset(genClass : GenClass, genModel : GenModel, negativeOffsetCorrection : String)]
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+  [if (genModel.useClassOverrideAnnotation()) ]
+	@Override
+  [/if]
+	public void eUnset(int featureID) {
+		switch (featureID[negativeOffsetCorrection/]) {
+  [for (genFeature : GenFeature | genClass.getEUnsetGenFeatures())]
+			case [genClass.getQualifiedFeatureID(genFeature)/]:
+    [if (genFeature.isListType() and not genFeature.isUnsettable()) ]
+      [if (genFeature.isWrappedFeatureMapType()) ]
+				(([genModel.getImportedName('org.eclipse.emf.ecore.util.FeatureMap')/].Internal.Wrapper)[genFeature.getGetAccessor()/]()).featureMap().clear();
+      [else]
+				[genFeature.getGetAccessor()/]().clear();
+      [/if]
+    [else][if (genFeature.isUnsettable()) ]
+				unset[genFeature.getAccessorName()/]();
+    [else][if (not genFeature.hasEDefault()) ]
+				set[genFeature.getAccessorName()/](([genFeature.getImportedType(genClass)/])null);
+    [else]
+				set[genFeature.getAccessorName()/]([genFeature.getEDefault()/]);
+    [/if][/if][/if]
+				return;
+  [/for]
+		}
+  [if (genModel.minimalReflectiveMethods) ]
+		super.eUnset(featureID);
+  [else]
+		eDynamicUnset(featureID);
+  [/if]
+	}
+
+[/template]
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genclass/genDeclaredFields.mtl b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genclass/genDeclaredFields.mtl
new file mode 100644
index 00000000000..39960920800
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genclass/genDeclaredFields.mtl
@@ -0,0 +1,206 @@
+[comment]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:
+ Obeo - Initial API and implementation
+ CEA LIST - Modification to support Facade code generation[/comment]
+[comment encoding = UTF-8 /]
+[module genDeclaredFields('http://www.eclipse.org/emf/2002/GenModel', 'http://www.eclipse.org/emf/2002/Ecore')/]
+
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenClass /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenClassifier /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenFeature /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenModel /]
+
+[template public genDeclaredFields(genFeature : GenFeature, genClass : GenClass, genModel : GenModel, isGWT : Boolean, isJDK50 : Boolean)]
+    [if (genFeature.hasSettingDelegate())]
+	/**
+	 * The cached setting delegate for the '{@link #[genFeature.getGetAccessor()/]() <em>[genFeature.getFormattedName()/]</em>}' [genFeature.getFeatureKind()/].
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #[genFeature.getGetAccessor()/]()
+	 * @generated
+	 * @ordered
+	 */
+      [if (isGWT) ]
+	@[genModel.getImportedName('com.google.gwt.user.client.rpc.GwtTransient')/]
+      [/if]
+	protected [genModel.getImportedName('org.eclipse.emf.ecore.EStructuralFeature')/].Internal.SettingDelegate [genFeature.getUpperName()/]__ESETTING_DELEGATE = (([genModel.getImportedName('org.eclipse.emf.ecore.EStructuralFeature')/].Internal)[genFeature.getQualifiedFeatureAccessor()/]).getSettingDelegate();
+
+    [else][if (genFeature.isListType() or genFeature.isReferenceType())]
+      [if (genClass.isField(genFeature)) ]
+	/**
+	 * The cached value of the '{@link #[genFeature.getGetAccessor()/]() <em>[genFeature.getFormattedName()/]</em>}' [genFeature.getFeatureKind()/].
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #[genFeature.getGetAccessor()/]()
+	 * @generated
+	 * @ordered
+	 */
+        [if (isGWT) ]
+	@[genModel.getImportedName('com.google.gwt.user.client.rpc.GwtTransient')/]
+        [/if]
+	protected [genFeature.getImportedInternalType(genClass)/] [genFeature.getSafeName()/];
+
+      [/if]
+      [if (genModel.arrayAccessors and genFeature.isListType() and not genFeature.isFeatureMapType() and not genFeature.isMapType())]
+        [let rawListItemType : String = genFeature.getRawListItemType()]
+          [let index : Integer = rawListItemType.index('[')]
+            [let head : String = if (index <> -1) then rawListItemType.substring(1, index) else rawListItemType endif]
+              [let tail : String = if (index <> -1) then rawListItemType.substring(index + 1) else '' endif]
+	/**
+	 * The empty value for the '{@link #[genFeature.getGetArrayAccessor()/]() <em>[genFeature.getFormattedName()/]</em>}' array accessor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #[genFeature.getGetArrayAccessor()/]()
+	 * @generated
+	 * @ordered
+	 */
+        [if (genFeature.getQualifiedListItemType(genClass).contains('<')) ]
+	@SuppressWarnings("unchecked")
+        [/if]
+	protected static final [rawListItemType/]['[]'/] [genFeature.getUpperName()/]_EEMPTY_ARRAY = new [head/] ['[0]'/][tail/];
+                
+              [/let]
+            [/let]
+          [/let]
+        [/let]
+      [/if]
+    [else]
+      [if (genFeature.hasEDefault() and (not genFeature.isVolatile() or not genModel.reflectiveDelegation and (not genFeature.hasDelegateFeature() or not genFeature.isUnsettable())))]
+        [let staticDefaultValue : String = genFeature.getStaticDefaultValue()]
+	/**
+	 * The default value of the '{@link #[genFeature.getGetAccessor()/]() <em>[genFeature.getFormattedName()/]</em>}' [genFeature.getFeatureKind()/].
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #[genFeature.getGetAccessor()/]()
+	 * @generated
+	 * @ordered
+	 */
+        [if (genModel.useGenerics() and genFeature.isListDataType() and genFeature.isSetDefaultValue()) ]
+	@SuppressWarnings("unchecked")
+        [/if]
+	protected static final [genFeature.getImportedType(genClass)/] [genFeature.getEDefault()/][if (staticDefaultValue = '') ]; // TODO The default value literal "[genFeature.ecoreFeature.defaultValueLiteral/]" is not valid.[else] = [staticDefaultValue/];[genModel.getNonNLS(staticDefaultValue)/][/if]
+
+        [/let]
+      [/if]
+      [if (genClass.isField(genFeature)) ]
+        [if (genClass.isFlag(genFeature))]
+          [let flagIndex : Integer = genClass.getFlagIndex(genFeature)]
+            [if (flagIndex > 31 and flagIndex.mod(32) = 0)]
+	/**
+	 * An additional set of bit flags representing the values of boolean attributes and whether unsettable features have been set.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+              [if (isGWT)]
+	@[genModel.getImportedName('com.google.gwt.user.client.rpc.GwtTransient')/]
+              [/if]
+	protected int [genClass.getFlagsField(genFeature)/] = 0;
+
+            [/if]
+            [if (genFeature.isEnumType())]
+	/**
+	 * The offset of the flags representing the value of the '{@link #[genFeature.getGetAccessor()/]() <em>[genFeature.getFormattedName()/]</em>}' [genFeature.getFeatureKind()/].
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int [genFeature.getUpperName()/]_EFLAG_OFFSET = [flagIndex.mod(32)/];
+
+	/**
+	 * The flags representing the default value of the '{@link #[genFeature.getGetAccessor()/]() <em>[genFeature.getFormattedName()/]</em>}' [genFeature.getFeatureKind()/].
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int [genFeature.getUpperName()/]_EFLAG_DEFAULT = [if (isJDK50) ][genFeature.getEDefault()/].ordinal()[else][genFeature.getImportedType(genClass)/].VALUES.indexOf([genFeature.getEDefault()/])[/if] << [genFeature.getUpperName()/]_EFLAG_OFFSET;
+
+	/**
+	 * The array of enumeration values for '{@link [genFeature.getImportedType(genClass)/] [genFeature.getTypeGenClassifier().getFormattedName()/]}'
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	private static final [genFeature.getImportedType(genClass)/]['[]'/] [genFeature.getUpperName()/]_EFLAG_VALUES = [if (isJDK50) ][genFeature.getImportedType(genClass)/].values()[else]([genFeature.getImportedType(genClass)/]['[]'/])[genFeature.getImportedType(genClass)/].VALUES.toArray(new [genFeature.getImportedType(genClass)/]['['/][genFeature.getImportedType(genClass)/].VALUES->size()])[/if];
+
+            [/if]
+	/**
+	 * The flag[if genClass.getFlagSize(genFeature) > 1]s[/if] representing the value of the '{@link #[genFeature.getGetAccessor()/]() <em>[genFeature.getFormattedName()/]</em>}' [genFeature.getFeatureKind()/].
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #[genFeature.getGetAccessor()/]()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int [genFeature.getUpperName()/]_EFLAG = [genClass.getFlagMask(genFeature)/] << [if (genFeature.isEnumType()) ][genFeature.getUpperName()/]_EFLAG_OFFSET[else][flagIndex.mod(32)/][/if];
+
+          [/let]
+        [else]
+	/**
+	 * The cached value of the '{@link #[genFeature.getGetAccessor()/]() <em>[genFeature.getFormattedName()/]</em>}' [genFeature.getFeatureKind()/].
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #[genFeature.getGetAccessor()/]()
+	 * @generated
+	 * @ordered
+	 */
+          [if (isGWT) ]
+	@[genModel.getImportedName('com.google.gwt.user.client.rpc.GwtTransient')/]
+          [/if]
+	protected [genFeature.getImportedType(genClass)/] [genFeature.getSafeName()/][if (genFeature.hasEDefault()) ] = [genFeature.getEDefault()/][/if];
+
+        [/if]
+      [/if]
+    [/if][/if]
+    [if (genClass.isESetField(genFeature)) ]
+      [if (genClass.isESetFlag(genFeature))]
+        [let flagIndex : Integer = genClass.getESetFlagIndex(genFeature)]
+          [if (flagIndex > 31 and flagIndex.mod(32) = 0) ]
+	/**
+	 * An additional set of bit flags representing the values of boolean attributes and whether unsettable features have been set.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+            [if (isGWT) ]
+	@[genModel.getImportedName('com.google.gwt.user.client.rpc.GwtTransient')/]
+            [/if]
+	protected int [genClass.getESetFlagsField(genFeature)/] = 0;
+
+          [/if]
+	/**
+	 * The flag representing whether the [genFeature.getFormattedName()/] [genFeature.getFeatureKind()/] has been set.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int [genFeature.getUpperName()/]_ESETFLAG = 1 << [flagIndex.mod(32) /];
+        [/let]
+      [else]
+	/**
+	 * This is true if the [genFeature.getFormattedName()/] [genFeature.getFeatureKind()/] has been set.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+        [if (isGWT) ]
+	@[genModel.getImportedName('com.google.gwt.user.client.rpc.GwtTransient')/]
+        [/if]
+	protected boolean [genFeature.getUncapName()/]ESet;
+
+      [/if]
+    [/if]
+[/template]
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genclass/genFeature.mtl b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genclass/genFeature.mtl
new file mode 100644
index 00000000000..2f3a615e867
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genclass/genFeature.mtl
@@ -0,0 +1,902 @@
+[comment]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:
+ Obeo - Initial API and implementation
+ CEA LIST - Modification to support Facade code generation[/comment]
+[comment encoding = UTF-8 /]
+[module genFeature('http://www.eclipse.org/emf/2002/GenModel', 'http://www.eclipse.org/emf/2002/Ecore','http://www.eclipse.org/uml2/4.0.0/UML')/]
+
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenClass /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenClassifier /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenFeature /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenModel /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenEnum /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenPackage /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenDataType /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenOperation /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenParameter /]
+[import org::eclipse::papyrus::facade::codegen::utils::FacadeCodegenUtils /]
+[import org::eclipse::papyrus::facade::codegen::utils::WrappingListUtils /]
+[import org::eclipse::emf::eef::codegen::ecore::model::FactoryClass/]
+
+[template public genFeature(genFeature : GenFeature, genClass : GenClass, genPackage : GenPackage, genModel : GenModel, isJDK50 : Boolean, isInterface : Boolean, isImplementation : Boolean, positiveOffsetCorrection : String, negativeOffsetCorrection : String, singleWildcard : String)]
+[if (genModel.arrayAccessors and genFeature.isListType() and not genFeature.isFeatureMapType() and not genFeature.isMapType()) ]
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+  [if (not isImplementation) ]
+	[genFeature.getListItemType(genClass)/]['[]'/] [genFeature.getGetArrayAccessor()/]();
+
+  [else]
+	public [genFeature.getListItemType(genClass)/]['[]'/] [genFeature.getGetArrayAccessor()/]() {
+    [if (genFeature.isVolatile()) ]
+		[genModel.getImportedName('org.eclipse.emf.common.util.BasicEList')/][genFeature.getListTemplateArguments(genClass)/] list = ([genModel.getImportedName('org.eclipse.emf.common.util.BasicEList')/][genFeature.getListTemplateArguments(genClass)/])[genFeature.getGetAccessor()/]();
+		if (list.isEmpty()) return [if (genModel.useGenerics() and not genFeature.getListItemType(genClass).contains('<') and genFeature.getListItemType(null) <> genFeature.getListItemType(genClass)) ]([genFeature.getListItemType(genClass)/]['[]'/])[/if][genFeature.getUpperName()/]_EEMPTY_ARRAY;
+    [else]
+		if ([genFeature.getSafeName()/] == null || [genFeature.getSafeName()/].isEmpty()) return [if (genModel.useGenerics() and not genFeature.getListItemType(genClass).contains('<') and genFeature.getListItemType(null) <> genFeature.getListItemType(genClass)) ]([genFeature.getListItemType(genClass)/]['[]'/])[/if][genFeature.getUpperName()/]_EEMPTY_ARRAY;
+		[genModel.getImportedName('org.eclipse.emf.common.util.BasicEList')/][genFeature.getListTemplateArguments(genClass)/] list = ([genModel.getImportedName('org.eclipse.emf.common.util.BasicEList')/][genFeature.getListTemplateArguments(genClass)/])[genFeature.getSafeName()/];
+    [/if]
+		list.shrink();
+		return ([genFeature.getListItemType(genClass)/]['[]'/])list.data();
+	}
+
+  [/if]
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+  [if (not isImplementation) ]
+	[genFeature.getListItemType(genClass)/] get[genFeature.getAccessorName()/](int index);
+
+  [else]
+	public [genFeature.getListItemType(genClass)/] get[genFeature.getAccessorName()/](int index) {
+		return [if (not genModel.useGenerics()) ]([genFeature.getListItemType(genClass)/])[/if][genFeature.getGetAccessor()/]().get(index);
+	}
+
+  [/if]
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+  [if (not isImplementation) ]
+	int get[genFeature.getAccessorName()/]Length();
+
+  [else]
+	public int get[genFeature.getAccessorName()/]Length() {
+    [if (genFeature.isVolatile()) ]
+		return [genFeature.getGetAccessor()/]().size();
+    [else]
+		return [genFeature.getSafeName()/] == null ? 0 : [genFeature.getSafeName()/].size();
+    [/if]
+	}
+
+  [/if]
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+  [if (not isImplementation) ]
+	void set[genFeature.getAccessorName()/]([genFeature.getListItemType(genClass)/]['[]'/] new[genFeature.getCapName()/]);
+
+  [else]
+	public void set[genFeature.getAccessorName()/]([genFeature.getListItemType(genClass)/]['[]'/] new[genFeature.getCapName()/]) {
+		(([genModel.getImportedName('org.eclipse.emf.common.util.BasicEList')/][genFeature.getListTemplateArguments(genClass)/])[genFeature.getGetAccessor()/]()).setData(new[genFeature.getCapName()/].length, new[genFeature.getCapName()/]);
+	}
+
+  [/if]
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+  [if (not isImplementation) ]
+	void set[genFeature.getAccessorName()/](int index, [genFeature.getListItemType(genClass)/] element);
+
+  [else]
+	public void set[genFeature.getAccessorName()/](int index, [genFeature.getListItemType(genClass)/] element) {
+		[genFeature.getGetAccessor()/]().set(index, element);
+	}
+
+  [/if]
+[/if]
+[if (genFeature.isGet() and (isImplementation or not genFeature.isSuppressedGetVisibility()))]
+  [if (isInterface)]
+	/**
+	 * Returns the value of the '<em><b>[genFeature.getFormattedName()/]</b></em>' [genFeature.getFeatureKind()/].
+    [if (genFeature.isListType())]
+      [if (genFeature.isMapType())]
+        [let keyFeature : GenFeature = genFeature.getMapEntryTypeGenClass().getMapEntryKeyFeature()]
+          [let valueFeature : GenFeature = genFeature.getMapEntryTypeGenClass().getMapEntryValueFeature()]
+	 * The key is of type [if (keyFeature.isListType()) ]list of {@link [keyFeature.getQualifiedListItemType(genClass)/]}[else]{@link [keyFeature.getType(genClass)/]}[/if],
+	 * and the value is of type [if (valueFeature.isListType()) ]list of {@link [valueFeature.getQualifiedListItemType(genClass)/]}[else]{@link [valueFeature.getType(genClass)/]}[/if],
+          [/let]
+        [/let]
+      [else][if (not genFeature.isWrappedFeatureMapType() and not (genModel.suppressEMFMetaData and 'org.eclipse.emf.ecore.EObject' = genFeature.getQualifiedListItemType(genClass)))]
+		[let typeName : String = genFeature.getQualifiedListItemType(genClass)]
+          [let index : Integer = if typeName.index('<') < 0 then typeName.index('[') else typeName.index('<') endif]
+            [let head : String = if index < 0 then typeName else typeName.substring(1, index - 1) endif]
+              [let tail : String = if index < 0 then '' else typeName.substring(index).replaceAll('<', '&lt;') endif]
+	 * The list contents are of type {@link [head/]}[tail/].
+	          [/let]
+	        [/let]
+	      [/let]
+        [/let]
+      [/if][/if]
+    [else][if (genFeature.isSetDefaultValue()) ]
+	 * The default value is <code>[genFeature.getDefaultValue()/]</code>.
+    [/if][/if]
+    [if (genFeature.getTypeGenEnum() <> null) ]
+	 * The literals are from the enumeration {@link [genFeature.getTypeGenEnum().getQualifiedName()/]}.
+    [/if]
+    [if (genFeature.isBidirectional() and not genFeature.getReverse().genClass.isMapEntry())]
+      [let reverseGenFeature : GenFeature = genFeature.getReverse()]
+        [if (not reverseGenFeature.isSuppressedGetVisibility()) ]
+	 * It is bidirectional and its opposite is '{@link [reverseGenFeature.genClass.getQualifiedInterfaceName()/]#[reverseGenFeature.getGetAccessor()/] <em>[reverseGenFeature.getFormattedName()/]</em>}'.
+        [/if]
+      [/let]
+    [/if]
+	 * <!-- begin-user-doc -->
+    [if (not genFeature.hasDocumentation()) ]
+	 * <p>
+	 * If the meaning of the '<em>[genFeature.getFormattedName()/]</em>' [genFeature.getFeatureKind()/] isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+    [/if]
+	 * <!-- end-user-doc -->
+    [if (genFeature.hasDocumentation()) ]
+	 * <!-- begin-model-doc -->
+	 * [genFeature.getDocumentation(genModel.getIndentation())/]
+	 * <!-- end-model-doc -->
+    [/if]
+	 * @return the value of the '<em>[genFeature.getFormattedName()/]</em>' [genFeature.getFeatureKind()/].
+    [if (genFeature.getTypeGenEnum() <> null) ]
+	 * @see [genFeature.getTypeGenEnum().getQualifiedName()/]
+    [/if]
+    [if (genFeature.isUnsettable()) ]
+      [if (not genFeature.isSuppressedIsSetVisibility()) ]
+	 * @see #isSet[genFeature.getAccessorName()/]()
+      [/if]
+      [if (genFeature.isChangeable() and not genFeature.isSuppressedUnsetVisibility()) ]
+	 * @see #unset[genFeature.getAccessorName()/]()
+      [/if]
+    [/if]
+    [if (genFeature.isChangeable() and not genFeature.isListType() and not genFeature.isSuppressedSetVisibility()) ]
+	 * @see #set[genFeature.getAccessorName()/]([genFeature.getRawImportedBoundType()/])
+    [/if]
+    [if (not genModel.suppressEMFMetaData) ]
+	 * @see [genPackage.getQualifiedPackageInterfaceName()/]#get[genFeature.getFeatureAccessorName()/]()
+    [/if]
+    [if (genFeature.isBidirectional() and not genFeature.getReverse().genClass.isMapEntry())]
+      [let reverseGenFeature : GenFeature = genFeature.getReverse()]
+        [if (not reverseGenFeature.isSuppressedGetVisibility()) ]
+	 * @see [reverseGenFeature.genClass.getQualifiedInterfaceName()/]#[reverseGenFeature.getGetAccessor()/]
+        [/if]
+      [/let]
+    [/if]
+    [if (not genModel.suppressEMFModelTags)]
+      [let modelInfoLines : Sequence(String) = genFeature.getModelInfo().tokenize(genModel.getLineDelimiter())]
+        [if (modelInfoLines->isEmpty())]
+	 * @model
+        [else]
+	 * @model [modelInfoLines->sep(genModel.getLineDelimiter() + '\t *        ')/]
+        [/if]
+      [/let]
+    [/if]
+	 * @generated
+	 */
+  [else][comment isInterface/]
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+    [if (isJDK50)][comment] { //Class/getGenFeature.annotations.insert.javajetinc[/comment]
+    [/if]
+  [/if][comment isInterface/]
+  [if (not isImplementation) ]
+	[genFeature.getImportedType(genClass)/] [genFeature.getGetAccessor()/]();
+
+  [else]
+    [if (genModel.useGenerics() and ((genFeature.isContainer() or genFeature.isResolveProxies()) and not genFeature.isListType() and not (genModel.reflectiveDelegation and genModel.isDynamicDelegation()) and genFeature.isUncheckedCast(genClass) or genFeature.isListType() and not genFeature.isFeatureMapType() and (genModel.reflectiveDelegation or genModel.isVirtualDelegation() or genModel.isDynamicDelegation()) or genFeature.isListDataType() and genFeature.hasDelegateFeature() or genFeature.isListType() and genFeature.hasSettingDelegate())) ]
+	@SuppressWarnings("unchecked")
+    [/if]
+	public [genFeature.getImportedType(genClass)/] [genFeature.getGetAccessor()/][if (genClass.hasCollidingGetAccessorOperation(genFeature)) ]_[/if]() {
+		[genGetContent(genFeature,genModel,genPackage,isImplementation)/]
+		
+	}
+
+  [/if]
+[/if]
+[if (isImplementation and not genModel.reflectiveDelegation and genFeature.isBasicGet()) ]
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+  [if (isJDK50)][comment] { //Class/basicGetGenFeature.annotations.insert.javajetinc[/comment]
+  [/if]
+	public [genFeature.getImportedType(genClass)/] basicGet[genFeature.getAccessorName()/]() {
+		[genGetContent(genFeature,genModel,genPackage,isImplementation)/]
+	}
+
+[/if]
+[if (isImplementation and not genModel.reflectiveDelegation and genFeature.isBasicSet()) ]
+
+	[genBasicSetContent(genFeature, genModel, genPackage, isImplementation, isJDK50, negativeOffsetCorrection, positiveOffsetCorrection)/]
+
+[/if]
+[if (genFeature.isSet() and (isImplementation or not genFeature.isSuppressedSetVisibility())) ]
+  [if (isInterface) ]
+	/**
+	 * Sets the value of the '{@link [genClass.getQualifiedInterfaceName()/]#[genFeature.getGetAccessor()/] <em>[genFeature.getFormattedName()/]</em>}' [genFeature.getFeatureKind()/].
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>[genFeature.getFormattedName()/]</em>' [genFeature.getFeatureKind()/].
+    [if (genFeature.isEnumType()) ]
+	 * @see [genFeature.getTypeGenEnum().getQualifiedName()/]
+    [/if]
+    [if (genFeature.isUnsettable()) ]
+      [if (not genFeature.isSuppressedIsSetVisibility()) ]
+	 * @see #isSet[genFeature.getAccessorName()/]()
+      [/if]
+      [if (not genFeature.isSuppressedUnsetVisibility()) ]
+	 * @see #unset[genFeature.getAccessorName()/]()
+      [/if]
+    [/if]
+	 * @see #[genFeature.getGetAccessor()/]()
+	 * @generated
+	 */
+  [else][comment isInterface /]
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+    [if (isJDK50)][comment] { //Class/setGenFeature.annotations.insert.javajetinc[/comment]
+    [/if]
+  [/if][comment isInterface /]
+  [if (not isImplementation)]
+	void set[genFeature.getAccessorName()/]([genFeature.getImportedType(genClass)/] value);
+
+  [else][comment not isImplementation /]
+    [comment Using query instead of variable because let does not support null !!!
+        let setAccessorOperation : GenOperation = genClass.getSetAccessorOperation(genFeature)/]
+	
+	[genSetContent(genFeature, genModel, genPackage , isImplementation, isJDK50,negativeOffsetCorrection,positiveOffsetCorrection)/]
+
+  [/if][comment not isImplementation /]
+[/if]
+[if (isImplementation and not genModel.reflectiveDelegation and genFeature.isBasicUnset()) ]
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+  [if (isJDK50)][comment] { //Class/basicUnsetGenFeature.annotations.insert.javajetinc[/comment]
+  [/if]
+	public [genModel.getImportedName('org.eclipse.emf.common.notify.NotificationChain')/] basicUnset[genFeature.getAccessorName()/]([genModel.getImportedName('org.eclipse.emf.common.notify.NotificationChain')/] msgs) {
+  [if (genModel.isDynamicDelegation()) ]
+		return eDynamicInverseRemove(([genModel.getImportedName('org.eclipse.emf.ecore.InternalEObject')/])[if (genFeature.isResolveProxies()) ]basicGet[genFeature.getAccessorName()/][else][genFeature.getGetAccessor()/][/if](), [genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/], msgs);
+  [else][if (not genFeature.isVolatile()) ]
+    [if (genModel.isVirtualDelegation()) ]
+      [if (not genModel.suppressNotification) ]Object old[genFeature.getCapName()/] = [/if]eVirtualUnset([genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/]);
+    [else]
+      [if (not genModel.suppressNotification) ]
+		[genFeature.getImportedType(genClass)/] old[genFeature.getCapName()/] = [genFeature.getSafeName()/];
+      [/if]
+		[genFeature.getSafeName()/] = null;
+    [/if]
+    [if (genModel.isVirtualDelegation()) ]
+      [if (not genModel.suppressNotification) ]
+		boolean isSetChange = old[genFeature.getCapName()/] != EVIRTUAL_NO_VALUE;
+      [/if]
+    [else][if (genClass.isESetFlag(genFeature)) ]
+      [if (not genModel.suppressNotification) ]
+		boolean old[genFeature.getCapName()/]ESet = ([genClass.getESetFlagsField(genFeature)/] & [genFeature.getUpperName()/]_ESETFLAG) != 0;
+      [/if]
+		[genClass.getESetFlagsField(genFeature)/] &= ~[genFeature.getUpperName()/]_ESETFLAG;
+    [else]
+      [if (not genModel.suppressNotification) ]
+		boolean old[genFeature.getCapName()/]ESet = [genFeature.getUncapName()/]ESet;
+      [/if]
+		[genFeature.getUncapName()/]ESet = false;
+    [/if][/if]
+    [if (not genModel.suppressNotification) ]
+		if (eNotificationRequired()) {
+			[genModel.getImportedName('org.eclipse.emf.ecore.impl.ENotificationImpl')/] notification = new [genModel.getImportedName('org.eclipse.emf.ecore.impl.ENotificationImpl')/](this, [genModel.getImportedName('org.eclipse.emf.common.notify.Notification')/].UNSET, [genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/], [if (genModel.isVirtualDelegation()) ]isSetChange ? old[genFeature.getCapName()/] : null[else]old[genFeature.getCapName()/][/if], null, [if (genModel.isVirtualDelegation()) ]isSetChange[else]old[genFeature.getCapName()/]ESet[/if]);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+    [/if]
+  [else]
+		// TODO: implement this method to unset the contained '[genFeature.getFormattedName()/]' [genFeature.getFeatureKind()/]
+		// -> this method is automatically invoked to keep the containment relationship in synch
+		// -> do not modify other features
+		// -> return msgs, after adding any generated Notification to it (if it is null, a NotificationChain object must be created first)
+		// Ensure that you remove @generated or mark it @generated NOT
+		throw new UnsupportedOperationException();
+  [/if][/if]
+	}
+
+[/if]
+[if (genFeature.isUnset() and (isImplementation or not genFeature.isSuppressedUnsetVisibility())) ]
+  [if (isInterface) ]
+	/**
+	 * Unsets the value of the '{@link [genClass.getQualifiedInterfaceName()/]#[genFeature.getGetAccessor()/] <em>[genFeature.getFormattedName()/]</em>}' [genFeature.getFeatureKind()/].
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+    [if (not genFeature.isSuppressedIsSetVisibility()) ]
+	 * @see #isSet[genFeature.getAccessorName()/]()
+    [/if]
+	 * @see #[genFeature.getGetAccessor()/]()
+    [if (not genFeature.isListType() and not genFeature.isSuppressedSetVisibility()) ]
+	 * @see #set[genFeature.getAccessorName()/]([genFeature.getRawImportedBoundType()/])
+    [/if]
+	 * @generated
+	 */
+  [else][comment isInterface/]
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+    [if (isJDK50)][comment] { //Class/unsetGenFeature.annotations.insert.javajetinc[/comment]
+    [/if]
+  [/if][comment isInterface/]
+  [if (not isImplementation) ]
+	void unset[genFeature.getAccessorName()/]();
+
+  [else][comment not isImplementation/]
+	[genUnsetContent(genFeature,genModel,genPackage,isJDK50,negativeOffsetCorrection,positiveOffsetCorrection, singleWildcard)/]
+  [/if][comment not isImplementation/]
+[/if]
+[if (genFeature.isIsSet() and (isImplementation or not genFeature.isSuppressedIsSetVisibility())) ]
+  [if (isInterface) ]
+	/**
+	 * Returns whether the value of the '{@link [genClass.getQualifiedInterfaceName()/]#[genFeature.getGetAccessor()/] <em>[genFeature.getFormattedName()/]</em>}' [genFeature.getFeatureKind()/] is set.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return whether the value of the '<em>[genFeature.getFormattedName()/]</em>' [genFeature.getFeatureKind()/] is set.
+    [if (genFeature.isChangeable() and not genFeature.isSuppressedUnsetVisibility()) ]
+	 * @see #unset[genFeature.getAccessorName()/]()
+    [/if]
+	 * @see #[genFeature.getGetAccessor()/]()
+    [if (not genFeature.isListType() and genFeature.isChangeable() and not genFeature.isSuppressedSetVisibility()) ]
+	 * @see #set[genFeature.getAccessorName()/]([genFeature.getRawImportedBoundType()/])
+    [/if]
+	 * @generated
+	 */
+  [else][comment isInterface/]
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+    [comment][if (isJDK50)][comment] { //Class/isSetGenFeature.annotations.insert.javajetinc[/comment]
+    [/if][/comment]
+  [/if][comment isInterface/]
+  [if (not isImplementation) ]
+	boolean isSet[genFeature.getAccessorName()/]();
+
+  [else][comment not isImplementation/]
+	[genIsSetContent(genFeature , genModel, genPackage ,isJDK50,negativeOffsetCorrection,positiveOffsetCorrection, singleWildcard )/]
+
+  [/if][comment not isImplementation/]
+[/if]
+[/template]
+
+[template public genGetContentPrimitiveType(genFeature : GenFeature, genModel: GenModel, genPackage : GenPackage)]
+	[if (genFeature.isStereotypeProperty())]
+		[genModel.getImportedName('org.eclipse.uml2.uml.Stereotype')/] stereotype = (([genModel.getImportedName('org.eclipse.uml2.uml.Element')/])__representedElement).getAppliedStereotype("[genFeature.getStereotypeQualifiedName()/]");
+	
+		if(stereotype != null) {
+			Object umlElement = (([genModel.getImportedName('org.eclipse.uml2.uml.Element')/])__representedElement).getValue(stereotype, "[genFeature.getSafeName()/]");
+	
+				[if (genFeature.isDerived())]
+					[genFeature.getSafeName()/] = ([genFeature.getImportedType(genClass)/])umlElement;
+					return [genFeature.getSafeName()/];
+				[else]
+					return ([genFeature.getImportedType(genClass)/])umlElement;
+				[/if]
+		}
+	
+		throw new UnsupportedOperationException();
+	[else]
+		[if (genFeature.isField())]
+			[genFeature.getSafeName()/] =  (([genModel.getImportedName(genFeature.genClass.ecoreClass.findUMLMetaElement(genModel).getPackagePathFromUML()+'.'+genClass.ecoreClass.getUMLMetaElement(genModel))/])get__Represented()).[genFeature.ecoreFeature.findUMLGetAccessor(genModel)/]();
+			return [genFeature.getSafeName()/];
+		[else]
+			return  (([genModel.getImportedName(genFeature.genClass.ecoreClass.findUMLMetaElement(genModel).getPackagePathFromUML()+'.'+genClass.ecoreClass.getUMLMetaElement(genModel))/])get__Represented()).[genFeature.ecoreFeature.findUMLGetAccessor(genModel)/]();
+		[/if]
+	[/if]
+[/template]
+
+[template public genGetContent(genFeature : GenFeature, genModel: GenModel, genPackage : GenPackage, isImplementation:Boolean)]
+	[if (genFeature.isListType())]
+		[if (genFeature.isPrimtiveList())]
+			 [genFeature.genGetContentPrimitiveType(genModel, genPackage)/]
+		[else]
+			[genModel.getImportedName('org.eclipse.emf.common.util.EList')/]<[genModel.getImportedName(genFeature.getTypeGenClass().ecoreClass.findUMLMetaElement(genModel).getPackagePathFromUML()+'.'+genFeature.getTypeGenClass().ecoreClass.getUMLMetaElement(genModel))/]> umlList = (([genModel.getImportedName(genClass.ecoreClass.findUMLMetaElement(genModel).getPackagePathFromUML()+'.'+genClass.ecoreClass.getUMLMetaElement(genModel))/])get__Represented()).[genFeature.ecoreFeature.findUMLGetAccessor(genModel)/]();
+			[genFeature.getImportedType(genClass)/] update = new [genModel.getImportedName('org.eclipse.emf.common.util.BasicEList')/]<[genFeature.getTypeGenClass().getQualifiedInterfaceName()/]>();
+			[if (genFeature.isField())]
+				if([genFeature.getSafeName()/] == null) {
+					[comment][genFeature.getSafeName()/] = new [genClass.getListConstructor(genFeature)/];[/comment]
+					[genFeature.getSafeName()/] = new [genClass.getWrappingListConstructor(genFeature,genFeature.getTypeGenClass().getQualifiedInterfaceName())/];
+				}
+			[else]
+				[genFeature.getImportedType(genClass)/] [genFeature.getSafeName()/] = new [genClass.getWrappingListConstructor(genFeature,genFeature.getTypeGenClass().getQualifiedInterfaceName())/];[comment]org.eclipse.papyrus.facade.utils.wrappinglist.WrappingBasicEList(umlList);[/comment]
+			[/if]
+	
+			for([genModel.getImportedName(genFeature.getTypeGenClass().ecoreClass.findUMLMetaElement(genModel).getPackagePathFromUML()+'.'+genFeature.getTypeGenClass().ecoreClass.getUMLMetaElement(genModel))/] umlElement : umlList) {
+	
+				[genModel.getImportedName('org.eclipse.emf.ecore.EObject')/] representingElement = [genModel.getImportedName(genPackage.getUtilitiesPackageName()+'.Wrapper')/].getInstance().findOrCreateSpecific(([genModel.getImportedName('org.eclipse.emf.ecore.EObject')/])umlElement);
+				if(representingElement != null) {
+					if(representingElement instanceof [genFeature.getTypeGenClass().getQualifiedInterfaceName()/]) {
+						update.add(([genFeature.getTypeGenClass().getQualifiedInterfaceName()/])representingElement);
+					} 	
+				}			
+			}
+	
+			[genModel.getImportedName(genPackage.getUtilitiesPackageName()+'.Wrapper')/].getInstance().updateCache(update, [genFeature.getSafeName()/]);
+			return [genFeature.getSafeName()/];
+		[/if]
+
+	[else]
+		[if (genFeature.isPrimitiveType() or genFeature.isStringType())]
+ 			[genFeature.genGetContentPrimitiveType(genModel, genPackage)/]
+		[else]
+			[if (genFeature.isStereotypeProperty())]
+				[genModel.getImportedName('org.eclipse.uml2.uml.Stereotype')/] stereotype = (([genModel.getImportedName('org.eclipse.uml2.uml.Element')/])__representedElement).getAppliedStereotype("[genFeature.getStereotypeQualifiedName()/]");
+
+				if(stereotype != null) {
+					Object umlElement = (([genModel.getImportedName('org.eclipse.uml2.uml.Element')/])__representedElement).getValue(stereotype, "[genFeature.getSafeName()/]");
+			[else]
+				[if (genFeature.isExtentionStereotypeProperty())]
+					[genModel.getImportedName(genFeature.getTypeGenClassifier().getEcoreClassifier().findUMLMetaElement(genModel).getPackagePathFromUML()+'.'+genFeature.getTypeGenClassifier().getEcoreClassifier().getUMLMetaElement(genModel))/] umlElement = [genModel.getImportedName('org.eclipse.uml2.uml.util.UMLUtil')/].getStereotypeApplication(([genModel.getImportedName('org.eclipse.uml2.uml.Element')/])get__Represented(), [genModel.getImportedName(genFeature.getTypeGenClassifier().getEcoreClassifier().findUMLMetaElement(genModel).getPackagePathFromUML()+'.'+genFeature.getTypeGenClassifier().getEcoreClassifier().getUMLMetaElement(genModel))/].class);
+				[else]
+					[genModel.getImportedName(genFeature.getTypeGenClassifier().getEcoreClassifier().findUMLMetaElement(genModel).getPackagePathFromUML()+'.'+genFeature.getTypeGenClassifier().getEcoreClassifier().getUMLMetaElement(genModel))/] umlElement = (([genModel.getImportedName(genClass.ecoreClass.findUMLMetaElement(genModel).getPackagePathFromUML()+'.'+genClass.ecoreClass.getUMLMetaElement(genModel))/])get__Represented()).[genFeature.ecoreFeature.findUMLGetAccessor(genModel)/]();
+				[/if]
+				
+			[/if]
+
+			if(umlElement [if (genFeature.isEnumType())] !=null [else] instanceof [genModel.getImportedName('org.eclipse.emf.ecore.EObject')/] [/if]) {
+			
+
+				[if (genFeature.isEnumType())]
+					Enum representingElement = [genModel.getImportedName(genPackage.getUtilitiesPackageName()+'.Wrapper')/].getInstance().getEnumMappingFromUML((Enum)umlElement);
+				[else]
+					[genModel.getImportedName('org.eclipse.emf.ecore.EObject')/] representingElement =  [genModel.getImportedName(genPackage.getUtilitiesPackageName()+'.Wrapper')/].getInstance().findOrCreateSpecific(([genModel.getImportedName('org.eclipse.emf.ecore.EObject')/])umlElement);
+				[/if]
+				
+				if(representingElement != null) {
+					if(representingElement instanceof [genFeature.getTypeGenClassifier().getAppropriateQualifiedTypeName()/]) {
+						[if (not genClass.isField(genFeature)) ]
+							return ([genFeature.getTypeGenClassifier().getAppropriateQualifiedTypeName()/])representingElement;
+						[else]
+							[genFeature.getSafeName()/] = ([genFeature.getTypeGenClassifier().getAppropriateQualifiedTypeName()/])representingElement;
+
+							return [genFeature.getSafeName()/];
+						[/if]
+					}
+				}
+			} 
+			[if (genFeature.isStereotypeProperty())]
+				}
+			[/if]
+			
+			return null;
+		[/if]
+	[/if]
+[/template]
+
+[template public genSetContent(genFeature : GenFeature, genModel: GenModel, genPackage : GenPackage, isImplementation:Boolean, isJDK50:Boolean,negativeOffsetCorrection:String,positiveOffsetCorrection:String)]
+	public void set[genFeature.getAccessorName()/][if (genClass.hasCollidingSetAccessorOperation(genFeature)) ]_[/if]([genFeature.getImportedType(genClass)/] [if (genClass.getSetAccessorOperation(genFeature) = null)]new[genFeature.getCapName()/][else][genClass.getSetAccessorOperation(genFeature).genParameters->at(1).getName()/][/if]) {
+	[if (not genFeature.isVolatile()) ]
+      [if (genFeature.isContainer())]
+        [let reverseFeature : GenFeature = genFeature.getReverse()]
+          [let targetClass : GenClass = reverseFeature.genClass]
+            [let reverseOffsetCorrection : String = if (targetClass.hasOffsetCorrection()) then ' + ' + genClass.getOffsetCorrectionField(genFeature) else '' endif]
+		if (new[genFeature.getCapName()/] != eInternalContainer() || (eContainerFeatureID() != [genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/] && new[genFeature.getCapName()/] != null)) {
+			if ([genModel.getImportedName('org.eclipse.emf.ecore.util.EcoreUtil')/].isAncestor(this, [genFeature.getEObjectCast()/]new[genFeature.getCapName()/]))
+				throw new [genModel.getImportedName('java.lang.IllegalArgumentException')/]("Recursive containment not allowed for " + toString());[genModel.getNonNLS()/]
+			if (eInternalContainer() != null)
+				eBasicRemoveFromContainer(null);
+			if (new[genFeature.getCapName()/] != null)
+				(([genModel.getImportedName('org.eclipse.emf.ecore.InternalEObject')/])new[genFeature.getCapName()/]).eInverseAdd(this, [targetClass.getQualifiedFeatureID(reverseFeature)/][reverseOffsetCorrection/], [targetClass.getRawImportedInterfaceName()/].class, null);
+			basicSet[genFeature.getAccessorName()/]([genFeature.getInternalTypeCast()/]new[genFeature.getCapName()/], null);
+			
+		}
+            [/let]
+          [/let]
+        [/let]
+      [else][if (genFeature.isBidirectional() or genFeature.isEffectiveContains()) ]
+        [if (genModel.isVirtualDelegation()) ]
+		[genFeature.getImportedType(genClass)/] [genFeature.getSafeName()/] = ([genFeature.getImportedType(genClass)/])eVirtualGet([genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/]);
+        [/if]
+		if (new[genFeature.getCapName()/] != [genFeature.getSafeName()/]) {
+			if ([genFeature.getSafeName()/] != null)
+        [if (not genFeature.isBidirectional()) ]
+				(([genModel.getImportedName('org.eclipse.emf.ecore.InternalEObject')/])[genFeature.getSafeName()/]).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - [genClass.getQualifiedFeatureID(genFeature)/][negativeOffsetCorrection/], null, null);
+			if (new[genFeature.getCapName()/] != null)
+				(([genModel.getImportedName('org.eclipse.emf.ecore.InternalEObject')/])new[genFeature.getCapName()/]).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - [genClass.getQualifiedFeatureID(genFeature)/][negativeOffsetCorrection/], null, null);
+        [else]
+          [let reverseFeature : GenFeature = genFeature.getReverse()]
+            [let targetClass : GenClass = reverseFeature.genClass]
+              [let reverseOffsetCorrection : String = if (targetClass.hasOffsetCorrection()) then ' + ' + genClass.getOffsetCorrectionField(genFeature) else '' endif]
+				(([genModel.getImportedName('org.eclipse.emf.ecore.InternalEObject')/])[genFeature.getSafeName()/]).eInverseRemove(this, [targetClass.getQualifiedFeatureID(reverseFeature)/][reverseOffsetCorrection/], [targetClass.getRawImportedInterfaceName()/].class, null);
+			if (new[genFeature.getCapName()/] != null)
+				(([genModel.getImportedName('org.eclipse.emf.ecore.InternalEObject')/])new[genFeature.getCapName()/]).eInverseAdd(this, [targetClass.getQualifiedFeatureID(reverseFeature)/][reverseOffsetCorrection/], [targetClass.getRawImportedInterfaceName()/].class, null);
+              [/let]
+            [/let]
+          [/let]
+        [/if]
+			basicSet[genFeature.getAccessorName()/]([genFeature.getInternalTypeCast()/]new[genFeature.getCapName()/], null);
+		}[if (genFeature.isUnsettable())] else {
+          [if (genModel.isVirtualDelegation()) ]
+			boolean old[genFeature.getCapName()/]ESet = eVirtualIsSet([genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/]);
+          [else][if (genClass.isESetFlag(genFeature)) ]
+            [if (not genModel.suppressNotification) ]
+			boolean old[genFeature.getCapName()/]ESet = ([genClass.getESetFlagsField(genFeature)/] & [genFeature.getUpperName()/]_ESETFLAG) != 0;
+            [/if]
+			[genClass.getESetFlagsField(genFeature)/] |= [genFeature.getUpperName()/]_ESETFLAG;
+          [else]
+            [if (not genModel.suppressNotification) ]
+			boolean old[genFeature.getCapName()/]ESet = [genFeature.getUncapName()/]ESet;
+            [/if]
+			[genFeature.getUncapName()/]ESet = true;
+          [/if][/if]
+          [if (not genModel.suppressNotification) ]
+			if (eNotificationRequired())
+				eNotify(new [genModel.getImportedName('org.eclipse.emf.ecore.impl.ENotificationImpl')/](this, [genModel.getImportedName('org.eclipse.emf.common.notify.Notification')/].SET, [genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/], new[genFeature.getCapName()/], new[genFeature.getCapName()/], not old[genFeature.getCapName()/]ESet));
+          [/if]
+		}
+
+        [/if]
+      [else]
+
+
+
+		[if (genFeature.isAPrimitiveType() or genFeature.isStringType() ) ]
+			[if (genFeature.isStereotypeProperty())]
+				[stereotypeSetContent(genModel,genFeature)/]
+			[else]
+				(([genModel.getImportedName(genClass.ecoreClass.findUMLMetaElement(genModel).getPackagePathFromUML()+'.'+genClass.ecoreClass.getUMLMetaElement(genModel))/])get__Represented()).set[genFeature.ecoreFeature.findUMLAccessorName(genModel)/](new[genFeature.getCapName()/]);
+			[/if]
+		[else]
+			[if (genFeature.isEnumType())]
+				[if (genFeature.isStereotypeProperty())]
+					[stereotypeSetContent(genModel,genFeature)/]
+				[else]	
+					(([genModel.getImportedName(genClass.ecoreClass.findUMLMetaElement(genModel).getPackagePathFromUML()+'.'+genClass.ecoreClass.getUMLMetaElement(genModel))/])get__Represented()).set[genFeature.ecoreFeature.findUMLAccessorName(genModel)/](([genModel.getImportedName(genFeature.getTypeGenClassifier().getEcoreClassifier().findUMLMetaElement(genModel).getPackagePathFromUML()+'.'+genFeature.getTypeGenClassifier().getEcoreClassifier().getUMLMetaElement(genModel))/])[genModel.getImportedName(genPackage.getUtilitiesPackageName()+'.Wrapper')/].getInstance().getEnumMappingFromSpecific(new[genFeature.getCapName()/]));
+				[/if]
+			[else]
+				[if (genFeature.isStereotypeProperty())]
+					[stereotypeSetContent(genModel,genFeature)/]
+				[else]	
+					(([genModel.getImportedName(genClass.ecoreClass.findUMLMetaElement(genModel).getPackagePathFromUML()+'.'+genClass.ecoreClass.getUMLMetaElement(genModel))/])get__Represented()).set[genFeature.ecoreFeature.findUMLAccessorName(genModel)/](([genModel.getImportedName(genFeature.getTypeGenClassifier().getEcoreClassifier().findUMLMetaElement(genModel).getPackagePathFromUML()+'.'+genFeature.getTypeGenClassifier().getEcoreClassifier().getUMLMetaElement(genModel))/])new[genFeature.getCapName()/].get__Represented());
+				[/if]
+			[/if]
+		[/if]
+      [/if][/if]
+    [else]
+		throw new UnsupportedOperationException();
+	[/if]
+	}
+[/template]
+
+[template public stereotypeSetContent(genModel:GenModel,genFeature:GenFeature)]
+	[genModel.getImportedName('org.eclipse.uml2.uml.Stereotype')/] stereotype = (([genModel.getImportedName('org.eclipse.uml2.uml.Element')/])get__Represented()).getAppliedStereotype("[genFeature.getStereotypeQualifiedName()/]");
+			
+	if(stereotype != null) {
+		(([genModel.getImportedName('org.eclipse.uml2.uml.Element')/])get__Represented()).setValue(stereotype, "[genFeature.ecoreFeature.name/]", new[genFeature.getCapName()/]);
+	}
+[/template]
+
+[template public genBasicSetContent(genFeature : GenFeature, genModel: GenModel, genPackage : GenPackage, isImplementation:Boolean, isJDK50:Boolean,negativeOffsetCorrection:String,positiveOffsetCorrection:String)]
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+  [if (isJDK50)][comment] { //Class/basicSetGenFeature.annotations.insert.javajetinc[/comment]
+  [/if]
+	public [genModel.getImportedName('org.eclipse.emf.common.notify.NotificationChain')/] basicSet[genFeature.getAccessorName()/]([genFeature.getImportedInternalType(genClass)/] new[genFeature.getCapName()/], [genModel.getImportedName('org.eclipse.emf.common.notify.NotificationChain')/] msgs) {
+  [if (genFeature.isContainer()) ]
+		msgs = eBasicSetContainer(([genModel.getImportedName('org.eclipse.emf.ecore.InternalEObject')/])new[genFeature.getCapName()/], [genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/], msgs);
+		return msgs;
+  [else][if (genModel.isDynamicDelegation()) ]
+		msgs = eDynamicInverseAdd(([genModel.getImportedName('org.eclipse.emf.ecore.InternalEObject')/])new[genFeature.getCapName()/], [genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/], msgs);
+		return msgs;
+  [else][if (not genFeature.isVolatile()) ]
+    [if (genModel.isVirtualDelegation()) ]
+		Object old[genFeature.getCapName()/] = eVirtualSet([genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/], new[genFeature.getCapName()/]);
+    [else]
+		[genFeature.getImportedType(genClass)/] old[genFeature.getCapName()/] = [genFeature.getSafeName()/];
+		[genFeature.getSafeName()/] = new[genFeature.getCapName()/];
+    [/if]
+    [if (genFeature.isUnsettable()) ]
+      [if (genModel.isVirtualDelegation()) ]
+        [if (not genModel.suppressNotification) ]
+		boolean isSetChange = old[genFeature.getCapName()/] == EVIRTUAL_NO_VALUE;
+        [/if]
+      [else][if (genClass.isESetFlag(genFeature)) ]
+		boolean old[genFeature.getCapName()/]ESet = ([genClass.getESetFlagsField(genFeature)/] & [genFeature.getUpperName()/]_ESETFLAG) != 0;
+        [if (not genModel.suppressNotification) ]
+		[genClass.getESetFlagsField(genFeature)/] |= [genFeature.getUpperName()/]_ESETFLAG;
+        [/if]
+      [else]
+        [if (not genModel.suppressNotification) ]
+		boolean old[genFeature.getCapName()/]ESet = [genFeature.getUncapName()/]ESet;
+        [/if]
+		[genFeature.getUncapName()/]ESet = true;
+      [/if][/if]
+    [/if]
+
+	[if (genFeature.isStereotypeProperty())]
+		[genModel.getImportedName('org.eclipse.uml2.uml.Stereotype')/] stereotype = (([genModel.getImportedName('org.eclipse.uml2.uml.Element')/])get__Represented()).getAppliedStereotype("[genFeature.getStereotypeQualifiedName()/]");
+
+		if(stereotype != null) {
+			if(new[genFeature.getCapName()/] == null) {
+				(([genModel.getImportedName('org.eclipse.uml2.uml.Element')/])get__Represented()).setValue(stereotype, "[genFeature.ecoreFeature.name/]", null);
+			} else {
+				(([genModel.getImportedName('org.eclipse.uml2.uml.Element')/])get__Represented()).setValue(stereotype, "[genFeature.ecoreFeature.name/]", new[genFeature.getCapName()/].get__Represented());
+			}
+		}
+	[else]
+		[if (genFeature.isExtentionStereotypeProperty())]
+			if(new[genFeature.getCapName()/] == null) {
+				String['[]'/] stereotypesQualifiedNames = { [genFeature.getTypeGenClassifier().getEcoreClassifier().getAllStereotypeQualifiedNames(genModel)/] };
+	
+				for([genModel.getImportedName('java.lang.String')/] stereoQualifiedName : stereotypesQualifiedNames) {
+				if((([genModel.getImportedName('org.eclipse.uml2.uml.Element')/])__representedElement).getAppliedStereotype(stereoQualifiedName) != null) {
+						[genModel.getImportedName('org.eclipse.uml2.uml.Stereotype')/] stereotype = (([genModel.getImportedName('org.eclipse.uml2.uml.Element')/])__representedElement).getApplicableStereotype(stereoQualifiedName);
+						if(stereotype != null) {
+							(([genModel.getImportedName('org.eclipse.uml2.uml.Element')/])__representedElement).unapplyStereotype(stereotype);
+						} else {
+							System.err.println("Problem: cannot unapply stereotype " + stereoQualifiedName);
+						}
+					}
+				}
+				[genModel.getImportedName('org.eclipse.emf.common.notify.Notification')/] notification = new [genModel.getImportedName('org.eclipse.emf.ecore.impl.ENotificationImpl')/](this, [genModel.getImportedName('org.eclipse.emf.common.notify.Notification')/].REMOVE, [genModel.getImportedName(genPackage.getImportedPackageInterfaceName())/].eINSTANCE.get[genFeature.getFeatureAccessorName()/](), old[genFeature.getCapName()/], new[genFeature.getCapName()/], -1, old[genFeature.getCapName()/] != null);
+				this.eNotify(notification);
+			} else {
+				String['[]'/] stereotypesQualifiedNames = { [genFeature.getTypeGenClassifier().getEcoreClassifier().getAllStereotypeQualifiedNames(genModel)/] };
+	
+				for([genModel.getImportedName('java.lang.String')/] stereoQualifiedName : stereotypesQualifiedNames) {
+					if((([genModel.getImportedName('org.eclipse.uml2.uml.Element')/])__representedElement).getAppliedStereotype(stereoQualifiedName) == null) {
+						[genModel.getImportedName('org.eclipse.uml2.uml.Stereotype')/] stereotype = (([genModel.getImportedName('org.eclipse.uml2.uml.Element')/])__representedElement).getApplicableStereotype(stereoQualifiedName);
+						if(stereotype != null) {
+							(([genModel.getImportedName('org.eclipse.uml2.uml.Element')/])__representedElement).applyStereotype(stereotype);
+						} else {
+							System.err.println("Problem: cannot apply stereotype " + stereoQualifiedName);
+						}
+					}
+				}
+				[genModel.getImportedName('org.eclipse.emf.common.notify.Notification')/] notification = new [genModel.getImportedName('org.eclipse.emf.ecore.impl.ENotificationImpl')/](this, [genModel.getImportedName('org.eclipse.emf.common.notify.Notification')/].ADD, [genModel.getImportedName(genPackage.getImportedPackageInterfaceName())/].eINSTANCE.get[genFeature.getFeatureAccessorName()/](), old[genFeature.getCapName()/], new[genFeature.getCapName()/], -1, old[genFeature.getCapName()/] != null);
+				this.eNotify(notification);
+			}
+		[else]
+			if(new[genFeature.getCapName()/] == null) {
+				(([genModel.getImportedName(genClass.ecoreClass.findUMLMetaElement(genModel).getPackagePathFromUML()+'.'+genClass.ecoreClass.getUMLMetaElement(genModel))/])get__Represented()).set[genFeature.ecoreFeature.findUMLAccessorName(genModel)/](null);
+			} else {
+				(([genModel.getImportedName(genClass.ecoreClass.findUMLMetaElement(genModel).getPackagePathFromUML()+'.'+genClass.ecoreClass.getUMLMetaElement(genModel))/])get__Represented()).set[genFeature.ecoreFeature.findUMLAccessorName(genModel)/](([genModel.getImportedName(genFeature.getTypeGenClass().ecoreClass.findUMLMetaElement(genModel).getPackagePathFromUML()+'.'+genFeature.getTypeGenClass().ecoreClass.getUMLMetaElement(genModel))/])new[genFeature.getCapName()/].get__Represented());
+			}
+		[/if]		
+	[/if]
+
+
+
+		return null;
+  [else][if (genFeature.hasDelegateFeature())]
+    [let delegateFeature : GenFeature = genFeature.getDelegateFeature()]
+      [if (delegateFeature.isWrappedFeatureMapType()) ]
+		return (([genModel.getImportedName('org.eclipse.emf.ecore.util.FeatureMap')/].Internal)(([genModel.getImportedName('org.eclipse.emf.ecore.util.FeatureMap')/].Internal.Wrapper)get[delegateFeature.getAccessorName()/]()).featureMap()).basicAdd([genFeature.getQualifiedFeatureAccessor()/], new[genFeature.getCapName()/], msgs);
+      [else]
+		return (([genModel.getImportedName('org.eclipse.emf.ecore.util.FeatureMap')/].Internal)get[delegateFeature.getAccessorName()/]()).basicAdd([genFeature.getQualifiedFeatureAccessor()/], new[genFeature.getCapName()/], msgs);
+      [/if]
+    [/let]
+  [else]
+		// TODO: implement this method to set the contained '[genFeature.getFormattedName()/]' [genFeature.getFeatureKind()/]
+		// -> this method is automatically invoked to keep the containment relationship in synch
+		// -> do not modify other features
+		// -> return msgs, after adding any generated Notification to it (if it is null, a NotificationChain object must be created first)
+		// Ensure that you remove @generated or mark it @generated NOT
+		throw new UnsupportedOperationException();
+  [/if][/if][/if][/if]
+	}
+[/template]
+
+[template public genUnsetContent(genFeature : GenFeature, genModel: GenModel, genPackage : GenPackage,isJDK50:Boolean,negativeOffsetCorrection:String,positiveOffsetCorrection:String, singleWildcard : String)]
+	public void unset[genFeature.getAccessorName()/][if (genClass.hasCollidingUnsetAccessorOperation(genFeature)) ]_[/if]() {
+
+	(([genModel.getImportedName(genClass.ecoreClass.findUMLMetaElement(genModel).getPackagePathFromUML()+'.'+genClass.ecoreClass.getUMLMetaElement(genModel))/])get__Represented()).unset[genFeature.ecoreFeature.findUMLAccessorName(genModel)/]();
+
+    [comment][if (genModel.isDynamicDelegation()) ]
+		eDynamicUnset([genClass.getQualifiedFeatureID(genFeature)/], [genFeature.getQualifiedFeatureAccessor()/]);
+    [else][if (genModel.reflectiveDelegation) ]
+		eUnset([genFeature.getQualifiedFeatureAccessor()/]);
+    [else][if (genFeature.hasSettingDelegate()) ]
+		[genFeature.getUpperName()/]__ESETTING_DELEGATE.dynamicUnset(this, null, 0);
+    [else][if (not genFeature.isVolatile()) ]
+      [if (genFeature.isListType()) ]
+        [if (genModel.isVirtualDelegation()) ]
+		[genFeature.getImportedType(genClass)/] [genFeature.getSafeName()/] = ([genFeature.getImportedType(genClass)/])eVirtualGet([genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/]);
+        [/if]
+		if ([genFeature.getSafeName()/] != null) (([genModel.getImportedName('org.eclipse.emf.ecore.util.InternalEList')/].Unsettable[singleWildcard/])[genFeature.getSafeName()/]).unset();
+      [else][if (genFeature.isBidirectional() or genFeature.isEffectiveContains()) ]
+        [if (genModel.isVirtualDelegation()) ]
+		[genFeature.getImportedType(genClass)/] [genFeature.getSafeName()/] = ([genFeature.getImportedType(genClass)/])eVirtualGet([genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/]);
+        [/if]
+		if ([genFeature.getSafeName()/] != null) {
+			[genModel.getImportedName('org.eclipse.emf.common.notify.NotificationChain')/] msgs = null;
+        [if (not genFeature.isBidirectional()) ]
+			msgs = (([genModel.getImportedName('org.eclipse.emf.ecore.InternalEObject')/])[genFeature.getSafeName()/]).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - [genClass.getQualifiedFeatureID(genFeature)/][negativeOffsetCorrection/], null, msgs);
+        [else]
+          [let reverseFeature : GenFeature = genFeature.getReverse()]
+            [let targetClass : GenClass = reverseFeature.genClass]
+              [let reverseOffsetCorrection : String = if (targetClass.hasOffsetCorrection()) then ' + ' + genClass.getOffsetCorrectionField(genFeature) else '' endif]
+			msgs = (([genModel.getImportedName('org.eclipse.emf.ecore.InternalEObject')/])[genFeature.getSafeName()/]).eInverseRemove(this, [targetClass.getQualifiedFeatureID(reverseFeature)/][reverseOffsetCorrection/], [targetClass.getRawImportedInterfaceName()/].class, msgs);
+              [/let]
+            [/let]
+          [/let]
+        [/if]
+			msgs = basicUnset[genFeature.getAccessorName()/](msgs);
+			if (msgs != null) msgs.dispatch();
+		} else {
+        [if (genModel.isVirtualDelegation()) ]
+			boolean old[genFeature.getCapName()/]ESet = eVirtualIsSet([genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/]);
+        [else][if (genClass.isESetFlag(genFeature)) ]
+          [if (not genModel.suppressNotification) ]
+			boolean old[genFeature.getCapName()/]ESet = ([genClass.getESetFlagsField(genFeature)/] & [genFeature.getUpperName()/]_ESETFLAG) != 0;
+          [/if]
+			[genClass.getESetFlagsField(genFeature)/] &= ~[genFeature.getUpperName()/]_ESETFLAG;
+        [else]
+          [if (not genModel.suppressNotification) ]
+			boolean old[genFeature.getCapName()/]ESet = [genFeature.getUncapName()/]ESet;
+          [/if]
+			[genFeature.getUncapName()/]ESet = false;
+        [/if][/if]
+        [if (not genModel.suppressNotification) ]
+			if (eNotificationRequired())
+				eNotify(new [genModel.getImportedName('org.eclipse.emf.ecore.impl.ENotificationImpl')/](this, [genModel.getImportedName('org.eclipse.emf.common.notify.Notification')/].UNSET, [genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/], null, null, old[genFeature.getCapName()/]ESet));
+        [/if]
+		}
+      [else]
+        [if (genClass.isFlag(genFeature)) ]
+          [if (not genModel.suppressNotification) ]
+            [if (genFeature.isBooleanType()) ]
+		[genFeature.getImportedType(genClass)/] old[genFeature.getCapName()/] = ([genClass.getFlagsField(genFeature)/] & [genFeature.getUpperName()/]_EFLAG) != 0;
+            [else]
+		[genFeature.getImportedType(genClass)/] old[genFeature.getCapName()/] = [genFeature.getUpperName()/]_EFLAG_VALUES['['/]([genClass.getFlagsField(genFeature)/] & [genFeature.getUpperName()/]_EFLAG) >>> [genFeature.getUpperName()/]_EFLAG_OFFSET];
+            [/if]
+          [/if]
+        [else][if (genModel.isVirtualDelegation() and not genFeature.isPrimitiveType()) ]
+		Object old[genFeature.getCapName()/] = eVirtualUnset([genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/]);
+        [else]
+          [if (not genModel.suppressNotification) ]
+		[genFeature.getImportedType(genClass)/] old[genFeature.getCapName()/] = [genFeature.getSafeName()/];
+          [/if]
+        [/if][/if]
+       [if (not genModel.suppressNotification) ]
+        [if (genModel.isVirtualDelegation() and not genFeature.isPrimitiveType()) ]
+		boolean isSetChange = old[genFeature.getCapName()/] != EVIRTUAL_NO_VALUE;
+          [else][if (genClass.isESetFlag(genFeature)) ]
+		boolean old[genFeature.getCapName()/]ESet = ([genClass.getESetFlagsField(genFeature)/] & [genFeature.getUpperName()/]_ESETFLAG) != 0;
+          [else]
+		boolean old[genFeature.getCapName()/]ESet = [genFeature.getUncapName()/]ESet;
+          [/if][/if]
+        [/if]
+        [if (genFeature.isReferenceType()) ]
+		[genFeature.getSafeName()/] = null;
+          [if (not genModel.isVirtualDelegation()) ]
+            [if (genClass.isESetFlag(genFeature)) ]
+		[genClass.getESetFlagsField(genFeature)/] &= ~[genFeature.getUpperName()/]_ESETFLAG;
+            [else]
+		[genFeature.getUncapName()/]ESet = false;
+            [/if]
+          [/if]
+          [if (not genModel.suppressNotification) ]
+		if (eNotificationRequired())
+			eNotify(new [genModel.getImportedName('org.eclipse.emf.ecore.impl.ENotificationImpl')/](this, [genModel.getImportedName('org.eclipse.emf.common.notify.Notification')/].UNSET, [genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/], [if (genModel.isVirtualDelegation()) ]isSetChange ? old[genFeature.getCapName()/] : null[else]old[genFeature.getCapName()/][/if], null, [if (genModel.isVirtualDelegation()) ]isSetChange[else]old[genFeature.getCapName()/]ESet[/if]));
+          [/if]
+        [else]
+          [if (genClass.isFlag(genFeature)) ]
+            [if (genFeature.isBooleanType()) ]
+		if ([genFeature.getEDefault()/]) [genClass.getFlagsField(genFeature)/] |= [genFeature.getUpperName()/]_EFLAG; else [genClass.getFlagsField(genFeature)/] &= ~[genFeature.getUpperName()/]_EFLAG;
+            [else]
+		[genClass.getFlagsField(genFeature)/] = [genClass.getFlagsField(genFeature)/] & ~[genFeature.getUpperName()/]_EFLAG | [genFeature.getUpperName()/]_EFLAG_DEFAULT;
+            [/if]
+          [else][if (not genModel.isVirtualDelegation() or genFeature.isPrimitiveType()) ]
+		[genFeature.getSafeName()/] = [genFeature.getEDefault()/];
+          [/if][/if]
+          [if (not genModel.isVirtualDelegation() or genFeature.isPrimitiveType()) ]
+            [if (genClass.isESetFlag(genFeature)) ]
+		[genClass.getESetFlagsField(genFeature)/] &= ~[genFeature.getUpperName()/]_ESETFLAG;
+            [else]
+		[genFeature.getUncapName()/]ESet = false;
+            [/if]
+          [/if]
+          [if (not genModel.suppressNotification) ]
+		if (eNotificationRequired())
+			eNotify(new [genModel.getImportedName('org.eclipse.emf.ecore.impl.ENotificationImpl')/](this, [genModel.getImportedName('org.eclipse.emf.common.notify.Notification')/].UNSET, [genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/], [if (genModel.isVirtualDelegation() and not genFeature.isPrimitiveType()) ]isSetChange ? old[genFeature.getCapName()/] : [genFeature.getEDefault()/][else]old[genFeature.getCapName()/][/if], [genFeature.getEDefault()/], [if (genModel.isVirtualDelegation() and not genFeature.isPrimitiveType()) ]isSetChange[else]old[genFeature.getCapName()/]ESet[/if]));
+          [/if]
+        [/if]
+      [/if][/if]
+    [else]][if (genFeature.hasDelegateFeature())]
+      [let delegateFeature : GenFeature = genFeature.getDelegateFeature()]
+        [if (delegateFeature.isWrappedFeatureMapType()) ]
+		(([genModel.getImportedName('org.eclipse.emf.ecore.util.FeatureMap')/].Internal)(([genModel.getImportedName('org.eclipse.emf.ecore.util.FeatureMap')/].Internal.Wrapper)get[delegateFeature.getAccessorName()/]()).featureMap()).clear([genFeature.getQualifiedFeatureAccessor()/]);
+        [else]
+		(([genModel.getImportedName('org.eclipse.emf.ecore.util.FeatureMap')/].Internal)get[delegateFeature.getAccessorName()/]()).clear([genFeature.getQualifiedFeatureAccessor()/]);
+        [/if]
+      [/let]
+    [else][if (genClass.getUnsetAccessorOperation(genFeature) <> null) ]
+		[genClass.getUnsetAccessorOperation(genFeature).getBody(genModel.getIndentation())/]
+    [else]
+		// TODO: implement this method to unset the '[genFeature.getFormattedName()/]' [genFeature.getFeatureKind()/]
+		// Ensure that you remove @generated or mark it @generated NOT
+		throw new UnsupportedOperationException();
+    [/if][/if][/if][/if][/if][/if][/comment]
+	}
+
+[/template]
+
+[template public genIsSetContent(genFeature : GenFeature, genModel: GenModel, genPackage : GenPackage,isJDK50:Boolean,negativeOffsetCorrection:String,positiveOffsetCorrection:String, singleWildcard : String)]
+	public boolean isSet[genFeature.getAccessorName()/][if (genClass.hasCollidingIsSetAccessorOperation(genFeature)) ]_[/if]() {
+
+		return (([genModel.getImportedName(genClass.ecoreClass.findUMLMetaElement(genModel).getPackagePathFromUML()+'.'+genClass.ecoreClass.getUMLMetaElement(genModel))/])get__Represented()).isSet[genFeature.ecoreFeature.findUMLAccessorName(genModel)/]();
+
+    [comment][if (genModel.isDynamicDelegation()) ]
+		return eDynamicIsSet([genClass.getQualifiedFeatureID(genFeature)/], [genFeature.getQualifiedFeatureAccessor()/]);
+    [else][if (genModel.reflectiveDelegation) ]
+		return eIsSet([genFeature.getQualifiedFeatureAccessor()/]);
+    [else][if (genFeature.hasSettingDelegate()) ]
+		return [genFeature.getUpperName()/]__ESETTING_DELEGATE.dynamicIsSet(this, null, 0);
+    [else][if (not genFeature.isVolatile()) ]
+      [if (genFeature.isListType()) ]
+        [if (genModel.isVirtualDelegation()) ]
+		[genFeature.getImportedType(genClass)/] [genFeature.getSafeName()/] = ([genFeature.getImportedType(genClass)/])eVirtualGet([genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/]);
+        [/if]
+		return [genFeature.getSafeName()/] != null && (([genModel.getImportedName('org.eclipse.emf.ecore.util.InternalEList')/].Unsettable[singleWildcard/])[genFeature.getSafeName()/]).isSet();
+      [else]
+        [if (genModel.isVirtualDelegation() and not genFeature.isPrimitiveType()) ]
+		return eVirtualIsSet([genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/]);
+        [else][if (genClass.isESetFlag(genFeature)) ]
+		return ([genClass.getESetFlagsField(genFeature)/] & [genFeature.getUpperName()/]_ESETFLAG) != 0;
+        [else]
+		return [genFeature.getUncapName()/]ESet;
+        [/if][/if]
+      [/if]
+    [else][if (genFeature.hasDelegateFeature())]
+      [let delegateFeature : GenFeature = genFeature.getDelegateFeature()]
+        [if (delegateFeature.isWrappedFeatureMapType()) ]
+		return !(([genModel.getImportedName('org.eclipse.emf.ecore.util.FeatureMap')/].Internal)(([genModel.getImportedName('org.eclipse.emf.ecore.util.FeatureMap')/].Internal.Wrapper)get[delegateFeature.getAccessorName()/]()).featureMap()).isEmpty([genFeature.getQualifiedFeatureAccessor()/]);
+        [else]
+		return !(([genModel.getImportedName('org.eclipse.emf.ecore.util.FeatureMap')/].Internal)get[delegateFeature.getAccessorName()/]()).isEmpty([genFeature.getQualifiedFeatureAccessor()/]);
+        [/if]
+      [/let]
+    [else][if (genClass.getIsSetAccessorOperation(genFeature) <> null) ]
+		[genClass.getIsSetAccessorOperation(genFeature).getBody(genModel.getIndentation())/]
+    [else]
+		// TODO: implement this method to return whether the '[genFeature.getFormattedName()/]' [genFeature.getFeatureKind()/] is set
+		// Ensure that you remove @generated or mark it @generated NOT
+		throw new UnsupportedOperationException();
+    [/if][/if][/if][/if][/if][/if][/comment]
+	}
+[/template]
+
+[query public isAPrimitiveType(genFeature : GenFeature) : Boolean= 
+ if(genFeature.ecoreFeature.eType.instanceTypeName='java.lang.String' or genFeature.ecoreFeature.eType.instanceTypeName='int' or genFeature.ecoreFeature.eType.instanceTypeName='boolean' or genFeature.ecoreFeature.eType.instanceTypeName='double') then true else false endif/]
+
+[query public toUpperCase( string : String) : String 
+	= invoke('java.lang.String', 'toUpperCase()', Sequence{string}) /]
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genclass/genOperation.mtl b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genclass/genOperation.mtl
new file mode 100644
index 00000000000..54e85fb0106
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genclass/genOperation.mtl
@@ -0,0 +1,191 @@
+[comment]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:
+ Obeo - Initial API and implementation
+ CEA LIST - Modification to support Facade code generation[/comment]
+[comment encoding = UTF-8 /]
+[module genOperation('http://www.eclipse.org/emf/2002/GenModel')/]
+
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenClass /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenClassifier /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenFeature /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenModel /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenEnum /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenPackage /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenDataType /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenOperation /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenParameter /]
+[import org::eclipse::papyrus::facade::codegen::utils::FacadeCodegenUtils /]
+[import org::eclipse::papyrus::facade::codegen::utils::WrappingListUtils /]
+
+[template public genOperation(genOperation : GenOperation, genClass : GenClass, genPackage : GenPackage, genModel : GenModel, isJDK50 : Boolean, isInterface : Boolean, isImplementation : Boolean, isGWT : Boolean)]
+[if (isImplementation) ]
+  [if (genOperation.isInvariant() and genOperation.hasInvariantExpression()) ]
+	/**
+	 * The cached validation expression for the '{@link #[genOperation.getName()/]([genOperation.getParameterTypes(', ')/]) <em>[genOperation.getFormattedName()/]</em>}' invariant operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #[genOperation.getName()/]([genOperation.getParameterTypes(', ')/])
+	 * @generated
+	 * @ordered
+	 */
+	protected static final [genModel.getImportedName('java.lang.String')/] [genClass.getUniqueNameUpperCase(genOperation)/]__EEXPRESSION = "[genOperation.getInvariantExpression('\t\t')/]";[genModel.getNonNLS()/]
+
+  [else][if (genOperation.hasInvocationDelegate()) ]
+	/**
+	 * The cached invocation delegate for the '{@link #[genOperation.getName()/]([genOperation.getParameterTypes(', ')/]) <em>[genOperation.getFormattedName()/]</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #[genOperation.getName()/]([genOperation.getParameterTypes(', ')/])
+	 * @generated
+	 * @ordered
+	 */
+	protected static final [genModel.getImportedName('org.eclipse.emf.ecore.EOperation')/].Internal.InvocationDelegate [genClass.getUniqueNameUpperCase(genOperation)/]__EINVOCATION_DELEGATE = (([genModel.getImportedName('org.eclipse.emf.ecore.EOperation')/].Internal)[genOperation.getQualifiedOperationAccessor()/]).getInvocationDelegate();
+
+  [/if][/if]
+[/if]
+[if (isInterface) ]
+[comment]<%@ include file="Class/genOperation.javadoc.override.javajetinc" fail="alternative" %>[/comment]
+[comment]<%@ start %>[/comment]
+	/**
+[comment]<%@ include file="Class/genOperation.javadoc.insert.javajetinc" fail="silent" %>[/comment]
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+  [if (genOperation.hasDocumentation() or genOperation.hasParameterDocumentation()) ]
+	 * <!-- begin-model-doc -->
+    [if (genOperation.hasDocumentation()) ]
+	 * [genOperation.getDocumentation(genModel.getIndentation())/]
+    [/if]
+  [for (genParameter : GenParameter | genOperation.genParameters)]
+      [if (genParameter.hasDocumentation())]
+        [let documentation : String = genParameter.getDocumentation('')]
+          [if (documentation.contains('\n') or documentation.contains('\r')) ]
+	 * @param [genParameter.getName()/]
+	 *   [genParameter.getDocumentation(genModel.getIndentation())/]
+          [else]
+	 * @param [genParameter.getName()/] [genParameter.getDocumentation(genModel.getIndentation())/]
+          [/if]
+        [/let]
+      [/if]
+    [/for]
+	 * <!-- end-model-doc -->
+  [/if]
+  [if (not genModel.suppressEMFModelTags)]
+    [let modelInfoLines : Sequence(String) = genOperation.getModelInfo().tokenize(genModel.getLineDelimiter())]
+      [if (modelInfoLines->isEmpty())]
+	 * @model
+      [else]
+	 * @model [modelInfoLines->sep(genModel.getLineDelimiter() + '\t *        ')/]
+      [/if]
+    [/let]
+  [/if]
+	 * @generated
+	 */
+[comment]<%@ end %><%//Class/genOperation.javadoc.override.javajetinc%>[/comment]
+[else]
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+  [if (isJDK50)][comment]//Class/genOperation.annotations.insert.javajetinc[/comment]
+[comment]<%@ include file="Class/genOperation.annotations.insert.javajetinc" fail="silent" %>[/comment]
+  [/if]
+[/if]
+[if (not isImplementation) ]
+	[genOperation.getTypeParameters(genClass)/][genOperation.getImportedType(genClass)/] [genOperation.getName()/]([genOperation.getParameters(genClass)/])[genOperation.getThrows(genClass)/];
+
+[else]
+	public [genOperation.getTypeParameters(genClass)/][genOperation.getImportedType(genClass)/] [genOperation.getName()/]([genOperation.getParameters(genClass)/])[genOperation.getThrows(genClass)/] {
+  [if (genOperation.hasBody()) ]
+		[genOperation.getBody(genModel.getIndentation())/]
+  [else]
+	[if (genOperation.isListType())]
+		[if (genOperation.isPrimtiveList())]
+			 [genOperation.genGetContentPrimitiveType(genModel, genPackage)/]
+		[else]
+			[genModel.getImportedName('org.eclipse.emf.common.util.EList')/]<? extends [genModel.getImportedName('org.eclipse.emf.ecore.EObject')/]> umlList = (([genModel.getImportedName(genClass.ecoreClass.findUMLMetaElement(genModel).getPackagePathFromUML()+'.'+genClass.ecoreClass.getUMLMetaElement(genModel))/])get__Represented()).[genOperation.ecoreOperation.findUMLGetAccessor(genModel)/]([genParameters(genOperation)/]);
+			[genOperation.getImportedType(genClass)/] update = new [genModel.getImportedName('org.eclipse.emf.common.util.BasicEList')/]<[genOperation.getTypeGenClass().getQualifiedInterfaceName()/]>();
+	
+			for([genModel.getImportedName('org.eclipse.emf.ecore.EObject')/] umlElement : umlList) {
+	
+				[genModel.getImportedName('org.eclipse.emf.ecore.EObject')/] representingElement = [genModel.getImportedName(genPackage.getUtilitiesPackageName()+'.Wrapper')/].getInstance().findOrCreateSpecific(([genModel.getImportedName('org.eclipse.emf.ecore.EObject')/])umlElement);
+				if(representingElement != null) {
+					if(representingElement instanceof [genOperation.getTypeGenClass().getQualifiedInterfaceName()/]) {
+						update.add(([genOperation.getTypeGenClass().getQualifiedInterfaceName()/])representingElement);
+					} 	
+				}			
+			}
+
+			return update;
+		[/if]
+
+	[else]	
+		[if (genOperation.isPrimitive())]
+ 			[genOperation.genGetContentPrimitiveType(genModel, genPackage)/]
+		[else]
+			[genModel.getImportedName('org.eclipse.emf.ecore.EObject')/] umlElement = (([genModel.getImportedName(genClass.ecoreClass.findUMLMetaElement(genModel).getPackagePathFromUML()+'.'+genClass.ecoreClass.getUMLMetaElement(genModel))/])get__Represented()).[genOperation.ecoreOperation.findUMLGetAccessor(genModel)/]([genParameters(genOperation)/]);
+	
+			if(umlElement [if (genOperation.isEnumType())] !=null [else] instanceof [genModel.getImportedName('org.eclipse.emf.ecore.EObject')/] [/if]) {
+			
+	
+				[if (genOperation.isEnumType())]
+					Enum representingElement = [genModel.getImportedName(genPackage.getUtilitiesPackageName()+'.Wrapper')/].getInstance().getEnumMappingFromUML((Enum)umlElement);
+				[else]
+					[genModel.getImportedName('org.eclipse.emf.ecore.EObject')/] representingElement =  [genModel.getImportedName(genPackage.getUtilitiesPackageName()+'.Wrapper')/].getInstance().findOrCreateSpecific(([genModel.getImportedName('org.eclipse.emf.ecore.EObject')/])umlElement);
+				[/if]
+				
+				if(representingElement != null) {
+					if(representingElement instanceof [genOperation.getTypeGenClassifier().getAppropriateQualifiedTypeName()/]) {
+				
+							return ([genOperation.getTypeGenClassifier().getAppropriateQualifiedTypeName()/])representingElement;
+	
+					}
+				}
+			} 
+	
+			return null;
+		[/if]	
+	[/if]
+
+  [/if]
+	}
+
+[/if]
+[comment]<%@ include file="Class/genOperation.insert.javajetinc" fail="silent" %>[/comment]
+[comment]<%@ end %><%//Class/implementedGenOperation.override.javajetinc%>[/comment]
+[/template]
+
+[template public genParameters(genOperation : GenOperation)]
+	[for (param : GenParameter | genOperation.genParameters) separator (',')]
+		[if (param.isPrimitive() or genOperation.isInvariant() or param.isPrimtiveList())]
+			[param.getName()/]
+		[else]
+			[if (param.isListType())]
+				[param.getGenModel().getImportedName(param.getGenPackage().getUtilitiesPackageName()+'.Wrapper')/].getInstance().toRepresentedList([param.getName()/])
+			[else]
+				[if (param.isEnumType())]
+					(([param.getGenModel().getImportedName(param.getTypeGenClassifier().getEcoreClassifier().findUMLMetaElement(param.getGenModel()).getPackagePathFromUML()+'.'+param.getTypeGenClassifier().getEcoreClassifier().getUMLMetaElement(param.getGenModel()))/])[param.getGenModel().getImportedName(param.getGenPackage().getUtilitiesPackageName()+'.Wrapper')/].getInstance().getEnumMappingFromSpecific([param.getName()/]))
+				[else]
+					([param.getGenModel().getImportedName(param.getTypeGenClass().ecoreClass.findUMLMetaElement(param.getGenModel()).getPackagePathFromUML()+'.'+param.getTypeGenClass().ecoreClass.getUMLMetaElement(param.getGenModel()))/])[param.getName()/].get__Represented()
+				[/if]
+			[/if]
+		[/if]
+		
+	[/for]
+[/template]
+
+[template public genGetContentPrimitiveType(genOperation : GenOperation, genModel: GenModel, genPackage : GenPackage)]
+
+	[if (genOperation.isVoid())]
+		(([genModel.getImportedName(genClass.ecoreClass.findUMLMetaElement(genModel).getPackagePathFromUML()+'.'+genClass.ecoreClass.getUMLMetaElement(genModel))/])get__Represented()).[genOperation.ecoreOperation.findUMLGetAccessor(genModel)/]([genParameters(genOperation)/]);
+	[else]
+		return  (([genModel.getImportedName(genOperation.genClass.ecoreClass.findUMLMetaElement(genModel).getPackagePathFromUML()+'.'+genClass.ecoreClass.getUMLMetaElement(genModel))/])get__Represented()).[genOperation.ecoreOperation.findUMLGetAccessor(genModel)/]([genParameters(genOperation)/]);
+	[/if]
+	
+[/template]
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genclass/reflectiveDelegationAlternative.mtl b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genclass/reflectiveDelegationAlternative.mtl
new file mode 100644
index 00000000000..27bebd978a0
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genclass/reflectiveDelegationAlternative.mtl
@@ -0,0 +1,39 @@
+[comment]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:
+ Obeo - Initial API and implementation
+ CEA LIST - Modification to support Facade code generation[/comment]
+[comment encoding = UTF-8 /]
+[module reflectiveDelegationAlternative('http://www.eclipse.org/emf/2002/GenModel')/]
+
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenModel /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenClass /]
+
+
+[template public reflectiveDelegationAlternative(genClass : GenClass, isImplementation : Boolean, genModel : GenModel)]
+[if (isImplementation
+	and (genModel.featureDelegation = GenDelegationKind::Reflective
+		or genModel.isDynamicDelegation())
+	and (genClass.getClassExtendsGenClass() = null
+		or (genClass.getClassExtendsGenClass().getGenModel().featureDelegation <> GenDelegationKind::Reflective
+			and not genClass.getClassExtendsGenClass().getGenModel().isDynamicDelegation()))) ]
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+  [if (genModel.useClassOverrideAnnotation()) ]
+	@Override
+  [/if]
+	protected int eStaticFeatureCount()
+	{
+		return [if genClass.getClassExtendsGenClass() = null]0[else][genClass.getClassExtendsGenClass().getAllGenFeatures()->size()/][/if];
+	}
+
+[/if]
+[/template]
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/AbstractRepresentingClass.mtl b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/AbstractRepresentingClass.mtl
new file mode 100644
index 00000000000..ea9464612df
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/AbstractRepresentingClass.mtl
@@ -0,0 +1,69 @@
+[comment]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:
+ Obeo - Initial API and implementation
+ CEA LIST - Modification to support Facade code generation[/comment]
+[comment encoding = UTF-8 /]
+[module AbstractRepresentingClass('http://www.eclipse.org/emf/2002/GenModel', 'http://www.eclipse.org/emf/2002/Ecore')/]
+
+[import org::eclipse::emf::eef::codegen::ecore::services::common /]
+[import org::eclipse::emf::eef::codegen::ecore::services::header /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenModel /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenPackage /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenClass /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenClassifier /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenFeature /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenDataType /]
+[import org::eclipse::emf::eef::codegen::ecore::services::StringUtil /]
+
+
+[template public abstractRepresentingClass(genPackage : GenPackage) { genModel : GenModel = genPackage.genModel; packageName : String = genPackage.getUtilitiesPackageName(); className : String = 'AbstractRepresentingElement'} ]
+[genModel.initializeImportManager(packageName, className)/]
+
+[genModel.getImportedName('org.eclipse.emf.common.util.URI')/]
+
+[file (genPackage.abstractRepresentingClassPath(className), false, 'UTF-8')]
+[genModel.includeHeader()/]
+package [packageName/];
+[let content : String = genPackage. abstractRepresentingFileContent(genModel, className)]
+[genModel.genSortedImports()/]
+[content/]
+[/let]
+[/file]
+[/template]
+
+[template protected  abstractRepresentingFileContent(genPackage : GenPackage, genModel : GenModel, className : String)]
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+import org.eclipse.papyrus.facade.utils.RepresentingElement;
+
+
+public abstract class AbstractRepresentingElement extends MinimalEObjectImpl.Container implements RepresentingElement {
+
+
+	protected EObject __representedElement;
+
+	@Override
+	public EObject get__Represented() {
+		return __representedElement;
+	}
+
+	@Override
+	public void set__Represented(EObject represented) {
+		this.__representedElement = represented;
+	}
+
+
+}
+
+[/template]
+
+[query public abstractRepresentingClassPath(genPackage : GenPackage, className : String) : String
+	= genPackage.genModel.extractSourceDirectory(genPackage.genModel.modelDirectory) + '/'+ genPackage.getUtilitiesPackageName().toPath() + '/' +
+		className+ '.java'/]
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/Class.mtl b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/Class.mtl
new file mode 100644
index 00000000000..4e80f3a0cf3
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/Class.mtl
@@ -0,0 +1,1029 @@
+[comment]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:
+ Obeo - Initial API and implementation
+ CEA LIST - Modification to support Facade code generation[/comment]
+[comment encoding = UTF-8 /]
+[module Class('http://www.eclipse.org/emf/2002/GenModel')/]
+
+[import org::eclipse::emf::eef::codegen::ecore::services::common /]
+[import org::eclipse::emf::eef::codegen::ecore::services::header /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenModel /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenPackage /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenClass /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenOperation /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenParameter /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenFeature /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenDataType /]
+[import org::eclipse::papyrus::facade::codegen::genclass::genDeclaredFields /]
+[import org::eclipse::papyrus::facade::codegen::genclass::genFeature /]
+[import org::eclipse::papyrus::facade::codegen::genclass::genOperation /]
+[import org::eclipse::papyrus::facade::codegen::genclass::eUnset /]
+[import org::eclipse::papyrus::facade::codegen::genclass::eIsSet /]
+[import org::eclipse::emf::eef::codegen::ecore::services::StringUtil /]
+[import org::eclipse::papyrus::facade::codegen::utils::FacadeCodegenUtils /]
+
+[template public genGenClass(genClass : GenClass, isInterface : Boolean, isImplementation : Boolean)]
+[let genPackage : GenPackage = genClass.genPackage]
+[let genModel : GenModel = genPackage.genModel]
+[let isJDK50 : Boolean = genModel.isJDK50()]
+[comment the two following booleans are passed as arguments to this template/]
+[comment] final boolean isInterface = Boolean.TRUE.equals(((Object['[]'/])argument)[1]); final boolean isImplementation = Boolean.TRUE.equals(((Object['[]'/])argument)[2]);[/comment]
+[let isGWT : Boolean = genModel.runtimePlatform = GenRuntimePlatform::GWT]
+[let publicStaticFinalFlag : String = if isImplementation then 'public static final ' else '' endif]
+[let singleWildcard : String = if isJDK50 then '<?>' else '' endif]
+[let negativeOffsetCorrection : String = if genClass.hasOffsetCorrection() then ' - ' + genClass.getDefaultOffsetCorrectionField(genClass) else '' endif]
+[let positiveOffsetCorrection : String = if genClass.hasOffsetCorrection() then ' + ' + genClass.getDefaultOffsetCorrectionField(genClass) else '' endif]
+[let negativeOperationOffsetCorrection : String = if genClass.hasOffsetCorrection() then ' - EOPERATION_OFFSET_CORRECTION' + genClass.getDefaultOffsetCorrectionField(genClass) else '' endif]
+[let positiveOperationOffsetCorrection : String = if genClass.hasOffsetCorrection() then ' + EOPERATION_OFFSET_CORRECTION' + genClass.getDefaultOffsetCorrectionField(genClass) else '' endif]
+
+[let packageName : String = if (isInterface) then
+		genPackage.getInterfacePackageName()
+	else
+		genPackage.getClassPackageName()
+	endif]
+[let className : String = if (isImplementation) then
+		genClass.getClassName()
+	else
+		genClass.getInterfaceName()
+	endif]
+
+[genModel.initializeImportManager(genPackage, packageName, className)/]
+[if (isImplementation)]
+	[genClass.addClassPseudoImports()/]
+[/if]
+
+
+
+[file (genClass.classFilePath(isInterface, isImplementation), false, 'UTF-8')]
+[genClass.includeHeader()/]
+[if (isInterface) ]
+package [genPackage.getInterfacePackageName()/];
+[else]
+package [genPackage.getClassPackageName()/];
+[/if]
+[let content : String = genClass.classFileContent(isInterface, isImplementation, genPackage, genModel, isJDK50, isGWT, publicStaticFinalFlag, singleWildcard, negativeOffsetCorrection, positiveOffsetCorrection, negativeOperationOffsetCorrection, positiveOperationOffsetCorrection)]
+
+[genClass.genSortedImports(isInterface, isImplementation).trim()/]
+
+[content/]
+[/let]
+[/file]
+
+
+
+[/let]
+[/let]
+
+[/let]
+[/let]
+[/let]
+[/let]
+[/let]
+[/let]
+[/let]
+[/let]
+[/let]
+[/let]
+[/template]
+
+[template protected classFileContent(genClass : GenClass, isInterface : Boolean, isImplementation : Boolean, genPackage : GenPackage, genModel : GenModel, isJDK50 : Boolean, isGWT : Boolean, publicStaticFinalFlag : String, singleWildcard : String, negativeOffsetCorrection : String, positiveOffsetCorrection : String, negativeOperationOffsetCorrection : String, positiveOperationOffsetCorrection : String) post(trim())]
+[if (isInterface)]
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>[genClass.getFormattedName()/]</b></em>'.
+ * <!-- end-user-doc -->
+  [if (genClass.hasDocumentation())]
+ *
+ * <!-- begin-model-doc -->
+ * [genClass.getDocumentation(genModel.getIndentation())/]
+ * <!-- end-model-doc -->
+  [/if]
+ *
+  [if (not genClass.genFeatures->isEmpty())]
+ * <p>
+ * The following features are supported:
+ * <ul>
+    [for (genFeature : GenFeature | genClass.genFeatures)]
+      [if (not genFeature.isSuppressedGetVisibility())]
+ *   <li>{@link [genClass.getQualifiedInterfaceName()/]#[genFeature.getGetAccessor()/] <em>[genFeature.getFormattedName()/]</em>}</li>
+      [/if]
+    [/for]
+ * </ul>
+ * </p>
+  [/if]
+ *
+  [if (not genModel.suppressEMFMetaData)]
+ * @see [genPackage.getQualifiedPackageInterfaceName()/]#get[genClass.getClassifierAccessorName()/]()
+  [/if]
+  [if (not genModel.suppressEMFModelTags)]
+    [let modelInfoLines : Sequence(String) = genClass.getModelInfo().tokenize(genModel.getLineDelimiter() + '\r')]
+      [if (modelInfoLines->isEmpty())]
+ * @model
+      [else]
+ * @model [modelInfoLines->sep(genModel.getLineDelimiter() + ' *        ')/]
+      [/if]
+    [/let]
+  [/if]
+  [if (genClass.needsRootExtendsInterfaceExtendsTag())]
+ * @extends [genModel.getImportedName(genModel.rootExtendsInterface)/]
+  [/if]
+ * @generated
+ */
+[else]
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>[genClass.getFormattedName()/]</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+  [if (not genClass.getImplementedGenFeatures()->isEmpty())]
+ * The following features are implemented:
+ * <ul>
+    [for (genFeature : GenFeature | genClass.getImplementedGenFeatures())]
+ *   <li>{@link [genClass.getQualifiedClassName()/]#[genFeature.getGetAccessor()/] <em>[genFeature.getFormattedName()/]</em>}</li>
+    [/for]
+ * </ul>
+  [/if]
+ * </p>
+ *
+ * @generated
+ */
+[/if]
+[if (isImplementation) ]
+public[if (genClass.isAbstract()) ] abstract[/if] class [genClass.getClassName()/][genClass.getTypeParameters().trim()/][if (genClass.ecoreClass.eSuperTypes->isEmpty()) ] extends [genModel.getImportedName(genPackage.getUtilitiesPackageName()+'.AbstractRepresentingElement')/] [else] [genClass.getClassExtends()/] [/if][genClass.getClassImplements()/] {
+
+
+[else]
+public interface [genClass.getInterfaceName()/][genClass.getTypeParameters().trim()/][genClass.getInterfaceExtends()/], [genModel.getImportedName('org.eclipse.papyrus.facade.utils.RepresentingElement')/]  {
+
+	[comment]public [genModel.getImportedName('org.eclipse.uml2.uml.Element')/] get__Represented();
+
+	public void set__Represented([genModel.getImportedName('org.eclipse.uml2.uml.Element')/] represented);[/comment]
+
+[/if]
+[if (genModel.hasCopyrightField()) ]
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	[publicStaticFinalFlag/][genModel.getImportedName('java.lang.String')/] copyright = [genModel.getCopyrightFieldLiteral()/];[genModel.getNonNLS()/]
+
+[/if]
+[if (isImplementation and genModel.getDriverNumber() <> null) ]
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final [genModel.getImportedName('java.lang.String')/] mofDriverNumber = "[genModel.getDriverNumber()/]";[genModel.getNonNLS()/]
+
+[/if]
+[if (isImplementation and genClass.isJavaIOSerializable()) ]
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static final long serialVersionUID = 1L;
+
+[/if]
+[if (isImplementation and genModel.isVirtualDelegation())]
+  [let eVirtualValuesField : String = genClass.getEVirtualValuesField()]
+  [if (genClass.getEVirtualValuesField() <> null) ]
+	/**
+	 * An array of objects representing the values of non-primitive features.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+      [if (isGWT) ]
+	@[genModel.getImportedName('com.google.gwt.user.client.rpc.GwtTransient')/]
+      [/if]
+	protected Object['[]'/] [genClass.getEVirtualValuesField()/];
+
+  [/if]
+  [let eVirtualIndexBitFields : Sequence(String) = genClass.getEVirtualIndexBitFields()]
+    [if (not eVirtualIndexBitFields->isEmpty()) ]
+      [for (eVirtualIndexBitField : String | eVirtualIndexBitFields)]
+	/**
+	 * A bit field representing the indices of non-primitive feature values.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+      [if (isGWT) ]
+	@[genModel.getImportedName('com.google.gwt.user.client.rpc.GwtTransient')/]
+      [/if]
+	protected int [eVirtualIndexBitField/];
+
+      [/for]
+    [/if]
+  [/let]
+  [/let]
+[/if]
+[if (isImplementation and genClass.isModelRoot() and genModel.isBooleanFlagsEnabled() and genModel.booleanFlagsReservedBits = -1) ]
+	/**
+	 * A set of bit flags representing the values of boolean attributes and whether unsettable features have been set.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+      [if (isGWT) ]
+	@[genModel.getImportedName('com.google.gwt.user.client.rpc.GwtTransient')/]
+      [/if]
+	protected int [genModel.booleanFlagsField/] = 0;
+
+[/if]
+[if (isImplementation and not genModel.reflectiveDelegation) ]
+  [for (genFeature : GenFeature | genClass.getDeclaredFieldGenFeatures())]
+[genFeature.genDeclaredFields(genClass, genModel, isGWT, isJDK50)/][/for]
+[/if]
+[if (isImplementation and genClass.hasOffsetCorrection() and not genClass.getImplementedGenFeatures()->isEmpty()) ]
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static final int [genClass.getDefaultOffsetCorrectionField()/] = [genClass.getQualifiedClassifierAccessor()/].getFeatureID([genClass.getImplementedGenFeatures()->at(1).oclAsType(GenFeature).getQualifiedFeatureAccessor()/]) - [genClass.getQualifiedFeatureID(genClass.getImplementedGenFeatures()->at(1).oclAsType(GenFeature))/];
+
+[/if]
+[if (isImplementation and not genModel.reflectiveDelegation) ]
+  [for (genFeature : GenFeature | genClass.getImplementedGenFeatures())]
+    [let reverseFeature : GenFeature = genFeature.getReverse()]
+      [if (reverseFeature <> null and reverseFeature.genClass.hasOffsetCorrection()) ]
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static final int [genClass.getOffsetCorrectionField(genFeature)/] = [reverseFeature.genClass.getQualifiedClassifierAccessor()/].getFeatureID([reverseFeature.getQualifiedFeatureAccessor()/]) - [reverseFeature.genClass.getQualifiedFeatureID(reverseFeature)/];
+
+      [/if]
+    [/let]
+  [/for]
+[/if]
+[if (genModel.operationReflection and isImplementation and genClass.hasOffsetCorrection() and not genClass.getImplementedGenOperations()->isEmpty()) ]
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static final int "EOPERATION_OFFSET_CORRECTION" = [genClass.getQualifiedClassifierAccessor()/].getOperationID([genClass.getImplementedGenOperations()->at(1).oclAsType(GenOperation).getQualifiedOperationAccessor()/]) - [genClass.getQualifiedOperationID(genClass.getImplementedGenOperations()->at(1).oclAsType(GenOperation))/];
+
+[/if]
+[if (isImplementation) ]
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	[if (genModel.publicConstructors) ]public[else]protected[/if] [genClass.getClassName()/]() {
+		super();
+		[if (not genClass.isAbstract()) ] 
+		__representedElement =  [genClass.ecoreClass.getUMLFactory(genModel)/].eINSTANCE.create[genClass.ecoreClass.getUMLMetaElement(genModel)/]();
+
+		boolean adapterExists = false;
+		for([genModel.getImportedName('org.eclipse.emf.common.notify.Adapter')/] adapter : __representedElement.eAdapters()) {
+			if(adapter instanceof [genModel.getImportedName(genPackage.getUtilitiesPackageName()+'.RepresentingElementAdapter')/]) {
+				(([genModel.getImportedName(genPackage.getUtilitiesPackageName()+'.RepresentingElementAdapter')/])adapter).set__Representing(this);
+				adapterExists = true;
+			}
+		}
+
+		if(!adapterExists) {
+			[genModel.getImportedName(genPackage.getUtilitiesPackageName()+'.RepresentingElementAdapter')/] adapter = new [genModel.getImportedName(genPackage.getUtilitiesPackageName()+'.RepresentingElementAdapter')/]();
+			adapter.set__Representing(this);
+			__representedElement.eAdapters().add(adapter);
+		}
+		[/if]
+
+
+
+  [for (genFeature : GenFeature | genClass.getFlagGenFeaturesWithDefault()) ]
+		[genClass.getFlagsField(genFeature)/] |= [genFeature.getUpperName()/]_EFLAG[if (not genFeature.isBooleanType()) ]_DEFAULT[/if];
+  [/for]
+	}
+
+
+	[if ( genClass.ecoreClass.getNonAssociationStereotypeQualifiedNames(genModel) <> '' )]
+
+	@Override
+	public [genModel.getImportedName('org.eclipse.emf.common.notify.NotificationChain')/]  eBasicSetContainer([genModel.getImportedName('org.eclipse.emf.ecore.InternalEObject')/] newContainer, int newContainerFeatureID, [genModel.getImportedName('org.eclipse.emf.common.notify.NotificationChain')/] msgs) {
+		[genModel.getImportedName('org.eclipse.emf.common.notify.NotificationChain')/] chain = super.eBasicSetContainer(newContainer, newContainerFeatureID, msgs);
+		if(newContainer != null) {
+			String['[]'/] stereotypesQualifiedNames = { [genClass.ecoreClass.getNonAssociationStereotypeQualifiedNames(genModel)/] };
+
+			for([genModel.getImportedName('java.lang.String')/] stereoQualifiedName : stereotypesQualifiedNames) {
+				if((([genModel.getImportedName('org.eclipse.uml2.uml.Element')/])__representedElement).getAppliedStereotype(stereoQualifiedName) == null) {
+					[genModel.getImportedName('org.eclipse.uml2.uml.Stereotype')/] stereotype = (([genModel.getImportedName('org.eclipse.uml2.uml.Element')/])__representedElement).getApplicableStereotype(stereoQualifiedName);
+					if(stereotype != null) {
+						(([genModel.getImportedName('org.eclipse.uml2.uml.Element')/])__representedElement).applyStereotype(stereotype);
+					} else {
+						System.err.println("Problem: cannot apply stereotype " + stereoQualifiedName);
+					}
+				}
+			}
+		}
+
+		return chain;
+	}
+
+	[/if]
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+  [if (genModel.useClassOverrideAnnotation()) ]
+	@Override
+  [/if]
+	protected [genModel.getImportedName('org.eclipse.emf.ecore.EClass')/] eStaticClass() {
+		return [genClass.getQualifiedClassifierAccessor()/];
+	}
+
+[/if]
+
+[for (genFeature : GenFeature | if isImplementation then genClass.getImplementedGenFeatures() else genClass.getDeclaredGenFeatures() endif)]
+[genFeature.genFeature(genClass, genPackage, genModel, isJDK50, isInterface, isImplementation, positiveOffsetCorrection, negativeOffsetCorrection, singleWildcard)/][/for]
+
+[for (genOperation : GenOperation | if isImplementation then genClass.getImplementedGenOperations() else genClass.getDeclaredGenOperations() endif)]
+[genOperation.genOperation(genClass, genPackage, genModel, isJDK50, isInterface, isImplementation, isGWT)/][/for]
+[if (isImplementation and not genModel.reflectiveDelegation and genClass.implementsAnyEInverseAddGenFeatures()) ]
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+  [if (genModel.useGenerics())]
+    [if (genClass.getEInverseAddGenFeatures()->filter(GenFeature)->select(f : GenFeature | f.isUncheckedCast(genClass))->size() > 0)]
+	@SuppressWarnings("unchecked")
+    [/if]
+  [/if]
+  [if (genModel.useClassOverrideAnnotation()) ]
+	@Override
+  [/if]
+	public [genModel.getImportedName('org.eclipse.emf.common.notify.NotificationChain')/] eInverseAdd([genModel.getImportedName('org.eclipse.emf.ecore.InternalEObject')/] otherEnd, int featureID, [genModel.getImportedName('org.eclipse.emf.common.notify.NotificationChain')/] msgs) {
+		switch (featureID[negativeOffsetCorrection/]) {
+[for (genFeature : GenFeature | genClass.getEInverseAddGenFeatures())]
+			case [genClass.getQualifiedFeatureID(genFeature)/]:
+  [if (genFeature.isListType())]
+    [let cast : String = '('
+        + genModel.getImportedName('org.eclipse.emf.ecore.util.InternalEList')
+        + if (not genModel.useGenerics()) then
+            ')'
+          else
+            '<'
+            + genModel.getImportedName('org.eclipse.emf.ecore.InternalEObject')
+   	        + '>)('
+   	        + genModel.getImportedName('org.eclipse.emf.ecore.util.InternalEList')
+   	        + '<?>)'
+          endif]
+      [if (genFeature.isMapType() and genFeature.isEffectiveSuppressEMFTypes()) ]
+				return (([cast/]([genModel.getImportedName('org.eclipse.emf.common.util.EMap')/].InternalMapView[genFeature.getImportedMapTemplateArguments(genClass)/])[genFeature.getGetAccessor()/]()).eMap()).basicAdd(otherEnd, msgs);
+      [else]
+				return ([cast/][genFeature.getGetAccessor()/]()).basicAdd(otherEnd, msgs);
+      [/if]
+    [/let]
+  [else][if (genFeature.isContainer()) ]
+				if (eInternalContainer() != null)
+					msgs = eBasicRemoveFromContainer(msgs);
+    [if (genFeature.isBasicSet()) ]
+				return basicSet[genFeature.getAccessorName()/](([genFeature.getImportedType(genClass)/])otherEnd, msgs);
+    [else]
+				return eBasicSetContainer(otherEnd, [genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/], msgs);
+    [/if]
+  [else]
+    [if (genClass.getImplementingGenModel(genFeature).isVirtualDelegation()) ]
+				[genFeature.getImportedType(genClass)/] [genFeature.getSafeName()/] = ([genFeature.getImportedType(genClass)/])eVirtualGet([genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/]);
+    [else][if (genFeature.isVolatile() or genClass.getImplementingGenModel(genFeature).isDynamicDelegation()) ]
+				[genFeature.getImportedType(genClass)/] [genFeature.getSafeName()/] = [if (genFeature.isResolveProxies()) ]basicGet[genFeature.getAccessorName()/][else][genFeature.getGetAccessor()/][/if]();
+    [/if][/if]
+				if ([genFeature.getSafeName()/] != null)
+    [if (genFeature.isEffectiveContains()) ]
+					msgs = (([genModel.getImportedName('org.eclipse.emf.ecore.InternalEObject')/])[genFeature.getSafeName()/]).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - [genClass.getQualifiedFeatureID(genFeature)/][negativeOffsetCorrection/], null, msgs);
+    [else]
+      [let reverseFeature : GenFeature = genFeature.getReverse()]
+        [let targetClass : GenClass = reverseFeature.genClass]
+          [let reverseOffsetCorrection : String = if (targetClass.hasOffsetCorrection()) then ' + ' + genClass.getOffsetCorrectionField(genFeature) else '' endif]
+					msgs = (([genModel.getImportedName('org.eclipse.emf.ecore.InternalEObject')/])[genFeature.getSafeName()/]).eInverseRemove(this, [targetClass.getQualifiedFeatureID(reverseFeature)/][reverseOffsetCorrection/], [targetClass.getRawImportedInterfaceName()/].class, msgs);
+          [/let]
+        [/let]
+      [/let]
+    [/if]
+				return basicSet[genFeature.getAccessorName()/](([genFeature.getImportedType(genClass)/])otherEnd, msgs);
+  [/if][/if]
+[/for]
+		}
+[if (genModel.minimalReflectiveMethods) ]
+		return super.eInverseAdd(otherEnd, featureID, msgs);
+[else]
+		return eDynamicInverseAdd(otherEnd, featureID, msgs);
+[/if]
+	}
+
+[/if]
+[if (isImplementation and not genModel.reflectiveDelegation and genClass.implementsAnyEInverseRemoveGenFeatures()) ]
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+  [if (genModel.useClassOverrideAnnotation()) ]
+	@Override
+  [/if]
+	public [genModel.getImportedName('org.eclipse.emf.common.notify.NotificationChain')/] eInverseRemove([genModel.getImportedName('org.eclipse.emf.ecore.InternalEObject')/] otherEnd, int featureID, [genModel.getImportedName('org.eclipse.emf.common.notify.NotificationChain')/] msgs) {
+		switch (featureID[negativeOffsetCorrection/]) {
+[for (genFeature : GenFeature | genClass.getEInverseRemoveGenFeatures())]
+			case [genClass.getQualifiedFeatureID(genFeature)/]:
+  [if (genFeature.isListType()) ]
+    [if (genFeature.isMapType() and genFeature.isEffectiveSuppressEMFTypes()) ]
+				return (([genModel.getImportedName('org.eclipse.emf.ecore.util.InternalEList')/][singleWildcard/])(([genModel.getImportedName('org.eclipse.emf.common.util.EMap')/].InternalMapView[genFeature.getImportedMapTemplateArguments(genClass)/])[genFeature.getGetAccessor()/]()).eMap()).basicRemove(otherEnd, msgs);
+    [else][if (genFeature.isWrappedFeatureMapType()) ]
+				return (([genModel.getImportedName('org.eclipse.emf.ecore.util.InternalEList')/][singleWildcard/])(([genModel.getImportedName('org.eclipse.emf.ecore.util.FeatureMap')/].Internal.Wrapper)[genFeature.getGetAccessor()/]()).featureMap()).basicRemove(otherEnd, msgs);
+    [else]
+				return (([genModel.getImportedName('org.eclipse.emf.ecore.util.InternalEList')/][singleWildcard/])[genFeature.getGetAccessor()/]()).basicRemove(otherEnd, msgs);
+    [/if][/if]
+  [else ][if (genFeature.isContainer() and not genFeature.isBasicSet()) ]
+				return eBasicSetContainer(null, [genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/], msgs);
+  [else][if (genFeature.isUnsettable()) ]
+				return basicUnset[genFeature.getAccessorName()/](msgs);
+  [else]
+				return basicSet[genFeature.getAccessorName()/](null, msgs);
+  [/if][/if][/if]
+[/for]
+		}
+[if (genModel.minimalReflectiveMethods) ]
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+[else]
+		return eDynamicInverseRemove(otherEnd, featureID, msgs);
+[/if]
+	}
+
+[/if]
+[if (isImplementation and not genModel.reflectiveDelegation and genClass.implementsAnyEBasicRemoveFromContainerGenFeatures()) ]
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+  [if (genModel.useClassOverrideAnnotation()) ]
+	@Override
+  [/if]
+	public [genModel.getImportedName('org.eclipse.emf.common.notify.NotificationChain')/] eBasicRemoveFromContainerFeature([genModel.getImportedName('org.eclipse.emf.common.notify.NotificationChain')/] msgs) {
+		switch (eContainerFeatureID()[negativeOffsetCorrection/]) {
+[for (genFeature : GenFeature | genClass.getEBasicRemoveFromContainerGenFeatures())]
+  [let reverseFeature : GenFeature = genFeature.getReverse()]
+    [let targetClass : GenClass = reverseFeature.genClass]
+      [let reverseOffsetCorrection : String = if (targetClass.hasOffsetCorrection()) then ' + ' + genClass.getOffsetCorrectionField(genFeature) else '' endif]
+			case [genClass.getQualifiedFeatureID(genFeature)/]:
+				return eInternalContainer().eInverseRemove(this, [targetClass.getQualifiedFeatureID(reverseFeature)/][reverseOffsetCorrection/], [targetClass.getRawImportedInterfaceName()/].class, msgs);
+      [/let]
+    [/let]
+  [/let]
+[/for]
+		}
+[if (genModel.minimalReflectiveMethods) ]
+		return super.eBasicRemoveFromContainerFeature(msgs);
+[else]
+		return eDynamicBasicRemoveFromContainer(msgs);
+[/if]
+	}
+
+[/if]
+[if (isImplementation and not genModel.reflectiveDelegation and genClass.implementsAnyEGetGenFeatures()) ]
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+  [if (genModel.useClassOverrideAnnotation()) ]
+	@Override
+  [/if]
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID[negativeOffsetCorrection/]) {
+[for (genFeature : GenFeature | genClass.getEGetGenFeatures())]
+			case [genClass.getQualifiedFeatureID(genFeature)/]:
+  [if (genFeature.isPrimitiveType()) ]
+    [if (isJDK50) ]
+				return [genFeature.getGetAccessor()/]();
+    [else][if (genFeature.isBooleanType()) ]
+				return [genFeature.getGetAccessor()/]() ? Boolean.TRUE : Boolean.FALSE;
+    [else]
+				return new [genFeature.getObjectType(genClass)/]([genFeature.getGetAccessor()/]());
+    [/if][/if]
+  [else][if (genFeature.isResolveProxies() and not genFeature.isListType()) ]
+				if (resolve) return [genFeature.getGetAccessor()/]();
+				return basicGet[genFeature.getAccessorName()/]();
+  [else][if (genFeature.isMapType()) ]
+    [if (genFeature.isEffectiveSuppressEMFTypes()) ]
+				if (coreType) return (([genModel.getImportedName('org.eclipse.emf.common.util.EMap')/].InternalMapView[genFeature.getImportedMapTemplateArguments(genClass)/])[genFeature.getGetAccessor()/]()).eMap();
+				else return [genFeature.getGetAccessor()/]();
+    [else]
+				if (coreType) return [genFeature.getGetAccessor()/]();
+				else return [genFeature.getGetAccessor()/]().map();
+    [/if]
+  [else][if (genFeature.isWrappedFeatureMapType()) ]
+				if (coreType) return (([genModel.getImportedName('org.eclipse.emf.ecore.util.FeatureMap')/].Internal.Wrapper)[genFeature.getGetAccessor()/]()).featureMap();
+				return [genFeature.getGetAccessor()/]();
+  [else][if (genFeature.isFeatureMapType()) ]
+				if (coreType) return [genFeature.getGetAccessor()/]();
+				return (([genModel.getImportedName('org.eclipse.emf.ecore.util.FeatureMap')/].Internal)[genFeature.getGetAccessor()/]()).getWrapper();
+  [else]
+				return [genFeature.getGetAccessor()/]();
+  [/if][/if][/if][/if][/if]
+[/for]
+		}
+[if (genModel.minimalReflectiveMethods) ]
+		return super.eGet(featureID, resolve, coreType);
+[else]
+		return eDynamicGet(featureID, resolve, coreType);
+[/if]
+	}
+
+[/if]
+[if (isImplementation and not genModel.reflectiveDelegation and genClass.implementsAnyESetGenFeatures()) ]
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+  [if (genModel.useGenerics()) ]
+    [if (genClass.getESetGenFeatures()->filter(GenFeature)->select(f : GenFeature| f.isUncheckedCast(genClass) and not f.isFeatureMapType() and not f.isMapType())->notEmpty()) ]
+	@SuppressWarnings("unchecked")
+    [/if]
+  [/if]
+  [if (genModel.useClassOverrideAnnotation()) ]
+	@Override
+  [/if]
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID[negativeOffsetCorrection/]) {
+  [for (genFeature : GenFeature | genClass.getESetGenFeatures())]
+			case [genClass.getQualifiedFeatureID(genFeature)/]:
+    [if (genFeature.isListType()) ]
+      [if (genFeature.isWrappedFeatureMapType()) ]
+				(([genModel.getImportedName('org.eclipse.emf.ecore.util.FeatureMap')/].Internal)(([genModel.getImportedName('org.eclipse.emf.ecore.util.FeatureMap')/].Internal.Wrapper)[genFeature.getGetAccessor()/]()).featureMap()).set(newValue);
+      [else][if (genFeature.isFeatureMapType()) ]
+				(([genModel.getImportedName('org.eclipse.emf.ecore.util.FeatureMap')/].Internal)[genFeature.getGetAccessor()/]()).set(newValue);
+      [else][if (genFeature.isMapType()) ]
+        [if (genFeature.isEffectiveSuppressEMFTypes()) ]
+				(([genModel.getImportedName('org.eclipse.emf.ecore.EStructuralFeature')/].Setting)(([genModel.getImportedName('org.eclipse.emf.common.util.EMap')/].InternalMapView[genFeature.getImportedMapTemplateArguments(genClass)/])[genFeature.getGetAccessor()/]()).eMap()).set(newValue);
+        [else]
+				(([genModel.getImportedName('org.eclipse.emf.ecore.EStructuralFeature')/].Setting)[genFeature.getGetAccessor()/]()).set(newValue);
+        [/if]
+      [else]
+				[genFeature.getGetAccessor()/]().clear();
+				[genFeature.getGetAccessor()/]().addAll(([genModel.getImportedName('java.util.Collection')/][if (isJDK50) ]<? extends [genFeature.getListItemType(genClass)/]>[/if])newValue);
+      [/if][/if][/if]
+    [else][if (not isJDK50 and genFeature.isPrimitiveType()) ]
+				set[genFeature.getAccessorName()/]((([genFeature.getObjectType(genClass)/])newValue).[genFeature.getPrimitiveValueFunction()/]());
+    [else]
+				set[genFeature.getAccessorName()/]([if (genFeature.getTypeGenDataType() = null or not genFeature.getTypeGenDataType().isObjectType() or genFeature.getRawType() <> genFeature.getType(genClass)) ]([genFeature.getObjectType(genClass)/])[/if]newValue);
+    [/if][/if]
+				return;
+  [/for]
+		}
+  [if (genModel.minimalReflectiveMethods) ]
+		super.eSet(featureID, newValue);
+  [else]
+		eDynamicSet(featureID, newValue);
+  [/if]
+	}
+
+[/if]
+[if (isImplementation and not genModel.reflectiveDelegation and genClass.implementsAnyEUnsetGenFeatures()) ]
+[genClass.eUnset(genModel, negativeOffsetCorrection)/]
+[/if]
+[if (isImplementation and not genModel.reflectiveDelegation and genClass.implementsAnyEIsSetGenFeatures()) ]
+[genClass.eIsSet(genModel, positiveOffsetCorrection, negativeOffsetCorrection)/]
+[/if]
+[if (isImplementation and (not genClass.getMixinGenFeatures()->isEmpty() or genClass.hasOffsetCorrection() and not genClass.genFeatures->isEmpty())) ]
+  [if (not genClass.getMixinGenFeatures()->isEmpty()) ]
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+    [if (genModel.useClassOverrideAnnotation()) ]
+	@Override
+    [/if]
+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class[singleWildcard/] baseClass) {
+    [for (mixinGenClass : GenClass | genClass.getMixinGenClasses())]
+		if (baseClass == [mixinGenClass.getRawImportedInterfaceName()/].class) {
+			switch (derivedFeatureID[negativeOffsetCorrection/]) {
+      [for (genFeature : GenFeature | mixinGenClass.genFeatures)]
+				case [genClass.getQualifiedFeatureID(genFeature)/]: return [mixinGenClass.getQualifiedFeatureID(genFeature)/];
+      [/for]
+				default: return -1;
+			}
+		}
+    [/for]
+		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+	}
+  [/if]
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+  [if (genModel.useClassOverrideAnnotation()) ]
+	@Override
+  [/if]
+	public int eDerivedStructuralFeatureID(int baseFeatureID, Class[singleWildcard/] baseClass) {
+  [for (mixinGenClass : GenClass | genClass.getMixinGenClasses())]
+		if (baseClass == [mixinGenClass.getRawImportedInterfaceName()/].class) {
+			switch (baseFeatureID) {
+    [for (genFeature : GenFeature | mixinGenClass.genFeatures)]
+				case [mixinGenClass.getQualifiedFeatureID(genFeature)/]: return [genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/];
+    [/for]
+				default: return -1;
+			}
+		}
+  [/for]
+  [if (genClass.hasOffsetCorrection() and not genClass.genFeatures->isEmpty()) ]
+		if (baseClass == [genClass.getRawImportedInterfaceName()/].class) {
+			switch (baseFeatureID[negativeOffsetCorrection/]) {
+    [for (genFeature : GenFeature | genClass.genFeatures)]
+				case [genClass.getQualifiedFeatureID(genFeature)/]: return [genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/];
+    [/for]
+				default: return -1;
+			}
+		}
+  [/if]
+		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+	}
+
+[/if]
+[if (genModel.operationReflection
+		and isImplementation
+		and (not genClass.getMixinGenOperations()->isEmpty()
+			or not genClass.overridesGenOperations()
+			or genClass.hasOffsetCorrection() and not genClass.genOperations->isEmpty()))]
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+  [if (genModel.useClassOverrideAnnotation()) ]
+	@Override
+  [/if]
+	public int eDerivedOperationID(int baseOperationID, Class[singleWildcard/] baseClass) {
+  [for (extendedGenClass : GenClass | genClass.getExtendedGenClasses())]
+    [let extendedImplementedGenOperations : Sequence(GenOperation) = extendedGenClass.getImplementedGenOperations()]
+	  [let implementedGenOperations : Sequence(GenOperation)  = genClass.getImplementedGenOperations()]
+    [if (not genClass.overridesExtendedGenOperations(extendedGenClass)) ]
+		if (baseClass == [extendedGenClass.getRawImportedInterfaceName()/].class) {
+			switch (baseOperationID) {
+      [for (genOperation : GenOperation | extendedImplementedGenOperations)]
+        [let overrideGenOperation : GenOperation = genClass.getOverrideGenOperation(genOperation)]
+          [if (implementedGenOperations->includes(overrideGenOperation)) ]
+				case [extendedGenClass.getQualifiedOperationID(genOperation)/]: return [genClass.getQualifiedOperationID(overrideGenOperation)/][positiveOperationOffsetCorrection/];
+          [/if]
+        [/let]
+      [/for]
+				default: return super.eDerivedOperationID(baseOperationID, baseClass);
+			}
+		}
+    [/if]
+      [/let]
+    [/let]
+  [/for]
+  [for (mixinGenClass : GenClass | genClass.getMixinGenClasses())]
+		if (baseClass == [mixinGenClass.getRawImportedInterfaceName()/].class) {
+			switch (baseOperationID) {
+    [for (genOperation : GenOperation | mixinGenClass.genOperations)]
+      [let overrideGenOperation : GenOperation = genClass.getOverrideGenOperation(genOperation)]
+				case [mixinGenClass.getQualifiedOperationID(genOperation)/]: return [genClass.getQualifiedOperationID(if (overrideGenOperation <> null) then overrideGenOperation else genOperation endif)/][positiveOperationOffsetCorrection/];
+      [/let]
+    [/for]
+				default: return -1;
+			}
+		}
+  [/for]
+  [if (genClass.hasOffsetCorrection() and not genClass.genOperations->isEmpty()) ]
+		if (baseClass == [genClass.getRawImportedInterfaceName()/].class) {
+			switch (baseOperationID[negativeOperationOffsetCorrection/]) {
+    [for (genOperation : GenOperation | genClass.genOperations)]
+				case [genClass.getQualifiedOperationID(genOperation)/]: return [genClass.getQualifiedOperationID(genOperation)/][positiveOperationOffsetCorrection/];
+    [/for]
+				default: return -1;
+			}
+		}
+  [/if]
+		return super.eDerivedOperationID(baseOperationID, baseClass);
+	}
+
+[/if]
+[if (isImplementation and genModel.isVirtualDelegation())]
+  [comment][let eVirtualValuesField : String = genClass.getEVirtualValuesField()][/comment]
+    [if (genClass.getEVirtualValuesField() <> null) ]
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+      [if (genModel.useClassOverrideAnnotation()) ]
+	@Override
+      [/if]
+	protected Object['[]'/] eVirtualValues() {
+		return [genClass.getEVirtualValuesField()/];
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+      [if (genModel.useClassOverrideAnnotation()) ]
+	@Override
+      [/if]
+	protected void eSetVirtualValues(Object['[]'/] newValues) {
+		[genClass.getEVirtualValuesField()/] = newValues;
+	}
+
+    [/if]
+    [let eVirtualIndexBitFields : Sequence(String) = genClass.getEVirtualIndexBitFields()]
+      [if (not eVirtualIndexBitFields->isEmpty())]
+        [let allEVirtualIndexBitFields : Sequence(String) = genClass.getAllEVirtualIndexBitFields()]
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+        [if (genModel.useClassOverrideAnnotation()) ]
+	@Override
+        [/if]
+	protected int eVirtualIndexBits(int offset) {
+		switch (offset) {
+        [for (field : String | allEVirtualIndexBitFields)]
+			case [i - 1/] :
+				return [field/];
+        [/for]
+			default :
+				throw new IndexOutOfBoundsException();
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+        [if (genModel.useClassOverrideAnnotation()) ]
+	@Override
+        [/if]
+	protected void eSetVirtualIndexBits(int offset, int newIndexBits) {
+		switch (offset) {
+        [for (field : String | allEVirtualIndexBitFields)]
+			case [i - 1/] :
+				[field/] = newIndexBits;
+				break;
+        [/for]
+			default :
+				throw new IndexOutOfBoundsException();
+		}
+	}
+
+        [/let]
+      [/if]
+    [/let]
+  [comment][/let][/comment]
+[/if]
+[if (genModel.operationReflection and isImplementation and not genClass.getImplementedGenOperations()->isEmpty()) ]
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+  [if (genModel.useClassOverrideAnnotation()) ]
+	@Override
+  [/if]
+  [let genOpList : Sequence(GenOperation) = if (genModel.minimalReflectiveMethods) then genClass.getImplementedGenOperations() else genClass.getAllGenOperations() endif]
+    [if (genOpList.genParameters
+		->flatten()
+		->filter(GenParameter)
+		->select(genParameter : GenParameter | genParameter.isUncheckedCast())
+		->notEmpty())]
+	@SuppressWarnings("unchecked")
+    [/if]
+	public Object eInvoke(int operationID, [genModel.getImportedName('org.eclipse.emf.common.util.EList')/][singleWildcard/] arguments) throws [genModel.getImportedName(if (isGWT) then 'org.eclipse.emf.common.util.InvocationTargetException' else 'java.lang.reflect.InvocationTargetException' endif)/] {
+		switch (operationID[negativeOperationOffsetCorrection/]) {
+[for (genOperation : GenOperation | genOpList)]
+  [let genParameters : OrderedSet(GenParameter) = genOperation.genParameters]
+    [let size : Integer = genParameters->size()]
+			case [genClass.getQualifiedOperationID(genOperation)/]:
+      [if (genOperation.isVoid()) ]
+				[genOperation.getName()/]([for (genParameter : GenParameter | genParameters)][if (not isJDK50 and genParameter.isPrimitiveType()) ]([/if][if (genParameter.getTypeGenDataType() = null or not genParameter.getTypeGenDataType().isObjectType() or genParameter.getRawType() <> genParameter.getType(genClass)) ]([genParameter.getObjectType(genClass)/])[/if]arguments.get([i/])[if (not isJDK50 and genParameter.isPrimitiveType()) ]).[genParameter.getPrimitiveValueFunction()/]()[/if][if (size > 1 and i < size) ], [/if][/for]);
+				return null;
+      [else]
+				return [if (not isJDK50 and genOperation.isPrimitiveType())]new [genOperation.getObjectType(genClass)/]([/if][genOperation.getName()/]([for (genParameter : GenParameter | genParameters)][if (not isJDK50 and genParameter.isPrimitiveType())]([/if][if (genParameter.getTypeGenDataType() = null or not genParameter.getTypeGenDataType().isObjectType() or genParameter.getRawType() <> genParameter.getType(genClass)) ]([genParameter.getObjectType(genClass)/])[/if]arguments.get([i - 1/])[if (not isJDK50 and genParameter.isPrimitiveType()) ]).[genParameter.getPrimitiveValueFunction()/]()[/if][if (i < size) ], [/if][/for])[if (not isJDK50 and genOperation.isPrimitiveType()) ])[/if];
+      [/if]
+    [/let]
+  [/let]
+[/for]
+  [/let]
+		}
+[if (genModel.minimalReflectiveMethods) ]
+		return super.eInvoke(operationID, arguments);
+[else]
+		return eDynamicInvoke(operationID, arguments);
+[/if]
+	}
+
+[/if]
+[if (not genClass.hasImplementedToStringGenOperation() and isImplementation and not genModel.reflectiveDelegation and not genModel.isDynamicDelegation() and not genClass.getToStringGenFeatures()->isEmpty()) ]
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+  [if (genModel.useClassOverrideAnnotation()) ]
+	@Override
+  [/if]
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+    [for (genFeature : GenFeature | genClass.getToStringGenFeatures())]
+      [if (i = 1)]
+		result.append(" ([genFeature.getName()/]: ");[genModel.getNonNLS()/]
+      [else]
+		result.append(", [genFeature.getName()/]: ");[genModel.getNonNLS()/]
+      [/if]
+      [if (genFeature.isUnsettable() and not genFeature.isListType()) ]
+        [if (genModel.isVirtualDelegation() and not genFeature.isPrimitiveType()) ]
+		if (eVirtualIsSet([genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/])) result.append(eVirtualGet([genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/])); else result.append("<unset>");[genModel.getNonNLS()/]
+        [else]
+          [if (genClass.isFlag(genFeature)) ]
+            [if (genFeature.isBooleanType()) ]
+		if ([if (genClass.isESetFlag(genFeature)) ]([genClass.getESetFlagsField(genFeature)/] & [genFeature.getUpperName()/]_ESETFLAG) != 0[else][genFeature.getUncapName()/]ESet[/if]) result.append(([genClass.getFlagsField(genFeature)/] & [genFeature.getUpperName()/]_EFLAG) != 0); else result.append("<unset>");[genModel.getNonNLS()/]
+            [else]
+		if ([if (genClass.isESetFlag(genFeature)) ]([genClass.getESetFlagsField(genFeature)/] & [genFeature.getUpperName()/]_ESETFLAG) != 0[else][genFeature.getUncapName()/]ESet[/if]) result.append([genFeature.getUpperName()/]_EFLAG_VALUES['['/]([genClass.getFlagsField(genFeature)/] & [genFeature.getUpperName()/]_EFLAG) >>> [genFeature.getUpperName()/]_EFLAG_OFFSET]); else result.append("<unset>");[genModel.getNonNLS()/]
+            [/if]
+          [else]
+		if ([if (genClass.isESetFlag(genFeature)) ]([genClass.getESetFlagsField(genFeature)/] & [genFeature.getUpperName()/]_ESETFLAG) != 0[else][genFeature.getUncapName()/]ESet[/if]) result.append([genFeature.getSafeName()/]); else result.append("<unset>");[genModel.getNonNLS()/]
+          [/if]
+        [/if]
+      [else]
+        [if (genModel.isVirtualDelegation() and not genFeature.isPrimitiveType()) ]
+		result.append(eVirtualGet([genClass.getQualifiedFeatureID(genFeature)/][positiveOffsetCorrection/][if (not genFeature.isListType() and not genFeature.isReferenceType())], [genFeature.getEDefault()/][/if]));
+        [else]
+          [if (genClass.isFlag(genFeature)) ]
+          [if (genFeature.isBooleanType()) ]
+		result.append(([genClass.getFlagsField(genFeature)/] & [genFeature.getUpperName()/]_EFLAG) != 0);
+          [else]
+		result.append([genFeature.getUpperName()/]_EFLAG_VALUES['['/]([genClass.getFlagsField(genFeature)/] & [genFeature.getUpperName()/]_EFLAG) >>> [genFeature.getUpperName()/]_EFLAG_OFFSET]);
+          [/if]
+          [else]
+		result.append([genFeature.getSafeName()/]);
+          [/if]
+        [/if]
+      [/if]
+    [/for]
+		result.append(')');
+		return result.toString();
+	}
+
+[/if]
+[if (isImplementation and genClass.isMapEntry())]
+[let keyFeature : GenFeature = genClass.getMapEntryKeyFeature()]
+[let valueFeature : GenFeature = genClass.getMapEntryValueFeature()]
+[let objectType : String = genModel.getImportedName('java.lang.Object')]
+[let keyType : String = if isJDK50 then keyFeature.getObjectType(genClass) else objectType endif]
+[let valueType : String = if isJDK50 then valueFeature.getObjectType(genClass) else objectType endif]
+[let eMapType : String = genModel.getImportedName('org.eclipse.emf.common.util.EMap') + (if isJDK50 then '<' + keyType + ', ' + valueType + '>' else '' endif)]
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+      [if (isGWT) ]
+	@[genModel.getImportedName('com.google.gwt.user.client.rpc.GwtTransient')/]
+      [/if]
+	protected int hash = -1;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public int getHash() {
+		if (hash == -1) {
+			[objectType/] theKey = getKey();
+			hash = (theKey == null ? 0 : theKey.hashCode());
+		}
+		return hash;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setHash(int hash) {
+		this.hash = hash;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public [keyType/] getKey() {
+  [if (not isJDK50 and keyFeature.isPrimitiveType()) ]
+		return new [keyFeature.getObjectType(genClass)/](getTypedKey());
+  [else]
+		return getTypedKey();
+  [/if]
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setKey([keyType/] key) {
+  [if (keyFeature.isListType()) ]
+		getTypedKey().addAll([if (not genModel.useGenerics()) ]([genModel.getImportedName('java.util.Collection')/])[/if]key);
+  [else][if (isJDK50)]
+		setTypedKey(key);
+  [else][if (keyFeature.isPrimitiveType())]
+		setTypedKey((([keyFeature.getObjectType(genClass)/])key).[keyFeature.getPrimitiveValueFunction()/]());
+  [else]
+		setTypedKey(([keyFeature.getImportedType(genClass)/])key);
+  [/if][/if][/if]
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public [valueType/] getValue() {
+  [if (not isJDK50 and valueFeature.isPrimitiveType()) ]
+		return new [valueFeature.getObjectType(genClass)/](getTypedValue());
+  [else]
+		return getTypedValue();
+  [/if]
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public [valueType/] setValue([valueType/] value) {
+		[valueType/] oldValue = getValue();
+  [if (valueFeature.isListType()) ]
+		getTypedValue().clear();
+		getTypedValue().addAll([if (not genModel.useGenerics()) ]([genModel.getImportedName('java.util.Collection')/])[/if]value);
+  [else][if (isJDK50)]
+		setTypedValue(value);
+  [else][if (valueFeature.isPrimitiveType()) ]
+		setTypedValue((([valueFeature.getObjectType(genClass)/])value).[valueFeature.getPrimitiveValueFunction()/]());
+  [else]
+		setTypedValue(([valueFeature.getImportedType(genClass)/])value);
+  [/if][/if][/if]
+		return oldValue;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+  [if (genModel.useGenerics()) ]
+	@SuppressWarnings("unchecked")
+  [/if]
+	public [eMapType/] getEMap() {
+		[genModel.getImportedName('org.eclipse.emf.ecore.EObject')/] container = eContainer();
+		return container == null ? null : ([eMapType/])container.eGet(eContainmentFeature());
+	}
+
+[/let]
+[/let]
+[/let]
+[/let]
+[/let]
+[/let]
+[/if]
+} //[if (isInterface)] [genClass.getInterfaceName()/][else][genClass.getClassName()/][/if]
+[/template]
+
+[query public classFilePath(genClass : GenClass, isInterface : Boolean, isImplementation : Boolean) : String
+	= genClass.getGenModel().extractSourceDirectory(genClass.getGenModel().modelDirectory) + '/' +
+		if isInterface then
+			genClass.getQualifiedInterfaceName().toPath()
+		else
+			genClass.getQualifiedClassName().toPath()
+		endif +
+		'.java' /]
+
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/GenFacade.java b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/GenFacade.java
new file mode 100644
index 00000000000..31b9c62b4d2
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/GenFacade.java
@@ -0,0 +1,420 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2012 Obeo.
+ * 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:
+ *     Obeo - initial API and implementation
+ *     CEA LIST - Modification to support Facade code generation
+ *******************************************************************************/
+package org.eclipse.papyrus.facade.codegen.genfacade;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.acceleo.common.preference.AcceleoPreferences;
+import org.eclipse.acceleo.engine.event.IAcceleoTextGenerationListener;
+import org.eclipse.acceleo.engine.generation.strategy.IAcceleoGenerationStrategy;
+import org.eclipse.acceleo.engine.service.AbstractAcceleoGenerator;
+import org.eclipse.emf.common.util.BasicMonitor;
+import org.eclipse.emf.common.util.Monitor;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+
+/**
+ * Entry point of the 'GenFacade' generation module.
+ * 
+ * @generated
+ */
+public class GenFacade extends AbstractAcceleoGenerator {
+
+	/**
+	 * The name of the module.
+	 * 
+	 * @generated
+	 */
+	public static final String MODULE_FILE_NAME = "/org/eclipse/papyrus/facade/codegen/genfacade/GenFacade"; //$NON-NLS-1$
+
+	/**
+	 * The name of the templates that are to be generated.
+	 * 
+	 * @generated
+	 */
+	public static final String[] TEMPLATE_NAMES = { "GenAllGenClass" }; //$NON-NLS-1$
+
+	/**
+	 * The list of properties files from the launch parameters (Launch configuration).
+	 * 
+	 * @generated
+	 */
+	private List<String> propertiesFiles = new ArrayList<String>();
+
+	/**
+	 * Allows the public constructor to be used. Note that a generator created
+	 * this way cannot be used to launch generations before one of {@link #initialize(EObject, File, List)} or {@link #initialize(URI, File, List)} is
+	 * called.
+	 * <p>
+	 * The main reason for this constructor is to allow clients of this generation to call it from another Java file, as it allows for the retrieval
+	 * of {@link #getProperties()} and {@link #getGenerationListeners()}.
+	 * </p>
+	 * 
+	 * @generated
+	 */
+	public GenFacade() {
+        // Empty implementation
+    }
+
+	/**
+	 * This allows clients to instantiates a generator with all required information.
+	 * 
+	 * @param modelURI
+	 *        URI where the model on which this generator will be used is located.
+	 * @param targetFolder
+	 *        This will be used as the output folder for this generation : it will be the base path
+	 *        against which all file block URLs will be resolved.
+	 * @param arguments
+	 *        If the template which will be called requires more than one argument taken from the model,
+	 *        pass them here.
+	 * @throws IOException
+	 *         This can be thrown in three scenarios : the module cannot be found, it cannot be loaded, or
+	 *         the model cannot be loaded.
+	 * @generated
+	 */
+	public GenFacade(URI modelURI, File targetFolder, List<? extends Object> arguments) throws IOException {
+        initialize(modelURI, targetFolder, arguments);
+    }
+
+	/**
+	 * This allows clients to instantiates a generator with all required information.
+	 * 
+	 * @param model
+	 *        We'll iterate over the content of this element to find Objects matching the first parameter
+	 *        of the template we need to call.
+	 * @param targetFolder
+	 *        This will be used as the output folder for this generation : it will be the base path
+	 *        against which all file block URLs will be resolved.
+	 * @param arguments
+	 *        If the template which will be called requires more than one argument taken from the model,
+	 *        pass them here.
+	 * @throws IOException
+	 *         This can be thrown in two scenarios : the module cannot be found, or it cannot be loaded.
+	 * @generated
+	 */
+	public GenFacade(EObject model, File targetFolder, List<? extends Object> arguments) throws IOException {
+        initialize(model, targetFolder, arguments);
+    }
+
+	/**
+	 * This can be used to launch the generation from a standalone application.
+	 * 
+	 * @param args
+	 *        Arguments of the generation.
+	 * @generated
+	 */
+	public static void main(String[] args) {
+        try {
+            if (args.length < 2) {
+                System.out.println("Arguments not valid : {model, folder}.");
+            } else {
+                URI modelURI = URI.createFileURI(args[0]);
+                File folder = new File(args[1]);
+                
+                List<String> arguments = new ArrayList<String>();
+                
+                /*
+                 * If you want to change the content of this method, do NOT forget to change the "@generated"
+                 * tag in the Javadoc of this method to "@generated NOT". Without this new tag, any compilation
+                 * of the Acceleo module with the main template that has caused the creation of this class will
+                 * revert your modifications.
+                 */
+
+                /*
+                 * Add in this list all the arguments used by the starting point of the generation
+                 * If your main template is called on an element of your model and a String, you can
+                 * add in "arguments" this "String" attribute.
+                 */
+                
+                GenFacade generator = new GenFacade(modelURI, folder, arguments);
+                
+                /*
+                 * Add the properties from the launch arguments.
+                 * If you want to programmatically add new properties, add them in "propertiesFiles"
+                 * You can add the absolute path of a properties files, or even a project relative path.
+                 * If you want to add another "protocol" for your properties files, please override 
+                 * "getPropertiesLoaderService(AcceleoService)" in order to return a new property loader.
+                 * The behavior of the properties loader service is explained in the Acceleo documentation
+                 * (Help -> Help Contents).
+                 */
+                 
+                for (int i = 2; i < args.length; i++) {
+                    generator.addPropertiesFile(args[i]);
+                }
+                
+                generator.doGenerate(new BasicMonitor());
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+	/**
+	 * Launches the generation described by this instance.
+	 * 
+	 * @param monitor
+	 *        This will be used to display progress information to the user.
+	 * @throws IOException
+	 *         This will be thrown if any of the output files cannot be saved to disk.
+	 * @generated NOT
+	 */
+	@Override
+	public void doGenerate(Monitor monitor) throws IOException {
+		/*
+		 * TODO if you wish to change the generation as a whole, override this. The default behavior should
+		 * be sufficient in most cases. If you want to change the content of this method, do NOT forget to
+		 * change the "@generated" tag in the Javadoc of this method to "@generated NOT". Without this new tag,
+		 * any compilation of the Acceleo module with the main template that has caused the creation of this
+		 * class will revert your modifications. If you encounter a problem with an unresolved proxy during the
+		 * generation, you can remove the comments in the following instructions to check for problems. Please
+		 * note that those instructions may have a significant impact on the performances.
+		 */
+
+		//org.eclipse.emf.ecore.util.EcoreUtil.resolveAll(model);
+
+		/*
+		 * If you want to check for potential errors in your models before the launch of the generation, you
+		 * use the code below.
+		 */
+
+		//if (model != null && model.eResource() != null) {
+		//    List<org.eclipse.emf.ecore.resource.Resource.Diagnostic> errors = model.eResource().getErrors();
+		//    for (org.eclipse.emf.ecore.resource.Resource.Diagnostic diagnostic : errors) {
+		//        System.err.println(diagnostic.toString());
+		//    }
+		//}
+
+		//        super.doGenerate(monitor);
+		EObject model = getModel();
+		if(model instanceof org.eclipse.emf.codegen.ecore.genmodel.GenModel) {
+			((org.eclipse.emf.codegen.ecore.genmodel.GenModel)model).getStaticGenPackages();
+		}
+		boolean formerCacheFlag = AcceleoPreferences.isQueryCacheEnabled();
+		try {
+			AcceleoPreferences.switchQueryCache(false);
+			super.doGenerate(monitor);
+		} finally {
+			AcceleoPreferences.switchQueryCache(formerCacheFlag);
+		}
+	}
+
+	/**
+	 * If this generator needs to listen to text generation events, listeners can be returned from here.
+	 * 
+	 * @return List of listeners that are to be notified when text is generated through this launch.
+	 * @generated
+	 */
+	@Override
+	public List<IAcceleoTextGenerationListener> getGenerationListeners() {
+        List<IAcceleoTextGenerationListener> listeners = super.getGenerationListeners();
+        /*
+         * TODO if you need to listen to generation event, add listeners to the list here. If you want to change
+         * the content of this method, do NOT forget to change the "@generated" tag in the Javadoc of this method
+         * to "@generated NOT". Without this new tag, any compilation of the Acceleo module with the main template
+         * that has caused the creation of this class will revert your modifications.
+         */
+        return listeners;
+    }
+
+	/**
+	 * If you need to change the way files are generated, this is your entry point.
+	 * <p>
+	 * The default is {@link org.eclipse.acceleo.engine.generation.strategy.DefaultStrategy}; it generates files on the fly. If you only need to
+	 * preview the results, return a new {@link org.eclipse.acceleo.engine.generation.strategy.PreviewStrategy}. Both of these aren't aware of the
+	 * running Eclipse and can be used standalone.
+	 * </p>
+	 * <p>
+	 * If you need the file generation to be aware of the workspace (A typical example is when you wanna override files that are under clear case or
+	 * any other VCS that could forbid the overriding), then return a new
+	 * {@link org.eclipse.acceleo.engine.generation.strategy.WorkspaceAwareStrategy}. <b>Note</b>, however, that this <b>cannot</b> be used
+	 * standalone.
+	 * </p>
+	 * <p>
+	 * All three of these default strategies support merging through JMerge.
+	 * </p>
+	 * 
+	 * @return The generation strategy that is to be used for generations launched through this launcher.
+	 * @generated
+	 */
+	@Override
+	public IAcceleoGenerationStrategy getGenerationStrategy() {
+        return super.getGenerationStrategy();
+    }
+
+	/**
+	 * This will be called in order to find and load the module that will be launched through this launcher.
+	 * We expect this name not to contain file extension, and the module to be located beside the launcher.
+	 * 
+	 * @return The name of the module that is to be launched.
+	 * @generated
+	 */
+	@Override
+	public String getModuleName() {
+        return MODULE_FILE_NAME;
+    }
+
+	/**
+	 * If the module(s) called by this launcher require properties files, return their qualified path from
+	 * here.Take note that the first added properties files will take precedence over subsequent ones if they
+	 * contain conflicting keys.
+	 * 
+	 * @return The list of properties file we need to add to the generation context.
+	 * @see java.util.ResourceBundle#getBundle(String)
+	 * @generated
+	 */
+	@Override
+	public List<String> getProperties() {
+        /*
+         * If you want to change the content of this method, do NOT forget to change the "@generated"
+         * tag in the Javadoc of this method to "@generated NOT". Without this new tag, any compilation
+         * of the Acceleo module with the main template that has caused the creation of this class will
+         * revert your modifications.
+         */
+
+        /*
+         * TODO if your generation module requires access to properties files, add their qualified path to the list here.
+         * 
+         * Properties files can be located in an Eclipse plug-in or in the file system (all Acceleo projects are Eclipse
+         * plug-in). In order to use properties files located in an Eclipse plugin, you need to add the path of the properties
+         * files to the "propertiesFiles" list:
+         * 
+         * final String prefix = "platform:/plugin/";
+         * final String pluginName = "org.eclipse.acceleo.module.sample";
+         * final String packagePath = "/org/eclipse/acceleo/module/sample/properties/";
+         * final String fileName = "default.properties";
+         * propertiesFiles.add(prefix + pluginName + packagePath + fileName);
+         * 
+         * With this mechanism, you can load properties files from your plugin or from another plugin.
+         * 
+         * You may want to load properties files from the file system, for that you need to add the absolute path of the file:
+         * 
+         * propertiesFiles.add("C:\Users\MyName\MyFile.properties");
+         * 
+         * If you want to let your users add properties files located in the same folder as the model:
+         *
+         * if (EMFPlugin.IS_ECLIPSE_RUNNING && model != null && model.eResource() != null) { 
+         *     propertiesFiles.addAll(AcceleoEngineUtils.getPropertiesFilesNearModel(model.eResource()));
+         * }
+         * 
+         * To learn more about Properties Files, have a look at the Acceleo documentation (Help -> Help Contents).
+         */
+        return propertiesFiles;
+    }
+
+	/**
+	 * Adds a properties file in the list of properties files.
+	 * 
+	 * @param propertiesFile
+	 *        The properties file to add.
+	 * @generated
+	 * @since 3.1
+	 */
+	@Override
+	public void addPropertiesFile(String propertiesFile) {
+        this.propertiesFiles.add(propertiesFile);
+    }
+
+	/**
+	 * This will be used to get the list of templates that are to be launched by this launcher.
+	 * 
+	 * @return The list of templates to call on the module {@link #getModuleName()}.
+	 * @generated
+	 */
+	@Override
+	public String[] getTemplateNames() {
+        return TEMPLATE_NAMES;
+    }
+
+	/**
+	 * This can be used to update the resource set's package registry with all needed EPackages.
+	 * 
+	 * @param resourceSet
+	 *        The resource set which registry has to be updated.
+	 * @generated
+	 */
+	@Override
+	public void registerPackages(ResourceSet resourceSet) {
+        super.registerPackages(resourceSet);
+        if (!isInWorkspace(org.eclipse.emf.ecore.EcorePackage.class)) {
+            resourceSet.getPackageRegistry().put(org.eclipse.emf.ecore.EcorePackage.eINSTANCE.getNsURI(), org.eclipse.emf.ecore.EcorePackage.eINSTANCE);
+        }
+        if (!isInWorkspace(org.eclipse.emf.codegen.ecore.genmodel.GenModelPackage.class)) {
+            resourceSet.getPackageRegistry().put(org.eclipse.emf.codegen.ecore.genmodel.GenModelPackage.eINSTANCE.getNsURI(), org.eclipse.emf.codegen.ecore.genmodel.GenModelPackage.eINSTANCE);
+        }
+        
+        /*
+         * If you want to change the content of this method, do NOT forget to change the "@generated"
+         * tag in the Javadoc of this method to "@generated NOT". Without this new tag, any compilation
+         * of the Acceleo module with the main template that has caused the creation of this class will
+         * revert your modifications.
+         */
+        
+        /*
+         * If you need additional package registrations, you can register them here. The following line
+         * (in comment) is an example of the package registration for UML.
+         * 
+         * You can use the method  "isInWorkspace(Class c)" to check if the package that you are about to
+         * register is in the workspace.
+         * 
+         * To register a package properly, please follow the following conventions:
+         *
+         * If the package is located in another plug-in, already installed in Eclipse. The following content should
+         * have been generated at the beginning of this method. Do not register the package using this mechanism if
+         * the metamodel is located in the workspace.
+         *  
+         * if (!isInWorkspace(UMLPackage.class)) {
+         *     // The normal package registration if your metamodel is in a plugin.
+         *     resourceSet.getPackageRegistry().put(UMLPackage.eNS_URI, UMLPackage.eINSTANCE);
+         * }
+         * 
+         * If the package is located in another project in your workspace, the plugin containing the package has not
+         * been register by EMF and Acceleo should register it automatically. If you want to use the generator in
+         * stand alone, the regular registration (seen a couple lines before) is needed.
+         * 
+         * To learn more about Package Registration, have a look at the Acceleo documentation (Help -> Help Contents).
+         */
+    }
+
+	/**
+	 * This can be used to update the resource set's resource factory registry with all needed factories.
+	 * 
+	 * @param resourceSet
+	 *        The resource set which registry has to be updated.
+	 * @generated
+	 */
+	@Override
+	public void registerResourceFactories(ResourceSet resourceSet) {
+        super.registerResourceFactories(resourceSet);
+        /*
+         * If you want to change the content of this method, do NOT forget to change the "@generated"
+         * tag in the Javadoc of this method to "@generated NOT". Without this new tag, any compilation
+         * of the Acceleo module with the main template that has caused the creation of this class will
+         * revert your modifications.
+         */
+        
+        /*
+         * TODO If you need additional resource factories registrations, you can register them here. the following line
+         * (in comment) is an example of the resource factory registration for UML.
+         *
+         * If you want to use the generator in stand alone, the resource factory registration will be required.
+         *  
+         * To learn more about the registration of Resource Factories, have a look at the Acceleo documentation (Help -> Help Contents). 
+         */ 
+        
+        // resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(UMLResource.FILE_EXTENSION, UMLResource.Factory.INSTANCE);
+    }
+
+}
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/GenFacade.mtl b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/GenFacade.mtl
new file mode 100644
index 00000000000..3f688fde6df
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/GenFacade.mtl
@@ -0,0 +1,158 @@
+[comment]Copyright (c) 2008, 2012 Obeo.
+
+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:
+ Obeo - Initial API and implementation
+ CEA LIST - Modification to support Facade code generation[/comment]
+[comment encoding = UTF-8/]
+[module GenFacade('http://www.eclipse.org/emf/2002/Ecore', 'http://www.eclipse.org/emf/2002/GenModel')/]
+
+[import org::eclipse::emf::eef::codegen::ecore::model::buildproperties /]
+[import org::eclipse::emf::eef::codegen::ecore::model::AdapterFactoryClass /]
+[import org::eclipse::emf::eef::codegen::ecore::model::FactoryClass /]
+[import org::eclipse::papyrus::facade::codegen::genfacade::PackageClass /]
+[import org::eclipse::papyrus::facade::codegen::genfacade::Class /]
+[import org::eclipse::emf::eef::codegen::ecore::model::EnumClass /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenModel /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenPackage /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenClass /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenEnum /]
+[import org::eclipse::emf::eef::codegen::ecore::model::manifest /]
+[import org::eclipse::emf::eef::codegen::ecore::model::module_gwt_xml /]
+[import org::eclipse::emf::eef::codegen::ecore::model::Plugin /]
+[import org::eclipse::emf::eef::codegen::ecore::model::plugin_properties /]
+[import org::eclipse::emf::eef::codegen::ecore::model::plugin_xml /]
+[import org::eclipse::papyrus::facade::codegen::genfacade::ResourceClass /]
+[import org::eclipse::emf::eef::codegen::ecore::model::ResourceFactoryClass /]
+[import org::eclipse::emf::eef::codegen::ecore::model::SwitchClass /]
+[import org::eclipse::emf::eef::codegen::ecore::model::ValidatorClass /]
+[import org::eclipse::emf::eef::codegen::ecore::model::XmlProcessorClass /]
+[import org::eclipse::emf::eef::codegen::ecore::services::fileUtil /]
+[import org::eclipse::papyrus::facade::codegen::genfacade::WrapperClass /]
+[import org::eclipse::papyrus::facade::codegen::genfacade::LoaderClass /]
+[import org::eclipse::papyrus::facade::codegen::genfacade::AbstractRepresentingClass /]
+[import org::eclipse::papyrus::facade::codegen::genfacade::RepresentingElementAdapter /]
+[import org::eclipse::papyrus::facade::codegen::utils::FacadeCodegenUtils /]
+
+
+[**
+ * Generates all the classes of the Model plug-in from a genModel.
+ * 
+ * WARNING: The genModel passed to this template MUST be loaded and reconciled as in 
+ * org.eclipse.emf.codegen.ecore.genmodel.presentation.GeneratorUIUtil.loadGenModels()
+ * Otherwise canGenerate() will always return false, and invalid reference in the GenModel will cause problems.
+ * In order to prevent a reference to an Ecore UI plug-in, this is done in the eef ui plug-in.
+ * 
+*/]
+[template public GenAllGenClass(genModel : GenModel) ? (genModel.canGenerate())]
+	[comment @main /]
+	[if (not genModel.fileExistsModel(genModel.buildPropertiesFilePath()))]
+		[genModel.buildProperties()/]
+	[/if]
+
+	[comment from EMF codegen : Do allow an existing MANIFEST.MF to be overwritten, since it may have been created as part of an empty EMF project.
+        Use the existence of a plugin.xml as a guard against overwriting in a project that has already been generated. /]
+	[if (not genModel.fileExistsModel(genModel.pluginXmlFilePath()))]
+		[genModel.manifest()/]
+	[/if]
+
+	[comment @TODO See when and where GWT files are generated/]
+	[comment][genModel.moduleGwt()/][/comment]
+
+	[if (genModel.hasModelPluginClass())]
+		[genModel.plugin()/]
+	[/if]
+
+	[if (genModel.hasPluginSupport())]
+		[if (not genModel.sameModelEditProject() and not genModel.sameModelEditorProject())]
+			[if (genModel.bundleManifest and not genModel.fileExistsModel(genModel.manifestFilePath()))]
+				[genModel.manifest()/]
+			[/if]
+	
+			[if (not genModel.fileExistsModel(genModel.pluginXmlFilePath()))]
+				[genModel.pluginXml()/]
+			[/if]
+		[/if]
+	
+		[if (not genModel.fileExistsModel(genModel.pluginPropertiesFilePath()))]
+			[genModel.pluginProperties()/]
+		[/if]
+	
+		[if (not genModel.fileExistsModel(genModel.buildPropertiesFilePath()))]
+			[genModel.buildProperties()/]
+		[/if]
+	[/if]
+
+	[for (p : GenPackage | genModel.eAllContents(GenPackage))]
+		[if (p.canGenerate())]
+			[p.prepareCache()/][comment Create helpers to cache and supply information for unique naming./]
+
+			[copyEcore(p)/]
+
+			[initUtilsCaches()/]
+	
+			[for (genClass : GenClass | p.genClasses)]
+				[if (genClass.canGenerate())]
+					[if (not genClass.isExternalInterface() and (not genModel.suppressInterfaces or genClass.isInterface()))]
+						[genClass.genGenClass(true, false)/]
+					[/if]
+					[if (not genClass.isInterface())]
+						[genClass.genGenClass(if genModel.suppressInterfaces then true else false endif, true)/]
+					[/if]
+				[/if]
+			[/for]
+			[for (genEnum : GenEnum | p.genEnums)]
+				[if (genEnum.canGenerate())]
+					[genEnum.enumClass()/]
+				[/if]
+			[/for]
+	
+			[if (p.hasClassifiers())]
+	
+
+	
+				[if (not genModel.suppressEMFMetaData and not genModel.suppressInterfaces)]
+					[p.packageClass(true, false)/]
+				[/if]
+		
+				[p.packageClass(if genModel.suppressEMFMetaData or genModel.suppressInterfaces then true else false endif, true)/]
+		
+				[if (not genModel.suppressInterfaces)]
+					[p.factoryClass(true, false)/]
+				[/if]
+		
+				[p.factoryClass(if genModel.suppressInterfaces then true else false endif, true)/]
+		
+				[if (p.resource = GenResourceKind::XML)]
+					[p.xmlProcessorClass()/]
+				[/if]
+		
+				[comment][if (p.hasConstraints())]
+					[p.validatorClass()/]
+				[/if][/comment]
+		
+				[if (p.adapterFactory and p.genClasses->notEmpty())]
+					[p.switchClass()/]
+					[p.adapterFactoryClass()/]
+				[/if]
+			[/if]
+
+			[p.wrapperClass()/]
+			[p.loaderClass()/]
+			[p.abstractRepresentingClass()/]
+			[p.representingElementAdapterClass()/]
+
+		
+			[if (p.resource <> GenResourceKind::None)]
+				[p.resourceFactoryClass()/]
+				[p.resourceClass()/]
+			[/if]
+	
+			[p.clearCache()/]
+		[/if]
+	[/for]
+[/template]
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/LoaderClass.mtl b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/LoaderClass.mtl
new file mode 100644
index 00000000000..0be27c265bd
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/LoaderClass.mtl
@@ -0,0 +1,128 @@
+[comment]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:
+ Obeo - Initial API and implementation
+ CEA LIST - Modification to support Facade code generation[/comment]
+[comment encoding = UTF-8 /]
+[module LoaderClass('http://www.eclipse.org/emf/2002/GenModel', 'http://www.eclipse.org/emf/2002/Ecore')/]
+
+[import org::eclipse::emf::eef::codegen::ecore::services::common /]
+[import org::eclipse::emf::eef::codegen::ecore::services::header /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenModel /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenPackage /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenClass /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenClassifier /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenFeature /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenDataType /]
+[import org::eclipse::emf::eef::codegen::ecore::services::StringUtil /]
+
+
+[template public loaderClass(genPackage : GenPackage) { genModel : GenModel = genPackage.genModel; packageName : String = genPackage.getUtilitiesPackageName(); className : String = 'Loader'} ]
+[genModel.initializeImportManager(packageName, className)/]
+
+[genModel.getImportedName('org.eclipse.emf.common.util.URI')/]
+
+[file (genPackage.loaderPath(className), false, 'UTF-8')]
+[genModel.includeHeader()/]
+package [packageName/];
+[let content : String = genPackage.loaderFileContent(genModel, className)]
+[genModel.genSortedImports()/]
+[content/]
+[/let]
+[/file]
+[/template]
+
+[template protected loaderFileContent(genPackage : GenPackage, genModel : GenModel, className : String)]
+
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EFactory;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.xml.sax.SAXException;
+
+
+public class Loader {
+
+	public static Resource doLoad(InputStream inputStream, Map<?, ?> options, EFactory inputFactory, Resource res) throws IOException {
+		//System.err.println("Load : " + res);
+
+		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		DocumentBuilder db;
+
+		// Open XML
+		try {
+			db = dbf.newDocumentBuilder();
+			Document document = db.parse(inputStream);
+			Element root = document.getDocumentElement();
+
+			if(root.getNodeName().equals("source")) {
+				String umlFileURIAtt = root.getAttribute("uri");
+				URI umlFileURI = URI.createURI(umlFileURIAtt);
+
+				ResourceSet resSetUML = new ResourceSetImpl();
+				Resource resUML = resSetUML.getResource(umlFileURI, true);
+				if(resUML != null) {
+
+					Iterator<EObject> content = resUML.getContents().iterator();
+					ArrayList internalEObjectList = new ArrayList<>();
+
+					while(content.hasNext()) {
+						EObject umlModelElement = (EObject)content.next();
+						if(umlModelElement instanceof org.eclipse.uml2.uml.Element) {
+							EObject representing = Wrapper.getInstance().findOrCreateSpecific((org.eclipse.uml2.uml.Element)umlModelElement);
+	
+							if(representing != null) {
+									internalEObjectList.add(representing);
+							}
+						}
+					}
+
+					InternalEList<InternalEObject> internalEObjects = (InternalEList<InternalEObject>)(InternalEList<?>)res.getContents();
+					internalEObjects.addAllUnique(internalEObjectList);
+
+					return resUML;
+				} else {
+					throw new UnsupportedOperationException();
+				}
+			}
+		} catch (ParserConfigurationException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (SAXException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+
+		return null;
+
+	}
+}
+
+
+[/template]
+
+[query public loaderPath(genPackage : GenPackage, className : String) : String
+	= genPackage.genModel.extractSourceDirectory(genPackage.genModel.modelDirectory) + '/'+ genPackage.getUtilitiesPackageName().toPath() + '/' +
+		className+ '.java'/]
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/PackageClass.mtl b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/PackageClass.mtl
new file mode 100644
index 00000000000..0ccb37a9895
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/PackageClass.mtl
@@ -0,0 +1,1289 @@
+[comment]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:
+ Obeo - Initial API and implementation
+ CEA LIST - Modification to support Facade code generation[/comment]
+[comment encoding = UTF-8 /]
+[module PackageClass('http://www.eclipse.org/emf/2002/GenModel', 'http://www.eclipse.org/emf/2002/Ecore')/]
+
+[import org::eclipse::emf::eef::codegen::ecore::services::common /]
+[import org::eclipse::emf::eef::codegen::ecore::services::header /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenModel /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenPackage /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenClass /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenClassifier /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenEnum /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenEnumLiteral /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenDataType /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenFeature /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenOperation /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenParameter /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenTypeParameter /]
+[import org::eclipse::emf::eef::codegen::ecore::model::genpackage::EGenericType /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::EAnnotation /]
+[import org::eclipse::emf::eef::codegen::ecore::services::StringUtil /]
+
+[template public packageClass(genPackage : GenPackage, isInterface : Boolean, isImplementation : Boolean)]
+[comment]
+ /**
+ * <copyright>
+ *
+ * Copyright (c) 2002-2010 IBM Corporation and others.
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   IBM - Initial API and implementation
+ *
+ * </copyright>
+ */
+[/comment]
+[let genModel : GenModel = genPackage.genModel]
+[let packageName : String = genPackage.packageClassPackageName(isInterface)]
+[let className : String = genPackage.packageClassName(isImplementation)]
+
+[genModel.initializeImportManager(genPackage, packageName, className)/]
+
+[if (isImplementation)]
+[genModel.addPseudoImport('org.eclipse.emf.ecore.EPackage.Registry')/]
+[genModel.addPseudoImport('org.eclipse.emf.ecore.EPackage.Descriptor')/]
+[genModel.addPseudoImport('org.eclipse.emf.ecore.impl.EPackageImpl.EBasicWhiteList')/]
+[genModel.addPseudoImport('org.eclipse.emf.ecore.impl.EPackageImpl.EBasicWhiteList')/]
+[genModel.addPseudoImport('org.eclipse.emf.ecore.impl.MinimalEObjectImpl.Container.Dynamic')/]
+[if (genPackage.isLiteralsInterface())]
+	[genModel.addPseudoImport(genPackage.getQualifiedPackageInterfaceName() + '.Literals')/]
+[/if]
+[for (genClassifier : GenClassifier | genPackage.getOrderedGenClassifiers())]
+	[genModel.addPseudoImport(genPackage.getQualifiedPackageInterfaceName() + '.' + genPackage.getClassifierID(genClassifier))/]
+[/for]
+[/if]
+
+
+
+[file (packageClassPath(genPackage, isInterface, isImplementation), false, 'UTF-8')]
+[genModel.includeHeader()/]
+package [packageName/];
+[let content : String = genPackage.packageClassFileContent(isInterface, isImplementation, genModel, className)]
+[genModel.genSortedImports()/]
+
+[content.trim()/]
+[/let]
+[/file]
+
+
+
+[/let][comment className /]
+[/let][comment packageName /]
+[/let][comment genModel /]
+[/template]
+
+[template protected packageClassFileContent(genPackage : GenPackage, isInterface : Boolean, isImplementation : Boolean, genModel : GenModel, className : String)]
+[let publicStaticFinalFlag : String = if (isImplementation) then 'public static final ' else '' endif]
+[if (isImplementation)]
+[genModel.addPseudoImport('org.eclipse.emf.ecore.EPackage.Registry')/]
+[genModel.addPseudoImport('org.eclipse.emf.ecore.EPackage.Descriptor')/]
+[genModel.addPseudoImport('org.eclipse.emf.ecore.impl.EPackageImpl.EBasicWhiteList')/]
+[genModel.addPseudoImport('org.eclipse.emf.ecore.impl.MinimalEObjectImpl.Container')/]
+[genModel.addPseudoImport('org.eclipse.emf.ecore.impl.MinimalEObjectImpl.Container.Dynamic')/]
+  [if (genPackage.isLiteralsInterface())]
+[genModel.addPseudoImport(genPackage.getQualifiedPackageInterfaceName() + '.Literals')/]
+  [/if]
+  [for (genClassifier : GenClassifier | genPackage.getOrderedGenClassifiers())]
+    [genModel.addPseudoImport(genPackage.getQualifiedPackageInterfaceName() + '.' + genPackage.getClassifierID(genClassifier))/]
+  [/for]
+[/if]
+[if (isInterface)]
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ *   <li>each class,</li>
+ *   <li>each feature of each class,</li>
+  [if (genModel.operationReflection)]
+ *   <li>each operation of each class,</li>
+  [/if]
+ *   <li>each enum,</li>
+ *   <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+  [if (genPackage.hasDocumentation())]
+ * <!-- begin-model-doc -->
+ * [genPackage.getDocumentation(genModel.getIndentation())/]
+ * <!-- end-model-doc -->
+  [/if]
+ * @see [genPackage.getQualifiedFactoryInterfaceName()/]
+  [if (not genModel.suppressEMFModelTags)]
+    [let modelInfoLines : Sequence(String) = genPackage.getModelInfo().tokenize(genModel.getLineDelimiter() + '\r')]
+      [if (modelInfoLines->isEmpty())]
+ * @model
+      [else]
+ * @model [modelInfoLines->sep(genModel.getLineDelimiter() + ' *        ')/]
+      [/if]
+    [/let]
+  [/if]
+ * @generated
+ */
+[else][comment isInterface /]
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+[/if][comment isInterface /]
+[if (isImplementation)]
+public class [className/] extends [genModel.getImportedName('org.eclipse.emf.ecore.impl.EPackageImpl')/][if (not isInterface)] implements [genPackage.getImportedPackageInterfaceName()/][/if] {
+[else]
+public interface [className/] extends [genModel.getImportedName('org.eclipse.emf.ecore.EPackage')/] {
+[/if]
+[if (genModel.hasCopyrightField())]
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	[publicStaticFinalFlag/][genModel.getImportedName('java.lang.String')/] copyright = [genModel.getCopyrightFieldLiteral()/];[genModel.getNonNLS()/]
+
+[/if]
+[if (isInterface)]
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	[publicStaticFinalFlag/][genModel.getImportedName('java.lang.String')/] eNAME = "[genPackage.getPackageName()/]";[genModel.getNonNLS()/]
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	[publicStaticFinalFlag/][genModel.getImportedName('java.lang.String')/] eNS_URI = "[genPackage.getNSURI()/]";[genModel.getNonNLS()/]
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	[publicStaticFinalFlag/][genModel.getImportedName('java.lang.String')/] eNS_PREFIX = "[genPackage.getNSName()/]";[genModel.getNonNLS()/]
+  [if (genPackage.isContentType())]
+
+	/**
+	 * The package content type ID.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	[publicStaticFinalFlag/][genModel.getImportedName('java.lang.String')/] eCONTENT_TYPE = "[genPackage.contentTypeIdentifier/]";[genModel.getNonNLS()/]
+  [/if]
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	[publicStaticFinalFlag/][genPackage.getPackageInterfaceName()/] eINSTANCE = [genPackage.getQualifiedPackageClassName()/].init();
+
+  [for (genClassifier : GenClassifier  | genPackage.getOrderedGenClassifiers())]
+	/**
+    [if (genClassifier.oclIsKindOf(GenClass))]
+      [let genClass : GenClass = genClassifier.oclAsType(GenClass)]
+        [if (not genClass.isInterface())]
+	 * The meta object id for the '{@link [genClass.getQualifiedClassName()/] <em>[genClass.getFormattedName()/]</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see [genClass.getQualifiedClassName()/]
+        [else]
+	 * The meta object id for the '{@link [genClass.getQualifiedInterfaceName()/] <em>[genClass.getFormattedName()/]</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see [genClass.getQualifiedInterfaceName()/]
+        [/if]
+      [/let]
+    [else][if (genClassifier.oclIsKindOf(GenEnum))]
+      [let genEnum : GenEnum = genClassifier.oclAsType(GenEnum)]
+	 * The meta object id for the '{@link [genEnum.getQualifiedName()/] <em>[genEnum.getFormattedName()/]</em>}' enum.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see [genEnum.getQualifiedName()/]
+      [/let]
+    [else][if (genClassifier.oclIsKindOf(GenDataType))]
+      [let genDataType : GenDataType = genClassifier.oclAsType(GenDataType)]
+	 * The meta object id for the '<em>[genDataType.getFormattedName()/]</em>' data type.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+        [if (not genDataType.isPrimitiveType() and not genDataType.isArrayType())]
+	 * @see [genDataType.getRawInstanceClassName()/]
+        [/if]
+      [/let]
+    [/if][/if][/if]
+	 * @see [genPackage.getQualifiedPackageClassName()/]#get[genClassifier.getClassifierAccessorName()/]()
+	 * @generated
+	 */
+	[publicStaticFinalFlag/]int [genPackage.getClassifierID(genClassifier)/] = [genPackage.getClassifierValue(genClassifier)/];
+
+    [if (genClassifier.oclIsKindOf(GenClass))]
+      [let genClass : GenClass = genClassifier.oclAsType(GenClass)]
+        [for (genFeature : GenFeature | genClass.getAllGenFeatures())]
+	/**
+	 * The feature id for the '<em><b>[genFeature.getFormattedName()/]</b></em>' [genFeature.getFeatureKind()/].
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	[publicStaticFinalFlag/]int [genClass.getFeatureID(genFeature)/] = [genClass.getFeatureValue(genFeature)/];
+
+        [/for]
+	/**
+	 * The number of structural features of the '<em>[genClass.getFormattedName()/]</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	[publicStaticFinalFlag/]int [genClass.getFeatureCountID()/] = [genClass.getFeatureCountValue()/];
+
+        [if (genModel.operationReflection)]
+          [for (genOperation : GenOperation | genClass.getAllGenOperations(false))]
+            [if (genClass.getOverrideGenOperation(genOperation) = null)]
+	/**
+	 * The operation id for the '<em>[genOperation.getFormattedName()/]</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	[publicStaticFinalFlag/]int [genClass.getOperationID(genOperation, false)/] = [genClass.getOperationValue(genOperation)/];
+
+            [/if]
+          [/for]
+	/**
+	 * The number of operations of the '<em>[genClass.getFormattedName()/]</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	[publicStaticFinalFlag/]int [genClass.getOperationCountID()/] = [genClass.getOperationCountValue()/];
+
+        [/if]
+      [/let]
+    [/if]
+  [/for]
+[/if]
+[if (isImplementation)]
+  [if (genPackage.isLoadingInitialization())]
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected String packageFilename = "[genPackage.getSerializedPackageFilename()/]";[genModel.getNonNLS()/]
+
+  [/if]
+  [for (genClassifier : GenClassifier | genPackage.genClassifiers)]
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private [genClassifier.getImportedMetaType()/] [genClassifier.getClassifierInstanceName()/] = null;
+
+  [/for]
+	/**
+	 * Creates an instance of the model <b>Package</b>, registered with
+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * package URI value.
+	 * <p>Note: the correct way to create the package is via the static
+	 * factory method {@link #init init()}, which also performs
+	 * initialization of the package, or returns the registered package,
+	 * if one already exists.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see [genPackage.getQualifiedPackageInterfaceName()/]#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private [genPackage.getPackageClassName()/]() {
+		super(eNS_URI, [genPackage.getQualifiedEFactoryInstanceAccessor()/]);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 * 
+	 * <p>This method is used to initialize {@link [genPackage.getImportedPackageInterfaceName()/]#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #eNS_URI
+  [if (not genPackage.isLoadedInitialization())]
+	 * @see #createPackageContents()
+	 * @see #initializePackageContents()
+  [/if]
+	 * @generated
+	 */
+	public static [genPackage.getImportedPackageInterfaceName()/] init() {
+		if (isInited) return ([genPackage.getImportedPackageInterfaceName()/])[genModel.getImportedName('org.eclipse.emf.ecore.EPackage')/].Registry.INSTANCE.getEPackage([genPackage.getImportedPackageInterfaceName()/].eNS_URI);
+
+  [if (genModel.runtimePlatform = GenRuntimePlatform::GWT)]
+		initializeRegistryHelpers();
+
+  [/if]
+		// Obtain or create and register package
+		[genPackage.getPackageClassName()/] the[genPackage.getBasicPackageName()/] = ([genPackage.getPackageClassName()/])([genModel.getImportedName('org.eclipse.emf.ecore.EPackage')/].Registry.INSTANCE.get(eNS_URI) instanceof [genPackage.getPackageClassName()/] ? [genModel.getImportedName('org.eclipse.emf.ecore.EPackage')/].Registry.INSTANCE.get(eNS_URI) : new [genPackage.getPackageClassName()/]());
+
+		isInited = true;
+
+  [if (genPackage.getPackageSimpleDependencies()->notEmpty())]
+		// Initialize simple dependencies
+    [for (dep : GenPackage | genPackage.getPackageSimpleDependencies())]
+		[dep.getImportedPackageInterfaceName()/].eINSTANCE.eClass();
+    [/for]
+
+  [/if]
+  [if (genPackage.getPackageInterDependencies()->notEmpty())]
+		// Obtain or create and register interdependencies
+    [for (interdep : GenPackage | genPackage.getPackageInterDependencies())]
+		[interdep.getImportedPackageClassName()/] [genPackage.getPackageInstanceVariable(interdep)/] = ([interdep.getImportedPackageClassName()/])([genModel.getImportedName('org.eclipse.emf.ecore.EPackage')/].Registry.INSTANCE.getEPackage([interdep.getImportedPackageInterfaceName()/].eNS_URI) instanceof [interdep.getImportedPackageClassName()/] ? [genModel.getImportedName('org.eclipse.emf.ecore.EPackage')/].Registry.INSTANCE.getEPackage([interdep.getImportedPackageInterfaceName()/].eNS_URI) : [interdep.getImportedPackageInterfaceName()/].eINSTANCE);
+    [/for]
+
+  [/if]
+  [if (genPackage.isLoadedInitialization() or genPackage.getPackageLoadInterDependencies()->notEmpty())]
+		// Load packages
+    [if (genPackage.isLoadingInitialization())]
+		the[genPackage.getBasicPackageName()/].loadPackage();
+    [/if]
+    [for (interdep : GenPackage | genPackage.getPackageLoadInterDependencies())]
+      [if (interdep.isLoadingInitialization())]
+		[genPackage.getPackageInstanceVariable(interdep)/].loadPackage();
+      [/if]
+    [/for]
+
+  [/if]
+  [if (not genPackage.isLoadedInitialization() or genPackage.getPackageBuildInterDependencies()->notEmpty())]
+		// Create package meta-data objects
+    [if (not genPackage.isLoadedInitialization())]
+		the[genPackage.getBasicPackageName()/].createPackageContents();
+    [/if]
+    [for (interdep : GenPackage | genPackage.getPackageBuildInterDependencies())]
+		[genPackage.getPackageInstanceVariable(interdep)/].createPackageContents();
+    [/for]
+
+		// Initialize created meta-data
+    [if (not genPackage.isLoadedInitialization())]
+		the[genPackage.getBasicPackageName()/].initializePackageContents();
+    [/if]
+    [for (interdep : GenPackage | genPackage.getPackageBuildInterDependencies())]
+		[genPackage.getPackageInstanceVariable(interdep)/].initializePackageContents();
+    [/for]
+
+  [/if]
+  [if (genPackage.isLoadedInitialization() or genPackage.getPackageLoadInterDependencies()->notEmpty())]
+		// Fix loaded packages
+    [if (genPackage.isLoadedInitialization())]
+		the[genPackage.getBasicPackageName()/].fixPackageContents();
+    [/if]
+    [for (interdep : GenPackage | genPackage.getPackageLoadInterDependencies())]
+		[genPackage.getPackageInstanceVariable(interdep)/].fixPackageContents();
+    [/for]
+
+  [/if]
+  [comment][if (genPackage.hasConstraints())]
+		// Register package validator
+		[genModel.getImportedName('org.eclipse.emf.ecore.EValidator')/].Registry.INSTANCE.put
+			(the[genPackage.getBasicPackageName()/], 
+			 new [genModel.getImportedName('org.eclipse.emf.ecore.EValidator')/].Descriptor()
+			 {
+				 public [genModel.getImportedName('org.eclipse.emf.ecore.EValidator')/] getEValidator()
+				 {
+					 return [genPackage.getImportedValidatorClassName()/].INSTANCE;
+				 }
+			 });
+
+  [/if][/comment]
+  [if (not genPackage.isEcorePackage())]
+		// Mark meta-data to indicate it can't be changed
+		the[genPackage.getBasicPackageName()/].freeze();
+
+  [/if]
+  
+		// Update the registry and return the package
+		[genModel.getImportedName('org.eclipse.emf.ecore.EPackage')/].Registry.INSTANCE.put([genPackage.getImportedPackageInterfaceName()/].eNS_URI, the[genPackage.getBasicPackageName()/]);
+		return the[genPackage.getBasicPackageName()/];
+	}
+  [if (genModel.runtimePlatform = GenRuntimePlatform::GWT)]
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static void initializeRegistryHelpers() {
+    [for (genClassifier : GenClassifier | genPackage.genClassifiers)]
+      [if (genClassifier.oclIsKindOf(GenClass))]
+        [let genClass : GenClass = genClassifier.oclAsType(GenClass)]
+          [if (not genClass.dynamic)]
+		[genModel.getImportedName('org.eclipse.emf.common.util.Reflect')/].register
+			([if (genClass.isMapEntry())][genClass.getImportedClassName()/][else][genClass.getRawImportedInterfaceName()/][/if].class, 
+			 new [genModel.getImportedName('org.eclipse.emf.common.util.Reflect')/].Helper() 
+			 {
+				 public boolean isInstance(Object instance)
+				 {
+					 return instance instanceof [if (genClass.isMapEntry())][genClass.getImportedClassName()/][else][genClass.getRawImportedInterfaceName()/][genClass.getInterfaceWildTypeArguments()/][/if];
+				 }
+
+				 public Object newArrayInstance(int size)
+				 {
+					 return new [if (genClass.isMapEntry())][genClass.getImportedClassName()/][else][genClass.getRawImportedInterfaceName()/][/if]['[size]'/];
+				 }
+			 });
+          [/if]
+        [/let]
+      [else][if (genClassifier.oclIsKindOf(GenDataType))]
+        [let genDataType : GenDataType = genClassifier.oclAsType(GenDataType)]
+          [if (not genDataType.isPrimitiveType() and not genDataType.isObjectType())]
+		[genModel.getImportedName('org.eclipse.emf.common.util.Reflect')/].register
+			([genDataType.getRawImportedInstanceClassName()/].class, 
+			 new [genModel.getImportedName('org.eclipse.emf.common.util.Reflect')/].Helper() {
+				 public boolean isInstance(Object instance) {
+					 return instance instanceof [genDataType.getImportedWildcardInstanceClassName()/];
+				 }
+
+				 public Object newArrayInstance(int size) {
+            [if (genDataType.isArrayType())]
+              [let componentType :String = genDataType.getRawImportedInstanceClassName().replaceAll('(?:\\[\\])+$', '')]
+                [let indices : String = genDataType.getRawImportedInstanceClassName().replaceAll('.*(?:\\[\\])+$', '$1')]
+					 return new [componentType/]['[size]'/][indices/];
+                [/let]
+              [/let]
+            [else]
+					 return new [genDataType.getRawImportedInstanceClassName()/]['[size]'/];
+            [/if]
+				 }
+		});
+          [/if]
+        [/let]
+      [/if][/if]
+    [/for]
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static class WhiteList implements [genModel.getImportedName('com.google.gwt.user.client.rpc.IsSerializable')/], EBasicWhiteList {
+    [for (genClassifier : GenClassifier | genPackage.genClassifiers)]
+      [if (genClassifier.oclIsKindOf(GenClass))]
+        [let genClass : GenClass = genClassifier.oclAsType(GenClass)]
+          [if (not genClass.dynamic)]
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected [if (genClass.isMapEntry())][genClass.getImportedClassName()/][else][genClass.getImportedWildcardInstanceClassName()/][/if] [genClass.getSafeUncapName()/];
+
+          [/if]
+        [/let]
+      [else][if (genClassifier.oclIsKindOf(GenDataType))]
+        [let genDataType : GenDataType = genClassifier.oclAsType(GenDataType)]
+          [if (not genDataType.isObjectType() and genDataType.isSerializable())]
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected [genDataType.getImportedWildcardInstanceClassName()/] [genDataType.getSafeUncapName()/];
+
+          [/if]
+        [/let]
+      [/if][/if]
+    [/for]
+	}
+  [/if]
+
+[/if]
+[if (isInterface)][comment TODO REMOVE THIS BOGUS EMPTY LINE /]
+
+[/if]
+[for (genClassifier : GenClassifier | genPackage.genClassifiers)]
+  [if (isInterface)]
+	/**
+    [if (genClassifier.oclIsKindOf(GenClass))]
+      [let genClass : GenClass = genClassifier.oclAsType(GenClass)]
+	 * Returns the meta object for class '{@link [genClass.getQualifiedInterfaceName()/] <em>[genClass.getFormattedName()/]</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>[genClass.getFormattedName()/]</em>'.
+	 * @see [genClass.getQualifiedInterfaceName()/]
+        [if (not genModel.suppressEMFModelTags and (genClass.isExternalInterface() or genClass.dynamic))]
+          [let modelInfoLines : Sequence(String) = genClass.getModelInfo().tokenize(genModel.getLineDelimiter() + '\r')]
+            [if (modelInfoLines->isEmpty())]
+	 * @model
+            [else]
+	 * @model [modelInfoLines->sep(genModel.getLineDelimiter() + '\t *        ')/]
+            [/if]
+          [/let]
+        [/if]
+      [/let]
+    [else][if (genClassifier.oclIsKindOf(GenEnum))]
+      [let genEnum : GenEnum = genClassifier.oclAsType(GenEnum)]
+	 * Returns the meta object for enum '{@link [genEnum.getQualifiedName()/] <em>[genEnum.getFormattedName()/]</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for enum '<em>[genEnum.getFormattedName()/]</em>'.
+	 * @see [genEnum.getQualifiedName()/]
+      [/let]
+    [else][if (genClassifier.oclIsKindOf(GenDataType))]
+      [let genDataType : GenDataType = genClassifier.oclAsType(GenDataType)]
+        [if (genDataType.isPrimitiveType() or genDataType.isArrayType())]
+	 * Returns the meta object for data type '<em>[genDataType.getFormattedName()/]</em>'.
+        [else]
+	 * Returns the meta object for data type '{@link [genDataType.getRawInstanceClassName()/] <em>[genDataType.getFormattedName()/]</em>}'.
+        [/if]
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for data type '<em>[genDataType.getFormattedName()/]</em>'.
+        [if (not genDataType.isPrimitiveType() and not genDataType.isArrayType())]
+	 * @see [genDataType.getRawInstanceClassName()/]
+        [/if]
+        [if (not genModel.suppressEMFModelTags)]
+          [let modelInfoLines : Sequence(String) = genDataType.getModelInfo().tokenize(genModel.getLineDelimiter() + '\r')]
+            [if (modelInfoLines->isEmpty())]
+	 * @model
+            [else]
+	 * @model [modelInfoLines->sep(genModel.getLineDelimiter() + '\t *        ')/]
+            [/if]
+          [/let]
+        [/if]
+      [/let]
+    [/if][/if][/if]
+	 * @generated
+	 */
+  [else]
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+  [/if]
+  [if (isImplementation)]
+	public [genClassifier.getImportedMetaType()/] get[genClassifier.getClassifierAccessorName()/]() {
+    [if (genPackage.isLoadedInitialization())]
+		if ([genClassifier.getClassifierInstanceName()/] == null) {
+			[genClassifier.getClassifierInstanceName()/] = ([genClassifier.getImportedMetaType()/])[genModel.getImportedName('org.eclipse.emf.ecore.EPackage')/].Registry.INSTANCE.getEPackage([genPackage.getImportedPackageInterfaceName()/].eNS_URI).getEClassifiers().get([genPackage.getLocalClassifierIndex(genClassifier)/]);
+		}
+    [/if]
+		return [genClassifier.getClassifierInstanceName()/];
+	}
+
+  [else]
+	[genClassifier.getImportedMetaType()/] get[genClassifier.getClassifierAccessorName()/]();
+
+  [/if]
+  [if (genClassifier.oclIsKindOf(GenClass))]
+    [let genClass : GenClass = genClassifier.oclAsType(GenClass)]
+      [for (genFeature : GenFeature | genClass.genFeatures)]
+        [if (isInterface)]
+	/**
+	 * Returns the meta object for the [genFeature.getFeatureKind()/] '{@link [genClass.getQualifiedInterfaceName()/][if (not genClass.isMapEntry() and not genFeature.isSuppressedGetVisibility())]#[genFeature.getGetAccessor()/][/if] <em>[genFeature.getFormattedName()/]</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the [genFeature.getFeatureKind()/] '<em>[genFeature.getFormattedName()/]</em>'.
+	 * @see [genClass.getQualifiedInterfaceName()/][if (not genClass.isMapEntry() and not genFeature.isSuppressedGetVisibility())]#[genFeature.getGetAccessor()/]()[/if]
+	 * @see #get[genClass.getClassifierAccessorName()/]()
+	 * @generated
+	 */
+        [else]
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+        [/if]
+        [if (isImplementation)]
+	public [genFeature.getImportedMetaType()/] get[genFeature.getFeatureAccessorName()/]() {
+          [if (not genPackage.isLoadedInitialization())]
+		return ([genFeature.getImportedMetaType()/])[genClass.getClassifierInstanceName()/].getEStructuralFeatures().get([genClass.getLocalFeatureIndex(genFeature)/]);
+          [else]
+        return ([genFeature.getImportedMetaType()/])get[genClassifier.getClassifierAccessorName()/]().getEStructuralFeatures().get([genClass.getLocalFeatureIndex(genFeature)/]);
+          [/if]
+	}
+        [else]
+	[genFeature.getImportedMetaType()/] get[genFeature.getFeatureAccessorName()/]();
+        [/if]
+
+      [/for]
+      [if (genModel.operationReflection)]
+        [for (genOperation : GenOperation | genClass.genOperations)]
+          [if (isInterface)]
+	/**
+	 * Returns the meta object for the '{@link [genClass.getQualifiedInterfaceName()/]#[genOperation.getName()/]([genOperation.getParameterTypes(', ')/]) <em>[genOperation.getFormattedName()/]</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>[genOperation.getFormattedName()/]</em>' operation.
+	 * @see [genClass.getQualifiedInterfaceName()/]#[genOperation.getName()/]([genOperation.getParameterTypes(', ')/])
+	 * @generated
+	 */
+          [else]
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+          [/if]
+          [if (isImplementation)]
+	public [genOperation.getImportedMetaType()/] get[genOperation.getOperationAccessorName()/]() {
+            [if (not genPackage.isLoadedInitialization())]
+		return [genClass.getClassifierInstanceName()/].getEOperations().get([genClass.getLocalOperationIndex(genOperation)/]);
+            [else]
+        return get[genClassifier.getClassifierAccessorName()/]().getEOperations().get([genClass.getLocalOperationIndex(genOperation)/]);
+            [/if]
+	}
+          [else]
+	[genOperation.getImportedMetaType()/] get[genOperation.getOperationAccessorName()/]();
+          [/if]
+
+        [/for]
+      [/if]
+    [/let]
+  [/if]
+[/for]
+[if (isInterface)]
+	/**
+	 * Returns the factory that creates the instances of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the factory that creates the instances of the model.
+	 * @generated
+	 */
+[else]
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+[/if]
+[if (isImplementation)]
+	public [genPackage.getImportedFactoryInterfaceName()/] get[genPackage.getFactoryName()/]() {
+		return ([genPackage.getImportedFactoryInterfaceName()/])getEFactoryInstance();
+	}
+[else]
+	[genPackage.getFactoryInterfaceName()/] get[genPackage.getFactoryName()/]();
+[/if]
+
+[if (isImplementation)]
+  [if (not genPackage.isLoadedInitialization())]
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated) return;
+		isCreated = true;
+
+    [if (genPackage.genClasses->notEmpty())]
+		// Create classes and their features
+      [for (genClass : GenClass | genPackage.genClasses) separator (genModel.getLineDelimiter())]
+		[genClass.getClassifierInstanceName()/] = create[genClass.getMetaType()/]([genClass.getClassifierID()/]);
+        [for (genFeature : GenFeature | genClass.genFeatures)]
+		create[genFeature.getMetaType()/]([genClass.getClassifierInstanceName()/], [genClass.getFeatureID(genFeature)/]);
+        [/for]
+        [if (genModel.operationReflection)]
+          [for (genOperation : GenOperation | genClass.genOperations)]
+		createEOperation([genClass.getClassifierInstanceName()/], [genClass.getOperationID(genOperation, false)/]);
+          [/for]
+        [/if]
+      [/for]
+    [/if]
+    [if (genPackage.genEnums->notEmpty())]
+
+		// Create enums
+      [for (genEnum : GenEnum | genPackage.genEnums)]
+		[genEnum.getClassifierInstanceName()/] = createEEnum([genEnum.getClassifierID()/]);
+      [/for]
+    [/if]
+    [if (genPackage.genDataTypes->notEmpty())]
+
+		// Create data types
+      [for (genDataType : GenDataType | genPackage.genDataTypes)]
+		[genDataType.getClassifierInstanceName()/] = createEDataType([genDataType.getClassifierID()/]);
+      [/for]
+    [/if]
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model.  This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) return;
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+    [if (genPackage.getPackageInitializationDependencies()->notEmpty())]
+
+		// Obtain other dependent packages
+      [for (dep : GenPackage | genPackage.getPackageInitializationDependencies())]
+		[dep.getImportedPackageInterfaceName()/] [genPackage.getPackageInstanceVariable(dep)/] = ([dep.getImportedPackageInterfaceName()/])[genModel.getImportedName('org.eclipse.emf.ecore.EPackage')/].Registry.INSTANCE.getEPackage([dep.getImportedPackageInterfaceName()/].eNS_URI);
+      [/for]
+    [/if]
+    [if (genPackage.getSubGenPackages()->notEmpty())]
+
+		// Add subpackages
+      [for (sub : GenPackage | genPackage.getSubGenPackages())]
+		getESubpackages().add([genPackage.getPackageInstanceVariable(sub)/]);
+      [/for]
+    [/if]
+    [if (genPackage.genClasses->notEmpty())]
+     [comment { boolean firstOperationAssignment = true; int maxTypeParameterAssignment = 0;/]
+      [if (genModel.useGenerics())]
+
+		// Create type parameters
+        [for (genClassifier : GenClassifier | genPackage.genClassifiers)]
+          [for (genTypeParameter : GenTypeParameter | genClassifier.genTypeParameters)]
+            [if (genTypeParameter.ecoreTypeParameter.eBounds->notEmpty() or genTypeParameter.isUsed())]
+		[genModel.getImportedName('org.eclipse.emf.ecore.ETypeParameter')/] [genClassifier.getClassifierInstanceName()/]_[genTypeParameter.getName()/] = addETypeParameter([genClassifier.getClassifierInstanceName()/], "[genTypeParameter.getName()/]");[genModel.getNonNLS()/]
+            [else]
+		addETypeParameter([genClassifier.getClassifierInstanceName()/], "[genTypeParameter.getName()/]");[genModel.getNonNLS()/]
+            [/if]
+          [/for]
+        [/for]
+      [/if]
+
+      [if (genModel.useGenerics())]
+
+		// Set bounds for type parameters[genPackage.resetMaxGenericTypeAssignment()/][genPackage.resetGenOperationPrefix()/]
+        [for (genClassifier : GenClassifier |genPackage.genClassifiers)]
+          [for (genTypeParameter : GenTypeParameter | genClassifier.genTypeParameters)]
+            [for (bound : EGenericType | genTypeParameter.ecoreTypeParameter.eBounds)]
+		[genPackage.prefix(0)/]g1 = createEGenericType([bound.type(genModel, genPackage)/]);
+              [for (eGenericType : EGenericType | bound.eAllContents(EGenericType))]
+              [comment]<%for (InformationIterator i=new InformationIterator(bound); i.hasNext(); ) { Information info = i.next(); String prefix = ""; if (maxGenericTypeAssignment <= eGenericType.depth()) { ++maxGenericTypeAssignment; prefix = genModel.getImportedName("org.eclipse.emf.ecore.EGenericType") + " "; }%>[/comment]
+		[genPackage.prefix(eGenericType.depth())/]g[eGenericType.depth() + 1/] = createEGenericType([eGenericType.type(genModel, genPackage)/]);
+		g[eGenericType.depth()/].[eGenericType.accessor()/](g[eGenericType.depth() + 1/]);
+              [/for]
+		[genClassifier.getClassifierInstanceName()/]_[genTypeParameter.getName()/].getEBounds().add(g1);
+            [/for]
+          [/for]
+        [/for]
+      [/if]
+
+		// Add supertypes to classes
+      [for (genClass : GenClass | genPackage.genClasses)]
+        [if (not genClass.hasGenericSuperTypes())]
+          [for (baseGenClass : GenClass | genClass.getBaseGenClasses())]
+		[genClass.getClassifierInstanceName()/].getESuperTypes().add([genPackage.getPackageInstanceVariable(baseGenClass.genPackage)/].get[baseGenClass.getClassifierAccessorName()/]());
+          [/for]
+        [else]
+          [for (superType : EGenericType | genClass.ecoreClass.eGenericSuperTypes)]
+		[genPackage.prefix(0)/]g1 = createEGenericType([superType.type(genModel, genPackage)/]);
+            [for (eGenericType : EGenericType | superType.eAllContents(EGenericType))]
+            [comment]<%for (InformationIterator i=new InformationIterator(superType); i.hasNext(); ) { Information info = i.next(); String prefix = ""; if (maxGenericTypeAssignment <= eGenericType.depth()) { ++maxGenericTypeAssignment; prefix = genModel.getImportedName("org.eclipse.emf.ecore.EGenericType") + " "; }%>[/comment]
+		[genPackage.prefix(eGenericType.depth())/]g[eGenericType.depth() + 1/] = createEGenericType([eGenericType.type(genModel, genPackage)/]);
+		g[eGenericType.depth()/].[eGenericType.accessor()/](g[eGenericType.depth() + 1/]);
+            [/for]
+		[genClass.getClassifierInstanceName()/].getEGenericSuperTypes().add(g1);
+          [/for]
+        [/if]
+      [/for]
+
+		// Initialize classes[if (genModel.operationReflection)], features, and operations; add parameters[else] and features; add operations and parameters[/if]
+      [for (genClass : GenClass | genPackage.genClasses) separator(genModel.getLineDelimiter())]
+      [let hasInstanceTypeName : Boolean = genModel.useGenerics() and genClass.ecoreClass.instanceTypeName <> null and genClass.ecoreClass.instanceTypeName.contains('<')]
+		initEClass([genClass.getClassifierInstanceName()/], [if (genClass.dynamic)]null[else][genClass.getRawImportedInterfaceName()/].class[/if], "[genClass.getName()/]", [genClass.getAbstractFlag()/], [genClass.getInterfaceFlag()/], [genClass.getGeneratedInstanceClassFlag()/][if (hasInstanceTypeName)], "[genClass.ecoreClass.instanceTypeName/]"[/if]);[genModel.getNonNLS()/][if (hasInstanceTypeName)][genModel.getNonNLS(2)/][/if]
+        [for (genFeature : GenFeature |genClass.genFeatures)]
+          [if (genFeature.hasGenericType())]
+            [let genericType : EGenericType = genFeature.ecoreFeature.eGenericType] 
+		[genPackage.prefix(0)/]g1 = createEGenericType([genericType.type(genModel, genPackage)/]);
+            [for (eGenericType : EGenericType | genericType.eAllContents(EGenericType))]
+            [comment]<%for (InformationIterator i=new InformationIterator(genFeature.getEcoreFeature().getEGenericType()); i.hasNext(); ) { Information info = i.next(); String prefix = ""; if (maxGenericTypeAssignment <= eGenericType.depth()) { ++maxGenericTypeAssignment; prefix = genModel.getImportedName("org.eclipse.emf.ecore.EGenericType") + " "; }%>[/comment]
+		[genPackage.prefix(eGenericType.depth())/]g[eGenericType.depth() + 1/] = createEGenericType([eGenericType.type(genModel, genPackage)/]);
+		g[eGenericType.depth()/].[eGenericType.accessor()/](g[eGenericType.depth() + 1/]);
+            [/for]
+            [/let]
+          [/if]
+          [if (genFeature.isReferenceType())]
+            [let reverse : String = if (genFeature.getReverse() = null) then 'null' else genPackage.getPackageInstanceVariable(genFeature.getReverse().getGenPackage()) + '.get' + genFeature.getReverse().getFeatureAccessorName() + '()' endif]
+		initEReference(get[genFeature.getFeatureAccessorName()/](), [if (genFeature.hasGenericType())]g1[else][genPackage.getPackageInstanceVariable(genFeature.getTypeGenPackage())/].get[genFeature.getTypeClassifierAccessorName()/]()[/if], [reverse/], "[genFeature.getName()/]", [genFeature.getDefaultValue()/], [genFeature.getLowerBound()/], [genFeature.getUpperBound()/], [genFeature.getContainerClass()/], [genFeature.getTransientFlag()/], [genFeature.getVolatileFlag()/], [genFeature.getChangeableFlag()/], [genFeature.getContainmentFlag()/], [genFeature.getResolveProxiesFlag()/], [genFeature.getUnsettableFlag()/], [genFeature.getUniqueFlag()/], [genFeature.getDerivedFlag()/], [genFeature.getOrderedFlag()/]);[genModel.getNonNLS()/][genModel.getNonNLS(genFeature.getDefaultValue(), 2)/]
+              [for (keyFeature : GenFeature |genFeature.getKeys())]
+		get[genFeature.getFeatureAccessorName()/]().getEKeys().add([genPackage.getPackageInstanceVariable(keyFeature.getGenPackage())/].get[keyFeature.getFeatureAccessorName()/]());
+              [/for]
+            [/let]
+          [else]
+		initEAttribute(get[genFeature.getFeatureAccessorName()/](), [if (genFeature.hasGenericType())]g1[else][genPackage.getPackageInstanceVariable(genFeature.getTypeGenPackage())/].get[genFeature.getTypeClassifierAccessorName()/]()[/if], "[genFeature.getName()/]", [genFeature.getDefaultValue()/], [genFeature.getLowerBound()/], [genFeature.getUpperBound()/], [genFeature.getContainerClass()/], [genFeature.getTransientFlag()/], [genFeature.getVolatileFlag()/], [genFeature.getChangeableFlag()/], [genFeature.getUnsettableFlag()/], [genFeature.getIDFlag()/], [genFeature.getUniqueFlag()/], [genFeature.getDerivedFlag()/], [genFeature.getOrderedFlag()/]);[genModel.getNonNLS()/][genModel.getNonNLS(genFeature.getDefaultValue(), 2)/]
+          [/if]
+        [/for]
+        [for (genOperation : GenOperation | genClass.genOperations)]
+
+          [if (genModel.useGenerics())]
+		[genOperation.prefix()/][if (genModel.operationReflection)]initEOperation(get[genOperation.getOperationAccessorName()/]()[else]addEOperation([genClass.getClassifierInstanceName()/][/if], [if (genOperation.isVoid() or genOperation.hasGenericType())]null[else][genPackage.getPackageInstanceVariable(genOperation.getTypeGenPackage())/].get[genOperation.getTypeClassifierAccessorName()/]()[/if], "[genOperation.getName()/]", [genOperation.getLowerBound()/], [genOperation.getUpperBound()/], [genOperation.getUniqueFlag()/], [genOperation.getOrderedFlag()/]);[genModel.getNonNLS()/]
+          [else][if (not genOperation.isVoid())]
+            [if (not genOperation.ecoreOperation.ordered or not genOperation.ecoreOperation.unique)]
+		[genPackage.requireAddEOperation()/][genOperation.prefix()/][if (genModel.operationReflection)]initEOperation(get[genOperation.getOperationAccessorName()/]()[else]addEOperation([genClass.getClassifierInstanceName()/][/if], [genPackage.getPackageInstanceVariable(genOperation.getTypeGenPackage())/].get[genOperation.getTypeClassifierAccessorName()/](), "[genOperation.getName()/]", [genOperation.getLowerBound()/], [genOperation.getUpperBound()/], [genOperation.getUniqueFlag()/], [genOperation.getOrderedFlag()/]);[genModel.getNonNLS()/]
+            [else]
+		[genOperation.prefix()/][if (genModel.operationReflection)]initEOperation(get[genOperation.getOperationAccessorName()/]()[else]addEOperation([genClass.getClassifierInstanceName()/][/if], [genPackage.getPackageInstanceVariable(genOperation.getTypeGenPackage())/].get[genOperation.getTypeClassifierAccessorName()/](), "[genOperation.getName()/]", [genOperation.getLowerBound()/], [genOperation.getUpperBound()/]);[genModel.getNonNLS()/]
+            [/if]
+          [else]
+		[genOperation.prefix()/][if (genModel.operationReflection)]initEOperation(get[genOperation.getOperationAccessorName()/]()[else]addEOperation([genClass.getClassifierInstanceName()/][/if], null, "[genOperation.getName()/]");[genModel.getNonNLS()/]
+          [/if][/if]
+          [if (genModel.useGenerics())]
+            [for (genTypeParameter : GenTypeParameter | genOperation.genTypeParameters)][comment @TODO remove let typeParameterVariable /]
+              [let typeParameterVariable : String =
+                if (genTypeParameter.ecoreTypeParameter.eBounds->notEmpty() or genTypeParameter.isUsed()) then
+                  if (i = 1) then
+                    genModel.getImportedName('org.eclipse.emf.ecore.ETypeParameter') + ' t' + i + ' = '
+                  else
+                    't' + i + ' = '
+                  endif
+                else
+                  ''
+                endif
+              ]
+            [comment for (ListIterator<GenTypeParameter> t=genOperation.getGenTypeParameters().listIterator(); t.hasNext(); ) {
+	GenTypeParameter genTypeParameter = t.next();
+	String typeParameterVariable = "";
+	if (genTypeParameter.getEcoreTypeParameter().getEBounds()->notEmpty() || genTypeParameter.isUsed()) {
+		if (maxTypeParameterAssignment <= t.previousIndex()) {
+			++maxTypeParameterAssignment;
+			typeParameterVariable = genModel.getImportedName("org.eclipse.emf.ecore.ETypeParameter") + " t" + t.nextIndex() + " = ";
+		} else {
+			typeParameterVariable = "t" + t.nextIndex() + " = ";
+		}
+	} /]
+		[typeParameterVariable/]addETypeParameter(op, "[genTypeParameter.getName()/]");[genModel.getNonNLS()/]
+              [for (typeParameter : EGenericType | genTypeParameter.ecoreTypeParameter.eBounds)]
+[comment <%for (InformationIterator i=new InformationIterator(typeParameter); i.hasNext(); ) {
+  Information info = i.next(); String typePrefix = "";
+  if (maxGenericTypeAssignment <= eGenericType.depth()) {
+    ++maxGenericTypeAssignment;
+    typePrefix = genModel.getImportedName("org.eclipse.emf.ecore.EGenericType") + " ";
+  }%>/]
+                [for (eGenericType : EGenericType | Sequence{typeParameter}->union(typeParameter.eAllContents(EGenericType)))]
+		[genPackage.typePrefix(eGenericType.depth())/]g[eGenericType.depth() + 1/] = createEGenericType([eGenericType.type(genModel, genPackage)/]);
+                  [if (eGenericType.depth() > 0)]
+		g[eGenericType.depth()/].[eGenericType.accessor()/](g[eGenericType.depth() + 1/]);
+                  [/if]
+                [/for]
+		t[i + 1/].getEBounds().add(g1);
+              [/for]
+              [/let]
+            [/for]
+          [/if]
+          [for (genParameter : GenParameter | genOperation.genParameters)]
+            [if (genParameter.hasGenericType())]
+              [for (eGenericType : EGenericType | genParameter.ecoreParameter.eAllContents(EGenericType))]
+              [comment <%for (InformationIterator i=new InformationIterator(genParameter.getEcoreParameter().getEGenericType()); i.hasNext(); ) { Information info = i.next(); String typePrefix = ""; if (maxGenericTypeAssignment <= eGenericType.depth()) { ++maxGenericTypeAssignment; typePrefix = genModel.getImportedName("org.eclipse.emf.ecore.EGenericType") + " "; }%>/]
+		[genPackage.typePrefix(eGenericType.depth())/]g[eGenericType.depth() + 1/] = createEGenericType([eGenericType.type(genModel, genPackage)/]);
+                [if (eGenericType.depth() > 0)]
+		g[eGenericType.depth()/].[eGenericType.accessor()/](g[eGenericType.depth() + 1/]);
+                [/if]
+              [/for]
+            [/if]
+            [if (genModel.useGenerics())]
+		addEParameter(op, [if (genParameter.hasGenericType())]g1[else][genPackage.getPackageInstanceVariable(genParameter.getTypeGenPackage())/].get[genParameter.getTypeClassifierAccessorName()/]()[/if], "[genParameter.getName()/]", [genParameter.getLowerBound()/], [genParameter.getUpperBound()/], [genParameter.getUniqueFlag()/], [genParameter.getOrderedFlag()/]);[genModel.getNonNLS()/]
+            [else][if (not genParameter.ecoreParameter.ordered or not genParameter.ecoreParameter.unique)]
+		[genPackage.requireAddEParameter()/]addEParameter(op, [if (genParameter.hasGenericType())]g1[else][genPackage.getPackageInstanceVariable(genParameter.getTypeGenPackage())/].get[genParameter.getTypeClassifierAccessorName()/]()[/if], "[genParameter.getName()/]", [genParameter.getLowerBound()/], [genParameter.getUpperBound()/], [genParameter.getUniqueFlag()/], [genParameter.getOrderedFlag()/]);[genModel.getNonNLS()/]
+            [else]
+		addEParameter(op, [if (genParameter.hasGenericType())]g1[else][genPackage.getPackageInstanceVariable(genParameter.getTypeGenPackage())/].get[genParameter.getTypeClassifierAccessorName()/]()[/if], "[genParameter.getName()/]", [genParameter.getLowerBound()/], [genParameter.getUpperBound()/]);[genModel.getNonNLS()/]
+            [/if][/if]
+          [/for]
+          [if (genOperation.hasGenericExceptions())]
+              [for (genericExceptions : EGenericType | genOperation.ecoreOperation.eGenericExceptions)]
+                [for (eGenericType : EGenericType | genericExceptions.eAllContents(EGenericType)->flatten())]
+                [comment <%for (InformationIterator i=new InformationIterator(genericExceptions); i.hasNext(); ) { Information info = i.next(); String typePrefix = ""; if (maxGenericTypeAssignment <= eGenericType.depth()) { ++maxGenericTypeAssignment; typePrefix = genModel.getImportedName("org.eclipse.emf.ecore.EGenericType") + " "; }%>/]
+		[genPackage.typePrefix(eGenericType.depth())/]g[eGenericType.depth() + 1/] = createEGenericType([eGenericType.type(genModel, genPackage)/]);
+                  [if (eGenericType.depth() > 0)]
+		g[eGenericType.depth()/].[eGenericType.accessor()/](g[eGenericType.depth() + 1/]);
+                  [/if]
+		addEException(op, g[eGenericType.depth() + 1/]);
+                [/for]
+              [/for]
+          [else]
+            [for (genException : GenClassifier | genOperation.getGenExceptions())]
+		addEException(op, [genPackage.getPackageInstanceVariable(genException.genPackage)/].get[genException.getClassifierAccessorName()/]());
+            [/for]
+          [/if]
+          [if (not genOperation.isVoid() and genOperation.hasGenericType())]
+            [for (eGenericType : EGenericType | Sequence{genOperation.ecoreOperation.eGenericType}->union(genOperation.ecoreOperation.eGenericType.eAllContents(EGenericType)))]
+            [comment]<%for (InformationIterator i=new InformationIterator(genOperation.getEcoreOperation().getEGenericType()); i.hasNext(); ) { Information info = i.next(); String typePrefix = ""; if (maxGenericTypeAssignment <= eGenericType.depth()) { ++maxGenericTypeAssignment; typePrefix = genModel.getImportedName("org.eclipse.emf.ecore.EGenericType") + " "; }%>[/comment]
+		[genPackage.typePrefix(eGenericType.depth())/]g[eGenericType.depth() + 1/] = createEGenericType([eGenericType.type(genModel, genPackage)/]);
+              [if (eGenericType.depth() > 0)]
+		g[eGenericType.depth()/].[eGenericType.accessor()/](g[eGenericType.depth() + 1/]);
+              [/if]
+            [/for]
+		initEOperation(op, g1);
+          [/if]
+        [/for][comment genOperation/]
+      [/let]
+      [/for]
+    [/if]
+    [if (genPackage.genEnums->notEmpty())]
+
+		// Initialize enums and add enum literals
+      [for (genEnum : GenEnum | genPackage.genEnums) separator(genModel.getLineDelimiter())]
+		initEEnum([genEnum.getClassifierInstanceName()/], [genModel.getImportedName(genEnum.getQualifiedName())/].class, "[genEnum.getName()/]");[genModel.getNonNLS()/]
+        [for (genEnumLiteral : GenEnumLiteral |genEnum.genEnumLiterals)]
+		addEEnumLiteral([genEnum.getClassifierInstanceName()/], [if (genModel.getImportedName(genEnum.getQualifiedName()) = genEnum.getClassifierID())][genEnum.getQualifiedName()/][else][genModel.getImportedName(genEnum.getQualifiedName())/][/if].[genEnumLiteral.getEnumLiteralInstanceConstantName()/]);
+        [/for]
+      [/for]
+    [/if]
+    [if (genPackage.genDataTypes->notEmpty())]
+
+		// Initialize data types
+      [for (genDataType : GenDataType | genPackage.genDataTypes)]
+        [let hasInstanceTypeName : Boolean = genModel.useGenerics() and genDataType.ecoreDataType.instanceTypeName <> null and genDataType.ecoreDataType.instanceTypeName.contains('<')]
+        initEDataType([genDataType.getClassifierInstanceName()/], [genDataType.getRawImportedInstanceClassName()/].class, "[genDataType.getName()/]", [genDataType.getSerializableFlag()/], [genDataType.getGeneratedInstanceClassFlag()/][if (hasInstanceTypeName)], "[genDataType.ecoreDataType.instanceTypeName/]"[/if]);[genModel.getNonNLS()/][if (hasInstanceTypeName)][genModel.getNonNLS(2)/][/if]
+        [/let]
+      [/for]
+    [/if]
+    [if (genPackage.getSuperGenPackage() = null)]
+
+		// Create resource
+		createResource(eNS_URI);
+    [/if]
+    [if (not genPackage.isEcorePackage() and genPackage.getAnnotationSources()->notEmpty())]
+
+		// Create annotations
+      [for (annotationSource : String |genPackage.getAnnotationSources())]
+		// [annotationSource/]
+		create[genPackage.getAnnotationSourceIdentifier(annotationSource)/]Annotations();
+      [/for]
+    [/if]
+	}
+
+    [for (annotationSource : String | genPackage.getAnnotationSources())]
+	/**
+	 * Initializes the annotations for <b>[annotationSource/]</b>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void create[genPackage.getAnnotationSourceIdentifier(annotationSource)/]Annotations() {
+		String source = [if (annotationSource = null)]null;[else]"[annotationSource/]";[genModel.getNonNLS()/][/if]
+      [for (eAnnotation : EAnnotation | genPackage.getAllAnnotations())]
+        [let annotationReferenceDataList : Sequence(Sequence(OclAny)) = eAnnotation.getReferenceData(genPackage)]
+        [comment] @TODO How? use collect(some transformation) on annotationSource creation
+[if (annotationSource = null)][eAnnotation.source = null/][else][annotationSource = eAnnotation.source/][/if][/comment]
+		addAnnotation
+		  ([genPackage.getAnnotatedModelElementAccessor(eAnnotation)/], 
+		   source, 
+		   new String['[]'/] 
+		   {
+			 [eAnnotation.writeKeyValuePairs(genModel)/]
+		   }[if (eAnnotation.hasReferenceData(genPackage))]);[else],[/if]
+          [if (not eAnnotation.hasReferenceData(genPackage))]
+		   new [genModel.getImportedName('org.eclipse.emf.common.util.URI')/]['[]'/] 
+		   {
+            [for (annotationReferenceData : Sequence(OclAny) | annotationReferenceDataList) separator (',' + genModel.getNonNLS())]
+			 [genModel.getImportedName('org.eclipse.emf.common.util.URI')/].createURI([if (annotationReferenceData->at(1) <> genPackage)][annotationReferenceData->at(1).oclAsType(GenPackage).getImportedPackageInterfaceName()/].[/if]eNS_URI).appendFragment("[annotationReferenceData->at(2)/]")[/for][genModel.getNonNLS()/]
+		   });
+          [/if]
+        [for (nestedEAnnotation : EAnnotation | genPackage.getAllNestedAnnotations(eAnnotation))]
+          [let nestedAnnotationSource : String = nestedEAnnotation.source]
+            [let depth : Integer = nestedEAnnotation.depth()]
+              [let nestedAnnotationReferenceDataList : Sequence(Sequence(OclAny)) = nestedEAnnotation.getReferenceData(genPackage)]
+		addAnnotation
+		  ([genPackage.getAnnotatedModelElementAccessor(eAnnotation)/], 
+		   [depth/],
+		   [if (nestedAnnotationSource = null)]null,[else]"[nestedAnnotationSource/]",[genModel.getNonNLS()/][/if]
+		   new String['[]'/] 
+		   {
+			 [nestedEAnnotation.writeKeyValuePairs(genModel)/]
+		   }[if (nestedEAnnotation.hasReferenceData(genPackage))]);[else],[/if]
+          [if (not nestedEAnnotation.hasReferenceData(genPackage))]
+		   new [genModel.getImportedName('org.eclipse.emf.common.util.URI')/]['[]'/] 
+		   {
+            [for (annotationReferenceData : Sequence(OclAny) | nestedAnnotationReferenceDataList) separator (',' + genModel.getNonNLS())]
+			 [genModel.getImportedName('org.eclipse.emf.common.util.URI')/].createURI([if (annotationReferenceData->at(1) <> genPackage)][annotationReferenceData->at(1).oclAsType(GenPackage).getImportedPackageInterfaceName()/].[/if]eNS_URI).appendFragment("[annotationReferenceData->at(2)/]")[/for][genModel.getNonNLS()/]
+		   });
+          [/if]
+              [/let]
+            [/let]
+          [/let]
+        [/for]
+        [/let]
+      [/for]
+	}
+
+    [/for]
+  [else]
+    [if (genPackage.isLoadingInitialization())]
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isLoaded = false;
+
+	/**
+	 * Laods the package and any sub-packages from their serialized form.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void loadPackage() {
+		if (isLoaded) return;
+		isLoaded = true;
+
+		[genModel.getImportedName('java.net.URL')/] url = getClass().getResource(packageFilename);
+		if (url == null) {
+			throw new RuntimeException("Missing serialized package: " + packageFilename);[genModel.getNonNLS()/]
+		}
+		[genModel.getImportedName('org.eclipse.emf.common.util.URI')/] uri = [genModel.getImportedName('org.eclipse.emf.common.util.URI')/].createURI(url.toString());
+		[genModel.getImportedName('org.eclipse.emf.ecore.resource.Resource')/] resource = new [genModel.getImportedName('org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl')/]().createResource(uri);
+		try {
+			resource.load(null);
+		}
+		catch ([genModel.getImportedName('java.io.IOException')/] exception) {
+			throw new [genModel.getImportedName('org.eclipse.emf.common.util.WrappedException')/](exception);
+		}
+		initializeFromLoadedEPackage(this, ([genModel.getImportedName('org.eclipse.emf.ecore.EPackage')/])resource.getContents().get(0));
+		createResource(eNS_URI);
+	}
+
+    [/if]
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isFixed = false;
+
+	/**
+	 * Fixes up the loaded package, to make it appear as if it had been programmatically built.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void fixPackageContents() {
+		if (isFixed) return;
+		isFixed = true;
+		fixEClassifiers();
+	}
+
+	/**
+	 * Sets the instance class on the given classifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+    [if (genModel.useClassOverrideAnnotation())]
+	@Override
+    [/if]
+	protected void fixInstanceClass([genModel.getImportedName('org.eclipse.emf.ecore.EClassifier')/] eClassifier) {
+		if (eClassifier.getInstanceClassName() == null) {
+    [let dynamicGenClasses : OrderedSet(GenClass) = genPackage.genClasses->select(c : GenClass | c.dynamic)]
+      [if (dynamicGenClasses->isEmpty())]
+			eClassifier.setInstanceClassName("[genPackage.getInterfacePackageName()/]." + eClassifier.getName());[genModel.getNonNLS()/]
+			setGeneratedClassName(eClassifier);
+      [else]
+			switch (eClassifier.getClassifierID()) {
+        [for (genClass : GenClass | dynamicGenClasses)]
+          [if (genClass.dynamic)]
+				case [genPackage.getClassifierID(genClass)/]:
+          [/if]
+        [/for]
+				{
+					break;
+				}
+				default:
+				{
+					eClassifier.setInstanceClassName("[genPackage.getInterfacePackageName()/]." + eClassifier.getName());[genModel.getNonNLS()/]
+					setGeneratedClassName(eClassifier);
+					break;
+				}
+			}
+      [/if]
+    [/let]
+		}
+	}
+
+  [/if]
+  [if (needsAddEOperation())]
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected [genModel.getImportedName('org.eclipse.emf.ecore.EOperation')/] addEOperation([genModel.getImportedName('org.eclipse.emf.ecore.EClass')/] owner, [genModel.getImportedName('org.eclipse.emf.ecore.EClassifier')/] type, String name, int lowerBound, int upperBound, boolean isUnique, boolean isOrdered) {
+		[genModel.getImportedName('org.eclipse.emf.ecore.EOperation')/] o = addEOperation(owner, type, name, lowerBound, upperBound);
+		o.setUnique(isUnique);
+		o.setOrdered(isOrdered);
+		return o;
+	}
+	
+  [/if][comment needsAddEOperation /]
+  [if (needsAddEParameter())]
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected [genModel.getImportedName('org.eclipse.emf.ecore.EParameter')/] addEParameter([genModel.getImportedName('org.eclipse.emf.ecore.EOperation')/] owner, [genModel.getImportedName('org.eclipse.emf.ecore.EClassifier')/] type, String name, int lowerBound, int upperBound, boolean isUnique, boolean isOrdered) {
+		[genModel.getImportedName('org.eclipse.emf.ecore.EParameter')/] p = ecoreFactory.createEParameter();
+		p.setEType(type);
+		p.setName(name);
+		p.setLowerBound(lowerBound);
+		p.setUpperBound(upperBound);
+		p.setUnique(isUnique);
+		p.setOrdered(isOrdered);
+		owner.getEParameters().add(p);
+		return p;
+	}
+	
+  [/if][comment needsAddEParameter /]
+[/if][comment isImplementation) /]
+[if (isInterface and genPackage.isLiteralsInterface())]
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 *   <li>each class,</li>
+	 *   <li>each feature of each class,</li>
+  [if (genModel.operationReflection)]
+	 *   <li>each operation of each class,</li>
+  [/if]
+	 *   <li>each enum,</li>
+	 *   <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	[if (isImplementation)]public [/if]interface Literals {
+  [for (genClassifier : GenClassifier | genPackage.genClassifiers)]
+		/**
+    [if (genClassifier.oclIsKindOf(GenClass))]
+      [let genClass : GenClass = genClassifier.oclAsType(GenClass)]
+        [if (not genClass.isInterface())]
+		 * The meta object literal for the '{@link [genClass.getQualifiedClassName()/] <em>[genClass.getFormattedName()/]</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see [genClass.getQualifiedClassName()/]
+        [else]
+		 * The meta object literal for the '{@link [genClass.getQualifiedInterfaceName()/] <em>[genClass.getFormattedName()/]</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see [genClass.getQualifiedInterfaceName()/]
+        [/if]
+      [/let]
+    [else][if (genClassifier.oclIsKindOf(GenEnum))]
+      [let genEnum : GenEnum = genClassifier.oclAsType(GenEnum)]
+		 * The meta object literal for the '{@link [genEnum.getQualifiedName()/] <em>[genEnum.getFormattedName()/]</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see [genEnum.getQualifiedName()/]
+      [/let]
+    [else][if (genClassifier.oclIsKindOf(GenDataType))]
+      [let genDataType : GenDataType = genClassifier.oclAsType(GenDataType)]
+		 * The meta object literal for the '<em>[genDataType.getFormattedName()/]</em>' data type.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+        [if (not genDataType.isPrimitiveType() and not genDataType.isArrayType())]
+		 * @see [genDataType.getRawInstanceClassName()/]
+        [/if]
+      [/let]
+    [/if][/if][/if]
+		 * @see [genPackage.getQualifiedPackageClassName()/]#get[genClassifier.getClassifierAccessorName()/]()
+		 * @generated
+		 */
+		[publicStaticFinalFlag/][genClassifier.getImportedMetaType()/] [genPackage.getClassifierID(genClassifier)/] = eINSTANCE.get[genClassifier.getClassifierAccessorName()/]();
+
+    [if (genClassifier.oclIsKindOf(GenClass))]
+      [let genClass : GenClass = genClassifier.oclAsType(GenClass)]
+        [for (genFeature : GenFeature |genClass.genFeatures)]
+		/**
+		 * The meta object literal for the '<em><b>[genFeature.getFormattedName()/]</b></em>' [genFeature.getFeatureKind()/] feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		[publicStaticFinalFlag/][genFeature.getImportedMetaType()/] [genClass.getFeatureID(genFeature)/] = eINSTANCE.get[genFeature.getFeatureAccessorName()/]();
+
+        [/for]
+        [if (genModel.operationReflection)]
+          [for (genOperation : GenOperation | genClass.genOperations)]
+		/**
+		 * The meta object literal for the '<em><b>[genOperation.getFormattedName()/]</b></em>' operation.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		[publicStaticFinalFlag/][genOperation.getImportedMetaType()/] [genClass.getOperationID(genOperation, false)/] = eINSTANCE.get[genOperation.getOperationAccessorName()/]();
+
+          [/for]
+        [/if]
+      [/let]
+    [/if]
+  [/for]
+	}
+
+[/if]
+} //[className/]
+[/let][comment publicStaticFinalFlag /]
+[/template]
+
+[query public packageClassPackageName(genPackage : GenPackage, isInterface : Boolean) : String =
+	if (isInterface and not genPackage.genModel.suppressInterfaces) then
+		genPackage.getReflectionPackageName()
+	else
+		genPackage.getClassPackageName()
+	endif
+/]
+
+[query public packageClassName(genPackage : GenPackage, isImplementation : Boolean) : String =
+	if (isImplementation) then
+		genPackage.getPackageClassName()
+	else
+		genPackage.getPackageInterfaceName()
+	endif
+/]
+
+[query public packageClassPath(genPackage : GenPackage, isInterface : Boolean, isImplementation : Boolean) : String
+	= genPackage.genModel.modelPath(genPackage.packageClassPackageName(isInterface), genPackage.packageClassName(isImplementation)) /]
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/RepresentingElementAdapter.mtl b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/RepresentingElementAdapter.mtl
new file mode 100644
index 00000000000..f5be6ff5a8e
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/RepresentingElementAdapter.mtl
@@ -0,0 +1,106 @@
+[comment]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:
+ Obeo - Initial API and implementation
+ CEA LIST - Modification to support Facade code generation[/comment]
+[comment encoding = UTF-8 /]
+[module RepresentingElementAdapter('http://www.eclipse.org/emf/2002/GenModel', 'http://www.eclipse.org/emf/2002/Ecore')/]
+
+[import org::eclipse::emf::eef::codegen::ecore::services::common /]
+[import org::eclipse::emf::eef::codegen::ecore::services::header /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenModel /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenPackage /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenClass /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenClassifier /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenFeature /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenDataType /]
+[import org::eclipse::emf::eef::codegen::ecore::services::StringUtil /]
+
+
+[template public representingElementAdapterClass(genPackage : GenPackage) { genModel : GenModel = genPackage.genModel; packageName : String = genPackage.getUtilitiesPackageName(); className : String = 'RepresentingElementAdapter'} ]
+[genModel.initializeImportManager(packageName, className)/]
+
+[genModel.getImportedName('org.eclipse.emf.common.util.URI')/]
+
+[file (genPackage.representingElementAdapterClassPath(className), false, 'UTF-8')]
+[genModel.includeHeader()/]
+package [packageName/];
+[let content : String = genPackage. representingElementAdapterFileContent(genModel, className)]
+[genModel.genSortedImports()/]
+[content/]
+[/let]
+[/file]
+[/template]
+
+[template protected representingElementAdapterFileContent(genPackage : GenPackage, genModel : GenModel, className : String)]
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.impl.AdapterImpl;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.uml2.uml.Element;
+
+public class RepresentingElementAdapter extends AdapterImpl {
+
+	private EObject representingElement;
+
+	/**
+	 * Does nothing; clients may override so that it does something.
+	 */
+	public void notifyChanged(Notification msg) {
+
+		//Wrap notif
+		Object umlNotifier = msg.getNotifier();
+		EObject specificNotifier = Wrapper.getInstance().findOrCreateSpecific((EObject)umlNotifier);
+
+		Object umlFeature = msg.getFeature();
+		EStructuralFeature specificFeature = Wrapper.getInstance().getFeatureMappingFromUML((EStructuralFeature)umlFeature);
+
+		if(msg.getFeature() instanceof EReference) {
+			Object umlOld = msg.getOldValue();
+			EObject specificOld = null;
+			if(umlOld != null) {
+				specificOld = Wrapper.getInstance().findOrCreateSpecific((Element)umlOld);
+			}
+
+			Object umlNew = msg.getNewValue();
+			EObject specificNew = null;
+			if(umlNew != null) {
+				specificNew = Wrapper.getInstance().findOrCreateSpecific((Element)umlNew);
+			}
+
+			Notification notification = new ENotificationImpl((InternalEObject)specificNotifier, msg.getEventType(), specificFeature, specificOld, specificNew, msg.getPosition(), msg.wasSet());
+
+			specificNotifier.eNotify(notification);
+
+		} else {
+			Notification notification = new ENotificationImpl((InternalEObject)specificNotifier, msg.getEventType(), specificFeature, msg.getOldValue(), msg.getNewValue(), msg.getPosition(), msg.wasSet());
+
+			specificNotifier.eNotify(notification);
+		}
+		//System.err.println("UML Notif -> " + msg);
+	}
+
+
+	public EObject get__Representing() {
+		return representingElement;
+	}
+
+	public void set__Representing(EObject representing) {
+		representingElement = representing;
+	}
+}
+
+
+[/template]
+
+[query public representingElementAdapterClassPath(genPackage : GenPackage, className : String) : String
+	= genPackage.genModel.extractSourceDirectory(genPackage.genModel.modelDirectory) + '/'+ genPackage.getUtilitiesPackageName().toPath() + '/' +
+		className+ '.java'/]
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/ResourceClass.mtl b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/ResourceClass.mtl
new file mode 100644
index 00000000000..5db46f61e88
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/ResourceClass.mtl
@@ -0,0 +1,536 @@
+[comment]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:
+ Obeo - Initial API and implementation
+ CEA LIST - Modification to support Facade code generation[/comment]
+[comment encoding = UTF-8 /]
+[module ResourceClass('http://www.eclipse.org/emf/2002/GenModel', 'http://www.eclipse.org/emf/2002/Ecore')/]
+
+[import org::eclipse::emf::eef::codegen::ecore::services::common /]
+[import org::eclipse::emf::eef::codegen::ecore::services::header /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenModel /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenPackage /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenClass /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenClassifier /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenFeature /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenDataType /]
+[import org::eclipse::emf::eef::codegen::ecore::services::StringUtil /]
+
+[comment]
+/**
+ * <copyright>
+ *
+ * Copyright (c) 2002-2006 IBM Corporation and others.
+ * All rights reserved.   This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   IBM - Initial API and implementation
+ *
+ * </copyright>
+ */
+[/comment]
+
+[template public resourceClass(genPackage : GenPackage) { genModel : GenModel = genPackage.genModel; packageName : String = genPackage.getUtilitiesPackageName(); className : String = genPackage.getResourceClassName();} ]
+[genModel.initializeImportManager(packageName, className)/]
+
+[genModel.getImportedName('org.eclipse.emf.common.util.URI')/]
+
+[file (genPackage.resourceClassPath(), false, 'UTF-8')]
+[genModel.includeHeader()/]
+package [packageName/];
+[let content : String = genPackage.resourceFileContent(genModel, className)]
+[genModel.genSortedImports()/]
+[content/]
+[/let]
+[/file]
+[/template]
+
+[template protected resourceFileContent(genPackage : GenPackage, genModel : GenModel, className : String)]
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Resource </b> associated with the package.
+ * <!-- end-user-doc -->
+ * @see [genPackage.getQualifiedResourceFactoryClassName()/]
+ * @generated
+ */
+public class [className/] extends [genPackage.getImportedResourceBaseClassName()/]
+{
+	private [genModel.getImportedName('org.eclipse.emf.ecore.resource.Resource')/] resUML;
+
+	@Override
+	public void doLoad([genModel.getImportedName('java.io.InputStream')/] inputStream, [genModel.getImportedName('java.util.Map')/]<?, ?> options) throws [genModel.getImportedName('java.io.IOException')/] {
+		resUML = [genModel.getImportedName(genPackage.getUtilitiesPackageName()+'.Loader')/].doLoad(inputStream, options, [genModel.getImportedName(genPackage.getImportedFactoryInterfaceName())/].eINSTANCE, this);
+	}
+
+	@Override
+	public void doSave([genModel.getImportedName('java.io.OutputStream')/] outputStream, [genModel.getImportedName('java.util.Map')/]<?, ?> options) throws [genModel.getImportedName('java.io.IOException')/] {
+		if(resUML != null) {
+			resUML.save(options);
+		}
+		[genModel.getImportedName('java.io.PrintStream')/] stream = new [genModel.getImportedName('java.io.PrintStream')/](outputStream);
+		stream.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+		String uri = resUML.getURI().toString();
+		stream.println("<source uri=\"" + uri + "\"/>");
+	}
+
+[if (genModel.hasCopyrightField())]
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final [genModel.getImportedName('java.lang.String')/] copyright = [genModel.getCopyrightFieldLiteral()/];[genModel.getNonNLS()/]
+
+[/if]
+	/**
+	 * Creates an instance of the resource.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param uri the URI of the new resource.
+	 * @generated
+	 */
+	public [className/](URI uri)
+	{
+		super(uri);
+[if (genPackage.getResource() = GenResourceKind::XML)][comment Do nothing/]
+[/if]
+	}
+
+[if (genPackage.dataTypeConverters and (genPackage.hasDocumentRoot() or genPackage.isXMLTypePackage()))]
+[let _Map : String = if (genModel.useGenerics()) then 'Map<?, ?>' else 'Map' endif]
+[let _MapStringBoolean : String = if (genModel.useGenerics()) then 'Map<String, Boolean>' else 'Map' endif]
+[let _MapStringWildcard : String = if (genModel.useGenerics()) then 'Map<String, ?>' else 'Map' endif]
+[comment || org.eclipse.emf.ecore.xml.type.XMLTypePackage.eNS_URI.equals(genPackage.getNSURI()))) { boolean isXMLTypePackage = org.eclipse.emf.ecore.xml.type.XMLTypePackage.eNS_URI.equals(genPackage.getNSURI());%>/]
+	[if (not genPackage.isXMLTypePackage())]
+[genModel.getImportedName('org.eclipse.emf.ecore.xmi.XMLResource')/]
+[genModel.getImportedName('org.eclipse.emf.ecore.xmi.XMLParserPool')/]
+[genModel.getImportedName('org.eclipse.emf.ecore.xmi.impl.XMLParserPoolImpl')/]
+[genModel.getImportedName('java.io.InputStream')/]
+[genModel.getImportedName('java.io.IOException')/]
+[genModel.getImportedName('org.eclipse.emf.ecore.EObject')/]
+[genModel.getImportedName('java.util.Collections')/]
+[genModel.getImportedName('java.util.HashMap')/]
+[genModel.getImportedName('java.util.Map')/]
+[genModel.getImportedName('org.xml.sax.InputSource')/]
+[genModel.getImportedName('javax.xml.parsers.SAXParser')/]
+	[/if]
+[genModel.getImportedName('org.xml.sax.Attributes')/]
+[genModel.getImportedName('org.xml.sax.SAXException')/]
+[let _StackFrame : String = genModel.getImportedName('org.eclipse.emf.ecore.xml.type.util.XMLTypeResourceImpl') + '.StackFrame']
+[let _DataFrame : String = genModel.getImportedName('org.eclipse.emf.ecore.xml.type.util.XMLTypeResourceImpl') + '.DataFrame']
+	[if (not genPackage.isXMLTypePackage())]
+	/**
+	 * A load option that turns of the use of the generate data converters.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final String OPTION_USE_DATA_CONVERTER = "USE_DATA_CONVERTER";
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+  [if (genModel.useClassOverrideAnnotation())]
+	@Override
+  [/if]
+	public void doLoad(InputStream inputStream, [_Map/] options) throws IOException
+	{
+		if (options != null && Boolean.TRUE.equals(options.get(OPTION_USE_DATA_CONVERTER)))
+		{
+		  getContents().add
+			 (load
+				 (new InputSource(inputStream), 
+				  ([_MapStringBoolean/])options.get(XMLResource.OPTION_PARSER_FEATURES), 
+				  ([_MapStringWildcard/])options.get(XMLResource.OPTION_PARSER_PROPERTIES), 
+				  Boolean.TRUE.equals(options.get(XMLResource.OPTION_USE_LEXICAL_HANDLER))).eContainer());
+		}
+		else
+		{  
+			super.doLoad(inputStream, options);
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+  [if (genModel.useClassOverrideAnnotation())]
+	@Override
+  [/if]
+	public void doLoad(InputSource inputSource, [_Map/] options) throws IOException
+	{
+		if (options != null && Boolean.TRUE.equals(options.get(OPTION_USE_DATA_CONVERTER)))
+		{
+		  getContents().add
+			 (load
+				 (inputSource,
+				  ([_MapStringBoolean/])options.get(XMLResource.OPTION_PARSER_FEATURES), 
+				  ([_MapStringWildcard/])options.get(XMLResource.OPTION_PARSER_PROPERTIES), 
+				  Boolean.TRUE.equals(options.get(XMLResource.OPTION_USE_LEXICAL_HANDLER))).eContainer());
+		}
+		else
+		{  
+			super.doLoad(inputSource, options);
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static final XMLParserPool parserPool = new XMLParserPoolImpl();
+
+	/**
+	 * Loads an instance from the input.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param inputSource the input from which to load.
+	 * @param features a map of the parser features and their values.
+	 * @param properties a map of a parser properties and their values.
+	 * @param useLexicalHandler whether a lexical handler should be used during loading.
+	 * @return the root object; for the case of a document root, the child of that document root is return.
+	 * @throws ParserConfigurationException
+	 * @throws SAXException
+	 * @generated
+	 */
+	public static EObject load(InputSource inputSource, [_MapStringBoolean/] features, [_MapStringWildcard/] properties, boolean useLexicalHandler) throws IOException
+	{
+		[_MapStringBoolean/] requiredFeatures = new [_MapStringBoolean.replaceAll('Map','HashMap')/]();
+		requiredFeatures.put("http://xml.org/sax/features/namespaces", Boolean.TRUE); 
+		if (features != null)
+		{
+			requiredFeatures.putAll(features);
+		}
+		
+		if (properties == null)
+		{
+			properties = Collections.[if (genModel.useGenerics())]emptyMap()[else]EMPTY_MAP[/if];
+		}
+		
+		SAXParser saxParser = null;
+		try
+		{
+			saxParser = parserPool.get(requiredFeatures, properties, useLexicalHandler);
+			final FrameFactory.DocumentRootStackFrame documentRoot = FrameFactory.INSTANCE.pushDocumentRoot(null, null);
+			XMLTypeResourceImpl.Handler handler = new XMLTypeResourceImpl.Handler(documentRoot);
+			saxParser.parse(inputSource, handler);
+		[if (genModel.suppressEMFTypes)]
+			return (EObject)((EObject)FrameFactory.INSTANCE.popDocumentRoot(documentRoot)).eContents().get(0);
+		[else]
+			return FrameFactory.INSTANCE.popDocumentRoot(documentRoot).eContents().get(0);
+		[/if]
+		}
+		catch (Exception exception)
+		{
+			throw new IOWrappedException(exception);
+		}
+		finally
+		{
+			parserPool.release(saxParser, requiredFeatures, properties, useLexicalHandler);
+		}
+	}
+
+	[/if]
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public final static class FrameFactory
+	{
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public static final FrameFactory INSTANCE = new FrameFactory();
+	
+	[for (genClass : GenClass | genPackage.genClasses)]
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected [genClass.getName()/]StackFrame [genClass.getSafeUncapName()/];
+
+	[/for]
+	[for (genDataType : GenDataType | genPackage.getAllGenDataTypes())]
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected [_DataFrame/] [genDataType.getSafeUncapName()/];
+
+	[/for]
+	[for (genClass : GenClass | genPackage.genClasses)]
+		[let attributes : Sequence(EStructuralFeature) = genModel.getAllExtendedMetaDataAttributes(genClass.ecoreClass)]
+			[let elements : Sequence(EStructuralFeature) = genModel.getAllExtendedMetaDataElements(genClass.ecoreClass)]
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public [genClass.getName()/]StackFrame push[genClass.getName()/]([_StackFrame/] previous, Attributes attributes)
+		{
+			 [genClass.getName()/]StackFrame result[genClass.getName()/] = [genClass.getSafeUncapName()/] == null ? new [genClass.getName()/]StackFrame() : [genClass.getSafeUncapName()/];
+			 [genClass.getSafeUncapName()/] = null;
+			 result[genClass.getName()/].pushOnto(previous);
+			 result[genClass.getName()/].handleAttributes(attributes);
+			 return result[genClass.getName()/];
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public [genClass.getImportedInterfaceName()/] pop[genClass.getName()/]([genClass.getName()/]StackFrame [genClass.getSafeUncapName()/])
+		{
+			[genClass.getImportedInterfaceName()/] result[genClass.getName()/]Value = [genClass.getSafeUncapName()/].pop[genClass.getName()/]();
+			this.[genClass.getSafeUncapName()/] = [genClass.getSafeUncapName()/];
+			return result[genClass.getName()/]Value;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public static class [genClass.getName()/]StackFrame extends [_StackFrame/]
+		{
+			/**
+			 * <!-- begin-user-doc -->
+			 * <!-- end-user-doc -->
+			 * @generated
+			 */
+			protected [genClass.getImportedInterfaceName()/] the[genClass.getName()/];
+		
+		[for (genFeature : GenFeature | genClass.getAllGenFeatures())]
+			[let name : String = genModel.getExtendedMetaDataName(genFeature.ecoreFeature)]
+			[if ((elements->includes(genFeature.ecoreFeature) or attributes->includes(genFeature.ecoreFeature)) and name.index(':') < 0)]
+				[if (genFeature.isReferenceType())]
+			/**
+			 * <!-- begin-user-doc -->
+			 * <!-- end-user-doc -->
+			 * @generated
+			 */
+			protected [genFeature.getTypeGenClass().genPackage.getImportedResourceClassName()/].FrameFactory.[genFeature.getTypeGenClass().getName()/]StackFrame [genFeature.getSafeName()/];
+
+				[else]
+			/**
+			 * <!-- begin-user-doc -->
+			 * <!-- end-user-doc -->
+			 * @generated
+			 */
+			protected [_DataFrame/] [genFeature.getSafeName()/];
+		
+				[/if]
+			[/if]
+			[/let]
+		[/for]
+			/**
+			 * <!-- begin-user-doc -->
+			 * <!-- end-user-doc -->
+			 * @generated
+			 */
+  [if (genModel.useClassOverrideAnnotation())]
+			@Override
+  [/if]
+			public void handleAttributes(Attributes attributes)
+			{
+	[comment int count = 0; for (GenFeature genFeature : genClass.getAllGenFeatures()) /]
+		[let featuresToHandle : Sequence(GenFeature) = genClass.getAllGenFeatures()->filter(GenFeature)
+			->select(f : GenFeature| attributes->includes(f.ecoreFeature)
+				and not f.isDerived()
+				and genModel.getExtendedMetaDataName(f.ecoreFeature).index(':') < 0
+				and not f.isReferenceType())]
+			[for (genFeature : GenFeature | featuresToHandle)]
+				[let name : String = genModel.getExtendedMetaDataName(genFeature.ecoreFeature)]
+					[let namespace : String = genModel.getExtendedMetaDataNamespaceAsLiteral(genFeature.ecoreFeature)]
+						[let genClassifier : GenClassifier = genFeature.getTypeGenClassifier()]
+				[if (i = 0)]
+				String theValue = attributes.getValue([namespace/], "[name/]");
+				[else]
+				theValue = attributes.getValue([namespace/], "[name/]");
+				[/if]
+				if (theValue != null)
+				{
+				[if (genClassifier.genPackage.dataTypeConverters)]
+					the[genClass.getName()/].set[genFeature.getAccessorName()/]([genClassifier.genPackage.getQualifiedFactoryInstanceAccessor()/].create[genClassifier.getName()/](theValue));
+				[else]
+					the[genClass.getName()/].set[genFeature.getAccessorName()/](([genFeature.getImportedType(null)/])[genClassifier.genPackage.getQualifiedEFactoryInstanceAccessor()/].createFromString([genClassifier.getQualifiedClassifierAccessor()/], theValue));
+				[/if]
+				}
+						[/let]
+					[/let]
+				[/let]
+			[/for]
+			[if (featuresToHandle->isEmpty())]
+				// There are attributes to handle.
+			[/if]
+		[/let]
+			}
+		
+			/**
+			 * <!-- begin-user-doc -->
+			 * <!-- end-user-doc -->
+			 * @generated
+			 */
+  [if (genModel.useClassOverrideAnnotation())]
+			@Override
+  [/if]
+			public [_StackFrame/] startElement(String namespace, String localName, String qName, Attributes attributes) throws SAXException
+			{
+		[let featuresToHandle : Sequence(GenFeature) = genClass.getAllGenFeatures()->filter(GenFeature)
+			->select(f : GenFeature | elements->includes(f.ecoreFeature)
+				and genModel.getExtendedMetaDataName(f.ecoreFeature).index(':') < 0)]
+			[for (genFeature : GenFeature | featuresToHandle)]
+				[let name : String = genModel.getExtendedMetaDataName(genFeature.ecoreFeature)]
+					[let namespace : String = genModel.getExtendedMetaDataNamespaceAsLiteral(genFeature.ecoreFeature)]
+				[if (i > 0)]else [/if]if ("[name/]".equals(localName) && [namespace/].equals(namespace))
+				{
+					return [genFeature.getSafeName()/] = [genFeature.getTypeGenClassifier().genPackage.getImportedResourceClassName()/].FrameFactory.INSTANCE.push[genFeature.getTypeGenClassifier().getName()/](this, attributes);
+				}
+					[/let]
+				[/let]
+			[/for]
+			[if (featuresToHandle->isEmpty())]
+				return super.startElement(namespace, localName, qName, attributes);
+			[else]
+				else
+				{
+					return super.startElement(namespace, localName, qName, attributes);
+				}
+			[/if]
+		[/let]
+			}
+
+			/**
+			 * <!-- begin-user-doc -->
+			 * <!-- end-user-doc -->
+			 * @generated
+			 */
+  [if (genModel.useClassOverrideAnnotation())]
+			@Override
+  [/if]
+			public void endElement([_StackFrame/] child) throws SAXException
+			{
+		[let featuresToHandle : Sequence(GenFeature) = genClass.getAllGenFeatures()->filter(GenFeature)
+			->select(f : GenFeature | elements->includes(f.ecoreFeature)
+				and genModel.getExtendedMetaDataName(f.ecoreFeature).index(':') < 0)]
+			[for (genFeature : GenFeature | featuresToHandle)]
+				[let name : String = genModel.getExtendedMetaDataName(genFeature.ecoreFeature)]
+				[if (i > 0)]else [/if]if (child == [genFeature.getSafeName()/])
+				{
+				[if (genFeature.isListType())]
+					the[genClass.getName()/].[genFeature.getGetAccessor()/]().add([genFeature.getTypeGenClassifier().genPackage.getImportedResourceClassName()/].FrameFactory.INSTANCE.pop[genFeature.getTypeGenClassifier().getName()/]([genFeature.getSafeName()/]));
+				[else]
+					the[genClass.getName()/].set[genFeature.getAccessorName()/]([genFeature.getTypeGenClassifier().genPackage.getImportedResourceClassName()/].FrameFactory.INSTANCE.pop[genFeature.getTypeGenClassifier().getName()/]([genFeature.getSafeName()/]));
+				[/if]
+					[genFeature.getSafeName()/] = null;
+				}
+				[/let]
+			[/for]
+			[if (featuresToHandle->isEmpty())]
+				super.endElement(child);
+			[else]
+				else
+				{
+					super.endElement(child);
+				}
+			[/if]
+		[/let]
+			}
+
+			/**
+			 * <!-- begin-user-doc -->
+			 * <!-- end-user-doc -->
+			 * @generated
+			 */
+  [if (genModel.useClassOverrideAnnotation())]
+			@Override
+  [/if]
+			public void create()
+			{
+				the[genClass.getName()/] = [genPackage.getQualifiedFactoryInstanceAccessor()/].create[genClass.getName()/]();
+			}
+		
+			/**
+			 * <!-- begin-user-doc -->
+			 * <!-- end-user-doc -->
+			 * @generated
+			 */
+			protected [genClass.getImportedInterfaceName()/] pop[genClass.getName()/]()
+			{
+				pop();
+				[genClass.getImportedInterfaceName()/] result[genClass.getName()/]Value = the[genClass.getName()/];
+				the[genClass.getName()/] = null;
+				return result[genClass.getName()/]Value;
+			}
+		
+		}
+
+			[/let]
+		[/let]
+	[/for]
+	[for (genDataType : GenDataType | genPackage.getAllGenDataTypes())]
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public [_DataFrame/] push[genDataType.getName()/]([_StackFrame/] previous, Attributes attributes)
+		{
+			 [_DataFrame/] result[genDataType.getName()/] = [genDataType.getSafeUncapName()/] == null ? new [_DataFrame/]() : [genDataType.getSafeUncapName()/];
+			 [genDataType.getSafeUncapName()/] = null;
+			 result[genDataType.getName()/].pushOnto(previous);
+			 result[genDataType.getName()/].handleAttributes(attributes);
+			 return result[genDataType.getName()/];
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public [genDataType.getImportedParameterizedInstanceClassName()/] pop[genDataType.getName()/]([_DataFrame/] [genDataType.getSafeUncapName()/])
+		{
+		[if (genDataType.genPackage.dataTypeConverters)]
+			[genDataType.getImportedParameterizedInstanceClassName()/] result[genDataType.getName()/]Value = [genDataType.genPackage.getQualifiedFactoryInstanceAccessor()/].create[genDataType.getName()/]([genDataType.getSafeUncapName()/].popValue());
+		[else][if (genDataType.isPrimitiveType() and not genModel.isJDK50())]
+			[genDataType.getImportedInstanceClassName()/] result[genDataType.getName()/]Value = (([genDataType.getObjectInstanceClassName()/])[genDataType.genPackage.getQualifiedEFactoryInstanceAccessor()/].createFromString([genDataType.getQualifiedClassifierAccessor()/], [genDataType.getSafeUncapName()/].popValue())).[genDataType.getPrimitiveValueFunction()/]();
+		[else]
+			[genDataType.getImportedInstanceClassName()/] result[genDataType.getName()/]Value = ([genDataType.getObjectInstanceClassName()/])[genDataType.genPackage.getQualifiedEFactoryInstanceAccessor()/].createFromString([genDataType.getQualifiedClassifierAccessor()/], [genDataType.getSafeUncapName()/].popValue());
+		[/if][/if]
+			this.[genDataType.getSafeUncapName()/] = [genDataType.getSafeUncapName()/];
+			return result[genDataType.getName()/]Value;
+		}
+
+	[/for]
+	}
+
+[/let]
+[/let]
+[/let]
+[/let]
+[/let]
+[/if]
+} //[className/]
+[/template]
+
+[query public resourceClassPath(genPackage : GenPackage) : String
+	= genPackage.genModel.extractSourceDirectory(genPackage.genModel.modelDirectory) + '/'
+		+ genPackage.getQualifiedResourceClassName().toPath() + '.java'/]
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/WrapperClass.mtl b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/WrapperClass.mtl
new file mode 100644
index 00000000000..aac751d53f3
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/genfacade/WrapperClass.mtl
@@ -0,0 +1,189 @@
+[comment]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:
+ Obeo - Initial API and implementation
+ CEA LIST - Modification to support Facade code generation[/comment]
+[comment encoding = UTF-8 /]
+[module WrapperClass('http://www.eclipse.org/emf/2002/GenModel','http://www.eclipse.org/papyrus/facademapping','http://www.eclipse.org/emf/2002/Ecore')]
+
+[import org::eclipse::emf::eef::codegen::ecore::services::common /]
+[import org::eclipse::emf::eef::codegen::ecore::services::header /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenModel /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenPackage /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenClass /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenClassifier /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenFeature /]
+[import org::eclipse::emf::eef::codegen::ecore::services::wrappers::GenDataType /]
+[import org::eclipse::emf::eef::codegen::ecore::services::StringUtil /]
+[import org::eclipse::papyrus::facade::codegen::utils::FacadeCodegenUtils /]
+
+
+[template public wrapperClass(genPackage : GenPackage)  { genModel : GenModel = genPackage.genModel; packageName : String = genPackage.getUtilitiesPackageName(); className : String = 'Wrapper'}]
+
+[genModel.initializeImportManager(packageName, className)/]
+
+[genModel.getImportedName('org.eclipse.emf.common.util.URI')/]
+
+
+[file (genPackage.wrapperClassPath(className), false, 'UTF-8')]
+[genModel.includeHeader()/]
+package [packageName/];
+[let content : String = genPackage.wrapperFileContent(genModel, className)]
+[genModel.genSortedImports()/]
+[content/]
+[/let]
+[/file]
+
+[/template]
+
+[template protected wrapperFileContent(genPackage : GenPackage, genModel : GenModel, className : String)]
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Wrapper</b> associated with the package.
+ * <!-- end-user-doc -->
+ * @see [genPackage.getQualifiedResourceFactoryClassName()/]
+ * @generated
+ */
+public class [className/] 
+{
+private static volatile Wrapper instance = null;
+
+	private Wrapper() {
+		super();
+	}
+
+	public final static Wrapper getInstance() {
+		if(instance == null) {
+			synchronized(Wrapper.class) {
+				if(instance == null) {
+					instance = new Wrapper();
+				}
+			}
+		}
+		return instance;
+	}
+
+	public [genModel.getImportedName('org.eclipse.emf.ecore.EClassifier')/] getMappingFromUML([genModel.getImportedName('org.eclipse.emf.ecore.EObject')/] umlElement) {
+		
+		[genModel.getAllMetaclassMappings().genMappingfromUML(genModel, genPackage)/]
+			
+		return null;
+	}
+
+	public <E extends [genModel.getImportedName('org.eclipse.papyrus.facade.utils.RepresentingElement')/]> void updateCache([genModel.getImportedName('org.eclipse.emf.common.util.EList')/]<E> update, [genModel.getImportedName('org.eclipse.emf.common.util.EList')/]<E> cache) {
+		//Empty the cache
+		while(!cache.isEmpty()) {
+			((org.eclipse.papyrus.facade.utils.wrappinglist.WrappingList<E>)cache).silentRemove(0);
+		}
+
+
+		for(int i = 0; i < update.size(); i++) {
+			E elementInUpdate = update.get(i);
+			((org.eclipse.papyrus.facade.utils.wrappinglist.WrappingList<E>)cache).silentAdd(i, elementInUpdate);
+		}
+	}
+
+	public <E extends [genModel.getImportedName('org.eclipse.papyrus.facade.utils.RepresentingElement')/]> [genModel.getImportedName('org.eclipse.emf.common.util.EList')/] toRepresentedList([genModel.getImportedName('java.util.List')/]<E> list) {
+		[genModel.getImportedName('org.eclipse.emf.common.util.EList')/]<[genModel.getImportedName('org.eclipse.emf.ecore.EObject')/]> result = new [genModel.getImportedName('org.eclipse.emf.common.util.BasicEList')/]<[genModel.getImportedName('org.eclipse.emf.ecore.EObject')/]>();
+
+		for(E representingElement : list) {
+			result.add(representingElement.get__Represented());
+		}
+
+		return result;
+	}
+
+	public [genModel.getImportedName('org.eclipse.emf.ecore.EStructuralFeature')/] getFeatureMappingFromUML([genModel.getImportedName('org.eclipse.emf.ecore.EStructuralFeature')/] feature) {
+
+		[genModel.getAllFeatureMappings().getFeatureMappingFromUML(genModel, genPackage)/]
+
+
+		return null;
+	}
+
+	public Enum getEnumMappingFromUML(Enum value) {
+
+		[genModel.getAllEnumLiteralMappings().genEnumMappingfromUML(genModel, genPackage)/]
+
+		return null;
+	}
+
+	public Enum getEnumMappingFromSpecific(Enum value) {
+
+		[genModel.getAllEnumLiteralMappings().genEnumMappingfromSpecific(genModel, genPackage)/]
+
+		return null;
+	}
+
+	public [genModel.getImportedName('org.eclipse.emf.ecore.EObject')/] findOrCreateSpecific([genModel.getImportedName('org.eclipse.emf.ecore.EObject')/] umlElement) {
+		[genModel.getImportedName('org.eclipse.emf.common.util.EList')/]<[genModel.getImportedName('org.eclipse.emf.common.notify.Adapter')/]> adapters = umlElement.eAdapters();
+		for([genModel.getImportedName('org.eclipse.emf.common.notify.Adapter')/] adapter : adapters) {
+			if(adapter instanceof [genModel.getImportedName(genPackage.getUtilitiesPackageName()+'.RepresentingElementAdapter')/]) {
+				return (([genModel.getImportedName(genPackage.getUtilitiesPackageName()+'.RepresentingElementAdapter')/])adapter).get__Representing();
+			}
+		}
+
+		[genModel.getImportedName('org.eclipse.emf.ecore.EClassifier')/] eClassifier = getMappingFromUML(umlElement);
+		if(eClassifier != null) {
+			if(eClassifier instanceof [genModel.getImportedName('org.eclipse.emf.ecore.EClass')/]) {
+				[genModel.getImportedName('org.eclipse.emf.ecore.EObject')/] representingElement = [genPackage.getImportedFactoryInterfaceName()/].eINSTANCE.create(([genModel.getImportedName('org.eclipse.emf.ecore.EClass')/])eClassifier);
+				if(representingElement instanceof [genModel.getImportedName('org.eclipse.papyrus.facade.utils.RepresentingElement')/]) {
+					//Override represented
+
+					(([genModel.getImportedName('org.eclipse.papyrus.facade.utils.RepresentingElement')/])representingElement).set__Represented(umlElement);
+					[genModel.getImportedName(genPackage.getUtilitiesPackageName()+'.RepresentingElementAdapter')/] adapter = new [genModel.getImportedName(genPackage.getUtilitiesPackageName()+'.RepresentingElementAdapter')/]();
+					adapter.set__Representing(representingElement);
+					umlElement.eAdapters().add(adapter);
+					return representingElement;
+				}
+			}
+		}
+
+
+		return null;
+	}
+}
+
+[/template]
+
+[template public genEnumMappingfromUML(mapping : Mapping , genModel:GenModel, genPackage: GenPackage)]
+
+	if(value ==  [getPackagePathFromMapping(mapping)/].[getUMLEnumElementFromMapping(mapping)/]) {
+		return [genModel.getImportedName(genPackage.getInterfacePackageName())/].[getFacadeEnumElementFromMapping(mapping)/];
+	}
+
+[/template]
+
+[template public genEnumMappingfromSpecific(mapping : Mapping , genModel:GenModel, genPackage: GenPackage)]
+
+	if(value ==  [genModel.getImportedName(genPackage.getInterfacePackageName())/].[getFacadeEnumElementFromMapping(mapping)/]) {
+		return [getPackagePathFromMapping(mapping)/].[getUMLEnumElementFromMapping(mapping)/];
+	}
+
+[/template]
+
+[template public genMappingfromUML(mapping : Mapping , genModel:GenModel, genPackage: GenPackage)]
+
+	if(umlElement.eClass() == [genModel.getImportedName(getUMLPackageName(mapping))/].eINSTANCE.get[getUMLAccessorName(mapping,genModel)/]()) {
+		[mapping.getCorrespondingStereotypeMapping(genModel,genPackage)/]
+
+		return [genModel.getImportedName(genPackage.getImportedPackageInterfaceName())/].eINSTANCE.get[getClassifierAccessorName(genModel,mapping)/]();
+	}
+
+[/template]
+
+[template public getFeatureMappingFromUML(mapping : Mapping , genModel:GenModel, genPackage: GenPackage)]
+	if(feature == [genModel.getImportedName(getUMLPackageName(mapping))/].eINSTANCE.get[getUMLFeatureFromMapping(mapping,genModel)/]()) {
+		return [genModel.getImportedName(genPackage.getImportedPackageInterfaceName())/].eINSTANCE.get[getFeatureAccessorName(genModel,mapping)/]();
+	
+	}
+[/template]
+
+[query public wrapperClassPath(genPackage : GenPackage, className : String) : String
+	= genPackage.genModel.extractSourceDirectory(genPackage.genModel.modelDirectory) + '/'+ genPackage.getUtilitiesPackageName().toPath() + '/' +
+		className+ '.java'/]
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/utils/FacadeCodegenUtils.mtl b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/utils/FacadeCodegenUtils.mtl
new file mode 100644
index 00000000000..9712b218a46
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/utils/FacadeCodegenUtils.mtl
@@ -0,0 +1,127 @@
+[comment]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:
+ CEA LIST - Initial API and implementation[/comment]
+[comment encoding = UTF-8 /]
+[module FacadeCodegenUtils('http://www.eclipse.org/emf/2002/Ecore','http://www.eclipse.org/papyrus/facademapping', 'http://www.eclipse.org/emf/2002/GenModel','http://www.eclipse.org/uml2/4.0.0/UML')/]
+
+[query public getUMLMetaElement( facadeMetaElement : EObject,  genModel :GenModel) : String
+= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'getUMLMetaElement( org.eclipse.emf.ecore.EObject,org.eclipse.emf.codegen.ecore.genmodel.GenModel)', Sequence{facadeMetaElement,genModel}) 
+/]
+
+[query public findUMLMetaElement( facadeMetaElement : EObject,  genModel :GenModel) : EObject
+= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'findUMLMetaElement( org.eclipse.emf.ecore.EObject,org.eclipse.emf.codegen.ecore.genmodel.GenModel)', Sequence{facadeMetaElement,genModel}) 
+/]
+
+[query public findUMLGetAccessor( facadeMetaFeature : EObject,  facadeGenModel :GenModel) : String
+= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'findUMLGetAccessor( org.eclipse.emf.ecore.EObject,org.eclipse.emf.codegen.ecore.genmodel.GenModel)', Sequence{facadeMetaFeature,facadeGenModel}) 
+/]
+
+[query public findUMLAccessorName( facadeMetaFeature : EObject,  facadeGenModel :GenModel) : String
+= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'findUMLAccessorName( org.eclipse.emf.ecore.EObject,org.eclipse.emf.codegen.ecore.genmodel.GenModel)', Sequence{facadeMetaFeature,facadeGenModel}) 
+/]
+
+[query public getClassifierAccessorName(  genModel:GenModel,  mapping:Mapping) : String
+= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'getClassifierAccessorName( org.eclipse.emf.codegen.ecore.genmodel.GenModel,org.eclipse.papyrus.facademapping.Mapping)', Sequence{genModel,mapping}) 
+/]
+
+[query public getFeatureAccessorName(  genModel:GenModel,  mapping:Mapping) : String
+= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'getFeatureAccessorName( org.eclipse.emf.codegen.ecore.genmodel.GenModel,org.eclipse.papyrus.facademapping.Mapping)', Sequence{genModel,mapping}) 
+/]
+
+[query public getUMLPackageName( mapping : Mapping) : String
+= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'getUMLPackageName( org.eclipse.papyrus.facademapping.Mapping)', Sequence{mapping}) 
+/]
+
+[query public getPackagePathFromUML( facadeMetaElement:EObject) : String
+= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'getPackagePathFromUML(org.eclipse.emf.ecore.EObject)', Sequence{facadeMetaElement}) 
+/]
+
+[query public getPackagePathFromMapping( mapping : Mapping) : String
+= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'getPackagePathFromMapping(org.eclipse.papyrus.facademapping.Mapping)', Sequence{mapping}) 
+/]
+
+[query public getUMLFactory( facadeMetaElement:EObject,  genModel:GenModel) : String
+= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'getUMLFactory( org.eclipse.emf.ecore.EObject,org.eclipse.emf.codegen.ecore.genmodel.GenModel)', Sequence{facadeMetaElement,genModel})
+/]
+
+[query public getUMLAccessorName( mapping : Mapping,  genModel :GenModel) : EObject
+= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'getUMLAccessorName( org.eclipse.papyrus.facademapping.Mapping ,org.eclipse.emf.codegen.ecore.genmodel.GenModel)', Sequence{mapping,genModel}) 
+/]
+
+[query public getAllMetaclassMappings( facadeGenModel :GenModel) : Sequence(Mapping)
+= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'getAllMetaclassMappings(org.eclipse.emf.codegen.ecore.genmodel.GenModel)', Sequence{facadeGenModel}) 
+/]
+
+[query public getUMLFeatureFromMapping( mapping : Mapping,  genModel :GenModel) : EObject
+= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'getUMLFeatureFromMapping( org.eclipse.papyrus.facademapping.Mapping ,org.eclipse.emf.codegen.ecore.genmodel.GenModel)', Sequence{mapping,genModel}) 
+/]
+
+[query public getAllFeatureMappings( facadeGenModel :GenModel) : Sequence(Mapping)
+= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'getAllFeatureMappings(org.eclipse.emf.codegen.ecore.genmodel.GenModel)', Sequence{facadeGenModel}) 
+/]
+
+[query public getAppropriateQualifiedTypeName( genClassifier :GenClassifier) : String
+= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'getAppropriateQualifiedTypeName(org.eclipse.emf.codegen.ecore.genmodel.GenClassifier)', Sequence{genClassifier}) 
+/]
+
+[query public getAllStereotypeQualifiedNames( facadeMetaElement:EObject,  facadeGenModel:GenModel) : String
+= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'getAllStereotypeQualifiedNames( org.eclipse.emf.ecore.EObject,org.eclipse.emf.codegen.ecore.genmodel.GenModel)', Sequence{facadeMetaElement,facadeGenModel})
+/]
+
+[query public getNonAssociationStereotypeQualifiedNames( facadeMetaElement:EObject,  facadeGenModel:GenModel) : String
+= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'getNonAssociationStereotypeQualifiedNames( org.eclipse.emf.ecore.EObject,org.eclipse.emf.codegen.ecore.genmodel.GenModel)', Sequence{facadeMetaElement,facadeGenModel})
+/]
+
+[query public getUMLEnumElementFromMapping( mapping : Mapping) : String
+= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'getUMLEnumElementFromMapping( org.eclipse.papyrus.facademapping.Mapping )', Sequence{mapping}) 
+/]
+
+[query public getFacadeEnumElementFromMapping( mapping : Mapping) : String
+= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'getFacadeEnumElementFromMapping( org.eclipse.papyrus.facademapping.Mapping )', Sequence{mapping}) 
+/]
+
+[query public getAllEnumLiteralMappings( facadeGenModel :GenModel) : Sequence(Mapping)
+= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'getAllEnumLiteralMappings(org.eclipse.emf.codegen.ecore.genmodel.GenModel)', Sequence{facadeGenModel}) 
+/]
+
+[query public isStereotypeProperty(genFeature:GenFeature) : Boolean
+= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'isStereotypeProperty(org.eclipse.emf.codegen.ecore.genmodel.GenFeature)', Sequence{genFeature}) 
+/]
+
+[query public isExtensionProperty(genFeature:GenFeature) : Boolean
+= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'isExtensionProperty(org.eclipse.emf.codegen.ecore.genmodel.GenFeature)', Sequence{genFeature}) 
+/]
+
+[query public isExtentionStereotypeProperty(genFeature:GenFeature) : Boolean
+= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'isExtentionStereotypeProperty(org.eclipse.emf.codegen.ecore.genmodel.GenFeature)', Sequence{genFeature}) 
+/]
+
+[query public isPrimtiveList(genTypedElement:GenTypedElement) : Boolean
+= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'isPrimtiveList(org.eclipse.emf.codegen.ecore.genmodel.GenTypedElement)', Sequence{genTypedElement}) 
+/]
+
+[query public isPrimitive(genTypedElement:GenTypedElement) : Boolean
+= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'isPrimitive(org.eclipse.emf.codegen.ecore.genmodel.GenTypedElement)', Sequence{genTypedElement}) 
+/]
+
+[query public getCorrespondingStereotypeMapping(mapping : Mapping, genModel:GenModel,genPackage:GenPackage) : String
+= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'getCorrespondingStereotypeMapping(org.eclipse.papyrus.facademapping.Mapping,org.eclipse.emf.codegen.ecore.genmodel.GenModel,org.eclipse.emf.codegen.ecore.genmodel.GenPackage)', Sequence{mapping,genModel,genPackage}) 
+/]
+
+[query public getStereotypeQualifiedName(genFeature:GenFeature) : String
+= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'getStereotypeQualifiedName(org.eclipse.emf.codegen.ecore.genmodel.GenFeature)', Sequence{genFeature}) 
+/]
+
+[query public copyEcore(genPackage:GenPackage) : OclVoid 
+= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'copyEcore(org.eclipse.emf.codegen.ecore.genmodel.GenPackage)', Sequence{genPackage}) 
+/]
+
+[query public initUtilsCaches(traceabilityContext : OclAny) : OclVoid 
+= invoke('org.eclipse.papyrus.facade.codegen.utils.FacadeCodegenUtils', 'initUtilsCaches()', Sequence{}) 
+/]
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/utils/WrappingListUtils.mtl b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/utils/WrappingListUtils.mtl
new file mode 100644
index 00000000000..f825f95aa75
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src-templates/org/eclipse/papyrus/facade/codegen/utils/WrappingListUtils.mtl
@@ -0,0 +1,14 @@
+[comment]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:
+ CEA LIST - Initial API and implementation[/comment]
+[comment encoding = UTF-8 /]
+[module WrappingListUtils('http://www.eclipse.org/emf/2002/Ecore','http://www.eclipse.org/papyrus/facademapping', 'http://www.eclipse.org/emf/2002/GenModel','http://www.eclipse.org/uml2/2.2.0/GenModel')/]
+
+[query public getWrappingListConstructor(genClass:GenClass,  genFeature:GenFeature,  typeArgument:String) : String
+= invoke('org.eclipse.papyrus.facade.codegen.utils.WrappingListUtils', 'getWrappingListConstructor(org.eclipse.emf.codegen.ecore.genmodel.GenClass, org.eclipse.emf.codegen.ecore.genmodel.GenFeature, java.lang.String)', Sequence{ genClass,  genFeature,  typeArgument})/] 
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/FacadeCodeGenPlugin.java b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/FacadeCodeGenPlugin.java
new file mode 100644
index 00000000000..a7c88816fbd
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/FacadeCodeGenPlugin.java
@@ -0,0 +1,66 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facade.codegen;

+

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

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

+import org.osgi.framework.BundleContext;

+

+/**

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

+ */

+public class FacadeCodeGenPlugin extends AbstractUIPlugin {

+

+	// The plug-in ID

+	public static final String PLUGIN_ID = "org.eclipse.papyrus.facade.codegen"; //$NON-NLS-1$

+

+	// The shared instance

+	private static FacadeCodeGenPlugin plugin;

+

+	/** The log. */

+	public static LogHelper log;

+

+	public FacadeCodeGenPlugin() {

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * 

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

+	 */

+	public void start(BundleContext context) throws Exception {

+		super.start(context);

+		plugin = this;

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * 

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

+	 */

+	public void stop(BundleContext context) throws Exception {

+		plugin = null;

+		super.stop(context);

+	}

+

+	/**

+	 * Returns the shared instance

+	 * 

+	 * @return the shared instance

+	 */

+	public static FacadeCodeGenPlugin getDefault() {

+		return plugin;

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/Messages.java b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/Messages.java
new file mode 100644
index 00000000000..00cafa5e7ec
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/Messages.java
@@ -0,0 +1,45 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facade.codegen;

+

+import org.eclipse.osgi.util.NLS;

+

+public class Messages extends NLS {

+

+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.facade.codegen.messages"; //$NON-NLS-1$

+

+	public static String GenerateCodeAction_0;

+

+	public static String GenerateFacadeAction_0;

+

+	public static String GenerateFacadeAction_1;

+

+	public static String GenerateFacadeAction_3;

+

+	public static String GenerateFacadeAction_5;

+

+	public static String GenerateFacadeAction_6;

+

+	public static String FacadeCodegenUtils_48;

+

+	public static String FacadeCodegenUtils_49;

+

+	static {

+		// initialize resource bundle

+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);

+	}

+

+	private Messages() {

+	}

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/handlers/GenerateFacadeHandler.java b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/handlers/GenerateFacadeHandler.java
new file mode 100644
index 00000000000..a32042d416e
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/handlers/GenerateFacadeHandler.java
@@ -0,0 +1,229 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facade.codegen.handlers;

+

+import java.io.File;

+import java.io.IOException;

+import java.util.ArrayList;

+import java.util.List;

+

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+import org.eclipse.emf.codegen.ecore.Generator;

+import org.eclipse.emf.codegen.ecore.genmodel.GenModel;

+import org.eclipse.emf.codegen.ecore.genmodel.generator.GenBaseGeneratorAdapter;

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

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

+import org.eclipse.emf.eef.codegen.flow.Step;

+import org.eclipse.emf.eef.codegen.flow.Workflow;

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

+import org.eclipse.papyrus.facade.codegen.FacadeCodeGenPlugin;

+import org.eclipse.papyrus.facade.codegen.Messages;

+import org.eclipse.papyrus.facade.codegen.genfacade.GenFacade;

+import org.eclipse.papyrus.facade.codegen.utils.EEFGeneratorAdapter;

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

+import org.eclipse.ui.ISelectionService;

+import org.eclipse.ui.IWorkbenchWindow;

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

+

+/**

+ * Handler to generate Facade code.

+ */

+public class GenerateFacadeHandler extends AbstractHandler {

+

+

+	/** The workspace. */

+	protected IWorkspace workspace = ResourcesPlugin.getWorkspace();

+

+

+	/**

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

+	 * 

+	 * @param event

+	 * @return

+	 * @throws ExecutionException

+	 */

+

+	@Override

+	public Object execute(ExecutionEvent event) throws ExecutionException {

+		List<GenModel> emfGenModels = new ArrayList<GenModel>();

+

+		// get workbench window

+		IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindowChecked(event);

+		// set selection service

+		ISelectionService service = window.getSelectionService();

+		// set structured selection

+		IStructuredSelection structured = (IStructuredSelection)service.getSelection();

+

+		if(structured != null) {

+			for(Object selectedElement : structured.toList()) {

+				if(selectedElement instanceof GenModel) {

+					emfGenModels.add((GenModel)selectedElement);

+				}

+			}

+		}

+

+		if(emfGenModels != null) {

+			final Workflow flow = initEMFGenFlow(emfGenModels);

+			flow.prepare();

+			Job job = new Job(Messages.GenerateCodeAction_0) {

+

+				@Override

+				protected IStatus run(IProgressMonitor monitor) {

+					flow.execute(monitor);

+					monitor.done();

+					return Status.OK_STATUS;

+				}

+

+			};

+			job.setUser(true);

+			job.schedule();

+		}

+

+		return null;

+	}

+

+	/**

+	 * Inits the emf gen flow.

+	 * 

+	 * @param emfGenModels

+	 *        the emf Genmodels to generate the facade for

+	 * @return the workflow

+	 */

+	protected Workflow initEMFGenFlow(List<GenModel> emfGenModels) {

+		final Workflow flow = new Workflow(Messages.GenerateFacadeAction_0, Display.getCurrent().getActiveShell());

+		for(final org.eclipse.emf.codegen.ecore.genmodel.GenModel emfGenModel : emfGenModels) {

+			String s2 = Messages.GenerateFacadeAction_1 + emfGenModel.eResource().getURI().toString();

+			flow.addStep(s2, new Step("FACADE MODEL") { //$NON-NLS-1$

+

+				@Override

+				public IStatus execute(IProgressMonitor monitor) {

+					// create the model project

+					IProject modelProject = getProjectFromStringPath(emfGenModel.getModelProjectDirectory());

+					if(modelProject == null) {

+						return Status.OK_STATUS;

+					}

+					List<IProject> referencedProjects = new UniqueEList<IProject>();

+					if(!workspace.getRoot().exists(modelProject.getFullPath())) {

+						if(modelProject.getLocation().toFile().exists()) {

+							modelProject.getLocation().toFile().delete();

+						}

+						modelProject = Generator.createEMFProject(new Path(emfGenModel.getModelDirectory()), modelProject.getLocation(), referencedProjects, new SubProgressMonitor(monitor, IProgressMonitor.UNKNOWN), Generator.EMF_MODEL_PROJECT_STYLE | Generator.EMF_PLUGIN_PROJECT_STYLE);

+					} else if(!modelProject.isAccessible()) {

+						try {

+							modelProject.open(monitor);

+						} catch (CoreException e) {

+							return new Status(IStatus.ERROR, FacadeCodeGenPlugin.PLUGIN_ID, e.getMessage(), e);

+						}

+					}

+					// generate using acceleo

+					List<String> args = new ArrayList<String>();

+					File modelDirectory = modelProject.getLocation().toFile();

+					try {

+						GenFacade generator = new GenFacade(emfGenModel, modelDirectory, args);

+						generator.doGenerate(BasicMonitor.toMonitor(new SubProgressMonitor(monitor, IProgressMonitor.UNKNOWN)));

+					} catch (IOException e) {

+						return new Status(IStatus.ERROR, FacadeCodeGenPlugin.PLUGIN_ID, e.getMessage(), e);

+					}

+					return Status.OK_STATUS;

+				}

+			});

+

+			if(emfGenModel.isCodeFormatting()) {

+				refresh(emfGenModel, flow);

+

+				String s2prime = Messages.GenerateFacadeAction_5;

+				flow.addStep(s2prime, new Step(s2prime) {

+

+					@Override

+					public IStatus execute(IProgressMonitor monitor) {

+						EEFGeneratorAdapter eefGen = new EEFGeneratorAdapter();

+						eefGen.generate(emfGenModel, GenBaseGeneratorAdapter.MODEL_PROJECT_TYPE, BasicMonitor.toMonitor(new SubProgressMonitor(monitor, IProgressMonitor.UNKNOWN)));

+						return Status.OK_STATUS;

+					}

+				});

+			}

+

+			refresh(emfGenModel, flow);

+		}

+		return flow;

+	}

+

+	/**

+	 * Refresh.

+	 * 

+	 * @param emfGenModel

+	 *        the emf GenModel that is used to generate facade code for

+	 * @param flow

+	 *        the flow

+	 */

+	protected void refresh(final org.eclipse.emf.codegen.ecore.genmodel.GenModel emfGenModel, Workflow flow) {

+		String s3 = Messages.GenerateFacadeAction_6 + emfGenModel.eResource().getURI().toString();

+		flow.addStep(s3, new Step("REFRESH") { //$NON-NLS-1$

+

+			@Override

+			public IStatus execute(IProgressMonitor monitor) {

+				// refresh model project

+				IProject modelProject = getProjectFromStringPath(emfGenModel.getModelProjectDirectory());

+				if(modelProject == null) {

+					return Status.OK_STATUS;

+				}

+				try {

+					if(!modelProject.isOpen()) {

+						modelProject.open(monitor);

+					}

+					modelProject.refreshLocal(IResource.DEPTH_INFINITE, monitor);

+				} catch (CoreException e) {

+					return new Status(IStatus.ERROR, FacadeCodeGenPlugin.PLUGIN_ID, e.getMessage(), e);

+				}

+				return Status.OK_STATUS;

+			}

+		});

+	}

+

+

+

+

+

+	/**

+	 * Extract project.

+	 * 

+	 * @param stringPath

+	 *        the path to the project encoded as a string

+	 * @return the corresponding project

+	 */

+	protected IProject getProjectFromStringPath(String stringPath) {

+		IPath path = new Path(stringPath);

+		if(path.isEmpty()) {

+			return null;

+		}

+		return workspace.getRoot().getProject(path.segment(0));

+	}

+

+

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/messages.properties b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/messages.properties
new file mode 100644
index 00000000000..16cb71d9451
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/messages.properties
@@ -0,0 +1,8 @@
+GenerateCodeAction_0=EEF architecture generation

+GenerateFacadeAction_0=Generate Facade code 

+GenerateFacadeAction_1=Generate Facade code for 

+GenerateFacadeAction_3=Refreshing workspace 

+GenerateFacadeAction_5=Formatting generated files

+GenerateFacadeAction_6=Refreshing workspace 

+FacadeCodegenUtils_48=Problem with : 

+FacadeCodegenUtils_49=Problem with : 

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/utils/EEFGeneratorAdapter.java b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/utils/EEFGeneratorAdapter.java
new file mode 100644
index 00000000000..f6ab31310f5
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/utils/EEFGeneratorAdapter.java
@@ -0,0 +1,172 @@
+/*****************************************************************************
+ * 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:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.facade.codegen.utils;
+
+import java.io.ByteArrayInputStream;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceVisitor;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.emf.codegen.ecore.generator.AbstractGeneratorAdapter;
+import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
+import org.eclipse.emf.codegen.ecore.genmodel.GenPackage;
+import org.eclipse.emf.codegen.ecore.genmodel.generator.GenBaseGeneratorAdapter;
+import org.eclipse.emf.common.EMFPlugin;
+import org.eclipse.emf.common.util.BasicMonitor;
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.common.util.Monitor;
+import org.eclipse.emf.common.util.URI;
+
+/**
+ * @author <a href="mailto:goulwen.lefur@obeo.fr">Goulwen Le Fur</a>
+ */
+public class EEFGeneratorAdapter extends AbstractGeneratorAdapter {
+
+	private static final String JAVA_EXT_FILE = "java"; //$NON-NLS-1$
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.emf.codegen.ecore.generator.AbstractGeneratorAdapter#canGenerate(java.lang.Object, java.lang.Object)
+	 */
+	@Override
+	public boolean canGenerate(Object object, Object projectType) {
+		return EMFPlugin.IS_ECLIPSE_RUNNING && object instanceof GenModel;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.emf.codegen.ecore.generator.AbstractGeneratorAdapter#doGenerate(java.lang.Object, java.lang.Object,
+	 *      org.eclipse.emf.common.util.Monitor)
+	 */
+	@Override
+	protected Diagnostic doGenerate(Object object, Object projectType, Monitor monitor) throws Exception {
+		GenModel genmodel = (GenModel)object;
+		IFolder folder = null;
+		final IProgressMonitor progressMonitor = BasicMonitor.toIProgressMonitor(monitor);
+		if(projectType == GenBaseGeneratorAdapter.MODEL_PROJECT_TYPE) {
+			final Object codeFormatter = createCodeFormatter(null, URI.createPlatformResourceURI(genmodel.getModelDirectory(), true));
+			folder = ResourcesPlugin.getWorkspace().getRoot().getFolder(new Path(genmodel.getModelDirectory())); // path);
+			if(folder != null && folder.isAccessible()) {
+				folder.accept(new ResourceVisitorFormatter(codeFormatter, progressMonitor));
+			}
+		} else if(projectType == GenBaseGeneratorAdapter.EDIT_PROJECT_TYPE) {
+			final Object codeFormatter = createCodeFormatter(null, URI.createPlatformResourceURI(genmodel.getEditDirectory(), true));
+			folder = ResourcesPlugin.getWorkspace().getRoot().getFolder(new Path(genmodel.getEditDirectory()));
+			if(folder != null && folder.isAccessible()) {
+				folder.accept(new ResourceVisitorFormatter(codeFormatter, progressMonitor));
+			}
+		} else if(projectType == GenBaseGeneratorAdapter.EDITOR_PROJECT_TYPE) {
+			final Object codeFormatter = createCodeFormatter(null, URI.createPlatformResourceURI(genmodel.getEditorDirectory(), true));
+			folder = ResourcesPlugin.getWorkspace().getRoot().getFolder(new Path(genmodel.getEditorDirectory()));
+			if(folder != null && folder.isAccessible()) {
+				folder.accept(new ResourceVisitorFormatter(codeFormatter, progressMonitor));
+			}
+		}
+		return Diagnostic.OK_INSTANCE;
+	}
+
+	/**
+	 * @param genmodel
+	 * @param genPack
+	 * @return
+	 */
+	protected IPath buildModelPath(GenModel genmodel, GenPackage genPack) {
+		String pathStr = genmodel.getModelDirectory() + "/" + genPack.getQualifiedPackageName().replaceAll("\\.", "/"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		IPath path = new Path(pathStr);
+		return path;
+	}
+
+	/**
+	 * @param genmodel
+	 * @param genPack
+	 * @return
+	 */
+	protected IPath buildProviderPath(GenModel genmodel, GenPackage genPack) {
+		String pathStr = genmodel.getEditDirectory();
+		if(genPack.getProviderPackageName() != null && !genPack.getProviderPackageName().equals("")) { //$NON-NLS-1$
+			pathStr += "/" + genPack.getProviderPackageName().replaceAll("\\.", "/"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		}
+		IPath path = new Path(pathStr);
+		return path;
+	}
+
+	/**
+	 * @param genmodel
+	 * @param genPack
+	 * @return
+	 */
+	protected IPath buildPresentationPath(GenModel genmodel, GenPackage genPack) {
+		String pathStr = genmodel.getEditorDirectory();
+		if(genPack.getPresentationPackageName() != null && !genPack.getPresentationPackageName().equals("")) { //$NON-NLS-1$
+			pathStr += "/" + genPack.getPresentationPackageName().replaceAll("\\.", "/"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		}
+		IPath path = new Path(pathStr);
+		return path;
+	}
+
+	/**
+	 * IResourceVisitor responsible to format all java code in a given folder.
+	 * 
+	 * @author <a href="mailto:goulwen.lefur@obeo.fr">Goulwen Le Fur</a>
+	 */
+	private final class ResourceVisitorFormatter implements IResourceVisitor {
+
+		private final Object codeFormatter;
+
+		private final IProgressMonitor progressMonitor;
+
+		private ResourceVisitorFormatter(Object codeFormatter, IProgressMonitor progressMonitor) {
+			this.codeFormatter = codeFormatter;
+			this.progressMonitor = progressMonitor;
+		}
+
+		public boolean visit(IResource resource) throws CoreException {
+			try {
+				String fileExtension = ((IFile)resource).getFileExtension();
+				if(fileExtension != null) {
+					if(resource instanceof IFile && fileExtension.equals(JAVA_EXT_FILE)) {
+						formatFile((IFile)resource, codeFormatter, progressMonitor);
+					}
+				}
+				return true;
+			} catch (Exception e) {
+				return false;
+			}
+		}
+
+		/**
+		 * @param file
+		 * @param codeFormatter
+		 * @param progressMonitor
+		 * @throws Exception
+		 */
+		private void formatFile(IFile file, Object codeFormatter, IProgressMonitor progressMonitor) throws Exception {
+			URI createPlatformResourceURI = URI.createURI(file.getFullPath().toString(), true);
+			final String contentsStr = getContents(createPlatformResourceURI, null);
+			String formatedContentsStr = formatCode(contentsStr, codeFormatter, true);
+			ByteArrayInputStream formatedContents = new ByteArrayInputStream(formatedContentsStr.getBytes());
+			file.setContents(formatedContents, true, true, progressMonitor);
+			formatedContents.close();
+		}
+
+	}
+}
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/utils/FacadeCodegenUtils.java b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/utils/FacadeCodegenUtils.java
new file mode 100644
index 00000000000..72be502d4b3
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/utils/FacadeCodegenUtils.java
@@ -0,0 +1,1446 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facade.codegen.utils;

+

+import java.io.File;

+import java.io.IOException;

+import java.nio.file.Files;

+import java.nio.file.StandardCopyOption;

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Collections;

+import java.util.HashMap;

+import java.util.HashSet;

+import java.util.List;

+import java.util.Map;

+import java.util.Set;

+

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

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

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

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

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

+import org.eclipse.emf.codegen.ecore.genmodel.GenClass;

+import org.eclipse.emf.codegen.ecore.genmodel.GenClassifier;

+import org.eclipse.emf.codegen.ecore.genmodel.GenDataType;

+import org.eclipse.emf.codegen.ecore.genmodel.GenFeature;

+import org.eclipse.emf.codegen.ecore.genmodel.GenModel;

+import org.eclipse.emf.codegen.ecore.genmodel.GenPackage;

+import org.eclipse.emf.codegen.ecore.genmodel.GenTypedElement;

+import org.eclipse.emf.codegen.util.CodeGenUtil;

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

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

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

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

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

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

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

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

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

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

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

+import org.eclipse.emf.ecore.plugin.EcorePlugin;

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

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

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

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

+import org.eclipse.papyrus.facade.codegen.FacadeCodeGenPlugin;

+import org.eclipse.papyrus.facade.codegen.Messages;

+import org.eclipse.papyrus.facade.utils.CombinationGenerator;

+import org.eclipse.papyrus.facademapping.ExtensionDefinitionKind;

+import org.eclipse.papyrus.facademapping.FacadeMappping;

+import org.eclipse.papyrus.facademapping.Mapping;

+import org.eclipse.papyrus.facademapping.StereotypedMapping;

+import org.eclipse.uml2.types.TypesPackage;

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

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

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

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

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

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

+

+/**

+ * The utils class used to generate facade code.

+ */

+public class FacadeCodegenUtils {

+

+	/** The path to the UML GenModel. */

+	protected final static String UML_GEN_MODEL = "platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel"; //$NON-NLS-1$

+

+	/** A cache of all mappings */

+	protected static HashMap<GenModel, List<Mapping>> allMappingsCache = new HashMap<GenModel, List<Mapping>>();

+

+	/** A cache of stereotyped mappings. */

+	protected static HashMap<GenModel, List<StereotypedMapping>> stereotypedMappingsCache = new HashMap<GenModel, List<StereotypedMapping>>();

+

+	/** A cache of enum literal mappings. */

+	protected static HashMap<GenModel, List<Mapping>> enumLiteralMappingsCache = new HashMap<GenModel, List<Mapping>>();

+

+	/** A cache of feature mappings. */

+	protected static HashMap<GenModel, List<Mapping>> featureMappingsCache = new HashMap<GenModel, List<Mapping>>();

+

+	/** A cache of all metaclass mappings. */

+	protected static HashMap<GenModel, List<Mapping>> allMetaclassMappingsCache = new HashMap<GenModel, List<Mapping>>();

+

+	private static Set<String> javaDefaultTypes = null;

+

+	private static Set<String> ecoreDefaultTypes;

+

+

+	/**

+	 * Find the mapping model from a genModel. Basically, the mapping model must be in the same folder as the ecoremodel underlying the GenModel and

+	 * named with the same filename but the file extension.

+	 * 

+	 * @param genModel

+	 *        the GenModel that will be used to try to find the mapping model

+	 * @return the string

+	 */

+	public static String findMappingModel(GenModel genModel) {

+

+		if(!genModel.getForeignModel().isEmpty()) {

+			String metamodel = genModel.getForeignModel().get(0);

+			metamodel = metamodel.replaceAll(".ecore", ".facademapping"); //$NON-NLS-1$ //$NON-NLS-2$

+

+			URI ecoreURI = genModel.eResource().getURI();

+			ecoreURI = ecoreURI.trimSegments(1);

+			ecoreURI = ecoreURI.appendSegment(metamodel);

+

+			return ecoreURI.toString();

+		}

+		return null;

+

+	}

+

+	/**

+	 * Gets the UML element of a mapping.

+	 * 

+	 * @param mapping

+	 *        the mapping to find the UML element for

+	 * @return the UML element mapped in the mapping

+	 */

+	protected static EObject getUMLElement(Mapping mapping) {

+

+		if(mapping instanceof StereotypedMapping) {

+			if(((StereotypedMapping)mapping).getKind() == ExtensionDefinitionKind.ASSOCIATION) {

+				EList<EObject> appliedStereotypes = ((StereotypedMapping)mapping).getAppliedStereotypes();

+				if(appliedStereotypes.size() != 1) {

+					return null;

+				} else {

+					return appliedStereotypes.get(0);

+				}

+			} else {

+				return mapping.getUmlElement();

+			}

+		} else {

+			return mapping.getUmlElement();

+		}

+

+	}

+

+	/**

+	 * Gets the all the mappings based on a GenModel of a facade

+	 * 

+	 * @param facadeGenModel

+	 *        the GenModel of a facade

+	 * @return all the mappings corresponding to a facade GenModel

+	 */

+	protected static synchronized List<Mapping> getAllMappings(GenModel facadeGenModel) {

+

+		if(!allMappingsCache.containsKey(facadeGenModel)) {

+

+			List<Mapping> allMappings = new ArrayList<Mapping>();

+

+			String mappingModel = findMappingModel(facadeGenModel);

+			if(mappingModel != null) {

+				if(facadeGenModel.eResource() != null) {

+					if(facadeGenModel.eResource().getResourceSet() != null) {

+						ResourceSet resourceSet = facadeGenModel.eResource().getResourceSet();

+						Resource res = resourceSet.getResource(URI.createURI(mappingModel, true), true);

+						if(res != null) {

+							if(!res.getContents().isEmpty()) {

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

+

+								if(root instanceof FacadeMappping) {

+									FacadeMappping facadeMappping = (FacadeMappping)root;

+

+									for(Mapping mapping : facadeMappping.getMappings()) {

+										allMappings.add(mapping);

+									}

+								}

+							}

+						}

+					}

+				}

+			}

+

+			allMappingsCache.put(facadeGenModel, allMappings);

+		}

+

+		return allMappingsCache.get(facadeGenModel);

+

+	}

+

+	/**

+	 * Get the stereotype qualifiedNames that are applied on the UML element represented by the facadeMetaElement

+	 * 

+	 * @param facadeMetaElement

+	 *        the facade metaelement

+	 * @param facadeGenModel

+	 *        the facade GenModel

+	 * @return the stereotype qualifiedNames

+	 */

+	public static String getAllStereotypeQualifiedNames(EObject facadeMetaElement, GenModel facadeGenModel) {

+

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

+

+

+		for(Mapping mapping : getAllMappings(facadeGenModel)) {

+			if(EcoreUtil.equals(mapping.getSpecificDomainElement(), facadeMetaElement)) {

+				if(mapping instanceof StereotypedMapping) {

+

+					for(EObject stereotype : ((StereotypedMapping)mapping).getAppliedStereotypes()) {

+						if(stereotype instanceof Stereotype) {

+							result.add("\"" + ((Stereotype)stereotype).getQualifiedName() + "\""); //$NON-NLS-1$ //$NON-NLS-2$

+						}

+					}

+				}

+			}

+		}

+

+		if(!result.isEmpty()) {

+			StringBuilder sb = new StringBuilder();

+

+			for(String s : result) {

+				sb.append(s).append(',');

+			}

+

+			sb.deleteCharAt(sb.length() - 1); //delete last comma

+

+			return sb.toString();

+		}

+

+		return ""; //$NON-NLS-1$

+	}

+

+	/**

+	 * Get the stereotype qualifiedNames that are applied on the UML element represented by the facadeMetaElement but that are not association kind of

+	 * mapping

+	 * 

+	 * @param facadeMetaElement

+	 *        the facade metaelement

+	 * @param facadeGenModel

+	 *        the facade GenModel

+	 * @return the stereotype qualifiedNames

+	 */

+	public static String getNonAssociationStereotypeQualifiedNames(EObject facadeMetaElement, GenModel facadeGenModel) {

+

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

+

+

+		for(Mapping mapping : getAllMappings(facadeGenModel)) {

+			if(EcoreUtil.equals(mapping.getSpecificDomainElement(), facadeMetaElement)) {

+				if(mapping instanceof StereotypedMapping) {

+

+					if(((StereotypedMapping)mapping).getKind() != ExtensionDefinitionKind.ASSOCIATION) {

+						for(EObject stereotype : ((StereotypedMapping)mapping).getAppliedStereotypes()) {

+							if(stereotype instanceof Stereotype) {

+								result.add("\"" + ((Stereotype)stereotype).getQualifiedName() + "\""); //$NON-NLS-1$ //$NON-NLS-2$

+							}

+						}

+					}

+				}

+			}

+		}

+

+		if(!result.isEmpty()) {

+			StringBuilder sb = new StringBuilder();

+

+			for(String s : result) {

+				sb.append(s).append(',');

+			}

+

+			sb.deleteCharAt(sb.length() - 1); //delete last comma

+

+			return sb.toString();

+		}

+

+		return ""; //$NON-NLS-1$

+	}

+

+	/**

+	 * Find UML getAccessor.

+	 * 

+	 * @param facadeMetaFeature

+	 *        the facade metafeature

+	 * @param facadeGenModel

+	 *        the facade GenModel

+	 * @return the getAccessor

+	 */

+	public static String findUMLGetAccessor(EObject facadeMetaFeature, GenModel facadeGenModel) {

+

+		EObject umlMetaElement = findUMLMetaElement(facadeMetaFeature, facadeGenModel);

+

+		if(umlMetaElement != null) {

+			if(umlMetaElement instanceof ETypedElement) {

+				ResourceSet resourceSet = new ResourceSetImpl();

+				EObject umlGenModel = resourceSet.getResource(URI.createURI(UML_GEN_MODEL, true), true).getContents().get(0);

+

+				if(umlGenModel != null) {

+					if(umlGenModel instanceof org.eclipse.uml2.codegen.ecore.genmodel.GenModel) {

+

+						if(umlMetaElement instanceof EStructuralFeature) {

+							return ((org.eclipse.uml2.codegen.ecore.genmodel.GenModel)umlGenModel).findGenFeature((EStructuralFeature)umlMetaElement).getGetAccessor();

+						} else if(umlMetaElement instanceof EOperation) {

+							return ((org.eclipse.uml2.codegen.ecore.genmodel.GenModel)umlGenModel).findGenOperation((EOperation)umlMetaElement).getName();

+						}

+					}

+				}

+			} else if(umlMetaElement instanceof Property) {

+				if(umlMetaElement.eResource() != null) {

+					if(!umlMetaElement.eResource().getContents().isEmpty()) {

+						EObject root = umlMetaElement.eResource().getContents().get(0);

+						if(root instanceof Profile) {

+

+							GenModel profileGen = getGenModel(umlMetaElement);

+							EObject umlMetaFeatureDefinition = ((Profile)root).getDefinition((NamedElement)umlMetaElement);

+							if(umlMetaFeatureDefinition instanceof EStructuralFeature) {

+								return ((org.eclipse.uml2.codegen.ecore.genmodel.GenModel)profileGen).findGenFeature((EStructuralFeature)umlMetaFeatureDefinition).getGetAccessor();

+							}

+						}

+					}

+				}

+			}

+		}

+

+		return "FAILED_TO_FIND_MAPPED_GET_ACCESSOR"; //$NON-NLS-1$

+	}

+

+	/**

+	 * Try to get the GenModel from an eObject

+	 * 

+	 * @param metaElement

+	 *        the metaElement to find the GenMdoel for

+	 * @return the GenModel

+	 */

+	protected static GenModel getGenModel(EObject metaElement) {

+		Map<String, URI> nsURIToGenModelsMap = EcorePlugin.getEPackageNsURIToGenModelLocationMap(true);

+

+

+

+		if(metaElement.eResource() != null) {

+			if(!metaElement.eResource().getContents().isEmpty()) {

+				EObject root = metaElement.eResource().getContents().get(0);

+				if(root instanceof Profile) {

+					Stereotype ePackageStereotype = ((Profile)root).getAppliedStereotype("Ecore::EPackage"); //$NON-NLS-1$

+					if(ePackageStereotype != null) {

+						Object nsURI = ((Profile)root).getValue(ePackageStereotype, "nsURI"); //$NON-NLS-1$

+						if(nsURI instanceof String) {

+							URI genModelURI = nsURIToGenModelsMap.get(nsURI);

+							String paltformstring = genModelURI.toPlatformString(true);

+							URI pluginURI = URI.createPlatformPluginURI(paltformstring, true);

+							if(pluginURI != null) {

+								ResourceSet resourceSet = new ResourceSetImpl();

+								EObject genModel = resourceSet.getResource(pluginURI, true).getContents().get(0);

+								if(genModel instanceof GenModel) {

+									return (GenModel)genModel;

+								}

+							}

+						}

+					}

+

+				}

+			}

+		}

+

+		return null;

+	}

+

+	/**

+	 * Find UML accessorName of a facade metaFeature.

+	 * 

+	 * @param facadeMetaFeature

+	 *        the facade metafeature

+	 * @param facadeGenModel

+	 *        the facade GenModel

+	 * @return the string

+	 */

+	public static String findUMLAccessorName(EObject facadeMetaFeature, GenModel facadeGenModel) {

+		EObject umlMetaFeature = findUMLMetaElement(facadeMetaFeature, facadeGenModel);

+

+		if(umlMetaFeature instanceof NamedElement) {

+

+			if(umlMetaFeature.eResource() != null) {

+				if(!umlMetaFeature.eResource().getContents().isEmpty()) {

+					EObject root = umlMetaFeature.eResource().getContents().get(0);

+					if(root instanceof Profile) {

+

+						GenModel profileGen = getGenModel(umlMetaFeature);

+						EObject umlMetaFeatureDefinition = ((Profile)root).getDefinition((NamedElement)umlMetaFeature);

+						if(umlMetaFeatureDefinition instanceof EStructuralFeature) {

+							return ((org.eclipse.uml2.codegen.ecore.genmodel.GenModel)profileGen).findGenFeature((EStructuralFeature)umlMetaFeatureDefinition).getAccessorName();

+						}

+

+					}

+				}

+			}

+		} else {

+

+			if(umlMetaFeature != null) {

+				if(umlMetaFeature instanceof EStructuralFeature) {

+					ResourceSet resourceSet = new ResourceSetImpl();

+					EObject umlGenModel = resourceSet.getResource(URI.createURI(UML_GEN_MODEL, true), true).getContents().get(0);

+

+					if(umlGenModel != null) {

+						if(umlGenModel instanceof org.eclipse.uml2.codegen.ecore.genmodel.GenModel) {

+

+							return ((org.eclipse.uml2.codegen.ecore.genmodel.GenModel)umlGenModel).findGenFeature((EStructuralFeature)umlMetaFeature).getAccessorName();

+						}

+					}

+				}

+			}

+		}

+

+		return "FAILED_TO_FIND_MAPPED_GET_ACCESSOR_NAME"; //$NON-NLS-1$

+	}

+

+	/**

+	 * Gets all the metaclass mappings.

+	 * 

+	 * @param facadeGenModel

+	 *        the facade GenModel

+	 * @return all mappings that map a metaclass

+	 */

+	public static synchronized List<? extends Mapping> getAllMetaclassMappings(GenModel facadeGenModel) {

+

+		if(!allMetaclassMappingsCache.containsKey(facadeGenModel)) {

+

+			List<Mapping> allMetaclassMappings = new ArrayList<Mapping>();

+

+			for(Mapping mapping : getAllMappings(facadeGenModel)) {

+				if(!(mapping instanceof StereotypedMapping)) {

+					if(mapping.getSpecificDomainElement() instanceof EClassifier) {

+						if(mapping.getUmlElement() != TypesPackage.eINSTANCE.getBoolean() && mapping.getUmlElement() != TypesPackage.eINSTANCE.getString() && mapping.getUmlElement() != TypesPackage.eINSTANCE.getReal() && mapping.getUmlElement() != TypesPackage.eINSTANCE.getInteger() && mapping.getUmlElement() != TypesPackage.eINSTANCE.getUnlimitedNatural()) {

+							if(!(mapping.getUmlElement() instanceof Stereotype)) {

+								if(mapping.getSpecificDomainElement() instanceof EClass) {

+									if(!((EClass)mapping.getSpecificDomainElement()).isAbstract()) {

+										allMetaclassMappings.add(mapping);

+									}

+								} else {

+									allMetaclassMappings.add(mapping);

+								}

+							}

+						}

+					}

+				} else {

+					if(((StereotypedMapping)mapping).getKind() == ExtensionDefinitionKind.ASSOCIATION) {

+						allMetaclassMappings.add(mapping);

+					}

+				}

+			}

+

+			allMetaclassMappingsCache.put(facadeGenModel, allMetaclassMappings);

+		}

+

+		return allMetaclassMappingsCache.get(facadeGenModel);

+	}

+

+	/**

+	 * Initializes caches

+	 */

+	public static void initUtilsCaches() {

+		allMappingsCache.clear();

+		allMetaclassMappingsCache.clear();

+		enumLiteralMappingsCache.clear();

+		featureMappingsCache.clear();

+		stereotypedMappingsCache.clear();

+	}

+

+	/**

+	 * Gets all the enumLiteral mappings.

+	 * 

+	 * @param facadeGenModel

+	 *        the facade GenModel

+	 * @return all mappings that map an enumLiteral

+	 */

+	public static synchronized List<? extends Mapping> getAllEnumLiteralMappings(GenModel facadeGenModel) {

+

+		if(!enumLiteralMappingsCache.containsKey(facadeGenModel)) {

+			List<Mapping> enumLiteralMappings = new ArrayList<Mapping>();

+			synchronized(enumLiteralMappings) {

+

+				for(Mapping mapping : getAllMappings(facadeGenModel)) {

+					if(mapping.getSpecificDomainElement() instanceof EEnumLiteral) {

+						if(mapping.getUmlElement() != TypesPackage.eINSTANCE.getBoolean() && mapping.getUmlElement() != TypesPackage.eINSTANCE.getString() && mapping.getUmlElement() != TypesPackage.eINSTANCE.getReal() && mapping.getUmlElement() != TypesPackage.eINSTANCE.getInteger() && mapping.getUmlElement() != TypesPackage.eINSTANCE.getUnlimitedNatural()) {

+							enumLiteralMappings.add(mapping);

+						}

+					}

+				}

+			}

+			enumLiteralMappingsCache.put(facadeGenModel, enumLiteralMappings);

+		}

+		return enumLiteralMappingsCache.get(facadeGenModel);

+

+	}

+

+	/**

+	 * Gets all the feature mappings.

+	 * 

+	 * @param facadeGenModel

+	 *        the facade GenModel

+	 * @return all mappings that map a feature

+	 */

+	public static synchronized List<? extends Mapping> getAllFeatureMappings(GenModel facadeGenModel) {

+

+		if(!featureMappingsCache.containsKey(facadeGenModel)) {

+

+			List<Mapping> featureMappings = new ArrayList<Mapping>();

+

+			for(Mapping mapping : getAllMappings(facadeGenModel)) {

+				if(!isExtensionStereotypePropertyFromFacade(mapping.getSpecificDomainElement(), facadeGenModel)) {

+					if(mapping.getSpecificDomainElement() instanceof EStructuralFeature) {

+

+						featureMappings.add(mapping);

+					}

+					if(mapping.getSpecificDomainElement() instanceof Property) {

+

+						if(((Property)mapping.getSpecificDomainElement()).getClass_() instanceof Stereotype) {

+							featureMappings.add(mapping);

+						}

+					}

+				}

+			}

+			featureMappingsCache.put(facadeGenModel, featureMappings);

+		}

+

+		return featureMappingsCache.get(facadeGenModel);

+

+	}

+

+	/**

+	 * Find UML metaElement.

+	 * 

+	 * @param facadeMetaElement

+	 *        the facade metaElement

+	 * @param genModel

+	 *        the GenModel

+	 * @return the UML metaElement

+	 */

+	public static EObject findUMLMetaElement(EObject facadeMetaElement, GenModel genModel) {

+		String mappingModel = findMappingModel(genModel);

+		if(mappingModel != null) {

+

+			if(genModel.eResource() != null) {

+				if(genModel.eResource().getResourceSet() != null) {

+					ResourceSet resourceSet = genModel.eResource().getResourceSet();

+					EObject root = resourceSet.getResource(URI.createURI(mappingModel, true), true).getContents().get(0);

+

+					if(root != null) {

+						if(root instanceof FacadeMappping) {

+							FacadeMappping facadeMappping = (FacadeMappping)root;

+							for(Mapping mapping : facadeMappping.getMappings()) {

+								if(EcoreUtil.equals(mapping.getSpecificDomainElement(), facadeMetaElement)) {

+

+									return getUMLElement(mapping);

+

+

+								}

+							}

+						}

+					}

+				}

+			}

+

+

+

+		}

+

+		return null;

+	}

+

+	/**

+	 * Gets the FeatureAccessorName of a the UML feature from a mapping.

+	 * 

+	 * @param mapping

+	 *        the mapping

+	 * @param genModel

+	 *        the GenModel

+	 * @return the UML feature from mapping

+	 */

+	public static String getUMLFeatureFromMapping(Mapping mapping, GenModel genModel) {

+		EObject UMLMetaElement = mapping.getUmlElement();

+

+		if(UMLMetaElement instanceof NamedElement) {

+

+			if(UMLMetaElement.eResource() != null) {

+				if(!UMLMetaElement.eResource().getContents().isEmpty()) {

+					EObject root = UMLMetaElement.eResource().getContents().get(0);

+					if(root instanceof Profile) {

+

+						GenModel profileGen = getGenModel(UMLMetaElement);

+						EObject umlMetaFeatureDefinition = ((Profile)root).getDefinition((NamedElement)UMLMetaElement);

+						if(umlMetaFeatureDefinition instanceof EStructuralFeature) {

+							return ((org.eclipse.uml2.codegen.ecore.genmodel.GenModel)profileGen).findGenFeature((EStructuralFeature)umlMetaFeatureDefinition).getFeatureAccessorName();

+						}

+

+					}

+				}

+			}

+

+

+		} else {

+

+			if(UMLMetaElement instanceof EStructuralFeature) {

+				if(UMLMetaElement != null) {

+					ResourceSet resourceSet = new ResourceSetImpl();

+					EObject umlGenModel = resourceSet.getResource(URI.createURI(UML_GEN_MODEL, true), true).getContents().get(0);

+

+					if(umlGenModel != null) {

+						if(umlGenModel instanceof org.eclipse.uml2.codegen.ecore.genmodel.GenModel) {

+

+							return ((org.eclipse.uml2.codegen.ecore.genmodel.GenModel)umlGenModel).findGenFeature((EStructuralFeature)UMLMetaElement).getFeatureAccessorName();

+						}

+					}

+				}

+			}

+		}

+

+		return "FAILED_TO_FIND_MAPPED_UML_FEATURE"; //$NON-NLS-1$

+	}

+

+

+	/**

+	 * Gets the package path from mapping.

+	 * 

+	 * @param mapping

+	 *        the mapping

+	 * @return the package path from mapping

+	 */

+	public static String getPackagePathFromMapping(Mapping mapping) {

+		EObject UMLMetaElement = getUMLElement(mapping);

+

+		return getPackagePathFromUML(UMLMetaElement);

+	}

+

+	/**

+	 * Gets the EPackage path from UML element mapped by a mapping.

+	 * 

+	 * @param UMLMetaElement

+	 *        the UML metaElement

+	 * @return the EPackage path from UML

+	 */

+	public static String getPackagePathFromUML(EObject UMLMetaElement) {

+

+		EObject root = UMLMetaElement.eResource().getContents().get(0);

+		if(root instanceof Profile) {

+			Stereotype ePackageStereotype = ((Profile)root).getAppliedStereotype("Ecore::EPackage"); //$NON-NLS-1$

+			if(ePackageStereotype != null) {

+				Object packageName = ((Profile)root).getValue(ePackageStereotype, "packageName"); //$NON-NLS-1$

+				Object basePackage = ((Profile)root).getValue(ePackageStereotype, "basePackage"); //$NON-NLS-1$

+				if(packageName instanceof String && basePackage instanceof String) {

+					if(UMLMetaElement instanceof NamedElement) {

+						return basePackage + "." + packageName; //$NON-NLS-1$

+					}

+				}

+			}

+

+		} else {

+

+			return "org.eclipse.uml2.uml"; //$NON-NLS-1$

+

+		}

+

+		return "FAILED_TO_FIND_MAPPED_UML_PACKAGE_PATH"; //$NON-NLS-1$

+	}

+

+	/**

+	 * Gets the full EPackage path from a mapping.

+	 * 

+	 * @param mapping

+	 *        the mapping

+	 * @return the Epackage path

+	 */

+	public static String getUMLPackageName(Mapping mapping) {

+

+		EObject UMLMetaElement = getUMLElement(mapping);

+

+		EObject root = UMLMetaElement.eResource().getContents().get(0);

+		if(root instanceof Profile) {

+			Stereotype ePackageStereotype = ((Profile)root).getAppliedStereotype("Ecore::EPackage"); //$NON-NLS-1$

+			if(ePackageStereotype != null) {

+				Object packageName = ((Profile)root).getValue(ePackageStereotype, "packageName"); //$NON-NLS-1$

+				if(packageName instanceof String) {

+					if(UMLMetaElement instanceof NamedElement) {

+						return getPackagePathFromMapping(mapping) + "." + packageName + "Package"; //$NON-NLS-1$ //$NON-NLS-2$

+					}

+				}

+			}

+

+		} else {

+

+			return getPackagePathFromMapping(mapping) + ".UMLPackage"; //$NON-NLS-1$

+

+		}

+

+		return "FAILED_TO_FIND_MAPPED_UML_PACKAGE_NAME"; //$NON-NLS-1$

+	}

+

+

+	/**

+	 * Gets the UML accessorName from a mapping.

+	 * 

+	 * @param mapping

+	 *        the mapping

+	 * @param genModel

+	 *        the GenModel

+	 * @return the UML accessorName

+	 */

+	public static String getUMLAccessorName(Mapping mapping, GenModel genModel) {

+

+		EObject UMLMetaElement = getUMLElement(mapping);

+

+		EObject root = UMLMetaElement.eResource().getContents().get(0);

+		if(root instanceof Profile) {

+

+			if(UMLMetaElement instanceof NamedElement) {

+				return ((NamedElement)UMLMetaElement).getName();

+			}

+

+		} else {

+

+			if(UMLMetaElement instanceof EClassifier) {

+

+				ResourceSet resourceSet = new ResourceSetImpl();

+				EObject umlGenModel = resourceSet.getResource(URI.createURI(UML_GEN_MODEL, true), true).getContents().get(0);

+

+				if(umlGenModel != null) {

+					if(umlGenModel instanceof org.eclipse.uml2.codegen.ecore.genmodel.GenModel) {

+

+						return ((org.eclipse.uml2.codegen.ecore.genmodel.GenModel)umlGenModel).findGenClassifier((EClassifier)UMLMetaElement).getClassifierAccessorName();

+					}

+				}

+

+			}

+		}

+

+		return "FAILED_TO_FIND_MAPPED_UML_ACCESSOR_NAME"; //$NON-NLS-1$

+	}

+

+	/**

+	 * Gets the ClassifierAccessorName from a mapping.

+	 * 

+	 * @param genModel

+	 *        the GenModel

+	 * @param mapping

+	 *        the mapping

+	 * @return the ClassifierAccessorName

+	 */

+	public static String getClassifierAccessorName(GenModel genModel, Mapping mapping) {

+		return genModel.findGenClassifier((EClassifier)mapping.getSpecificDomainElement()).getClassifierAccessorName();

+	}

+

+	/**

+	 * Gets the FeatureAccessorName from a mapping.

+	 * 

+	 * @param genModel

+	 *        the GenModel

+	 * @param mapping

+	 *        the mapping

+	 * @return the FeatureAccessorName

+	 */

+	public static String getFeatureAccessorName(GenModel genModel, Mapping mapping) {

+		return genModel.findGenFeature((EStructuralFeature)mapping.getSpecificDomainElement()).getFeatureAccessorName();

+	}

+

+	/**

+	 * Gets the UML meta element mapped to a facadeElement.

+	 * 

+	 * @param facadeMetaElement

+	 *        the facade meta element

+	 * @param genModel

+	 *        the GenModel

+	 * @return the UML meta element

+	 */

+	public static String getUMLMetaElement(EObject facadeMetaElement, GenModel genModel) {

+

+		for(Mapping mapping : getAllMappings(genModel)) {

+			if(EcoreUtil.equals(mapping.getSpecificDomainElement(), facadeMetaElement)) {

+				EObject UMLMetaElement = getUMLElement(mapping);

+

+				if(UMLMetaElement instanceof ENamedElement) {

+					return ((ENamedElement)UMLMetaElement).getName();

+				} else if(UMLMetaElement instanceof NamedElement) {

+					return ((NamedElement)UMLMetaElement).getName();

+				}

+

+			}

+		}

+

+

+		return "FAILED_TO_FIND_MAPPED_UML_METACLASS"; //$NON-NLS-1$

+	}

+

+	/**

+	 * Gets the UML factory.

+	 * 

+	 * @param facadeMetaElement

+	 *        the facade meta element

+	 * @param genModel

+	 *        the GenModel

+	 * @return the UML factory

+	 */

+	public static String getUMLFactory(EObject facadeMetaElement, GenModel genModel) {

+

+		for(Mapping mapping : getAllMappings(genModel)) {

+			if(EcoreUtil.equals(mapping.getSpecificDomainElement(), facadeMetaElement)) {

+

+				EObject UMLMetaElement = getUMLElement(mapping);

+

+				if(UMLMetaElement != null) {

+					EObject root = UMLMetaElement.eResource().getContents().get(0);

+					if(root instanceof Profile) {

+						Stereotype ePackageStereotype = ((Profile)root).getAppliedStereotype("Ecore::EPackage"); //$NON-NLS-1$

+						if(ePackageStereotype != null) {

+							Object packageName = ((Profile)root).getValue(ePackageStereotype, "packageName"); //$NON-NLS-1$

+							if(packageName instanceof String) {

+								if(UMLMetaElement instanceof NamedElement) {

+									return getPackagePathFromUML(UMLMetaElement) + "." + packageName + "Factory"; //$NON-NLS-1$ //$NON-NLS-2$

+								}

+							}

+						}

+					} else {

+						return getPackagePathFromUML(UMLMetaElement) + ".UMLFactory"; //$NON-NLS-1$

+					}

+				}

+

+			}

+		}

+

+

+

+

+		return "FAILED_TO_FIND_MAPPED_UML_FACTORY"; //$NON-NLS-1$

+	}

+

+	/**

+	 * Gets the appropriate qualified type name.

+	 * 

+	 * @param genClassifier

+	 *        a genClassifier

+	 * @return the qualifiedType name

+	 */

+	public static String getAppropriateQualifiedTypeName(GenClassifier genClassifier) {

+		if(genClassifier instanceof GenClass) {

+

+			return ((GenClass)genClassifier).getQualifiedInterfaceName();

+

+		} else if(genClassifier instanceof GenDataType) {

+

+			return ((GenDataType)genClassifier).getQualifiedInstanceClassName();

+

+		} else {

+

+			return "FAILED_TO_FIND_QUALIFIED_TYPE_NAME"; //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * Gets the UML enum element from mapping.

+	 * 

+	 * @param mapping

+	 *        the mapping

+	 * @return the UML enum element from mapping

+	 */

+	public static String getUMLEnumElementFromMapping(Mapping mapping) {

+		if(mapping.getUmlElement() instanceof EEnumLiteral) {

+			return ((EEnumLiteral)mapping.getUmlElement()).getEEnum().getName() + ".get(" + ((EEnumLiteral)mapping.getUmlElement()).getValue() + ")"; //$NON-NLS-1$ //$NON-NLS-2$

+		} else if(mapping.getUmlElement() instanceof EnumerationLiteral) {

+			return ((EnumerationLiteral)mapping.getUmlElement()).getEnumeration().getName() + ".get(\"" + ((EnumerationLiteral)mapping.getUmlElement()).getName() + "\")"; //$NON-NLS-1$ //$NON-NLS-2$

+		}

+

+		return "FAILED_TO_FIND_MAPPED_UML_ENUM_ELEMENT"; //$NON-NLS-1$

+	}

+

+	/**

+	 * Gets the facade enum element from mapping.

+	 * 

+	 * @param mapping

+	 *        the mapping

+	 * @return the facade enum element from the mapping

+	 */

+	public static String getFacadeEnumElementFromMapping(Mapping mapping) {

+		if(mapping.getUmlElement() instanceof EEnumLiteral) {

+			return ((EEnumLiteral)mapping.getUmlElement()).getEEnum().getName() + ".get(" + ((EEnumLiteral)mapping.getUmlElement()).getValue() + ")"; //$NON-NLS-1$ //$NON-NLS-2$

+		} else if(mapping.getUmlElement() instanceof EnumerationLiteral) {

+			return ((EnumerationLiteral)mapping.getUmlElement()).getEnumeration().getName() + ".get(\"" + ((EnumerationLiteral)mapping.getUmlElement()).getName() + "\")"; //$NON-NLS-1$ //$NON-NLS-2$

+		}

+

+		return "FAILED_TO_FIND_MAPPED_FACADE_ENUM_ELEMENT"; //$NON-NLS-1$

+	}

+

+	/**

+	 * Checks if facade element represents a stereotype role for an extension

+	 * 

+	 * @param facadeElement

+	 *        the facade element

+	 * @param genModel

+	 *        the GenModel

+	 * @return true, if facade element represents a stereotype role for an extension

+	 */

+	protected static boolean isExtensionStereotypePropertyFromFacade(EObject facadeElement, GenModel genModel) {

+		EObject umlElement = findUMLMetaElement(facadeElement, genModel);

+

+		if(umlElement instanceof Property) {

+			if(((Property)umlElement).getAssociation() instanceof Extension) {

+				if(((Property)umlElement).getName().startsWith(Extension.STEREOTYPE_ROLE_PREFIX)) {

+					return Boolean.TRUE;

+				}

+

+			}

+		}

+		return Boolean.FALSE;

+	}

+

+	/**

+	 * Checks if is extention stereotype property.

+	 * 

+	 * @param genFeature

+	 *        the gen feature

+	 * @return true, if is extention stereotype property

+	 */

+	public static boolean isExtentionStereotypeProperty(GenFeature genFeature) {

+

+

+		EObject umlElement = findUMLMetaElement(genFeature.getEcoreFeature(), genFeature.getGenModel());

+

+		if(umlElement instanceof Property) {

+			if(((Property)umlElement).getAssociation() instanceof Extension) {

+				if(((Property)umlElement).getName().startsWith(Extension.STEREOTYPE_ROLE_PREFIX)) {

+					return Boolean.TRUE;

+				}

+

+			}

+		}

+		return Boolean.FALSE;

+	}

+

+	/**

+	 * Checks if is extension property.

+	 * 

+	 * @param genFeature

+	 *        the gen feature

+	 * @return true, if is extension property

+	 */

+	public static boolean isExtensionProperty(GenFeature genFeature) {

+		EObject umlElement = findUMLMetaElement(genFeature.getEcoreFeature(), genFeature.getGenModel());

+

+		if(umlElement instanceof Property) {

+			if(((Property)umlElement).getAssociation() instanceof Extension) {

+

+				return Boolean.TRUE;

+			}

+		}

+		return Boolean.FALSE;

+	}

+

+	/**

+	 * Checks if is stereotype property.

+	 * 

+	 * @param genFeature

+	 *        the gen feature

+	 * @return true, if is stereotype property

+	 */

+	public static boolean isStereotypeProperty(GenFeature genFeature) {

+		EClass ecoreClass = genFeature.getGenClass().getEcoreClass();

+

+		boolean isAppropriateMapping = false;

+		for(Mapping mapping : getAllMappings(genFeature.getGenModel())) {

+			if(EcoreUtil.equals(ecoreClass, mapping.getSpecificDomainElement())) {

+				if(mapping instanceof StereotypedMapping) {

+					if(((StereotypedMapping)mapping).getKind() != ExtensionDefinitionKind.ASSOCIATION) {

+						isAppropriateMapping = true;

+					}

+				}

+			}

+		}

+

+		if(isAppropriateMapping) {

+			EObject umlElement = findUMLMetaElement(genFeature.getEcoreFeature(), genFeature.getGenModel());

+

+			if(umlElement instanceof Property) {

+				if(((Property)umlElement).getClass_() instanceof Stereotype) {

+					if(!isExtensionProperty(genFeature)) {

+						return Boolean.TRUE;

+					}

+				}

+			}

+		}

+		return Boolean.FALSE;

+	}

+

+	/**

+	 * Gets the stereotype qualified name.

+	 * 

+	 * @param genFeature

+	 *        the gen feature

+	 * @return the stereotype qualified name

+	 */

+	public static String getStereotypeQualifiedName(GenFeature genFeature) {

+		EObject umlElement = findUMLMetaElement(genFeature.getEcoreFeature(), genFeature.getGenModel());

+

+		if(umlElement instanceof Property) {

+			if(((Property)umlElement).getClass_() instanceof Stereotype) {

+				return ((Property)umlElement).getClass_().getQualifiedName();

+			}

+		}

+		return "FAILED_TO_FIND_STEREOTYPE_QUALIFIEDNAME"; //$NON-NLS-1$

+	}

+

+

+

+	/**

+	 * Gets the stereotyped mappings.

+	 * 

+	 * @param genModel

+	 *        the GenModel

+	 * @return the stereotyped mappings

+	 */

+	public static synchronized List<StereotypedMapping> getStereotypedMappings(GenModel genModel) {

+

+		if(!stereotypedMappingsCache.containsKey(genModel)) {

+

+			List<StereotypedMapping> stereotypedMappings = new ArrayList<StereotypedMapping>();

+			for(Mapping mapping : getAllMappings(genModel)) {

+				if(mapping instanceof StereotypedMapping) {

+					stereotypedMappings.add((StereotypedMapping)mapping);

+				}

+			}

+

+			stereotypedMappingsCache.put(genModel, stereotypedMappings);

+		}

+

+		return stereotypedMappingsCache.get(genModel);

+	}

+

+	/**

+	 * Generate the wrapper for a mapping considering possible application of stereotype combinations

+	 * 

+	 * @param mapping

+	 *        the mapping

+	 * @param genModel

+	 *        the GenModel

+	 * @param genPackage

+	 *        the gen package

+	 * @return the corresponding stereotype mapping

+	 */

+	public static String getCorrespondingStereotypeMapping(org.eclipse.papyrus.facademapping.Mapping mapping, GenModel genModel, GenPackage genPackage) {

+		String result = ""; //$NON-NLS-1$

+

+		if(!(mapping instanceof StereotypedMapping)) {

+

+			List<StereotypedMapping> correspondingStereotypeMappings = new ArrayList<StereotypedMapping>();

+			List<StereotypedMapping> correspondingAssocationStereotypeMappings = new ArrayList<StereotypedMapping>();

+

+			for(Mapping toProcessMapping : getStereotypedMappings(genModel)) {

+

+				if(mapping != toProcessMapping) {

+

+					boolean isAbstract = false;

+					EList<EObject> stereos = ((StereotypedMapping)toProcessMapping).getAppliedStereotypes();

+					for(EObject stereo : stereos) {

+						if(stereo instanceof Stereotype) {

+							if(((Stereotype)stereo).isAbstract()) {

+								isAbstract = true;

+							}

+						}

+					}

+					if(!isAbstract) {

+

+						if(((StereotypedMapping)toProcessMapping).getKind() == ExtensionDefinitionKind.GENERALIZATION || ((StereotypedMapping)toProcessMapping).getKind() == ExtensionDefinitionKind.MULTI_GENERALIZATION) {

+							if(toProcessMapping.getUmlElement() == mapping.getUmlElement()) {

+								correspondingStereotypeMappings.add((StereotypedMapping)toProcessMapping);

+							}

+						} else {

+							if(mapping.getUmlElement() instanceof EClass) {

+								List<EObject> candidates = new ArrayList<EObject>();

+								candidates.add((EClass)mapping.getUmlElement());

+								candidates.addAll(((EClass)mapping.getUmlElement()).getEAllSuperTypes());

+

+								if(candidates.contains(toProcessMapping.getUmlElement()))

+									correspondingAssocationStereotypeMappings.add((StereotypedMapping)toProcessMapping);

+							}

+						}

+					}

+				}

+			}

+

+			for(StereotypedMapping correspondingStereotypeMapping : correspondingStereotypeMappings) {

+				if(correspondingStereotypeMapping.getSpecificDomainElement() instanceof ENamedElement) {

+

+					String name = ((ENamedElement)correspondingStereotypeMapping.getSpecificDomainElement()).getName().toLowerCase();

+

+					//Single stereotype

+					List<Stereotype> combination = new ArrayList<Stereotype>();

+					combination.addAll((Collection<? extends Stereotype>)correspondingStereotypeMapping.getAppliedStereotypes());

+					result += addWrappingStereotypeMapping(combination, name, genPackage, genModel, correspondingStereotypeMapping);

+

+					//Create combination with association stereo

+					if(!correspondingAssocationStereotypeMappings.isEmpty()) {

+

+						for(int k = 1; k <= correspondingAssocationStereotypeMappings.size(); k++) {

+							CombinationGenerator combinaisonGenerator = new CombinationGenerator(correspondingAssocationStereotypeMappings.size(), k);

+

+							//Process each combination

+							while(combinaisonGenerator.hasMore()) {

+								int[] indices = combinaisonGenerator.getNext();

+

+								//Single stereotype first

+								combination = new ArrayList<Stereotype>();

+								combination.addAll((Collection<? extends Stereotype>)correspondingStereotypeMapping.getAppliedStereotypes());

+								name = ((ENamedElement)correspondingStereotypeMapping.getSpecificDomainElement()).getName().toLowerCase();

+

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

+									combination.addAll((Collection<? extends Stereotype>)correspondingAssocationStereotypeMappings.get(indices[i]).getAppliedStereotypes());

+

+									if(correspondingAssocationStereotypeMappings.get(indices[i]).getSpecificDomainElement() instanceof ENamedElement) {

+										name += "_" + ((ENamedElement)correspondingAssocationStereotypeMappings.get(indices[i]).getSpecificDomainElement()).getName().toLowerCase(); //$NON-NLS-1$

+									} else {

+										FacadeCodeGenPlugin.log.warn(Messages.FacadeCodegenUtils_48 + correspondingAssocationStereotypeMappings.get(indices[i]).getSpecificDomainElement());

+									}

+								}

+								result += addWrappingStereotypeMapping(combination, name, genPackage, genModel, correspondingStereotypeMapping);

+							}

+						}

+					}

+

+				} else {

+					FacadeCodeGenPlugin.log.warn(Messages.FacadeCodegenUtils_49 + correspondingStereotypeMapping.getSpecificDomainElement());

+				}

+

+			}

+

+		}

+

+		return result;

+

+	}

+

+	/**

+	 * Generate the actual text for a wrapping of a combination of stereotype application

+	 * 

+	 * @param combination

+	 *        the combination

+	 * @param name

+	 *        the name

+	 * @param genPackage

+	 *        the gen package

+	 * @param genModel

+	 *        the GenModel

+	 * @param correspondingStereotypeMapping

+	 *        the corresponding stereotype mapping

+	 * @return the string

+	 */

+	protected static String addWrappingStereotypeMapping(List<Stereotype> combination, String name, GenPackage genPackage, GenModel genModel, StereotypedMapping correspondingStereotypeMapping) {

+

+		String result = ""; //$NON-NLS-1$

+

+		result += "java.util.List<org.eclipse.uml2.uml.Stereotype> " + name + "_Stereotypes = new java.util.ArrayList<org.eclipse.uml2.uml.Stereotype>();\n"; //$NON-NLS-1$ //$NON-NLS-2$

+

+		result += addStereotypes(combination, name);

+		result += "if(((org.eclipse.uml2.uml.Element)umlElement).getAppliedStereotypes().size() ==  " + name + "_Stereotypes.size()) {\n"; //$NON-NLS-1$ //$NON-NLS-2$

+		result += "if(((org.eclipse.uml2.uml.Element)umlElement).getAppliedStereotypes().containsAll(" + name + "_Stereotypes)) {\n"; //$NON-NLS-1$ //$NON-NLS-2$

+		result += "return " + genPackage.getImportedPackageInterfaceName() + ".eINSTANCE.get" + getClassifierAccessorName(genModel, correspondingStereotypeMapping) + "();\n"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+		result += "}\n"; //$NON-NLS-1$

+		result += "}\n"; //$NON-NLS-1$

+		for(int i = 0; i < combination.size(); i++) {

+			result += "}\n"; //$NON-NLS-1$

+		}

+

+		return result;

+

+	}

+

+	/**

+	 * Generate the text for the combination of stereotype application

+	 * 

+	 * @param combination

+	 *        the combination

+	 * @param name

+	 *        the name

+	 * @return the string

+	 */

+	protected static String addStereotypes(List<Stereotype> combination, String name) {

+		String result = ""; //$NON-NLS-1$

+

+		for(EObject stereotype : combination) {

+			if(stereotype instanceof Stereotype) {

+				result += "if(((org.eclipse.uml2.uml.Element)umlElement).getApplicableStereotype(\"" + ((Stereotype)stereotype).getQualifiedName() + "\") != null) {\n"; //$NON-NLS-1$ //$NON-NLS-2$

+				result += name + "_Stereotypes.add(((org.eclipse.uml2.uml.Element)umlElement).getApplicableStereotype(\"" + ((Stereotype)stereotype).getQualifiedName() + "\"));\n"; //$NON-NLS-1$ //$NON-NLS-2$

+

+			}

+		}

+

+		return result;

+	}

+

+	/**

+	 * Checks if is a list of primitive types.

+	 * 

+	 * @param genFeature

+	 *        the genFeature

+	 * @return true, if is list of primitive types

+	 */

+	public static boolean isPrimtiveList(GenTypedElement genTypedElement) {

+		if(CodeGenUtil.isJavaDefaultType(genTypedElement.getListItemType())) {

+			return Boolean.TRUE;

+		}

+

+		return Boolean.FALSE;

+	}

+

+	/**

+	 * Checks if is primitive type.

+	 * 

+	 * @param genFeature

+	 *        the genFeature

+	 * @return true, if is primitive type

+	 */

+	public static boolean isPrimitive(GenTypedElement genTypedElement) {

+		if(isJavaDefaultType(genTypedElement.getType())) {

+			return Boolean.TRUE;

+		}

+

+		if(isEcoreDefaultType(genTypedElement.getType())) {

+			return Boolean.TRUE;

+		}

+

+		if(genTypedElement.getType().startsWith("java.util.Map<")) {

+			return Boolean.TRUE;

+		}

+

+		return Boolean.FALSE;

+	}

+

+	/**

+	 * Tests whether the given string is the name of a primitive or java.lang type.

+	 */

+	protected static boolean isEcoreDefaultType(String s) {

+		return getEcoreDefaultTypes().contains(s);

+	}

+

+	/**

+	 * Tests whether the given string is the name of a primitive or java.lang type.

+	 */

+	protected static boolean isJavaDefaultType(String s) {

+		return getJavaDefaultTypes().contains(s);

+	}

+

+	/**

+	 * Returns the names of the ecore types

+	 */

+	public static synchronized Set<String> getEcoreDefaultTypes() {

+		if(ecoreDefaultTypes == null) {

+			Set<String> result = new HashSet<String>(100);

+			result.add("org.eclipse.emf.ecore.EAnnotation");

+			result.add("org.eclipse.emf.ecore.EAttribute");

+			result.add("org.eclipse.emf.ecore.EClass");

+			result.add("org.eclipse.emf.ecore.EClassifier");

+			result.add("org.eclipse.emf.ecore.EcoreFactory");

+			result.add("org.eclipse.emf.ecore.EcorePackage");

+			result.add("org.eclipse.emf.ecore.EDataType");

+			result.add("org.eclipse.emf.ecore.EEnum");

+			result.add("org.eclipse.emf.ecore.EEnumLiteral");

+			result.add("org.eclipse.emf.ecore.EFactory");

+			result.add("org.eclipse.emf.ecore.EGenericType");

+			result.add("org.eclipse.emf.ecore.EModelElement");

+			result.add("org.eclipse.emf.ecore.ENamedElement");

+			result.add("org.eclipse.emf.ecore.EObject");

+			result.add("org.eclipse.emf.ecore.EOperation");

+			result.add("org.eclipse.emf.ecore.EPackage");

+			result.add("org.eclipse.emf.ecore.EParameter");

+			result.add("org.eclipse.emf.ecore.EReference");

+			result.add("org.eclipse.emf.ecore.EStructuralFeature");

+			result.add("org.eclipse.emf.ecore.ETypedElement");

+			result.add("org.eclipse.emf.ecore.ETypeParameter");

+			result.add("org.eclipse.emf.ecore.EValidator");

+			result.add("org.eclipse.emf.ecore.InternalEObject");

+

+			//ypes not directly EMF but used by EMF

+			result.add("org.eclipse.emf.common.util.DiagnosticChain");

+

+

+			ecoreDefaultTypes = Collections.unmodifiableSet(result);

+		}

+		return ecoreDefaultTypes;

+	}

+

+	/**

+	 * Returns the names of the primitives and types

+	 */

+	public static synchronized Set<String> getJavaDefaultTypes() {

+		if(javaDefaultTypes == null) {

+			Set<String> result = new HashSet<String>(100);

+			result.add("java.lang.AbstractMethodError");

+			result.add("java.lang.ArithmeticException");

+			result.add("java.lang.ArrayIndexOutOfBoundsException");

+			result.add("java.lang.ArrayStoreException");

+			result.add("java.lang.Boolean");

+			result.add("java.lang.Byte");

+			result.add("java.lang.Character");

+			result.add("java.lang.Class");

+			result.add("java.lang.ClassCastException");

+			result.add("java.lang.ClassCircularityError");

+			result.add("java.lang.ClassFormatError");

+			result.add("java.lang.ClassLoader");

+			result.add("java.lang.ClassNotFoundException");

+			result.add("java.lang.CloneNotSupportedException");

+			result.add("java.lang.Cloneable");

+			result.add("java.lang.Comparable");

+			result.add("java.lang.Compiler");

+			result.add("java.lang.Double");

+			result.add("java.lang.Deprecated");

+			result.add("java.lang.Enum");

+			result.add("java.lang.Error");

+			result.add("java.lang.Exception");

+			result.add("java.lang.ExceptionInInitializerError");

+			result.add("java.lang.Float");

+			result.add("java.lang.FloatingDecimal");

+			result.add("java.lang.IllegalAccessError");

+			result.add("java.lang.IllegalAccessException");

+			result.add("java.lang.IllegalArgumentException");

+			result.add("java.lang.IllegalMonitorStateException");

+			result.add("java.lang.IllegalStateException");

+			result.add("java.lang.IllegalThreadStateException");

+			result.add("java.lang.IncompatibleClassChangeError");

+			result.add("java.lang.IndexOutOfBoundsException");

+			result.add("java.lang.InheritableThreadLocal");

+			result.add("java.lang.InstantiationError");

+			result.add("java.lang.InstantiationException");

+			result.add("java.lang.Integer");

+			result.add("java.lang.InternalError");

+			result.add("java.lang.InterruptedException");

+			result.add("java.lang.LinkageError");

+			result.add("java.lang.Long");

+			result.add("java.lang.Math");

+			result.add("java.lang.NegativeArraySizeException");

+			result.add("java.lang.NoClassDefFoundError");

+			result.add("java.lang.NoSuchFieldError");

+			result.add("java.lang.NoSuchFieldException");

+			result.add("java.lang.NoSuchMethodError");

+			result.add("java.lang.NoSuchMethodException");

+			result.add("java.lang.NullPointerException");

+			result.add("java.lang.Number");

+			result.add("java.lang.NumberFormatException");

+			result.add("java.lang.Object");

+			result.add("java.lang.Override");

+			result.add("java.lang.OutOfMemoryError");

+			result.add("java.lang.Package");

+			result.add("java.lang.Process");

+			result.add("java.lang.Runnable");

+			result.add("java.lang.Runtime");

+			result.add("java.lang.RuntimeException");

+			result.add("java.lang.RuntimePermission");

+			result.add("java.lang.SecurityException");

+			result.add("java.lang.SecurityManager");

+			result.add("java.lang.Short");

+			result.add("java.lang.StackOverflowError");

+			result.add("java.lang.String");

+			result.add("java.lang.StringBuffer");

+			result.add("java.lang.StringBuilder");

+			result.add("java.lang.StringIndexOutOfBoundsException");

+			result.add("java.lang.SuppressWarnings");

+			result.add("java.lang.System");

+			result.add("java.lang.Thread");

+			result.add("java.lang.ThreadDeath");

+			result.add("java.lang.ThreadGroup");

+			result.add("java.lang.ThreadLocal");

+			result.add("java.lang.Throwable");

+			result.add("java.lang.UnknownError");

+			result.add("java.lang.UnsatisfiedLinkError");

+			result.add("java.lang.UnsupportedClassVersionError");

+			result.add("java.lang.UnsupportedOperationException");

+			result.add("java.lang.VerifyError");

+			result.add("java.lang.VirtualMachineError");

+			result.add("Void");

+			result.add("void");

+			result.add("boolean");

+			result.add("byte");

+			result.add("char");

+			result.add("double");

+			result.add("float");

+			result.add("int");

+			result.add("long");

+			result.add("short");

+			javaDefaultTypes = Collections.unmodifiableSet(result);

+		}

+		return javaDefaultTypes;

+	}

+

+	/**

+	 * Copy the original ecore metamodel in the impl source package

+	 * 

+	 * @param genPackage

+	 *        the gen package

+	 */

+	public static void copyEcore(GenPackage genPackage) {

+

+

+		GenModel genModel = genPackage.getGenModel();

+		EModelElement ecoreModelElement = genPackage.getEcoreModelElement();

+		if(ecoreModelElement != null) {

+

+			URI originalURI = ecoreModelElement.eResource().getURI();

+			String modelDirectory = genModel.getModelDirectory();

+			String implPackage = genPackage.getClassPackageName().replaceAll("\\.", "/"); //$NON-NLS-1$ //$NON-NLS-2$

+			if(!implPackage.startsWith("/") && !modelDirectory.endsWith("/")) { //$NON-NLS-1$ //$NON-NLS-2$

+				implPackage = "/" + implPackage; //$NON-NLS-1$

+			}

+			String filePath = modelDirectory + implPackage;

+			if(!filePath.endsWith("/")) { //$NON-NLS-1$

+				filePath += "/"; //$NON-NLS-1$

+			}

+			filePath += originalURI.lastSegment();

+			URI destURI = URI.createURI("platform:/resource" + filePath, true); //$NON-NLS-1$

+			String dest = destURI.toPlatformString(true);

+

+			try {

+

+				if(originalURI.isPlatformResource()) {

+					String platformString = originalURI.toPlatformString(true);

+					IResource resource = ResourcesPlugin.getWorkspace().getRoot().findMember(platformString);

+					if(resource instanceof IFile) {

+

+						IPath destPath = new Path(dest);

+						if(destPath.segmentCount() >= 2) {

+							IFile destFolder = resource.getProject().getFile(destPath.removeLastSegments(1).removeFirstSegments(1));

+							IFile destFile = resource.getProject().getFile(destPath.removeFirstSegments(1));

+

+							File destFolderFile = destFolder.getLocation().toFile();

+							File destFileFile = destFile.getLocation().toFile();

+							destFolderFile.mkdirs();

+							destFileFile.createNewFile();

+							Files.copy(resource.getLocation().toFile().toPath(), destFileFile.toPath(), StandardCopyOption.REPLACE_EXISTING);

+

+						}

+

+					}

+				}

+			} catch (IOException e) {

+				e.printStackTrace();

+			}

+

+

+

+		}

+	}

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/utils/WrappingListUtils.java b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/utils/WrappingListUtils.java
new file mode 100644
index 00000000000..21372aa2d6c
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/src/org/eclipse/papyrus/facade/codegen/utils/WrappingListUtils.java
@@ -0,0 +1,344 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facade.codegen.utils;

+

+import java.util.ArrayList;

+import java.util.List;

+

+import org.eclipse.emf.codegen.ecore.genmodel.GenClass;

+import org.eclipse.emf.codegen.ecore.genmodel.GenFeature;

+import org.eclipse.emf.codegen.ecore.genmodel.GenJDKLevel;

+import org.eclipse.emf.codegen.ecore.genmodel.GenModel;

+import org.eclipse.emf.codegen.ecore.genmodel.impl.GenClassImpl;

+import org.eclipse.emf.codegen.util.CodeGenUtil;

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

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

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

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

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

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

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

+

+public class WrappingListUtils {

+

+	private static final String UNSUPPORTED_LIST_CONSTRUCTOR = "UNSUPPORTED_LIST_CONSTRUCTOR"; //$NON-NLS-1$

+

+	/**

+	 * Gets the list of genFeatures that are subsetted by the genFeature.

+	 * 

+	 * @param genFeature

+	 *        the genFeature

+	 * @return the list of subsetted genFeatures

+	 */

+	protected static List<GenFeature> getSubsetReferenceGenFeature(GenFeature genFeature) {

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

+		EStructuralFeature ecoreFeature = genFeature.getEcoreFeature();

+		if(ecoreFeature != null) {

+			EAnnotation annotation = ecoreFeature.getEAnnotation("subsets"); //$NON-NLS-1$

+			if(annotation != null) {

+				EList<EObject> references = annotation.getReferences();

+				for(EObject ref : references) {

+

+					if(ref instanceof EReference) {

+						GenFeature refGenFeature = genFeature.getGenModel().findGenFeature((EStructuralFeature)ref);

+						result.add(refGenFeature);

+					}

+				}

+			}

+		}

+		return result;

+	}

+

+

+	/**

+	 * Gets the wrapping list constructor.

+	 * 

+	 * @param genClass

+	 *        the gen class

+	 * @param genFeature

+	 *        the gen feature

+	 * @param typeArgument

+	 *        the type argument

+	 * @return the wrapping list constructor

+	 */

+	public static String getWrappingListConstructor(GenClass genClass, GenFeature genFeature, String typeArgument) {

+

+		boolean isJava5 = isJDK50(genClass.getGenModel());

+		if(genClass instanceof GenClassImpl) {

+

+			GenClassImpl genClassImpl = (GenClassImpl)genClass;

+			StringBuffer sb = new StringBuffer();

+

+			String unsettable = genFeature.isUnsettable() ? ".Unsettable" : ""; //$NON-NLS-1$ //$NON-NLS-2$

+			String offsetCorrectionField = genClassImpl.hasOffsetCorrection() ? " + " + genClassImpl.getOffsetCorrectionField(null) : ""; //$NON-NLS-1$ //$NON-NLS-2$

+

+

+			if(genFeature.isMapType()) {

+				sb.append(UNSUPPORTED_LIST_CONSTRUCTOR + "_MapType"); //$NON-NLS-1$

+				//				GenClass mapGenClass = genFeature.getMapEntryTypeGenClass();

+				//				sb.append(genClassImpl.getGenModel().getImportedName("org.eclipse.emf.ecore.util.EcoreEMap"));

+				//				sb.append(unsettable);

+				//				if(isJava5) {

+				//					sb.append('<');

+				//					sb.append(genFeature.getImportedMapKeyType(genClassImpl));

+				//					sb.append(',');

+				//					sb.append(genFeature.getImportedMapValueType(genClassImpl));

+				//					sb.append('>');

+				//				}

+				//				sb.append("(");

+				//				sb.append(mapGenClass.getQualifiedClassifierAccessor());

+				//				sb.append(", ");

+				//				sb.append(genFeature.getImportedMapEntryType());

+				//				sb.append(".class, this, ");

+				//				sb.append(genClassImpl.getQualifiedFeatureID(genFeature));

+				//				sb.append(offsetCorrectionField);

+				//				if(genFeature.isBidirectional() && genClassImpl.getGenModel().getRuntimeVersion().getValue() >= GenRuntimeVersion.EMF27_VALUE) {

+				//					sb.append(", ");

+				//					sb.append(genFeature.getReverse().getGenClass().getQualifiedFeatureID(genFeature.getReverse()));

+				//				}

+				//				sb.append(")");

+			} else if(genFeature.isFeatureMapType()) {

+				sb.append(UNSUPPORTED_LIST_CONSTRUCTOR + "_FeatureMapType"); //$NON-NLS-1$

+				//				if(genFeature.isWrappedFeatureMapType()) {

+				//					sb.append(genFeature.getImportedEffectiveFeatureMapWrapperClass());

+				//					sb.append("(new ");

+				//				}

+				//				sb.append(genClassImpl.getGenModel().getImportedName("org.eclipse.emf.ecore.util.BasicFeatureMap"));

+				//				sb.append("(this, ");

+				//				sb.append(genClassImpl.getQualifiedFeatureID(genFeature));

+				//				sb.append(offsetCorrectionField);

+				//				sb.append(")");

+				//				if(genFeature.isWrappedFeatureMapType()) {

+				//					sb.append(")");

+				//				}

+			} else {

+				EGenericType eGenericType = genFeature.getEcoreFeature().getEGenericType();

+				if(genClassImpl.getGenModel().isSuppressNotification()) {

+

+					sb.append(UNSUPPORTED_LIST_CONSTRUCTOR + "_Generic"); //$NON-NLS-1$

+

+					//					sb.append(genClassImpl.getGenModel().getImportedName("org.eclipse.emf.ecore.util.BasicInternalEList"));

+					//					if(genClassImpl.getGenModel().getRuntimeVersion().getValue() >= GenRuntimeVersion.EMF28_VALUE) {

+					//						sb.append(unsettable);

+					//					}

+					//					if(isJava5) {

+					//						sb.append('<');

+					//						sb.append(genFeature.getListItemType(genClassImpl));

+					//						sb.append('>');

+					//					}

+					//					sb.append("(");

+					//					sb.append(typeArgument);

+					//					sb.append(".class)");

+				} else if(genFeature.isEffectiveContains()) {

+					if(genFeature.isBidirectional()) {

+						GenFeature reverseFeature = genFeature.getReverse();

+						if(!getSubsetReferenceGenFeature(genFeature).isEmpty()) {

+							sb.append(genClassImpl.getGenModel().getImportedName("org.eclipse.papyrus.facade.utils.wrappinglist.subset.WrappingSubsetEObjectContainmentWithInverseEList")); //$NON-NLS-1$

+						} else {

+							sb.append(genClassImpl.getGenModel().getImportedName("org.eclipse.papyrus.facade.utils.wrappinglist.WrappingEObjectContainmentWithInverseEList")); //$NON-NLS-1$

+						}

+						sb.append(unsettable);

+						if(genFeature.isResolveProxies()) {

+							//							sb.append(".Resolving");

+							sb.append(UNSUPPORTED_LIST_CONSTRUCTOR + "_Resolving"); //$NON-NLS-1$

+						}

+						if(isJava5) {

+							sb.append('<');

+							sb.append(genFeature.getListItemType(genClassImpl));

+							sb.append('>');

+						}

+						sb.append("("); //$NON-NLS-1$

+						sb.append(typeArgument);

+						sb.append(".class, this, "); //$NON-NLS-1$

+						sb.append(genClassImpl.getQualifiedFeatureID(genFeature));

+						sb.append(offsetCorrectionField);

+						sb.append(", "); //$NON-NLS-1$

+						sb.append(reverseFeature.getGenClass().getQualifiedFeatureID(reverseFeature));

+						if(reverseFeature.getGenClass().hasOffsetCorrection()) {

+							sb.append(" + "); //$NON-NLS-1$

+							sb.append(genClassImpl.getOffsetCorrectionField(genFeature));

+						}

+						sb.append(",(java.util.Collection)umlList"); //$NON-NLS-1$

+						if(!getSubsetReferenceGenFeature(genFeature).isEmpty()) {

+							for(GenFeature feature : getSubsetReferenceGenFeature(genFeature)) {

+								sb.append(",(" + genClassImpl.getGenModel().getImportedName("org.eclipse.papyrus.facade.utils.wrappinglist.WrappingList") + ")" + feature.getGetAccessor() + "()"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$

+							}

+						}

+						sb.append(")"); //$NON-NLS-1$

+					} else {

+						if(!getSubsetReferenceGenFeature(genFeature).isEmpty()) {

+							sb.append(genClassImpl.getGenModel().getImportedName("org.eclipse.papyrus.facade.utils.wrappinglist.subset.WrappingSubsetEObjectContainmentEList")); //$NON-NLS-1$

+						} else {

+							sb.append(genClassImpl.getGenModel().getImportedName("org.eclipse.papyrus.facade.utils.wrappinglist.WrappingEObjectContainmentEList")); //$NON-NLS-1$

+						}

+						sb.append(unsettable);

+						if(genFeature.isResolveProxies()) {

+							//							sb.append(".Resolving");

+							sb.append(UNSUPPORTED_LIST_CONSTRUCTOR + "_Resolving"); //$NON-NLS-1$

+						}

+						if(isJava5) {

+							sb.append('<');

+							sb.append(genFeature.getListItemType(genClassImpl));

+							sb.append('>');

+						}

+						sb.append("("); //$NON-NLS-1$

+						sb.append(typeArgument);

+						sb.append(".class, this, "); //$NON-NLS-1$

+						sb.append(genClassImpl.getQualifiedFeatureID(genFeature));

+						sb.append(offsetCorrectionField);

+						sb.append(",(java.util.Collection)umlList"); //$NON-NLS-1$

+						if(!getSubsetReferenceGenFeature(genFeature).isEmpty()) {

+							for(GenFeature feature : getSubsetReferenceGenFeature(genFeature)) {

+								sb.append(",(" + genClassImpl.getGenModel().getImportedName("org.eclipse.papyrus.facade.utils.wrappinglist.WrappingList") + ")" + feature.getGetAccessor() + "()"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$

+							}

+						}

+						sb.append(")"); //$NON-NLS-1$

+					}

+				} else if(genFeature.isReferenceType()) {

+					if(genFeature.isBidirectional()) {

+						GenFeature reverseFeature = genFeature.getReverse();

+						if(genFeature.isResolveProxies()) {

+							//							sb.append(genClassImpl.getGenModel().getImportedName("org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList"));

+							if(!getSubsetReferenceGenFeature(genFeature).isEmpty()) {

+								sb.append(genClassImpl.getGenModel().getImportedName("org.eclipse.papyrus.facade.utils.wrappinglist.subset.WrappingSubsetEObjectWithInverseEList")); //$NON-NLS-1$

+							} else {

+								sb.append(genClassImpl.getGenModel().getImportedName("org.eclipse.papyrus.facade.utils.wrappinglist.WrappingEObjectWithInverseEList")); //$NON-NLS-1$

+							}

+						} else {

+							if(!getSubsetReferenceGenFeature(genFeature).isEmpty()) {

+								sb.append(genClassImpl.getGenModel().getImportedName("org.eclipse.papyrus.facade.utils.wrappinglist.subset.WrappingSubsetEObjectWithInverseEList")); //$NON-NLS-1$

+							} else {

+								sb.append(genClassImpl.getGenModel().getImportedName("org.eclipse.papyrus.facade.utils.wrappinglist.WrappingEObjectWithInverseEList")); //$NON-NLS-1$

+							}

+						}

+						sb.append(unsettable);

+						if(reverseFeature.isListType()) {

+							if(!getSubsetReferenceGenFeature(genFeature).isEmpty()) {

+								sb.append(".WrappingSubsetManyInverse"); //$NON-NLS-1$

+							} else {

+								sb.append(".WrappingManyInverse"); //$NON-NLS-1$

+							}

+						}

+						if(isJava5) {

+							sb.append('<');

+							sb.append(genFeature.getListItemType(genClassImpl));

+							sb.append('>');

+						}

+						sb.append("("); //$NON-NLS-1$

+						sb.append(typeArgument);

+						sb.append(".class, this, "); //$NON-NLS-1$

+						sb.append(genClassImpl.getQualifiedFeatureID(genFeature));

+						sb.append(offsetCorrectionField);

+						sb.append(", "); //$NON-NLS-1$

+						sb.append(reverseFeature.getGenClass().getQualifiedFeatureID(reverseFeature));

+						if(reverseFeature.getGenClass().hasOffsetCorrection()) {

+							sb.append(" + "); //$NON-NLS-1$

+							sb.append(genClassImpl.getOffsetCorrectionField(genFeature));

+						}

+						sb.append(",(java.util.Collection)umlList"); //$NON-NLS-1$

+						if(!getSubsetReferenceGenFeature(genFeature).isEmpty()) {

+							for(GenFeature feature : getSubsetReferenceGenFeature(genFeature)) {

+								sb.append(",(" + genClassImpl.getGenModel().getImportedName("org.eclipse.papyrus.facade.utils.wrappinglist.WrappingList") + ")" + feature.getGetAccessor() + "()"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$

+							}

+						}

+						sb.append(")"); //$NON-NLS-1$

+					} else {

+						if(genFeature.isResolveProxies()) {

+							//							sb.append(genClassImpl.getGenModel().getImportedName("org.eclipse.emf.ecore.util.EObjectResolvingEList"));

+							if(!getSubsetReferenceGenFeature(genFeature).isEmpty()) {

+								sb.append(genClassImpl.getGenModel().getImportedName("org.eclipse.papyrus.facade.utils.wrappinglist.subset.WrappingSubsetEObjectEList")); //$NON-NLS-1$

+							} else {

+								sb.append(genClassImpl.getGenModel().getImportedName("org.eclipse.papyrus.facade.utils.wrappinglist.WrappingEObjectEList")); //$NON-NLS-1$

+							}

+						} else {

+							if(!getSubsetReferenceGenFeature(genFeature).isEmpty()) {

+								sb.append(genClassImpl.getGenModel().getImportedName("org.eclipse.papyrus.facade.utils.wrappinglist.subset.WrappingSubsetEObjectEList")); //$NON-NLS-1$

+							} else {

+								sb.append(genClassImpl.getGenModel().getImportedName("org.eclipse.papyrus.facade.utils.wrappinglist.WrappingEObjectEList")); //$NON-NLS-1$

+							}

+						}

+						sb.append(unsettable);

+						if(isJava5) {

+							sb.append('<');

+							sb.append(genFeature.getListItemType(genClassImpl));

+							sb.append('>');

+						}

+						sb.append("("); //$NON-NLS-1$

+						sb.append(typeArgument);

+						sb.append(".class, this, "); //$NON-NLS-1$

+						sb.append(genClassImpl.getQualifiedFeatureID(genFeature));

+						sb.append(offsetCorrectionField);

+						sb.append(",(java.util.Collection)umlList"); //$NON-NLS-1$

+						if(!getSubsetReferenceGenFeature(genFeature).isEmpty()) {

+							for(GenFeature feature : getSubsetReferenceGenFeature(genFeature)) {

+								sb.append(",(" + genClassImpl.getGenModel().getImportedName("org.eclipse.papyrus.facade.utils.wrappinglist.WrappingList") + ")" + feature.getGetAccessor() + "()"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$

+							}

+						}

+						sb.append(")"); //$NON-NLS-1$

+					}

+				} else { //data type

+					if(genFeature.isUnique()) {

+						//						sb.append(genClassImpl.getGenModel().getImportedName("org.eclipse.emf.ecore.util.EDataTypeUniqueEList"));

+						sb.append(UNSUPPORTED_LIST_CONSTRUCTOR + "_UniqueDatatype"); //$NON-NLS-1$

+					} else {

+						//						sb.append(genClassImpl.getGenModel().getImportedName("org.eclipse.emf.ecore.util.EDataTypeEList"));

+						sb.append(UNSUPPORTED_LIST_CONSTRUCTOR + "_NotUniqueDatatype"); //$NON-NLS-1$

+					}

+					sb.append(unsettable);

+					if(isJava5) {

+						sb.append('<');

+						sb.append(genFeature.getListItemType(genClassImpl));

+						sb.append('>');

+					}

+					sb.append("("); //$NON-NLS-1$

+					sb.append(isPrimitiveType(eGenericType.getERawType()) ? genFeature.getRawListItemType() : typeArgument);

+					sb.append(".class, this, "); //$NON-NLS-1$

+					sb.append(genClassImpl.getQualifiedFeatureID(genFeature));

+					sb.append(offsetCorrectionField);

+					sb.append(")"); //$NON-NLS-1$

+				}

+			}

+			return sb.toString();

+		}

+		return ""; //$NON-NLS-1$

+	}

+

+	/**

+	 * Checks if the genModel is defined as JDK50 complianceLevel.

+	 * 

+	 * @param genModel

+	 *        the genModel

+	 * @return true, if the genModel is defined as JDK50 complianceLevel.

+	 */

+	public static boolean isJDK50(GenModel genModel) {

+		if(genModel != null && genModel.getComplianceLevel() != null)

+			return genModel.getComplianceLevel().getValue() >= GenJDKLevel.JDK50;

+		return false;

+	}

+

+	/**

+	 * Checks if is primitive type.

+	 * 

+	 * @param eType

+	 *        the eType

+	 * @return true, if is primitive type

+	 */

+	static public boolean isPrimitiveType(EClassifier eType) {

+		return eType != null && CodeGenUtil.isJavaPrimitiveType(eType.getInstanceClassName());

+	}

+

+

+

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/.classpath b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/.classpath
new file mode 100644
index 00000000000..8a8f1668cdc
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<classpath>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

+	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="output" path="bin"/>

+</classpath>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/.project b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/.project
new file mode 100644
index 00000000000..36c4dfa1de0
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.papyrus.facade.definition.editor</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.jdt.core.javabuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.ManifestBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.SchemaBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.pde.PluginNature</nature>

+		<nature>org.eclipse.jdt.core.javanature</nature>

+	</natures>

+</projectDescription>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/.settings/org.eclipse.jdt.core.prefs b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..060c5ee3d2e
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,11 @@
+eclipse.preferences.version=1

+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

+org.eclipse.jdt.core.compiler.compliance=1.5

+org.eclipse.jdt.core.compiler.debug.lineNumber=generate

+org.eclipse.jdt.core.compiler.debug.localVariable=generate

+org.eclipse.jdt.core.compiler.debug.sourceFile=generate

+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

+org.eclipse.jdt.core.compiler.source=1.5

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/META-INF/MANIFEST.MF b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..d0c443f4655
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/META-INF/MANIFEST.MF
@@ -0,0 +1,18 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: FacadeSepcificEditor
+Bundle-SymbolicName: org.eclipse.papyrus.facade.definition.editor;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.jface.text,
+ org.eclipse.ui.editors,
+ org.eclipse.uml2;bundle-version="3.2.0",
+ org.eclipse.uml2.uml;bundle-version="4.1.0",
+ org.eclipse.papyrus.facade.editor;bundle-version="1.0.0",
+ org.eclipse.papyrus.uml.extensionpoints,
+ org.eclipse.papyrus.infra.core.log;bundle-version="0.10.1",
+ org.eclipse.papyrus.facade.utils;bundle-version="0.10.0"
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/build.properties b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/build.properties
new file mode 100644
index 00000000000..4b8162ab8b2
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/build.properties
@@ -0,0 +1,6 @@
+source.. = src/

+output.. = bin/

+bin.includes = plugin.xml,\

+               META-INF/,\

+               .,\

+               icons/

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/association.png b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/association.png
new file mode 100644
index 00000000000..0ed33de4bbd
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/association.png
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/associationRequired.png b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/associationRequired.png
new file mode 100644
index 00000000000..2e8f27c7c84
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/associationRequired.png
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/checked.gif b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/checked.gif
new file mode 100644
index 00000000000..9cacb96dca9
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/checked.gif
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/combinaison.png b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/combinaison.png
new file mode 100644
index 00000000000..fd48fba83ae
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/combinaison.png
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/facade.png b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/facade.png
new file mode 100644
index 00000000000..779a7b8b123
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/facade.png
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/fusion.png b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/fusion.png
new file mode 100644
index 00000000000..48b3d9712e4
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/fusion.png
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/fusionRequired.png b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/fusionRequired.png
new file mode 100644
index 00000000000..792ab41bdfd
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/fusionRequired.png
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/generalization.png b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/generalization.png
new file mode 100644
index 00000000000..2bc0fe5703e
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/generalization.png
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/generalizationRequired.png b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/generalizationRequired.png
new file mode 100644
index 00000000000..0d00d0dcbf0
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/generalizationRequired.png
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/multigeneralization.png b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/multigeneralization.png
new file mode 100644
index 00000000000..d68ef99ac8d
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/multigeneralization.png
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/multigeneralizationRequired.png b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/multigeneralizationRequired.png
new file mode 100644
index 00000000000..1690a3eab3b
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/multigeneralizationRequired.png
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/tag.png b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/tag.png
new file mode 100644
index 00000000000..228231008ee
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/tag.png
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/tagRequired.png b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/tagRequired.png
new file mode 100644
index 00000000000..007e8a4dadc
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/tagRequired.png
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/unchecked.gif b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/unchecked.gif
new file mode 100644
index 00000000000..5f17b937e9f
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/unchecked.gif
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/StereotypeInterface.gif b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/StereotypeInterface.gif
new file mode 100644
index 00000000000..4da4be6653b
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/StereotypeInterface.gif
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualDatatype.gif b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualDatatype.gif
new file mode 100644
index 00000000000..5d31048451a
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualDatatype.gif
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualEnum.gif b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualEnum.gif
new file mode 100644
index 00000000000..343d086340b
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualEnum.gif
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualLiteral.gif b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualLiteral.gif
new file mode 100644
index 00000000000..7bb44f59cc8
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualLiteral.gif
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualMetaclass.gif b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualMetaclass.gif
new file mode 100644
index 00000000000..2b8da630d85
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualMetaclass.gif
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualOperation.gif b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualOperation.gif
new file mode 100644
index 00000000000..60824bba116
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualOperation.gif
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualParameter.gif b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualParameter.gif
new file mode 100644
index 00000000000..bef08f3cc15
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualParameter.gif
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualReference.gif b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualReference.gif
new file mode 100644
index 00000000000..88cdf2ad850
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/icons/virtualmetamodel/VirtualReference.gif
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/plugin.xml b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/plugin.xml
new file mode 100644
index 00000000000..bc95e9e6f16
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/plugin.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<?eclipse version="3.4"?>

+<plugin>

+

+   <extension

+         point="org.eclipse.ui.editors">

+      <editor

+            name="Facade Definition Editor"

+            extensions="facade"

+            icon="icons/facade.png"

+            contributorClass="org.eclipse.papyrus.facade.presentation.FacadeActionBarContributor"

+            class="org.eclipse.papyrus.facadeSpecificEditor.FacadeSpecificEditor"

+            id="FacadeDefinitionEditor">

+      </editor>

+   </extension>

+
+</plugin>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/com/swtdesigner/ResourceManager.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/com/swtdesigner/ResourceManager.java
new file mode 100644
index 00000000000..4b94d4e04d4
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/com/swtdesigner/ResourceManager.java
@@ -0,0 +1,420 @@
+/*****************************************************************************
+ * 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:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package com.swtdesigner;
+
+import java.io.File;
+import java.io.InputStream;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.jface.resource.CompositeImageDescriptor;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
+import org.osgi.framework.Bundle;
+
+/**
+ * Utility class for managing OS resources associated with SWT/JFace controls such as colors, fonts, images,
+ * etc.
+ * 
+ * !!! IMPORTANT !!! Application code must explicitly invoke the <code>dispose()</code> method to release the
+ * operating system resources managed by cached objects when those objects and OS resources are no longer
+ * needed (e.g. on application shutdown)
+ * 
+ * This class may be freely distributed as part of any application or plugin.
+ * <p>
+ * Copyright (c) 2003 - 2007, Instantiations, Inc. <br>
+ * All Rights Reserved
+ * 
+ * @author scheglov_ke
+ * @author Dan Rubel
+ */
+public class ResourceManager extends SWTResourceManager {
+	////////////////////////////////////////////////////////////////////////////
+	//
+	// Image
+	//
+	////////////////////////////////////////////////////////////////////////////
+	private static Map<ImageDescriptor, Image> m_descriptorImageMap = new HashMap<ImageDescriptor, Image>();
+	/**
+	 * Returns an {@link ImageDescriptor} stored in the file at the specified path relative to the specified
+	 * class.
+	 * 
+	 * @param clazz
+	 *            the {@link Class} relative to which to find the image descriptor.
+	 * @param path
+	 *            the path to the image file.
+	 * @return the {@link ImageDescriptor} stored in the file at the specified path.
+	 */
+	public static ImageDescriptor getImageDescriptor(Class<?> clazz, String path) {
+		return ImageDescriptor.createFromFile(clazz, path);
+	}
+	/**
+	 * Returns an {@link ImageDescriptor} stored in the file at the specified path.
+	 * 
+	 * @param path
+	 *            the path to the image file.
+	 * @return the {@link ImageDescriptor} stored in the file at the specified path.
+	 */
+	public static ImageDescriptor getImageDescriptor(String path) {
+		try {
+			return ImageDescriptor.createFromURL(new File(path).toURI().toURL());
+		} catch (MalformedURLException e) {
+			return null;
+		}
+	}
+	/**
+	 * Returns an {@link Image} based on the specified {@link ImageDescriptor}.
+	 * 
+	 * @param descriptor
+	 *            the {@link ImageDescriptor} for the {@link Image}.
+	 * @return the {@link Image} based on the specified {@link ImageDescriptor}.
+	 */
+	public static Image getImage(ImageDescriptor descriptor) {
+		if (descriptor == null) {
+			return null;
+		}
+		Image image = m_descriptorImageMap.get(descriptor);
+		if (image == null) {
+			image = descriptor.createImage();
+			m_descriptorImageMap.put(descriptor, image);
+		}
+		return image;
+	}
+	/**
+	 * Maps images to decorated images.
+	 */
+	@SuppressWarnings("unchecked")
+	private static Map<Image, Map<Image, Image>>[] m_decoratedImageMap = new Map[LAST_CORNER_KEY];
+	/**
+	 * Returns an {@link Image} composed of a base image decorated by another image.
+	 * 
+	 * @param baseImage
+	 *            the base {@link Image} that should be decorated.
+	 * @param decorator
+	 *            the {@link Image} to decorate the base image.
+	 * @return {@link Image} The resulting decorated image.
+	 */
+	public static Image decorateImage(Image baseImage, Image decorator) {
+		return decorateImage(baseImage, decorator, BOTTOM_RIGHT);
+	}
+	/**
+	 * Returns an {@link Image} composed of a base image decorated by another image.
+	 * 
+	 * @param baseImage
+	 *            the base {@link Image} that should be decorated.
+	 * @param decorator
+	 *            the {@link Image} to decorate the base image.
+	 * @param corner
+	 *            the corner to place decorator image.
+	 * @return the resulting decorated {@link Image}.
+	 */
+	public static Image decorateImage(final Image baseImage, final Image decorator, final int corner) {
+		if (corner <= 0 || corner >= LAST_CORNER_KEY) {
+			throw new IllegalArgumentException("Wrong decorate corner");
+		}
+		Map<Image, Map<Image, Image>> cornerDecoratedImageMap = m_decoratedImageMap[corner];
+		if (cornerDecoratedImageMap == null) {
+			cornerDecoratedImageMap = new HashMap<Image, Map<Image, Image>>();
+			m_decoratedImageMap[corner] = cornerDecoratedImageMap;
+		}
+		Map<Image, Image> decoratedMap = cornerDecoratedImageMap.get(baseImage);
+		if (decoratedMap == null) {
+			decoratedMap = new HashMap<Image, Image>();
+			cornerDecoratedImageMap.put(baseImage, decoratedMap);
+		}
+		//
+		Image result = decoratedMap.get(decorator);
+		if (result == null) {
+			final Rectangle bib = baseImage.getBounds();
+			final Rectangle dib = decorator.getBounds();
+			final Point baseImageSize = new Point(bib.width, bib.height);
+			CompositeImageDescriptor compositImageDesc = new CompositeImageDescriptor() {
+				@Override
+				protected void drawCompositeImage(int width, int height) {
+					drawImage(baseImage.getImageData(), 0, 0);
+					if (corner == TOP_LEFT) {
+						drawImage(decorator.getImageData(), 0, 0);
+					} else if (corner == TOP_RIGHT) {
+						drawImage(decorator.getImageData(), bib.width - dib.width, 0);
+					} else if (corner == BOTTOM_LEFT) {
+						drawImage(decorator.getImageData(), 0, bib.height - dib.height);
+					} else if (corner == BOTTOM_RIGHT) {
+						drawImage(decorator.getImageData(), bib.width - dib.width, bib.height - dib.height);
+					}
+				}
+				@Override
+				protected Point getSize() {
+					return baseImageSize;
+				}
+			};
+			//
+			result = compositImageDesc.createImage();
+			decoratedMap.put(decorator, result);
+		}
+		return result;
+	}
+	/**
+	 * Dispose all of the cached images.
+	 */
+	public static void disposeImages() {
+		SWTResourceManager.disposeImages();
+		// dispose ImageDescriptor images
+		{
+			for (Iterator<Image> I = m_descriptorImageMap.values().iterator(); I.hasNext();) {
+				I.next().dispose();
+			}
+			m_descriptorImageMap.clear();
+		}
+		// dispose decorated images
+		for (int i = 0; i < m_decoratedImageMap.length; i++) {
+			Map<Image, Map<Image, Image>> cornerDecoratedImageMap = m_decoratedImageMap[i];
+			if (cornerDecoratedImageMap != null) {
+				for (Map<Image, Image> decoratedMap : cornerDecoratedImageMap.values()) {
+					for (Image image : decoratedMap.values()) {
+						image.dispose();
+					}
+					decoratedMap.clear();
+				}
+				cornerDecoratedImageMap.clear();
+			}
+		}
+		// dispose plugin images
+		{
+			for (Iterator<Image> I = m_URLImageMap.values().iterator(); I.hasNext();) {
+				I.next().dispose();
+			}
+			m_URLImageMap.clear();
+		}
+	}
+	////////////////////////////////////////////////////////////////////////////
+	//
+	// Plugin images support
+	//
+	////////////////////////////////////////////////////////////////////////////
+	/**
+	 * Maps URL to images.
+	 */
+	private static Map<String, Image> m_URLImageMap = new HashMap<String, Image>();
+	/**
+	 * Provider for plugin resources, used by WindowBuilder at design time.
+	 */
+	public interface PluginResourceProvider {
+		URL getEntry(String symbolicName, String path);
+	}
+	/**
+	 * Instance of {@link PluginResourceProvider}, used by WindowBuilder at design time.
+	 */
+	private static PluginResourceProvider m_designTimePluginResourceProvider = null;
+	/**
+	 * Returns an {@link Image} based on a plugin and file path.
+	 * 
+	 * @param plugin
+	 *            the plugin {@link Object} containing the image
+	 * @param name
+	 *            the path to the image within the plugin
+	 * @return the {@link Image} stored in the file at the specified path
+	 * 
+	 * @deprecated Use {@link #getPluginImage(String, String)} instead.
+	 */
+	@Deprecated
+	public static Image getPluginImage(Object plugin, String name) {
+		try {
+			URL url = getPluginImageURL(plugin, name);
+			if (url != null) {
+				return getPluginImageFromUrl(url);
+			}
+		} catch (Throwable e) {
+			// Ignore any exceptions
+		}
+		return null;
+	}
+	/**
+	 * Returns an {@link Image} based on a {@link Bundle} and resource entry path.
+	 * 
+	 * @param symbolicName
+	 *            the symbolic name of the {@link Bundle}.
+	 * @param path
+	 *            the path of the resource entry.
+	 * @return the {@link Image} stored in the file at the specified path.
+	 */
+	public static Image getPluginImage(String symbolicName, String path) {
+		try {
+			URL url = getPluginImageURL(symbolicName, path);
+			if (url != null) {
+				return getPluginImageFromUrl(url);
+			}
+		} catch (Throwable e) {
+			// Ignore any exceptions
+		}
+		return null;
+	}
+	/**
+	 * Returns an {@link Image} based on given {@link URL}.
+	 */
+	private static Image getPluginImageFromUrl(URL url) {
+		try {
+			try {
+				String key = url.toExternalForm();
+				Image image = m_URLImageMap.get(key);
+				if (image == null) {
+					InputStream stream = url.openStream();
+					try {
+						image = getImage(stream);
+						m_URLImageMap.put(key, image);
+					} finally {
+						stream.close();
+					}
+				}
+				return image;
+			} catch (Throwable e) {
+				// Ignore any exceptions
+			}
+		} catch (Throwable e) {
+			// Ignore any exceptions
+		}
+		return null;
+	}
+	/**
+	 * Returns an {@link ImageDescriptor} based on a plugin and file path.
+	 * 
+	 * @param plugin
+	 *            the plugin {@link Object} containing the image.
+	 * @param name
+	 *            the path to th eimage within the plugin.
+	 * @return the {@link ImageDescriptor} stored in the file at the specified path.
+	 * 
+	 * @deprecated Use {@link #getPluginImageDescriptor(String, String)} instead.
+	 */
+	@Deprecated
+	public static ImageDescriptor getPluginImageDescriptor(Object plugin, String name) {
+		try {
+			try {
+				URL url = getPluginImageURL(plugin, name);
+				return ImageDescriptor.createFromURL(url);
+			} catch (Throwable e) {
+				// Ignore any exceptions
+			}
+		} catch (Throwable e) {
+			// Ignore any exceptions
+		}
+		return null;
+	}
+	/**
+	 * Returns an {@link ImageDescriptor} based on a {@link Bundle} and resource entry path.
+	 * 
+	 * @param symbolicName
+	 *            the symbolic name of the {@link Bundle}.
+	 * @param path
+	 *            the path of the resource entry.
+	 * @return the {@link ImageDescriptor} based on a {@link Bundle} and resource entry path.
+	 */
+	public static ImageDescriptor getPluginImageDescriptor(String symbolicName, String path) {
+		try {
+			URL url = getPluginImageURL(symbolicName, path);
+			if (url != null) {
+				return ImageDescriptor.createFromURL(url);
+			}
+		} catch (Throwable e) {
+			// Ignore any exceptions
+		}
+		return null;
+	}
+	/**
+	 * Returns an {@link URL} based on a {@link Bundle} and resource entry path.
+	 */
+	private static URL getPluginImageURL(String symbolicName, String path) {
+		// try runtime plugins
+		{
+			Bundle bundle = Platform.getBundle(symbolicName);
+			if (bundle != null) {
+				return bundle.getEntry(path);
+			}
+		}
+		// try design time provider
+		if (m_designTimePluginResourceProvider != null) {
+			return m_designTimePluginResourceProvider.getEntry(symbolicName, path);
+		}
+		// no such resource
+		return null;
+	}
+	/**
+	 * Returns an {@link URL} based on a plugin and file path.
+	 * 
+	 * @param plugin
+	 *            the plugin {@link Object} containing the file path.
+	 * @param name
+	 *            the file path.
+	 * @return the {@link URL} representing the file at the specified path.
+	 * @throws Exception
+	 */
+	private static URL getPluginImageURL(Object plugin, String name) throws Exception {
+		// try to work with 'plugin' as with OSGI BundleContext
+		try {
+			Class<?> BundleClass = Class.forName("org.osgi.framework.Bundle"); //$NON-NLS-1$
+			Class<?> BundleContextClass = Class.forName("org.osgi.framework.BundleContext"); //$NON-NLS-1$
+			if (BundleContextClass.isAssignableFrom(plugin.getClass())) {
+				Method getBundleMethod = BundleContextClass.getMethod("getBundle", new Class[0]); //$NON-NLS-1$
+				Object bundle = getBundleMethod.invoke(plugin, new Object[0]);
+				//
+				Class<?> PathClass = Class.forName("org.eclipse.core.runtime.Path"); //$NON-NLS-1$
+				Constructor<?> pathConstructor = PathClass.getConstructor(new Class[]{String.class});
+				Object path = pathConstructor.newInstance(new Object[]{name});
+				//
+				Class<?> IPathClass = Class.forName("org.eclipse.core.runtime.IPath"); //$NON-NLS-1$
+				Class<?> PlatformClass = Class.forName("org.eclipse.core.runtime.Platform"); //$NON-NLS-1$
+				Method findMethod = PlatformClass.getMethod("find", new Class[]{BundleClass, IPathClass}); //$NON-NLS-1$
+				return (URL) findMethod.invoke(null, new Object[]{bundle, path});
+			}
+		} catch (Throwable e) {
+			// Ignore any exceptions
+		}
+		// else work with 'plugin' as with usual Eclipse plugin
+		{
+			Class<?> PluginClass = Class.forName("org.eclipse.core.runtime.Plugin"); //$NON-NLS-1$
+			if (PluginClass.isAssignableFrom(plugin.getClass())) {
+				//
+				Class<?> PathClass = Class.forName("org.eclipse.core.runtime.Path"); //$NON-NLS-1$
+				Constructor<?> pathConstructor = PathClass.getConstructor(new Class[]{String.class});
+				Object path = pathConstructor.newInstance(new Object[]{name});
+				//
+				Class<?> IPathClass = Class.forName("org.eclipse.core.runtime.IPath"); //$NON-NLS-1$
+				Method findMethod = PluginClass.getMethod("find", new Class[]{IPathClass}); //$NON-NLS-1$
+				return (URL) findMethod.invoke(plugin, new Object[]{path});
+			}
+		}
+		return null;
+	}
+	////////////////////////////////////////////////////////////////////////////
+	//
+	// General
+	//
+	////////////////////////////////////////////////////////////////////////////
+	/**
+	 * Dispose of cached objects and their underlying OS resources. This should only be called when the cached
+	 * objects are no longer needed (e.g. on application shutdown).
+	 */
+	public static void dispose() {
+		disposeColors();
+		disposeFonts();
+		disposeImages();
+	}
+}
\ No newline at end of file
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/com/swtdesigner/SWTResourceManager.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/com/swtdesigner/SWTResourceManager.java
new file mode 100644
index 00000000000..d0bf3bcaa18
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/com/swtdesigner/SWTResourceManager.java
@@ -0,0 +1,453 @@
+/*****************************************************************************
+ * 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:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package com.swtdesigner;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Cursor;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.ImageData;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.widgets.Display;
+
+/**
+ * Utility class for managing OS resources associated with SWT controls such as colors, fonts, images, etc.
+ * <p>
+ * !!! IMPORTANT !!! Application code must explicitly invoke the <code>dispose()</code> method to release the
+ * operating system resources managed by cached objects when those objects and OS resources are no longer
+ * needed (e.g. on application shutdown)
+ * <p>
+ * This class may be freely distributed as part of any application or plugin.
+ * <p>
+ * Copyright (c) 2003 - 2007, Instantiations, Inc. <br>
+ * All Rights Reserved
+ * 
+ * @author scheglov_ke
+ * @author Dan Rubel
+ */
+public class SWTResourceManager {
+	////////////////////////////////////////////////////////////////////////////
+	//
+	// Color
+	//
+	////////////////////////////////////////////////////////////////////////////
+	private static Map<RGB, Color> m_colorMap = new HashMap<RGB, Color>();
+	/**
+	 * Returns the system {@link Color} matching the specific ID.
+	 * 
+	 * @param systemColorID
+	 *            the ID value for the color
+	 * @return the system {@link Color} matching the specific ID
+	 */
+	public static Color getColor(int systemColorID) {
+		Display display = Display.getCurrent();
+		return display.getSystemColor(systemColorID);
+	}
+	/**
+	 * Returns a {@link Color} given its red, green and blue component values.
+	 * 
+	 * @param r
+	 *            the red component of the color
+	 * @param g
+	 *            the green component of the color
+	 * @param b
+	 *            the blue component of the color
+	 * @return the {@link Color} matching the given red, green and blue component values
+	 */
+	public static Color getColor(int r, int g, int b) {
+		return getColor(new RGB(r, g, b));
+	}
+	/**
+	 * Returns a {@link Color} given its RGB value.
+	 * 
+	 * @param rgb
+	 *            the {@link RGB} value of the color
+	 * @return the {@link Color} matching the RGB value
+	 */
+	public static Color getColor(RGB rgb) {
+		Color color = m_colorMap.get(rgb);
+		if (color == null) {
+			Display display = Display.getCurrent();
+			color = new Color(display, rgb);
+			m_colorMap.put(rgb, color);
+		}
+		return color;
+	}
+	/**
+	 * Dispose of all the cached {@link Color}'s.
+	 */
+	public static void disposeColors() {
+		for (Color color : m_colorMap.values()) {
+			color.dispose();
+		}
+		m_colorMap.clear();
+	}
+	////////////////////////////////////////////////////////////////////////////
+	//
+	// Image
+	//
+	////////////////////////////////////////////////////////////////////////////
+	/**
+	 * Maps image paths to images.
+	 */
+	private static Map<String, Image> m_imageMap = new HashMap<String, Image>();
+	/**
+	 * Returns an {@link Image} encoded by the specified {@link InputStream}.
+	 * 
+	 * @param stream
+	 *            the {@link InputStream} encoding the image data
+	 * @return the {@link Image} encoded by the specified input stream
+	 */
+	protected static Image getImage(InputStream stream) throws IOException {
+		try {
+			Display display = Display.getCurrent();
+			ImageData data = new ImageData(stream);
+			if (data.transparentPixel > 0) {
+				return new Image(display, data, data.getTransparencyMask());
+			}
+			return new Image(display, data);
+		} finally {
+			stream.close();
+		}
+	}
+	/**
+	 * Returns an {@link Image} stored in the file at the specified path.
+	 * 
+	 * @param path
+	 *            the path to the image file
+	 * @return the {@link Image} stored in the file at the specified path
+	 */
+	public static Image getImage(String path) {
+		Image image = m_imageMap.get(path);
+		if (image == null) {
+			try {
+				image = getImage(new FileInputStream(path));
+				m_imageMap.put(path, image);
+			} catch (Exception e) {
+				image = getMissingImage();
+				m_imageMap.put(path, image);
+			}
+		}
+		return image;
+	}
+	/**
+	 * Returns an {@link Image} stored in the file at the specified path relative to the specified class.
+	 * 
+	 * @param clazz
+	 *            the {@link Class} relative to which to find the image
+	 * @param path
+	 *            the path to the image file, if starts with <code>'/'</code>
+	 * @return the {@link Image} stored in the file at the specified path
+	 */
+	public static Image getImage(Class<?> clazz, String path) {
+		String key = clazz.getName() + '|' + path;
+		Image image = m_imageMap.get(key);
+		if (image == null) {
+			try {
+				image = getImage(clazz.getResourceAsStream(path));
+				m_imageMap.put(key, image);
+			} catch (Exception e) {
+				image = getMissingImage();
+				m_imageMap.put(key, image);
+			}
+		}
+		return image;
+	}
+	private static final int MISSING_IMAGE_SIZE = 10;
+	/**
+	 * @return the small {@link Image} that can be used as placeholder for missing image.
+	 */
+	private static Image getMissingImage() {
+		Image image = new Image(Display.getCurrent(), MISSING_IMAGE_SIZE, MISSING_IMAGE_SIZE);
+		//
+		GC gc = new GC(image);
+		gc.setBackground(getColor(SWT.COLOR_RED));
+		gc.fillRectangle(0, 0, MISSING_IMAGE_SIZE, MISSING_IMAGE_SIZE);
+		gc.dispose();
+		//
+		return image;
+	}
+	/**
+	 * Style constant for placing decorator image in top left corner of base image.
+	 */
+	public static final int TOP_LEFT = 1;
+	/**
+	 * Style constant for placing decorator image in top right corner of base image.
+	 */
+	public static final int TOP_RIGHT = 2;
+	/**
+	 * Style constant for placing decorator image in bottom left corner of base image.
+	 */
+	public static final int BOTTOM_LEFT = 3;
+	/**
+	 * Style constant for placing decorator image in bottom right corner of base image.
+	 */
+	public static final int BOTTOM_RIGHT = 4;
+	/**
+	 * Internal value.
+	 */
+	protected static final int LAST_CORNER_KEY = 5;
+	/**
+	 * Maps images to decorated images.
+	 */
+	@SuppressWarnings("unchecked")
+	private static Map<Image, Map<Image, Image>>[] m_decoratedImageMap = new Map[LAST_CORNER_KEY];
+	/**
+	 * Returns an {@link Image} composed of a base image decorated by another image.
+	 * 
+	 * @param baseImage
+	 *            the base {@link Image} that should be decorated
+	 * @param decorator
+	 *            the {@link Image} to decorate the base image
+	 * @return {@link Image} The resulting decorated image
+	 */
+	public static Image decorateImage(Image baseImage, Image decorator) {
+		return decorateImage(baseImage, decorator, BOTTOM_RIGHT);
+	}
+	/**
+	 * Returns an {@link Image} composed of a base image decorated by another image.
+	 * 
+	 * @param baseImage
+	 *            the base {@link Image} that should be decorated
+	 * @param decorator
+	 *            the {@link Image} to decorate the base image
+	 * @param corner
+	 *            the corner to place decorator image
+	 * @return the resulting decorated {@link Image}
+	 */
+	public static Image decorateImage(final Image baseImage, final Image decorator, final int corner) {
+		if (corner <= 0 || corner >= LAST_CORNER_KEY) {
+			throw new IllegalArgumentException("Wrong decorate corner");
+		}
+		Map<Image, Map<Image, Image>> cornerDecoratedImageMap = m_decoratedImageMap[corner];
+		if (cornerDecoratedImageMap == null) {
+			cornerDecoratedImageMap = new HashMap<Image, Map<Image, Image>>();
+			m_decoratedImageMap[corner] = cornerDecoratedImageMap;
+		}
+		Map<Image, Image> decoratedMap = cornerDecoratedImageMap.get(baseImage);
+		if (decoratedMap == null) {
+			decoratedMap = new HashMap<Image, Image>();
+			cornerDecoratedImageMap.put(baseImage, decoratedMap);
+		}
+		//
+		Image result = decoratedMap.get(decorator);
+		if (result == null) {
+			Rectangle bib = baseImage.getBounds();
+			Rectangle dib = decorator.getBounds();
+			//
+			result = new Image(Display.getCurrent(), bib.width, bib.height);
+			//
+			GC gc = new GC(result);
+			gc.drawImage(baseImage, 0, 0);
+			if (corner == TOP_LEFT) {
+				gc.drawImage(decorator, 0, 0);
+			} else if (corner == TOP_RIGHT) {
+				gc.drawImage(decorator, bib.width - dib.width, 0);
+			} else if (corner == BOTTOM_LEFT) {
+				gc.drawImage(decorator, 0, bib.height - dib.height);
+			} else if (corner == BOTTOM_RIGHT) {
+				gc.drawImage(decorator, bib.width - dib.width, bib.height - dib.height);
+			}
+			gc.dispose();
+			//
+			decoratedMap.put(decorator, result);
+		}
+		return result;
+	}
+	/**
+	 * Dispose all of the cached {@link Image}'s.
+	 */
+	public static void disposeImages() {
+		// dispose loaded images
+		{
+			for (Image image : m_imageMap.values()) {
+				image.dispose();
+			}
+			m_imageMap.clear();
+		}
+		// dispose decorated images
+		for (int i = 0; i < m_decoratedImageMap.length; i++) {
+			Map<Image, Map<Image, Image>> cornerDecoratedImageMap = m_decoratedImageMap[i];
+			if (cornerDecoratedImageMap != null) {
+				for (Map<Image, Image> decoratedMap : cornerDecoratedImageMap.values()) {
+					for (Image image : decoratedMap.values()) {
+						image.dispose();
+					}
+					decoratedMap.clear();
+				}
+				cornerDecoratedImageMap.clear();
+			}
+		}
+	}
+	////////////////////////////////////////////////////////////////////////////
+	//
+	// Font
+	//
+	////////////////////////////////////////////////////////////////////////////
+	/**
+	 * Maps font names to fonts.
+	 */
+	private static Map<String, Font> m_fontMap = new HashMap<String, Font>();
+	/**
+	 * Maps fonts to their bold versions.
+	 */
+	private static Map<Font, Font> m_fontToBoldFontMap = new HashMap<Font, Font>();
+	/**
+	 * Returns a {@link Font} based on its name, height and style.
+	 * 
+	 * @param name
+	 *            the name of the font
+	 * @param height
+	 *            the height of the font
+	 * @param style
+	 *            the style of the font
+	 * @return {@link Font} The font matching the name, height and style
+	 */
+	public static Font getFont(String name, int height, int style) {
+		return getFont(name, height, style, false, false);
+	}
+	/**
+	 * Returns a {@link Font} based on its name, height and style. Windows-specific strikeout and underline
+	 * flags are also supported.
+	 * 
+	 * @param name
+	 *            the name of the font
+	 * @param size
+	 *            the size of the font
+	 * @param style
+	 *            the style of the font
+	 * @param strikeout
+	 *            the strikeout flag (warning: Windows only)
+	 * @param underline
+	 *            the underline flag (warning: Windows only)
+	 * @return {@link Font} The font matching the name, height, style, strikeout and underline
+	 */
+	public static Font getFont(String name, int size, int style, boolean strikeout, boolean underline) {
+		String fontName = name + '|' + size + '|' + style + '|' + strikeout + '|' + underline;
+		Font font = m_fontMap.get(fontName);
+		if (font == null) {
+			FontData fontData = new FontData(name, size, style);
+			if (strikeout || underline) {
+				try {
+					Class<?> logFontClass = Class.forName("org.eclipse.swt.internal.win32.LOGFONT"); //$NON-NLS-1$
+					Object logFont = FontData.class.getField("data").get(fontData); //$NON-NLS-1$
+					if (logFont != null && logFontClass != null) {
+						if (strikeout) {
+							logFontClass.getField("lfStrikeOut").set(logFont, Byte.valueOf((byte) 1)); //$NON-NLS-1$
+						}
+						if (underline) {
+							logFontClass.getField("lfUnderline").set(logFont, Byte.valueOf((byte) 1)); //$NON-NLS-1$
+						}
+					}
+				} catch (Throwable e) {
+					System.err.println("Unable to set underline or strikeout" + " (probably on a non-Windows platform). " + e); //$NON-NLS-1$ //$NON-NLS-2$
+				}
+			}
+			font = new Font(Display.getCurrent(), fontData);
+			m_fontMap.put(fontName, font);
+		}
+		return font;
+	}
+	/**
+	 * Returns a bold version of the given {@link Font}.
+	 * 
+	 * @param baseFont
+	 *            the {@link Font} for which a bold version is desired
+	 * @return the bold version of the given {@link Font}
+	 */
+	public static Font getBoldFont(Font baseFont) {
+		Font font = m_fontToBoldFontMap.get(baseFont);
+		if (font == null) {
+			FontData fontDatas[] = baseFont.getFontData();
+			FontData data = fontDatas[0];
+			font = new Font(Display.getCurrent(), data.getName(), data.getHeight(), SWT.BOLD);
+			m_fontToBoldFontMap.put(baseFont, font);
+		}
+		return font;
+	}
+	/**
+	 * Dispose all of the cached {@link Font}'s.
+	 */
+	public static void disposeFonts() {
+		// clear fonts
+		for (Font font : m_fontMap.values()) {
+			font.dispose();
+		}
+		m_fontMap.clear();
+		// clear bold fonts
+		for (Font font : m_fontToBoldFontMap.values()) {
+			font.dispose();
+		}
+		m_fontToBoldFontMap.clear();
+	}
+	////////////////////////////////////////////////////////////////////////////
+	//
+	// Cursor
+	//
+	////////////////////////////////////////////////////////////////////////////
+	/**
+	 * Maps IDs to cursors.
+	 */
+	private static Map<Integer, Cursor> m_idToCursorMap = new HashMap<Integer, Cursor>();
+	/**
+	 * Returns the system cursor matching the specific ID.
+	 * 
+	 * @param id
+	 *            int The ID value for the cursor
+	 * @return Cursor The system cursor matching the specific ID
+	 */
+	public static Cursor getCursor(int id) {
+		Integer key = Integer.valueOf(id);
+		Cursor cursor = m_idToCursorMap.get(key);
+		if (cursor == null) {
+			cursor = new Cursor(Display.getDefault(), id);
+			m_idToCursorMap.put(key, cursor);
+		}
+		return cursor;
+	}
+	/**
+	 * Dispose all of the cached cursors.
+	 */
+	public static void disposeCursors() {
+		for (Cursor cursor : m_idToCursorMap.values()) {
+			cursor.dispose();
+		}
+		m_idToCursorMap.clear();
+	}
+	////////////////////////////////////////////////////////////////////////////
+	//
+	// General
+	//
+	////////////////////////////////////////////////////////////////////////////
+	/**
+	 * Dispose of cached objects and their underlying OS resources. This should only be called when the cached
+	 * objects are no longer needed (e.g. on application shutdown).
+	 */
+	public static void dispose() {
+		disposeColors();
+		disposeImages();
+		disposeFonts();
+		disposeCursors();
+	}
+}
\ No newline at end of file
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/FacadeDefinitionEditorActivator.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/FacadeDefinitionEditorActivator.java
new file mode 100644
index 00000000000..116954f3596
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/FacadeDefinitionEditorActivator.java
@@ -0,0 +1,80 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facadeSpecificEditor;

+

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

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

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

+import org.osgi.framework.BundleContext;

+

+/**

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

+ */

+public class FacadeDefinitionEditorActivator extends AbstractUIPlugin {

+

+	// The plug-in ID

+	public static final String PLUGIN_ID = "org.eclipse.papyrus.FacadeSpecificEditor"; //$NON-NLS-1$

+

+	// The shared instance

+	private static FacadeDefinitionEditorActivator plugin;

+

+	public static LogHelper log;

+

+	/**

+	 * The constructor

+	 */

+	public FacadeDefinitionEditorActivator() {

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * 

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

+	 */

+	public void start(BundleContext context) throws Exception {

+		super.start(context);

+		plugin = this;

+		log = new LogHelper(this);

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * 

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

+	 */

+	public void stop(BundleContext context) throws Exception {

+		plugin = null;

+		super.stop(context);

+	}

+

+	/**

+	 * Returns the shared instance

+	 * 

+	 * @return the shared instance

+	 */

+	public static FacadeDefinitionEditorActivator getDefault() {

+		return plugin;

+	}

+

+	/**

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

+	 * 

+	 * @param path

+	 *        the path

+	 * @return the image descriptor

+	 */

+	public static ImageDescriptor getImageDescriptor(String path) {

+		return imageDescriptorFromPlugin(PLUGIN_ID, path);

+	}

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/FacadeSpecificEditor.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/FacadeSpecificEditor.java
new file mode 100644
index 00000000000..c839948ea50
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/FacadeSpecificEditor.java
@@ -0,0 +1,761 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facadeSpecificEditor;

+

+import java.lang.reflect.InvocationTargetException;

+import java.util.ArrayList;

+import java.util.Arrays;

+import java.util.Collections;

+import java.util.HashSet;

+import java.util.List;

+import java.util.Set;

+

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

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

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

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

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

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

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

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

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

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

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

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

+import org.eclipse.emf.edit.ui.util.EditUIUtil;

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

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

+import org.eclipse.jface.operation.IRunnableWithProgress;

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

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

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

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

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

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

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

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

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

+import org.eclipse.papyrus.facade.Facade;

+import org.eclipse.papyrus.facade.FacadePackage;

+import org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass;

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition;

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinitionKind;

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionFactory;

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage;

+import org.eclipse.papyrus.facade.presentation.FacadeEditor;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelFactory;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

+import org.eclipse.papyrus.facadeSpecificEditor.editingSupport.EditionUtils;

+import org.eclipse.papyrus.facadeSpecificEditor.editingSupport.ExtensionKindColumnEditingSupport;

+import org.eclipse.papyrus.facadeSpecificEditor.editingSupport.IsPossibleColumnEditingSupport;

+import org.eclipse.papyrus.facadeSpecificEditor.editingSupport.MetaclassAliasColumnEditingSupport;

+import org.eclipse.papyrus.facadeSpecificEditor.editingSupport.MetaclassIsAbstractColumnEditingSupport;

+import org.eclipse.papyrus.facadeSpecificEditor.editingSupport.MetaclassToKeepColumnEditingSupport;

+import org.eclipse.papyrus.facadeSpecificEditor.editingSupport.MetaclassUseRepresentedColumnEditingSupport;

+import org.eclipse.papyrus.facadeSpecificEditor.editingSupport.PropertiesAliasColumnEdintingSupport;

+import org.eclipse.papyrus.facadeSpecificEditor.editingSupport.PropertiesMaxColumnEdintingSupport;

+import org.eclipse.papyrus.facadeSpecificEditor.editingSupport.PropertiesMinColumnEdintingSupport;

+import org.eclipse.papyrus.facadeSpecificEditor.editingSupport.PropertiesToKeepColumnEditingSupport;

+import org.eclipse.papyrus.facadeSpecificEditor.editingSupport.StereotypeIncompatibilityColumnEditingSupport;

+import org.eclipse.papyrus.facadeSpecificEditor.metamodel.CreatePreliminaryMetamodelListener;

+import org.eclipse.papyrus.facadeSpecificEditor.metamodel.EcoreGenerator;

+import org.eclipse.papyrus.facadeSpecificEditor.providers.ExtensionDefintionContentProvider;

+import org.eclipse.papyrus.facadeSpecificEditor.providers.ExtensionDefintionLabelProvider;

+import org.eclipse.papyrus.facadeSpecificEditor.providers.IncompatibilitiesContentProvider;

+import org.eclipse.papyrus.facadeSpecificEditor.providers.IncompatibilitiesLabelProvider;

+import org.eclipse.papyrus.facadeSpecificEditor.providers.MetamodelContentProvider;

+import org.eclipse.papyrus.facadeSpecificEditor.providers.MetamodelLabelProvider;

+import org.eclipse.papyrus.facadeSpecificEditor.providers.TypedElementContentProvider;

+import org.eclipse.papyrus.facadeSpecificEditor.providers.TypedElementLabelProvider;

+import org.eclipse.papyrus.facadeSpecificEditor.utils.ProfileUtils;

+import org.eclipse.papyrus.facadeSpecificEditor.utils.StereotypeUtils;

+import org.eclipse.papyrus.facadeSpecificEditor.utils.UMLModelUtils;

+import org.eclipse.papyrus.uml.extensionpoints.profile.RegisteredProfile;

+import org.eclipse.papyrus.uml.extensionpoints.standard.ExtensionLabelProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.custom.SashForm;

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

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

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

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

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

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

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

+import org.eclipse.swt.layout.GridData;

+import org.eclipse.swt.layout.GridLayout;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+

+/**

+ * The Class Facade Definition Editor. It is mostly UI.

+ */

+public class FacadeSpecificEditor extends FacadeEditor {

+

+	/** The facade under edition */

+	protected Facade facade;

+

+	/** The model resource of the facade */

+	protected Resource facadeModelResource;

+

+	/** The initialize button. */

+	protected Button initializeButton;

+

+	/** The profiles that are invloved in the facade. */

+	protected List<Profile> profileModels = new ArrayList<Profile>();

+

+	/** The resource set used to open UML profiles */

+	protected ResourceSet profileResourceSet = new ResourceSetImpl();

+

+

+	/**

+	 * UI elements

+	 */

+	protected Tree metamodelTree;

+

+	protected Tree extensionDefinitionTable;

+

+	protected FilteredTree extensionDefintionFilteredTreeViewer;

+

+	protected static TreeViewer extensionDefintionTreeViewer;

+

+	protected FilteredTree metamodelFilteredTreeViewer;

+

+	protected static TreeViewer metamodelTreeViewer;

+

+	protected TreeViewer propertiesTreeViewer;

+

+	protected Tree propertiesTree;

+

+	protected TableViewer incompatibilitiesTableViewer;

+

+	protected Table incompatibilitiesTable;

+

+	protected TabFolder tabFolder;

+

+	protected Button createMetamodelButton;

+

+	protected Button createEcoreButton;

+

+	protected Button createGlueButton;

+

+	protected Text metamodelName;

+

+	protected Text nsPrefix;

+

+	protected Text nsURI;

+

+

+	/**

+	 * @see org.eclipse.papyrus.facade.presentation.FacadeEditor#createModel()

+	 * 

+	 */

+	public void createModel() {

+

+		URI resourceURI = EditUIUtil.getURI(getEditorInput());

+		Exception exception = null;

+		facadeModelResource = null;

+		try {

+			// Load the resource through the editing domain.

+			facadeModelResource = editingDomain.getResourceSet().getResource(resourceURI, true);

+		} catch (Exception e) {

+			exception = e;

+			facadeModelResource = editingDomain.getResourceSet().getResource(resourceURI, false);

+		}

+

+		Diagnostic diagnostic = analyzeResourceProblems(facadeModelResource, exception);

+		if(diagnostic.getSeverity() != Diagnostic.OK) {

+			resourceToDiagnosticMap.put(facadeModelResource, analyzeResourceProblems(facadeModelResource, exception));

+		}

+		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);

+

+		if(facadeModelResource.getContents().size() > 0) {

+			// Get the root

+			facade = (Facade)facadeModelResource.getContents().get(0);

+

+			if(!facade.getExtensionDefinitions().isEmpty()) {

+				// Shouldn't be required but just in case

+				ProfileUtils.clearSiblings();

+

+				for(ExtensionDefinition stereotypeDefinition : facade.getExtensionDefinitions()) {

+					ProfileUtils.initSiblings(stereotypeDefinition.getStereotype());

+				}

+			}

+		}

+	}

+

+	/**

+	 * Getter for the extensionDefintionTreeViewer widget

+	 * 

+	 * @return the extensionDefintionTreeViewer widget

+	 */

+	public static TreeViewer getExtensionDefintionTreeViewer() {

+		return extensionDefintionTreeViewer;

+	}

+

+	/**

+	 * Getter for the metamodelTreeViewer widget

+	 * 

+	 * @return the metamodelTreeViewer widget

+	 */

+	public static TreeViewer getMetamodelTreeViewer() {

+		return metamodelTreeViewer;

+	}

+

+	/**

+	 * Helper method to clear the facade.

+	 */

+	protected void clearModel() {

+		RemoveCommand commandMetaclasses = new RemoveCommand(editingDomain, facade, FacadePackage.eINSTANCE.getFacade_Virtualmetamodel(), facade.getVirtualmetamodel());

+		editingDomain.getCommandStack().execute(commandMetaclasses);

+

+		RemoveCommand commandStereotype = new RemoveCommand(editingDomain, facade, FacadePackage.eINSTANCE.getFacade_ExtensionDefinitions(), facade.getExtensionDefinitions());

+		editingDomain.getCommandStack().execute(commandStereotype);

+	}

+

+

+	protected class FacadeInitializer extends MouseAdapter {

+

+		/**

+		 * Open profiles to start the definition of the facade.

+		 */

+		protected void openProfile() {

+			RegisteredProfile[] regProfiles = RegisteredProfile.getRegisteredProfiles();

+			ListSelectionDialog dlg = new ListSelectionDialog(Display.getCurrent().getActiveShell(), Arrays.asList(regProfiles), new IStructuredContentProvider() {

+

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

+				}

+

+				public void dispose() {

+				}

+

+				public Object[] getElements(Object inputElement) {

+					if(inputElement instanceof List) {

+						return ((List<?>)inputElement).toArray();

+					}

+					return Collections.emptyList().toArray();

+				}

+			}, new ExtensionLabelProvider(), Messages.FacadeSpecificEditor_1);

+			dlg.setTitle(Messages.FacadeSpecificEditor_2);

+			dlg.open();

+			if(dlg.getResult() != null) {

+

+				for(Object selectedElement : dlg.getResult()) {

+					if(selectedElement instanceof RegisteredProfile) {

+						EObject model = UMLModelUtils.loadModel(((RegisteredProfile)selectedElement).uri, profileResourceSet);

+						if(model instanceof Profile) {

+							TreeIterator<EObject> it = model.eAllContents();

+							boolean failed = false;

+							while(it.hasNext() && !failed) {

+								EObject eObject = (EObject)it.next();

+								if(eObject instanceof PrimitiveType) {

+									Stereotype stereotype = ((PrimitiveType)eObject).getAppliedStereotype("Ecore::EDataType"); //$NON-NLS-1$

+									if(stereotype != null) {

+										Object value = ((PrimitiveType)eObject).getValue(stereotype, "instanceClassName"); //$NON-NLS-1$

+										if(!(value instanceof String)) {

+											failed = true;

+											MessageDialog.openError(getContainer().getShell(), Messages.FacadeSpecificEditor_5, Messages.FacadeSpecificEditor_6 + ((PrimitiveType)eObject).getName() + Messages.FacadeSpecificEditor_7);

+										}

+									}

+								}

+								if(eObject instanceof Extension) {

+									if(((Extension)eObject).isRequired()) {

+										failed = true;

+										MessageDialog.openError(getContainer().getShell(), Messages.FacadeSpecificEditor_8, Messages.FacadeSpecificEditor_9);

+									}

+								}

+							}

+							if(!failed) {

+								profileModels.add((Profile)model);

+							}

+						} else {

+							MessageDialog.openError(getContainer().getShell(), Messages.FacadeSpecificEditor_10, Messages.FacadeSpecificEditor_11);

+						}

+					}

+				}

+			}

+		}

+

+		/**

+		 * @see org.eclipse.swt.events.MouseAdapter#mouseUp(org.eclipse.swt.events.MouseEvent)

+		 * 

+		 * @param e

+		 */

+

+		public void mouseUp(MouseEvent e) {

+

+			profileModels.clear();

+

+			openProfile();

+

+			if(!profileModels.isEmpty()) {

+

+				clearModel();

+				ProfileUtils.clearSiblings();

+

+				VirtualMetamodel virtualMetamodel = VirtualmetamodelFactory.eINSTANCE.createVirtualMetamodel();

+				virtualMetamodel.setName(""); //$NON-NLS-1$

+				virtualMetamodel.setNsPrefix(""); //$NON-NLS-1$

+				virtualMetamodel.setNsURI(""); //$NON-NLS-1$

+

+				SetCommand command = new SetCommand(editingDomain, facade, FacadePackage.eINSTANCE.getFacade_Virtualmetamodel(), virtualMetamodel);

+				editingDomain.getCommandStack().execute(command);

+

+				createExtensionDefinitions();

+

+				extensionDefintionTreeViewer.refresh();

+

+				metamodelTreeViewer.refresh();

+			}

+		}

+	}

+

+	/**

+	 * Creates the extension definitions from the selected UML profiles

+	 */

+	protected void createExtensionDefinitions() {

+		ProgressMonitorDialog dialog = new ProgressMonitorDialog(Display.getCurrent().getActiveShell());

+		try {

+			dialog.run(false, false, new IRunnableWithProgress() {

+

+				public void run(IProgressMonitor monitor) {

+					monitor.beginTask(Messages.FacadeSpecificEditor_15, IProgressMonitor.UNKNOWN);

+

+					// Find all extensions be it in the profile or in another profile

+					Set<Extension> extensions = new HashSet<Extension>();

+

+					for(Profile profile : profileModels) {

+

+						TreeIterator<EObject> iterator = profile.eAllContents();

+						while(iterator.hasNext()) {

+							EObject eObject = (EObject)iterator.next();

+							if(eObject instanceof Stereotype) {

+

+								extensions.addAll(ProfileUtils.findExtensions((Stereotype)eObject));

+

+							}

+						}

+					}

+

+					for(Extension extension : extensions) {

+

+						List<Stereotype> stereotypes = ProfileUtils.findAllSubsInProfile(extension.getStereotype());

+

+						stereotypes.add(extension.getStereotype());

+

+						for(Stereotype stereotype : stereotypes) {

+							ExtensionDefinition extensionDefinition = ExtensiondefinitionFactory.eINSTANCE.createExtensionDefinition();

+							extensionDefinition.setExtension(extension);

+							extensionDefinition.setKind(ExtensionDefinitionKind.ASSOCIATION);

+							extensionDefinition.setStereotype(stereotype);

+

+							AddCommand command = new AddCommand(editingDomain, facade, FacadePackage.eINSTANCE.getFacade_ExtensionDefinitions(), extensionDefinition);

+							editingDomain.getCommandStack().execute(command);

+

+							ProfileUtils.initSiblings(stereotype);

+

+							List<EClass> baseMetaclasses = StereotypeUtils.getAllExtendableMetaclasses(extension, false);

+							for(EClass eClass : baseMetaclasses) {

+

+								BaseMetaclass baseMetaclass = ExtensiondefinitionFactory.eINSTANCE.createBaseMetaclass();

+								baseMetaclass.setBase(eClass);

+								baseMetaclass.setPossible(true);

+

+								AddCommand command2 = new AddCommand(editingDomain, extensionDefinition, ExtensiondefinitionPackage.eINSTANCE.getExtensionDefinition_BaseMetaclasses(), baseMetaclass);

+								editingDomain.getCommandStack().execute(command2);

+							}

+						}

+					}

+

+					EditionUtils.initAllStereotypeCombinations(facade, editingDomain);

+

+					EditionUtils.initIsPossible(facade, editingDomain);

+

+					monitor.done();

+

+				}

+

+			});

+		} catch (InvocationTargetException e) {

+			e.printStackTrace();

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.facade.presentation.FacadeEditor#createPages()

+	 * 

+	 */

+	public void createPages() {

+		// Creates the model from the editor input

+		createModel();

+

+		// Only creates the other pages if there is something that can be edited

+		if(!getEditingDomain().getResourceSet().getResources().isEmpty()) {

+			Composite composite = new Composite(getContainer(), SWT.NONE);

+			composite.setLayout(new GridLayout(1, true));

+

+			initializeButton = new Button(composite, SWT.PUSH);

+			initializeButton.setText(Messages.FacadeSpecificEditor_16);

+			initializeButton.addMouseListener(new FacadeInitializer());

+

+			tabFolder = new TabFolder(composite, SWT.BORDER);

+			GridData layoutData = new GridData(SWT.FILL, SWT.FILL, true, true);

+			tabFolder.setLayoutData(layoutData);

+			tabFolder.setLayout(new GridLayout(1, true));

+

+			TabItem clarifyExtensionsTabItem = new TabItem(tabFolder, SWT.NONE);

+			clarifyExtensionsTabItem.setText(Messages.FacadeSpecificEditor_17);

+

+			createClarifyExtension(tabFolder, clarifyExtensionsTabItem);

+

+			TabItem designMetamodelTabItem = new TabItem(tabFolder, SWT.NONE);

+			designMetamodelTabItem.setText(Messages.FacadeSpecificEditor_18);

+

+			createDesignMetamodel(tabFolder, designMetamodelTabItem);

+

+			TabItem generateMetamodelTabItem = new TabItem(tabFolder, SWT.NONE);

+			generateMetamodelTabItem.setText(Messages.FacadeSpecificEditor_19);

+

+			createGenerateEcore(tabFolder, generateMetamodelTabItem);

+

+			tabFolder.addSelectionListener(new SelectionAdapter() {

+

+				public void widgetSelected(org.eclipse.swt.events.SelectionEvent event) {

+					if(tabFolder.getSelectionIndex() <= 1) {

+						extensionDefintionTreeViewer.refresh();

+						metamodelTreeViewer.refresh();

+					}

+				}

+			});

+

+			addPage(composite);

+			setActivePage(0);

+		}

+

+		// Ensures that this editor will only display the page's tab

+		// area if there are more than one page

+		getContainer().addControlListener(new ControlAdapter() {

+

+			boolean guard = false;

+

+			public void controlResized(ControlEvent event) {

+				if(!guard) {

+					guard = true;

+					hideTabs();

+					guard = false;

+				}

+			}

+		});

+

+		getSite().getShell().getDisplay().asyncExec(new Runnable() {

+

+			public void run() {

+				updateProblemIndication();

+			}

+		});

+	}

+

+	/**

+	 * Creates the tab corresponding to the generation of the actual ECore metamodel

+	 * 

+	 * @param tabFolder

+	 *        the tab folder

+	 * @param generateMetamodelTabItem

+	 *        the generate metamodel tab item

+	 */

+	protected void createGenerateEcore(Composite tabFolder, TabItem generateMetamodelTabItem) {

+		GridData layoutData = new GridData(SWT.FILL, SWT.FILL, true, false);

+		Composite composite = new Composite(tabFolder, SWT.NONE);

+		composite.setLayoutData(layoutData);

+		composite.setLayout(new GridLayout(1, true));

+

+		Label metamodelNameLabel = new Label(composite, SWT.NONE);

+		metamodelNameLabel.setText(Messages.FacadeSpecificEditor_21);

+		metamodelName = new Text(composite, SWT.BORDER);

+		metamodelName.setLayoutData(layoutData);

+		if(facade.getVirtualmetamodel() != null) {

+			if(facade.getVirtualmetamodel().getName() != null) {

+				metamodelName.setText(facade.getVirtualmetamodel().getName());

+			} else {

+				metamodelName.setText(""); //$NON-NLS-1$

+			}

+		}

+		metamodelName.addModifyListener(new ModifyListener() {

+

+			public void modifyText(ModifyEvent e) {

+				SetCommand commandName = new SetCommand(editingDomain, facade.getVirtualmetamodel(), VirtualmetamodelPackage.eINSTANCE.getVirtualMetamodel_Name(), metamodelName.getText());

+				editingDomain.getCommandStack().execute(commandName);

+			}

+		});

+

+		Label nsPrefixLabel = new Label(composite, SWT.NONE);

+		nsPrefixLabel.setText(Messages.FacadeSpecificEditor_23);

+		nsPrefix = new Text(composite, SWT.BORDER);

+		nsPrefix.setLayoutData(layoutData);

+		if(facade.getVirtualmetamodel() != null) {

+			if(facade.getVirtualmetamodel().getNsPrefix() != null) {

+				nsPrefix.setText(facade.getVirtualmetamodel().getNsPrefix());

+			} else {

+				nsPrefix.setText(""); //$NON-NLS-1$

+			}

+		}

+		nsPrefix.addModifyListener(new ModifyListener() {

+

+			public void modifyText(ModifyEvent e) {

+				SetCommand commandName = new SetCommand(editingDomain, facade.getVirtualmetamodel(), VirtualmetamodelPackage.eINSTANCE.getVirtualMetamodel_NsPrefix(), nsPrefix.getText());

+				editingDomain.getCommandStack().execute(commandName);

+

+			}

+		});

+

+		Label nsURILabel = new Label(composite, SWT.NONE);

+		nsURILabel.setText(Messages.FacadeSpecificEditor_25);

+		nsURI = new Text(composite, SWT.BORDER);

+		nsURI.setLayoutData(layoutData);

+		if(facade.getVirtualmetamodel() != null) {

+			if(facade.getVirtualmetamodel().getNsURI() != null) {

+				nsURI.setText(facade.getVirtualmetamodel().getNsURI());

+			} else {

+				nsURI.setText(""); //$NON-NLS-1$

+			}

+		}

+		nsURI.addModifyListener(new ModifyListener() {

+

+			public void modifyText(ModifyEvent e) {

+				SetCommand commandName = new SetCommand(editingDomain, facade.getVirtualmetamodel(), VirtualmetamodelPackage.eINSTANCE.getVirtualMetamodel_NsURI(), nsURI.getText());

+				editingDomain.getCommandStack().execute(commandName);

+

+			}

+		});

+

+		createEcoreButton = new Button(composite, SWT.NONE);

+		createEcoreButton.setText(Messages.FacadeSpecificEditor_27);

+		createEcoreButton.addMouseListener(new EcoreGenerator(facade, editingDomain));

+

+		generateMetamodelTabItem.setControl(composite);

+	}

+

+	/**

+	 * Creates the tab used to define the wanted facade metamodel.

+	 * 

+	 * @param tabFolder

+	 *        the tab folder

+	 * @param designMetamodelTabItem

+	 *        the design metamodel tab item

+	 */

+	protected void createDesignMetamodel(Composite tabFolder, TabItem designMetamodelTabItem) {

+

+		GridData layoutData = new GridData(SWT.FILL, SWT.FILL, true, true);

+		Composite composite = new Composite(tabFolder, SWT.NONE);

+		composite.setLayoutData(layoutData);

+		composite.setLayout(new GridLayout(1, true));

+

+		createMetamodelButton = new Button(composite, SWT.NONE);

+		createMetamodelButton.setText(Messages.FacadeSpecificEditor_28);

+		createMetamodelButton.addMouseListener(new CreatePreliminaryMetamodelListener(facade, editingDomain));

+

+		SashForm sashFormMetamodel = new SashForm(composite, SWT.VERTICAL);

+		layoutData = new GridData(SWT.FILL, SWT.FILL, true, true);

+		sashFormMetamodel.setLayoutData(layoutData);

+		sashFormMetamodel.setLayout(new GridLayout(1, true));

+

+		metamodelFilteredTreeViewer = new FilteredTree(sashFormMetamodel, SWT.BORDER | SWT.FULL_SELECTION, new PatternFilter(), true);

+		metamodelTreeViewer = metamodelFilteredTreeViewer.getViewer();

+		metamodelTreeViewer.getControl().setLayoutData(layoutData);

+		metamodelTree = metamodelTreeViewer.getTree();

+		metamodelTree.setHeaderVisible(true);

+

+		TreeViewerColumn metaclassTreeViewerColumn = new TreeViewerColumn(metamodelTreeViewer, SWT.NONE);

+		TreeColumn metaclassTreeColumn = metaclassTreeViewerColumn.getColumn();

+		metaclassTreeColumn.setWidth(300);

+		metaclassTreeColumn.setText(Messages.FacadeSpecificEditor_29);

+

+		TreeViewerColumn metaclassToKeepTreeViewerColumn = new TreeViewerColumn(metamodelTreeViewer, SWT.NONE);

+		TreeColumn metaclassToKeepTreeColumn = metaclassToKeepTreeViewerColumn.getColumn();

+		metaclassToKeepTreeColumn.setWidth(60);

+		metaclassToKeepTreeColumn.setText(Messages.FacadeSpecificEditor_30);

+		metaclassToKeepTreeViewerColumn.setEditingSupport(new MetaclassToKeepColumnEditingSupport(metamodelTreeViewer, editingDomain, metamodelTree, facade));

+

+		TreeViewerColumn metaclassAliasTreeViewerColumn = new TreeViewerColumn(metamodelTreeViewer, SWT.NONE);

+		TreeColumn metaclassAliasTreeColumn = metaclassAliasTreeViewerColumn.getColumn();

+		metaclassAliasTreeColumn.setWidth(300);

+		metaclassAliasTreeColumn.setText(Messages.FacadeSpecificEditor_31);

+		metaclassAliasTreeViewerColumn.setEditingSupport(new MetaclassAliasColumnEditingSupport(metamodelTreeViewer, editingDomain, metamodelTree));

+

+		TreeViewerColumn metaclassIsAbstractTreeViewerColumn = new TreeViewerColumn(metamodelTreeViewer, SWT.NONE);

+		TreeColumn metaclassIsAbstractTreeColumn = metaclassIsAbstractTreeViewerColumn.getColumn();

+		metaclassIsAbstractTreeColumn.setWidth(100);

+		metaclassIsAbstractTreeColumn.setText(Messages.FacadeSpecificEditor_32);

+		metaclassIsAbstractTreeViewerColumn.setEditingSupport(new MetaclassIsAbstractColumnEditingSupport(metamodelTreeViewer, editingDomain, metamodelTree));

+

+		TreeViewerColumn metaclassUseRepresentedTreeViewerColumn = new TreeViewerColumn(metamodelTreeViewer, SWT.NONE);

+		TreeColumn metaclassUseRepresentedTreeColumn = metaclassUseRepresentedTreeViewerColumn.getColumn();

+		metaclassUseRepresentedTreeColumn.setWidth(100);

+		metaclassUseRepresentedTreeColumn.setText(Messages.FacadeSpecificEditor_0);

+		metaclassUseRepresentedTreeViewerColumn.setEditingSupport(new MetaclassUseRepresentedColumnEditingSupport(metamodelTreeViewer, editingDomain, metamodelTree));

+

+		metamodelTreeViewer.setContentProvider(new MetamodelContentProvider());

+		metamodelTreeViewer.setLabelProvider(new MetamodelLabelProvider());

+		metamodelTreeViewer.setInput(facade);

+

+		metamodelTreeViewer.addSelectionChangedListener(new ISelectionChangedListener() {

+

+			public void selectionChanged(SelectionChangedEvent event) {

+				if(event.getSelection() instanceof IStructuredSelection) {

+					Object first = ((IStructuredSelection)event.getSelection()).getFirstElement();

+					propertiesTreeViewer.setInput(first);

+					propertiesTreeViewer.refresh();

+				}

+

+			}

+		});

+

+		propertiesTreeViewer = new TreeViewer(sashFormMetamodel, SWT.BORDER | SWT.FULL_SELECTION);

+		propertiesTreeViewer.getControl().setLayoutData(layoutData);

+		propertiesTree = propertiesTreeViewer.getTree();

+		propertiesTree.setHeaderVisible(true);

+

+		TreeViewerColumn propertiesTableViewerColumn = new TreeViewerColumn(propertiesTreeViewer, SWT.NONE);

+		TreeColumn propertiesTableColumn = propertiesTableViewerColumn.getColumn();

+		propertiesTableColumn.setWidth(200);

+		propertiesTableColumn.setText(Messages.FacadeSpecificEditor_33);

+

+		TreeViewerColumn propertiesToKeepTableViewerColumn = new TreeViewerColumn(propertiesTreeViewer, SWT.NONE);

+		TreeColumn propertiesToKeepTableColumn = propertiesToKeepTableViewerColumn.getColumn();

+		propertiesToKeepTableColumn.setWidth(60);

+		propertiesToKeepTableColumn.setText(Messages.FacadeSpecificEditor_34);

+		propertiesToKeepTableViewerColumn.setEditingSupport(new PropertiesToKeepColumnEditingSupport(propertiesTreeViewer, editingDomain, propertiesTree));

+

+		TreeViewerColumn propertiesAliasTableViewerColumn = new TreeViewerColumn(propertiesTreeViewer, SWT.NONE);

+		TreeColumn propertiesAliasTreeColumn = propertiesAliasTableViewerColumn.getColumn();

+		propertiesAliasTreeColumn.setWidth(200);

+		propertiesAliasTreeColumn.setText(Messages.FacadeSpecificEditor_35);

+		propertiesAliasTableViewerColumn.setEditingSupport(new PropertiesAliasColumnEdintingSupport(propertiesTreeViewer, editingDomain, propertiesTree));

+

+		TreeViewerColumn propertiesMinTableViewerColumn = new TreeViewerColumn(propertiesTreeViewer, SWT.NONE);

+		TreeColumn propertiesMinTreeColumn = propertiesMinTableViewerColumn.getColumn();

+		propertiesMinTreeColumn.setWidth(50);

+		propertiesMinTreeColumn.setText(Messages.FacadeSpecificEditor_36);

+		propertiesMinTableViewerColumn.setEditingSupport(new PropertiesMinColumnEdintingSupport(propertiesTreeViewer, editingDomain, propertiesTree));

+

+		TreeViewerColumn propertiesMaxTableViewerColumn = new TreeViewerColumn(propertiesTreeViewer, SWT.NONE);

+		TreeColumn propertiesMaxTreeColumn = propertiesMaxTableViewerColumn.getColumn();

+		propertiesMaxTreeColumn.setWidth(50);

+		propertiesMaxTreeColumn.setText(Messages.FacadeSpecificEditor_37);

+		propertiesMaxTableViewerColumn.setEditingSupport(new PropertiesMaxColumnEdintingSupport(propertiesTreeViewer, editingDomain, propertiesTree));

+

+		propertiesTreeViewer.setContentProvider(new TypedElementContentProvider());

+		propertiesTreeViewer.setLabelProvider(new TypedElementLabelProvider());

+

+		designMetamodelTabItem.setControl(composite);

+

+	}

+

+	/**

+	 * Creates the tab used to clarify extensions identified in the UML profiles

+	 * 

+	 * @param tabFolder

+	 *        the tab folder

+	 * @param clarifyExtensionsTabItem

+	 *        the clarify extensions tab item

+	 */

+	protected void createClarifyExtension(Composite tabFolder, TabItem clarifyExtensionsTabItem) {

+		GridData layoutData = new GridData(SWT.FILL, SWT.FILL, true, true);

+

+		final SashForm sashForm = new SashForm(tabFolder, SWT.HORIZONTAL);

+		layoutData = new GridData(SWT.FILL, SWT.FILL, true, true);

+		sashForm.setLayoutData(layoutData);

+		sashForm.setLayout(new GridLayout(1, true));

+

+		extensionDefintionFilteredTreeViewer = new FilteredTree(sashForm, SWT.BORDER | SWT.FULL_SELECTION, new PatternFilter(), true);

+		extensionDefintionTreeViewer = extensionDefintionFilteredTreeViewer.getViewer();

+		extensionDefintionTreeViewer.getControl().setLayoutData(layoutData);

+		extensionDefinitionTable = extensionDefintionTreeViewer.getTree();

+		extensionDefinitionTable.setHeaderVisible(true);

+

+		TreeViewerColumn extensionDefinitionTableViewerColumn = new TreeViewerColumn(extensionDefintionTreeViewer, SWT.NONE);

+		TreeColumn extensionDefinitionTableColumn = extensionDefinitionTableViewerColumn.getColumn();

+		extensionDefinitionTableColumn.setWidth(300);

+		extensionDefinitionTableColumn.setText(Messages.FacadeSpecificEditor_38);

+

+		TreeViewerColumn extensionKindTableViewerColumn = new TreeViewerColumn(extensionDefintionTreeViewer, SWT.NONE);

+		TreeColumn extensionKindTableColumn = extensionKindTableViewerColumn.getColumn();

+		extensionKindTableColumn.setWidth(150);

+		extensionKindTableColumn.setText(Messages.FacadeSpecificEditor_39);

+		extensionKindTableViewerColumn.setEditingSupport(new ExtensionKindColumnEditingSupport(extensionDefintionTreeViewer, editingDomain, extensionDefinitionTable));

+

+		TreeViewerColumn isPossibleTableViewerColumn = new TreeViewerColumn(extensionDefintionTreeViewer, SWT.NONE);

+		TreeColumn isPossibleTableColumn = isPossibleTableViewerColumn.getColumn();

+		isPossibleTableColumn.setWidth(200);

+		isPossibleTableColumn.setText(Messages.FacadeSpecificEditor_40);

+		isPossibleTableViewerColumn.setEditingSupport(new IsPossibleColumnEditingSupport(extensionDefintionTreeViewer, editingDomain, extensionDefinitionTable));

+

+		extensionDefintionTreeViewer.setContentProvider(new ExtensionDefintionContentProvider());

+		extensionDefintionTreeViewer.setLabelProvider(new ExtensionDefintionLabelProvider());

+		extensionDefintionTreeViewer.setInput(facade);

+

+		extensionDefintionTreeViewer.addSelectionChangedListener(new ISelectionChangedListener() {

+

+			public void selectionChanged(SelectionChangedEvent event) {

+				if(event.getSelection() instanceof IStructuredSelection) {

+					Object first = ((IStructuredSelection)event.getSelection()).getFirstElement();

+					incompatibilitiesTableViewer.setInput(first);

+					incompatibilitiesTableViewer.refresh();

+				}

+

+			}

+		});

+

+		incompatibilitiesTableViewer = new TableViewer(sashForm, SWT.BORDER | SWT.FULL_SELECTION);

+		incompatibilitiesTableViewer.getControl().setLayoutData(layoutData);

+		incompatibilitiesTable = incompatibilitiesTableViewer.getTable();

+		incompatibilitiesTable.setHeaderVisible(true);

+

+		TableViewerColumn stereoTableViewerColumn = new TableViewerColumn(incompatibilitiesTableViewer, SWT.NONE);

+		TableColumn stereoTableColumn = stereoTableViewerColumn.getColumn();

+		stereoTableColumn.setWidth(300);

+		stereoTableColumn.setText(Messages.FacadeSpecificEditor_41);

+

+		TableViewerColumn stereoIncompatibilityTableViewerColumn = new TableViewerColumn(incompatibilitiesTableViewer, SWT.NONE);

+		TableColumn stereoIncompatibilityTableColumn = stereoIncompatibilityTableViewerColumn.getColumn();

+		stereoIncompatibilityTableColumn.setWidth(150);

+		stereoIncompatibilityTableColumn.setText(Messages.FacadeSpecificEditor_42);

+		stereoIncompatibilityTableViewerColumn.setEditingSupport(new StereotypeIncompatibilityColumnEditingSupport(incompatibilitiesTableViewer, editingDomain, incompatibilitiesTable));

+

+		incompatibilitiesTableViewer.setContentProvider(new IncompatibilitiesContentProvider());

+		incompatibilitiesTableViewer.setLabelProvider(new IncompatibilitiesLabelProvider());

+

+		clarifyExtensionsTabItem.setControl(sashForm);

+

+	}

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/Messages.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/Messages.java
new file mode 100644
index 00000000000..5547489cab5
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/Messages.java
@@ -0,0 +1,258 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facadeSpecificEditor;

+

+import org.eclipse.osgi.util.NLS;

+

+public class Messages extends NLS {

+

+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.facadeSpecificEditor.messages"; //$NON-NLS-1$

+

+	public static String EcoreGenerator_10;

+

+	public static String EcoreGenerator_11;

+

+	public static String EcoreGenerator_12;

+

+	public static String EcoreGenerator_13;

+

+	public static String EcoreGenerator_14;

+

+	public static String EcoreGenerator_15;

+

+	public static String EcoreGenerator_16;

+

+	public static String EcoreGenerator_17;

+

+	public static String EcoreGenerator_18;

+

+	public static String EcoreGenerator_19;

+

+	public static String EcoreGenerator_20;

+

+	public static String EcoreGenerator_21;

+

+	public static String EcoreGenerator_22;

+

+	public static String EcoreGenerator_23;

+

+	public static String EcoreGenerator_24;

+

+	public static String EcoreGenerator_25;

+

+	public static String EcoreGenerator_26;

+

+	public static String EcoreGenerator_27;

+

+	public static String EcoreGenerator_3;

+

+	public static String EcoreGenerator_30;

+

+	public static String EcoreGenerator_31;

+

+	public static String EcoreGenerator_35;

+

+	public static String EcoreGenerator_36;

+

+	public static String EcoreGenerator_37;

+

+	public static String EcoreGenerator_4;

+

+	public static String EcoreGenerator_40;

+

+	public static String EcoreGenerator_41;

+

+	public static String EcoreGenerator_42;

+

+	public static String EcoreGenerator_43;

+

+	public static String EcoreGenerator_44;

+

+	public static String EcoreGenerator_45;

+

+	public static String EcoreGenerator_5;

+

+	public static String EcoreGenerator_6;

+

+	public static String EcoreGenerator_9;

+

+	public static String ExtensionDefintionLabelProvider_13;

+

+	public static String ExtensionKindColumnEditingSupport_0;

+

+	public static String ExtensionKindColumnEditingSupport_1;

+

+	public static String ExtensionKindColumnEditingSupport_2;

+

+	public static String ExtensionKindColumnEditingSupport_3;

+

+	public static String ExtensionKindColumnEditingSupport_4;

+

+	public static String ExtensionKindColumnEditingSupport_5;

+

+	public static String ExtensionKindColumnEditingSupport_6;

+

+	public static String ExtensionKindColumnEditingSupport_7;

+

+	public static String ExtensionKindColumnEditingSupport_8;

+

+	public static String FacadeSpecificEditor_0;

+

+	public static String FacadeSpecificEditor_1;

+

+	public static String FacadeSpecificEditor_10;

+

+	public static String FacadeSpecificEditor_11;

+

+	public static String FacadeSpecificEditor_15;

+

+	public static String FacadeSpecificEditor_16;

+

+	public static String FacadeSpecificEditor_17;

+

+	public static String FacadeSpecificEditor_18;

+

+	public static String FacadeSpecificEditor_19;

+

+	public static String FacadeSpecificEditor_2;

+

+	public static String FacadeSpecificEditor_21;

+

+	public static String FacadeSpecificEditor_23;

+

+	public static String FacadeSpecificEditor_25;

+

+	public static String FacadeSpecificEditor_27;

+

+	public static String FacadeSpecificEditor_28;

+

+	public static String FacadeSpecificEditor_29;

+

+	public static String FacadeSpecificEditor_30;

+

+	public static String FacadeSpecificEditor_31;

+

+	public static String FacadeSpecificEditor_32;

+

+	public static String FacadeSpecificEditor_33;

+

+	public static String FacadeSpecificEditor_34;

+

+	public static String FacadeSpecificEditor_35;

+

+	public static String FacadeSpecificEditor_36;

+

+	public static String FacadeSpecificEditor_37;

+

+	public static String FacadeSpecificEditor_38;

+

+	public static String FacadeSpecificEditor_39;

+

+	public static String FacadeSpecificEditor_40;

+

+	public static String FacadeSpecificEditor_41;

+

+	public static String FacadeSpecificEditor_42;

+

+	public static String FacadeSpecificEditor_5;

+

+	public static String FacadeSpecificEditor_6;

+

+	public static String FacadeSpecificEditor_7;

+

+	public static String FacadeSpecificEditor_8;

+

+	public static String FacadeSpecificEditor_9;

+

+	public static String IsPossibleColumnEditingSupport_0;

+

+	public static String IsPossibleColumnEditingSupport_1;

+

+	public static String IsPossibleColumnEditingSupport_2;

+

+	public static String MetamodelLabelProvider_8;

+

+	public static String MetamodelUtils_0;

+

+	public static String MetamodelUtils_1;

+

+	public static String MetamodelUtils_10;

+

+	public static String MetamodelUtils_11;

+

+	public static String MetamodelUtils_12;

+

+	public static String MetamodelUtils_13;

+

+	public static String MetamodelUtils_2;

+

+	public static String MetamodelUtils_3;

+

+	public static String MetamodelUtils_4;

+

+	public static String MetamodelUtils_5;

+

+	public static String MetamodelUtils_6;

+

+	public static String MetamodelUtils_7;

+

+	public static String MetamodelUtils_8;

+

+	public static String MetamodelUtils_9;

+

+	public static String PropertiesMaxColumnEdintingSupport_0;

+

+	public static String PropertiesMaxColumnEdintingSupport_1;

+

+	public static String PropertiesMaxColumnEdintingSupport_2;

+

+	public static String PropertiesMaxColumnEdintingSupport_3;

+

+	public static String PropertiesMaxColumnEdintingSupport_4;

+

+	public static String PropertiesMaxColumnEdintingSupport_5;

+

+	public static String PropertiesMinColumnEdintingSupport_0;

+

+	public static String PropertiesMinColumnEdintingSupport_1;

+

+	public static String PropertiesMinColumnEdintingSupport_2;

+

+	public static String PropertiesMinColumnEdintingSupport_3;

+

+	public static String PropertiesMinColumnEdintingSupport_4;

+

+	public static String PropertiesMinColumnEdintingSupport_5;

+

+	public static String PropertiesToKeepColumnEditingSupport_0;

+

+	public static String PropertiesToKeepColumnEditingSupport_1;

+

+	public static String PropertiesToKeepColumnEditingSupport_2;

+

+	public static String PropertiesToKeepColumnEditingSupport_3;

+

+	public static String StereotypeIncompatibilityColumnEditingSupport_0;

+

+	public static String StereotypeIncompatibilityColumnEditingSupport_1;

+

+	public static String StereotypeIncompatibilityColumnEditingSupport_2;

+	static {

+		// initialize resource bundle

+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);

+	}

+

+	private Messages() {

+	}

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/EditionUtils.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/EditionUtils.java
new file mode 100644
index 00000000000..c25fc8a125a
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/EditionUtils.java
@@ -0,0 +1,192 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facadeSpecificEditor.editingSupport;

+

+import java.util.ArrayList;

+import java.util.List;

+

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

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

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

+import org.eclipse.papyrus.facade.Facade;

+import org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass;

+import org.eclipse.papyrus.facade.extensiondefinition.Combination;

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition;

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinitionKind;

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage;

+import org.eclipse.papyrus.facadeSpecificEditor.utils.ProfileUtils;

+

+public class EditionUtils {

+

+	/**

+	 * Check is a combination of stereotypes appears in a list (independently from the order of the combination)

+	 * 

+	 * @param list

+	 *        the list to search in

+	 * @param combinaison

+	 *        the combination to find

+	 * @return

+	 */

+	public static boolean containsCombination(List<Combination> list, Combination combinaison) {

+		for(Combination item : list) {

+			if(item.getMembers().size() == combinaison.getMembers().size()) {

+				if(item.getMembers().containsAll(combinaison.getMembers())) {

+					return true;

+				}

+			}

+		}

+

+		return false;

+

+	}

+

+	/**

+	 * Find a combination of stereotypes appears in a list of combination (independently from the order of the combination)

+	 * 

+	 * @param list

+	 *        the list to search in

+	 * @param combinaison

+	 *        the combination to find

+	 * @return

+	 */

+	public static Combination getCombinationThatMatch(List<Combination> list, Combination combinaison) {

+		for(Combination item : list) {

+			if(item.getMembers().size() == combinaison.getMembers().size()) {

+				if(item.getMembers().containsAll(combinaison.getMembers())) {

+					return item;

+				}

+			}

+		}

+

+		return null;

+

+	}

+

+	/**

+	 * Generate the stereotype combinations for the facade

+	 * 

+	 * @param facade

+	 *        the facade to generate the combinations for

+	 * @param editingDomain

+	 */

+	public static void initAllStereotypeCombinations(Facade facade, AdapterFactoryEditingDomain editingDomain) {

+

+		for(ExtensionDefinition extensionDefinition : facade.getExtensionDefinitions()) {

+			for(BaseMetaclass baseMeta : extensionDefinition.getBaseMetaclasses()) {

+

+				List<Combination> possibleCombinations = ProfileUtils.getPossibleCombinations(baseMeta);

+

+				List<Combination> toAdd = new ArrayList<Combination>();

+

+				for(Combination combinaison : possibleCombinations) {

+

+					if(!containsCombination(baseMeta.getIncompatibleStereotypes(), combinaison)) {

+						if(!containsCombination(baseMeta.getCompatibleStereotypes(), combinaison)) {

+							toAdd.add(combinaison);

+						}

+					}

+				}

+

+				for(Combination combination : toAdd) {

+

+					AddCommand addIncompatibilitiesCommand = new AddCommand(editingDomain, baseMeta, ExtensiondefinitionPackage.eINSTANCE.getBaseMetaclass_IncompatibleStereotypes(), combination);

+					editingDomain.getCommandStack().execute(addIncompatibilitiesCommand);

+				}

+			}

+		}

+	}

+

+	/**

+	 * Remove the stereotype combinations from the facade

+	 * 

+	 * @param facade

+	 * @param editingDomain

+	 */

+	public static void clearAllStereotypeCombinations(Facade facade, AdapterFactoryEditingDomain editingDomain) {

+		for(ExtensionDefinition extensionDefinition : facade.getExtensionDefinitions()) {

+			for(BaseMetaclass baseMeta : extensionDefinition.getBaseMetaclasses()) {

+

+				List<Combination> possibleCombinations = ProfileUtils.getPossibleCombinations(baseMeta);

+

+				List<Combination> incompatibilitiesToRemove = new ArrayList<Combination>();

+

+				for(Combination incompatibleBase : baseMeta.getIncompatibleStereotypes()) {

+					if(!containsCombination(possibleCombinations, incompatibleBase)) {

+						incompatibilitiesToRemove.add(incompatibleBase);

+					}

+

+				}

+				RemoveCommand removeIncompatibilityCommand = new RemoveCommand(editingDomain, baseMeta, ExtensiondefinitionPackage.eINSTANCE.getBaseMetaclass_IncompatibleStereotypes(), incompatibilitiesToRemove); //$NON-NLS-1$

+				editingDomain.getCommandStack().execute(removeIncompatibilityCommand);

+

+				List<Combination> compatibilitiesToRemove = new ArrayList<Combination>();

+

+				for(Combination compatibleBase : baseMeta.getCompatibleStereotypes()) {

+					if(!containsCombination(possibleCombinations, compatibleBase)) {

+						compatibilitiesToRemove.add(compatibleBase);

+					}

+				}

+				RemoveCommand removeCompatibilityCommand = new RemoveCommand(editingDomain, baseMeta, ExtensiondefinitionPackage.eINSTANCE.getBaseMetaclass_CompatibleStereotypes(), compatibilitiesToRemove); //$NON-NLS-1$

+				editingDomain.getCommandStack().execute(removeCompatibilityCommand);

+

+			}

+		}

+	}

+

+	/**

+	 * Check whether the baseMetaclass has a combination that is required

+	 * 

+	 * @param baseMeta

+	 * @return

+	 */

+	public static boolean hasARequiredCombination(BaseMetaclass baseMeta) {

+

+		List<Combination> combinaisonsToCheck = new ArrayList<Combination>();

+

+		combinaisonsToCheck.addAll(baseMeta.getCompatibleStereotypes());

+		combinaisonsToCheck.addAll(baseMeta.getIncompatibleStereotypes());

+

+		for(Combination combination : combinaisonsToCheck) {

+			for(BaseMetaclass metaclass : combination.getMembers()) {

+				if(metaclass.getExtensionDefinition().getKind() == ExtensionDefinitionKind.MULTI_GENERALIZATION) {

+					if(metaclass.getExtensionDefinition().getExtension().isRequired()) {

+						return true;

+					}

+				}

+			}

+		}

+		return false;

+

+	}

+

+	/**

+	 * Initialize the isPossible of all the extension definitions of a Facade

+	 * 

+	 * @param facade

+	 * @param editingDomain

+	 */

+	public static void initIsPossible(Facade facade, AdapterFactoryEditingDomain editingDomain) {

+		for(ExtensionDefinition extensionDefinition : facade.getExtensionDefinitions()) {

+			for(BaseMetaclass baseMeta : extensionDefinition.getBaseMetaclasses()) {

+				// If it has a combination that contains a required

+				if(hasARequiredCombination(baseMeta)) {

+					baseMeta.setPossible(false);

+				} else {

+					baseMeta.setPossible(true);

+				}

+			}

+		}

+

+	}

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/ExtensionKindColumnEditingSupport.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/ExtensionKindColumnEditingSupport.java
new file mode 100644
index 00000000000..32eee41119c
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/ExtensionKindColumnEditingSupport.java
@@ -0,0 +1,316 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facadeSpecificEditor.editingSupport;

+

+import java.lang.reflect.InvocationTargetException;

+import java.util.HashSet;

+

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

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

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

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

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

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

+import org.eclipse.jface.operation.IRunnableWithProgress;

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

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

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

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

+import org.eclipse.papyrus.facade.Facade;

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition;

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinitionKind;

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage;

+import org.eclipse.papyrus.facadeSpecificEditor.Messages;

+import org.eclipse.papyrus.facadeSpecificEditor.utils.ProfileUtils;

+import org.eclipse.swt.SWT;

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

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

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

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

+

+public class ExtensionKindColumnEditingSupport extends EditingSupport {

+

+	protected AdapterFactoryEditingDomain editingDomain;

+

+	protected Composite parent;

+

+	public ExtensionKindColumnEditingSupport(ColumnViewer viewer, AdapterFactoryEditingDomain editingDomain, Composite parent) {

+		super(viewer);

+		this.editingDomain = editingDomain;

+		this.parent = parent;

+	}

+

+	/**

+	 * Change the interpretation to give to an extension to ExtensionDefinitionKind.ASSOCIATION

+	 * 

+	 * @param element

+	 */

+	protected void transformIntoAssociation(ExtensionDefinition element) {

+		SetCommand command = new SetCommand(editingDomain, element, ExtensiondefinitionPackage.eINSTANCE.getExtensionDefinition_Kind(), ExtensionDefinitionKind.ASSOCIATION); //$NON-NLS-1$

+		editingDomain.getCommandStack().execute(command);

+

+	}

+

+	/**

+	 * Change the interpretation to give to an extension to ExtensionDefinitionKind.GENERALIZATION

+	 * 

+	 * @param element

+	 */

+	protected void transformIntoGeneralization(ExtensionDefinition element) {

+

+		SetCommand command = new SetCommand(editingDomain, element, ExtensiondefinitionPackage.eINSTANCE.getExtensionDefinition_Kind(), ExtensionDefinitionKind.GENERALIZATION); //$NON-NLS-1$

+		editingDomain.getCommandStack().execute(command);

+

+	}

+

+	/**

+	 * Change the interpretation to give to an extension to ExtensionDefinitionKind.MULTI_GENERALIZATION

+	 * 

+	 * @param element

+	 */

+	protected void transformIntoMultiGeneralization(ExtensionDefinition element) {

+

+		SetCommand command = new SetCommand(editingDomain, element, ExtensiondefinitionPackage.eINSTANCE.getExtensionDefinition_Kind(), ExtensionDefinitionKind.MULTI_GENERALIZATION); //$NON-NLS-1$

+		editingDomain.getCommandStack().execute(command);

+

+	}

+

+	/**

+	 * Change the interpretation to give to an extension to ExtensionDefinitionKind.FUSION

+	 * 

+	 * @param element

+	 */

+	protected void transformIntoFusion(ExtensionDefinition element) {

+

+		SetCommand command = new SetCommand(editingDomain, element, ExtensiondefinitionPackage.eINSTANCE.getExtensionDefinition_Kind(), ExtensionDefinitionKind.FUSION); //$NON-NLS-1$

+		editingDomain.getCommandStack().execute(command);

+

+	}

+

+	/**

+	 * Check if the stereotype involved in the extensionDefinition is also used to type the property of a stereotype elsewhere

+	 * 

+	 * @param extensionDefinition

+	 * @return

+	 */

+	protected boolean stereotypeUsedElsewhere(ExtensionDefinition extensionDefinition) {

+		EList<ExtensionDefinition> allExtensionDefintion = extensionDefinition.getFacade().getExtensionDefinitions();

+

+		for(ExtensionDefinition otherExtensionDefinition : allExtensionDefintion) {

+			if(otherExtensionDefinition != extensionDefinition) {

+				for(Property property : otherExtensionDefinition.getStereotype().getAttributes()) {

+					if(property.getType() == extensionDefinition.getStereotype()) {

+						return true;

+					}

+				}

+			}

+		}

+

+		return false;

+	}

+

+	/**

+	 * Check if the stereotype involved in the extensionDefinition is also involved in another extensionDefinition

+	 * 

+	 * @param extensionDefinition

+	 * @return

+	 */

+	protected boolean hasOtherExtension(ExtensionDefinition extensionDefinition) {

+		EList<ExtensionDefinition> allExtensionDefintion = extensionDefinition.getFacade().getExtensionDefinitions();

+

+		for(ExtensionDefinition otherExtensionDefinition : allExtensionDefintion) {

+			if(otherExtensionDefinition != extensionDefinition) {

+				if(extensionDefinition.getStereotype() == otherExtensionDefinition.getStereotype()) {

+					return true;

+				}

+			}

+		}

+

+		return false;

+	}

+

+	/**

+	 * @see org.eclipse.jface.viewers.EditingSupport#setValue(java.lang.Object, java.lang.Object)

+	 * 

+	 * @param element

+	 * @param value

+	 */

+	@Override

+	protected void setValue(final Object element, final Object value) {

+		final ExtensionDefinitionKind newValue = ExtensionDefinitionKind.get((Integer)value);

+

+		if(element instanceof ExtensionDefinition) {

+

+			ProgressMonitorDialog dialog = new ProgressMonitorDialog(Display.getCurrent().getActiveShell());

+			try {

+				dialog.run(false, false, new IRunnableWithProgress() {

+

+					public void run(IProgressMonitor monitor) {

+						monitor.beginTask(Messages.ExtensionKindColumnEditingSupport_0, IProgressMonitor.UNKNOWN);

+

+						Facade facade = ((ExtensionDefinition)element).getFacade();

+

+						if(newValue == ExtensionDefinitionKind.ASSOCIATION) {

+

+							transformIntoAssociation((ExtensionDefinition)element);

+

+							// All children and generals must be set to Association as well

+							HashSet<Stereotype> siblings = ProfileUtils.getSiblings(((ExtensionDefinition)element).getStereotype());

+

+							for(ExtensionDefinition extensionDefinition : facade.getExtensionDefinitions()) {

+

+								if(extensionDefinition.getExtension() == ((ExtensionDefinition)element).getExtension()) {

+									if(siblings.contains(extensionDefinition.getStereotype())) {

+

+										transformIntoAssociation(extensionDefinition);

+									}

+								}

+							}

+

+						} else if(newValue == ExtensionDefinitionKind.GENERALIZATION) {

+

+							if(((ExtensionDefinition)element).getExtension().getMetaclass().isAbstract()) {

+

+								MessageDialog.openInformation(Display.getCurrent().getActiveShell(), Messages.ExtensionKindColumnEditingSupport_1, Messages.ExtensionKindColumnEditingSupport_2);

+

+							} else {

+								if(((ExtensionDefinition)element).getExtension().isRequired()) {

+									MessageDialog.openInformation(Display.getCurrent().getActiveShell(), Messages.ExtensionKindColumnEditingSupport_3, Messages.ExtensionKindColumnEditingSupport_4);

+								} else {

+

+									transformIntoGeneralization((ExtensionDefinition)element);

+									// All children and generals must be set to generalization as well

+									HashSet<Stereotype> siblings = ProfileUtils.getSiblings(((ExtensionDefinition)element).getStereotype());

+

+									for(ExtensionDefinition extensionDefinition : facade.getExtensionDefinitions()) {

+										if(extensionDefinition.getExtension() == ((ExtensionDefinition)element).getExtension()) {

+											if(siblings.contains(extensionDefinition.getStereotype())) {

+												transformIntoGeneralization(extensionDefinition);

+											}

+										}

+									}

+								}

+							}

+

+						} else if(newValue == ExtensionDefinitionKind.MULTI_GENERALIZATION) {

+

+							if(hasOtherExtension((ExtensionDefinition)element) && stereotypeUsedElsewhere((ExtensionDefinition)element)) {

+								MessageDialog.openInformation(Display.getCurrent().getActiveShell(), Messages.ExtensionKindColumnEditingSupport_5, Messages.ExtensionKindColumnEditingSupport_6);

+							} else {

+								transformIntoMultiGeneralization((ExtensionDefinition)element);

+								// All children and generals must be set to generalization as well

+								HashSet<Stereotype> siblings = ProfileUtils.getSiblings(((ExtensionDefinition)element).getStereotype());

+

+								for(ExtensionDefinition extensionDefinition : facade.getExtensionDefinitions()) {

+									if(extensionDefinition.getExtension() == ((ExtensionDefinition)element).getExtension()) {

+										if(siblings.contains(extensionDefinition.getStereotype())) {

+											transformIntoMultiGeneralization(extensionDefinition);

+										}

+									}

+								}

+							}

+

+						} else if(newValue == ExtensionDefinitionKind.FUSION) {

+							if(hasOtherExtension((ExtensionDefinition)element) && stereotypeUsedElsewhere((ExtensionDefinition)element)) {

+								MessageDialog.openInformation(Display.getCurrent().getActiveShell(), Messages.ExtensionKindColumnEditingSupport_7, Messages.ExtensionKindColumnEditingSupport_8);

+							} else {

+								transformIntoFusion((ExtensionDefinition)element);

+

+								// All children and generals must be set to generalization as well

+								HashSet<Stereotype> siblings = ProfileUtils.getSiblings(((ExtensionDefinition)element).getStereotype());

+

+								for(ExtensionDefinition extensionDefinition : facade.getExtensionDefinitions()) {

+									if(extensionDefinition.getExtension() == ((ExtensionDefinition)element).getExtension()) {

+										if(siblings.contains(extensionDefinition.getStereotype())) {

+											transformIntoFusion(extensionDefinition);

+										}

+									}

+								}

+							}

+						}

+

+						// Clear incompatibilities that don't exist anymore

+						EditionUtils.clearAllStereotypeCombinations(facade, editingDomain);

+						// Init new incompatibilities

+						EditionUtils.initAllStereotypeCombinations(facade, editingDomain);

+						// Update isPossible

+						EditionUtils.initIsPossible(facade, editingDomain);

+

+						monitor.done();

+

+					}

+

+				});

+			} catch (InvocationTargetException e) {

+				e.printStackTrace();

+			} catch (InterruptedException e) {

+				e.printStackTrace();

+			}

+

+			getViewer().refresh();

+		}

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.EditingSupport#getValue(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+	@Override

+	protected Object getValue(Object element) {

+		if(element instanceof ExtensionDefinition) {

+			int value = ((ExtensionDefinition)element).getKind().getValue();

+			return value;

+

+		}

+		return null;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.EditingSupport#getCellEditor(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+	@Override

+	protected CellEditor getCellEditor(Object element) {

+

+		if(element instanceof ExtensionDefinition) {

+

+			String[] itemsArray = { ExtensionDefinitionKind.ASSOCIATION.getName(), ExtensionDefinitionKind.GENERALIZATION.getName(), ExtensionDefinitionKind.MULTI_GENERALIZATION.getName() };

+

+			ComboBoxCellEditor combo = new ComboBoxCellEditor(parent, itemsArray, SWT.READ_ONLY);

+

+			return combo;

+		}

+

+		return null;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.EditingSupport#canEdit(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+	@Override

+	protected boolean canEdit(Object element) {

+		return true;

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/IsPossibleColumnEditingSupport.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/IsPossibleColumnEditingSupport.java
new file mode 100644
index 00000000000..4cfe72a3dba
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/IsPossibleColumnEditingSupport.java
@@ -0,0 +1,218 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facadeSpecificEditor.editingSupport;

+

+import java.lang.reflect.InvocationTargetException;

+import java.util.HashSet;

+

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

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

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

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

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

+import org.eclipse.jface.operation.IRunnableWithProgress;

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

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

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

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

+import org.eclipse.papyrus.facade.Facade;

+import org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass;

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition;

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage;

+import org.eclipse.papyrus.facadeSpecificEditor.Messages;

+import org.eclipse.papyrus.facadeSpecificEditor.utils.ProfileUtils;

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

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

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

+

+public class IsPossibleColumnEditingSupport extends EditingSupport {

+

+	protected AdapterFactoryEditingDomain editingDomain;

+

+	protected Composite parent;

+

+	public IsPossibleColumnEditingSupport(ColumnViewer viewer, AdapterFactoryEditingDomain editingDomain, Composite parent) {

+		super(viewer);

+		this.editingDomain = editingDomain;

+		this.parent = parent;

+	}

+

+	/**

+	 * Change IsPossible in the model to impossible

+	 * 

+	 * @param element

+	 */

+	protected void transformPossibleIntoImpossible(BaseMetaclass element) {

+		SetCommand command = new SetCommand(editingDomain, element, ExtensiondefinitionPackage.eINSTANCE.getBaseMetaclass_Possible(), false);

+		editingDomain.getCommandStack().execute(command);

+

+	}

+

+	/**

+	 * Change IsPossible in the model to possible

+	 * 

+	 * @param element

+	 */

+	protected void transformImpossibleIntoPossible(BaseMetaclass element) {

+

+		SetCommand command = new SetCommand(editingDomain, element, ExtensiondefinitionPackage.eINSTANCE.getBaseMetaclass_Possible(), true);

+		editingDomain.getCommandStack().execute(command);

+

+	}

+

+	/**

+	 * Change IsPossible in the model to impossible and propagate to children and generals

+	 * 

+	 * @param element

+	 */

+	protected void transformAllPossibleIntoImpossible(BaseMetaclass element) {

+		Facade facade = ((BaseMetaclass)element).getExtensionDefinition().getFacade();

+		transformPossibleIntoImpossible((BaseMetaclass)element);

+

+		// All children and generals must be set to Impossible as well

+		HashSet<Stereotype> siblings = ProfileUtils.getSiblings(((BaseMetaclass)element).getExtensionDefinition().getStereotype());

+

+		for(ExtensionDefinition extensionDefinition : facade.getExtensionDefinitions()) {

+			if(extensionDefinition.getExtension() == ((BaseMetaclass)element).getExtensionDefinition().getExtension()) {

+				if(siblings.contains(extensionDefinition.getStereotype())) {

+					for(BaseMetaclass baseMetaclass : extensionDefinition.getBaseMetaclasses())

+						if(baseMetaclass.getBase() == ((BaseMetaclass)element).getBase()) {

+							transformPossibleIntoImpossible(baseMetaclass);

+						}

+				}

+			}

+		}

+	}

+

+	/**

+	 * Change IsPossible in the model to possible and propagate to children and generals

+	 * 

+	 * @param element

+	 */

+	protected void transformAllImpossibleIntoPossible(BaseMetaclass element) {

+		Facade facade = ((BaseMetaclass)element).getExtensionDefinition().getFacade();

+		transformImpossibleIntoPossible((BaseMetaclass)element);

+

+		// All children and generals must be set to Possible as well

+		HashSet<Stereotype> siblings = ProfileUtils.getSiblings(((BaseMetaclass)element).getExtensionDefinition().getStereotype());

+

+		for(ExtensionDefinition extensionDefinition : facade.getExtensionDefinitions()) {

+			if(extensionDefinition.getExtension() == ((BaseMetaclass)element).getExtensionDefinition().getExtension()) {

+				if(siblings.contains(extensionDefinition.getStereotype())) {

+					for(BaseMetaclass baseMetaclass : extensionDefinition.getBaseMetaclasses())

+						if(baseMetaclass.getBase() == ((BaseMetaclass)element).getBase()) {

+							transformImpossibleIntoPossible(baseMetaclass);

+						}

+				}

+			}

+		}

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.EditingSupport#setValue(java.lang.Object, java.lang.Object)

+	 * 

+	 * @param element

+	 * @param value

+	 */

+	@Override

+	protected void setValue(final Object element, final Object value) {

+		if(element instanceof BaseMetaclass) {

+

+			if(EditionUtils.hasARequiredCombination((BaseMetaclass)element)) {

+				MessageDialog.openInformation(Display.getCurrent().getActiveShell(), Messages.IsPossibleColumnEditingSupport_0, Messages.IsPossibleColumnEditingSupport_1);

+

+			} else {

+

+				ProgressMonitorDialog dialog = new ProgressMonitorDialog(Display.getCurrent().getActiveShell());

+				try {

+					dialog.run(false, false, new IRunnableWithProgress() {

+

+						public void run(IProgressMonitor monitor) {

+							monitor.beginTask(Messages.IsPossibleColumnEditingSupport_2, IProgressMonitor.UNKNOWN);

+

+							if((Boolean)value == true) {

+								transformAllImpossibleIntoPossible((BaseMetaclass)element);

+							} else {

+								transformAllPossibleIntoImpossible((BaseMetaclass)element);

+

+							}

+

+							Facade facade = ((BaseMetaclass)element).getExtensionDefinition().getFacade();

+

+							// Clear incompatibilities that don't exist anymore

+							EditionUtils.clearAllStereotypeCombinations(facade, editingDomain);

+							// Init new incompatibilities

+							EditionUtils.initAllStereotypeCombinations(facade, editingDomain);

+

+							monitor.done();

+						}

+					});

+				} catch (InvocationTargetException e) {

+					e.printStackTrace();

+				} catch (InterruptedException e) {

+					e.printStackTrace();

+				}

+

+				getViewer().refresh();

+			}

+		}

+

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.EditingSupport#getCellEditor(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+	@Override

+	protected CellEditor getCellEditor(Object element) {

+		if(element instanceof BaseMetaclass) {

+			if(!((BaseMetaclass)element).getExtensionDefinition().getExtension().isRequired()) {

+				return new CheckboxCellEditor(parent);

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.EditingSupport#canEdit(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+	@Override

+	protected boolean canEdit(Object element) {

+		return true;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.EditingSupport#getValue(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+	@Override

+	protected Object getValue(Object element) {

+		if(element instanceof BaseMetaclass) {

+			return Boolean.valueOf(((BaseMetaclass)element).isPossible());

+		}

+		return null;

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/MetaclassAliasColumnEditingSupport.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/MetaclassAliasColumnEditingSupport.java
new file mode 100644
index 00000000000..e18fbdeaeaa
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/MetaclassAliasColumnEditingSupport.java
@@ -0,0 +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:

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facadeSpecificEditor.editingSupport;

+

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

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

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

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

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

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

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

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

+

+public class MetaclassAliasColumnEditingSupport extends EditingSupport {

+

+	protected AdapterFactoryEditingDomain editingDomain;

+

+	protected Composite parent;

+

+	public MetaclassAliasColumnEditingSupport(ColumnViewer viewer, AdapterFactoryEditingDomain editingDomain, Composite parent) {

+		super(viewer);

+		this.editingDomain = editingDomain;

+		this.parent = parent;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.EditingSupport#setValue(java.lang.Object, java.lang.Object)

+	 * 

+	 * @param element

+	 * @param value

+	 */

+	@Override

+	protected void setValue(Object element, Object value) {

+		if(element instanceof VirtualElement) {

+			SetCommand command = new SetCommand(editingDomain, (VirtualElement)element, VirtualmetamodelPackage.eINSTANCE.getVirtualElement_AliasName(), (String)value); //$NON-NLS-1$

+			editingDomain.getCommandStack().execute(command);

+			getViewer().refresh();

+		}

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.EditingSupport#getValue(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+	@Override

+	protected Object getValue(Object element) {

+		if(element instanceof VirtualElement) {

+			if(((VirtualElement)element).getAliasName() == null) {

+				return ""; //$NON-NLS-1$

+			} else {

+				return ((VirtualElement)element).getAliasName();

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.EditingSupport#getCellEditor(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+	@Override

+	protected CellEditor getCellEditor(Object element) {

+		return new TextCellEditor(parent);

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.EditingSupport#canEdit(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+	@Override

+	protected boolean canEdit(Object element) {

+		return true;

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/MetaclassIsAbstractColumnEditingSupport.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/MetaclassIsAbstractColumnEditingSupport.java
new file mode 100644
index 00000000000..8531c561cce
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/MetaclassIsAbstractColumnEditingSupport.java
@@ -0,0 +1,102 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facadeSpecificEditor.editingSupport;

+

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

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

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

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

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

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

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

+import org.eclipse.papyrus.facadeSpecificEditor.metamodel.MetamodelUtils;

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

+

+public class MetaclassIsAbstractColumnEditingSupport extends EditingSupport {

+

+	protected AdapterFactoryEditingDomain editingDomain;

+

+	protected Composite parent;

+

+	public MetaclassIsAbstractColumnEditingSupport(ColumnViewer viewer, AdapterFactoryEditingDomain editingDomain, Composite parent) {

+		super(viewer);

+		this.editingDomain = editingDomain;

+		this.parent = parent;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.EditingSupport#getCellEditor(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+	@Override

+	protected CellEditor getCellEditor(Object element) {

+		if(element instanceof VirtualMetaclass) {

+

+			if(MetamodelUtils.canBeAbstract((VirtualMetaclass)element)) {

+				return new CheckboxCellEditor(parent);

+			}

+		}

+

+		return null;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.EditingSupport#canEdit(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+	@Override

+	protected boolean canEdit(Object element) {

+		return true;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.EditingSupport#getValue(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+	@Override

+	protected Object getValue(Object element) {

+		if(element instanceof VirtualMetaclass) {

+			return Boolean.valueOf(((VirtualMetaclass)element).isAbstract());

+		}

+		return null;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.EditingSupport#setValue(java.lang.Object, java.lang.Object)

+	 * 

+	 * @param element

+	 * @param value

+	 */

+	@Override

+	protected void setValue(Object element, Object value) {

+		if(element instanceof VirtualMetaclass) {

+

+			SetCommand command = new SetCommand(editingDomain, (VirtualMetaclass)element, VirtualmetamodelPackage.eINSTANCE.getVirtualMetaclass_Abstract(), (Boolean)value); //$NON-NLS-1$

+			editingDomain.getCommandStack().execute(command);

+			getViewer().refresh();

+

+		}

+	}

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/MetaclassToKeepColumnEditingSupport.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/MetaclassToKeepColumnEditingSupport.java
new file mode 100644
index 00000000000..c17545dc1c5
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/MetaclassToKeepColumnEditingSupport.java
@@ -0,0 +1,112 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facadeSpecificEditor.editingSupport;

+

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

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

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

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

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

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

+import org.eclipse.papyrus.facade.Facade;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

+import org.eclipse.papyrus.facadeSpecificEditor.utils.PrunerUtils;

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

+

+public class MetaclassToKeepColumnEditingSupport extends EditingSupport {

+

+	protected AdapterFactoryEditingDomain editingDomain;

+

+	protected Composite parent;

+

+	protected Facade facade;

+

+	public MetaclassToKeepColumnEditingSupport(ColumnViewer viewer, AdapterFactoryEditingDomain editingDomain, Composite parent, Facade facade) {

+		super(viewer);

+		this.editingDomain = editingDomain;

+		this.parent = parent;

+		this.facade = facade;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.EditingSupport#setValue(java.lang.Object, java.lang.Object)

+	 * 

+	 * @param element

+	 * @param value

+	 */

+	@Override

+	protected void setValue(Object element, Object value) {

+		if(element instanceof VirtualElement) {

+

+			VirtualMetamodel metamodel = facade.getVirtualmetamodel();

+

+			if((Boolean)value == false) {

+				if(PrunerUtils.classifierUnkeep((VirtualElement)element, metamodel, editingDomain)) {

+

+					getViewer().refresh();

+				}

+			} else {

+				SetCommand command = new SetCommand(editingDomain, (VirtualElement)element, VirtualmetamodelPackage.eINSTANCE.getVirtualElement_Kept(), (Boolean)value); //$NON-NLS-1$

+				editingDomain.getCommandStack().execute(command);

+				getViewer().refresh();

+			}

+

+		}

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.EditingSupport#getValue(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+	@Override

+	protected Object getValue(Object element) {

+		if(element instanceof VirtualElement) {

+			return Boolean.valueOf(((VirtualElement)element).isKept());

+		}

+		return null;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.EditingSupport#getCellEditor(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+	@Override

+	protected CellEditor getCellEditor(Object element) {

+

+		return new CheckboxCellEditor(parent);

+

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.EditingSupport#canEdit(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+	@Override

+	protected boolean canEdit(Object element) {

+		return true;

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/MetaclassUseRepresentedColumnEditingSupport.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/MetaclassUseRepresentedColumnEditingSupport.java
new file mode 100644
index 00000000000..73686c74159
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/MetaclassUseRepresentedColumnEditingSupport.java
@@ -0,0 +1,99 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facadeSpecificEditor.editingSupport;

+

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

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

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

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

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

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

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

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

+

+public class MetaclassUseRepresentedColumnEditingSupport extends EditingSupport {

+

+	protected AdapterFactoryEditingDomain editingDomain;

+

+	protected Composite parent;

+

+	public MetaclassUseRepresentedColumnEditingSupport(ColumnViewer viewer, AdapterFactoryEditingDomain editingDomain, Composite parent) {

+		super(viewer);

+		this.editingDomain = editingDomain;

+		this.parent = parent;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.EditingSupport#getCellEditor(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+	@Override

+	protected CellEditor getCellEditor(Object element) {

+		if(element instanceof VirtualElement) {

+			return new CheckboxCellEditor(parent);

+		}

+

+		return null;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.EditingSupport#canEdit(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+	@Override

+	protected boolean canEdit(Object element) {

+		return true;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.EditingSupport#getValue(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+	@Override

+	protected Object getValue(Object element) {

+		if(element instanceof VirtualElement) {

+			return Boolean.valueOf(((VirtualElement)element).isUseRepresented());

+		}

+		return null;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.EditingSupport#setValue(java.lang.Object, java.lang.Object)

+	 * 

+	 * @param element

+	 * @param value

+	 */

+	@Override

+	protected void setValue(Object element, Object value) {

+		if(element instanceof VirtualMetaclass) {

+

+			SetCommand command = new SetCommand(editingDomain, (VirtualMetaclass)element, VirtualmetamodelPackage.eINSTANCE.getVirtualElement_UseRepresented(), (Boolean)value); //$NON-NLS-1$

+			editingDomain.getCommandStack().execute(command);

+			getViewer().refresh();

+

+		}

+	}

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/PropertiesAliasColumnEdintingSupport.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/PropertiesAliasColumnEdintingSupport.java
new file mode 100644
index 00000000000..868c785dfca
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/PropertiesAliasColumnEdintingSupport.java
@@ -0,0 +1,100 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facadeSpecificEditor.editingSupport;

+

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

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

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

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

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

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

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

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

+

+public class PropertiesAliasColumnEdintingSupport extends EditingSupport {

+

+	protected AdapterFactoryEditingDomain editingDomain;

+

+	protected Composite parent;

+

+	public PropertiesAliasColumnEdintingSupport(ColumnViewer viewer, AdapterFactoryEditingDomain editingDomain, Composite parent) {

+		super(viewer);

+		this.editingDomain = editingDomain;

+		this.parent = parent;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.EditingSupport#setValue(java.lang.Object, java.lang.Object)

+	 * 

+	 * @param element

+	 * @param value

+	 */

+	@Override

+	protected void setValue(Object element, Object value) {

+		if(element instanceof VirtualElement) {

+			SetCommand command = new SetCommand(editingDomain, (VirtualElement)element, VirtualmetamodelPackage.eINSTANCE.getVirtualElement_AliasName(), (String)value); //$NON-NLS-1$

+			editingDomain.getCommandStack().execute(command);

+			getViewer().refresh();

+		}

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.EditingSupport#getValue(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+	@Override

+	protected Object getValue(Object element) {

+		if(element instanceof VirtualElement) {

+			if(((VirtualElement)element).getAliasName() == null) {

+				return ""; //$NON-NLS-1$

+			} else {

+				return ((VirtualElement)element).getAliasName();

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.EditingSupport#getCellEditor(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+	@Override

+	protected CellEditor getCellEditor(Object element) {

+

+		return new TextCellEditor(parent);

+

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.EditingSupport#canEdit(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+	@Override

+	protected boolean canEdit(Object element) {

+

+		return true;

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/PropertiesMaxColumnEdintingSupport.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/PropertiesMaxColumnEdintingSupport.java
new file mode 100644
index 00000000000..79cfb5b0b7f
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/PropertiesMaxColumnEdintingSupport.java
@@ -0,0 +1,149 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facadeSpecificEditor.editingSupport;

+

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

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

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

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

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

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

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

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

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

+import org.eclipse.papyrus.facadeSpecificEditor.Messages;

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

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

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

+

+public class PropertiesMaxColumnEdintingSupport extends EditingSupport {

+

+	protected AdapterFactoryEditingDomain editingDomain;

+

+	protected Composite parent;

+

+	public PropertiesMaxColumnEdintingSupport(ColumnViewer viewer, AdapterFactoryEditingDomain editingDomain, Composite parent) {

+		super(viewer);

+		this.editingDomain = editingDomain;

+		this.parent = parent;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.EditingSupport#setValue(java.lang.Object, java.lang.Object)

+	 * 

+	 * @param element

+	 * @param value

+	 */

+	@Override

+	protected void setValue(Object element, Object value) {

+		if(element instanceof VirtualTypedElement) {

+

+			try {

+

+				if(((VirtualTypedElement)element).getRepresentedElement() instanceof MultiplicityElement || ((VirtualTypedElement)element).getRepresentedElement() instanceof ETypedElement) {

+					boolean isOk = false;

+					int intValue = Integer.valueOf((String)value);

+

+					if(intValue >= -1) {

+						int upperReference = 0;

+

+						if(((VirtualTypedElement)element).getRepresentedElement() instanceof MultiplicityElement) {

+							upperReference = ((MultiplicityElement)((VirtualTypedElement)element).getRepresentedElement()).getUpper();

+

+						} else if(((VirtualTypedElement)element).getRepresentedElement() instanceof ETypedElement) {

+							upperReference = ((ETypedElement)((VirtualTypedElement)element).getRepresentedElement()).getUpperBound();

+						}

+

+						if(upperReference != -1) {

+							if(intValue != -1) {

+								if(intValue <= upperReference) {

+									isOk = true;

+								}

+							}

+

+						} else {

+							isOk = true;

+						}

+

+						if(isOk) {

+							SetCommand command = new SetCommand(editingDomain, (VirtualTypedElement)element, VirtualmetamodelPackage.eINSTANCE.getVirtualTypedElement_Upper(), intValue); //$NON-NLS-1$

+							editingDomain.getCommandStack().execute(command);

+							getViewer().refresh();

+						} else {

+							MessageDialog.openWarning(Display.getCurrent().getActiveShell(), Messages.PropertiesMaxColumnEdintingSupport_0, Messages.PropertiesMaxColumnEdintingSupport_1 + upperReference);

+						}

+					} else {

+						MessageDialog.openWarning(Display.getCurrent().getActiveShell(), Messages.PropertiesMaxColumnEdintingSupport_2, Messages.PropertiesMaxColumnEdintingSupport_3);

+					}

+				}

+

+			} catch (NumberFormatException ex) {

+				MessageDialog.openWarning(Display.getCurrent().getActiveShell(), Messages.PropertiesMaxColumnEdintingSupport_4, Messages.PropertiesMaxColumnEdintingSupport_5);

+			}

+		}

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.EditingSupport#getValue(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+	@Override

+	protected Object getValue(Object element) {

+		if(element instanceof VirtualTypedElement) {

+

+			return ((VirtualTypedElement)element).getUpper() + ""; //$NON-NLS-1$

+

+		}

+		return null;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.EditingSupport#getCellEditor(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+	@Override

+	protected CellEditor getCellEditor(Object element) {

+		if(element instanceof VirtualTypedElement) {

+			return new TextCellEditor(parent);

+		}

+

+		return null;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.EditingSupport#canEdit(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+	@Override

+	protected boolean canEdit(Object element) {

+		if(element instanceof VirtualProperty) {

+			return true;

+		}

+

+		return false;

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/PropertiesMinColumnEdintingSupport.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/PropertiesMinColumnEdintingSupport.java
new file mode 100644
index 00000000000..8f62674c1f0
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/PropertiesMinColumnEdintingSupport.java
@@ -0,0 +1,144 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facadeSpecificEditor.editingSupport;

+

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

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

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

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

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

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

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

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

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

+import org.eclipse.papyrus.facadeSpecificEditor.Messages;

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

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

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

+

+public class PropertiesMinColumnEdintingSupport extends EditingSupport {

+

+	protected AdapterFactoryEditingDomain editingDomain;

+

+	protected Composite parent;

+

+	public PropertiesMinColumnEdintingSupport(ColumnViewer viewer, AdapterFactoryEditingDomain editingDomain, Composite parent) {

+		super(viewer);

+		this.editingDomain = editingDomain;

+		this.parent = parent;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.EditingSupport#setValue(java.lang.Object, java.lang.Object)

+	 * 

+	 * @param element

+	 * @param value

+	 */

+	@Override

+	protected void setValue(Object element, Object value) {

+		if(element instanceof VirtualTypedElement) {

+

+			try {

+

+				if(((VirtualTypedElement)element).getRepresentedElement() instanceof MultiplicityElement || ((VirtualTypedElement)element).getRepresentedElement() instanceof ETypedElement) {

+					boolean isOk = false;

+					int intValue = Integer.valueOf((String)value);

+

+					if(intValue >= -1) {

+						int lowerReference = 0;

+

+						if(((VirtualTypedElement)element).getRepresentedElement() instanceof MultiplicityElement) {

+							lowerReference = ((MultiplicityElement)((VirtualTypedElement)element).getRepresentedElement()).getLower();

+

+						} else if(((VirtualTypedElement)element).getRepresentedElement() instanceof ETypedElement) {

+							lowerReference = ((ETypedElement)((VirtualTypedElement)element).getRepresentedElement()).getLowerBound();

+						}

+

+						if(lowerReference != -1) {

+							if(intValue >= lowerReference) {

+								isOk = true;

+							}

+						}

+

+						if(isOk) {

+							SetCommand command = new SetCommand(editingDomain, (VirtualTypedElement)element, VirtualmetamodelPackage.eINSTANCE.getVirtualTypedElement_Lower(), intValue); //$NON-NLS-1$

+							editingDomain.getCommandStack().execute(command);

+							getViewer().refresh();

+						} else {

+							MessageDialog.openWarning(Display.getCurrent().getActiveShell(), Messages.PropertiesMinColumnEdintingSupport_0, Messages.PropertiesMinColumnEdintingSupport_1 + lowerReference);

+						}

+					} else {

+						MessageDialog.openWarning(Display.getCurrent().getActiveShell(), Messages.PropertiesMinColumnEdintingSupport_2, Messages.PropertiesMinColumnEdintingSupport_3);

+					}

+				}

+

+			} catch (NumberFormatException ex) {

+				MessageDialog.openWarning(Display.getCurrent().getActiveShell(), Messages.PropertiesMinColumnEdintingSupport_4, Messages.PropertiesMinColumnEdintingSupport_5);

+			}

+		}

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.EditingSupport#getValue(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+	@Override

+	protected Object getValue(Object element) {

+		if(element instanceof VirtualTypedElement) {

+

+			return ((VirtualTypedElement)element).getLower() + ""; //$NON-NLS-1$

+

+		}

+		return null;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.EditingSupport#getCellEditor(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+	@Override

+	protected CellEditor getCellEditor(Object element) {

+		if(element instanceof VirtualTypedElement) {

+			return new TextCellEditor(parent);

+		}

+

+		return null;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.EditingSupport#canEdit(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+	@Override

+	protected boolean canEdit(Object element) {

+		if(element instanceof VirtualProperty) {

+			return true;

+		}

+

+		return false;

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/PropertiesToKeepColumnEditingSupport.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/PropertiesToKeepColumnEditingSupport.java
new file mode 100644
index 00000000000..536b683afb3
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/PropertiesToKeepColumnEditingSupport.java
@@ -0,0 +1,117 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facadeSpecificEditor.editingSupport;

+

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

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

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

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

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

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

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

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

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

+import org.eclipse.papyrus.facadeSpecificEditor.Messages;

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

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

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

+

+public class PropertiesToKeepColumnEditingSupport extends EditingSupport {

+

+	protected AdapterFactoryEditingDomain editingDomain;

+

+	protected Composite parent;

+

+	public PropertiesToKeepColumnEditingSupport(ColumnViewer viewer, AdapterFactoryEditingDomain editingDomain, Composite parent) {

+		super(viewer);

+		this.editingDomain = editingDomain;

+		this.parent = parent;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.EditingSupport#setValue(java.lang.Object, java.lang.Object)

+	 * 

+	 * @param element

+	 * @param value

+	 */

+	@Override

+	protected void setValue(Object element, Object value) {

+		if(element instanceof VirtualElement) {

+			boolean canBeUnkept = true;

+			if(element instanceof VirtualProperty) {

+				if(((VirtualElement)element).getRepresentedElement() instanceof EStructuralFeature) {

+					if(((EStructuralFeature)((VirtualElement)element).getRepresentedElement()).getLowerBound() > 0) {

+						canBeUnkept = false;

+						MessageDialog.openWarning(Display.getCurrent().getActiveShell(), Messages.PropertiesToKeepColumnEditingSupport_0, Messages.PropertiesToKeepColumnEditingSupport_1);

+					}

+				} else if(((VirtualElement)element).getRepresentedElement() instanceof Property) {

+					if(((Property)((VirtualElement)element).getRepresentedElement()).getLower() > 0) {

+						canBeUnkept = false;

+						MessageDialog.openWarning(Display.getCurrent().getActiveShell(), Messages.PropertiesToKeepColumnEditingSupport_2, Messages.PropertiesToKeepColumnEditingSupport_3);

+					}

+				}

+

+			}

+

+			if(canBeUnkept) {

+				SetCommand command = new SetCommand(editingDomain, (VirtualElement)element, VirtualmetamodelPackage.eINSTANCE.getVirtualElement_Kept(), (Boolean)value); //$NON-NLS-1$

+				editingDomain.getCommandStack().execute(command);

+				getViewer().refresh();

+			}

+		}

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.EditingSupport#getValue(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+	@Override

+	protected Object getValue(Object element) {

+		if(element instanceof VirtualElement) {

+			return Boolean.valueOf(((VirtualElement)element).isKept());

+		}

+		return null;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.EditingSupport#getCellEditor(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+	@Override

+	protected CellEditor getCellEditor(Object element) {

+		return new CheckboxCellEditor(parent);

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.EditingSupport#canEdit(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+	@Override

+	protected boolean canEdit(Object element) {

+		return true;

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/StereotypeIncompatibilityColumnEditingSupport.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/StereotypeIncompatibilityColumnEditingSupport.java
new file mode 100644
index 00000000000..30a0e5c20e7
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/editingSupport/StereotypeIncompatibilityColumnEditingSupport.java
@@ -0,0 +1,297 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facadeSpecificEditor.editingSupport;

+

+import java.lang.reflect.InvocationTargetException;

+

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

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

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

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

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

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

+import org.eclipse.jface.operation.IRunnableWithProgress;

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

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

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

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

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

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

+import org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass;

+import org.eclipse.papyrus.facade.extensiondefinition.Combination;

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionFactory;

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage;

+import org.eclipse.papyrus.facadeSpecificEditor.FacadeSpecificEditor;

+import org.eclipse.papyrus.facadeSpecificEditor.Messages;

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

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

+

+public class StereotypeIncompatibilityColumnEditingSupport extends EditingSupport {

+

+	protected AdapterFactoryEditingDomain editingDomain;

+

+	protected Composite parent;

+

+	public StereotypeIncompatibilityColumnEditingSupport(ColumnViewer viewer, AdapterFactoryEditingDomain editingDomain, Composite parent) {

+		super(viewer);

+		this.editingDomain = editingDomain;

+		this.parent = parent;

+	}

+

+	/**

+	 * Change a compatibility between stereotype application to incompatible in the model

+	 * 

+	 * @param baseMetaclass

+	 * @param combinaison

+	 */

+	protected void transformCompatibleIntoIncompatible(BaseMetaclass baseMetaclass, Combination combinaison) {

+		AddCommand command = new AddCommand(editingDomain, baseMetaclass, ExtensiondefinitionPackage.eINSTANCE.getBaseMetaclass_IncompatibleStereotypes(), combinaison); //$NON-NLS-1$

+		editingDomain.getCommandStack().execute(command);

+		RemoveCommand removeCommand = new RemoveCommand(editingDomain, baseMetaclass, ExtensiondefinitionPackage.eINSTANCE.getBaseMetaclass_CompatibleStereotypes(), combinaison); //$NON-NLS-1$

+		editingDomain.getCommandStack().execute(removeCommand);

+	}

+

+	/**

+	 * Change a compatibility between stereotype application to incompatible in the model

+	 * 

+	 * @param baseMetaclass

+	 * @param combinaison

+	 */

+	protected void transformAllCompatibleIntoIncompatible(BaseMetaclass baseMetaclass, Combination combinaison) {

+

+		transformCompatibleIntoIncompatible(baseMetaclass, combinaison);

+	}

+

+	/**

+	 * Change a compatibility between stereotype application to compatible in the model

+	 * 

+	 * @param baseMetaclass

+	 * @param combinaison

+	 */

+	protected void transformImcompatibleIntoCompatible(BaseMetaclass baseMetaclass, Combination combinaison) {

+		RemoveCommand removeCommand = new RemoveCommand(editingDomain, baseMetaclass, ExtensiondefinitionPackage.eINSTANCE.getBaseMetaclass_IncompatibleStereotypes(), combinaison); //$NON-NLS-1$

+		editingDomain.getCommandStack().execute(removeCommand);

+		AddCommand addCommand = new AddCommand(editingDomain, baseMetaclass, ExtensiondefinitionPackage.eINSTANCE.getBaseMetaclass_CompatibleStereotypes(), combinaison); //$NON-NLS-1$

+		editingDomain.getCommandStack().execute(addCommand);

+	}

+

+	/**

+	 * Change a compatibility between stereotype application to compatible in the model

+	 * 

+	 * @param baseMetaclass

+	 * @param combinaison

+	 */

+	protected void transformAllImcompatibleIntoCompatible(BaseMetaclass baseMetaclass, Combination combinaison) {

+

+		transformImcompatibleIntoCompatible(baseMetaclass, combinaison);

+	}

+

+	/**

+	 * Used to propagate compatibilities and incompatibilities among stereotype applications

+	 * 

+	 * @param combination

+	 * @param iAmNotARequired

+	 */

+	protected void proceedTheOtherWayCompatibleIntoIncompatible(Combination combination, boolean iAmNotARequired) {

+

+		for(BaseMetaclass meta : ((Combination)combination).getMembers()) {

+			// Build fake Combination that contain all the basemetaclass of the combinaison except the basemetaclass we are processing

+			Combination fakeCombination = ExtensiondefinitionFactory.eINSTANCE.createCombination();

+			for(BaseMetaclass metaFake : ((Combination)combination).getMembers()) {

+				if(meta != metaFake) {

+					fakeCombination.getMembers().add(metaFake);

+				}

+			}

+			// fake Combination + the general basemetaclass that own this combinaison

+			if(iAmNotARequired) {

+				BaseMetaclass containerBaseMetaClass = (BaseMetaclass)((Combination)combination).eContainer();

+				BaseMetaclass general = containerBaseMetaClass;

+				fakeCombination.getMembers().add(general);

+			}

+

+			// if (!EditionUtils.containsOnlyRequired(fakeCombination)) {

+			// We go through the compatible combinaison of this basemeta and try to find the fake

+			Combination combinaison = EditionUtils.getCombinationThatMatch(meta.getCompatibleStereotypes(), fakeCombination);

+			if(combinaison != null) {

+				transformAllCompatibleIntoIncompatible(meta, combinaison);

+			} else {

+				org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.StereotypeIncompatibilityColumnEditingSupport_0);

+			}

+			// }

+		}

+	}

+

+	/**

+	 * Used to propagate compatibilities and incompatibilities among stereotype applications

+	 * 

+	 * @param combination

+	 * @param iAmNotARequired

+	 */

+	protected void proceedTheOtherWayImcompatibleIntoCompatible(Combination combination, boolean iAmNotARequired) {

+		for(BaseMetaclass meta : ((Combination)combination).getMembers()) {

+			// Build fake Combination that contain all the basemetaclass of the combinaison except the basemetaclass we are processing

+			Combination fakeCombination = ExtensiondefinitionFactory.eINSTANCE.createCombination();

+			for(BaseMetaclass metaFake : ((Combination)combination).getMembers()) {

+				if(meta != metaFake) {

+					fakeCombination.getMembers().add(metaFake);

+				}

+			}

+			// fake Combination + the basemetaclass that own this combinaison

+			if(iAmNotARequired) {

+				BaseMetaclass containerBaseMetaClass = (BaseMetaclass)((Combination)combination).eContainer();

+				//				BaseMetaclass general = findCorrespondingGeneral(containerBaseMetaClass);

+				BaseMetaclass general = containerBaseMetaClass;

+				fakeCombination.getMembers().add(general);

+			}

+

+			// if (!EditionUtils.containsOnlyRequired(fakeCombination)) {

+			// We go through the incompatible combinaison of this basemeta and try to find the fake

+			Combination combinaison = EditionUtils.getCombinationThatMatch(meta.getIncompatibleStereotypes(), fakeCombination);

+			if(combinaison != null) {

+				transformAllImcompatibleIntoCompatible(meta, combinaison);

+			} else {

+				org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.StereotypeIncompatibilityColumnEditingSupport_1);

+			}

+			// }

+

+		}

+	}

+

+	/**

+	 * Set a combination of stereotype application to incompatible

+	 * 

+	 * @param baseMetaclass

+	 * @param combination

+	 * @param bothWays

+	 */

+	protected void makeItImcompatible(BaseMetaclass baseMetaclass, Combination combination, boolean bothWays) {

+		transformAllCompatibleIntoIncompatible(baseMetaclass, combination);

+		proceedTheOtherWayCompatibleIntoIncompatible(combination, true);

+	}

+

+	/**

+	 * Set a combination of stereotype application to compatible

+	 * 

+	 * @param baseMetaclass

+	 * @param combination

+	 * @param bothWays

+	 */

+	protected void makeItCompatible(BaseMetaclass baseMetaclass, Combination combination, boolean bothWays) {

+		transformAllImcompatibleIntoCompatible(baseMetaclass, (Combination)combination);

+		proceedTheOtherWayImcompatibleIntoCompatible(combination, true);

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.EditingSupport#setValue(java.lang.Object, java.lang.Object)

+	 * 

+	 * @param element

+	 * @param value

+	 */

+	@Override

+	protected void setValue(final Object element, final Object value) {

+		if(element instanceof Combination) {

+

+			ProgressMonitorDialog dialog = new ProgressMonitorDialog(Display.getCurrent().getActiveShell());

+			try {

+				dialog.run(false, false, new IRunnableWithProgress() {

+

+					public void run(IProgressMonitor monitor) {

+						monitor.beginTask(Messages.StereotypeIncompatibilityColumnEditingSupport_2, IProgressMonitor.UNKNOWN);

+

+						ISelection selection = FacadeSpecificEditor.getExtensionDefintionTreeViewer().getSelection();

+						if(selection instanceof IStructuredSelection) {

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

+

+							if(first instanceof BaseMetaclass) {

+								BaseMetaclass baseMetaclass = (BaseMetaclass)first;

+

+								if((Boolean)value == false) {

+									makeItImcompatible(baseMetaclass, (Combination)element, true);

+								} else {

+									// Make it compatible

+									makeItCompatible(baseMetaclass, (Combination)element, true);

+

+								}

+

+							}

+						}

+

+						monitor.done();

+					}

+				});

+			} catch (InvocationTargetException e) {

+				e.printStackTrace();

+			} catch (InterruptedException e) {

+				e.printStackTrace();

+			}

+

+			getViewer().refresh();

+			FacadeSpecificEditor.getExtensionDefintionTreeViewer().refresh();

+		}

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.EditingSupport#getValue(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+	@Override

+	protected Object getValue(Object element) {

+		if(element instanceof Combination) {

+			ISelection selection = FacadeSpecificEditor.getExtensionDefintionTreeViewer().getSelection();

+			if(selection instanceof IStructuredSelection) {

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

+

+				if(first instanceof BaseMetaclass) {

+					EList<Combination> incompatibleStereotypes = ((BaseMetaclass)first).getIncompatibleStereotypes();

+					if(incompatibleStereotypes.contains(element)) {

+						return Boolean.valueOf(false);

+					} else {

+						return Boolean.valueOf(true);

+					}

+				}

+			}

+

+		}

+		return null;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.EditingSupport#getCellEditor(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+	@Override

+	protected CellEditor getCellEditor(Object element) {

+		return new CheckboxCellEditor(parent);

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.EditingSupport#canEdit(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+	@Override

+	protected boolean canEdit(Object element) {

+		return true;

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/messages.properties b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/messages.properties
new file mode 100644
index 00000000000..80e04f055a3
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/messages.properties
@@ -0,0 +1,115 @@
+EcoreGenerator_10=Don't know how to handle association because wrong number of member end : 

+EcoreGenerator_11=Don't know how to handle association because wrong number of owned member : 

+EcoreGenerator_12=Property : Type not found for : 

+EcoreGenerator_13=Virtual property already processed: 

+EcoreGenerator_14=Problem with elementReprensentingFather kind: 

+EcoreGenerator_15=Problem with representingElement kind: 

+EcoreGenerator_16=Problem with metaclass generalization generation for : 

+EcoreGenerator_17=Generalization already processed: 

+EcoreGenerator_18=EAttribute : Type not found for : 

+EcoreGenerator_19=EReference : Type not found for : 

+EcoreGenerator_20=The kind of represented Property is unknown: 

+EcoreGenerator_21=Problem of type for metaclass properties generation for : 

+EcoreGenerator_22=Problem with metaclass properties generation for : 

+EcoreGenerator_23=Properties already processed: 

+EcoreGenerator_24=createOperations - couldn't find the virtualClassifier that represents the type: 

+EcoreGenerator_25=createOperations - parameters - couldn't find the virtualClassifier that represents the type: 

+EcoreGenerator_26=The kind of oppositeVirtualProperty is unknown: 

+EcoreGenerator_27=Warning : Problem to update eopposite : 

+EcoreGenerator_3=setRepresenting : stereotypes are not only onekind on 

+EcoreGenerator_30=processEAnnotations: couldn't find representing for : 

+EcoreGenerator_31=processEAnnotations: couldn't find corresponding VirtualMetaclass for : 

+EcoreGenerator_35=Generate ecore metamodel

+EcoreGenerator_36=Unknown kind of the classifier: 

+EcoreGenerator_37=This element doesn't have represented element : 

+EcoreGenerator_4=Litral : know the kind of enum literal : 

+EcoreGenerator_40=Validation of the generated metamodel

+EcoreGenerator_41=The generated metamodel seems OK. 

+EcoreGenerator_42=Validation of the generated metamodel

+EcoreGenerator_43=The generated metamodel contains issues that you must fix in the preliminary metamodel. \nYou may open the generated metamodel to spot the problem but don't fix it manualy. 

+EcoreGenerator_44=Metamodel name, nsPrefix and nsURI

+EcoreGenerator_45=Metamodel name, nsPrefix and nsURI must not be empty

+EcoreGenerator_5=Litral : Don't know the kind of enum literal : 

+EcoreGenerator_6=Enum : We don't know the kind of represented Element: 

+EcoreGenerator_9=Datatype : We don't know the kind of represented Element: 

+ExtensionDefintionLabelProvider_13=\ on

+ExtensionKindColumnEditingSupport_0=Updating stereotypes definitions

+ExtensionKindColumnEditingSupport_1=Warning

+ExtensionKindColumnEditingSupport_2=The extension extends an abstract class. The extension cannot be a generalization.

+ExtensionKindColumnEditingSupport_3=Warning

+ExtensionKindColumnEditingSupport_4=The extension is required. The extension cannot be a generalization.

+ExtensionKindColumnEditingSupport_5=Warning

+ExtensionKindColumnEditingSupport_6=Cannot change the extension kind to MultiGeneralization because stereotype is used to  type a property elsewhere. 

+ExtensionKindColumnEditingSupport_7=Warning

+ExtensionKindColumnEditingSupport_8=Cannot change the extension kind to Fusion because stereotype is used to  type a property elsewhere. 

+FacadeSpecificEditor_0=Use represented

+FacadeSpecificEditor_1=Select the Profiles:

+FacadeSpecificEditor_10=Open a real Profile

+FacadeSpecificEditor_11=The model you open is not a profile

+FacadeSpecificEditor_15=Load profile

+FacadeSpecificEditor_16=Open Profile

+FacadeSpecificEditor_17=Clarify extensions

+FacadeSpecificEditor_18=Define metamodel

+FacadeSpecificEditor_19=Create actual metamodel

+FacadeSpecificEditor_2=Profile selection

+FacadeSpecificEditor_21=Name: 

+FacadeSpecificEditor_23=NSPrefix: 

+FacadeSpecificEditor_25=NSURI: 

+FacadeSpecificEditor_27=Generate Ecore metamodel and mapping

+FacadeSpecificEditor_28=Create preliminary metamodel

+FacadeSpecificEditor_29=Metaclass name

+FacadeSpecificEditor_30=To keep

+FacadeSpecificEditor_31=Alias

+FacadeSpecificEditor_32=Make it abstract

+FacadeSpecificEditor_33=Feature name

+FacadeSpecificEditor_34=To keep

+FacadeSpecificEditor_35=Alias

+FacadeSpecificEditor_36=Min

+FacadeSpecificEditor_37=Max

+FacadeSpecificEditor_38=Stereotype name

+FacadeSpecificEditor_39=Kind

+FacadeSpecificEditor_40=Applicable on this metaclass

+FacadeSpecificEditor_41=Stereotype

+FacadeSpecificEditor_42=Is compatible combination

+FacadeSpecificEditor_5=PrimitiveType issue

+FacadeSpecificEditor_6=PrimitiveType 

+FacadeSpecificEditor_7=\ must be stereotype with Ecore::EDataType and instanceTypeName must be specified

+FacadeSpecificEditor_8=Required extension issue

+FacadeSpecificEditor_9=Required extension are not suppported yet.

+IsPossibleColumnEditingSupport_0=Cannot change possibility

+IsPossibleColumnEditingSupport_1=Cannot change because it contains a required metaclass in the combinations

+IsPossibleColumnEditingSupport_2=Updating stereotypes definitions

+MetamodelLabelProvider_8=Unknow

+MetamodelUtils_0=Don't know how to get fathers : 

+MetamodelUtils_1=addMetaclass: didn't add because already represented : 

+MetamodelUtils_10=Can't  create properties for the type : 

+MetamodelUtils_11=postProcessProperties: don't know the representingType for: 

+MetamodelUtils_12=postProcessProperties: don't know the representingType for: 

+MetamodelUtils_13=The kind of the represented element for the virtualProperty is unknown: 

+MetamodelUtils_2=Can't create literal for the type : 

+MetamodelUtils_3=Can't create parameters for the operation : 

+MetamodelUtils_4=addStereotypeInterface: didn't add because already represented : 

+MetamodelUtils_5=Stereotype properties typed by a Class (that are not part of UML metamodel) are not supported yet

+MetamodelUtils_6=Can't process the type : 

+MetamodelUtils_7=Can't process the element for property : 

+MetamodelUtils_8=addProperty: didn't add because already represented : 

+MetamodelUtils_9=Stereotype is already applied to a parent

+PropertiesMaxColumnEdintingSupport_0=Problem with upper bound

+PropertiesMaxColumnEdintingSupport_1=Custom upper bound must be <= 

+PropertiesMaxColumnEdintingSupport_2=Problem with upper bound

+PropertiesMaxColumnEdintingSupport_3=Upper bound must be an between [-1 and +inf[

+PropertiesMaxColumnEdintingSupport_4=Problem with upper bound

+PropertiesMaxColumnEdintingSupport_5=Lower bound must be an integer.

+PropertiesMinColumnEdintingSupport_0=Problem with lower bound

+PropertiesMinColumnEdintingSupport_1=Custom lower bound must be >= 

+PropertiesMinColumnEdintingSupport_2=Problem with upper bound

+PropertiesMinColumnEdintingSupport_3=Lower bound must be an between [-1 and +inf[

+PropertiesMinColumnEdintingSupport_4=Problem with lower bound

+PropertiesMinColumnEdintingSupport_5=Lower bound must be an integer.

+PropertiesToKeepColumnEditingSupport_0=Cannot unkeep this element

+PropertiesToKeepColumnEditingSupport_1=This element cannot be unkept because it is has lower bound > 0. 

+PropertiesToKeepColumnEditingSupport_2=Cannot unkeep this element

+PropertiesToKeepColumnEditingSupport_3=This element cannot be unkept because it is has lower bound > 0. 

+StereotypeIncompatibilityColumnEditingSupport_0=Problem to find combinaison CompatibleIntoIncompatible

+StereotypeIncompatibilityColumnEditingSupport_1=Problem to find combinaison ImcompatibleIntoCompatible

+StereotypeIncompatibilityColumnEditingSupport_2=Updating stereotypes definitions

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/metamodel/CreatePreliminaryMetamodelListener.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/metamodel/CreatePreliminaryMetamodelListener.java
new file mode 100644
index 00000000000..4e8a2cb7b0c
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/metamodel/CreatePreliminaryMetamodelListener.java
@@ -0,0 +1,346 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facadeSpecificEditor.metamodel;

+

+import java.util.ArrayList;

+import java.util.HashMap;

+import java.util.List;

+

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

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

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

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

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

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

+import org.eclipse.papyrus.facade.Facade;

+import org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass;

+import org.eclipse.papyrus.facade.extensiondefinition.Combination;

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition;

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinitionKind;

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionFactory;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

+import org.eclipse.papyrus.facadeSpecificEditor.FacadeSpecificEditor;

+import org.eclipse.papyrus.facadeSpecificEditor.editingSupport.EditionUtils;

+import org.eclipse.papyrus.facadeSpecificEditor.utils.ProfileUtils;

+import org.eclipse.papyrus.facadeSpecificEditor.utils.StereotypeUtils;

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

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

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

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

+import org.eclipse.uml2.uml.internal.impl.UMLPackageImpl;

+

+public class CreatePreliminaryMetamodelListener extends MouseAdapter {

+

+	Facade facade;

+

+	AdapterFactoryEditingDomain editingDomain;

+

+	protected static EPackage umlMetamodel = UMLPackageImpl.eINSTANCE;

+

+	public CreatePreliminaryMetamodelListener(Facade facade, AdapterFactoryEditingDomain editingDomain) {

+		super();

+		this.facade = facade;

+		this.editingDomain = editingDomain;

+	}

+

+	/**

+	 * Interpret the extension as a Generalization and therefore generate the metaclass accordingly

+	 * 

+	 * @param extensionDefinition

+	 */

+	protected void initGeneralization(ExtensionDefinition extensionDefinition) {

+

+		BaseMetaclass baseMetaclass = MetamodelUtils.findActualBaseMetaclass(extensionDefinition);

+

+		if(baseMetaclass != null) {

+			ArrayList<BaseMetaclass> stereotypes = new ArrayList<BaseMetaclass>();

+			stereotypes.add(baseMetaclass);

+			MetamodelUtils.addMetaclass(StereotypeUtils.findBase(extensionDefinition), stereotypes, extensionDefinition.getStereotype().getName(), facade, editingDomain);

+

+			if(MetamodelUtils.hasSiblings(extensionDefinition)) {

+				//Create a Stereotype interface

+				MetamodelUtils.addStereotypeInterface(baseMetaclass.getExtensionDefinition().getStereotype(), baseMetaclass.getExtensionDefinition().getStereotype().getName() + "_applied", facade, editingDomain);

+			}

+

+		} else {

+			org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info("initGeneralization: Error can't find actual base metaclass : " + extensionDefinition.getStereotype());

+		}

+	}

+

+	/**

+	 * Interpret the extension as an Association and therefore generate the metaclass accordingly

+	 * 

+	 * @param extensionDefinition

+	 */

+	protected void initAssociation(ExtensionDefinition extensionDefinition) {

+

+		BaseMetaclass baseMetaclass = MetamodelUtils.findActualBaseMetaclass(extensionDefinition);

+		if(baseMetaclass != null) {

+			ArrayList<BaseMetaclass> stereotypes = new ArrayList<BaseMetaclass>();

+			stereotypes.add(baseMetaclass);

+			String name = ((EClass)baseMetaclass.getBase()).getName() + "_" + baseMetaclass.getExtensionDefinition().getStereotype().getName();

+

+			MetamodelUtils.addMetaclass(baseMetaclass.getBase(), stereotypes, name, facade, editingDomain);

+

+			//Create property in the virtualmetaclass that represents the base metaclass to facilitate navigation 

+			if(MetamodelUtils.isActualExtensionDefinition(extensionDefinition)) {

+				//Find the base metaclass

+				VirtualMetaclass virtualMetaclass = MetamodelUtils.findMetaclassWithNoRealStereoThatMatch((EClass)baseMetaclass.getBase(), facade);

+				//Add the property

+				MetamodelUtils.addProperty(virtualMetaclass, extensionDefinition.getExtension().getMemberEnds().get(0), extensionDefinition.getExtension().getMemberEnds().get(0).getType(), name, facade, editingDomain);

+			}

+

+			if(MetamodelUtils.hasSiblings(extensionDefinition)) {

+				//Create a Stereotype interface

+				MetamodelUtils.addStereotypeInterface(baseMetaclass.getExtensionDefinition().getStereotype(), baseMetaclass.getExtensionDefinition().getStereotype().getName() + "_applied", facade, editingDomain);

+			}

+		}

+	}

+

+	/**

+	 * Interpret the extension as a MultiGeneralization and therefore generate the metaclass accordingly

+	 * 

+	 * @param extensionDefinition

+	 */

+	protected void initMultiGeneralization(ExtensionDefinition extensionDefinition) {

+		// Prepare possible METACLASS combinations

+		HashMap<EClass, ArrayList<Combination>> possibleMetaclasses = new HashMap<EClass, ArrayList<Combination>>();

+

+		for(BaseMetaclass baseMetaclass : extensionDefinition.getBaseMetaclasses()) {

+

+			ArrayList<Combination> possibleCombinations = new ArrayList<Combination>();

+			if(possibleMetaclasses.containsKey(baseMetaclass.getBase())) {

+				possibleCombinations = possibleMetaclasses.get(baseMetaclass.getBase());

+			}

+

+			// If I am possible I am a combination

+			if(baseMetaclass.isPossible()) {

+				Combination combination = ExtensiondefinitionFactory.eINSTANCE.createCombination();

+				combination.getMembers().add(baseMetaclass);

+				if(!EditionUtils.containsCombination(possibleCombinations, combination)) {

+					possibleCombinations.add(combination);

+				}

+			}

+

+			// I take the compatible combination

+			for(Combination possibleCombination : baseMetaclass.getCompatibleStereotypes()) {

+

+				Combination combination = ExtensiondefinitionFactory.eINSTANCE.createCombination();

+				combination.getMembers().add(baseMetaclass);

+				combination.getMembers().addAll(possibleCombination.getMembers());

+				if(!EditionUtils.containsCombination(possibleCombinations, combination)) {

+					possibleCombinations.add(combination);

+				}

+

+			}

+

+			possibleMetaclasses.put((EClass)baseMetaclass.getBase(), possibleCombinations);

+

+		}

+

+		// Generate the possible METACLASS combinations

+		for(EClass representedElement : possibleMetaclasses.keySet()) {

+			for(Combination combination : possibleMetaclasses.get(representedElement)) {

+

+				MetamodelUtils.addMetaclass(representedElement, combination.getMembers(), createName(representedElement, combination), facade, editingDomain);

+

+				//Each stereotype that is used in a MultiGeneralization must be declared as a Stereotype interface

+				for(BaseMetaclass baseMetaclass : combination.getMembers()) {

+					Stereotype stereotype = baseMetaclass.getExtensionDefinition().getStereotype();

+					MetamodelUtils.addStereotypeInterface(stereotype, stereotype.getName() + "_applied", facade, editingDomain);

+				}

+

+			}

+		}

+	}

+

+	/**

+	 * Interpret the extension as a Fusion and therefore generate the metaclass accordingly

+	 * 

+	 * @param extensionDefinition

+	 */

+	protected void initFusion(ExtensionDefinition extensionDefinition) {

+

+		if(extensionDefinition.getStereotype().getGenerals().isEmpty()) {

+			//Find virtualmetaclass that will be fusion with

+			VirtualMetaclass toFusionWith = MetamodelUtils.findMetaclassWithNoRealStereoThatMatch(StereotypeUtils.findBase(extensionDefinition), facade);

+

+			BaseMetaclass baseMetaclass = MetamodelUtils.findActualBaseMetaclass(extensionDefinition);

+			if(baseMetaclass != null) {

+				//Add the stereotype to fusion to the virtualmetaclasse that represent the base metaclass of the stereotype

+				if(!toFusionWith.getAppliedStereotypes().contains(baseMetaclass)) {

+					toFusionWith.getAppliedStereotypes().add(baseMetaclass);

+				}

+			}

+		} else {

+			//For the stereotype that inherit from the stereotype to fusion with the base metaclss, create corresponding virtualmetaclasses

+			BaseMetaclass baseMetaclass = MetamodelUtils.findActualBaseMetaclass(extensionDefinition);

+			ArrayList<BaseMetaclass> stereotypes = new ArrayList<BaseMetaclass>();

+			stereotypes.add(baseMetaclass);

+			MetamodelUtils.addMetaclass(StereotypeUtils.findBase(extensionDefinition), stereotypes, extensionDefinition.getStereotype().getName(), facade, editingDomain);

+		}

+	}

+

+	/**

+	 * Generate the prelimenary metamodel on the basis of the clarification of the extensions

+	 */

+	protected void initMetamodel() {

+

+		// Generate for the UML metamodel

+		for(EClassifier classifier : umlMetamodel.getEClassifiers()) {

+			MetamodelUtils.createForType(classifier, facade, editingDomain);

+		}

+

+		for(ExtensionDefinition extensionDefinition : facade.getExtensionDefinitions()) {

+			if(extensionDefinition.getKind() == ExtensionDefinitionKind.GENERALIZATION) {

+				initGeneralization(extensionDefinition);

+			} else if(extensionDefinition.getKind() == ExtensionDefinitionKind.FUSION) {

+				initFusion(extensionDefinition);

+			} else if(extensionDefinition.getKind() == ExtensionDefinitionKind.ASSOCIATION) {

+				initAssociation(extensionDefinition);

+			} else if(extensionDefinition.getKind() == ExtensionDefinitionKind.MULTI_GENERALIZATION) {

+				initMultiGeneralization(extensionDefinition);

+			}

+		}

+

+		//		initStereotypeInterfaces();

+

+		initAbstractMetaclasses(MetamodelUtils.getOnlyVirtualMetaclasses(facade.getVirtualmetamodel().getVirtualClassifiers()));

+

+		MetamodelUtils.createPropertiesForAll(facade, editingDomain);

+

+		MetamodelUtils.createOperationsForAll(facade, editingDomain);

+

+		MetamodelUtils.createGeneralizations(facade, editingDomain);

+

+		MetamodelUtils.postProcessTypedElements(facade, editingDomain);

+

+		MetamodelUtils.postProcessUseRepresented(facade, editingDomain);

+	}

+

+	//	private void initStereotypeInterfaces() {

+	//				for(VirtualClassifier classifier : facade.getVirtualmetamodel().getVirtualClassifiers()) {

+	//					if(classifier instanceof VirtualMetaclass) {

+	//						if(!MetamodelUtils.onlyOneKind(((VirtualMetaclass)classifier).getAppliedStereotypes())) {

+	//							List<Stereotype> stereotypes = MetamodelUtils.getStereotypesFromBaseMetaclass(((VirtualMetaclass)classifier).getAppliedStereotypes());

+	//							if(stereotypes.size() == 1) {

+	//								

+	//							} else {

+	//								org.eclipse.papyrus.facadeSpecificEditor.Activator.log.info("initStereotypeInterfaces: Error with number of different applied stereotypes");

+	//							}

+	//						}

+	//					}

+	//				}

+	//	}

+

+	/**

+	 * Set the isAbstract value each virtualMetaclass

+	 * 

+	 * @param list

+	 */

+	protected void initAbstractMetaclasses(List<VirtualMetaclass> list) {

+		for(VirtualMetaclass metaclass : list) {

+			metaclass.setAbstract(MetamodelUtils.mustBeAbstract(metaclass));

+		}

+	}

+

+	/**

+	 * Generate a name that is meaningful using a combination of applied stereotypes

+	 * 

+	 * @param representedElement

+	 * @param combination

+	 * @return

+	 *         a meaningful name

+	 */

+	protected String createName(EClass representedElement, Combination combination) {

+		String name = representedElement.getName();

+

+		for(BaseMetaclass baseMetaclass : combination.getMembers()) {

+			name += "_" + baseMetaclass.getExtensionDefinition().getStereotype().getName();

+		}

+

+		return name;

+	}

+

+	/**

+	 * Check whether two or more required stereotypes are defined as MULTI_GENERALIZATION on a unique base metaclass

+	 * 

+	 * @return

+	 */

+	protected boolean isFeasible() {

+

+		for(ExtensionDefinition extensionDefinition : facade.getExtensionDefinitions()) {

+			if(extensionDefinition.getKind() == ExtensionDefinitionKind.MULTI_GENERALIZATION) {

+				if(extensionDefinition.getExtension().isRequired()) {

+					// Is there another that is required with common basemetaclasses

+					for(ExtensionDefinition extensionDefinition2 : facade.getExtensionDefinitions()) {

+						if(!ProfileUtils.getSiblings(extensionDefinition.getStereotype()).contains(extensionDefinition2.getStereotype())) {

+							if(extensionDefinition2.getKind() == ExtensionDefinitionKind.MULTI_GENERALIZATION) {

+								if(extensionDefinition2.getExtension().isRequired()) {

+									if(extensionDefinition != extensionDefinition2) {

+

+										List<EClass> baseMetaclasses = StereotypeUtils.getAllExtendableMetaclasses(extensionDefinition.getExtension(), true);

+										List<EClass> baseMetaclasses2 = StereotypeUtils.getAllExtendableMetaclasses(extensionDefinition2.getExtension(), true);

+

+										for(EClass eClass : baseMetaclasses) {

+											if(baseMetaclasses2.contains(eClass)) {

+												MessageDialog.openError(Display.getCurrent().getActiveShell(), "Cannot generate metamodel", "Two or more required stereotypes are defined as MULTI_GENERALIZATION on " + eClass.getName() + ". \nYou must define only one as MultiGeneralization.");

+												return false;

+											}

+										}

+									}

+

+								}

+							}

+						}

+					}

+				}

+			}

+		}

+		return true;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.swt.events.MouseAdapter#mouseUp(org.eclipse.swt.events.MouseEvent)

+	 * 

+	 * @param e

+	 */

+	@Override

+	public void mouseUp(MouseEvent e) {

+		if(isFeasible()) {

+

+			boolean proceed = false;

+			if(facade.getVirtualmetamodel().eContents().isEmpty()) {

+				proceed = true;

+			} else {

+				if(MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), "Confirmation", "We are going to erase the preliminary metamodel")) {

+					proceed = true;

+				}

+			}

+

+			if(proceed) {

+				// Command to execute for development only

+				RemoveCommand commandMetaclasses = new RemoveCommand(editingDomain, facade.getVirtualmetamodel(), VirtualmetamodelPackage.eINSTANCE.getVirtualMetamodel_VirtualClassifiers(), facade.getVirtualmetamodel().getVirtualClassifiers());

+				editingDomain.getCommandStack().execute(commandMetaclasses);

+

+				initMetamodel();

+

+				FacadeSpecificEditor.getMetamodelTreeViewer().refresh();

+			}

+		}

+

+	}

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/metamodel/EcoreGenerator.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/metamodel/EcoreGenerator.java
new file mode 100644
index 00000000000..eb129a57f8c
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/metamodel/EcoreGenerator.java
@@ -0,0 +1,960 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facadeSpecificEditor.metamodel;

+

+import java.io.IOException;

+import java.lang.reflect.InvocationTargetException;

+import java.util.ArrayList;

+import java.util.HashMap;

+import java.util.HashSet;

+import java.util.List;

+import java.util.Map;

+

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

+import org.eclipse.emf.common.ui.dialogs.DiagnosticDialog;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+import org.eclipse.emf.ecore.xmi.XMLResource;

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

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

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

+import org.eclipse.jface.operation.IRunnableWithProgress;

+import org.eclipse.papyrus.facade.Facade;

+import org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass;

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinitionKind;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualDatatype;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualEnum;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualLiteral;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualOperation;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualParameter;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty;

+import org.eclipse.papyrus.facadeSpecificEditor.Messages;

+import org.eclipse.papyrus.facadeSpecificEditor.utils.StereotypeUtils;

+import org.eclipse.papyrus.facademapping.FacadeMappping;

+import org.eclipse.papyrus.facademapping.FacademappingFactory;

+import org.eclipse.papyrus.facademapping.Mapping;

+import org.eclipse.papyrus.facademapping.StereotypedMapping;

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

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

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

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.types.TypesPackage;

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

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

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

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

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

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

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

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

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

+

+public class EcoreGenerator extends MouseAdapter {

+

+	Facade facade;

+

+	AdapterFactoryEditingDomain editingDomain;

+

+	protected Resource ecoreResource;

+

+	protected Resource mappingResource;

+

+	protected HashSet<VirtualMetaclass> propertiesProcessed;

+

+	protected HashSet<VirtualMetaclass> generalizationProcessed;

+

+	protected HashMap<VirtualProperty, EObject> processedProperty;

+

+	protected HashMap<VirtualLiteral, EObject> processedLiteral;

+

+	protected HashMap<VirtualClassifier, EClassifier> processedClassifier;

+

+	protected HashMap<VirtualProperty, EStructuralFeature> processedPropertyFeature;

+

+	protected static EPackage ecoreMetamodel = EcorePackage.eINSTANCE;

+

+

+	public EcoreGenerator(Facade facade, AdapterFactoryEditingDomain editingDomain) {

+		super();

+		this.facade = facade;

+		this.editingDomain = editingDomain;

+

+		propertiesProcessed = new HashSet<VirtualMetaclass>();

+		processedProperty = new HashMap<VirtualProperty, EObject>();

+		processedClassifier = new HashMap<VirtualClassifier, EClassifier>();

+		generalizationProcessed = new HashSet<VirtualMetaclass>();

+		processedLiteral = new HashMap<VirtualLiteral, EObject>();

+		processedPropertyFeature = new HashMap<VirtualProperty, EStructuralFeature>();

+	}

+

+	/**

+	 * Helper method to create the Ecore file for the actual metamodel for the facade

+	 * 

+	 * @return

+	 *         the root of the ecore metamodel

+	 */

+	protected EObject createEcoreFile() {

+		URI ecoreURI = facade.eResource().getURI();

+		ecoreURI = ecoreURI.trimSegments(1);

+		ecoreURI = ecoreURI.appendSegment(facade.getVirtualmetamodel().getName() + ".ecore"); //$NON-NLS-1$

+

+		ResourceSet resourceSet = new ResourceSetImpl();

+		ecoreResource = resourceSet.createResource(ecoreURI);

+

+		ecoreResource.getContents().clear();

+		EPackage root = EcoreFactory.eINSTANCE.createEPackage();

+		root.setName(facade.getVirtualmetamodel().getName());

+		root.setNsPrefix(facade.getVirtualmetamodel().getNsPrefix());

+		root.setNsURI(facade.getVirtualmetamodel().getNsURI());

+		ecoreResource.getContents().add(root);

+

+		EObject ecoreModel = ecoreResource.getContents().get(0);

+

+		return ecoreModel;

+	}

+

+	/**

+	 * Helper method to create the mapping file between UML + profile and the facade metamodel

+	 * 

+	 * @return

+	 *         the root of the mapping model

+	 */

+	protected EObject createMappingFile() {

+		URI ecoreURI = facade.eResource().getURI();

+		ecoreURI = ecoreURI.trimSegments(1);

+		ecoreURI = ecoreURI.appendSegment(facade.getVirtualmetamodel().getName() + ".facademapping"); //$NON-NLS-1$

+

+		ResourceSet resourceSet = new ResourceSetImpl();

+		mappingResource = resourceSet.createResource(ecoreURI);

+

+		mappingResource.getContents().clear();

+		FacadeMappping root = FacademappingFactory.eINSTANCE.createFacadeMappping();

+		mappingResource.getContents().add(root);

+

+		EObject mappingModel = mappingResource.getContents().get(0);

+

+		return mappingModel;

+	}

+

+	/**

+	 * Helper method to save the the Ecore facade metamodel file and the the mapping model

+	 */

+	protected void save() {

+		try {

+			Map<Object, Object> options = new HashMap<Object, Object>();

+			options.put(XMLResource.OPTION_ENCODING, "UTF-8"); //$NON-NLS-1$

+			ecoreResource.save(options);

+			mappingResource.save(options);

+		} catch (IOException e1) {

+			e1.printStackTrace();

+		}

+	}

+

+	/**

+	 * Store a mapping in the mapping model

+	 * 

+	 * @param element

+	 * @param representingElement

+	 * @param facadeMappingModel

+	 */

+	protected void setRepresenting(VirtualElement element, EObject representingElement, FacadeMappping facadeMappingModel) {

+

+		if(element instanceof VirtualMetaclass) {

+			if(!((VirtualMetaclass)element).getAppliedStereotypes().isEmpty()) {

+

+				StereotypedMapping mappingToEdit = FacademappingFactory.eINSTANCE.createStereotypedMapping();

+

+				List<Stereotype> stereotypes = new ArrayList<Stereotype>();

+

+				for(BaseMetaclass baseMetaclass : ((VirtualMetaclass)element).getAppliedStereotypes()) {

+					stereotypes.add(baseMetaclass.getExtensionDefinition().getStereotype());

+				}

+

+				if(MetamodelUtils.onlyOneKind(((VirtualMetaclass)element).getAppliedStereotypes(), ExtensionDefinitionKind.ASSOCIATION)) {

+					mappingToEdit.setKind(org.eclipse.papyrus.facademapping.ExtensionDefinitionKind.ASSOCIATION);

+				} else if(MetamodelUtils.onlyOneKind(((VirtualMetaclass)element).getAppliedStereotypes(), ExtensionDefinitionKind.GENERALIZATION)) {

+					mappingToEdit.setKind(org.eclipse.papyrus.facademapping.ExtensionDefinitionKind.GENERALIZATION);

+				} else if(MetamodelUtils.onlyOneKind(((VirtualMetaclass)element).getAppliedStereotypes(), ExtensionDefinitionKind.MULTI_GENERALIZATION)) {

+					mappingToEdit.setKind(org.eclipse.papyrus.facademapping.ExtensionDefinitionKind.MULTI_GENERALIZATION);

+				} else if(MetamodelUtils.onlyOneKind(((VirtualMetaclass)element).getAppliedStereotypes(), ExtensionDefinitionKind.FUSION)) {

+					mappingToEdit.setKind(org.eclipse.papyrus.facademapping.ExtensionDefinitionKind.FUSION);

+				} else {

+					org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_3 + element.getRepresentedElement());

+				}

+

+				mappingToEdit.setUmlElement(element.getRepresentedElement());

+				mappingToEdit.setSpecificDomainElement(representingElement);

+				((StereotypedMapping)mappingToEdit).getAppliedStereotypes().addAll(stereotypes);

+

+				facadeMappingModel.getMappings().add(mappingToEdit);

+

+				return;

+			}

+		}

+

+		Mapping mapping = FacademappingFactory.eINSTANCE.createMapping();

+		mapping.setUmlElement(element.getRepresentedElement());

+		mapping.setSpecificDomainElement(representingElement);

+

+		facadeMappingModel.getMappings().add(mapping);

+	}

+

+	/**

+	 * Create an EEnum from an VirtualEnum in the facade metamodel

+	 * 

+	 * @param virtualEnum

+	 * @param ecoreRoot

+	 * @param facadeMappping

+	 */

+	protected void createEnum(VirtualEnum virtualEnum, EPackage ecoreRoot, FacadeMappping facadeMappping) {

+		if(virtualEnum.getRepresentedElement() instanceof EEnum) {

+

+			EEnum enumeration = EcoreFactory.eINSTANCE.createEEnum();

+			enumeration.setName(virtualEnum.getAliasName());

+

+			for(VirtualLiteral literal : virtualEnum.getLiterals()) {

+				if(literal.getRepresentedElement() instanceof EEnumLiteral) {

+					EEnumLiteral enumLiteral = EcoreFactory.eINSTANCE.createEEnumLiteral();

+					enumLiteral.setName(literal.getAliasName());

+

+					enumLiteral.setValue(((EEnumLiteral)literal.getRepresentedElement()).getValue());

+					enumeration.getELiterals().add(enumLiteral);

+					setRepresenting(literal, enumLiteral, facadeMappping);

+					processedLiteral.put(literal, enumLiteral);

+				} else {

+					org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_4 + virtualEnum.getRepresentedElement());

+				}

+			}

+

+			ecoreRoot.getEClassifiers().add(enumeration);

+			setRepresenting(virtualEnum, enumeration, facadeMappping);

+			processedClassifier.put(virtualEnum, enumeration);

+

+		} else if(virtualEnum.getRepresentedElement() instanceof Enumeration) {

+			EEnum enumeration = EcoreFactory.eINSTANCE.createEEnum();

+			enumeration.setName(virtualEnum.getAliasName());

+

+			int i = 0;

+			for(VirtualLiteral literal : virtualEnum.getLiterals()) {

+				if(literal.getRepresentedElement() instanceof EnumerationLiteral) {

+					EEnumLiteral enumLiteral = EcoreFactory.eINSTANCE.createEEnumLiteral();

+					enumLiteral.setName(literal.getAliasName());

+

+					enumLiteral.setValue(i);

+					enumeration.getELiterals().add(enumLiteral);

+					setRepresenting(literal, enumLiteral, facadeMappping);

+					processedLiteral.put(literal, enumLiteral);

+					i++;

+				} else {

+					org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_5 + literal.getRepresentedElement());

+				}

+			}

+

+			ecoreRoot.getEClassifiers().add(enumeration);

+			setRepresenting(virtualEnum, enumeration, facadeMappping);

+			processedClassifier.put(virtualEnum, enumeration);

+		} else {

+			org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_6 + virtualEnum.getRepresentedElement());

+		}

+	}

+

+	/**

+	 * Create an EDatatype from an VirtualDatatype in the facade metamodel

+	 * 

+	 * @param datatype

+	 * @param ecoreRoot

+	 * @param facadeMappping

+	 */

+	protected void createDatatype(VirtualDatatype datatype, EPackage ecoreRoot, FacadeMappping facadeMappping) {

+		if(datatype.getRepresentedElement() instanceof EDataType) {

+			EDataType eDataType = EcoreFactory.eINSTANCE.createEDataType();

+			eDataType.setName(datatype.getAliasName());

+			eDataType.setInstanceTypeName(((EDataType)datatype.getRepresentedElement()).getInstanceTypeName());

+

+			ecoreRoot.getEClassifiers().add(eDataType);

+			setRepresenting(datatype, eDataType, facadeMappping);

+			processedClassifier.put(datatype, eDataType);

+		}

+		if(datatype.getRepresentedElement() instanceof PrimitiveType) {

+			EDataType eDataType = EcoreFactory.eINSTANCE.createEDataType();

+			eDataType.setName(datatype.getAliasName());

+

+			Stereotype stereotype = ((PrimitiveType)datatype.getRepresentedElement()).getAppliedStereotype("Ecore::EDataType"); //$NON-NLS-1$

+			if(stereotype != null) {

+				Object value = ((PrimitiveType)datatype.getRepresentedElement()).getValue(stereotype, "instanceClassName"); //$NON-NLS-1$

+				if(value instanceof String) {

+					eDataType.setInstanceTypeName((String)value);

+				}

+			}

+

+			ecoreRoot.getEClassifiers().add(eDataType);

+			setRepresenting(datatype, eDataType, facadeMappping);

+			processedClassifier.put(datatype, eDataType);

+		} else {

+			org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_9 + datatype.getRepresentedElement());

+		}

+	}

+

+	/**

+	 * Create an EClass from an VirtualMetaclass in the facade metamodel

+	 * 

+	 * @param metaclass

+	 * @param ecoreRoot

+	 * @param facadeMappping

+	 */

+	protected void createMetaclass(VirtualMetaclass metaclass, EPackage ecoreRoot, FacadeMappping facadeMappping) {

+

+		if(!processedClassifier.containsKey(metaclass)) {

+			EClass eClass = EcoreFactory.eINSTANCE.createEClass();

+			eClass.setName(metaclass.getAliasName());

+			eClass.setAbstract(metaclass.isAbstract());

+

+			ecoreRoot.getEClassifiers().add(eClass);

+

+			setRepresenting(metaclass, eClass, facadeMappping);

+			processedClassifier.put(metaclass, eClass);

+		}

+	}

+

+	/**

+	 * Add a boolean attribute to a representingElement in the facade metamodel

+	 * 

+	 * @param virtualProperty

+	 * @param representingElement

+	 * @param facadeMappping

+	 */

+	protected void createBooleanAttribute(VirtualProperty virtualProperty, EClass representingElement, FacadeMappping facadeMappping) {

+		EAttribute attrib = EcoreFactory.eINSTANCE.createEAttribute();

+		attrib.setName(virtualProperty.getAliasName());

+		attrib.setLowerBound(virtualProperty.getLower());

+		attrib.setUpperBound(virtualProperty.getUpper());

+		attrib.setEType(EcorePackage.Literals.EBOOLEAN);

+

+		representingElement.getEStructuralFeatures().add(attrib);

+		setRepresenting(virtualProperty, attrib, facadeMappping);

+		processedPropertyFeature.put(virtualProperty, attrib);

+	}

+

+	/**

+	 * Add a String attribute to a representingElement in the facade metamodel

+	 * 

+	 * @param virtualProperty

+	 * @param representingElement

+	 * @param facadeMappping

+	 */

+	protected void createStringAttribute(VirtualProperty virtualProperty, EClass representingElement, FacadeMappping facadeMappping) {

+		EAttribute attrib = EcoreFactory.eINSTANCE.createEAttribute();

+		attrib.setName(virtualProperty.getAliasName());

+		attrib.setLowerBound(virtualProperty.getLower());

+		attrib.setUpperBound(virtualProperty.getUpper());

+		attrib.setEType(EcorePackage.Literals.ESTRING);

+

+		representingElement.getEStructuralFeatures().add(attrib);

+		setRepresenting(virtualProperty, attrib, facadeMappping);

+		processedPropertyFeature.put(virtualProperty, attrib);

+	}

+

+	/**

+	 * Add an integer attribute to a representingElement in the facade metamodel

+	 * 

+	 * @param virtualProperty

+	 * @param representingElement

+	 * @param facadeMappping

+	 */

+	protected void createIntegerAttribute(VirtualProperty virtualProperty, EClass representingElement, FacadeMappping facadeMappping) {

+		EAttribute attrib = EcoreFactory.eINSTANCE.createEAttribute();

+		attrib.setName(virtualProperty.getAliasName());

+		attrib.setLowerBound(virtualProperty.getLower());

+		attrib.setUpperBound(virtualProperty.getUpper());

+		attrib.setEType(EcorePackage.Literals.EINT);

+

+		representingElement.getEStructuralFeatures().add(attrib);

+		setRepresenting(virtualProperty, attrib, facadeMappping);

+		processedPropertyFeature.put(virtualProperty, attrib);

+	}

+

+	/**

+	 * Add an unlimitedNatural attribute to a representingElement in the facade metamodel

+	 * 

+	 * @param virtualProperty

+	 * @param representingElement

+	 * @param facadeMappping

+	 */

+	protected void createUnlimitedNaturalAttribute(VirtualProperty virtualProperty, EClass representingElement, FacadeMappping facadeMappping) {

+		createIntegerAttribute(virtualProperty, representingElement, facadeMappping);

+	}

+

+	/**

+	 * Add a real attribute to a representingElement in the facade metamodel

+	 * 

+	 * @param virtualProperty

+	 * @param representingElement

+	 * @param facadeMappping

+	 */

+	protected void createRealAttribute(VirtualProperty virtualProperty, EClass representingElement, FacadeMappping facadeMappping) {

+		EAttribute attrib = EcoreFactory.eINSTANCE.createEAttribute();

+		attrib.setName(virtualProperty.getAliasName());

+		attrib.setLowerBound(virtualProperty.getLower());

+		attrib.setUpperBound(virtualProperty.getUpper());

+		attrib.setEType(EcorePackage.Literals.EFLOAT);

+

+		representingElement.getEStructuralFeatures().add(attrib);

+		setRepresenting(virtualProperty, attrib, facadeMappping);

+		processedPropertyFeature.put(virtualProperty, attrib);

+	}

+

+	/**

+	 * Generate a eAttribute of eReference in the facade metamodel to represent a virtualProperty

+	 * 

+	 * @param virtualProperty

+	 * @param representingElement

+	 * @param facadeMappping

+	 */

+	protected void processPropertyFeature(VirtualProperty virtualProperty, EClass representingElement, FacadeMappping facadeMappping) {

+

+		if(!processedPropertyFeature.containsKey(virtualProperty)) {

+			Property property = (Property)virtualProperty.getRepresentedElement();

+

+			EObject eType = StereotypeUtils.findEClass((Classifier)((Property)property).getType());

+

+			if(eType == TypesPackage.eINSTANCE.getBoolean()) {

+				createBooleanAttribute(virtualProperty, representingElement, facadeMappping);

+			} else if(eType == TypesPackage.eINSTANCE.getString()) {

+				createStringAttribute(virtualProperty, representingElement, facadeMappping);

+			} else if(eType == TypesPackage.eINSTANCE.getInteger()) {

+				createIntegerAttribute(virtualProperty, representingElement, facadeMappping);

+			} else if(eType == TypesPackage.eINSTANCE.getUnlimitedNatural()) {

+				createUnlimitedNaturalAttribute(virtualProperty, representingElement, facadeMappping);

+			} else if(eType == TypesPackage.eINSTANCE.getReal()) {

+				createRealAttribute(virtualProperty, representingElement, facadeMappping);

+			} else {

+				EClassifier representingType = null;

+				if(eType != null) {

+					if(eType instanceof EClassifier) {

+						VirtualClassifier typeVirtualMetaclass = MetamodelUtils.findClassifierThatMatch(eType, facade);

+						representingType = processedClassifier.get(typeVirtualMetaclass);

+					}

+				} else if(property instanceof ExtensionEnd) {

+					Property otherEnd = ((ExtensionEnd)property).getOtherEnd();

+					VirtualClassifier typeVirtualMetaclass = MetamodelUtils.findMetaclassThatMatch(StereotypeUtils.findEClass((Classifier)otherEnd.getType()), (Stereotype)property.getType(), facade);

+					representingType = processedClassifier.get(typeVirtualMetaclass);

+				} else {

+					VirtualClassifier typeVirtualMetaclass = MetamodelUtils.findClassifierThatMatch(property.getType(), facade);

+					representingType = processedClassifier.get(typeVirtualMetaclass);

+				}

+

+				if(representingType != null) {

+					EStructuralFeature attrib;

+					if(representingType instanceof EDataType) {

+						attrib = EcoreFactory.eINSTANCE.createEAttribute();

+					} else {

+						attrib = EcoreFactory.eINSTANCE.createEReference();

+					}

+

+					attrib.setName(virtualProperty.getAliasName());

+					attrib.setLowerBound(virtualProperty.getLower());

+					attrib.setUpperBound(virtualProperty.getUpper());

+

+					if(attrib instanceof EReference) {

+						if(virtualProperty.getRepresentedElement() instanceof Property) {

+							if(((Property)virtualProperty.getRepresentedElement()).getClass_() instanceof Stereotype) {

+								if(!(((Property)virtualProperty.getRepresentedElement()).getType() instanceof Stereotype) && !(((Property)virtualProperty.getRepresentedElement()).getAssociation() instanceof Extension)) {

+									if(((Property)virtualProperty.getRepresentedElement()).getType().eClass().getEPackage() != UMLPackage.eINSTANCE) {

+										((EReference)attrib).setContainment(true);

+									}

+								}

+							}

+

+							if(virtualProperty.getRepresentedElement() instanceof ExtensionEnd) {

+								((EReference)attrib).setContainment(true);

+							}

+						}

+					}

+

+					if(property.getAssociation() != null) {

+						if(property.getAssociation().getOwnedEnds().size() == 1) {

+							if(property.getAssociation().getMemberEnds().size() == 2) {

+								// Do nothing

+							} else {

+								org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_10 + property.getAssociation());

+							}

+						} else {

+							org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_11 + property.getAssociation());

+						}

+					}

+

+					attrib.setEType(representingType);

+

+					representingElement.getEStructuralFeatures().add(attrib);

+					setRepresenting(virtualProperty, attrib, facadeMappping);

+					//					updateRepresenting(property, attrib, facadeMappping);

+					processedPropertyFeature.put(virtualProperty, attrib);

+				} else {

+					org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_12 + property);

+				}

+

+			}

+		} else {

+			org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_13 + virtualProperty);

+		}

+

+	}

+

+	/**

+	 * Create the generalization relationships of a representingElement of a virtualMetaclass

+	 * 

+	 * @param metaclass

+	 * @param root

+	 * @param facadeMappping

+	 */

+	protected void createGeneralisations(VirtualMetaclass metaclass, EPackage root, FacadeMappping facadeMappping) {

+

+		if(!generalizationProcessed.contains(metaclass)) {

+			EObject representingElement = processedClassifier.get(metaclass);

+			if(representingElement != null) {

+

+				generalizationProcessed.add(metaclass);

+

+				// Add generalization

+				for(VirtualMetaclass father : metaclass.getParents()) {

+					EObject elementReprensentingFather = processedClassifier.get(father);

+					if(representingElement instanceof EClass) {

+						if(elementReprensentingFather instanceof EClass) {

+							((EClass)representingElement).getESuperTypes().add((EClass)elementReprensentingFather);

+						} else {

+							org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_14 + elementReprensentingFather);

+						}

+					} else {

+						org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_15 + representingElement);

+					}

+				}

+			} else {

+				org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_16 + metaclass);

+			}

+		} else {

+			org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_17 + metaclass);

+		}

+	}

+

+	/**

+	 * Generate the properties in the facade metamodel from virtualmetaclass

+	 * 

+	 * @param metaclass

+	 * @param root

+	 * @param facadeMappping

+	 */

+	protected void createProperties(VirtualMetaclass metaclass, EPackage root, FacadeMappping facadeMappping) {

+

+		if(!propertiesProcessed.contains(metaclass)) {

+			EObject representingElement = processedClassifier.get(metaclass);

+			if(representingElement != null) {

+

+				propertiesProcessed.add(metaclass);

+

+				// Create features

+				if(representingElement instanceof EClass) {

+					for(VirtualProperty property : metaclass.getProperties()) {

+						if(property.isKept()) {

+

+							if(property.getRepresentedElement() instanceof EAttribute) {

+								VirtualClassifier typeVirtualMetaclass = MetamodelUtils.findClassifierThatMatch(((EAttribute)property.getRepresentedElement()).getEType(), facade);

+								EClassifier representingType = processedClassifier.get(typeVirtualMetaclass);

+								if(representingType != null) {

+									EAttribute attrib = (EAttribute)EcoreUtil.copy(property.getRepresentedElement());

+									attrib.setName(property.getAliasName());

+									attrib.setEType(representingType);

+

+									((EClass)representingElement).getEStructuralFeatures().add(attrib);

+

+									setRepresenting(property, attrib, facadeMappping);

+									processedProperty.put(property, attrib);

+								} else {

+									org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_18 + property);

+								}

+							} else if(property.getRepresentedElement() instanceof EReference) {

+								VirtualClassifier typeVirtualMetaclass = MetamodelUtils.findClassifierThatMatch(((EReference)property.getRepresentedElement()).getEType(), facade);

+								EClassifier representingType = processedClassifier.get(typeVirtualMetaclass);

+								if(representingType != null) {

+									EReference attrib = (EReference)EcoreUtil.copy(property.getRepresentedElement());

+									attrib.setName(property.getAliasName());

+									attrib.setEType(representingType);

+

+									((EClass)representingElement).getEStructuralFeatures().add(attrib);

+

+									setRepresenting(property, attrib, facadeMappping);

+									processedProperty.put(property, attrib);

+								} else {

+									org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_19 + property);

+								}

+							} else if(property.getRepresentedElement() instanceof Property) {

+								processPropertyFeature(property, (EClass)representingElement, facadeMappping);

+							} else {

+								org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_20 + property.getRepresentedElement());

+							}

+						}

+					}

+				} else {

+					org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_21 + metaclass);

+				}

+			} else {

+				org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_22 + metaclass);

+			}

+		} else {

+			org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_23 + metaclass);

+		}

+

+	}

+

+	/**

+	 * Generate the operations in the facade metamodel from virtualmetaclass

+	 * 

+	 * @param metaclass

+	 * @param root

+	 * @param facadeMappping

+	 */

+	protected void createOperations(VirtualMetaclass metaclass, EPackage root, FacadeMappping facadeMappping) {

+		for(VirtualOperation virtualOperation : metaclass.getOperations()) {

+			if(virtualOperation.isKept()) {

+				EClassifier representing = processedClassifier.get(metaclass);

+

+				if(representing instanceof EClass) {

+					if(virtualOperation.getRepresentedElement() instanceof EOperation) {

+						EOperation eOperation = (EOperation)EcoreUtil.copy(virtualOperation.getRepresentedElement());

+						eOperation.getEParameters().clear();

+						eOperation.setName(virtualOperation.getAliasName());

+						((EClass)representing).getEOperations().add(eOperation);

+

+						setRepresenting(virtualOperation, eOperation, facadeMappping);

+

+						if(eOperation.getEType() != null) {

+							if(eOperation.getEType().getEPackage() == UMLPackage.eINSTANCE || eOperation.getEType().getEPackage() == TypesPackage.eINSTANCE) {

+								VirtualClassifier virtualClassifier = MetamodelUtils.findClassifierThatMatch(eOperation.getEType(), facade);

+								if(virtualClassifier != null) {

+									eOperation.setEType(processedClassifier.get(virtualClassifier));

+								} else {

+									org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_24 + eOperation.getEType());

+								}

+							}

+						}

+

+						for(VirtualParameter virtualParameter : virtualOperation.getParameters()) {

+							EParameter eParameter = (EParameter)EcoreUtil.copy(virtualParameter.getRepresentedElement());

+

+							eParameter.setName(virtualParameter.getAliasName());

+							eParameter.setLowerBound(virtualParameter.getLower());

+							eParameter.setUpperBound(virtualParameter.getUpper());

+							setRepresenting(virtualParameter, eParameter, facadeMappping);

+							if(eParameter.getEType() != null) {

+								if(eParameter.getEType().getEPackage() == UMLPackage.eINSTANCE || eParameter.getEType().getEPackage() == TypesPackage.eINSTANCE) {

+									VirtualClassifier virtualClassifier = MetamodelUtils.findClassifierThatMatch(eParameter.getEType(), facade);

+									if(virtualClassifier != null) {

+										eParameter.setEType(processedClassifier.get(virtualClassifier));

+									} else {

+										org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_25 + eOperation.getEType());

+									}

+								}

+							}

+							eOperation.getEParameters().add(eParameter);

+						}

+

+						EList<EAnnotation> annotation = ((EModelElement)virtualOperation.getRepresentedElement()).getEAnnotations();

+						for(EAnnotation eAnnotation : annotation) {

+							eOperation.getEAnnotations().add(EcoreUtil.copy(eAnnotation));

+						}

+					}

+				}

+			}

+		}

+	}

+

+	/**

+	 * Find the representing eReference that is the eOpposite of a eReference

+	 * 

+	 * @param reference

+	 * @return

+	 */

+	protected EReference findEOpposite(EReference reference) {

+		VirtualMetaclass oppositeTypeVirtualMetaclass = MetamodelUtils.findMetaclassWithNoRealStereoThatMatch((EClassifier)reference.eContainer(), facade);

+

+		VirtualProperty oppositeVirtualProperty = null;

+

+		if(oppositeTypeVirtualMetaclass != null) {

+			for(VirtualProperty virtualProperty : oppositeTypeVirtualMetaclass.getProperties()) {

+				EObject virtualPropertyRepresentedElement = virtualProperty.getRepresentedElement();

+

+				if(virtualPropertyRepresentedElement instanceof ENamedElement) {

+					if(((ENamedElement)virtualPropertyRepresentedElement).getName().equals(reference.getName())) {

+						oppositeVirtualProperty = virtualProperty;

+						break;

+					}

+				} else if(virtualPropertyRepresentedElement instanceof ExtensionEnd) {

+

+				} else {

+					org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_26 + virtualPropertyRepresentedElement);

+				}

+			}

+

+			if(oppositeVirtualProperty != null) {

+				if(processedProperty.containsKey(oppositeVirtualProperty)) {

+					if(processedProperty.get(oppositeVirtualProperty) instanceof EReference) {

+						return (EReference)processedProperty.get(oppositeVirtualProperty);

+					}

+				}

+			}

+		}

+

+		return null;

+	}

+

+	/**

+	 * Find the facade element that represents a umlElement

+	 * 

+	 * @param umlElement

+	 * @param facadeMappping

+	 * @return

+	 */

+	protected EObject findRepresenting(EObject umlElement, FacadeMappping facadeMappping) {

+		for(Mapping mapping : facadeMappping.getMappings()) {

+			if(mapping.getUmlElement() == umlElement) {

+				return mapping.getSpecificDomainElement();

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * Update the eOpposite among eReferences in the facade metamodel

+	 * 

+	 * @param root

+	 * @param facadeMappping

+	 */

+	protected void processEOpposites(EPackage root, FacadeMappping facadeMappping) {

+		TreeIterator<EObject> it = root.eAllContents();

+		while(it.hasNext()) {

+			EObject eObject = (EObject)it.next();

+			if(eObject instanceof EReference) {

+				EReference reference = (EReference)eObject;

+

+				EReference eOpposite = reference.getEOpposite();

+

+				if(eOpposite != null) {

+					EReference representingEOpposite = findEOpposite(eOpposite);

+					if(representingEOpposite == null) {

+						org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_27 + eOpposite);

+					}

+					reference.setEOpposite(representingEOpposite);

+				} else {

+					for(Mapping mapping : facadeMappping.getMappings()) {

+						if(mapping.getSpecificDomainElement() == eObject) {

+							EObject umlElement = mapping.getUmlElement();

+							if(umlElement instanceof Property) {

+								Property otherEnd = ((Property)umlElement).getOtherEnd();

+								if(otherEnd != null) {

+									EObject otherEndRepresenting = findRepresenting(otherEnd, facadeMappping);

+									if(otherEndRepresenting instanceof EReference) {

+										reference.setEOpposite((EReference)otherEndRepresenting);

+									}

+

+								}

+							}

+						}

+					}

+				}

+			}

+		}

+	}

+

+	/**

+	 * Copy significant EAnnotations from represented element to representing elements in the facade metamodel

+	 * 

+	 * @param root

+	 */

+	protected void processEAnnotations(EPackage root) {

+		TreeIterator<EObject> it = root.eAllContents();

+		while(it.hasNext()) {

+			EObject eObject = (EObject)it.next();

+

+			if(eObject instanceof EAnnotation) {

+				String source = ((EAnnotation)eObject).getSource();

+				if(source.equals("subsets") || source.equals("redefines")) { //$NON-NLS-1$ //$NON-NLS-2$

+					ArrayList<EObject> newList = new ArrayList<EObject>();

+					for(EObject reference : ((EAnnotation)eObject).getReferences()) {

+

+						VirtualProperty correspondingVirtualProperty = MetamodelUtils.findProperty(reference, facade);

+						if(correspondingVirtualProperty != null) {

+							EObject representing = processedProperty.get(correspondingVirtualProperty);

+							if(representing != null) {

+								newList.add(representing);

+							} else {

+								representing = processedPropertyFeature.get(correspondingVirtualProperty);

+								if(representing != null) {

+									newList.add(representing);

+								} else {

+									org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_30 + correspondingVirtualProperty);

+								}

+							}

+						} else {

+							org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_31 + reference);

+						}

+					}

+

+					((EAnnotation)eObject).getReferences().clear();

+					((EAnnotation)eObject).getReferences().addAll(newList);

+				}

+			}

+		}

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.swt.events.MouseAdapter#mouseUp(org.eclipse.swt.events.MouseEvent)

+	 * 

+	 * @param event

+	 */

+	@Override

+	public void mouseUp(MouseEvent event) {

+		if(!facade.getVirtualmetamodel().getName().equals("") && !facade.getVirtualmetamodel().getNsPrefix().equals("") && !facade.getVirtualmetamodel().getNsURI().equals("")) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+

+			ProgressMonitorDialog dialog = new ProgressMonitorDialog(Display.getCurrent().getActiveShell());

+			try {

+				dialog.run(false, false, new IRunnableWithProgress() {

+

+					public void run(IProgressMonitor monitor) {

+						monitor.beginTask(Messages.EcoreGenerator_35, IProgressMonitor.UNKNOWN);

+

+						propertiesProcessed.clear();

+						generalizationProcessed.clear();

+						processedProperty.clear();

+						processedLiteral.clear();

+						processedClassifier.clear();

+						processedPropertyFeature.clear();

+

+						// Create files

+						EObject ecoreModel = createEcoreFile();

+						EObject facadeMapppingModel = createMappingFile();

+

+						if(ecoreModel instanceof EPackage) {

+							EPackage root = (EPackage)ecoreModel;

+							if(facadeMapppingModel instanceof FacadeMappping) {

+								FacadeMappping facadeMappping = (FacadeMappping)facadeMapppingModel;

+

+								// Create metaclasses first

+								for(VirtualClassifier classifier : facade.getVirtualmetamodel().getVirtualClassifiers()) {

+									if(classifier.isKept()) {

+										if(!classifier.isUseRepresented()) {

+											if(classifier instanceof VirtualMetaclass) {

+												createMetaclass((VirtualMetaclass)classifier, root, facadeMappping);

+											} else if(classifier instanceof VirtualEnum) {

+												createEnum((VirtualEnum)classifier, root, facadeMappping);

+											} else if(classifier instanceof VirtualDatatype) {

+												createDatatype((VirtualDatatype)classifier, root, facadeMappping);

+											} else {

+												org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_36 + classifier);

+											}

+										}

+									}

+								}

+

+								// Hierarchy and features among metaclasses

+								for(VirtualMetaclass metaclass : MetamodelUtils.getOnlyVirtualMetaclasses(processedClassifier.keySet())) {

+									createGeneralisations(metaclass, root, facadeMappping);

+									createProperties(metaclass, root, facadeMappping);

+									createOperations(metaclass, root, facadeMappping);

+								}

+

+								// Process eOpposites

+								processEOpposites(root, facadeMappping);

+

+								//Clean eAnnotations

+								processEAnnotations(root);

+

+								Diagnostic diagnostic = Diagnostician.INSTANCE.validate(root);

+

+								for(Diagnostic child : diagnostic.getChildren()) {

+									if(child.getCode() == EcoreValidator.DISJOINT_FEATURE_AND_OPERATION_SIGNATURES) {

+										for(Object dataElement : child.getData()) {

+											if(dataElement instanceof EOperation) {

+												EcoreUtil.setSuppressedVisibility((EOperation)dataElement, true);

+											}

+										}

+									}

+								}

+

+								diagnostic = Diagnostician.INSTANCE.validate(root);

+

+								// Sanity check

+								TreeIterator<EObject> it = facade.eAllContents();

+								while(it.hasNext()) {

+									EObject eObject = (EObject)it.next();

+									if(eObject instanceof VirtualElement) {

+										if(((VirtualElement)eObject).getRepresentedElement() == null) {

+											org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.EcoreGenerator_37 + eObject);

+										}

+									}

+								}

+

+								// Save

+								save();

+

+								if(diagnostic.getSeverity() == Diagnostic.OK) {

+									MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), Messages.EcoreGenerator_40, Messages.EcoreGenerator_41);

+

+								} else {

+									DiagnosticDialog dialog = new DiagnosticDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), Messages.EcoreGenerator_42, Messages.EcoreGenerator_43, diagnostic, Diagnostic.OK | Diagnostic.INFO | Diagnostic.WARNING | Diagnostic.ERROR);

+									dialog.open();

+								}

+								monitor.done();

+							}

+						}

+					}

+				});

+			} catch (InvocationTargetException e) {

+				e.printStackTrace();

+			} catch (InterruptedException e) {

+				e.printStackTrace();

+			}

+

+		} else {

+			MessageDialog.openError(Display.getCurrent().getActiveShell(), Messages.EcoreGenerator_44, Messages.EcoreGenerator_45);

+		}

+	}

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/metamodel/MetamodelUtils.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/metamodel/MetamodelUtils.java
new file mode 100644
index 00000000000..a9c86c09035
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/metamodel/MetamodelUtils.java
@@ -0,0 +1,1160 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facadeSpecificEditor.metamodel;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.List;

+

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+import org.eclipse.papyrus.facade.Facade;

+import org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass;

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition;

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinitionKind;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualDatatype;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualEnum;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualLiteral;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualOperation;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualParameter;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelFactory;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

+import org.eclipse.papyrus.facadeSpecificEditor.Messages;

+import org.eclipse.papyrus.facadeSpecificEditor.utils.StereotypeUtils;

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

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

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

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

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

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

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

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

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

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

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

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

+

+public class MetamodelUtils {

+

+	/**

+	 * Check whether the list contains only {@link BaseMetaclass} that represent required extensions

+	 * 

+	 * @param list

+	 * @return true if the list contains only required extensions

+	 */

+	public static boolean containsOnlyRequiredBaseMetaclass(List<BaseMetaclass> list) {

+		if(!list.isEmpty()) {

+			for(BaseMetaclass baseMetaclass : list) {

+				if(baseMetaclass.getExtensionDefinition().getKind() == ExtensionDefinitionKind.MULTI_GENERALIZATION || baseMetaclass.getExtensionDefinition().getKind() == ExtensionDefinitionKind.GENERALIZATION) {

+					if(!baseMetaclass.getExtensionDefinition().getExtension().isRequired()) {

+						return false;

+					}

+				}

+			}

+			return true;

+		} else {

+			return false;

+		}

+	}

+

+	/**

+	 * Check whether the list contains a {@link BaseMetaclass} that represent an abstract stereotype

+	 * 

+	 * @param list

+	 * @return true if the list contains a {@link BaseMetaclass} that represent an abstract stereotype

+	 */

+	public static boolean containsAbstractStereotype(EList<BaseMetaclass> list) {

+		for(BaseMetaclass baseMetaclass : list) {

+			if(baseMetaclass.getExtensionDefinition().getStereotype().isAbstract()) {

+				return true;

+			}

+		}

+		return false;

+	}

+

+	/**

+	 * Extract only {@link VirtualMetaclass} from a list of {@link VirtualClassifier}

+	 * 

+	 * @param list

+	 *        a list containing {@link VirtualClassifier}

+	 * @return

+	 *         a list containing only {@link VirtualMetaclass}

+	 */

+	public static List<VirtualMetaclass> getOnlyVirtualMetaclasses(Collection<VirtualClassifier> list) {

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

+		for(VirtualClassifier classifier : list) {

+			if(classifier instanceof VirtualMetaclass) {

+				result.add((VirtualMetaclass)classifier);

+			}

+		}

+		return result;

+	}

+

+

+	/**

+	 * Check whether the list contains only {@link BaseMetaclass} that represent abstract stereotype

+	 * 

+	 * @param list

+	 * @return

+	 *         true if the list contains only {@link BaseMetaclass} that represent abstract stereotype

+	 */

+	public static boolean containsOnlyAbstractStereotype(EList<BaseMetaclass> list) {

+		if(!list.isEmpty()) {

+			for(BaseMetaclass baseMetaclass : list) {

+				if(!baseMetaclass.getExtensionDefinition().getStereotype().isAbstract()) {

+					return false;

+				}

+			}

+			return true;

+		} else {

+			return false;

+		}

+	}

+

+	/**

+	 * Find a {@link VirtualClassifier} that represents the element in the facade

+	 * 

+	 * @param element

+	 *        the element that must be represented by the {@link VirtualClassifier}

+	 * @param facade

+	 * @return a {@link VirtualClassifier} that represents the element or null

+	 */

+	public static VirtualClassifier findClassifierThatMatch(EObject element, Facade facade) {

+

+		for(VirtualClassifier classifier : facade.getVirtualmetamodel().getVirtualClassifiers()) {

+

+			if(classifier.getRepresentedElement() == element) {

+				if(classifier instanceof VirtualMetaclass) {

+

+					if(((VirtualMetaclass)classifier).getAppliedStereotypes().isEmpty() || onlyOneKind(((VirtualMetaclass)classifier).getAppliedStereotypes(), ExtensionDefinitionKind.FUSION)) {

+						return ((VirtualMetaclass)classifier);

+					}

+

+				} else {

+					return classifier;

+				}

+			}

+		}

+

+		//Try to find as an association

+		if(element instanceof Stereotype) {

+			for(VirtualClassifier classifier : facade.getVirtualmetamodel().getVirtualClassifiers()) {

+				if(classifier instanceof VirtualMetaclass) {

+					if(((VirtualMetaclass)classifier).getAppliedStereotypes().size() == 1) {

+						if(onlyOneKind(((VirtualMetaclass)classifier).getAppliedStereotypes(), ExtensionDefinitionKind.ASSOCIATION)) {

+							if(((VirtualMetaclass)classifier).getAppliedStereotypes().get(0).getExtensionDefinition().getStereotype() == element) {

+								return classifier;

+							}

+						}

+					}

+				}

+			}

+		}

+

+		if(element instanceof Classifier) {

+			EClassifier foundEClass = StereotypeUtils.findEClass((Classifier)element);

+			if(foundEClass != null) {

+				return findClassifierThatMatch(foundEClass, facade);

+			}

+		}

+

+		return null;

+	}

+

+	/**

+	 * Find a {@link VirtualClassifier} that represents the element in the facade but that doesn't have a stereotype applied

+	 * 

+	 * @param element

+	 * @param facade

+	 * @return

+	 */

+	public static VirtualMetaclass findMetaclassWithNoRealStereoThatMatch(EObject element, Facade facade) {

+		for(VirtualClassifier classifier : facade.getVirtualmetamodel().getVirtualClassifiers()) {

+

+			if(classifier instanceof VirtualMetaclass) {

+				if(((VirtualMetaclass)classifier).getRepresentedElement() == element) {

+					if(((VirtualMetaclass)classifier).getAppliedStereotypes().isEmpty() || onlyOneKind(((VirtualMetaclass)classifier).getAppliedStereotypes(), ExtensionDefinitionKind.FUSION)) {

+

+						return ((VirtualMetaclass)classifier);

+					}

+				}

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * Find a {@link VirtualProperty} that represents the feature in the facade

+	 * 

+	 * @param feature

+	 * @param facade

+	 * @return

+	 */

+	public static VirtualProperty findProperty(EObject feature, Facade facade) {

+		for(VirtualClassifier classifier : facade.getVirtualmetamodel().getVirtualClassifiers()) {

+			if(classifier instanceof VirtualMetaclass)

+				for(VirtualProperty property : ((VirtualMetaclass)classifier).getProperties()) {

+					if(property.getRepresentedElement() == feature) {

+						return property;

+					}

+				}

+		}

+		return null;

+	}

+

+	/**

+	 * Find the BaseMetaclass that represents the actual base metaclass among the BaseMetaclasses of an ExtensionDefinition

+	 * 

+	 * @param extensionDefinition

+	 * @return

+	 */

+	public static BaseMetaclass findActualBaseMetaclass(ExtensionDefinition extensionDefinition) {

+		for(BaseMetaclass baseMetaclass : extensionDefinition.getBaseMetaclasses()) {

+			if(baseMetaclass.getBase() == StereotypeUtils.findBase(extensionDefinition)) {

+				return baseMetaclass;

+

+			}

+		}

+		return null;

+

+	}

+

+	/**

+	 * Find a {@link VirtualMetaclass} that represents the element in the facade

+	 * 

+	 * @param element

+	 * @param stereo

+	 * @param facade

+	 * @return

+	 */

+	public static VirtualMetaclass findMetaclassThatMatch(EObject element, Stereotype stereo, Facade facade) {

+		for(VirtualClassifier classifier : facade.getVirtualmetamodel().getVirtualClassifiers()) {

+			if(classifier.getRepresentedElement() == element) {

+

+				if(classifier instanceof VirtualMetaclass) {

+					if(((VirtualMetaclass)classifier).getAppliedStereotypes().size() == 1) {

+

+						if(((VirtualMetaclass)classifier).getAppliedStereotypes().get(0).getExtensionDefinition().getStereotype() == stereo) {

+							return ((VirtualMetaclass)classifier);

+						}

+

+					}

+				}

+			}

+

+		}

+		return null;

+	}

+

+	/**

+	 * Check whether the stereotype represented by the {@link ExtensionDefinition} is a the same as the stereotype related to the extension

+	 * represented by this {@link ExtensionDefinition}

+	 * 

+	 * @param extensionDefinition

+	 * @return

+	 */

+	public static boolean isActualExtensionDefinition(ExtensionDefinition extensionDefinition) {

+

+		if(extensionDefinition.getExtension().getStereotype() == extensionDefinition.getStereotype()) {

+			return true;

+		}

+

+		return false;

+

+	}

+

+	/**

+	 * Check whether the list of {@link BaseMetaclass} contains only {@link BaseMetaclass} that are of the same {@link ExtensionDefinitionKind}

+	 * 

+	 * @param list

+	 * @param kind

+	 * @return

+	 */

+	public static boolean onlyOneKind(List<BaseMetaclass> list, ExtensionDefinitionKind kind) {

+		for(BaseMetaclass baseMetaclass : list) {

+			if(baseMetaclass.getExtensionDefinition().getKind() != kind) {

+				return false;

+			}

+		}

+		return true;

+	}

+

+	/**

+	 * Check whether the stereotype represented by an {@link ExtensionDefinition} is also represented by another {@link ExtensionDefinition}

+	 * 

+	 * @param extensionDefinition

+	 * @return

+	 */

+	public static boolean hasSiblings(ExtensionDefinition extensionDefinition) {

+		Facade facade = extensionDefinition.getFacade();

+

+		for(ExtensionDefinition otherExtensionDefinition : facade.getExtensionDefinitions()) {

+			if(extensionDefinition != otherExtensionDefinition) {

+				if(extensionDefinition.getStereotype() == otherExtensionDefinition.getStereotype()) {

+					return true;

+				}

+

+			}

+		}

+		return false;

+	}

+

+	public static ArrayList<VirtualMetaclass> findThoseToSpecialize(VirtualMetaclass metaclassInput, Facade facade) {

+		ArrayList<VirtualMetaclass> output = new ArrayList<VirtualMetaclass>();

+		BaseMetaclass requiredBaseMetaclass = null;

+

+		// Find the required one

+		for(BaseMetaclass baseMetaclass : metaclassInput.getAppliedStereotypes()) {

+			if(baseMetaclass.getExtensionDefinition().getExtension().isRequired()) {

+				requiredBaseMetaclass = baseMetaclass;

+				break;

+			}

+		}

+

+		if(requiredBaseMetaclass != null) {

+			output.add(findMetaclassThatMatch((EClass)requiredBaseMetaclass.getBase(), requiredBaseMetaclass.getExtensionDefinition().getStereotype(), facade));

+		} else {

+			output.add(findMetaclassWithNoRealStereoThatMatch((EClass)metaclassInput.getRepresentedElement(), facade));

+		}

+

+		return output;

+

+	}

+

+	/**

+	 * Get all {@link VirtualMetaclass} (i.e. recursively) that are generals of a {@link VirtualMetaclass}

+	 * 

+	 * @param metaclass

+	 * @return

+	 */

+	public static List<VirtualMetaclass> getAllFathers(VirtualMetaclass metaclass) {

+

+		List<VirtualMetaclass> toProcess = new ArrayList<VirtualMetaclass>();

+		List<VirtualMetaclass> output = new ArrayList<VirtualMetaclass>();

+

+		toProcess.addAll(getFathers(metaclass));

+		while(!toProcess.isEmpty()) {

+			VirtualMetaclass father = toProcess.remove(0);

+			output.add(father);

+			toProcess.addAll(getFathers(father));

+		}

+

+		return output;

+

+	}

+

+	/**

+	 * Get {@link VirtualMetaclass} that are generals of a {@link VirtualMetaclass}

+	 * 

+	 * @param metaclass

+	 * @return

+	 */

+	public static List<VirtualMetaclass> getFathers(VirtualMetaclass metaclass) {

+		List<VirtualMetaclass> output = new ArrayList<VirtualMetaclass>();

+

+		Facade facade = ((VirtualMetaclass)metaclass).getMetamodel().getFacade();

+

+		if(metaclass.getAppliedStereotypes().isEmpty() || onlyOneKind(metaclass.getAppliedStereotypes(), ExtensionDefinitionKind.FUSION)) {

+			if(metaclass.getRepresentedElement() instanceof EClass) {

+				EList<EClass> supers = ((EClass)metaclass.getRepresentedElement()).getESuperTypes();

+				for(EClass eClass : supers) {

+					VirtualMetaclass meta = findMetaclassWithNoRealStereoThatMatch(eClass, facade);

+					if(meta != null) {

+						output.add(meta);

+					}

+				}

+			}

+		} else if(onlyOneKind(metaclass.getAppliedStereotypes(), ExtensionDefinitionKind.MULTI_GENERALIZATION)) {

+			if(MetamodelUtils.containsOnlyRequiredBaseMetaclass(metaclass.getAppliedStereotypes())) {

+				if(metaclass.getAppliedStereotypes().get(0).getExtensionDefinition().getStereotype().getGenerals().isEmpty()) {

+					output.add(findMetaclassWithNoRealStereoThatMatch((EClass)metaclass.getAppliedStereotypes().get(0).getBase(), facade));

+				} else {

+					EList<Classifier> supersStereo = metaclass.getAppliedStereotypes().get(0).getExtensionDefinition().getStereotype().getGenerals();

+					for(Classifier superStereo : supersStereo) {

+						output.add(findMetaclassThatMatch(metaclass.getRepresentedElement(), (Stereotype)superStereo, facade));

+					}

+				}

+			} else {

+				// Get the one that we must extend

+				output.addAll(findThoseToSpecialize(metaclass, facade));

+			}

+

+			//Add the StereotypeInterface to generals

+			for(BaseMetaclass stereotype : metaclass.getAppliedStereotypes()) {

+				output.add(findStereotypeInterface(stereotype));

+			}

+

+		} else if(onlyOneKind(metaclass.getAppliedStereotypes(), ExtensionDefinitionKind.ASSOCIATION)) {

+			for(BaseMetaclass baseMetaclass : metaclass.getAppliedStereotypes()) {

+				EList<Classifier> supersStereo = baseMetaclass.getExtensionDefinition().getStereotype().getGenerals();

+				for(Classifier superStereo : supersStereo) {

+					output.add(findMetaclassThatMatch(metaclass.getRepresentedElement(), (Stereotype)superStereo, facade));

+				}

+			}

+

+			if(hasSiblings(metaclass.getAppliedStereotypes().get(0).getExtensionDefinition())) {

+				//Add the StereotypeInterface to generals

+				for(BaseMetaclass stereotype : metaclass.getAppliedStereotypes()) {

+					output.add(findStereotypeInterface(stereotype));

+				}

+			}

+		} else if(onlyOneKind(metaclass.getAppliedStereotypes(), ExtensionDefinitionKind.GENERALIZATION)) {

+			for(BaseMetaclass baseMetaclass : metaclass.getAppliedStereotypes()) {

+				EList<Classifier> supersStereo = baseMetaclass.getExtensionDefinition().getStereotype().getGenerals();

+				if(!supersStereo.isEmpty()) {

+					for(Classifier superStereo : supersStereo) {

+						output.add(findMetaclassThatMatch(metaclass.getRepresentedElement(), (Stereotype)superStereo, facade));

+					}

+				} else {

+					output.add(findMetaclassWithNoRealStereoThatMatch(StereotypeUtils.findBase(metaclass.getAppliedStereotypes().get(0).getExtensionDefinition()), facade));

+				}

+			}

+

+			if(hasSiblings(metaclass.getAppliedStereotypes().get(0).getExtensionDefinition())) {

+				//Add the StereotypeInterface to generals

+				for(BaseMetaclass stereotype : metaclass.getAppliedStereotypes()) {

+					output.add(findStereotypeInterface(stereotype));

+				}

+			}

+		} else {

+			org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.MetamodelUtils_0 + metaclass.getAliasName());

+		}

+

+		return output;

+	}

+

+	public static VirtualMetaclass findStereotypeInterface(BaseMetaclass stereotype) {

+		List<VirtualMetaclass> allVirtualMetaclasses = getOnlyVirtualMetaclasses(stereotype.getExtensionDefinition().getFacade().getVirtualmetamodel().getVirtualClassifiers());

+

+		for(VirtualMetaclass virtualMetaclass : allVirtualMetaclasses) {

+			if(virtualMetaclass.isStereotypeInterface()) {

+				if(virtualMetaclass.getRepresentedElement() == stereotype.getExtensionDefinition().getStereotype()) {

+					return virtualMetaclass;

+				}

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * Get {@link VirtualMetaclass} that are children (through generalization relationship) of a {@link VirtualMetaclass}

+	 * 

+	 * @param parent

+	 * @return

+	 */

+	public static List<VirtualMetaclass> getChildren(VirtualMetaclass parent) {

+		List<VirtualMetaclass> children = new ArrayList<VirtualMetaclass>();

+

+		for(VirtualClassifier classifier : parent.getMetamodel().getVirtualClassifiers()) {

+

+			if(classifier instanceof VirtualMetaclass)

+				if(MetamodelUtils.getFathers((VirtualMetaclass)classifier).contains(parent)) {

+					children.add((VirtualMetaclass)classifier);

+				}

+		}

+

+		return children;

+	}

+

+	/**

+	 * Get all {@link VirtualMetaclass} (i.e. recursively) that are children (through generalization relationship) of a {@link VirtualMetaclass}

+	 * 

+	 * @param parent

+	 * @return

+	 */

+	public static List<VirtualMetaclass> getAllChildren(VirtualMetaclass parent) {

+		List<VirtualMetaclass> toProcess = new ArrayList<VirtualMetaclass>();

+		List<VirtualMetaclass> output = new ArrayList<VirtualMetaclass>();

+

+		toProcess.addAll(getChildren(parent));

+		while(!toProcess.isEmpty()) {

+			VirtualMetaclass child = toProcess.remove(0);

+			output.add(child);

+			toProcess.addAll(getChildren(child));

+		}

+

+		return output;

+	}

+

+	public static boolean mustBeAbstract(VirtualMetaclass metaclass) {

+		if(metaclass.isStereotypeInterface()) {

+			return true;

+		}

+		if(metaclass.getAppliedStereotypes().isEmpty()) {

+			if(metaclass.getRepresentedElement() instanceof EClass) {

+				if(((EClass)metaclass.getRepresentedElement()).isAbstract()) {

+					return true;

+				} else {

+

+					List<VirtualMetaclass> children = getChildren(metaclass);

+

+					if(containsOnlyRequired(children)) {

+						return true;

+					}

+				}

+			}

+		} else {

+			if(containsOnlyAbstractStereotype(metaclass.getAppliedStereotypes())) {

+				return true;

+			}

+		}

+

+		return false;

+

+	}

+

+	private static boolean containsOnlyRequired(List<VirtualMetaclass> children) {

+		if(!children.isEmpty()) {

+			for(VirtualMetaclass metaclass : children) {

+				if(!containsOnlyRequiredBaseMetaclass(metaclass.getAppliedStereotypes())) {

+					return false;

+				}

+			}

+			return true;

+		} else {

+			return false;

+		}

+	}

+

+	public static boolean canBeAbstract(VirtualMetaclass metaclass) {

+

+		if(!mustBeAbstract(metaclass)) {

+			for(VirtualMetaclass child : getAllChildren(metaclass)) {

+				if(child.isKept()) {

+					if(!child.isAbstract()) {

+						return true;

+					}

+				}

+			}

+		}

+		return false;

+

+	}

+

+	public static boolean isStereotypableByMetaclassKind(EClass classifier, Facade facade) {

+		for(ExtensionDefinition extensionDefinition : facade.getExtensionDefinitions()) {

+			if(extensionDefinition.getKind() == ExtensionDefinitionKind.MULTI_GENERALIZATION) {

+				for(BaseMetaclass baseMetaclass : extensionDefinition.getBaseMetaclasses()) {

+					if(baseMetaclass.isPossible() == true) {

+						if(baseMetaclass.getBase() == classifier) {

+							return true;

+						}

+					}

+				}

+			}

+		}

+		return false;

+	}

+

+	public static List<Stereotype> getStereotypesFromBaseMetaclass(List<BaseMetaclass> list) {

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

+		for(BaseMetaclass baseMetaclass : list) {

+			if(!result.contains(baseMetaclass.getExtensionDefinition().getStereotype())) {

+				result.add(baseMetaclass.getExtensionDefinition().getStereotype());

+			}

+		}

+		return result;

+	}

+

+	public static VirtualClassifier addMetaclass(EObject representedElement, List<BaseMetaclass> stereotypes, String alias, Facade facade, AdapterFactoryEditingDomain editingDomain) {

+

+		VirtualClassifier output = null;

+

+		//Verify that the virtualmetaclass doesn't exist already

+		boolean found = false;

+		for(VirtualClassifier classifier : facade.getVirtualmetamodel().getVirtualClassifiers()) {

+

+			if(classifier.getRepresentedElement() == representedElement) {

+				if(stereotypes != null) {

+					List<Stereotype> classifierStereotypes = getStereotypesFromBaseMetaclass(((VirtualMetaclass)classifier).getAppliedStereotypes());

+					List<Stereotype> stereotypesToAdd = getStereotypesFromBaseMetaclass(stereotypes);

+					if(classifierStereotypes.size() == stereotypesToAdd.size()) {

+

+						if(classifierStereotypes.containsAll(stereotypesToAdd)) {

+							output = ((VirtualMetaclass)classifier);

+							found = true;

+							break;

+						}

+					}

+				} else {

+					output = classifier;

+					found = true;

+					break;

+				}

+

+			}

+		}

+

+		if(!found) {

+			if(representedElement instanceof PrimitiveType) {

+				VirtualDatatype datatype = VirtualmetamodelFactory.eINSTANCE.createVirtualDatatype();

+				datatype.setKept(true);

+				datatype.setRepresentedElement(representedElement);

+				datatype.setAliasName(alias);

+				AddCommand command = new AddCommand(editingDomain, facade.getVirtualmetamodel(), VirtualmetamodelPackage.eINSTANCE.getVirtualMetamodel_VirtualClassifiers(), datatype);

+				editingDomain.getCommandStack().execute(command);

+

+				output = datatype;

+			} else {

+				VirtualMetaclass metaclass = VirtualmetamodelFactory.eINSTANCE.createVirtualMetaclass();

+				metaclass.setKept(true);

+				metaclass.setRepresentedElement(representedElement);

+				metaclass.setAbstract(false);

+				metaclass.setStereotypeInterface(false);

+				if(stereotypes != null) {

+					metaclass.getAppliedStereotypes().addAll(stereotypes);

+				}

+				metaclass.setAliasName(alias);

+				AddCommand command = new AddCommand(editingDomain, facade.getVirtualmetamodel(), VirtualmetamodelPackage.eINSTANCE.getVirtualMetamodel_VirtualClassifiers(), metaclass);

+				editingDomain.getCommandStack().execute(command);

+

+				output = metaclass;

+			}

+		} else {

+			org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.MetamodelUtils_1 + representedElement);

+		}

+

+		return output;

+	}

+

+	public static VirtualEnum addEnum(EObject representedElement, String alias, Facade facade, AdapterFactoryEditingDomain editingDomain) {

+		VirtualEnum output = null;

+

+		boolean found = false;

+		for(VirtualClassifier classifier : facade.getVirtualmetamodel().getVirtualClassifiers()) {

+			if(classifier instanceof VirtualEnum)

+				if(classifier.getRepresentedElement() == representedElement) {

+					output = (VirtualEnum)classifier;

+					found = true;

+					break;

+				}

+		}

+

+		if(!found) {

+

+			VirtualEnum enumeration = VirtualmetamodelFactory.eINSTANCE.createVirtualEnum();

+			enumeration.setKept(true);

+			enumeration.setRepresentedElement(representedElement);

+			enumeration.setAliasName(alias);

+			AddCommand command = new AddCommand(editingDomain, facade.getVirtualmetamodel(), VirtualmetamodelPackage.eINSTANCE.getVirtualMetamodel_VirtualClassifiers(), enumeration);

+			editingDomain.getCommandStack().execute(command);

+

+			if(enumeration.getRepresentedElement() instanceof EEnum) {

+				EList<EEnumLiteral> literals = ((EEnum)enumeration.getRepresentedElement()).getELiterals();

+				for(EEnumLiteral literal : literals) {

+					MetamodelUtils.addLiteral(enumeration, literal, literal.getName(), facade, editingDomain);

+				}

+			} else if(enumeration.getRepresentedElement() instanceof Enumeration) {

+				EList<EnumerationLiteral> literals = ((Enumeration)enumeration.getRepresentedElement()).getOwnedLiterals();

+				for(EnumerationLiteral literal : literals) {

+					MetamodelUtils.addLiteral(enumeration, literal, literal.getName(), facade, editingDomain);

+				}

+			} else {

+				org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.MetamodelUtils_2 + enumeration.getRepresentedElement());

+			}

+

+			output = enumeration;

+		}

+

+		return output;

+	}

+

+	public static VirtualOperation addOperation(VirtualMetaclass metaclass, EObject operationElement, String alias, Facade facade, AdapterFactoryEditingDomain editingDomain) {

+		VirtualOperation output = null;

+

+		boolean found = false;

+		for(VirtualOperation operation : metaclass.getOperations()) {

+			if(operation.getRepresentedElement() == operationElement) {

+				output = operation;

+				found = true;

+				break;

+			}

+		}

+

+		if(!found) {

+			VirtualOperation operation = VirtualmetamodelFactory.eINSTANCE.createVirtualOperation();

+			operation.setKept(true);

+			operation.setRepresentedElement(operationElement);

+			operation.setAliasName(alias);

+			processMultiplicities(operationElement, operation);

+

+			processTypedElement(operationElement, facade, editingDomain);

+

+			AddCommand command = new AddCommand(editingDomain, metaclass, VirtualmetamodelPackage.eINSTANCE.getVirtualMetaclass_Operations(), operation);

+			editingDomain.getCommandStack().execute(command);

+

+			if(operation.getRepresentedElement() instanceof EOperation) {

+				EList<EParameter> parameters = ((EOperation)operation.getRepresentedElement()).getEParameters();

+				for(EParameter param : parameters) {

+					MetamodelUtils.addParameter(operation, param, param.getName(), facade, editingDomain);

+				}

+			} else if(operation.getRepresentedElement() instanceof Operation) {

+				EList<Parameter> parameters = ((Operation)operation.getRepresentedElement()).getOwnedParameters();

+				for(Parameter param : parameters) {

+					MetamodelUtils.addParameter(operation, param, param.getName(), facade, editingDomain);

+				}

+			} else {

+				org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.MetamodelUtils_3 + operation.getRepresentedElement());

+			}

+

+			output = operation;

+		}

+

+		return output;

+	}

+

+	public static VirtualDatatype addDatatype(EObject representedElement, String alias, Facade facade, AdapterFactoryEditingDomain editingDomain) {

+

+		VirtualDatatype output = null;

+

+		boolean found = false;

+		for(VirtualClassifier classifier : facade.getVirtualmetamodel().getVirtualClassifiers()) {

+			if(classifier instanceof VirtualDatatype)

+				if(classifier.getRepresentedElement() == representedElement) {

+					output = (VirtualDatatype)classifier;

+					found = true;

+					break;

+				}

+		}

+

+		if(!found) {

+

+			VirtualDatatype datatype = VirtualmetamodelFactory.eINSTANCE.createVirtualDatatype();

+			datatype.setKept(true);

+			datatype.setRepresentedElement(representedElement);

+			datatype.setAliasName(alias);

+			AddCommand command = new AddCommand(editingDomain, facade.getVirtualmetamodel(), VirtualmetamodelPackage.eINSTANCE.getVirtualMetamodel_VirtualClassifiers(), datatype);

+			editingDomain.getCommandStack().execute(command);

+

+			output = datatype;

+

+		}

+

+		return output;

+	}

+

+	public static VirtualMetaclass addStereotypeInterface(Stereotype representedElement, String alias, Facade facade, AdapterFactoryEditingDomain editingDomain) {

+

+		VirtualMetaclass output = null;

+

+		boolean found = false;

+		for(VirtualClassifier classifier : facade.getVirtualmetamodel().getVirtualClassifiers()) {

+			if(classifier instanceof VirtualMetaclass)

+				if(((VirtualMetaclass)classifier).isStereotypeInterface()) {

+					if(classifier.getRepresentedElement() == representedElement) {

+						output = (VirtualMetaclass)classifier;

+						found = true;

+						break;

+					}

+				}

+		}

+

+		if(!found) {

+			VirtualMetaclass metaclass = VirtualmetamodelFactory.eINSTANCE.createVirtualMetaclass();

+			metaclass.setKept(true);

+			metaclass.setRepresentedElement(representedElement);

+			metaclass.setAliasName(alias);

+			metaclass.setAbstract(true);

+			metaclass.setStereotypeInterface(true);

+			AddCommand command = new AddCommand(editingDomain, facade.getVirtualmetamodel(), VirtualmetamodelPackage.eINSTANCE.getVirtualMetamodel_VirtualClassifiers(), metaclass);

+			editingDomain.getCommandStack().execute(command);

+

+			output = metaclass;

+		} else {

+			org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.MetamodelUtils_4 + representedElement);

+		}

+

+		return output;

+	}

+

+	public static VirtualClassifier createForType(EObject classifier, Facade facade, AdapterFactoryEditingDomain editingDomain) {

+		if(classifier instanceof EClass) {

+			VirtualClassifier metaclass = MetamodelUtils.addMetaclass(classifier, null, ((EClass)classifier).getName(), facade, editingDomain);

+			return metaclass;

+		} else if(classifier instanceof EDataType) {

+			if(classifier instanceof EEnum) {

+				VirtualEnum enumeration = MetamodelUtils.addEnum(classifier, ((EEnum)classifier).getName(), facade, editingDomain);

+				return enumeration;

+			} else {

+				VirtualDatatype datatype = MetamodelUtils.addDatatype(classifier, ((EDataType)classifier).getName(), facade, editingDomain);

+				return datatype;

+			}

+		} else if(classifier instanceof DataType) {

+			VirtualClassifier dataype = MetamodelUtils.addMetaclass(classifier, null, ((DataType)classifier).getName(), facade, editingDomain);

+			return dataype;

+		} else if(classifier instanceof PrimitiveType) {

+			//			VirtualClassifier dataype = MetamodelUtils.addMetaclass(classifier, null, ((PrimitiveType)classifier).getName(), facade, editingDomain);

+			//			return dataype;

+		}

+		return null;

+	}

+

+	public static void processMultiplicities(EObject element, VirtualTypedElement virtualElement) {

+		int lower = 0;

+		int upper = 0;

+

+		if(element instanceof ETypedElement) {

+			lower = ((ETypedElement)element).getLowerBound();

+			upper = ((ETypedElement)element).getUpperBound();

+		} else if(element instanceof MultiplicityElement) {

+

+			lower = ((MultiplicityElement)element).getLower();

+			upper = ((MultiplicityElement)element).getUpper();

+		}

+

+		virtualElement.setLower(lower);

+		virtualElement.setUpper(upper);

+	}

+

+	public static void processTypedElement(EObject typedElement, Facade facade, AdapterFactoryEditingDomain editingDomain) {

+		if(typedElement instanceof ETypedElement) {

+

+			EClassifier eType = ((ETypedElement)typedElement).getEType();

+

+			if(!containtsType(eType, facade)) {

+				VirtualClassifier newType = createForType(eType, facade, editingDomain);

+				if(newType instanceof VirtualMetaclass) {

+					createProperties((VirtualMetaclass)newType, facade, editingDomain);

+				}

+			}

+		} else if(typedElement instanceof TypedElement) {

+

+			if(!(((TypedElement)typedElement).getType() instanceof Stereotype)) {

+				if(((TypedElement)typedElement).getType() instanceof Enumeration) {

+					EObject eType = ((TypedElement)typedElement).getType();

+					String name = ((TypedElement)typedElement).getType().getName();

+					if(!containtsType(eType, facade)) {

+						MetamodelUtils.addEnum(eType, name, facade, editingDomain);

+					}

+				} else if(((TypedElement)typedElement).getType() instanceof DataType) {

+					if(((TypedElement)typedElement).getType() instanceof PrimitiveType) {

+						//Check if it is a UML primitivetype

+						EObject eType = StereotypeUtils.findEClass((Classifier)((TypedElement)typedElement).getType());

+						if(eType != null) {

+							if(!containtsType(eType, facade)) {

+								VirtualClassifier virtualClassifier = createForType((EClassifier)eType, facade, editingDomain);

+								if(virtualClassifier instanceof VirtualMetaclass) {

+									createProperties((VirtualMetaclass)virtualClassifier, facade, editingDomain);

+								}

+							}

+						} else {

+							createForType(((TypedElement)typedElement).getType(), facade, editingDomain);

+						}

+					} else {

+

+						VirtualClassifier virtualClassifier = createForType(((TypedElement)typedElement).getType(), facade, editingDomain);

+						if(virtualClassifier instanceof VirtualMetaclass) {

+							createProperties((VirtualMetaclass)virtualClassifier, facade, editingDomain);

+						}

+

+					}

+				} else if(((TypedElement)typedElement).getType() instanceof org.eclipse.uml2.uml.Class) {

+					EClassifier eClass = StereotypeUtils.findEClass((Classifier)((TypedElement)typedElement).getType());

+					if(eClass == null) {

+						org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.MetamodelUtils_5);

+					}

+				} else {

+					org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.MetamodelUtils_6 + ((TypedElement)typedElement).getType());

+				}

+			}

+

+		} else {

+			org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.MetamodelUtils_7 + typedElement);

+		}

+	}

+

+	public static void addProperty(VirtualMetaclass metaclass, EObject propertyElement, EObject type, String alias, Facade facade, AdapterFactoryEditingDomain editingDomain) {

+

+		boolean found = false;

+		for(VirtualProperty property : metaclass.getProperties()) {

+			if(property.getRepresentedElement() == propertyElement) {

+				found = true;

+			}

+		}

+

+		if(!found) {

+

+			processTypedElement(propertyElement, facade, editingDomain);

+

+			VirtualProperty property = VirtualmetamodelFactory.eINSTANCE.createVirtualProperty();

+			property.setKept(true);

+			property.setAliasName(alias);

+			property.setRepresentedElement(propertyElement);

+			processMultiplicities(propertyElement, property);

+

+			AddCommand command = new AddCommand(editingDomain, metaclass, VirtualmetamodelPackage.eINSTANCE.getVirtualMetaclass_Properties(), property);

+			editingDomain.getCommandStack().execute(command);

+		} else {

+			org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.MetamodelUtils_8 + propertyElement);

+		}

+

+	}

+

+	public static VirtualParameter addParameter(VirtualOperation operation, EObject parameterElement, String alias, Facade facade, AdapterFactoryEditingDomain editingDomain) {

+		VirtualParameter virtualParameter = VirtualmetamodelFactory.eINSTANCE.createVirtualParameter();

+		virtualParameter.setKept(true);

+		virtualParameter.setAliasName(alias);

+		virtualParameter.setRepresentedElement(parameterElement);

+		processMultiplicities(parameterElement, virtualParameter);

+

+		processTypedElement(parameterElement, facade, editingDomain);

+

+		AddCommand command = new AddCommand(editingDomain, operation, VirtualmetamodelPackage.eINSTANCE.getVirtualOperation_Parameters(), virtualParameter);

+		editingDomain.getCommandStack().execute(command);

+

+		return virtualParameter;

+	}

+

+	public static VirtualLiteral addLiteral(VirtualEnum enumeration, EObject element, String alias, Facade facade, AdapterFactoryEditingDomain editingDomain) {

+		VirtualLiteral literal = VirtualmetamodelFactory.eINSTANCE.createVirtualLiteral();

+		literal.setKept(true);

+		literal.setAliasName(alias);

+		literal.setRepresentedElement(element);

+

+		AddCommand command = new AddCommand(editingDomain, enumeration, VirtualmetamodelPackage.eINSTANCE.getVirtualEnum_Literals(), literal);

+		editingDomain.getCommandStack().execute(command);

+

+		return literal;

+	}

+

+	public static void createStereotypeProperties(VirtualMetaclass metaclass, Facade facade, AdapterFactoryEditingDomain editingDomain) {

+		// Add stereotype properties only if it is not already added to a father

+

+		for(BaseMetaclass appliedStereotype : metaclass.getAppliedStereotypes()) {

+			List<VirtualMetaclass> allFathers = MetamodelUtils.getAllFathers(metaclass);

+

+			boolean alreadyApplied = false;

+			for(VirtualMetaclass virtualMetaclass : allFathers) {

+				if(virtualMetaclass.getAppliedStereotypes().contains(appliedStereotype)) {

+					alreadyApplied = true;

+				}

+			}

+

+			if(!alreadyApplied) {

+

+				if(!hasSiblings(appliedStereotype.getExtensionDefinition())) {

+

+					EList<Property> stereotypeProperties = appliedStereotype.getExtensionDefinition().getStereotype().getAttributes();

+					for(Property property : stereotypeProperties) {

+

+						if(appliedStereotype.getExtensionDefinition().getKind() == ExtensionDefinitionKind.ASSOCIATION) {

+							if(!property.getName().startsWith(Extension.METACLASS_ROLE_PREFIX)) {

+								MetamodelUtils.addProperty(metaclass, property, property.getType(), property.getName(), facade, editingDomain);

+							} else {

+								if(appliedStereotype.getExtensionDefinition().getExtension().getMemberEnds().contains(property)) {

+									MetamodelUtils.addProperty(metaclass, property, property.getType(), property.getName(), facade, editingDomain);

+								}

+							}

+						} else {

+							if(!property.getName().startsWith(Extension.METACLASS_ROLE_PREFIX)) {

+								MetamodelUtils.addProperty(metaclass, property, property.getType(), property.getName(), facade, editingDomain);

+							}

+						}

+					}

+

+				} else {

+					EList<Property> stereotypeProperties = appliedStereotype.getExtensionDefinition().getStereotype().getAttributes();

+					for(Property property : stereotypeProperties) {

+

+						if(appliedStereotype.getExtensionDefinition().getKind() == ExtensionDefinitionKind.ASSOCIATION) {

+							if(property.getName().startsWith(Extension.METACLASS_ROLE_PREFIX)) {

+								if(appliedStereotype.getExtensionDefinition().getExtension().getMemberEnds().contains(property)) {

+									MetamodelUtils.addProperty(metaclass, property, property.getType(), property.getName(), facade, editingDomain);

+								}

+							}

+						}

+					}

+				}

+			} else {

+				org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.MetamodelUtils_9);

+			}

+		}

+	}

+

+	public static void createProperties(VirtualMetaclass metaclass, Facade facade, AdapterFactoryEditingDomain editingDomain) {

+		if(metaclass.isStereotypeInterface()) {

+			EList<Property> stereotypeProperties = ((Stereotype)metaclass.getRepresentedElement()).getAttributes();

+			for(Property property : stereotypeProperties) {

+				if(!property.getName().startsWith(Extension.METACLASS_ROLE_PREFIX)) {

+					MetamodelUtils.addProperty(metaclass, property, property.getType(), property.getName(), facade, editingDomain);

+				}

+			}

+		} else {

+			if(!onlyOneKind(metaclass.getAppliedStereotypes(), ExtensionDefinitionKind.MULTI_GENERALIZATION) || metaclass.getAppliedStereotypes().isEmpty()) {

+				if(metaclass.getRepresentedElement() instanceof EClass) {

+					if(onlyOneKind(metaclass.getAppliedStereotypes(), ExtensionDefinitionKind.FUSION) || metaclass.getAppliedStereotypes().isEmpty()) {

+						EList<EStructuralFeature> properties = ((EClass)metaclass.getRepresentedElement()).getEStructuralFeatures();

+						for(EStructuralFeature eStructuralFeature : properties) {

+							MetamodelUtils.addProperty(metaclass, eStructuralFeature, eStructuralFeature.getEType(), eStructuralFeature.getName(), facade, editingDomain);

+						}

+					}

+				} else if(metaclass.getRepresentedElement() instanceof DataType) {

+					EList<Property> properties = ((DataType)metaclass.getRepresentedElement()).getAttributes();

+					for(Property property : properties) {

+						MetamodelUtils.addProperty(metaclass, property, property.getType(), property.getName(), facade, editingDomain);

+					}

+				} else {

+					org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.MetamodelUtils_10 + metaclass.getRepresentedElement());

+				}

+

+				createStereotypeProperties(metaclass, facade, editingDomain);

+			}

+		}

+	}

+

+	public static void createPropertiesForAll(Facade facade, AdapterFactoryEditingDomain editingDomain) {

+		//Only VirtualMetaclasses can have properties

+		for(VirtualMetaclass metaclass : getOnlyVirtualMetaclasses(facade.getVirtualmetamodel().getVirtualClassifiers())) {

+			createProperties(metaclass, facade, editingDomain);

+		}

+	}

+

+	protected static boolean containtsType(EObject type, Facade facade) {

+		for(VirtualClassifier classifier : facade.getVirtualmetamodel().getVirtualClassifiers()) {

+			if(classifier.isKept()) {

+				if(classifier.getRepresentedElement() == type) {

+					return true;

+				}

+			}

+		}

+

+		return false;

+	}

+

+	public static List<VirtualClassifier> getElements(Facade inputElement) {

+

+		List<VirtualClassifier> elements = new ArrayList<VirtualClassifier>();

+		if(inputElement.getVirtualmetamodel() != null) {

+			for(VirtualClassifier classifier : inputElement.getVirtualmetamodel().getVirtualClassifiers()) {

+

+				if(classifier instanceof VirtualMetaclass) {

+					if(MetamodelUtils.getFathers((VirtualMetaclass)classifier).isEmpty()) {

+						elements.add((VirtualMetaclass)classifier);

+					}

+				} else {

+					elements.add(classifier);

+				}

+			}

+		}

+

+		return elements;

+	}

+

+	public static void createGeneralizations(Facade facade, AdapterFactoryEditingDomain editingDomain) {

+		for(VirtualMetaclass metaclass : MetamodelUtils.getOnlyVirtualMetaclasses(facade.getVirtualmetamodel().getVirtualClassifiers())) {

+			List<VirtualMetaclass> fathers = getFathers(metaclass);

+

+			List<VirtualMetaclass> fathersToAdd = new ArrayList<VirtualMetaclass>();

+			for(VirtualMetaclass father : fathers) {

+				if(!metaclass.getParents().contains(father)) {

+					fathersToAdd.add(father);

+				}

+			}

+

+			AddCommand command = new AddCommand(editingDomain, metaclass, VirtualmetamodelPackage.eINSTANCE.getVirtualMetaclass_Parents(), fathersToAdd);

+			editingDomain.getCommandStack().execute(command);

+		}

+	}

+

+	public static void createOperationsForAll(Facade facade, AdapterFactoryEditingDomain editingDomain) {

+		//Only VirtualMetaclasses can have operations

+		for(VirtualMetaclass metaclass : getOnlyVirtualMetaclasses(facade.getVirtualmetamodel().getVirtualClassifiers())) {

+			createOperations(metaclass, facade, editingDomain);

+		}

+	}

+

+	private static void createOperations(VirtualMetaclass metaclass, Facade facade, AdapterFactoryEditingDomain editingDomain) {

+		if(metaclass.getRepresentedElement() instanceof EClass) {

+			if(metaclass.getAppliedStereotypes().isEmpty()) {

+				EList<EOperation> operations = ((EClass)metaclass.getRepresentedElement()).getEOperations();

+				for(EOperation eOperation : operations) {

+					addOperation(metaclass, eOperation, eOperation.getName(), facade, editingDomain);

+				}

+			}

+		}

+	}

+

+	public static void postProcessTypedElements(Facade facade, AdapterFactoryEditingDomain editingDomain) {

+		TreeIterator<EObject> it = facade.eAllContents();

+		while(it.hasNext()) {

+			EObject eObject = (EObject)it.next();

+

+			if(eObject instanceof VirtualTypedElement) {

+				VirtualTypedElement virtualTypedElement = (VirtualTypedElement)eObject;

+				VirtualClassifier representingType = null;

+				if(virtualTypedElement.getRepresentedElement() instanceof TypedElement) {

+					representingType = MetamodelUtils.findClassifierThatMatch(((TypedElement)virtualTypedElement.getRepresentedElement()).getType(), facade);

+					if(representingType != null) {

+						virtualTypedElement.setType(representingType);

+					} else {

+						org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.MetamodelUtils_11 + virtualTypedElement);

+					}

+				} else {

+					if(virtualTypedElement.getRepresentedElement() instanceof ETypedElement) {

+						if(((ETypedElement)virtualTypedElement.getRepresentedElement()).getEType() != null) {

+							representingType = MetamodelUtils.findClassifierThatMatch(((ETypedElement)virtualTypedElement.getRepresentedElement()).getEType(), facade);

+							if(representingType != null) {

+								virtualTypedElement.setType(representingType);

+							} else {

+								org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.MetamodelUtils_12 + virtualTypedElement);

+							}

+						}

+					} else {

+						org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info(Messages.MetamodelUtils_13 + virtualTypedElement);

+					}

+				}

+

+			}

+		}

+	}

+

+	public static void postProcessUseRepresented(Facade facade, AdapterFactoryEditingDomain editingDomain) {

+		TreeIterator<EObject> it = facade.eAllContents();

+		while(it.hasNext()) {

+			EObject virtualElement = (EObject)it.next();

+

+			if(virtualElement instanceof VirtualElement) {

+				EObject represented = ((VirtualElement)virtualElement).getRepresentedElement();

+

+				TreeIterator<EObject> ecoreIt = EcorePackage.eINSTANCE.eAllContents();

+				while(ecoreIt.hasNext()) {

+					EObject ecoreEObject = (EObject)ecoreIt.next();

+					if(ecoreEObject == represented) {

+						((VirtualElement)virtualElement).setUseRepresented(true);

+					}

+				}

+

+			}

+

+		}

+	}

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/ExtensionDefintionContentProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/ExtensionDefintionContentProvider.java
new file mode 100644
index 00000000000..caa7dbeee3e
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/ExtensionDefintionContentProvider.java
@@ -0,0 +1,121 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facadeSpecificEditor.providers;

+

+import java.util.ArrayList;

+import java.util.HashSet;

+import java.util.List;

+

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

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

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

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

+import org.eclipse.papyrus.facade.Facade;

+import org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass;

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition;

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinitionKind;

+

+public class ExtensionDefintionContentProvider implements ITreeContentProvider {

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.IContentProvider#dispose()

+	 * 

+	 */

+	public void dispose() {

+

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)

+	 * 

+	 * @param viewer

+	 * @param oldInput

+	 * @param newInput

+	 */

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

+

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getElements(java.lang.Object)

+	 * 

+	 * @param inputElement

+	 * @return

+	 */

+	public Object[] getElements(Object inputElement) {

+		HashSet<ExtensionDefinition> output = new HashSet<ExtensionDefinition>();

+

+		if(inputElement instanceof Facade) {

+			EList<ExtensionDefinition> extensionsDefinitions = ((Facade)inputElement).getExtensionDefinitions();

+			for(ExtensionDefinition extensionDefinition : extensionsDefinitions) {

+				output.add(extensionDefinition);

+			}

+		}

+

+		return output.toArray();

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)

+	 * 

+	 * @param parentElement

+	 * @return

+	 */

+	public Object[] getChildren(Object parentElement) {

+		List<BaseMetaclass> output = new ArrayList<BaseMetaclass>();

+		if(parentElement instanceof ExtensionDefinition) {

+

+			ExtensionDefinition parent = (ExtensionDefinition)parentElement;

+

+			if(parent.getKind() == ExtensionDefinitionKind.MULTI_GENERALIZATION) {

+				for(BaseMetaclass baseMetaclass : parent.getBaseMetaclasses()) {

+					if(!((EClass)baseMetaclass.getBase()).isAbstract()) {

+						output.add(baseMetaclass);

+					}

+				}

+			}

+		}

+		return output.toArray();

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+	public Object getParent(Object element) {

+		return null;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+	public boolean hasChildren(Object element) {

+		if(getChildren(element).length != 0) {

+			return true;

+		} else {

+			return false;

+		}

+	}

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/ExtensionDefintionLabelProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/ExtensionDefintionLabelProvider.java
new file mode 100644
index 00000000000..3508440f858
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/ExtensionDefintionLabelProvider.java
@@ -0,0 +1,236 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facadeSpecificEditor.providers;

+

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

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

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

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

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

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

+import org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass;

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition;

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinitionKind;

+import org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator;

+import org.eclipse.papyrus.facadeSpecificEditor.Messages;

+import org.eclipse.papyrus.facadeSpecificEditor.utils.StereotypeUtils;

+import org.eclipse.swt.graphics.Font;

+import org.eclipse.swt.graphics.Image;

+

+import com.swtdesigner.ResourceManager;

+

+public class ExtensionDefintionLabelProvider implements ITableLabelProvider, ILabelProvider, IFontProvider {

+

+	/**

+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)

+	 * 

+	 * @param listener

+	 */

+

+	public void addListener(ILabelProviderListener listener) {

+

+	}

+

+	/**

+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()

+	 * 

+	 */

+

+	public void dispose() {

+

+	}

+

+	/**

+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)

+	 * 

+	 * @param element

+	 * @param property

+	 * @return

+	 */

+

+	public boolean isLabelProperty(Object element, String property) {

+		return false;

+	}

+

+	/**

+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)

+	 * 

+	 * @param listener

+	 */

+

+	public void removeListener(ILabelProviderListener listener) {

+

+	}

+

+	/**

+	 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)

+	 * 

+	 * @param element

+	 * @param columnIndex

+	 * @return

+	 */

+

+	public Image getColumnImage(Object element, int columnIndex) {

+		switch(columnIndex) {

+		case 0:

+

+			break;

+		case 1:

+			if(element instanceof ExtensionDefinition) {

+				if(((ExtensionDefinition)element).getKind() == ExtensionDefinitionKind.ASSOCIATION) {

+					if(((ExtensionDefinition)element).getExtension().isRequired()) {

+						return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/associationRequired.png"); //$NON-NLS-1$

+					} else {

+						return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/association.png"); //$NON-NLS-1$

+					}

+				} else if(((ExtensionDefinition)element).getKind() == ExtensionDefinitionKind.GENERALIZATION) {

+					if(((ExtensionDefinition)element).getExtension().isRequired()) {

+						return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/generalizationRequired.png"); //$NON-NLS-1$

+					} else {

+						return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/generalization.png"); //$NON-NLS-1$

+					}

+

+				} else if(((ExtensionDefinition)element).getKind() == ExtensionDefinitionKind.MULTI_GENERALIZATION) {

+					if(((ExtensionDefinition)element).getExtension().isRequired()) {

+						return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/multigeneralizationRequired.png"); //$NON-NLS-1$

+					} else {

+						return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/multigeneralization.png"); //$NON-NLS-1$

+					}

+

+				} else if(((ExtensionDefinition)element).getKind() == ExtensionDefinitionKind.FUSION) {

+					if(((ExtensionDefinition)element).getExtension().isRequired()) {

+						return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/fusionRequired.png"); //$NON-NLS-1$

+					} else {

+						return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/fusion.png"); //$NON-NLS-1$

+					}

+

+				}

+

+			}

+			break;

+		case 2:

+			if(element instanceof BaseMetaclass) {

+				if(!((BaseMetaclass)element).getExtensionDefinition().getExtension().isRequired()) {

+					if(((BaseMetaclass)element).isPossible()) {

+						return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/checked.gif"); //$NON-NLS-1$

+					} else {

+						return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/unchecked.gif"); //$NON-NLS-1$

+					}

+				}

+

+			}

+			break;

+

+		default:

+			break;

+		}

+

+		return null;

+	}

+

+	/**

+	 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)

+	 * 

+	 * @param element

+	 * @param columnIndex

+	 * @return

+	 */

+

+	public String getColumnText(Object element, int columnIndex) {

+		switch(columnIndex) {

+		case 0:

+			if(element instanceof ExtensionDefinition) {

+

+				String name = ((ExtensionDefinition)element).getStereotype().getQualifiedName();

+				if(!((ExtensionDefinition)element).getStereotype().getGenerals().isEmpty()) {

+					name += " [-> "; //$NON-NLS-1$

+					name += ((ExtensionDefinition)element).getStereotype().getGenerals().get(0).getQualifiedName();

+					if(((ExtensionDefinition)element).getStereotype().getGenerals().size() > 1) {

+						for(int i = 1; i < ((ExtensionDefinition)element).getStereotype().getGenerals().size(); i++) {

+							name += ", " + ((ExtensionDefinition)element).getStereotype().getGenerals().get(i).getQualifiedName(); //$NON-NLS-1$

+						}

+					}

+					name += "]"; //$NON-NLS-1$

+				}

+				name += Messages.ExtensionDefintionLabelProvider_13;

+				if(((ExtensionDefinition)element).getKind() != ExtensionDefinitionKind.MULTI_GENERALIZATION) {

+					if(StereotypeUtils.findBase((ExtensionDefinition)element) != null) {

+						name += " " + StereotypeUtils.findBase((ExtensionDefinition)element).getName(); //$NON-NLS-1$

+					}

+				}

+				return name;

+

+			} else if(element instanceof BaseMetaclass) {

+				if(((BaseMetaclass)element).getBase() instanceof EClass) {

+

+					String name = ((EClass)((BaseMetaclass)element).getBase()).getName();

+					return name;

+				}

+			}

+

+			break;

+		case 1:

+			if(element instanceof ExtensionDefinition) {

+				return ((ExtensionDefinition)element).getKind().getName();

+			}

+			break;

+		case 2:

+

+			break;

+

+		default:

+			break;

+		}

+

+		return null;

+	}

+

+	/**

+	 * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+

+	public Image getImage(Object element) {

+		return null;

+	}

+

+	/**

+	 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+

+	public String getText(Object element) {

+		return getColumnText(element, 0);

+	}

+

+	/**

+	 * @see org.eclipse.jface.viewers.IFontProvider#getFont(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+

+	public Font getFont(Object element) {

+		if(element instanceof ExtensionDefinition) {

+			if(((ExtensionDefinition)element).getStereotype().isAbstract()) {

+				return JFaceResources.getFontRegistry().getItalic(JFaceResources.DEFAULT_FONT);

+			}

+		}

+		return JFaceResources.getFontRegistry().get(JFaceResources.DEFAULT_FONT);

+	}

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/IncompatibilitiesContentProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/IncompatibilitiesContentProvider.java
new file mode 100644
index 00000000000..0fc542ab5c5
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/IncompatibilitiesContentProvider.java
@@ -0,0 +1,63 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facadeSpecificEditor.providers;

+

+import java.util.HashSet;

+

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

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

+import org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass;

+import org.eclipse.papyrus.facade.extensiondefinition.Combination;

+

+public class IncompatibilitiesContentProvider implements IStructuredContentProvider {

+

+	/**

+	 * @see org.eclipse.jface.viewers.IContentProvider#dispose()

+	 * 

+	 */

+

+	public void dispose() {

+

+	}

+

+	/**

+	 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)

+	 * 

+	 * @param viewer

+	 * @param oldInput

+	 * @param newInput

+	 */

+

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

+

+	}

+

+	/**

+	 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)

+	 * 

+	 * @param inputElement

+	 * @return

+	 */

+

+	public Object[] getElements(Object inputElement) {

+

+		HashSet<Combination> output = new HashSet<Combination>();

+		if(inputElement instanceof BaseMetaclass) {

+			output.addAll(((BaseMetaclass)inputElement).getIncompatibleStereotypes());

+			output.addAll(((BaseMetaclass)inputElement).getCompatibleStereotypes());

+		}

+		return output.toArray();

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/IncompatibilitiesLabelProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/IncompatibilitiesLabelProvider.java
new file mode 100644
index 00000000000..165e0b6d717
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/IncompatibilitiesLabelProvider.java
@@ -0,0 +1,213 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facadeSpecificEditor.providers;

+

+import java.util.ArrayList;

+import java.util.HashSet;

+import java.util.List;

+

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

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

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

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

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

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

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

+import org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass;

+import org.eclipse.papyrus.facade.extensiondefinition.Combination;

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition;

+import org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator;

+import org.eclipse.papyrus.facadeSpecificEditor.FacadeSpecificEditor;

+import org.eclipse.papyrus.facadeSpecificEditor.utils.ProfileUtils;

+import org.eclipse.swt.graphics.Font;

+import org.eclipse.swt.graphics.Image;

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

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

+

+import com.swtdesigner.ResourceManager;

+

+public class IncompatibilitiesLabelProvider implements ITableLabelProvider, IFontProvider {

+

+	/**

+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)

+	 * 

+	 * @param listener

+	 */

+

+	public void addListener(ILabelProviderListener listener) {

+

+	}

+

+	/**

+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()

+	 * 

+	 */

+

+	public void dispose() {

+

+	}

+

+	/**

+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)

+	 * 

+	 * @param element

+	 * @param property

+	 * @return

+	 */

+

+	public boolean isLabelProperty(Object element, String property) {

+		return false;

+	}

+

+	/**

+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)

+	 * 

+	 * @param listener

+	 */

+

+	public void removeListener(ILabelProviderListener listener) {

+

+	}

+

+	/**

+	 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)

+	 * 

+	 * @param element

+	 * @param columnIndex

+	 * @return

+	 */

+

+	public Image getColumnImage(Object element, int columnIndex) {

+		switch(columnIndex) {

+		case 0:

+			if(element instanceof Combination) {

+				return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/combinaison.png"); //$NON-NLS-1$

+			}

+			break;

+		case 1:

+			if(element instanceof Combination) {

+				ISelection selection = FacadeSpecificEditor.getExtensionDefintionTreeViewer().getSelection();

+				if(selection instanceof IStructuredSelection) {

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

+

+					if(first instanceof BaseMetaclass) {

+						EList<Combination> incompatibleStereotypes = ((BaseMetaclass)first).getIncompatibleStereotypes();

+						if(incompatibleStereotypes.contains(element)) {

+							return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/unchecked.gif"); //$NON-NLS-1$

+						} else {

+							return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/checked.gif"); //$NON-NLS-1$

+						}

+					}

+				}

+

+			}

+			break;

+

+		default:

+			break;

+		}

+

+		return null;

+	}

+

+	/**

+	 * Produce sibling list.

+	 * 

+	 * @param stereotype

+	 *        the stereotype

+	 * @return the string

+	 */

+	protected String produceSiblingList(Stereotype stereotype) {

+		String output = ""; //$NON-NLS-1$

+		HashSet<Stereotype> siblings = ProfileUtils.getSiblings(stereotype);

+		List<Classifier> siblingsList = new ArrayList<Classifier>(siblings);

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

+			output += "["; //$NON-NLS-1$

+		}

+

+		if(!siblingsList.isEmpty()) {

+			output += siblingsList.get(0).getQualifiedName();

+

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

+				for(int i = 1; i < siblingsList.size(); i++) {

+					output += ", "; //$NON-NLS-1$

+					output += siblingsList.get(i).getQualifiedName();

+				}

+			}

+		}

+

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

+			output += "]"; //$NON-NLS-1$

+		}

+		return output;

+	}

+

+	/**

+	 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)

+	 * 

+	 * @param element

+	 * @param columnIndex

+	 * @return

+	 */

+

+	public String getColumnText(Object element, int columnIndex) {

+		switch(columnIndex) {

+		case 0:

+			String name = ""; //$NON-NLS-1$

+			if(element instanceof Combination) {

+

+				Combination combination = (Combination)element;

+				if(!combination.getMembers().isEmpty()) {

+					name += combination.getMembers().get(0).getExtensionDefinition().getStereotype().getName();

+					if(((Combination)element).getMembers().size() > 1) {

+						for(int i = 1; i < combination.getMembers().size(); i++) {

+							name += ", "; //$NON-NLS-1$

+							name += combination.getMembers().get(i).getExtensionDefinition().getStereotype().getName();

+						}

+					}

+

+					return name;

+				}

+

+			}

+

+			break;

+		case 1:

+			break;

+

+		default:

+			break;

+		}

+

+		return null;

+	}

+

+	/**

+	 * @see org.eclipse.jface.viewers.IFontProvider#getFont(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+

+	public Font getFont(Object element) {

+		if(element instanceof ExtensionDefinition) {

+			if(((ExtensionDefinition)element).getStereotype().isAbstract()) {

+				return JFaceResources.getFontRegistry().getItalic(JFaceResources.DEFAULT_FONT);

+			}

+		}

+

+		return JFaceResources.getFontRegistry().get(JFaceResources.DEFAULT_FONT);

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/MetamodelContentProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/MetamodelContentProvider.java
new file mode 100644
index 00000000000..c1f8cde5ed8
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/MetamodelContentProvider.java
@@ -0,0 +1,115 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facadeSpecificEditor.providers;

+

+import java.util.ArrayList;

+import java.util.List;

+

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

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

+import org.eclipse.papyrus.facade.Facade;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass;

+import org.eclipse.papyrus.facadeSpecificEditor.metamodel.MetamodelUtils;

+

+

+public class MetamodelContentProvider implements ITreeContentProvider {

+

+	/**

+	 * @see org.eclipse.jface.viewers.IContentProvider#dispose()

+	 * 

+	 */

+

+	public void dispose() {

+

+	}

+

+	/**

+	 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)

+	 * 

+	 * @param viewer

+	 * @param oldInput

+	 * @param newInput

+	 */

+

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

+

+	}

+

+	/**

+	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getElements(java.lang.Object)

+	 * 

+	 * @param inputElement

+	 * @return

+	 */

+

+	public Object[] getElements(Object inputElement) {

+		List<VirtualElement> elements = new ArrayList<VirtualElement>();

+

+		if(inputElement instanceof Facade) {

+			elements.addAll(MetamodelUtils.getElements((Facade)inputElement));

+		}

+

+		return elements.toArray();

+	}

+

+	/**

+	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)

+	 * 

+	 * @param parentElement

+	 * @return

+	 */

+

+	public Object[] getChildren(Object parentElement) {

+		List<VirtualMetaclass> children = new ArrayList<VirtualMetaclass>();

+

+		if(parentElement instanceof VirtualMetaclass)

+			for(VirtualClassifier classifier : ((VirtualMetaclass)parentElement).getMetamodel().getVirtualClassifiers()) {

+

+				if(classifier instanceof VirtualMetaclass)

+					if(((VirtualMetaclass)classifier).getParents().contains(parentElement)) {

+						children.add((VirtualMetaclass)classifier);

+					}

+			}

+

+		return children.toArray();

+	}

+

+	/**

+	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+

+	public Object getParent(Object element) {

+		return null;

+	}

+

+	/**

+	 * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+

+	public boolean hasChildren(Object element) {

+		if(getChildren(element).length == 0) {

+			return false;

+		} else {

+			return true;

+		}

+	}

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/MetamodelLabelProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/MetamodelLabelProvider.java
new file mode 100644
index 00000000000..2de7bdc30a3
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/MetamodelLabelProvider.java
@@ -0,0 +1,279 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facadeSpecificEditor.providers;

+

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

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

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

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

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

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

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

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualDatatype;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualEnum;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass;

+import org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator;

+import org.eclipse.papyrus.facadeSpecificEditor.Messages;

+import org.eclipse.papyrus.facadeSpecificEditor.metamodel.MetamodelUtils;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.Font;

+import org.eclipse.swt.graphics.Image;

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

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

+

+import com.swtdesigner.ResourceManager;

+

+// TODO: Auto-generated Javadoc

+/**

+ * The Class MetamodelLabelProvider.

+ */

+public class MetamodelLabelProvider implements ITableLabelProvider, ILabelProvider, IFontProvider, IColorProvider {

+

+	/**

+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)

+	 * 

+	 * @param listener

+	 */

+

+	public void addListener(ILabelProviderListener listener) {

+

+	}

+

+	/**

+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()

+	 * 

+	 */

+

+	public void dispose() {

+

+	}

+

+	/**

+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)

+	 * 

+	 * @param element

+	 * @param property

+	 * @return

+	 */

+

+	public boolean isLabelProperty(Object element, String property) {

+		return false;

+	}

+

+	/**

+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)

+	 * 

+	 * @param listener

+	 */

+

+	public void removeListener(ILabelProviderListener listener) {

+

+	}

+

+	/**

+	 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)

+	 * 

+	 * @param element

+	 * @param columnIndex

+	 * @return

+	 */

+

+	public Image getColumnImage(Object element, int columnIndex) {

+		switch(columnIndex) {

+		case 0:

+			if(element instanceof VirtualMetaclass) {

+				if(((VirtualMetaclass)element).isStereotypeInterface()) {

+					return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/virtualmetamodel/StereotypeInterface.gif"); //$NON-NLS-1$

+				} else {

+					return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/virtualmetamodel/VirtualMetaclass.gif"); //$NON-NLS-1$

+				}

+			} else if(element instanceof VirtualDatatype) {

+				return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/virtualmetamodel/VirtualDatatype.gif"); //$NON-NLS-1$

+			} else if(element instanceof VirtualEnum) {

+				return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/virtualmetamodel/VirtualEnum.gif"); //$NON-NLS-1$

+			}

+

+			break;

+		case 1:

+			if(element instanceof VirtualElement) {

+				if(((VirtualElement)element).isKept()) {

+					return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/checked.gif"); //$NON-NLS-1$

+				} else {

+					return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/unchecked.gif"); //$NON-NLS-1$

+				}

+			}

+			break;

+		case 2:

+

+			break;

+

+		case 3:

+			if(element instanceof VirtualMetaclass) {

+				if(MetamodelUtils.canBeAbstract((VirtualMetaclass)element)) {

+					if(((VirtualMetaclass)element).isAbstract()) {

+						return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/checked.gif"); //$NON-NLS-1$

+					} else {

+						return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/unchecked.gif"); //$NON-NLS-1$

+					}

+				}

+			}

+			break;

+

+		case 4:

+			if(element instanceof VirtualElement) {

+

+				if(((VirtualElement)element).isUseRepresented()) {

+					return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/checked.gif"); //$NON-NLS-1$

+				} else {

+					return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/unchecked.gif"); //$NON-NLS-1$

+				}

+

+			}

+			break;

+

+		default:

+			break;

+		}

+		return null;

+	}

+

+	/**

+	 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)

+	 * 

+	 * @param element

+	 * @param columnIndex

+	 * @return

+	 */

+

+	public String getColumnText(Object element, int columnIndex) {

+		switch(columnIndex) {

+		case 0:

+			String result = Messages.MetamodelLabelProvider_8;

+			if(element instanceof VirtualElement) {

+				if(((VirtualElement)element).getRepresentedElement() instanceof ENamedElement) {

+					result = ((ENamedElement)((VirtualElement)element).getRepresentedElement()).getName();

+				} else if(((VirtualElement)element).getRepresentedElement() instanceof NamedElement) {

+					result = ((NamedElement)((VirtualElement)element).getRepresentedElement()).getName();

+				}

+

+				if(element instanceof VirtualMetaclass) {

+					if(!((VirtualMetaclass)element).getAppliedStereotypes().isEmpty()) {

+						result += " ("; //$NON-NLS-1$

+						result += ((VirtualMetaclass)element).getAppliedStereotypes().get(0).getExtensionDefinition().getStereotype().getName();

+

+						if(((VirtualMetaclass)element).getAppliedStereotypes().size() > 1) {

+							for(int i = 1; i < ((VirtualMetaclass)element).getAppliedStereotypes().size(); i++) {

+								result += ", "; //$NON-NLS-1$

+								result += ((VirtualMetaclass)element).getAppliedStereotypes().get(i).getExtensionDefinition().getStereotype().getName();

+							}

+

+						}

+						result += ")"; //$NON-NLS-1$

+					}

+				}

+			}

+

+			return result;

+

+		case 1:

+			break;

+

+		case 2:

+			if(element instanceof VirtualElement) {

+				return ((VirtualElement)element).getAliasName();

+			}

+			break;

+

+		case 3:

+			break;

+

+		default:

+			break;

+		}

+

+		return null;

+	}

+

+	/**

+	 * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+

+	public Image getImage(Object element) {

+		return null;

+	}

+

+	/**

+	 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+

+	public String getText(Object element) {

+		return getColumnText(element, 0) + getColumnText(element, 2);

+

+	}

+

+	/**

+	 * @see org.eclipse.jface.viewers.IFontProvider#getFont(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+

+	public Font getFont(Object element) {

+		if(element instanceof VirtualMetaclass) {

+

+			if(((VirtualMetaclass)element).isAbstract()) {

+				return JFaceResources.getFontRegistry().getItalic(JFaceResources.DEFAULT_FONT);

+			}

+		}

+

+		return JFaceResources.getFontRegistry().get(JFaceResources.DEFAULT_FONT);

+	}

+

+	/**

+	 * @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+

+	public Color getForeground(Object element) {

+		if(element instanceof VirtualElement) {

+			if(!((VirtualElement)element).isKept()) {

+				return Display.getDefault().getSystemColor(SWT.COLOR_GRAY);

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @see org.eclipse.jface.viewers.IColorProvider#getBackground(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+

+	public Color getBackground(Object element) {

+

+		return null;

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/TypedElementContentProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/TypedElementContentProvider.java
new file mode 100644
index 00000000000..420a28fdec3
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/TypedElementContentProvider.java
@@ -0,0 +1,90 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facadeSpecificEditor.providers;

+

+import java.util.ArrayList;

+import java.util.List;

+

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

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

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualEnum;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualOperation;

+

+public class TypedElementContentProvider implements ITreeContentProvider {

+

+	/**

+	 * @see org.eclipse.jface.viewers.IContentProvider#dispose()

+	 * 

+	 */

+

+	public void dispose() {

+

+	}

+

+	/**

+	 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)

+	 * 

+	 * @param viewer

+	 * @param oldInput

+	 * @param newInput

+	 */

+

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

+

+	}

+

+	/**

+	 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)

+	 * 

+	 * @param inputElement

+	 * @return

+	 */

+

+	public Object[] getElements(Object inputElement) {

+		ArrayList<VirtualElement> output = new ArrayList<VirtualElement>();

+		if(inputElement instanceof VirtualMetaclass) {

+			output.addAll(((VirtualMetaclass)inputElement).getProperties());

+			output.addAll(((VirtualMetaclass)inputElement).getOperations());

+		}

+		if(inputElement instanceof VirtualEnum) {

+			output.addAll(((VirtualEnum)inputElement).getLiterals());

+		}

+

+		return output.toArray();

+	}

+

+	public Object[] getChildren(Object parentElement) {

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

+		if(parentElement instanceof VirtualOperation) {

+			result.addAll(((VirtualOperation)parentElement).getParameters());

+		}

+

+		return result.toArray();

+	}

+

+	public Object getParent(Object element) {

+		return null;

+	}

+

+	public boolean hasChildren(Object element) {

+		if(getChildren(element).length == 0) {

+			return false;

+		} else {

+			return true;

+		}

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/TypedElementLabelProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/TypedElementLabelProvider.java
new file mode 100644
index 00000000000..355c9e70f4f
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/providers/TypedElementLabelProvider.java
@@ -0,0 +1,176 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facadeSpecificEditor.providers;

+

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

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

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

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualLiteral;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualOperation;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualParameter;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement;

+import org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator;

+import org.eclipse.swt.graphics.Image;

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

+

+import com.swtdesigner.ResourceManager;

+

+public class TypedElementLabelProvider implements ITableLabelProvider {

+

+	/**

+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)

+	 * 

+	 * @param listener

+	 */

+

+	public void addListener(ILabelProviderListener listener) {

+

+	}

+

+	/**

+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()

+	 * 

+	 */

+	public void dispose() {

+

+	}

+

+	/**

+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)

+	 * 

+	 * @param element

+	 * @param property

+	 * @return

+	 */

+

+	public boolean isLabelProperty(Object element, String property) {

+		return false;

+	}

+

+	/**

+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)

+	 * 

+	 * @param listener

+	 */

+

+	public void removeListener(ILabelProviderListener listener) {

+

+	}

+

+	/**

+	 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)

+	 * 

+	 * @param element

+	 * @param columnIndex

+	 * @return

+	 */

+

+	public Image getColumnImage(Object element, int columnIndex) {

+		switch(columnIndex) {

+		case 0:

+			if(element instanceof VirtualProperty) {

+				return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/virtualmetamodel/VirtualReference.gif"); //$NON-NLS-1$

+

+			} else if(element instanceof VirtualOperation) {

+				return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/virtualmetamodel/VirtualOperation.gif"); //$NON-NLS-1$

+

+			} else if(element instanceof VirtualLiteral) {

+				return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/virtualmetamodel/VirtualLiteral.gif"); //$NON-NLS-1$

+

+			} else if(element instanceof VirtualParameter) {

+				return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/virtualmetamodel/VirtualParameter.gif"); //$NON-NLS-1$

+

+			}

+			break;

+		case 1:

+			if(element instanceof VirtualElement) {

+				if(((VirtualElement)element).isKept()) {

+					return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/checked.gif"); //$NON-NLS-1$

+				} else {

+					return ResourceManager.getPluginImage(FacadeDefinitionEditorActivator.getDefault(), "icons/unchecked.gif"); //$NON-NLS-1$

+				}

+			}

+			break;

+		case 2:

+

+			break;

+		case 3:

+

+			break;

+		case 4:

+

+			break;

+		default:

+			break;

+		}

+

+		return null;

+	}

+

+	/**

+	 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)

+	 * 

+	 * @param element

+	 * @param columnIndex

+	 * @return

+	 */

+

+	public String getColumnText(Object element, int columnIndex) {

+		switch(columnIndex) {

+		case 0:

+			if(element instanceof VirtualElement) {

+

+				String name = ""; //$NON-NLS-1$

+				if(((VirtualElement)element).getRepresentedElement() instanceof ENamedElement) {

+					name += ((ENamedElement)((VirtualElement)element).getRepresentedElement()).getName();

+				} else if(((VirtualElement)element).getRepresentedElement() instanceof NamedElement) {

+					name += ((NamedElement)((VirtualElement)element).getRepresentedElement()).getName();

+				}

+

+				if(element instanceof VirtualTypedElement) {

+					if(((VirtualTypedElement)element).getType() != null) {

+						name += " (" + ((VirtualTypedElement)element).getType().getAliasName() + ")"; //$NON-NLS-1$ //$NON-NLS-2$

+					}

+				}

+

+				return name;

+			}

+			break;

+		case 1:

+

+			break;

+		case 2:

+			if(element instanceof VirtualElement) {

+				return ((VirtualElement)element).getAliasName();

+			}

+			break;

+		case 3:

+			if(element instanceof VirtualTypedElement) {

+				return ((VirtualTypedElement)element).getLower() + ""; //$NON-NLS-1$

+			}

+			break;

+		case 4:

+			if(element instanceof VirtualTypedElement) {

+				return ((VirtualTypedElement)element).getUpper() + ""; //$NON-NLS-1$

+			}

+			break;

+		default:

+			break;

+		}

+

+		return null;

+	}

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/utils/ProfileUtils.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/utils/ProfileUtils.java
new file mode 100644
index 00000000000..62740845eee
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/utils/ProfileUtils.java
@@ -0,0 +1,253 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facadeSpecificEditor.utils;

+

+import java.util.ArrayList;

+import java.util.HashMap;

+import java.util.HashSet;

+import java.util.List;

+import java.util.Vector;

+

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

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

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

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

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

+import org.eclipse.papyrus.facade.Facade;

+import org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass;

+import org.eclipse.papyrus.facade.extensiondefinition.Combination;

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition;

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinitionKind;

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionFactory;

+import org.eclipse.papyrus.facade.utils.CombinationGenerator;

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

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

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

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

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

+

+public class ProfileUtils {

+

+	public static HashSet<Classifier> getAllClassifiers(Classifier element) {

+

+		HashSet<Classifier> output = new HashSet<Classifier>();

+

+		// Fake go through

+		EcoreUtil.resolveAll(element);

+

+		EList<Resource> resources = element.eResource().getResourceSet().getResources();

+		for(Resource resource : resources) {

+			TreeIterator<EObject> it = resource.getAllContents();

+			while(it.hasNext()) {

+				EObject eObject = (EObject)it.next();

+				if(eObject instanceof Classifier) {

+					output.add((Classifier)eObject);

+				}

+			}

+		}

+

+		return output;

+	}

+

+	public static HashSet<Extension> getAllExtensions(Profile profile) {

+

+		HashSet<Extension> output = new HashSet<Extension>();

+

+		// Fake go through

+		EcoreUtil.resolveAll(profile);

+

+		EList<Resource> resources = profile.eResource().getResourceSet().getResources();

+		for(Resource resource : resources) {

+			TreeIterator<EObject> it = resource.getAllContents();

+			while(it.hasNext()) {

+				EObject eObject = (EObject)it.next();

+				if(eObject instanceof Extension) {

+					output.add((Extension)eObject);

+				}

+			}

+		}

+

+		return output;

+	}

+

+	public static List<Extension> findExtensions(Stereotype stereotype) {

+		List<Extension> extensions = new ArrayList<Extension>();

+

+		for(Property property : stereotype.getAllAttributes()) {

+			if(property.getName().startsWith(Extension.METACLASS_ROLE_PREFIX)) {

+				if(property.getAssociation() instanceof Extension) {

+					extensions.add((Extension)property.getAssociation());

+				}

+			}

+		}

+

+		return extensions;

+

+	}

+

+	public static List<Stereotype> findAllSubsInProfile(Stereotype classifier) {

+		List<Stereotype> output = new ArrayList<Stereotype>();

+

+		HashSet<Classifier> classifiers = getAllClassifiers(classifier);

+		for(Classifier classifierCandidate : classifiers) {

+			if(classifierCandidate.getGenerals().contains(classifier)) {

+				if(classifierCandidate instanceof Stereotype) {

+					output.add((Stereotype)classifierCandidate);

+				}

+			}

+

+		}

+

+		return output;

+	}

+

+	protected static HashMap<Stereotype, HashSet<Stereotype>> siblingsReference = new HashMap<Stereotype, HashSet<Stereotype>>();

+

+	public static void initSiblings(Stereotype stereotype) {

+		siblingsReference.remove(stereotype);

+		siblingsReference.put(stereotype, findSibling(stereotype));

+	}

+

+	public static void clearSiblings() {

+		siblingsReference.clear();

+	}

+

+	public static HashSet<Stereotype> getSiblings(Stereotype stereotype) {

+		return siblingsReference.get(stereotype);

+	}

+

+	protected static HashSet<Stereotype> findSibling(Stereotype stereotype) {

+		HashSet<Stereotype> stereotypeRelatives = new HashSet<Stereotype>();

+

+		EList<Classifier> stereotypeGenerals = stereotype.getGenerals();

+

+		if(!stereotypeGenerals.isEmpty()) {

+			for(Classifier classifier : stereotypeGenerals) {

+				if(classifier instanceof Stereotype) {

+					stereotypeRelatives.addAll(findAllSubsInProfile((Stereotype)classifier));

+

+					stereotypeRelatives.add((Stereotype)classifier);

+				}

+			}

+		} else {

+			stereotypeRelatives.addAll(findAllSubsInProfile(stereotype));

+			stereotypeRelatives.add(stereotype);

+		}

+

+		return stereotypeRelatives;

+	}

+

+	public static boolean areNotRelatives(Stereotype stereotypeA, Stereotype stereotypeB) {

+

+		HashSet<Stereotype> stereotypeARelatives = getSiblings(stereotypeA);

+		HashSet<Stereotype> stereotypeBRelatives = getSiblings(stereotypeB);

+

+		// They must not be relatives

+		if(!stereotypeARelatives.contains(stereotypeB) && !stereotypeBRelatives.contains(stereotypeA)) {

+			return true;

+		}

+

+		return false;

+	}

+

+	protected static List<Combination> generatePossibleCombination(List<BaseMetaclass> possibleStereotypes) {

+		Vector<BaseMetaclass> elements = new Vector<BaseMetaclass>(possibleStereotypes);

+		int[] indices;

+

+		List<Combination> allCombination = new ArrayList<Combination>();

+		for(int k = 1; k <= possibleStereotypes.size(); k++) {

+			CombinationGenerator combinaisonGenerator = new CombinationGenerator(elements.size(), k);

+

+			while(combinaisonGenerator.hasMore()) {

+				// ArrayList<Stereotype> combination = new ArrayList<Stereotype>();

+				indices = combinaisonGenerator.getNext();

+

+				Combination combinaison = ExtensiondefinitionFactory.eINSTANCE.createCombination();

+

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

+					// combination.add();

+					combinaison.getMembers().add(elements.get(indices[i]));

+				}

+

+				//Check that combination doesn't contain siblings

+				boolean containsSiblings = false;

+				for(BaseMetaclass baseA : combinaison.getMembers()) {

+					for(BaseMetaclass baseB : combinaison.getMembers()) {

+						if(baseA != baseB) {

+							if(!areNotRelatives(baseA.getExtensionDefinition().getStereotype(), baseB.getExtensionDefinition().getStereotype())) {

+								containsSiblings = true;

+							}

+						}

+					}

+				}

+

+				if(!containsSiblings) {

+					allCombination.add(combinaison);

+				}

+			}

+		}

+

+		return allCombination;

+	}

+

+	public static List<Combination> getPossibleCombinations(BaseMetaclass inputElement) {

+		List<BaseMetaclass> requiredCompatibleStereotypes = new ArrayList<BaseMetaclass>();

+		List<BaseMetaclass> optionalCompatibleStereotypes = new ArrayList<BaseMetaclass>();

+

+		if(inputElement.getExtensionDefinition().getKind() == ExtensionDefinitionKind.MULTI_GENERALIZATION) {

+

+			Facade facade = inputElement.getExtensionDefinition().getFacade();

+			for(ExtensionDefinition extensionDefinition : facade.getExtensionDefinitions()) {

+

+				if(extensionDefinition.getKind() == ExtensionDefinitionKind.MULTI_GENERALIZATION) {

+					for(BaseMetaclass baseMetaclass : extensionDefinition.getBaseMetaclasses()) {

+						if(baseMetaclass.getBase() == inputElement.getBase()) {

+

+							if(baseMetaclass != inputElement) {

+								Stereotype inputElementStereo = inputElement.getExtensionDefinition().getStereotype();

+								Stereotype baseMetaClassStereo = baseMetaclass.getExtensionDefinition().getStereotype();

+

+								if(ProfileUtils.areNotRelatives(inputElementStereo, baseMetaClassStereo)) {

+

+									if(!baseMetaclass.getExtensionDefinition().getStereotype().isAbstract()) {

+

+										if(baseMetaclass.getExtensionDefinition().getExtension().isRequired()) {

+											requiredCompatibleStereotypes.add(baseMetaclass);

+										} else {

+											optionalCompatibleStereotypes.add(baseMetaclass);

+										}

+

+									}

+								}

+							}

+						}

+					}

+				}

+			}

+		}

+

+		List<Combination> possibleCombination = generatePossibleCombination(optionalCompatibleStereotypes);

+		if(!requiredCompatibleStereotypes.isEmpty()) {

+			for(Combination combination : possibleCombination) {

+				combination.getMembers().addAll(requiredCompatibleStereotypes);

+			}

+			Combination combinationRequired = ExtensiondefinitionFactory.eINSTANCE.createCombination();

+			combinationRequired.getMembers().addAll(requiredCompatibleStereotypes);

+			possibleCombination.add(combinationRequired);

+		}

+

+		return possibleCombination;

+

+	}

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/utils/PrunerUtils.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/utils/PrunerUtils.java
new file mode 100644
index 00000000000..2b3cb6489a4
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/utils/PrunerUtils.java
@@ -0,0 +1,129 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facadeSpecificEditor.utils;

+

+import java.util.ArrayList;

+import java.util.List;

+

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

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

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

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

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

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

+import org.eclipse.papyrus.facadeSpecificEditor.metamodel.MetamodelUtils;

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

+

+public class PrunerUtils {

+

+	//	protected static VirtualElement findVirtualElement(EObject element, VirtualMetamodel metamodel) {

+	//		TreeIterator<EObject> it = metamodel.eAllContents();

+	//

+	//		while(it.hasNext()) {

+	//			EObject eObject = (EObject)it.next();

+	//			if(eObject instanceof VirtualElement) {

+	//				if(((VirtualElement)eObject).getRepresentedElement() == element) {

+	//					return (VirtualElement)eObject;

+	//				}

+	//			}

+	//		}

+	//		return null;

+	//	}

+

+	//	protected static boolean isUsed(VirtualClassifier classifier, VirtualMetamodel metamodel) {

+	//

+	//		TreeIterator<EObject> it = metamodel.eAllContents();

+	//

+	//		while(it.hasNext()) {

+	//			EObject element = (EObject)it.next();

+	//			if(element != classifier) {

+	//				//VirtualMetclass of type of the property must be not kept

+	//				if(element instanceof VirtualProperty) {

+	//					if(((VirtualProperty)element).isKept()) {

+	//

+	//						if(((VirtualProperty)element).getRepresentedElement() instanceof Property) {

+	//							Type typeOfTheProperty = ((Property)((VirtualProperty)element).getRepresentedElement()).getType();

+	//

+	//							if(findVirtualElement(typeOfTheProperty, metamodel).isKept()) {

+	//

+	//							}

+	//

+	//						} else if(((VirtualProperty)element).getRepresentedElement() instanceof EStructuralFeature) {

+	//							EClassifier typeOfTheProperty = ((EStructuralFeature)((VirtualProperty)element).getRepresentedElement()).getEType();

+	//						} else {

+	//							org.eclipse.papyrus.facadeSpecificEditor.FacadeDefinitionEditorActivator.log.info("The kind of the property is unknown: " + element);

+	//						}

+	//					}

+	//

+	//				}

+	//

+	//			}

+	//

+	//		}

+	//

+	//		return true;

+	//	}

+

+	public static boolean classifierUnkeep(VirtualElement element, VirtualMetamodel metamodel, EditingDomain editingDomain) {

+		List<EObject> typedElementToUnkeep = new ArrayList<EObject>();

+

+		if(element instanceof VirtualClassifier) {

+			List<VirtualMetaclass> children = MetamodelUtils.getChildren((VirtualMetaclass)element);

+

+			for(VirtualMetaclass child : children) {

+				if(classifierUnkeep(child, metamodel, editingDomain) == false) {

+					return false;

+				}

+			}

+

+			TreeIterator<EObject> it = metamodel.eAllContents();

+

+			while(it.hasNext()) {

+				EObject metamodelElement = (EObject)it.next();

+				if(metamodelElement != element) {

+					//VirtualMetclass of type of the property must be not kept

+					if(metamodelElement instanceof VirtualTypedElement) {

+						if(((VirtualTypedElement)metamodelElement).isKept()) {

+

+							if(((VirtualTypedElement)metamodelElement).getType() == element) {

+								if(((VirtualTypedElement)metamodelElement).getLower() > 0) {

+									MessageDialog.openWarning(Display.getCurrent().getActiveShell(), "Cannot unkeep this element", "This element cannot be unkept because it is used by : " + ((VirtualTypedElement)metamodelElement).getAliasName());

+									return false;

+								}

+

+								typedElementToUnkeep.add(metamodelElement);

+							}

+						}

+					}

+				}

+			}

+		}

+

+		for(EObject eObject : typedElementToUnkeep) {

+			SetCommand command = new SetCommand(editingDomain, (VirtualElement)eObject, VirtualmetamodelPackage.eINSTANCE.getVirtualElement_Kept(), false); //$NON-NLS-1$

+			editingDomain.getCommandStack().execute(command);

+		}

+

+		SetCommand command = new SetCommand(editingDomain, (VirtualElement)element, VirtualmetamodelPackage.eINSTANCE.getVirtualElement_Kept(), false); //$NON-NLS-1$

+		editingDomain.getCommandStack().execute(command);

+

+		return true;

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/utils/StereotypeUtils.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/utils/StereotypeUtils.java
new file mode 100644
index 00000000000..1cd18b61436
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/utils/StereotypeUtils.java
@@ -0,0 +1,150 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facadeSpecificEditor.utils;

+

+import java.util.Collection;

+import java.util.LinkedHashSet;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Set;

+

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

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

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

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

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition;

+import org.eclipse.uml2.types.TypesPackage;

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

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

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

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

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

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

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

+

+public class StereotypeUtils {

+

+	protected static EPackage umlMetamodel = UMLPackage.eINSTANCE;

+

+	protected static EPackage typesPackage = TypesPackage.eINSTANCE;

+

+	/**

+	 * Compute all the ecore UML metaclasses on which the stereotype can be applied

+	 * 

+	 * @param stereotype

+	 * @param concreteClassesOnly

+	 * @return

+	 */

+	public static List<EClass> getAllExtendableMetaclasses(Stereotype stereotype, boolean concreteClassesOnly) {

+		EList<Class> extendedMetaclasses = stereotype.getAllExtendedMetaclasses();

+		Set<EClass> allMetaclasses = new LinkedHashSet<EClass>();

+		for(Class extendedMetaclass : extendedMetaclasses) {

+			EClassifier UMLEClass = findEClass(extendedMetaclass);

+			if(UMLEClass instanceof EClass) {

+				allMetaclasses.addAll(getSubclassesOf((EClass)UMLEClass, concreteClassesOnly));

+			}

+		}

+

+		return new LinkedList<EClass>(allMetaclasses);

+	}

+

+	/**

+	 * Get the ecore UML metaclass corresponding to an {@link ExtensionDefinition}

+	 * 

+	 * @param extension

+	 * @return

+	 */

+	public static EClassifier findBase(ExtensionDefinition extension) {

+		for(Property member : extension.getExtension().getMemberEnds()) {

+			if(!(member instanceof ExtensionEnd)) {

+				return findEClass((Classifier)member.getType());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * Compute all the ecore UML metaclasses on which the extension applies

+	 * 

+	 * @param extension

+	 * @param concreteClassesOnly

+	 * @return

+	 */

+	public static List<EClass> getAllExtendableMetaclasses(Extension extension, boolean concreteClassesOnly) {

+		Class extendedMetaclass = extension.getMetaclass();

+		Set<EClass> allMetaclasses = new LinkedHashSet<EClass>();

+

+		EClassifier UMLEClass = findEClass(extendedMetaclass);

+		if(UMLEClass instanceof EClass) {

+			allMetaclasses.addAll(getSubclassesOf((EClass)UMLEClass, concreteClassesOnly));

+		}

+

+		return new LinkedList<EClass>(allMetaclasses);

+	}

+

+	/**

+	 * Get all the ecore subclasses of a UML metaclass

+	 * 

+	 * @param UMLEClass

+	 * @param concreteClassesOnly

+	 * @return

+	 */

+	protected static Collection<? extends EClass> getSubclassesOf(EClass UMLEClass, boolean concreteClassesOnly) {

+		Set<EClass> subs = new LinkedHashSet<EClass>();

+

+		if(UMLEClass != null) {

+			if((concreteClassesOnly && !UMLEClass.isAbstract()) || !concreteClassesOnly) {

+				subs.add(UMLEClass);

+			}

+

+			for(EClassifier classifier : umlMetamodel.getEClassifiers()) {

+				if(classifier instanceof EClass) {

+					EClass clazz = (EClass)classifier;

+

+					if((concreteClassesOnly && !clazz.isAbstract()) || !concreteClassesOnly) {

+

+						EList<EClass> supers = clazz.getEAllSuperTypes();

+						if(supers.contains(UMLEClass)) {

+							subs.add(clazz);

+						}

+					}

+				}

+			}

+		}

+		return subs;

+	}

+

+	/**

+	 * Get the eClass in the UML metamodel from a UML classifier

+	 * 

+	 * @param type

+	 * @return

+	 */

+	public static EClassifier findEClass(Classifier type) {

+		for(EClassifier classifier : umlMetamodel.getEClassifiers()) {

+			if(classifier.getName().equals(type.getName())) {

+				return classifier;

+			}

+		}

+

+		for(EClassifier classifier : typesPackage.getEClassifiers()) {

+			if(classifier.getName().equals(type.getName())) {

+				return classifier;

+			}

+		}

+

+		return null;

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/utils/UMLModelUtils.java b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/utils/UMLModelUtils.java
new file mode 100644
index 00000000000..85ff139ff8c
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.definition.editor/src/org/eclipse/papyrus/facadeSpecificEditor/utils/UMLModelUtils.java
@@ -0,0 +1,36 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facadeSpecificEditor.utils;

+

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

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

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

+import org.eclipse.uml2.uml.resource.UMLResource;

+

+public class UMLModelUtils {

+

+	/**

+	 * Load a given uri as an EMF model and return the root

+	 * 

+	 * @param file

+	 * @param resourceSet

+	 * @return

+	 */

+	public static EObject loadModel(URI uri, ResourceSet resourceSet) {

+		resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(UMLResource.FILE_EXTENSION, UMLResource.Factory.INSTANCE);

+		resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(UMLResource.Factory.Registry.DEFAULT_EXTENSION, UMLResource.Factory.INSTANCE);

+

+		return resourceSet.getResource(uri, true).getContents().get(0);

+	}

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/.classpath b/extraplugins/facade/org.eclipse.papyrus.facade.edit/.classpath
new file mode 100644
index 00000000000..45f024e850e
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<classpath>

+	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

+	<classpathentry kind="output" path="bin"/>

+</classpath>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/.project b/extraplugins/facade/org.eclipse.papyrus.facade.edit/.project
new file mode 100644
index 00000000000..e98e2b457d7
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.papyrus.facade.edit</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.jdt.core.javabuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.ManifestBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.SchemaBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.jdt.core.javanature</nature>

+		<nature>org.eclipse.pde.PluginNature</nature>

+	</natures>

+</projectDescription>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/META-INF/MANIFEST.MF b/extraplugins/facade/org.eclipse.papyrus.facade.edit/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..7a0fdf28717
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/META-INF/MANIFEST.MF
@@ -0,0 +1,23 @@
+Manifest-Version: 1.0

+Bundle-ManifestVersion: 2

+Bundle-Name: %pluginName

+Bundle-SymbolicName: org.eclipse.papyrus.facade.edit;singleton:=true

+Bundle-Version: 1.0.0.qualifier

+Bundle-ClassPath: .

+Bundle-Activator: org.eclipse.papyrus.facade.provider.FacadeEditPlugin$Implementation

+Bundle-Vendor: %providerName

+Bundle-Localization: plugin

+Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Export-Package: org.eclipse.papyrus.facade.extensiondefinition.provider,

+ org.eclipse.papyrus.facade.provider,

+ org.eclipse.papyrus.facade.virtualmetamodel.provider,

+ org.eclipse.papyrus.facademapping.provider

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

+ org.eclipse.papyrus.facade;visibility:=reexport,

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

+ org.eclipse.emf.ecore;visibility:=reexport,

+ org.eclipse.emf.ecore.edit;visibility:=reexport,

+ org.eclipse.uml2.types;visibility:=reexport,

+ org.eclipse.uml2.uml;visibility:=reexport,

+ org.eclipse.uml2.uml.edit;visibility:=reexport

+Bundle-ActivationPolicy: lazy

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/build.properties b/extraplugins/facade/org.eclipse.papyrus.facade.edit/build.properties
new file mode 100644
index 00000000000..061672eb20e
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/build.properties
@@ -0,0 +1,10 @@
+#

+

+bin.includes = .,\

+               icons/,\

+               META-INF/,\

+               plugin.xml,\

+               plugin.properties

+jars.compile.order = .

+source.. = src/

+output.. = bin/

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateBaseMetaclass_compatibleStereotypes_Combination.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateBaseMetaclass_compatibleStereotypes_Combination.gif
new file mode 100644
index 00000000000..5da4564cd4c
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateBaseMetaclass_compatibleStereotypes_Combination.gif
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateBaseMetaclass_incompatibleStereotypes_Combination.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateBaseMetaclass_incompatibleStereotypes_Combination.gif
new file mode 100644
index 00000000000..5da4564cd4c
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateBaseMetaclass_incompatibleStereotypes_Combination.gif
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateExtensionDefinition_baseMetaclasses_BaseMetaclass.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateExtensionDefinition_baseMetaclasses_BaseMetaclass.gif
new file mode 100644
index 00000000000..becf3c963f7
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateExtensionDefinition_baseMetaclasses_BaseMetaclass.gif
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateFacadeMappping_mappings_Mapping.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateFacadeMappping_mappings_Mapping.gif
new file mode 100644
index 00000000000..486225ee11c
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateFacadeMappping_mappings_Mapping.gif
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateFacadeMappping_mappings_StereotypedMapping.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateFacadeMappping_mappings_StereotypedMapping.gif
new file mode 100644
index 00000000000..21f89523da9
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateFacadeMappping_mappings_StereotypedMapping.gif
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateFacade_extensionDefinitions_ExtensionDefinition.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateFacade_extensionDefinitions_ExtensionDefinition.gif
new file mode 100644
index 00000000000..1010ed82e50
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateFacade_extensionDefinitions_ExtensionDefinition.gif
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateFacade_virtualmetamodel_VirtualMetamodel.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateFacade_virtualmetamodel_VirtualMetamodel.gif
new file mode 100644
index 00000000000..a29500a4ff0
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateFacade_virtualmetamodel_VirtualMetamodel.gif
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualEnum_literals_VirtualLiteral.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualEnum_literals_VirtualLiteral.gif
new file mode 100644
index 00000000000..d9a8b0c6560
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualEnum_literals_VirtualLiteral.gif
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualMetaclass_operations_VirtualOperation.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualMetaclass_operations_VirtualOperation.gif
new file mode 100644
index 00000000000..5a0697e635e
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualMetaclass_operations_VirtualOperation.gif
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualMetaclass_properties_VirtualProperty.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualMetaclass_properties_VirtualProperty.gif
new file mode 100644
index 00000000000..c4bac7155ca
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualMetaclass_properties_VirtualProperty.gif
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualMetamodel_virtualClassifiers_VirtualDatatype.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualMetamodel_virtualClassifiers_VirtualDatatype.gif
new file mode 100644
index 00000000000..f7e0ea73df1
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualMetamodel_virtualClassifiers_VirtualDatatype.gif
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualMetamodel_virtualClassifiers_VirtualEnum.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualMetamodel_virtualClassifiers_VirtualEnum.gif
new file mode 100644
index 00000000000..d5cbc02e268
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualMetamodel_virtualClassifiers_VirtualEnum.gif
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualMetamodel_virtualClassifiers_VirtualMetaclass.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualMetamodel_virtualClassifiers_VirtualMetaclass.gif
new file mode 100644
index 00000000000..7a7c260f79c
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualMetamodel_virtualClassifiers_VirtualMetaclass.gif
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualOperation_parameters_VirtualParameter.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualOperation_parameters_VirtualParameter.gif
new file mode 100644
index 00000000000..39428c713a1
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/ctool16/CreateVirtualOperation_parameters_VirtualParameter.gif
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/BaseMetaclass.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/BaseMetaclass.gif
new file mode 100644
index 00000000000..5a9bc7514fa
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/BaseMetaclass.gif
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/Combination.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/Combination.gif
new file mode 100644
index 00000000000..c8d381f0b32
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/Combination.gif
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/ExtensionDefinition.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/ExtensionDefinition.gif
new file mode 100644
index 00000000000..35ef84e20e2
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/ExtensionDefinition.gif
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/Facade.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/Facade.gif
new file mode 100644
index 00000000000..106881e5d9b
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/Facade.gif
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/FacadeMappping.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/FacadeMappping.gif
new file mode 100644
index 00000000000..badaab0664a
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/FacadeMappping.gif
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/Mapping.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/Mapping.gif
new file mode 100644
index 00000000000..b3643da048a
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/Mapping.gif
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/StereotypedMapping.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/StereotypedMapping.gif
new file mode 100644
index 00000000000..338fb8d9a72
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/StereotypedMapping.gif
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualDatatype.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualDatatype.gif
new file mode 100644
index 00000000000..4365960a04b
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualDatatype.gif
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualEnum.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualEnum.gif
new file mode 100644
index 00000000000..136e3b27269
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualEnum.gif
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualLiteral.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualLiteral.gif
new file mode 100644
index 00000000000..cdd3b76e3c0
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualLiteral.gif
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualMetaclass.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualMetaclass.gif
new file mode 100644
index 00000000000..05dc74ad5da
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualMetaclass.gif
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualMetamodel.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualMetamodel.gif
new file mode 100644
index 00000000000..c4fb30e9687
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualMetamodel.gif
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualOperation.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualOperation.gif
new file mode 100644
index 00000000000..33854e98c25
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualOperation.gif
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualParameter.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualParameter.gif
new file mode 100644
index 00000000000..83afb9b3c9a
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualParameter.gif
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualProperty.gif b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualProperty.gif
new file mode 100644
index 00000000000..5a9bc7514fa
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/icons/full/obj16/VirtualProperty.gif
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/plugin.properties b/extraplugins/facade/org.eclipse.papyrus.facade.edit/plugin.properties
new file mode 100644
index 00000000000..78cce222fc9
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/plugin.properties
@@ -0,0 +1,85 @@
+#

+

+pluginName = Facade Edit Support

+providerName = www.example.org

+

+_UI_CreateChild_text = {0}

+_UI_CreateChild_text2 = {1} {0}

+_UI_CreateChild_text3 = {1}

+_UI_CreateChild_tooltip = Create New {0} Under {1} Feature

+_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.

+_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.

+

+_UI_PropertyDescriptor_description = The {0} of the {1}

+

+_UI_Facade_type = Facade

+_UI_VirtualMetamodel_type = Virtual Metamodel

+_UI_VirtualElement_type = Virtual Element

+_UI_VirtualClassifier_type = Virtual Classifier

+_UI_VirtualMetaclass_type = Virtual Metaclass

+_UI_VirtualProperty_type = Virtual Property

+_UI_VirtualOperation_type = Virtual Operation

+_UI_VirtualParameter_type = Virtual Parameter

+_UI_VirtualDatatype_type = Virtual Datatype

+_UI_VirtualEnum_type = Virtual Enum

+_UI_VirtualLiteral_type = Virtual Literal

+_UI_ExtensionDefinition_type = Extension Definition

+_UI_BaseMetaclass_type = Base Metaclass

+_UI_Combination_type = Combination

+_UI_Unknown_type = Object

+

+_UI_Unknown_datatype= Value

+

+_UI_Facade_extensionDefinitions_feature = Extension Definitions

+_UI_Facade_virtualmetamodel_feature = Virtualmetamodel

+_UI_VirtualMetamodel_name_feature = Name

+_UI_VirtualMetamodel_nsPrefix_feature = Ns Prefix

+_UI_VirtualMetamodel_nsURI_feature = Ns URI

+_UI_VirtualMetamodel_virtualClassifiers_feature = Virtual Classifiers

+_UI_VirtualMetamodel_facade_feature = Facade

+_UI_VirtualElement_aliasName_feature = Alias Name

+_UI_VirtualElement_kept_feature = Kept

+_UI_VirtualElement_representedElement_feature = Represented Element

+_UI_VirtualClassifier_metamodel_feature = Metamodel

+_UI_VirtualMetaclass_abstract_feature = Abstract

+_UI_VirtualMetaclass_appliedStereotypes_feature = Applied Stereotypes

+_UI_VirtualMetaclass_operations_feature = Operations

+_UI_VirtualMetaclass_parents_feature = Parents

+_UI_VirtualMetaclass_properties_feature = Properties

+_UI_VirtualMetaclass_stereotypeInterface_feature = Stereotype Interface

+_UI_VirtualProperty_lower_feature = Lower

+_UI_VirtualProperty_upper_feature = Upper

+_UI_VirtualProperty_virtualMetaclass_feature = Virtual Metaclass

+_UI_VirtualProperty_type_feature = Type

+_UI_VirtualOperation_parameters_feature = Parameters

+_UI_VirtualEnum_literals_feature = Literals

+_UI_ExtensionDefinition_extension_feature = Extension

+_UI_ExtensionDefinition_baseMetaclasses_feature = Base Metaclasses

+_UI_ExtensionDefinition_facade_feature = Facade

+_UI_ExtensionDefinition_stereotype_feature = Stereotype

+_UI_ExtensionDefinition_kind_feature = Kind

+_UI_BaseMetaclass_incompatibleStereotypes_feature = Incompatible Stereotypes

+_UI_BaseMetaclass_base_feature = Base

+_UI_BaseMetaclass_extensionDefinition_feature = Extension Definition

+_UI_BaseMetaclass_compatibleStereotypes_feature = Compatible Stereotypes

+_UI_BaseMetaclass_possible_feature = Possible

+_UI_Combination_members_feature = Members

+_UI_Unknown_feature = Unspecified

+

+_UI_ExtensionDefinitionKind_Association_literal = Association

+_UI_ExtensionDefinitionKind_Generalization_literal = Generalization

+_UI_ExtensionDefinitionKind_MultiGeneralization_literal = MultiGeneralization

+_UI_ExtensionDefinitionKind_Fusion_literal = Fusion

+_UI_VirtualTypedElement_type = Virtual Typed Element

+_UI_VirtualTypedElement_lower_feature = Lower

+_UI_VirtualTypedElement_upper_feature = Upper

+_UI_VirtualTypedElement_type_feature = Type

+_UI_Mapping_type = Mapping

+_UI_StereotypedMapping_type = Stereotyped Mapping

+_UI_FacadeMappping_type = Facade Mappping

+_UI_Mapping_umlElement_feature = Uml Element

+_UI_Mapping_specificDomainElement_feature = Specific Domain Element

+_UI_StereotypedMapping_appliedStereotypes_feature = Applied Stereotypes

+_UI_StereotypedMapping_kind_feature = Kind

+_UI_FacadeMappping_mappings_feature = Mappings

+_UI_VirtualElement_useRepresented_feature = Use Represented

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/plugin.xml b/extraplugins/facade/org.eclipse.papyrus.facade.edit/plugin.xml
new file mode 100644
index 00000000000..3eb7c459ee4
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/plugin.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<?eclipse version="3.0"?>

+

+<!--

+-->

+

+<plugin>

+

+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

+      <!-- @generated facade -->

+      <factory

+            uri="http://www.eclipse.org/papyrus/facade"

+            class="org.eclipse.papyrus.facade.provider.FacadeItemProviderAdapterFactory"

+            supportedTypes=

+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

+               org.eclipse.emf.edit.provider.ITreeItemContentProvider

+               org.eclipse.emf.edit.provider.IItemLabelProvider

+               org.eclipse.emf.edit.provider.IItemPropertySource"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

+      <!-- @generated facade -->

+      <factory

+            uri="http://www.eclipse.org/papyrus/virtualmetamodel"

+            class="org.eclipse.papyrus.facade.virtualmetamodel.provider.VirtualmetamodelItemProviderAdapterFactory"

+            supportedTypes=

+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

+               org.eclipse.emf.edit.provider.ITreeItemContentProvider

+               org.eclipse.emf.edit.provider.IItemLabelProvider

+               org.eclipse.emf.edit.provider.IItemPropertySource"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

+      <!-- @generated facade -->

+      <factory

+            uri="http://www.eclipse.org/papyrus/extensiondefinition"

+            class="org.eclipse.papyrus.facade.extensiondefinition.provider.ExtensiondefinitionItemProviderAdapterFactory"

+            supportedTypes=

+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

+               org.eclipse.emf.edit.provider.ITreeItemContentProvider

+               org.eclipse.emf.edit.provider.IItemLabelProvider

+               org.eclipse.emf.edit.provider.IItemPropertySource"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

+      <!-- @generated facademapping -->

+      <factory

+            uri="http://www.eclipse.org/papyrus/facademapping"

+            class="org.eclipse.papyrus.facademapping.provider.FacademappingItemProviderAdapterFactory"

+            supportedTypes=

+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

+               org.eclipse.emf.edit.provider.ITreeItemContentProvider

+               org.eclipse.emf.edit.provider.IItemLabelProvider

+               org.eclipse.emf.edit.provider.IItemPropertySource"/>

+   </extension>

+

+</plugin>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/extensiondefinition/provider/BaseMetaclassItemProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/extensiondefinition/provider/BaseMetaclassItemProvider.java
new file mode 100644
index 00000000000..fb93864be4f
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/extensiondefinition/provider/BaseMetaclassItemProvider.java
@@ -0,0 +1,263 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facade.extensiondefinition.provider;

+

+

+import java.util.Collection;

+import java.util.List;

+

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

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

+

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

+

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

+

+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

+import org.eclipse.emf.edit.provider.IItemLabelProvider;

+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.IItemPropertySource;

+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.ItemProviderAdapter;

+import org.eclipse.emf.edit.provider.ViewerNotification;

+

+import org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass;

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionFactory;

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage;

+

+import org.eclipse.papyrus.facade.provider.FacadeEditPlugin;

+

+/**

+ * This is the item provider adapter for a {@link org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass} object.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class BaseMetaclassItemProvider

+	extends ItemProviderAdapter

+	implements

+		IEditingDomainItemProvider,

+		IStructuredItemContentProvider,

+		ITreeItemContentProvider,

+		IItemLabelProvider,

+		IItemPropertySource {

+	/**

+	 * This constructs an instance from a factory and a notifier.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public BaseMetaclassItemProvider(AdapterFactory adapterFactory) {

+		super(adapterFactory);

+	}

+

+	/**

+	 * This returns the property descriptors for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

+		if (itemPropertyDescriptors == null) {

+			super.getPropertyDescriptors(object);

+

+			addBasePropertyDescriptor(object);

+			addPossiblePropertyDescriptor(object);

+		}

+		return itemPropertyDescriptors;

+	}

+

+	/**

+	 * This adds a property descriptor for the Base feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void addBasePropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_BaseMetaclass_base_feature"),

+				 getString("_UI_PropertyDescriptor_description", "_UI_BaseMetaclass_base_feature", "_UI_BaseMetaclass_type"),

+				 ExtensiondefinitionPackage.Literals.BASE_METACLASS__BASE,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

+	}

+

+	/**

+	 * This adds a property descriptor for the Possible feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void addPossiblePropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_BaseMetaclass_possible_feature"),

+				 getString("_UI_PropertyDescriptor_description", "_UI_BaseMetaclass_possible_feature", "_UI_BaseMetaclass_type"),

+				 ExtensiondefinitionPackage.Literals.BASE_METACLASS__POSSIBLE,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

+				 null,

+				 null));

+	}

+

+	/**

+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an

+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {

+		if (childrenFeatures == null) {

+			super.getChildrenFeatures(object);

+			childrenFeatures.add(ExtensiondefinitionPackage.Literals.BASE_METACLASS__INCOMPATIBLE_STEREOTYPES);

+			childrenFeatures.add(ExtensiondefinitionPackage.Literals.BASE_METACLASS__COMPATIBLE_STEREOTYPES);

+		}

+		return childrenFeatures;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EStructuralFeature getChildFeature(Object object, Object child) {

+		// Check the type of the specified child object and return the proper feature to use for

+		// adding (see {@link AddCommand}) it as a child.

+

+		return super.getChildFeature(object, child);

+	}

+

+	/**

+	 * This returns BaseMetaclass.gif.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object getImage(Object object) {

+		return overlayImage(object, getResourceLocator().getImage("full/obj16/BaseMetaclass"));

+	}

+

+	/**

+	 * This returns the label text for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String getText(Object object) {

+		BaseMetaclass baseMetaclass = (BaseMetaclass)object;

+		return getString("_UI_BaseMetaclass_type") + " " + baseMetaclass.isPossible();

+	}

+	

+

+	/**

+	 * This handles model notifications by calling {@link #updateChildren} to update any cached

+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void notifyChanged(Notification notification) {

+		updateChildren(notification);

+

+		switch (notification.getFeatureID(BaseMetaclass.class)) {

+			case ExtensiondefinitionPackage.BASE_METACLASS__POSSIBLE:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+				return;

+			case ExtensiondefinitionPackage.BASE_METACLASS__INCOMPATIBLE_STEREOTYPES:

+			case ExtensiondefinitionPackage.BASE_METACLASS__COMPATIBLE_STEREOTYPES:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

+				return;

+		}

+		super.notifyChanged(notification);

+	}

+

+	/**

+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

+	 * that can be created under this object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

+		super.collectNewChildDescriptors(newChildDescriptors, object);

+

+		newChildDescriptors.add

+			(createChildParameter

+				(ExtensiondefinitionPackage.Literals.BASE_METACLASS__INCOMPATIBLE_STEREOTYPES,

+				 ExtensiondefinitionFactory.eINSTANCE.createCombination()));

+

+		newChildDescriptors.add

+			(createChildParameter

+				(ExtensiondefinitionPackage.Literals.BASE_METACLASS__COMPATIBLE_STEREOTYPES,

+				 ExtensiondefinitionFactory.eINSTANCE.createCombination()));

+	}

+

+	/**

+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {

+		Object childFeature = feature;

+		Object childObject = child;

+

+		boolean qualify =

+			childFeature == ExtensiondefinitionPackage.Literals.BASE_METACLASS__INCOMPATIBLE_STEREOTYPES ||

+			childFeature == ExtensiondefinitionPackage.Literals.BASE_METACLASS__COMPATIBLE_STEREOTYPES;

+

+		if (qualify) {

+			return getString

+				("_UI_CreateChild_text2",

+				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });

+		}

+		return super.getCreateChildText(owner, feature, child, selection);

+	}

+

+	/**

+	 * Return the resource locator for this item provider's resources.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public ResourceLocator getResourceLocator() {

+		return FacadeEditPlugin.INSTANCE;

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/extensiondefinition/provider/CombinationItemProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/extensiondefinition/provider/CombinationItemProvider.java
new file mode 100644
index 00000000000..5544591d6f3
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/extensiondefinition/provider/CombinationItemProvider.java
@@ -0,0 +1,159 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facade.extensiondefinition.provider;

+

+

+import java.util.Collection;

+import java.util.List;

+

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

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

+

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

+

+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

+import org.eclipse.emf.edit.provider.IItemLabelProvider;

+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.IItemPropertySource;

+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

+import org.eclipse.emf.edit.provider.ItemProviderAdapter;

+

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage;

+

+import org.eclipse.papyrus.facade.provider.FacadeEditPlugin;

+

+/**

+ * This is the item provider adapter for a {@link org.eclipse.papyrus.facade.extensiondefinition.Combination} object.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class CombinationItemProvider

+	extends ItemProviderAdapter

+	implements

+		IEditingDomainItemProvider,

+		IStructuredItemContentProvider,

+		ITreeItemContentProvider,

+		IItemLabelProvider,

+		IItemPropertySource {

+	/**

+	 * This constructs an instance from a factory and a notifier.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public CombinationItemProvider(AdapterFactory adapterFactory) {

+		super(adapterFactory);

+	}

+

+	/**

+	 * This returns the property descriptors for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

+		if (itemPropertyDescriptors == null) {

+			super.getPropertyDescriptors(object);

+

+			addMembersPropertyDescriptor(object);

+		}

+		return itemPropertyDescriptors;

+	}

+

+	/**

+	 * This adds a property descriptor for the Members feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void addMembersPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_Combination_members_feature"),

+				 getString("_UI_PropertyDescriptor_description", "_UI_Combination_members_feature", "_UI_Combination_type"),

+				 ExtensiondefinitionPackage.Literals.COMBINATION__MEMBERS,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

+	}

+

+	/**

+	 * This returns Combination.gif.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object getImage(Object object) {

+		return overlayImage(object, getResourceLocator().getImage("full/obj16/Combination"));

+	}

+

+	/**

+	 * This returns the label text for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String getText(Object object) {

+		return getString("_UI_Combination_type");

+	}

+	

+

+	/**

+	 * This handles model notifications by calling {@link #updateChildren} to update any cached

+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void notifyChanged(Notification notification) {

+		updateChildren(notification);

+		super.notifyChanged(notification);

+	}

+

+	/**

+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

+	 * that can be created under this object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

+		super.collectNewChildDescriptors(newChildDescriptors, object);

+	}

+

+	/**

+	 * Return the resource locator for this item provider's resources.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public ResourceLocator getResourceLocator() {

+		return FacadeEditPlugin.INSTANCE;

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/extensiondefinition/provider/ExtensionDefinitionItemProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/extensiondefinition/provider/ExtensionDefinitionItemProvider.java
new file mode 100644
index 00000000000..1f3e872d9d8
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/extensiondefinition/provider/ExtensionDefinitionItemProvider.java
@@ -0,0 +1,260 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facade.extensiondefinition.provider;

+

+

+import java.util.Collection;

+import java.util.List;

+

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

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

+

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

+

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

+

+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

+import org.eclipse.emf.edit.provider.IItemLabelProvider;

+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.IItemPropertySource;

+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.ItemProviderAdapter;

+import org.eclipse.emf.edit.provider.ViewerNotification;

+

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition;

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinitionKind;

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionFactory;

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage;

+

+import org.eclipse.papyrus.facade.provider.FacadeEditPlugin;

+

+/**

+ * This is the item provider adapter for a {@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition} object.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class ExtensionDefinitionItemProvider

+	extends ItemProviderAdapter

+	implements

+		IEditingDomainItemProvider,

+		IStructuredItemContentProvider,

+		ITreeItemContentProvider,

+		IItemLabelProvider,

+		IItemPropertySource {

+	/**

+	 * This constructs an instance from a factory and a notifier.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public ExtensionDefinitionItemProvider(AdapterFactory adapterFactory) {

+		super(adapterFactory);

+	}

+

+	/**

+	 * This returns the property descriptors for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

+		if (itemPropertyDescriptors == null) {

+			super.getPropertyDescriptors(object);

+

+			addExtensionPropertyDescriptor(object);

+			addStereotypePropertyDescriptor(object);

+			addKindPropertyDescriptor(object);

+		}

+		return itemPropertyDescriptors;

+	}

+

+	/**

+	 * This adds a property descriptor for the Extension feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void addExtensionPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_ExtensionDefinition_extension_feature"),

+				 getString("_UI_PropertyDescriptor_description", "_UI_ExtensionDefinition_extension_feature", "_UI_ExtensionDefinition_type"),

+				 ExtensiondefinitionPackage.Literals.EXTENSION_DEFINITION__EXTENSION,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

+	}

+

+	/**

+	 * This adds a property descriptor for the Stereotype feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void addStereotypePropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_ExtensionDefinition_stereotype_feature"),

+				 getString("_UI_PropertyDescriptor_description", "_UI_ExtensionDefinition_stereotype_feature", "_UI_ExtensionDefinition_type"),

+				 ExtensiondefinitionPackage.Literals.EXTENSION_DEFINITION__STEREOTYPE,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

+	}

+

+	/**

+	 * This adds a property descriptor for the Kind feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void addKindPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_ExtensionDefinition_kind_feature"),

+				 getString("_UI_PropertyDescriptor_description", "_UI_ExtensionDefinition_kind_feature", "_UI_ExtensionDefinition_type"),

+				 ExtensiondefinitionPackage.Literals.EXTENSION_DEFINITION__KIND,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

+	}

+

+	/**

+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an

+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {

+		if (childrenFeatures == null) {

+			super.getChildrenFeatures(object);

+			childrenFeatures.add(ExtensiondefinitionPackage.Literals.EXTENSION_DEFINITION__BASE_METACLASSES);

+		}

+		return childrenFeatures;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EStructuralFeature getChildFeature(Object object, Object child) {

+		// Check the type of the specified child object and return the proper feature to use for

+		// adding (see {@link AddCommand}) it as a child.

+

+		return super.getChildFeature(object, child);

+	}

+

+	/**

+	 * This returns ExtensionDefinition.gif.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object getImage(Object object) {

+		return overlayImage(object, getResourceLocator().getImage("full/obj16/ExtensionDefinition"));

+	}

+

+	/**

+	 * This returns the label text for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String getText(Object object) {

+		ExtensionDefinitionKind labelValue = ((ExtensionDefinition)object).getKind();

+		String label = labelValue == null ? null : labelValue.toString();

+		return label == null || label.length() == 0 ?

+			getString("_UI_ExtensionDefinition_type") :

+			getString("_UI_ExtensionDefinition_type") + " " + label;

+	}

+	

+

+	/**

+	 * This handles model notifications by calling {@link #updateChildren} to update any cached

+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void notifyChanged(Notification notification) {

+		updateChildren(notification);

+

+		switch (notification.getFeatureID(ExtensionDefinition.class)) {

+			case ExtensiondefinitionPackage.EXTENSION_DEFINITION__KIND:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+				return;

+			case ExtensiondefinitionPackage.EXTENSION_DEFINITION__BASE_METACLASSES:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

+				return;

+		}

+		super.notifyChanged(notification);

+	}

+

+	/**

+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

+	 * that can be created under this object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

+		super.collectNewChildDescriptors(newChildDescriptors, object);

+

+		newChildDescriptors.add

+			(createChildParameter

+				(ExtensiondefinitionPackage.Literals.EXTENSION_DEFINITION__BASE_METACLASSES,

+				 ExtensiondefinitionFactory.eINSTANCE.createBaseMetaclass()));

+	}

+

+	/**

+	 * Return the resource locator for this item provider's resources.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public ResourceLocator getResourceLocator() {

+		return FacadeEditPlugin.INSTANCE;

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/extensiondefinition/provider/ExtensiondefinitionItemProviderAdapterFactory.java b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/extensiondefinition/provider/ExtensiondefinitionItemProviderAdapterFactory.java
new file mode 100644
index 00000000000..eb41300826d
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/extensiondefinition/provider/ExtensiondefinitionItemProviderAdapterFactory.java
@@ -0,0 +1,258 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facade.extensiondefinition.provider;

+

+import java.util.ArrayList;

+import java.util.Collection;

+

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

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

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

+

+import org.eclipse.emf.edit.provider.ChangeNotifier;

+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

+import org.eclipse.emf.edit.provider.IChangeNotifier;

+import org.eclipse.emf.edit.provider.IDisposable;

+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

+import org.eclipse.emf.edit.provider.IItemLabelProvider;

+import org.eclipse.emf.edit.provider.IItemPropertySource;

+import org.eclipse.emf.edit.provider.INotifyChangedListener;

+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

+

+import org.eclipse.papyrus.facade.extensiondefinition.util.ExtensiondefinitionAdapterFactory;

+

+/**

+ * This is the factory that is used to provide the interfaces needed to support Viewers.

+ * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.

+ * The adapters also support Eclipse property sheets.

+ * Note that most of the adapters are shared among multiple instances.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class ExtensiondefinitionItemProviderAdapterFactory extends ExtensiondefinitionAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {

+	/**

+	 * This keeps track of the root adapter factory that delegates to this adapter factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected ComposedAdapterFactory parentAdapterFactory;

+

+	/**

+	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected IChangeNotifier changeNotifier = new ChangeNotifier();

+

+	/**

+	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected Collection<Object> supportedTypes = new ArrayList<Object>();

+

+	/**

+	 * This constructs an instance.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public ExtensiondefinitionItemProviderAdapterFactory() {

+		supportedTypes.add(IEditingDomainItemProvider.class);

+		supportedTypes.add(IStructuredItemContentProvider.class);

+		supportedTypes.add(ITreeItemContentProvider.class);

+		supportedTypes.add(IItemLabelProvider.class);

+		supportedTypes.add(IItemPropertySource.class);

+	}

+

+	/**

+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition} instances.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected ExtensionDefinitionItemProvider extensionDefinitionItemProvider;

+

+	/**

+	 * This creates an adapter for a {@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Adapter createExtensionDefinitionAdapter() {

+		if (extensionDefinitionItemProvider == null) {

+			extensionDefinitionItemProvider = new ExtensionDefinitionItemProvider(this);

+		}

+

+		return extensionDefinitionItemProvider;

+	}

+

+	/**

+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass} instances.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected BaseMetaclassItemProvider baseMetaclassItemProvider;

+

+	/**

+	 * This creates an adapter for a {@link org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Adapter createBaseMetaclassAdapter() {

+		if (baseMetaclassItemProvider == null) {

+			baseMetaclassItemProvider = new BaseMetaclassItemProvider(this);

+		}

+

+		return baseMetaclassItemProvider;

+	}

+

+	/**

+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.facade.extensiondefinition.Combination} instances.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected CombinationItemProvider combinationItemProvider;

+

+	/**

+	 * This creates an adapter for a {@link org.eclipse.papyrus.facade.extensiondefinition.Combination}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Adapter createCombinationAdapter() {

+		if (combinationItemProvider == null) {

+			combinationItemProvider = new CombinationItemProvider(this);

+		}

+

+		return combinationItemProvider;

+	}

+

+	/**

+	 * This returns the root adapter factory that contains this factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public ComposeableAdapterFactory getRootAdapterFactory() {

+		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();

+	}

+

+	/**

+	 * This sets the composed adapter factory that contains this factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {

+		this.parentAdapterFactory = parentAdapterFactory;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean isFactoryForType(Object type) {

+		return supportedTypes.contains(type) || super.isFactoryForType(type);

+	}

+

+	/**

+	 * This implementation substitutes the factory itself as the key for the adapter.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Adapter adapt(Notifier notifier, Object type) {

+		return super.adapt(notifier, this);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object adapt(Object object, Object type) {

+		if (isFactoryForType(type)) {

+			Object adapter = super.adapt(object, type);

+			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {

+				return adapter;

+			}

+		}

+

+		return null;

+	}

+

+	/**

+	 * This adds a listener.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void addListener(INotifyChangedListener notifyChangedListener) {

+		changeNotifier.addListener(notifyChangedListener);

+	}

+

+	/**

+	 * This removes a listener.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void removeListener(INotifyChangedListener notifyChangedListener) {

+		changeNotifier.removeListener(notifyChangedListener);

+	}

+

+	/**

+	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void fireNotifyChanged(Notification notification) {

+		changeNotifier.fireNotifyChanged(notification);

+

+		if (parentAdapterFactory != null) {

+			parentAdapterFactory.fireNotifyChanged(notification);

+		}

+	}

+

+	/**

+	 * This disposes all of the item providers created by this factory. 

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void dispose() {

+		if (extensionDefinitionItemProvider != null) extensionDefinitionItemProvider.dispose();

+		if (baseMetaclassItemProvider != null) baseMetaclassItemProvider.dispose();

+		if (combinationItemProvider != null) combinationItemProvider.dispose();

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/provider/FacadeEditPlugin.java b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/provider/FacadeEditPlugin.java
new file mode 100644
index 00000000000..8876e5d1ac8
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/provider/FacadeEditPlugin.java
@@ -0,0 +1,106 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facade.provider;

+

+import org.eclipse.emf.common.EMFPlugin;

+

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

+

+import org.eclipse.emf.ecore.provider.EcoreEditPlugin;

+

+import org.eclipse.uml2.uml.edit.UMLEditPlugin;

+

+/**

+ * This is the central singleton for the Facade edit plugin.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public final class FacadeEditPlugin extends EMFPlugin {

+	/**

+	 * Keep track of the singleton.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static final FacadeEditPlugin INSTANCE = new FacadeEditPlugin();

+

+	/**

+	 * Keep track of the singleton.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private static Implementation plugin;

+

+	/**

+	 * Create the instance.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public FacadeEditPlugin() {

+		super

+		  (new ResourceLocator [] {

+		     EcoreEditPlugin.INSTANCE,

+		     UMLEditPlugin.INSTANCE,

+		   });

+	}

+

+	/**

+	 * Returns the singleton instance of the Eclipse plugin.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the singleton instance.

+	 * @generated

+	 */

+	@Override

+	public ResourceLocator getPluginResourceLocator() {

+		return plugin;

+	}

+

+	/**

+	 * Returns the singleton instance of the Eclipse plugin.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the singleton instance.

+	 * @generated

+	 */

+	public static Implementation getPlugin() {

+		return plugin;

+	}

+

+	/**

+	 * The actual implementation of the Eclipse <b>Plugin</b>.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static class Implementation extends EclipsePlugin {

+		/**

+		 * Creates an instance.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public Implementation() {

+			super();

+

+			// Remember the static instance.

+			//

+			plugin = this;

+		}

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/provider/FacadeItemProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/provider/FacadeItemProvider.java
new file mode 100644
index 00000000000..9323355dbbf
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/provider/FacadeItemProvider.java
@@ -0,0 +1,189 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facade.provider;

+

+

+import java.util.Collection;

+import java.util.List;

+

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

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

+

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

+

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

+

+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

+import org.eclipse.emf.edit.provider.IItemLabelProvider;

+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.IItemPropertySource;

+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

+import org.eclipse.emf.edit.provider.ItemProviderAdapter;

+import org.eclipse.emf.edit.provider.ViewerNotification;

+

+import org.eclipse.papyrus.facade.Facade;

+import org.eclipse.papyrus.facade.FacadePackage;

+

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionFactory;

+

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelFactory;

+

+/**

+ * This is the item provider adapter for a {@link org.eclipse.papyrus.facade.Facade} object.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class FacadeItemProvider

+	extends ItemProviderAdapter

+	implements

+		IEditingDomainItemProvider,

+		IStructuredItemContentProvider,

+		ITreeItemContentProvider,

+		IItemLabelProvider,

+		IItemPropertySource {

+	/**

+	 * This constructs an instance from a factory and a notifier.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public FacadeItemProvider(AdapterFactory adapterFactory) {

+		super(adapterFactory);

+	}

+

+	/**

+	 * This returns the property descriptors for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

+		if (itemPropertyDescriptors == null) {

+			super.getPropertyDescriptors(object);

+

+		}

+		return itemPropertyDescriptors;

+	}

+

+	/**

+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an

+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {

+		if (childrenFeatures == null) {

+			super.getChildrenFeatures(object);

+			childrenFeatures.add(FacadePackage.Literals.FACADE__EXTENSION_DEFINITIONS);

+			childrenFeatures.add(FacadePackage.Literals.FACADE__VIRTUALMETAMODEL);

+		}

+		return childrenFeatures;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EStructuralFeature getChildFeature(Object object, Object child) {

+		// Check the type of the specified child object and return the proper feature to use for

+		// adding (see {@link AddCommand}) it as a child.

+

+		return super.getChildFeature(object, child);

+	}

+

+	/**

+	 * This returns Facade.gif.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object getImage(Object object) {

+		return overlayImage(object, getResourceLocator().getImage("full/obj16/Facade"));

+	}

+

+	/**

+	 * This returns the label text for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String getText(Object object) {

+		return getString("_UI_Facade_type");

+	}

+	

+

+	/**

+	 * This handles model notifications by calling {@link #updateChildren} to update any cached

+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void notifyChanged(Notification notification) {

+		updateChildren(notification);

+

+		switch (notification.getFeatureID(Facade.class)) {

+			case FacadePackage.FACADE__EXTENSION_DEFINITIONS:

+			case FacadePackage.FACADE__VIRTUALMETAMODEL:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

+				return;

+		}

+		super.notifyChanged(notification);

+	}

+

+	/**

+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

+	 * that can be created under this object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

+		super.collectNewChildDescriptors(newChildDescriptors, object);

+

+		newChildDescriptors.add

+			(createChildParameter

+				(FacadePackage.Literals.FACADE__EXTENSION_DEFINITIONS,

+				 ExtensiondefinitionFactory.eINSTANCE.createExtensionDefinition()));

+

+		newChildDescriptors.add

+			(createChildParameter

+				(FacadePackage.Literals.FACADE__VIRTUALMETAMODEL,

+				 VirtualmetamodelFactory.eINSTANCE.createVirtualMetamodel()));

+	}

+

+	/**

+	 * Return the resource locator for this item provider's resources.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public ResourceLocator getResourceLocator() {

+		return FacadeEditPlugin.INSTANCE;

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/provider/FacadeItemProviderAdapterFactory.java b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/provider/FacadeItemProviderAdapterFactory.java
new file mode 100644
index 00000000000..7333c458b91
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/provider/FacadeItemProviderAdapterFactory.java
@@ -0,0 +1,210 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facade.provider;

+

+import java.util.ArrayList;

+import java.util.Collection;

+

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

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

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

+

+import org.eclipse.emf.edit.provider.ChangeNotifier;

+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

+import org.eclipse.emf.edit.provider.IChangeNotifier;

+import org.eclipse.emf.edit.provider.IDisposable;

+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

+import org.eclipse.emf.edit.provider.IItemLabelProvider;

+import org.eclipse.emf.edit.provider.IItemPropertySource;

+import org.eclipse.emf.edit.provider.INotifyChangedListener;

+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

+

+import org.eclipse.papyrus.facade.util.FacadeAdapterFactory;

+

+/**

+ * This is the factory that is used to provide the interfaces needed to support Viewers.

+ * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.

+ * The adapters also support Eclipse property sheets.

+ * Note that most of the adapters are shared among multiple instances.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class FacadeItemProviderAdapterFactory extends FacadeAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {

+	/**

+	 * This keeps track of the root adapter factory that delegates to this adapter factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected ComposedAdapterFactory parentAdapterFactory;

+

+	/**

+	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected IChangeNotifier changeNotifier = new ChangeNotifier();

+

+	/**

+	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected Collection<Object> supportedTypes = new ArrayList<Object>();

+

+	/**

+	 * This constructs an instance.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public FacadeItemProviderAdapterFactory() {

+		supportedTypes.add(IEditingDomainItemProvider.class);

+		supportedTypes.add(IStructuredItemContentProvider.class);

+		supportedTypes.add(ITreeItemContentProvider.class);

+		supportedTypes.add(IItemLabelProvider.class);

+		supportedTypes.add(IItemPropertySource.class);

+	}

+

+	/**

+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.facade.Facade} instances.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected FacadeItemProvider facadeItemProvider;

+

+	/**

+	 * This creates an adapter for a {@link org.eclipse.papyrus.facade.Facade}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Adapter createFacadeAdapter() {

+		if (facadeItemProvider == null) {

+			facadeItemProvider = new FacadeItemProvider(this);

+		}

+

+		return facadeItemProvider;

+	}

+

+	/**

+	 * This returns the root adapter factory that contains this factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public ComposeableAdapterFactory getRootAdapterFactory() {

+		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();

+	}

+

+	/**

+	 * This sets the composed adapter factory that contains this factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {

+		this.parentAdapterFactory = parentAdapterFactory;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean isFactoryForType(Object type) {

+		return supportedTypes.contains(type) || super.isFactoryForType(type);

+	}

+

+	/**

+	 * This implementation substitutes the factory itself as the key for the adapter.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Adapter adapt(Notifier notifier, Object type) {

+		return super.adapt(notifier, this);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object adapt(Object object, Object type) {

+		if (isFactoryForType(type)) {

+			Object adapter = super.adapt(object, type);

+			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {

+				return adapter;

+			}

+		}

+

+		return null;

+	}

+

+	/**

+	 * This adds a listener.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void addListener(INotifyChangedListener notifyChangedListener) {

+		changeNotifier.addListener(notifyChangedListener);

+	}

+

+	/**

+	 * This removes a listener.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void removeListener(INotifyChangedListener notifyChangedListener) {

+		changeNotifier.removeListener(notifyChangedListener);

+	}

+

+	/**

+	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void fireNotifyChanged(Notification notification) {

+		changeNotifier.fireNotifyChanged(notification);

+

+		if (parentAdapterFactory != null) {

+			parentAdapterFactory.fireNotifyChanged(notification);

+		}

+	}

+

+	/**

+	 * This disposes all of the item providers created by this factory. 

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void dispose() {

+		if (facadeItemProvider != null) facadeItemProvider.dispose();

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualClassifierItemProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualClassifierItemProvider.java
new file mode 100644
index 00000000000..9a6d888592c
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualClassifierItemProvider.java
@@ -0,0 +1,111 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facade.virtualmetamodel.provider;

+

+

+import java.util.Collection;

+import java.util.List;

+

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

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

+

+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

+import org.eclipse.emf.edit.provider.IItemLabelProvider;

+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.IItemPropertySource;

+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

+

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier;

+

+/**

+ * This is the item provider adapter for a {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier} object.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class VirtualClassifierItemProvider

+	extends VirtualElementItemProvider

+	implements

+		IEditingDomainItemProvider,

+		IStructuredItemContentProvider,

+		ITreeItemContentProvider,

+		IItemLabelProvider,

+		IItemPropertySource {

+	/**

+	 * This constructs an instance from a factory and a notifier.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public VirtualClassifierItemProvider(AdapterFactory adapterFactory) {

+		super(adapterFactory);

+	}

+

+	/**

+	 * This returns the property descriptors for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

+		if (itemPropertyDescriptors == null) {

+			super.getPropertyDescriptors(object);

+

+		}

+		return itemPropertyDescriptors;

+	}

+

+	/**

+	 * This returns the label text for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String getText(Object object) {

+		String label = ((VirtualClassifier)object).getAliasName();

+		return label == null || label.length() == 0 ?

+			getString("_UI_VirtualClassifier_type") :

+			getString("_UI_VirtualClassifier_type") + " " + label;

+	}

+	

+

+	/**

+	 * This handles model notifications by calling {@link #updateChildren} to update any cached

+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void notifyChanged(Notification notification) {

+		updateChildren(notification);

+		super.notifyChanged(notification);

+	}

+

+	/**

+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

+	 * that can be created under this object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

+		super.collectNewChildDescriptors(newChildDescriptors, object);

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualDatatypeItemProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualDatatypeItemProvider.java
new file mode 100644
index 00000000000..104c4b1ec6f
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualDatatypeItemProvider.java
@@ -0,0 +1,122 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facade.virtualmetamodel.provider;

+

+

+import java.util.Collection;

+import java.util.List;

+

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

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

+

+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

+import org.eclipse.emf.edit.provider.IItemLabelProvider;

+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.IItemPropertySource;

+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

+

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualDatatype;

+

+/**

+ * This is the item provider adapter for a {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualDatatype} object.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class VirtualDatatypeItemProvider

+	extends VirtualClassifierItemProvider

+	implements

+		IEditingDomainItemProvider,

+		IStructuredItemContentProvider,

+		ITreeItemContentProvider,

+		IItemLabelProvider,

+		IItemPropertySource {

+	/**

+	 * This constructs an instance from a factory and a notifier.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public VirtualDatatypeItemProvider(AdapterFactory adapterFactory) {

+		super(adapterFactory);

+	}

+

+	/**

+	 * This returns the property descriptors for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

+		if (itemPropertyDescriptors == null) {

+			super.getPropertyDescriptors(object);

+

+		}

+		return itemPropertyDescriptors;

+	}

+

+	/**

+	 * This returns VirtualDatatype.gif.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object getImage(Object object) {

+		return overlayImage(object, getResourceLocator().getImage("full/obj16/VirtualDatatype"));

+	}

+

+	/**

+	 * This returns the label text for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String getText(Object object) {

+		String label = ((VirtualDatatype)object).getAliasName();

+		return label == null || label.length() == 0 ?

+			getString("_UI_VirtualDatatype_type") :

+			getString("_UI_VirtualDatatype_type") + " " + label;

+	}

+	

+

+	/**

+	 * This handles model notifications by calling {@link #updateChildren} to update any cached

+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void notifyChanged(Notification notification) {

+		updateChildren(notification);

+		super.notifyChanged(notification);

+	}

+

+	/**

+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

+	 * that can be created under this object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

+		super.collectNewChildDescriptors(newChildDescriptors, object);

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualElementItemProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualElementItemProvider.java
new file mode 100644
index 00000000000..c0b72509770
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualElementItemProvider.java
@@ -0,0 +1,231 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facade.virtualmetamodel.provider;

+

+

+import java.util.Collection;

+import java.util.List;

+

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

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

+

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

+

+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

+import org.eclipse.emf.edit.provider.IItemLabelProvider;

+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.IItemPropertySource;

+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.ItemProviderAdapter;

+import org.eclipse.emf.edit.provider.ViewerNotification;

+

+import org.eclipse.papyrus.facade.provider.FacadeEditPlugin;

+

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

+

+/**

+ * This is the item provider adapter for a {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement} object.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class VirtualElementItemProvider

+	extends ItemProviderAdapter

+	implements

+		IEditingDomainItemProvider,

+		IStructuredItemContentProvider,

+		ITreeItemContentProvider,

+		IItemLabelProvider,

+		IItemPropertySource {

+	/**

+	 * This constructs an instance from a factory and a notifier.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public VirtualElementItemProvider(AdapterFactory adapterFactory) {

+		super(adapterFactory);

+	}

+

+	/**

+	 * This returns the property descriptors for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

+		if (itemPropertyDescriptors == null) {

+			super.getPropertyDescriptors(object);

+

+			addAliasNamePropertyDescriptor(object);

+			addKeptPropertyDescriptor(object);

+			addRepresentedElementPropertyDescriptor(object);

+			addUseRepresentedPropertyDescriptor(object);

+		}

+		return itemPropertyDescriptors;

+	}

+

+	/**

+	 * This adds a property descriptor for the Alias Name feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void addAliasNamePropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_VirtualElement_aliasName_feature"),

+				 getString("_UI_PropertyDescriptor_description", "_UI_VirtualElement_aliasName_feature", "_UI_VirtualElement_type"),

+				 VirtualmetamodelPackage.Literals.VIRTUAL_ELEMENT__ALIAS_NAME,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

+	}

+

+	/**

+	 * This adds a property descriptor for the Kept feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void addKeptPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_VirtualElement_kept_feature"),

+				 getString("_UI_PropertyDescriptor_description", "_UI_VirtualElement_kept_feature", "_UI_VirtualElement_type"),

+				 VirtualmetamodelPackage.Literals.VIRTUAL_ELEMENT__KEPT,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

+				 null,

+				 null));

+	}

+

+	/**

+	 * This adds a property descriptor for the Represented Element feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void addRepresentedElementPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_VirtualElement_representedElement_feature"),

+				 getString("_UI_PropertyDescriptor_description", "_UI_VirtualElement_representedElement_feature", "_UI_VirtualElement_type"),

+				 VirtualmetamodelPackage.Literals.VIRTUAL_ELEMENT__REPRESENTED_ELEMENT,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

+	}

+

+	/**

+	 * This adds a property descriptor for the Use Represented feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void addUseRepresentedPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_VirtualElement_useRepresented_feature"),

+				 getString("_UI_PropertyDescriptor_description", "_UI_VirtualElement_useRepresented_feature", "_UI_VirtualElement_type"),

+				 VirtualmetamodelPackage.Literals.VIRTUAL_ELEMENT__USE_REPRESENTED,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

+				 null,

+				 null));

+	}

+

+	/**

+	 * This returns the label text for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String getText(Object object) {

+		String label = ((VirtualElement)object).getAliasName();

+		return label == null || label.length() == 0 ?

+			getString("_UI_VirtualElement_type") :

+			getString("_UI_VirtualElement_type") + " " + label;

+	}

+	

+

+	/**

+	 * This handles model notifications by calling {@link #updateChildren} to update any cached

+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void notifyChanged(Notification notification) {

+		updateChildren(notification);

+

+		switch (notification.getFeatureID(VirtualElement.class)) {

+			case VirtualmetamodelPackage.VIRTUAL_ELEMENT__ALIAS_NAME:

+			case VirtualmetamodelPackage.VIRTUAL_ELEMENT__KEPT:

+			case VirtualmetamodelPackage.VIRTUAL_ELEMENT__USE_REPRESENTED:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+				return;

+		}

+		super.notifyChanged(notification);

+	}

+

+	/**

+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

+	 * that can be created under this object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

+		super.collectNewChildDescriptors(newChildDescriptors, object);

+	}

+

+	/**

+	 * Return the resource locator for this item provider's resources.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public ResourceLocator getResourceLocator() {

+		return FacadeEditPlugin.INSTANCE;

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualEnumItemProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualEnumItemProvider.java
new file mode 100644
index 00000000000..01aa785cee0
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualEnumItemProvider.java
@@ -0,0 +1,168 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facade.virtualmetamodel.provider;

+

+

+import java.util.Collection;

+import java.util.List;

+

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

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

+

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

+

+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

+import org.eclipse.emf.edit.provider.IItemLabelProvider;

+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.IItemPropertySource;

+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

+import org.eclipse.emf.edit.provider.ViewerNotification;

+

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualEnum;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelFactory;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

+

+/**

+ * This is the item provider adapter for a {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualEnum} object.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class VirtualEnumItemProvider

+	extends VirtualClassifierItemProvider

+	implements

+		IEditingDomainItemProvider,

+		IStructuredItemContentProvider,

+		ITreeItemContentProvider,

+		IItemLabelProvider,

+		IItemPropertySource {

+	/**

+	 * This constructs an instance from a factory and a notifier.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public VirtualEnumItemProvider(AdapterFactory adapterFactory) {

+		super(adapterFactory);

+	}

+

+	/**

+	 * This returns the property descriptors for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

+		if (itemPropertyDescriptors == null) {

+			super.getPropertyDescriptors(object);

+

+		}

+		return itemPropertyDescriptors;

+	}

+

+	/**

+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an

+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {

+		if (childrenFeatures == null) {

+			super.getChildrenFeatures(object);

+			childrenFeatures.add(VirtualmetamodelPackage.Literals.VIRTUAL_ENUM__LITERALS);

+		}

+		return childrenFeatures;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EStructuralFeature getChildFeature(Object object, Object child) {

+		// Check the type of the specified child object and return the proper feature to use for

+		// adding (see {@link AddCommand}) it as a child.

+

+		return super.getChildFeature(object, child);

+	}

+

+	/**

+	 * This returns VirtualEnum.gif.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object getImage(Object object) {

+		return overlayImage(object, getResourceLocator().getImage("full/obj16/VirtualEnum"));

+	}

+

+	/**

+	 * This returns the label text for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String getText(Object object) {

+		String label = ((VirtualEnum)object).getAliasName();

+		return label == null || label.length() == 0 ?

+			getString("_UI_VirtualEnum_type") :

+			getString("_UI_VirtualEnum_type") + " " + label;

+	}

+	

+

+	/**

+	 * This handles model notifications by calling {@link #updateChildren} to update any cached

+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void notifyChanged(Notification notification) {

+		updateChildren(notification);

+

+		switch (notification.getFeatureID(VirtualEnum.class)) {

+			case VirtualmetamodelPackage.VIRTUAL_ENUM__LITERALS:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

+				return;

+		}

+		super.notifyChanged(notification);

+	}

+

+	/**

+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

+	 * that can be created under this object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

+		super.collectNewChildDescriptors(newChildDescriptors, object);

+

+		newChildDescriptors.add

+			(createChildParameter

+				(VirtualmetamodelPackage.Literals.VIRTUAL_ENUM__LITERALS,

+				 VirtualmetamodelFactory.eINSTANCE.createVirtualLiteral()));

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualLiteralItemProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualLiteralItemProvider.java
new file mode 100644
index 00000000000..7c9c9815c11
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualLiteralItemProvider.java
@@ -0,0 +1,122 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facade.virtualmetamodel.provider;

+

+

+import java.util.Collection;

+import java.util.List;

+

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

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

+

+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

+import org.eclipse.emf.edit.provider.IItemLabelProvider;

+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.IItemPropertySource;

+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

+

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualLiteral;

+

+/**

+ * This is the item provider adapter for a {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualLiteral} object.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class VirtualLiteralItemProvider

+	extends VirtualElementItemProvider

+	implements

+		IEditingDomainItemProvider,

+		IStructuredItemContentProvider,

+		ITreeItemContentProvider,

+		IItemLabelProvider,

+		IItemPropertySource {

+	/**

+	 * This constructs an instance from a factory and a notifier.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public VirtualLiteralItemProvider(AdapterFactory adapterFactory) {

+		super(adapterFactory);

+	}

+

+	/**

+	 * This returns the property descriptors for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

+		if (itemPropertyDescriptors == null) {

+			super.getPropertyDescriptors(object);

+

+		}

+		return itemPropertyDescriptors;

+	}

+

+	/**

+	 * This returns VirtualLiteral.gif.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object getImage(Object object) {

+		return overlayImage(object, getResourceLocator().getImage("full/obj16/VirtualLiteral"));

+	}

+

+	/**

+	 * This returns the label text for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String getText(Object object) {

+		String label = ((VirtualLiteral)object).getAliasName();

+		return label == null || label.length() == 0 ?

+			getString("_UI_VirtualLiteral_type") :

+			getString("_UI_VirtualLiteral_type") + " " + label;

+	}

+	

+

+	/**

+	 * This handles model notifications by calling {@link #updateChildren} to update any cached

+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void notifyChanged(Notification notification) {

+		updateChildren(notification);

+		super.notifyChanged(notification);

+	}

+

+	/**

+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

+	 * that can be created under this object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

+		super.collectNewChildDescriptors(newChildDescriptors, object);

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualMetaclassItemProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualMetaclassItemProvider.java
new file mode 100644
index 00000000000..5b5ff556299
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualMetaclassItemProvider.java
@@ -0,0 +1,273 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facade.virtualmetamodel.provider;

+

+

+import java.util.Collection;

+import java.util.List;

+

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

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

+

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

+

+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

+import org.eclipse.emf.edit.provider.IItemLabelProvider;

+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.IItemPropertySource;

+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.ViewerNotification;

+

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelFactory;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

+

+/**

+ * This is the item provider adapter for a {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass} object.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class VirtualMetaclassItemProvider

+	extends VirtualClassifierItemProvider

+	implements

+		IEditingDomainItemProvider,

+		IStructuredItemContentProvider,

+		ITreeItemContentProvider,

+		IItemLabelProvider,

+		IItemPropertySource {

+	/**

+	 * This constructs an instance from a factory and a notifier.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public VirtualMetaclassItemProvider(AdapterFactory adapterFactory) {

+		super(adapterFactory);

+	}

+

+	/**

+	 * This returns the property descriptors for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

+		if (itemPropertyDescriptors == null) {

+			super.getPropertyDescriptors(object);

+

+			addAbstractPropertyDescriptor(object);

+			addAppliedStereotypesPropertyDescriptor(object);

+			addParentsPropertyDescriptor(object);

+			addStereotypeInterfacePropertyDescriptor(object);

+		}

+		return itemPropertyDescriptors;

+	}

+

+	/**

+	 * This adds a property descriptor for the Abstract feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void addAbstractPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_VirtualMetaclass_abstract_feature"),

+				 getString("_UI_PropertyDescriptor_description", "_UI_VirtualMetaclass_abstract_feature", "_UI_VirtualMetaclass_type"),

+				 VirtualmetamodelPackage.Literals.VIRTUAL_METACLASS__ABSTRACT,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

+				 null,

+				 null));

+	}

+

+	/**

+	 * This adds a property descriptor for the Applied Stereotypes feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void addAppliedStereotypesPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_VirtualMetaclass_appliedStereotypes_feature"),

+				 getString("_UI_PropertyDescriptor_description", "_UI_VirtualMetaclass_appliedStereotypes_feature", "_UI_VirtualMetaclass_type"),

+				 VirtualmetamodelPackage.Literals.VIRTUAL_METACLASS__APPLIED_STEREOTYPES,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

+	}

+

+	/**

+	 * This adds a property descriptor for the Parents feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void addParentsPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_VirtualMetaclass_parents_feature"),

+				 getString("_UI_PropertyDescriptor_description", "_UI_VirtualMetaclass_parents_feature", "_UI_VirtualMetaclass_type"),

+				 VirtualmetamodelPackage.Literals.VIRTUAL_METACLASS__PARENTS,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

+	}

+

+	/**

+	 * This adds a property descriptor for the Stereotype Interface feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void addStereotypeInterfacePropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_VirtualMetaclass_stereotypeInterface_feature"),

+				 getString("_UI_PropertyDescriptor_description", "_UI_VirtualMetaclass_stereotypeInterface_feature", "_UI_VirtualMetaclass_type"),

+				 VirtualmetamodelPackage.Literals.VIRTUAL_METACLASS__STEREOTYPE_INTERFACE,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

+				 null,

+				 null));

+	}

+

+	/**

+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an

+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {

+		if (childrenFeatures == null) {

+			super.getChildrenFeatures(object);

+			childrenFeatures.add(VirtualmetamodelPackage.Literals.VIRTUAL_METACLASS__OPERATIONS);

+			childrenFeatures.add(VirtualmetamodelPackage.Literals.VIRTUAL_METACLASS__PROPERTIES);

+		}

+		return childrenFeatures;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EStructuralFeature getChildFeature(Object object, Object child) {

+		// Check the type of the specified child object and return the proper feature to use for

+		// adding (see {@link AddCommand}) it as a child.

+

+		return super.getChildFeature(object, child);

+	}

+

+	/**

+	 * This returns VirtualMetaclass.gif.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object getImage(Object object) {

+		return overlayImage(object, getResourceLocator().getImage("full/obj16/VirtualMetaclass"));

+	}

+

+	/**

+	 * This returns the label text for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String getText(Object object) {

+		String label = ((VirtualMetaclass)object).getAliasName();

+		return label == null || label.length() == 0 ?

+			getString("_UI_VirtualMetaclass_type") :

+			getString("_UI_VirtualMetaclass_type") + " " + label;

+	}

+	

+

+	/**

+	 * This handles model notifications by calling {@link #updateChildren} to update any cached

+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void notifyChanged(Notification notification) {

+		updateChildren(notification);

+

+		switch (notification.getFeatureID(VirtualMetaclass.class)) {

+			case VirtualmetamodelPackage.VIRTUAL_METACLASS__ABSTRACT:

+			case VirtualmetamodelPackage.VIRTUAL_METACLASS__STEREOTYPE_INTERFACE:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+				return;

+			case VirtualmetamodelPackage.VIRTUAL_METACLASS__OPERATIONS:

+			case VirtualmetamodelPackage.VIRTUAL_METACLASS__PROPERTIES:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

+				return;

+		}

+		super.notifyChanged(notification);

+	}

+

+	/**

+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

+	 * that can be created under this object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

+		super.collectNewChildDescriptors(newChildDescriptors, object);

+

+		newChildDescriptors.add

+			(createChildParameter

+				(VirtualmetamodelPackage.Literals.VIRTUAL_METACLASS__OPERATIONS,

+				 VirtualmetamodelFactory.eINSTANCE.createVirtualOperation()));

+

+		newChildDescriptors.add

+			(createChildParameter

+				(VirtualmetamodelPackage.Literals.VIRTUAL_METACLASS__PROPERTIES,

+				 VirtualmetamodelFactory.eINSTANCE.createVirtualProperty()));

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualMetamodelItemProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualMetamodelItemProvider.java
new file mode 100644
index 00000000000..ba7051fa7b2
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualMetamodelItemProvider.java
@@ -0,0 +1,270 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facade.virtualmetamodel.provider;

+

+

+import java.util.Collection;

+import java.util.List;

+

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

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

+

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

+

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

+

+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

+import org.eclipse.emf.edit.provider.IItemLabelProvider;

+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.IItemPropertySource;

+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.ItemProviderAdapter;

+import org.eclipse.emf.edit.provider.ViewerNotification;

+

+import org.eclipse.papyrus.facade.provider.FacadeEditPlugin;

+

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelFactory;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

+

+/**

+ * This is the item provider adapter for a {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel} object.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class VirtualMetamodelItemProvider

+	extends ItemProviderAdapter

+	implements

+		IEditingDomainItemProvider,

+		IStructuredItemContentProvider,

+		ITreeItemContentProvider,

+		IItemLabelProvider,

+		IItemPropertySource {

+	/**

+	 * This constructs an instance from a factory and a notifier.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public VirtualMetamodelItemProvider(AdapterFactory adapterFactory) {

+		super(adapterFactory);

+	}

+

+	/**

+	 * This returns the property descriptors for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

+		if (itemPropertyDescriptors == null) {

+			super.getPropertyDescriptors(object);

+

+			addNamePropertyDescriptor(object);

+			addNsPrefixPropertyDescriptor(object);

+			addNsURIPropertyDescriptor(object);

+		}

+		return itemPropertyDescriptors;

+	}

+

+	/**

+	 * This adds a property descriptor for the Name feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void addNamePropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_VirtualMetamodel_name_feature"),

+				 getString("_UI_PropertyDescriptor_description", "_UI_VirtualMetamodel_name_feature", "_UI_VirtualMetamodel_type"),

+				 VirtualmetamodelPackage.Literals.VIRTUAL_METAMODEL__NAME,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

+	}

+

+	/**

+	 * This adds a property descriptor for the Ns Prefix feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void addNsPrefixPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_VirtualMetamodel_nsPrefix_feature"),

+				 getString("_UI_PropertyDescriptor_description", "_UI_VirtualMetamodel_nsPrefix_feature", "_UI_VirtualMetamodel_type"),

+				 VirtualmetamodelPackage.Literals.VIRTUAL_METAMODEL__NS_PREFIX,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

+	}

+

+	/**

+	 * This adds a property descriptor for the Ns URI feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void addNsURIPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_VirtualMetamodel_nsURI_feature"),

+				 getString("_UI_PropertyDescriptor_description", "_UI_VirtualMetamodel_nsURI_feature", "_UI_VirtualMetamodel_type"),

+				 VirtualmetamodelPackage.Literals.VIRTUAL_METAMODEL__NS_URI,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

+	}

+

+	/**

+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an

+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {

+		if (childrenFeatures == null) {

+			super.getChildrenFeatures(object);

+			childrenFeatures.add(VirtualmetamodelPackage.Literals.VIRTUAL_METAMODEL__VIRTUAL_CLASSIFIERS);

+		}

+		return childrenFeatures;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EStructuralFeature getChildFeature(Object object, Object child) {

+		// Check the type of the specified child object and return the proper feature to use for

+		// adding (see {@link AddCommand}) it as a child.

+

+		return super.getChildFeature(object, child);

+	}

+

+	/**

+	 * This returns VirtualMetamodel.gif.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object getImage(Object object) {

+		return overlayImage(object, getResourceLocator().getImage("full/obj16/VirtualMetamodel"));

+	}

+

+	/**

+	 * This returns the label text for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String getText(Object object) {

+		String label = ((VirtualMetamodel)object).getName();

+		return label == null || label.length() == 0 ?

+			getString("_UI_VirtualMetamodel_type") :

+			getString("_UI_VirtualMetamodel_type") + " " + label;

+	}

+	

+

+	/**

+	 * This handles model notifications by calling {@link #updateChildren} to update any cached

+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void notifyChanged(Notification notification) {

+		updateChildren(notification);

+

+		switch (notification.getFeatureID(VirtualMetamodel.class)) {

+			case VirtualmetamodelPackage.VIRTUAL_METAMODEL__NAME:

+			case VirtualmetamodelPackage.VIRTUAL_METAMODEL__NS_PREFIX:

+			case VirtualmetamodelPackage.VIRTUAL_METAMODEL__NS_URI:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+				return;

+			case VirtualmetamodelPackage.VIRTUAL_METAMODEL__VIRTUAL_CLASSIFIERS:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

+				return;

+		}

+		super.notifyChanged(notification);

+	}

+

+	/**

+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

+	 * that can be created under this object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

+		super.collectNewChildDescriptors(newChildDescriptors, object);

+

+		newChildDescriptors.add

+			(createChildParameter

+				(VirtualmetamodelPackage.Literals.VIRTUAL_METAMODEL__VIRTUAL_CLASSIFIERS,

+				 VirtualmetamodelFactory.eINSTANCE.createVirtualMetaclass()));

+

+		newChildDescriptors.add

+			(createChildParameter

+				(VirtualmetamodelPackage.Literals.VIRTUAL_METAMODEL__VIRTUAL_CLASSIFIERS,

+				 VirtualmetamodelFactory.eINSTANCE.createVirtualDatatype()));

+

+		newChildDescriptors.add

+			(createChildParameter

+				(VirtualmetamodelPackage.Literals.VIRTUAL_METAMODEL__VIRTUAL_CLASSIFIERS,

+				 VirtualmetamodelFactory.eINSTANCE.createVirtualEnum()));

+	}

+

+	/**

+	 * Return the resource locator for this item provider's resources.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public ResourceLocator getResourceLocator() {

+		return FacadeEditPlugin.INSTANCE;

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualOperationItemProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualOperationItemProvider.java
new file mode 100644
index 00000000000..a7367b9c2f9
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualOperationItemProvider.java
@@ -0,0 +1,168 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facade.virtualmetamodel.provider;

+

+

+import java.util.Collection;

+import java.util.List;

+

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

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

+

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

+

+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

+import org.eclipse.emf.edit.provider.IItemLabelProvider;

+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.IItemPropertySource;

+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

+import org.eclipse.emf.edit.provider.ViewerNotification;

+

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualOperation;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelFactory;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

+

+/**

+ * This is the item provider adapter for a {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualOperation} object.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class VirtualOperationItemProvider

+	extends VirtualTypedElementItemProvider

+	implements

+		IEditingDomainItemProvider,

+		IStructuredItemContentProvider,

+		ITreeItemContentProvider,

+		IItemLabelProvider,

+		IItemPropertySource {

+	/**

+	 * This constructs an instance from a factory and a notifier.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public VirtualOperationItemProvider(AdapterFactory adapterFactory) {

+		super(adapterFactory);

+	}

+

+	/**

+	 * This returns the property descriptors for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

+		if (itemPropertyDescriptors == null) {

+			super.getPropertyDescriptors(object);

+

+		}

+		return itemPropertyDescriptors;

+	}

+

+	/**

+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an

+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {

+		if (childrenFeatures == null) {

+			super.getChildrenFeatures(object);

+			childrenFeatures.add(VirtualmetamodelPackage.Literals.VIRTUAL_OPERATION__PARAMETERS);

+		}

+		return childrenFeatures;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EStructuralFeature getChildFeature(Object object, Object child) {

+		// Check the type of the specified child object and return the proper feature to use for

+		// adding (see {@link AddCommand}) it as a child.

+

+		return super.getChildFeature(object, child);

+	}

+

+	/**

+	 * This returns VirtualOperation.gif.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object getImage(Object object) {

+		return overlayImage(object, getResourceLocator().getImage("full/obj16/VirtualOperation"));

+	}

+

+	/**

+	 * This returns the label text for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String getText(Object object) {

+		String label = ((VirtualOperation)object).getAliasName();

+		return label == null || label.length() == 0 ?

+			getString("_UI_VirtualOperation_type") :

+			getString("_UI_VirtualOperation_type") + " " + label;

+	}

+	

+

+	/**

+	 * This handles model notifications by calling {@link #updateChildren} to update any cached

+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void notifyChanged(Notification notification) {

+		updateChildren(notification);

+

+		switch (notification.getFeatureID(VirtualOperation.class)) {

+			case VirtualmetamodelPackage.VIRTUAL_OPERATION__PARAMETERS:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

+				return;

+		}

+		super.notifyChanged(notification);

+	}

+

+	/**

+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

+	 * that can be created under this object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

+		super.collectNewChildDescriptors(newChildDescriptors, object);

+

+		newChildDescriptors.add

+			(createChildParameter

+				(VirtualmetamodelPackage.Literals.VIRTUAL_OPERATION__PARAMETERS,

+				 VirtualmetamodelFactory.eINSTANCE.createVirtualParameter()));

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualParameterItemProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualParameterItemProvider.java
new file mode 100644
index 00000000000..7a62a02145a
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualParameterItemProvider.java
@@ -0,0 +1,122 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facade.virtualmetamodel.provider;

+

+

+import java.util.Collection;

+import java.util.List;

+

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

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

+

+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

+import org.eclipse.emf.edit.provider.IItemLabelProvider;

+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.IItemPropertySource;

+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

+

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualParameter;

+

+/**

+ * This is the item provider adapter for a {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualParameter} object.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class VirtualParameterItemProvider

+	extends VirtualTypedElementItemProvider

+	implements

+		IEditingDomainItemProvider,

+		IStructuredItemContentProvider,

+		ITreeItemContentProvider,

+		IItemLabelProvider,

+		IItemPropertySource {

+	/**

+	 * This constructs an instance from a factory and a notifier.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public VirtualParameterItemProvider(AdapterFactory adapterFactory) {

+		super(adapterFactory);

+	}

+

+	/**

+	 * This returns the property descriptors for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

+		if (itemPropertyDescriptors == null) {

+			super.getPropertyDescriptors(object);

+

+		}

+		return itemPropertyDescriptors;

+	}

+

+	/**

+	 * This returns VirtualParameter.gif.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object getImage(Object object) {

+		return overlayImage(object, getResourceLocator().getImage("full/obj16/VirtualParameter"));

+	}

+

+	/**

+	 * This returns the label text for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String getText(Object object) {

+		String label = ((VirtualParameter)object).getAliasName();

+		return label == null || label.length() == 0 ?

+			getString("_UI_VirtualParameter_type") :

+			getString("_UI_VirtualParameter_type") + " " + label;

+	}

+	

+

+	/**

+	 * This handles model notifications by calling {@link #updateChildren} to update any cached

+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void notifyChanged(Notification notification) {

+		updateChildren(notification);

+		super.notifyChanged(notification);

+	}

+

+	/**

+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

+	 * that can be created under this object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

+		super.collectNewChildDescriptors(newChildDescriptors, object);

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualPropertyItemProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualPropertyItemProvider.java
new file mode 100644
index 00000000000..34000d0bc84
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualPropertyItemProvider.java
@@ -0,0 +1,122 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facade.virtualmetamodel.provider;

+

+

+import java.util.Collection;

+import java.util.List;

+

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

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

+

+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

+import org.eclipse.emf.edit.provider.IItemLabelProvider;

+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.IItemPropertySource;

+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

+

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty;

+

+/**

+ * This is the item provider adapter for a {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty} object.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class VirtualPropertyItemProvider

+	extends VirtualTypedElementItemProvider

+	implements

+		IEditingDomainItemProvider,

+		IStructuredItemContentProvider,

+		ITreeItemContentProvider,

+		IItemLabelProvider,

+		IItemPropertySource {

+	/**

+	 * This constructs an instance from a factory and a notifier.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public VirtualPropertyItemProvider(AdapterFactory adapterFactory) {

+		super(adapterFactory);

+	}

+

+	/**

+	 * This returns the property descriptors for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

+		if (itemPropertyDescriptors == null) {

+			super.getPropertyDescriptors(object);

+

+		}

+		return itemPropertyDescriptors;

+	}

+

+	/**

+	 * This returns VirtualProperty.gif.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object getImage(Object object) {

+		return overlayImage(object, getResourceLocator().getImage("full/obj16/VirtualProperty"));

+	}

+

+	/**

+	 * This returns the label text for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String getText(Object object) {

+		String label = ((VirtualProperty)object).getAliasName();

+		return label == null || label.length() == 0 ?

+			getString("_UI_VirtualProperty_type") :

+			getString("_UI_VirtualProperty_type") + " " + label;

+	}

+	

+

+	/**

+	 * This handles model notifications by calling {@link #updateChildren} to update any cached

+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void notifyChanged(Notification notification) {

+		updateChildren(notification);

+		super.notifyChanged(notification);

+	}

+

+	/**

+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

+	 * that can be created under this object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

+		super.collectNewChildDescriptors(newChildDescriptors, object);

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualTypedElementItemProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualTypedElementItemProvider.java
new file mode 100644
index 00000000000..61f53671c92
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualTypedElementItemProvider.java
@@ -0,0 +1,191 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facade.virtualmetamodel.provider;

+

+

+import java.util.Collection;

+import java.util.List;

+

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

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

+

+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

+import org.eclipse.emf.edit.provider.IItemLabelProvider;

+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.IItemPropertySource;

+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.ViewerNotification;

+

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

+

+/**

+ * This is the item provider adapter for a {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement} object.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class VirtualTypedElementItemProvider

+	extends VirtualElementItemProvider

+	implements

+		IEditingDomainItemProvider,

+		IStructuredItemContentProvider,

+		ITreeItemContentProvider,

+		IItemLabelProvider,

+		IItemPropertySource {

+	/**

+	 * This constructs an instance from a factory and a notifier.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public VirtualTypedElementItemProvider(AdapterFactory adapterFactory) {

+		super(adapterFactory);

+	}

+

+	/**

+	 * This returns the property descriptors for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

+		if (itemPropertyDescriptors == null) {

+			super.getPropertyDescriptors(object);

+

+			addLowerPropertyDescriptor(object);

+			addUpperPropertyDescriptor(object);

+			addTypePropertyDescriptor(object);

+		}

+		return itemPropertyDescriptors;

+	}

+

+	/**

+	 * This adds a property descriptor for the Lower feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void addLowerPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_VirtualTypedElement_lower_feature"),

+				 getString("_UI_PropertyDescriptor_description", "_UI_VirtualTypedElement_lower_feature", "_UI_VirtualTypedElement_type"),

+				 VirtualmetamodelPackage.Literals.VIRTUAL_TYPED_ELEMENT__LOWER,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,

+				 null,

+				 null));

+	}

+

+	/**

+	 * This adds a property descriptor for the Upper feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void addUpperPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_VirtualTypedElement_upper_feature"),

+				 getString("_UI_PropertyDescriptor_description", "_UI_VirtualTypedElement_upper_feature", "_UI_VirtualTypedElement_type"),

+				 VirtualmetamodelPackage.Literals.VIRTUAL_TYPED_ELEMENT__UPPER,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,

+				 null,

+				 null));

+	}

+

+	/**

+	 * This adds a property descriptor for the Type feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void addTypePropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_VirtualTypedElement_type_feature"),

+				 getString("_UI_PropertyDescriptor_description", "_UI_VirtualTypedElement_type_feature", "_UI_VirtualTypedElement_type"),

+				 VirtualmetamodelPackage.Literals.VIRTUAL_TYPED_ELEMENT__TYPE,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

+	}

+

+	/**

+	 * This returns the label text for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String getText(Object object) {

+		String label = ((VirtualTypedElement)object).getAliasName();

+		return label == null || label.length() == 0 ?

+			getString("_UI_VirtualTypedElement_type") :

+			getString("_UI_VirtualTypedElement_type") + " " + label;

+	}

+	

+

+	/**

+	 * This handles model notifications by calling {@link #updateChildren} to update any cached

+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void notifyChanged(Notification notification) {

+		updateChildren(notification);

+

+		switch (notification.getFeatureID(VirtualTypedElement.class)) {

+			case VirtualmetamodelPackage.VIRTUAL_TYPED_ELEMENT__LOWER:

+			case VirtualmetamodelPackage.VIRTUAL_TYPED_ELEMENT__UPPER:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+				return;

+		}

+		super.notifyChanged(notification);

+	}

+

+	/**

+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

+	 * that can be created under this object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

+		super.collectNewChildDescriptors(newChildDescriptors, object);

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualmetamodelItemProviderAdapterFactory.java b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualmetamodelItemProviderAdapterFactory.java
new file mode 100644
index 00000000000..297da5680a9
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facade/virtualmetamodel/provider/VirtualmetamodelItemProviderAdapterFactory.java
@@ -0,0 +1,378 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facade.virtualmetamodel.provider;

+

+import java.util.ArrayList;

+import java.util.Collection;

+

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

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

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

+

+import org.eclipse.emf.edit.provider.ChangeNotifier;

+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

+import org.eclipse.emf.edit.provider.IChangeNotifier;

+import org.eclipse.emf.edit.provider.IDisposable;

+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

+import org.eclipse.emf.edit.provider.IItemLabelProvider;

+import org.eclipse.emf.edit.provider.IItemPropertySource;

+import org.eclipse.emf.edit.provider.INotifyChangedListener;

+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

+

+import org.eclipse.papyrus.facade.virtualmetamodel.util.VirtualmetamodelAdapterFactory;

+

+/**

+ * This is the factory that is used to provide the interfaces needed to support Viewers.

+ * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.

+ * The adapters also support Eclipse property sheets.

+ * Note that most of the adapters are shared among multiple instances.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class VirtualmetamodelItemProviderAdapterFactory extends VirtualmetamodelAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {

+	/**

+	 * This keeps track of the root adapter factory that delegates to this adapter factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected ComposedAdapterFactory parentAdapterFactory;

+

+	/**

+	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected IChangeNotifier changeNotifier = new ChangeNotifier();

+

+	/**

+	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected Collection<Object> supportedTypes = new ArrayList<Object>();

+

+	/**

+	 * This constructs an instance.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public VirtualmetamodelItemProviderAdapterFactory() {

+		supportedTypes.add(IEditingDomainItemProvider.class);

+		supportedTypes.add(IStructuredItemContentProvider.class);

+		supportedTypes.add(ITreeItemContentProvider.class);

+		supportedTypes.add(IItemLabelProvider.class);

+		supportedTypes.add(IItemPropertySource.class);

+	}

+

+	/**

+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel} instances.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected VirtualMetamodelItemProvider virtualMetamodelItemProvider;

+

+	/**

+	 * This creates an adapter for a {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Adapter createVirtualMetamodelAdapter() {

+		if (virtualMetamodelItemProvider == null) {

+			virtualMetamodelItemProvider = new VirtualMetamodelItemProvider(this);

+		}

+

+		return virtualMetamodelItemProvider;

+	}

+

+	/**

+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass} instances.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected VirtualMetaclassItemProvider virtualMetaclassItemProvider;

+

+	/**

+	 * This creates an adapter for a {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Adapter createVirtualMetaclassAdapter() {

+		if (virtualMetaclassItemProvider == null) {

+			virtualMetaclassItemProvider = new VirtualMetaclassItemProvider(this);

+		}

+

+		return virtualMetaclassItemProvider;

+	}

+

+	/**

+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty} instances.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected VirtualPropertyItemProvider virtualPropertyItemProvider;

+

+	/**

+	 * This creates an adapter for a {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Adapter createVirtualPropertyAdapter() {

+		if (virtualPropertyItemProvider == null) {

+			virtualPropertyItemProvider = new VirtualPropertyItemProvider(this);

+		}

+

+		return virtualPropertyItemProvider;

+	}

+

+	/**

+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualOperation} instances.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected VirtualOperationItemProvider virtualOperationItemProvider;

+

+	/**

+	 * This creates an adapter for a {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualOperation}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Adapter createVirtualOperationAdapter() {

+		if (virtualOperationItemProvider == null) {

+			virtualOperationItemProvider = new VirtualOperationItemProvider(this);

+		}

+

+		return virtualOperationItemProvider;

+	}

+

+	/**

+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualParameter} instances.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected VirtualParameterItemProvider virtualParameterItemProvider;

+

+	/**

+	 * This creates an adapter for a {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualParameter}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Adapter createVirtualParameterAdapter() {

+		if (virtualParameterItemProvider == null) {

+			virtualParameterItemProvider = new VirtualParameterItemProvider(this);

+		}

+

+		return virtualParameterItemProvider;

+	}

+

+	/**

+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualDatatype} instances.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected VirtualDatatypeItemProvider virtualDatatypeItemProvider;

+

+	/**

+	 * This creates an adapter for a {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualDatatype}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Adapter createVirtualDatatypeAdapter() {

+		if (virtualDatatypeItemProvider == null) {

+			virtualDatatypeItemProvider = new VirtualDatatypeItemProvider(this);

+		}

+

+		return virtualDatatypeItemProvider;

+	}

+

+	/**

+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualEnum} instances.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected VirtualEnumItemProvider virtualEnumItemProvider;

+

+	/**

+	 * This creates an adapter for a {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualEnum}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Adapter createVirtualEnumAdapter() {

+		if (virtualEnumItemProvider == null) {

+			virtualEnumItemProvider = new VirtualEnumItemProvider(this);

+		}

+

+		return virtualEnumItemProvider;

+	}

+

+	/**

+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualLiteral} instances.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected VirtualLiteralItemProvider virtualLiteralItemProvider;

+

+	/**

+	 * This creates an adapter for a {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualLiteral}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Adapter createVirtualLiteralAdapter() {

+		if (virtualLiteralItemProvider == null) {

+			virtualLiteralItemProvider = new VirtualLiteralItemProvider(this);

+		}

+

+		return virtualLiteralItemProvider;

+	}

+

+	/**

+	 * This returns the root adapter factory that contains this factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public ComposeableAdapterFactory getRootAdapterFactory() {

+		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();

+	}

+

+	/**

+	 * This sets the composed adapter factory that contains this factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {

+		this.parentAdapterFactory = parentAdapterFactory;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean isFactoryForType(Object type) {

+		return supportedTypes.contains(type) || super.isFactoryForType(type);

+	}

+

+	/**

+	 * This implementation substitutes the factory itself as the key for the adapter.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Adapter adapt(Notifier notifier, Object type) {

+		return super.adapt(notifier, this);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object adapt(Object object, Object type) {

+		if (isFactoryForType(type)) {

+			Object adapter = super.adapt(object, type);

+			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {

+				return adapter;

+			}

+		}

+

+		return null;

+	}

+

+	/**

+	 * This adds a listener.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void addListener(INotifyChangedListener notifyChangedListener) {

+		changeNotifier.addListener(notifyChangedListener);

+	}

+

+	/**

+	 * This removes a listener.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void removeListener(INotifyChangedListener notifyChangedListener) {

+		changeNotifier.removeListener(notifyChangedListener);

+	}

+

+	/**

+	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void fireNotifyChanged(Notification notification) {

+		changeNotifier.fireNotifyChanged(notification);

+

+		if (parentAdapterFactory != null) {

+			parentAdapterFactory.fireNotifyChanged(notification);

+		}

+	}

+

+	/**

+	 * This disposes all of the item providers created by this factory. 

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void dispose() {

+		if (virtualMetamodelItemProvider != null) virtualMetamodelItemProvider.dispose();

+		if (virtualMetaclassItemProvider != null) virtualMetaclassItemProvider.dispose();

+		if (virtualPropertyItemProvider != null) virtualPropertyItemProvider.dispose();

+		if (virtualOperationItemProvider != null) virtualOperationItemProvider.dispose();

+		if (virtualParameterItemProvider != null) virtualParameterItemProvider.dispose();

+		if (virtualDatatypeItemProvider != null) virtualDatatypeItemProvider.dispose();

+		if (virtualEnumItemProvider != null) virtualEnumItemProvider.dispose();

+		if (virtualLiteralItemProvider != null) virtualLiteralItemProvider.dispose();

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facademapping/provider/FacadeMapppingItemProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facademapping/provider/FacadeMapppingItemProvider.java
new file mode 100644
index 00000000000..ffd74623b5f
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facademapping/provider/FacadeMapppingItemProvider.java
@@ -0,0 +1,184 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facademapping.provider;

+

+

+import java.util.Collection;

+import java.util.List;

+

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

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

+

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

+

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

+

+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

+import org.eclipse.emf.edit.provider.IItemLabelProvider;

+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.IItemPropertySource;

+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

+import org.eclipse.emf.edit.provider.ItemProviderAdapter;

+import org.eclipse.emf.edit.provider.ViewerNotification;

+

+import org.eclipse.papyrus.facademapping.FacadeMappping;

+import org.eclipse.papyrus.facademapping.FacademappingFactory;

+import org.eclipse.papyrus.facademapping.FacademappingPackage;

+

+/**

+ * This is the item provider adapter for a {@link org.eclipse.papyrus.facademapping.FacadeMappping} object.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class FacadeMapppingItemProvider

+	extends ItemProviderAdapter

+	implements

+		IEditingDomainItemProvider,

+		IStructuredItemContentProvider,

+		ITreeItemContentProvider,

+		IItemLabelProvider,

+		IItemPropertySource {

+	/**

+	 * This constructs an instance from a factory and a notifier.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public FacadeMapppingItemProvider(AdapterFactory adapterFactory) {

+		super(adapterFactory);

+	}

+

+	/**

+	 * This returns the property descriptors for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

+		if (itemPropertyDescriptors == null) {

+			super.getPropertyDescriptors(object);

+

+		}

+		return itemPropertyDescriptors;

+	}

+

+	/**

+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an

+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {

+		if (childrenFeatures == null) {

+			super.getChildrenFeatures(object);

+			childrenFeatures.add(FacademappingPackage.Literals.FACADE_MAPPPING__MAPPINGS);

+		}

+		return childrenFeatures;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EStructuralFeature getChildFeature(Object object, Object child) {

+		// Check the type of the specified child object and return the proper feature to use for

+		// adding (see {@link AddCommand}) it as a child.

+

+		return super.getChildFeature(object, child);

+	}

+

+	/**

+	 * This returns FacadeMappping.gif.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object getImage(Object object) {

+		return overlayImage(object, getResourceLocator().getImage("full/obj16/FacadeMappping"));

+	}

+

+	/**

+	 * This returns the label text for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String getText(Object object) {

+		return getString("_UI_FacadeMappping_type");

+	}

+	

+

+	/**

+	 * This handles model notifications by calling {@link #updateChildren} to update any cached

+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void notifyChanged(Notification notification) {

+		updateChildren(notification);

+

+		switch (notification.getFeatureID(FacadeMappping.class)) {

+			case FacademappingPackage.FACADE_MAPPPING__MAPPINGS:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

+				return;

+		}

+		super.notifyChanged(notification);

+	}

+

+	/**

+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

+	 * that can be created under this object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

+		super.collectNewChildDescriptors(newChildDescriptors, object);

+

+		newChildDescriptors.add

+			(createChildParameter

+				(FacademappingPackage.Literals.FACADE_MAPPPING__MAPPINGS,

+				 FacademappingFactory.eINSTANCE.createMapping()));

+

+		newChildDescriptors.add

+			(createChildParameter

+				(FacademappingPackage.Literals.FACADE_MAPPPING__MAPPINGS,

+				 FacademappingFactory.eINSTANCE.createStereotypedMapping()));

+	}

+

+	/**

+	 * Return the resource locator for this item provider's resources.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public ResourceLocator getResourceLocator() {

+		return FacademappingEditPlugin.INSTANCE;

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facademapping/provider/FacademappingEditPlugin.java b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facademapping/provider/FacademappingEditPlugin.java
new file mode 100644
index 00000000000..076161cc2dc
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facademapping/provider/FacademappingEditPlugin.java
@@ -0,0 +1,100 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facademapping.provider;

+

+import org.eclipse.emf.common.EMFPlugin;

+

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

+

+/**

+ * This is the central singleton for the Facademapping edit plugin.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public final class FacademappingEditPlugin extends EMFPlugin {

+	/**

+	 * Keep track of the singleton.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static final FacademappingEditPlugin INSTANCE = new FacademappingEditPlugin();

+

+	/**

+	 * Keep track of the singleton.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private static Implementation plugin;

+

+	/**

+	 * Create the instance.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public FacademappingEditPlugin() {

+		super

+		  (new ResourceLocator [] {

+		   });

+	}

+

+	/**

+	 * Returns the singleton instance of the Eclipse plugin.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the singleton instance.

+	 * @generated

+	 */

+	@Override

+	public ResourceLocator getPluginResourceLocator() {

+		return plugin;

+	}

+

+	/**

+	 * Returns the singleton instance of the Eclipse plugin.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the singleton instance.

+	 * @generated

+	 */

+	public static Implementation getPlugin() {

+		return plugin;

+	}

+

+	/**

+	 * The actual implementation of the Eclipse <b>Plugin</b>.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static class Implementation extends EclipsePlugin {

+		/**

+		 * Creates an instance.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public Implementation() {

+			super();

+

+			// Remember the static instance.

+			//

+			plugin = this;

+		}

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facademapping/provider/FacademappingItemProviderAdapterFactory.java b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facademapping/provider/FacademappingItemProviderAdapterFactory.java
new file mode 100644
index 00000000000..e0aabc70118
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facademapping/provider/FacademappingItemProviderAdapterFactory.java
@@ -0,0 +1,258 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facademapping.provider;

+

+import java.util.ArrayList;

+import java.util.Collection;

+

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

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

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

+

+import org.eclipse.emf.edit.provider.ChangeNotifier;

+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

+import org.eclipse.emf.edit.provider.IChangeNotifier;

+import org.eclipse.emf.edit.provider.IDisposable;

+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

+import org.eclipse.emf.edit.provider.IItemLabelProvider;

+import org.eclipse.emf.edit.provider.IItemPropertySource;

+import org.eclipse.emf.edit.provider.INotifyChangedListener;

+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

+

+import org.eclipse.papyrus.facademapping.util.FacademappingAdapterFactory;

+

+/**

+ * This is the factory that is used to provide the interfaces needed to support Viewers.

+ * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.

+ * The adapters also support Eclipse property sheets.

+ * Note that most of the adapters are shared among multiple instances.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class FacademappingItemProviderAdapterFactory extends FacademappingAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {

+	/**

+	 * This keeps track of the root adapter factory that delegates to this adapter factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected ComposedAdapterFactory parentAdapterFactory;

+

+	/**

+	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected IChangeNotifier changeNotifier = new ChangeNotifier();

+

+	/**

+	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected Collection<Object> supportedTypes = new ArrayList<Object>();

+

+	/**

+	 * This constructs an instance.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public FacademappingItemProviderAdapterFactory() {

+		supportedTypes.add(IEditingDomainItemProvider.class);

+		supportedTypes.add(IStructuredItemContentProvider.class);

+		supportedTypes.add(ITreeItemContentProvider.class);

+		supportedTypes.add(IItemLabelProvider.class);

+		supportedTypes.add(IItemPropertySource.class);

+	}

+

+	/**

+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.facademapping.Mapping} instances.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected MappingItemProvider mappingItemProvider;

+

+	/**

+	 * This creates an adapter for a {@link org.eclipse.papyrus.facademapping.Mapping}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Adapter createMappingAdapter() {

+		if (mappingItemProvider == null) {

+			mappingItemProvider = new MappingItemProvider(this);

+		}

+

+		return mappingItemProvider;

+	}

+

+	/**

+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.facademapping.StereotypedMapping} instances.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected StereotypedMappingItemProvider stereotypedMappingItemProvider;

+

+	/**

+	 * This creates an adapter for a {@link org.eclipse.papyrus.facademapping.StereotypedMapping}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Adapter createStereotypedMappingAdapter() {

+		if (stereotypedMappingItemProvider == null) {

+			stereotypedMappingItemProvider = new StereotypedMappingItemProvider(this);

+		}

+

+		return stereotypedMappingItemProvider;

+	}

+

+	/**

+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.facademapping.FacadeMappping} instances.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected FacadeMapppingItemProvider facadeMapppingItemProvider;

+

+	/**

+	 * This creates an adapter for a {@link org.eclipse.papyrus.facademapping.FacadeMappping}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Adapter createFacadeMapppingAdapter() {

+		if (facadeMapppingItemProvider == null) {

+			facadeMapppingItemProvider = new FacadeMapppingItemProvider(this);

+		}

+

+		return facadeMapppingItemProvider;

+	}

+

+	/**

+	 * This returns the root adapter factory that contains this factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public ComposeableAdapterFactory getRootAdapterFactory() {

+		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();

+	}

+

+	/**

+	 * This sets the composed adapter factory that contains this factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {

+		this.parentAdapterFactory = parentAdapterFactory;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean isFactoryForType(Object type) {

+		return supportedTypes.contains(type) || super.isFactoryForType(type);

+	}

+

+	/**

+	 * This implementation substitutes the factory itself as the key for the adapter.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Adapter adapt(Notifier notifier, Object type) {

+		return super.adapt(notifier, this);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object adapt(Object object, Object type) {

+		if (isFactoryForType(type)) {

+			Object adapter = super.adapt(object, type);

+			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {

+				return adapter;

+			}

+		}

+

+		return null;

+	}

+

+	/**

+	 * This adds a listener.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void addListener(INotifyChangedListener notifyChangedListener) {

+		changeNotifier.addListener(notifyChangedListener);

+	}

+

+	/**

+	 * This removes a listener.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void removeListener(INotifyChangedListener notifyChangedListener) {

+		changeNotifier.removeListener(notifyChangedListener);

+	}

+

+	/**

+	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void fireNotifyChanged(Notification notification) {

+		changeNotifier.fireNotifyChanged(notification);

+

+		if (parentAdapterFactory != null) {

+			parentAdapterFactory.fireNotifyChanged(notification);

+		}

+	}

+

+	/**

+	 * This disposes all of the item providers created by this factory. 

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void dispose() {

+		if (mappingItemProvider != null) mappingItemProvider.dispose();

+		if (stereotypedMappingItemProvider != null) stereotypedMappingItemProvider.dispose();

+		if (facadeMapppingItemProvider != null) facadeMapppingItemProvider.dispose();

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facademapping/provider/MappingItemProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facademapping/provider/MappingItemProvider.java
new file mode 100644
index 00000000000..b5153a71257
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facademapping/provider/MappingItemProvider.java
@@ -0,0 +1,180 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facademapping.provider;

+

+

+import java.util.Collection;

+import java.util.List;

+

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

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

+

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

+

+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

+import org.eclipse.emf.edit.provider.IItemLabelProvider;

+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.IItemPropertySource;

+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

+import org.eclipse.emf.edit.provider.ItemProviderAdapter;

+

+import org.eclipse.papyrus.facademapping.FacademappingPackage;

+

+/**

+ * This is the item provider adapter for a {@link org.eclipse.papyrus.facademapping.Mapping} object.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class MappingItemProvider

+	extends ItemProviderAdapter

+	implements

+		IEditingDomainItemProvider,

+		IStructuredItemContentProvider,

+		ITreeItemContentProvider,

+		IItemLabelProvider,

+		IItemPropertySource {

+	/**

+	 * This constructs an instance from a factory and a notifier.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public MappingItemProvider(AdapterFactory adapterFactory) {

+		super(adapterFactory);

+	}

+

+	/**

+	 * This returns the property descriptors for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

+		if (itemPropertyDescriptors == null) {

+			super.getPropertyDescriptors(object);

+

+			addUmlElementPropertyDescriptor(object);

+			addSpecificDomainElementPropertyDescriptor(object);

+		}

+		return itemPropertyDescriptors;

+	}

+

+	/**

+	 * This adds a property descriptor for the Uml Element feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void addUmlElementPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_Mapping_umlElement_feature"),

+				 getString("_UI_PropertyDescriptor_description", "_UI_Mapping_umlElement_feature", "_UI_Mapping_type"),

+				 FacademappingPackage.Literals.MAPPING__UML_ELEMENT,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

+	}

+

+	/**

+	 * This adds a property descriptor for the Specific Domain Element feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void addSpecificDomainElementPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_Mapping_specificDomainElement_feature"),

+				 getString("_UI_PropertyDescriptor_description", "_UI_Mapping_specificDomainElement_feature", "_UI_Mapping_type"),

+				 FacademappingPackage.Literals.MAPPING__SPECIFIC_DOMAIN_ELEMENT,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

+	}

+

+	/**

+	 * This returns Mapping.gif.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object getImage(Object object) {

+		return overlayImage(object, getResourceLocator().getImage("full/obj16/Mapping"));

+	}

+

+	/**

+	 * This returns the label text for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String getText(Object object) {

+		return getString("_UI_Mapping_type");

+	}

+	

+

+	/**

+	 * This handles model notifications by calling {@link #updateChildren} to update any cached

+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void notifyChanged(Notification notification) {

+		updateChildren(notification);

+		super.notifyChanged(notification);

+	}

+

+	/**

+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

+	 * that can be created under this object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

+		super.collectNewChildDescriptors(newChildDescriptors, object);

+	}

+

+	/**

+	 * Return the resource locator for this item provider's resources.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public ResourceLocator getResourceLocator() {

+		return FacademappingEditPlugin.INSTANCE;

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facademapping/provider/StereotypedMappingItemProvider.java b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facademapping/provider/StereotypedMappingItemProvider.java
new file mode 100644
index 00000000000..eb992b8abf8
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.edit/src/org/eclipse/papyrus/facademapping/provider/StereotypedMappingItemProvider.java
@@ -0,0 +1,180 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facademapping.provider;

+

+

+import java.util.Collection;

+import java.util.List;

+

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

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

+

+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

+import org.eclipse.emf.edit.provider.IItemLabelProvider;

+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.IItemPropertySource;

+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.ViewerNotification;

+

+import org.eclipse.papyrus.facademapping.ExtensionDefinitionKind;

+import org.eclipse.papyrus.facademapping.FacademappingPackage;

+import org.eclipse.papyrus.facademapping.StereotypedMapping;

+

+/**

+ * This is the item provider adapter for a {@link org.eclipse.papyrus.facademapping.StereotypedMapping} object.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class StereotypedMappingItemProvider

+	extends MappingItemProvider

+	implements

+		IEditingDomainItemProvider,

+		IStructuredItemContentProvider,

+		ITreeItemContentProvider,

+		IItemLabelProvider,

+		IItemPropertySource {

+	/**

+	 * This constructs an instance from a factory and a notifier.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public StereotypedMappingItemProvider(AdapterFactory adapterFactory) {

+		super(adapterFactory);

+	}

+

+	/**

+	 * This returns the property descriptors for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

+		if (itemPropertyDescriptors == null) {

+			super.getPropertyDescriptors(object);

+

+			addAppliedStereotypesPropertyDescriptor(object);

+			addKindPropertyDescriptor(object);

+		}

+		return itemPropertyDescriptors;

+	}

+

+	/**

+	 * This adds a property descriptor for the Applied Stereotypes feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void addAppliedStereotypesPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_StereotypedMapping_appliedStereotypes_feature"),

+				 getString("_UI_PropertyDescriptor_description", "_UI_StereotypedMapping_appliedStereotypes_feature", "_UI_StereotypedMapping_type"),

+				 FacademappingPackage.Literals.STEREOTYPED_MAPPING__APPLIED_STEREOTYPES,

+				 true,

+				 false,

+				 true,

+				 null,

+				 null,

+				 null));

+	}

+

+	/**

+	 * This adds a property descriptor for the Kind feature.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void addKindPropertyDescriptor(Object object) {

+		itemPropertyDescriptors.add

+			(createItemPropertyDescriptor

+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),

+				 getResourceLocator(),

+				 getString("_UI_StereotypedMapping_kind_feature"),

+				 getString("_UI_PropertyDescriptor_description", "_UI_StereotypedMapping_kind_feature", "_UI_StereotypedMapping_type"),

+				 FacademappingPackage.Literals.STEREOTYPED_MAPPING__KIND,

+				 true,

+				 false,

+				 false,

+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

+				 null,

+				 null));

+	}

+

+	/**

+	 * This returns StereotypedMapping.gif.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object getImage(Object object) {

+		return overlayImage(object, getResourceLocator().getImage("full/obj16/StereotypedMapping"));

+	}

+

+	/**

+	 * This returns the label text for the adapted class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String getText(Object object) {

+		ExtensionDefinitionKind labelValue = ((StereotypedMapping)object).getKind();

+		String label = labelValue == null ? null : labelValue.toString();

+		return label == null || label.length() == 0 ?

+			getString("_UI_StereotypedMapping_type") :

+			getString("_UI_StereotypedMapping_type") + " " + label;

+	}

+	

+

+	/**

+	 * This handles model notifications by calling {@link #updateChildren} to update any cached

+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void notifyChanged(Notification notification) {

+		updateChildren(notification);

+

+		switch (notification.getFeatureID(StereotypedMapping.class)) {

+			case FacademappingPackage.STEREOTYPED_MAPPING__KIND:

+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

+				return;

+		}

+		super.notifyChanged(notification);

+	}

+

+	/**

+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

+	 * that can be created under this object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

+		super.collectNewChildDescriptors(newChildDescriptors, object);

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/.classpath b/extraplugins/facade/org.eclipse.papyrus.facade.editor/.classpath
new file mode 100644
index 00000000000..45f024e850e
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.editor/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<classpath>

+	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

+	<classpathentry kind="output" path="bin"/>

+</classpath>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/.project b/extraplugins/facade/org.eclipse.papyrus.facade.editor/.project
new file mode 100644
index 00000000000..5310a6aef35
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.editor/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.papyrus.facade.editor</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.jdt.core.javabuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.ManifestBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.SchemaBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.jdt.core.javanature</nature>

+		<nature>org.eclipse.pde.PluginNature</nature>

+	</natures>

+</projectDescription>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/META-INF/MANIFEST.MF b/extraplugins/facade/org.eclipse.papyrus.facade.editor/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..6cdcf050beb
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.editor/META-INF/MANIFEST.MF
@@ -0,0 +1,23 @@
+Manifest-Version: 1.0

+Bundle-ManifestVersion: 2

+Bundle-Name: %pluginName

+Bundle-SymbolicName: org.eclipse.papyrus.facade.editor;singleton:=true

+Bundle-Version: 1.0.0.qualifier

+Bundle-ClassPath: .

+Bundle-Activator: org.eclipse.papyrus.facade.presentation.FacadeEditorPlugin$Implementation

+Bundle-Vendor: %providerName

+Bundle-Localization: plugin

+Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Export-Package: org.eclipse.papyrus.facade.extensiondefinition.presentation,

+ org.eclipse.papyrus.facade.presentation,

+ org.eclipse.papyrus.facade.virtualmetamodel.presentation,

+ org.eclipse.papyrus.facademapping.presentation

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

+ org.eclipse.core.resources;visibility:=reexport,

+ org.eclipse.papyrus.facade.edit;visibility:=reexport,

+ org.eclipse.emf.ecore.xmi;visibility:=reexport,

+ org.eclipse.emf.edit.ui;visibility:=reexport,

+ org.eclipse.ui.ide;visibility:=reexport,

+ org.eclipse.emf.ecore.edit;visibility:=reexport,

+ org.eclipse.uml2.uml.edit;visibility:=reexport

+Bundle-ActivationPolicy: lazy

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/build.properties b/extraplugins/facade/org.eclipse.papyrus.facade.editor/build.properties
new file mode 100644
index 00000000000..0f81e49d110
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.editor/build.properties
@@ -0,0 +1,10 @@
+#

+

+bin.includes = .,\

+               icons/,\

+               META-INF/,\

+               plugin.xml,\

+               plugin.properties

+jars.compile.order = .

+source.. = src/

+output.. = bin

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/obj16/ExtensiondefinitionModelFile.gif b/extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/obj16/ExtensiondefinitionModelFile.gif
new file mode 100644
index 00000000000..82d83d1334f
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/obj16/ExtensiondefinitionModelFile.gif
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/obj16/FacadeModelFile.gif b/extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/obj16/FacadeModelFile.gif
new file mode 100644
index 00000000000..7ede4ac8f48
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/obj16/FacadeModelFile.gif
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/obj16/FacademappingModelFile.gif b/extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/obj16/FacademappingModelFile.gif
new file mode 100644
index 00000000000..8a944104572
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/obj16/FacademappingModelFile.gif
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/obj16/VirtualmetamodelModelFile.gif b/extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/obj16/VirtualmetamodelModelFile.gif
new file mode 100644
index 00000000000..9e5e19a7405
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/obj16/VirtualmetamodelModelFile.gif
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/wizban/NewExtensiondefinition.gif b/extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/wizban/NewExtensiondefinition.gif
new file mode 100644
index 00000000000..7b4e56dd8c9
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/wizban/NewExtensiondefinition.gif
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/wizban/NewFacade.gif b/extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/wizban/NewFacade.gif
new file mode 100644
index 00000000000..e3b9c14a6a6
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/wizban/NewFacade.gif
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/wizban/NewFacademapping.gif b/extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/wizban/NewFacademapping.gif
new file mode 100644
index 00000000000..92c8b752980
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/wizban/NewFacademapping.gif
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/wizban/NewVirtualmetamodel.gif b/extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/wizban/NewVirtualmetamodel.gif
new file mode 100644
index 00000000000..5db54235cf4
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.editor/icons/full/wizban/NewVirtualmetamodel.gif
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/plugin.properties b/extraplugins/facade/org.eclipse.papyrus.facade.editor/plugin.properties
new file mode 100644
index 00000000000..dbbee83454e
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.editor/plugin.properties
@@ -0,0 +1,78 @@
+#

+

+pluginName = Facade Editor

+providerName = www.example.org

+

+_UI_FacadeEditor_menu = &Facade Editor

+_UI_VirtualmetamodelEditor_menu = &Virtualmetamodel Editor

+_UI_ExtensiondefinitionEditor_menu = &Extensiondefinition Editor

+

+_UI_CreateChild_menu_item = &New Child

+_UI_CreateSibling_menu_item = N&ew Sibling

+

+_UI_ShowPropertiesView_menu_item = Show &Properties View

+_UI_RefreshViewer_menu_item = &Refresh

+

+_UI_SelectionPage_label = Selection

+_UI_ParentPage_label = Parent

+_UI_ListPage_label = List

+_UI_TreePage_label = Tree

+_UI_TablePage_label = Table

+_UI_TreeWithColumnsPage_label = Tree with Columns

+_UI_ObjectColumn_label = Object

+_UI_SelfColumn_label = Self

+

+_UI_NoObjectSelected = Selected Nothing

+_UI_SingleObjectSelected = Selected Object: {0}

+_UI_MultiObjectSelected = Selected {0} Objects

+

+_UI_OpenEditorError_label = Open Editor

+

+_UI_Wizard_category = Example EMF Model Creation Wizards

+

+_UI_CreateModelError_message = Problems encountered in file "{0}"

+

+_UI_FacadeModelWizard_label = Facade Model

+_UI_FacadeModelWizard_description = Create a new Facade model

+

+_UI_FacadeEditor_label = Facade Model Editor

+

+_UI_FacadeEditorFilenameDefaultBase = My

+_UI_FacadeEditorFilenameExtensions = facade

+

+_UI_VirtualmetamodelModelWizard_label = Virtualmetamodel Model

+_UI_VirtualmetamodelModelWizard_description = Create a new Virtualmetamodel model

+

+_UI_VirtualmetamodelEditor_label = Virtualmetamodel Model Editor

+

+_UI_VirtualmetamodelEditorFilenameDefaultBase = My

+_UI_VirtualmetamodelEditorFilenameExtensions = virtualmetamodel

+

+_UI_ExtensiondefinitionModelWizard_label = Extensiondefinition Model

+_UI_ExtensiondefinitionModelWizard_description = Create a new Extensiondefinition model

+

+_UI_ExtensiondefinitionEditor_label = Extensiondefinition Model Editor

+

+_UI_ExtensiondefinitionEditorFilenameDefaultBase = My

+_UI_ExtensiondefinitionEditorFilenameExtensions = extensiondefinition

+

+_UI_Wizard_label = New

+

+_WARN_FilenameExtension = The file name must end in ''.{0}''

+_WARN_FilenameExtensions = The file name must have one of the following extensions: {0}

+

+_UI_ModelObject = &Model Object

+_UI_XMLEncoding = &XML Encoding

+_UI_XMLEncodingChoices = UTF-8 ASCII UTF-16 UTF-16BE UTF-16LE ISO-8859-1

+_UI_Wizard_initial_object_description = Select a model object to create

+

+_UI_FileConflict_label = File Conflict

+_WARN_FileConflict = There are unsaved changes that conflict with changes made outside the editor.  Do you wish to discard this editor's changes?

+

+_UI_FacademappingEditor_menu = &Facademapping Editor

+
_UI_FacademappingModelWizard_label = Facademapping Model

+_UI_FacademappingModelWizard_description = Create a new Facademapping model

+
_UI_FacademappingEditor_label = Facademapping Model Editor

+
_UI_FacademappingEditorFilenameDefaultBase = My

+_UI_FacademappingEditorFilenameExtensions = facademapping

+


diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/plugin.xml b/extraplugins/facade/org.eclipse.papyrus.facade.editor/plugin.xml
new file mode 100644
index 00000000000..b634852e869
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.editor/plugin.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<?eclipse version="3.0"?>

+

+<!--

+-->

+

+<plugin>

+

+   <extension point="org.eclipse.ui.newWizards">

+      <!-- @generated facade -->

+      <category

+            id="org.eclipse.emf.ecore.Wizard.category.ID"

+            name="%_UI_Wizard_category"/>

+      <wizard

+            id="org.eclipse.papyrus.facade.presentation.FacadeModelWizardID"

+            name="%_UI_FacadeModelWizard_label"

+            class="org.eclipse.papyrus.facade.presentation.FacadeModelWizard"

+            category="org.eclipse.emf.ecore.Wizard.category.ID"

+            icon="icons/full/obj16/FacadeModelFile.gif">

+         <description>%_UI_FacadeModelWizard_description</description>

+         <selection class="org.eclipse.core.resources.IResource"/>

+      </wizard>

+   </extension>

+

+   <extension point="org.eclipse.ui.editors">

+      <!-- @generated facademapping -->

+      <editor

+            id="org.eclipse.papyrus.facademapping.presentation.FacademappingEditorID"

+            name="%_UI_FacademappingEditor_label"

+            icon="icons/full/obj16/FacademappingModelFile.gif"

+            extensions="facademapping"

+            class="org.eclipse.papyrus.facademapping.presentation.FacademappingEditor"

+            contributorClass="org.eclipse.papyrus.facademapping.presentation.FacademappingActionBarContributor">

+      </editor>

+   </extension>

+

+   <extension point="org.eclipse.ui.editors">

+      <!-- @generated facade -->

+      <editor

+            id="org.eclipse.papyrus.facade.presentation.FacadeEditorID"

+            name="%_UI_FacadeEditor_label"

+            icon="icons/full/obj16/FacadeModelFile.gif"

+            extensions="facade"

+            class="org.eclipse.papyrus.facade.presentation.FacadeEditor"

+            contributorClass="org.eclipse.papyrus.facade.presentation.FacadeActionBarContributor">

+      </editor>

+   </extension>

+

+   <extension point="org.eclipse.ui.newWizards">

+      <!-- @generated facade -->

+      <category

+            id="org.eclipse.emf.ecore.Wizard.category.ID"

+            name="%_UI_Wizard_category"/>

+      <wizard

+            id="org.eclipse.papyrus.facade.virtualmetamodel.presentation.VirtualmetamodelModelWizardID"

+            name="%_UI_VirtualmetamodelModelWizard_label"

+            class="org.eclipse.papyrus.facade.virtualmetamodel.presentation.VirtualmetamodelModelWizard"

+            category="org.eclipse.emf.ecore.Wizard.category.ID"

+            icon="icons/full/obj16/VirtualmetamodelModelFile.gif">

+         <description>%_UI_VirtualmetamodelModelWizard_description</description>

+         <selection class="org.eclipse.core.resources.IResource"/>

+      </wizard>

+   </extension>

+

+null

+   <extension point="org.eclipse.ui.editors">

+      <!-- @generated facade -->

+      <editor

+            id="org.eclipse.papyrus.facade.virtualmetamodel.presentation.VirtualmetamodelEditorID"

+            name="%_UI_VirtualmetamodelEditor_label"

+            icon="icons/full/obj16/VirtualmetamodelModelFile.gif"

+            extensions="virtualmetamodel"

+            class="org.eclipse.papyrus.facade.virtualmetamodel.presentation.VirtualmetamodelEditor"

+            contributorClass="org.eclipse.papyrus.facade.virtualmetamodel.presentation.VirtualmetamodelActionBarContributor">

+      </editor>

+   </extension>

+

+   <extension point="org.eclipse.ui.newWizards">

+      <!-- @generated facade -->

+      <category

+            id="org.eclipse.emf.ecore.Wizard.category.ID"

+            name="%_UI_Wizard_category"/>

+      <wizard

+            id="org.eclipse.papyrus.facade.extensiondefinition.presentation.ExtensiondefinitionModelWizardID"

+            name="%_UI_ExtensiondefinitionModelWizard_label"

+            class="org.eclipse.papyrus.facade.extensiondefinition.presentation.ExtensiondefinitionModelWizard"

+            category="org.eclipse.emf.ecore.Wizard.category.ID"

+            icon="icons/full/obj16/ExtensiondefinitionModelFile.gif">

+         <description>%_UI_ExtensiondefinitionModelWizard_description</description>

+         <selection class="org.eclipse.core.resources.IResource"/>

+      </wizard>

+   </extension>

+

+null

+   <extension point="org.eclipse.ui.editors">

+      <!-- @generated facade -->

+      <editor

+            id="org.eclipse.papyrus.facade.extensiondefinition.presentation.ExtensiondefinitionEditorID"

+            name="%_UI_ExtensiondefinitionEditor_label"

+            icon="icons/full/obj16/ExtensiondefinitionModelFile.gif"

+            extensions="extensiondefinition"

+            class="org.eclipse.papyrus.facade.extensiondefinition.presentation.ExtensiondefinitionEditor"

+            contributorClass="org.eclipse.papyrus.facade.extensiondefinition.presentation.ExtensiondefinitionActionBarContributor">

+      </editor>

+   </extension>

+

+</plugin>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/extensiondefinition/presentation/ExtensiondefinitionActionBarContributor.java b/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/extensiondefinition/presentation/ExtensiondefinitionActionBarContributor.java
new file mode 100644
index 00000000000..c33812ffa64
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/extensiondefinition/presentation/ExtensiondefinitionActionBarContributor.java
@@ -0,0 +1,436 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facade.extensiondefinition.presentation;

+

+import java.util.ArrayList;

+import java.util.Collection;

+

+import org.eclipse.emf.common.ui.viewer.IViewerProvider;

+

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

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

+

+import org.eclipse.emf.edit.ui.action.ControlAction;

+import org.eclipse.emf.edit.ui.action.CreateChildAction;

+import org.eclipse.emf.edit.ui.action.CreateSiblingAction;

+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

+import org.eclipse.emf.edit.ui.action.LoadResourceAction;

+import org.eclipse.emf.edit.ui.action.ValidateAction;

+

+import org.eclipse.jface.action.Action;

+import org.eclipse.jface.action.ActionContributionItem;

+import org.eclipse.jface.action.IAction;

+import org.eclipse.jface.action.IContributionItem;

+import org.eclipse.jface.action.IContributionManager;

+import org.eclipse.jface.action.IMenuListener;

+import org.eclipse.jface.action.IMenuManager;

+import org.eclipse.jface.action.IToolBarManager;

+import org.eclipse.jface.action.MenuManager;

+import org.eclipse.jface.action.Separator;

+import org.eclipse.jface.action.SubContributionItem;

+

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

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

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

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

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

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

+

+import org.eclipse.papyrus.facade.presentation.FacadeEditorPlugin;

+

+import org.eclipse.ui.IEditorPart;

+import org.eclipse.ui.PartInitException;

+

+/**

+ * This is the action bar contributor for the Extensiondefinition model editor.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class ExtensiondefinitionActionBarContributor

+	extends EditingDomainActionBarContributor

+	implements ISelectionChangedListener {

+	/**

+	 * This keeps track of the active editor.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected IEditorPart activeEditorPart;

+

+	/**

+	 * This keeps track of the current selection provider.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected ISelectionProvider selectionProvider;

+

+	/**

+	 * This action opens the Properties view.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected IAction showPropertiesViewAction =

+		new Action(FacadeEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) {

+			@Override

+			public void run() {

+				try {

+					getPage().showView("org.eclipse.ui.views.PropertySheet");

+				}

+				catch (PartInitException exception) {

+					FacadeEditorPlugin.INSTANCE.log(exception);

+				}

+			}

+		};

+

+	/**

+	 * This action refreshes the viewer of the current editor if the editor

+	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected IAction refreshViewerAction =

+		new Action(FacadeEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) {

+			@Override

+			public boolean isEnabled() {

+				return activeEditorPart instanceof IViewerProvider;

+			}

+

+			@Override

+			public void run() {

+				if (activeEditorPart instanceof IViewerProvider) {

+					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();

+					if (viewer != null) {

+						viewer.refresh();

+					}

+				}

+			}

+		};

+

+	/**

+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor

+	 * generated for the current selection by the item provider.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected Collection<IAction> createChildActions;

+

+	/**

+	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected IMenuManager createChildMenuManager;

+

+	/**

+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor

+	 * generated for the current selection by the item provider.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected Collection<IAction> createSiblingActions;

+

+	/**

+	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected IMenuManager createSiblingMenuManager;

+

+	/**

+	 * This creates an instance of the contributor.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public ExtensiondefinitionActionBarContributor() {

+		super(ADDITIONS_LAST_STYLE);

+		loadResourceAction = new LoadResourceAction();

+		validateAction = new ValidateAction();

+		controlAction = new ControlAction();

+	}

+

+	/**

+	 * This adds Separators for editor additions to the tool bar.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void contributeToToolBar(IToolBarManager toolBarManager) {

+		toolBarManager.add(new Separator("extensiondefinition-settings"));

+		toolBarManager.add(new Separator("extensiondefinition-additions"));

+	}

+

+	/**

+	 * This adds to the menu bar a menu and some separators for editor additions,

+	 * as well as the sub-menus for object creation items.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void contributeToMenu(IMenuManager menuManager) {

+		super.contributeToMenu(menuManager);

+

+		IMenuManager submenuManager = new MenuManager(FacadeEditorPlugin.INSTANCE.getString("_UI_ExtensiondefinitionEditor_menu"), "org.eclipse.papyrus.facade.extensiondefinitionMenuID");

+		menuManager.insertAfter("additions", submenuManager);

+		submenuManager.add(new Separator("settings"));

+		submenuManager.add(new Separator("actions"));

+		submenuManager.add(new Separator("additions"));

+		submenuManager.add(new Separator("additions-end"));

+

+		// Prepare for CreateChild item addition or removal.

+		//

+		createChildMenuManager = new MenuManager(FacadeEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));

+		submenuManager.insertBefore("additions", createChildMenuManager);

+

+		// Prepare for CreateSibling item addition or removal.

+		//

+		createSiblingMenuManager = new MenuManager(FacadeEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));

+		submenuManager.insertBefore("additions", createSiblingMenuManager);

+

+		// Force an update because Eclipse hides empty menus now.

+		//

+		submenuManager.addMenuListener

+			(new IMenuListener() {

+				 public void menuAboutToShow(IMenuManager menuManager) {

+					 menuManager.updateAll(true);

+				 }

+			 });

+

+		addGlobalActions(submenuManager);

+	}

+

+	/**

+	 * When the active editor changes, this remembers the change and registers with it as a selection provider.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void setActiveEditor(IEditorPart part) {

+		super.setActiveEditor(part);

+		activeEditorPart = part;

+

+		// Switch to the new selection provider.

+		//

+		if (selectionProvider != null) {

+			selectionProvider.removeSelectionChangedListener(this);

+		}

+		if (part == null) {

+			selectionProvider = null;

+		}

+		else {

+			selectionProvider = part.getSite().getSelectionProvider();

+			selectionProvider.addSelectionChangedListener(this);

+

+			// Fake a selection changed event to update the menus.

+			//

+			if (selectionProvider.getSelection() != null) {

+				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));

+			}

+		}

+	}

+

+	/**

+	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},

+	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings

+	 * that can be added to the selected object and updating the menus accordingly.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void selectionChanged(SelectionChangedEvent event) {

+		// Remove any menu items for old selection.

+		//

+		if (createChildMenuManager != null) {

+			depopulateManager(createChildMenuManager, createChildActions);

+		}

+		if (createSiblingMenuManager != null) {

+			depopulateManager(createSiblingMenuManager, createSiblingActions);

+		}

+

+		// Query the new selection for appropriate new child/sibling descriptors

+		//

+		Collection<?> newChildDescriptors = null;

+		Collection<?> newSiblingDescriptors = null;

+

+		ISelection selection = event.getSelection();

+		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {

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

+

+			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();

+

+			newChildDescriptors = domain.getNewChildDescriptors(object, null);

+			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);

+		}

+

+		// Generate actions for selection; populate and redraw the menus.

+		//

+		createChildActions = generateCreateChildActions(newChildDescriptors, selection);

+		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);

+

+		if (createChildMenuManager != null) {

+			populateManager(createChildMenuManager, createChildActions, null);

+			createChildMenuManager.update(true);

+		}

+		if (createSiblingMenuManager != null) {

+			populateManager(createSiblingMenuManager, createSiblingActions, null);

+			createSiblingMenuManager.update(true);

+		}

+	}

+

+	/**

+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,

+	 * and returns the collection of these actions.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {

+		Collection<IAction> actions = new ArrayList<IAction>();

+		if (descriptors != null) {

+			for (Object descriptor : descriptors) {

+				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));

+			}

+		}

+		return actions;

+	}

+

+	/**

+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,

+	 * and returns the collection of these actions.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {

+		Collection<IAction> actions = new ArrayList<IAction>();

+		if (descriptors != null) {

+			for (Object descriptor : descriptors) {

+				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));

+			}

+		}

+		return actions;

+	}

+

+	/**

+	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s

+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,

+	 * by inserting them before the specified contribution item <code>contributionID</code>.

+	 * If <code>contributionID</code> is <code>null</code>, they are simply added.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {

+		if (actions != null) {

+			for (IAction action : actions) {

+				if (contributionID != null) {

+					manager.insertBefore(contributionID, action);

+				}

+				else {

+					manager.add(action);

+				}

+			}

+		}

+	}

+		

+	/**

+	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s

+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {

+		if (actions != null) {

+			IContributionItem[] items = manager.getItems();

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

+				// Look into SubContributionItems

+				//

+				IContributionItem contributionItem = items[i];

+				while (contributionItem instanceof SubContributionItem) {

+					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();

+				}

+

+				// Delete the ActionContributionItems with matching action.

+				//

+				if (contributionItem instanceof ActionContributionItem) {

+					IAction action = ((ActionContributionItem)contributionItem).getAction();

+					if (actions.contains(action)) {

+						manager.remove(contributionItem);

+					}

+				}

+			}

+		}

+	}

+

+	/**

+	 * This populates the pop-up menu before it appears.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void menuAboutToShow(IMenuManager menuManager) {

+		super.menuAboutToShow(menuManager);

+		MenuManager submenuManager = null;

+

+		submenuManager = new MenuManager(FacadeEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));

+		populateManager(submenuManager, createChildActions, null);

+		menuManager.insertBefore("edit", submenuManager);

+

+		submenuManager = new MenuManager(FacadeEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));

+		populateManager(submenuManager, createSiblingActions, null);

+		menuManager.insertBefore("edit", submenuManager);

+	}

+

+	/**

+	 * This inserts global actions before the "additions-end" separator.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected void addGlobalActions(IMenuManager menuManager) {

+		menuManager.insertAfter("additions-end", new Separator("ui-actions"));

+		menuManager.insertAfter("ui-actions", showPropertiesViewAction);

+

+		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		

+		menuManager.insertAfter("ui-actions", refreshViewerAction);

+

+		super.addGlobalActions(menuManager);

+	}

+

+	/**

+	 * This ensures that a delete action will clean up all references to deleted objects.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected boolean removeAllReferencesOnDelete() {

+		return true;

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/extensiondefinition/presentation/ExtensiondefinitionEditor.java b/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/extensiondefinition/presentation/ExtensiondefinitionEditor.java
new file mode 100644
index 00000000000..52e9d012c6e
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/extensiondefinition/presentation/ExtensiondefinitionEditor.java
@@ -0,0 +1,1843 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facade.extensiondefinition.presentation;

+

+

+import java.io.IOException;

+import java.io.InputStream;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Collections;

+import java.util.EventObject;

+import java.util.HashMap;

+import java.util.Iterator;

+import java.util.LinkedHashMap;

+import java.util.List;

+import java.util.Map;

+

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

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

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

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

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

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

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

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

+

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

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

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

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

+

+import org.eclipse.jface.action.IMenuListener;

+import org.eclipse.jface.action.IMenuManager;

+import org.eclipse.jface.action.IStatusLineManager;

+import org.eclipse.jface.action.IToolBarManager;

+import org.eclipse.jface.action.MenuManager;

+import org.eclipse.jface.action.Separator;

+

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

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

+

+import org.eclipse.jface.util.LocalSelectionTransfer;

+

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

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

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

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

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

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

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

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

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

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

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

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

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

+

+import org.eclipse.swt.SWT;

+

+import org.eclipse.swt.custom.CTabFolder;

+

+import org.eclipse.swt.dnd.DND;

+import org.eclipse.swt.dnd.FileTransfer;

+import org.eclipse.swt.dnd.Transfer;

+

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

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

+

+import org.eclipse.swt.graphics.Point;

+

+import org.eclipse.swt.layout.FillLayout;

+

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

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

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

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

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

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

+

+import org.eclipse.ui.IActionBars;

+import org.eclipse.ui.IEditorInput;

+import org.eclipse.ui.IEditorPart;

+import org.eclipse.ui.IEditorSite;

+import org.eclipse.ui.IPartListener;

+import org.eclipse.ui.IWorkbenchPart;

+import org.eclipse.ui.PartInitException;

+

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

+

+import org.eclipse.ui.ide.IGotoMarker;

+

+import org.eclipse.ui.part.FileEditorInput;

+import org.eclipse.ui.part.MultiPageEditorPart;

+

+import org.eclipse.ui.views.contentoutline.ContentOutline;

+import org.eclipse.ui.views.contentoutline.ContentOutlinePage;

+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;

+

+import org.eclipse.ui.views.properties.IPropertySheetPage;

+import org.eclipse.ui.views.properties.PropertySheet;

+import org.eclipse.ui.views.properties.PropertySheetPage;

+

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

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

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

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

+

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

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

+

+import org.eclipse.emf.common.ui.MarkerHelper;

+import org.eclipse.emf.common.ui.ViewerPane;

+

+import org.eclipse.emf.common.ui.editor.ProblemEditorPart;

+

+import org.eclipse.emf.common.ui.viewer.IViewerProvider;

+

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

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

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

+

+

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

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

+

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

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

+

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

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

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

+

+import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;

+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

+import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;

+

+import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;

+

+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

+

+import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;

+

+import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;

+import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

+import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;

+

+import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;

+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

+import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;

+

+import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;

+import org.eclipse.emf.edit.ui.util.EditUIUtil;

+

+import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;

+

+import org.eclipse.papyrus.facade.extensiondefinition.provider.ExtensiondefinitionItemProviderAdapterFactory;

+

+import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

+

+import org.eclipse.papyrus.facade.presentation.FacadeEditorPlugin;

+

+import org.eclipse.papyrus.facade.provider.FacadeItemProviderAdapterFactory;

+

+import org.eclipse.papyrus.facade.virtualmetamodel.provider.VirtualmetamodelItemProviderAdapterFactory;

+

+import org.eclipse.ui.actions.WorkspaceModifyOperation;

+

+import org.eclipse.uml2.uml.edit.providers.UMLItemProviderAdapterFactory;

+

+

+/**

+ * This is an example of a Extensiondefinition model editor.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class ExtensiondefinitionEditor

+	extends MultiPageEditorPart

+	implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {

+	/**

+	 * This keeps track of the editing domain that is used to track all changes to the model.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected AdapterFactoryEditingDomain editingDomain;

+

+	/**

+	 * This is the one adapter factory used for providing views of the model.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected ComposedAdapterFactory adapterFactory;

+

+	/**

+	 * This is the content outline page.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected IContentOutlinePage contentOutlinePage;

+

+	/**

+	 * This is a kludge...

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected IStatusLineManager contentOutlineStatusLineManager;

+

+	/**

+	 * This is the content outline page's viewer.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected TreeViewer contentOutlineViewer;

+

+	/**

+	 * This is the property sheet page.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();

+

+	/**

+	 * This is the viewer that shadows the selection in the content outline.

+	 * The parent relation must be correctly defined for this to work.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected TreeViewer selectionViewer;

+

+	/**

+	 * This inverts the roll of parent and child in the content provider and show parents as a tree.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected TreeViewer parentViewer;

+

+	/**

+	 * This shows how a tree view works.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected TreeViewer treeViewer;

+

+	/**

+	 * This shows how a list view works.

+	 * A list viewer doesn't support icons.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected ListViewer listViewer;

+

+	/**

+	 * This shows how a table view works.

+	 * A table can be used as a list with icons.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected TableViewer tableViewer;

+

+	/**

+	 * This shows how a tree view with columns works.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected TreeViewer treeViewerWithColumns;

+

+	/**

+	 * This keeps track of the active viewer pane, in the book.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected ViewerPane currentViewerPane;

+

+	/**

+	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected Viewer currentViewer;

+

+	/**

+	 * This listens to which ever viewer is active.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected ISelectionChangedListener selectionChangedListener;

+

+	/**

+	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();

+

+	/**

+	 * This keeps track of the selection of the editor as a whole.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected ISelection editorSelection = StructuredSelection.EMPTY;

+

+	/**

+	 * The MarkerHelper is responsible for creating workspace resource markers presented

+	 * in Eclipse's Problems View.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected MarkerHelper markerHelper = new EditUIMarkerHelper();

+

+	/**

+	 * This listens for when the outline becomes active

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected IPartListener partListener =

+		new IPartListener() {

+			public void partActivated(IWorkbenchPart p) {

+				if (p instanceof ContentOutline) {

+					if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {

+						getActionBarContributor().setActiveEditor(ExtensiondefinitionEditor.this);

+

+						setCurrentViewer(contentOutlineViewer);

+					}

+				}

+				else if (p instanceof PropertySheet) {

+					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {

+						getActionBarContributor().setActiveEditor(ExtensiondefinitionEditor.this);

+						handleActivate();

+					}

+				}

+				else if (p == ExtensiondefinitionEditor.this) {

+					handleActivate();

+				}

+			}

+			public void partBroughtToTop(IWorkbenchPart p) {

+				// Ignore.

+			}

+			public void partClosed(IWorkbenchPart p) {

+				// Ignore.

+			}

+			public void partDeactivated(IWorkbenchPart p) {

+				// Ignore.

+			}

+			public void partOpened(IWorkbenchPart p) {

+				// Ignore.

+			}

+		};

+

+	/**

+	 * Resources that have been removed since last activation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected Collection<Resource> removedResources = new ArrayList<Resource>();

+

+	/**

+	 * Resources that have been changed since last activation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected Collection<Resource> changedResources = new ArrayList<Resource>();

+

+	/**

+	 * Resources that have been saved.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected Collection<Resource> savedResources = new ArrayList<Resource>();

+

+	/**

+	 * Map to store the diagnostic associated with a resource.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();

+

+	/**

+	 * Controls whether the problem indication should be updated.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected boolean updateProblemIndication = true;

+

+	/**

+	 * Adapter used to update the problem indication when resources are demanded loaded.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EContentAdapter problemIndicationAdapter =

+		new EContentAdapter() {

+			@Override

+			public void notifyChanged(Notification notification) {

+				if (notification.getNotifier() instanceof Resource) {

+					switch (notification.getFeatureID(Resource.class)) {

+						case Resource.RESOURCE__IS_LOADED:

+						case Resource.RESOURCE__ERRORS:

+						case Resource.RESOURCE__WARNINGS: {

+							Resource resource = (Resource)notification.getNotifier();

+							Diagnostic diagnostic = analyzeResourceProblems(resource, null);

+							if (diagnostic.getSeverity() != Diagnostic.OK) {

+								resourceToDiagnosticMap.put(resource, diagnostic);

+							}

+							else {

+								resourceToDiagnosticMap.remove(resource);

+							}

+

+							if (updateProblemIndication) {

+								getSite().getShell().getDisplay().asyncExec

+									(new Runnable() {

+										 public void run() {

+											 updateProblemIndication();

+										 }

+									 });

+							}

+							break;

+						}

+					}

+				}

+				else {

+					super.notifyChanged(notification);

+				}

+			}

+

+			@Override

+			protected void setTarget(Resource target) {

+				basicSetTarget(target);

+			}

+

+			@Override

+			protected void unsetTarget(Resource target) {

+				basicUnsetTarget(target);

+				resourceToDiagnosticMap.remove(target);

+				if (updateProblemIndication) {

+					getSite().getShell().getDisplay().asyncExec

+						(new Runnable() {

+							 public void run() {

+								 updateProblemIndication();

+							 }

+						 });

+				}

+			}

+		};

+

+	/**

+	 * This listens for workspace changes.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected IResourceChangeListener resourceChangeListener =

+		new IResourceChangeListener() {

+			public void resourceChanged(IResourceChangeEvent event) {

+				IResourceDelta delta = event.getDelta();

+				try {

+					class ResourceDeltaVisitor implements IResourceDeltaVisitor {

+						protected ResourceSet resourceSet = editingDomain.getResourceSet();

+						protected Collection<Resource> changedResources = new ArrayList<Resource>();

+						protected Collection<Resource> removedResources = new ArrayList<Resource>();

+

+						public boolean visit(IResourceDelta delta) {

+							if (delta.getResource().getType() == IResource.FILE) {

+								if (delta.getKind() == IResourceDelta.REMOVED ||

+								    delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {

+									Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);

+									if (resource != null) {

+										if (delta.getKind() == IResourceDelta.REMOVED) {

+											removedResources.add(resource);

+										}

+										else if (!savedResources.remove(resource)) {

+											changedResources.add(resource);

+										}

+									}

+								}

+								return false;

+							}

+

+							return true;

+						}

+

+						public Collection<Resource> getChangedResources() {

+							return changedResources;

+						}

+

+						public Collection<Resource> getRemovedResources() {

+							return removedResources;

+						}

+					}

+

+					final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();

+					delta.accept(visitor);

+

+					if (!visitor.getRemovedResources().isEmpty()) {

+						getSite().getShell().getDisplay().asyncExec

+							(new Runnable() {

+								 public void run() {

+									 removedResources.addAll(visitor.getRemovedResources());

+									 if (!isDirty()) {

+										 getSite().getPage().closeEditor(ExtensiondefinitionEditor.this, false);

+									 }

+								 }

+							 });

+					}

+

+					if (!visitor.getChangedResources().isEmpty()) {

+						getSite().getShell().getDisplay().asyncExec

+							(new Runnable() {

+								 public void run() {

+									 changedResources.addAll(visitor.getChangedResources());

+									 if (getSite().getPage().getActiveEditor() == ExtensiondefinitionEditor.this) {

+										 handleActivate();

+									 }

+								 }

+							 });

+					}

+				}

+				catch (CoreException exception) {

+					FacadeEditorPlugin.INSTANCE.log(exception);

+				}

+			}

+		};

+

+	/**

+	 * Handles activation of the editor or it's associated views.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void handleActivate() {

+		// Recompute the read only state.

+		//

+		if (editingDomain.getResourceToReadOnlyMap() != null) {

+		  editingDomain.getResourceToReadOnlyMap().clear();

+

+		  // Refresh any actions that may become enabled or disabled.

+		  //

+		  setSelection(getSelection());

+		}

+

+		if (!removedResources.isEmpty()) {

+			if (handleDirtyConflict()) {

+				getSite().getPage().closeEditor(ExtensiondefinitionEditor.this, false);

+			}

+			else {

+				removedResources.clear();

+				changedResources.clear();

+				savedResources.clear();

+			}

+		}

+		else if (!changedResources.isEmpty()) {

+			changedResources.removeAll(savedResources);

+			handleChangedResources();

+			changedResources.clear();

+			savedResources.clear();

+		}

+	}

+

+	/**

+	 * Handles what to do with changed resources on activation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void handleChangedResources() {

+		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {

+			if (isDirty()) {

+				changedResources.addAll(editingDomain.getResourceSet().getResources());

+			}

+			editingDomain.getCommandStack().flush();

+

+			updateProblemIndication = false;

+			for (Resource resource : changedResources) {

+				if (resource.isLoaded()) {

+					resource.unload();

+					try {

+						resource.load(Collections.EMPTY_MAP);

+					}

+					catch (IOException exception) {

+						if (!resourceToDiagnosticMap.containsKey(resource)) {

+							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

+						}

+					}

+				}

+			}

+

+			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {

+				setSelection(StructuredSelection.EMPTY);

+			}

+

+			updateProblemIndication = true;

+			updateProblemIndication();

+		}

+	}

+

+	/**

+	 * Updates the problems indication with the information described in the specified diagnostic.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void updateProblemIndication() {

+		if (updateProblemIndication) {

+			BasicDiagnostic diagnostic =

+				new BasicDiagnostic

+					(Diagnostic.OK,

+					 "org.eclipse.papyrus.facade.editor",

+					 0,

+					 null,

+					 new Object [] { editingDomain.getResourceSet() });

+			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {

+				if (childDiagnostic.getSeverity() != Diagnostic.OK) {

+					diagnostic.add(childDiagnostic);

+				}

+			}

+

+			int lastEditorPage = getPageCount() - 1;

+			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {

+				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);

+				if (diagnostic.getSeverity() != Diagnostic.OK) {

+					setActivePage(lastEditorPage);

+				}

+			}

+			else if (diagnostic.getSeverity() != Diagnostic.OK) {

+				ProblemEditorPart problemEditorPart = new ProblemEditorPart();

+				problemEditorPart.setDiagnostic(diagnostic);

+				problemEditorPart.setMarkerHelper(markerHelper);

+				try {

+					addPage(++lastEditorPage, problemEditorPart, getEditorInput());

+					setPageText(lastEditorPage, problemEditorPart.getPartName());

+					setActivePage(lastEditorPage);

+					showTabs();

+				}

+				catch (PartInitException exception) {

+					FacadeEditorPlugin.INSTANCE.log(exception);

+				}

+			}

+

+			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {

+				markerHelper.deleteMarkers(editingDomain.getResourceSet());

+				if (diagnostic.getSeverity() != Diagnostic.OK) {

+					try {

+						markerHelper.createMarkers(diagnostic);

+					}

+					catch (CoreException exception) {

+						FacadeEditorPlugin.INSTANCE.log(exception);

+					}

+				}

+			}

+		}

+	}

+

+	/**

+	 * Shows a dialog that asks if conflicting changes should be discarded.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected boolean handleDirtyConflict() {

+		return

+			MessageDialog.openQuestion

+				(getSite().getShell(),

+				 getString("_UI_FileConflict_label"),

+				 getString("_WARN_FileConflict"));

+	}

+

+	/**

+	 * This creates a model editor.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public ExtensiondefinitionEditor() {

+		super();

+		initializeEditingDomain();

+	}

+

+	/**

+	 * This sets up the editing domain for the model editor.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void initializeEditingDomain() {

+		// Create an adapter factory that yields item providers.

+		//

+		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);

+

+		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());

+		adapterFactory.addAdapterFactory(new FacadeItemProviderAdapterFactory());

+		adapterFactory.addAdapterFactory(new VirtualmetamodelItemProviderAdapterFactory());

+		adapterFactory.addAdapterFactory(new ExtensiondefinitionItemProviderAdapterFactory());

+		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());

+		adapterFactory.addAdapterFactory(new UMLItemProviderAdapterFactory());

+		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());

+

+		// Create the command stack that will notify this editor as commands are executed.

+		//

+		BasicCommandStack commandStack = new BasicCommandStack();

+

+		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.

+		//

+		commandStack.addCommandStackListener

+			(new CommandStackListener() {

+				 public void commandStackChanged(final EventObject event) {

+					 getContainer().getDisplay().asyncExec

+						 (new Runnable() {

+							  public void run() {

+								  firePropertyChange(IEditorPart.PROP_DIRTY);

+

+								  // Try to select the affected objects.

+								  //

+								  Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();

+								  if (mostRecentCommand != null) {

+									  setSelectionToViewer(mostRecentCommand.getAffectedObjects());

+								  }

+								  for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext(); ) {

+									  PropertySheetPage propertySheetPage = i.next();

+									  if (propertySheetPage.getControl().isDisposed()) {

+										  i.remove();

+									  }

+									  else {

+										  propertySheetPage.refresh();

+									  }

+								  }

+							  }

+						  });

+				 }

+			 });

+

+		// Create the editing domain with a special command stack.

+		//

+		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());

+	}

+

+	/**

+	 * This is here for the listener to be able to call it.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+			@Override

+	protected void firePropertyChange(int action) {

+		super.firePropertyChange(action);

+	}

+

+	/**

+	 * This sets the selection into whichever viewer is active.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setSelectionToViewer(Collection<?> collection) {

+		final Collection<?> theSelection = collection;

+		// Make sure it's okay.

+		//

+		if (theSelection != null && !theSelection.isEmpty()) {

+			Runnable runnable =

+				new Runnable() {

+					public void run() {

+						// Try to select the items in the current content viewer of the editor.

+						//

+						if (currentViewer != null) {

+							currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);

+						}

+					}

+				};

+			getSite().getShell().getDisplay().asyncExec(runnable);

+		}

+	}

+

+	/**

+	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.

+	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain}

+	 * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EditingDomain getEditingDomain() {

+		return editingDomain;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {

+			super(adapterFactory);

+		}

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		@Override

+		public Object [] getElements(Object object) {

+			Object parent = super.getParent(object);

+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

+		}

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		@Override

+		public Object [] getChildren(Object object) {

+			Object parent = super.getParent(object);

+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

+		}

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		@Override

+		public boolean hasChildren(Object object) {

+			Object parent = super.getParent(object);

+			return parent != null;

+		}

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		@Override

+		public Object getParent(Object object) {

+			return null;

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setCurrentViewerPane(ViewerPane viewerPane) {

+		if (currentViewerPane != viewerPane) {

+			if (currentViewerPane != null) {

+				currentViewerPane.showFocus(false);

+			}

+			currentViewerPane = viewerPane;

+		}

+		setCurrentViewer(currentViewerPane.getViewer());

+	}

+

+	/**

+	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,

+	 * is the current one.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setCurrentViewer(Viewer viewer) {

+		// If it is changing...

+		//

+		if (currentViewer != viewer) {

+			if (selectionChangedListener == null) {

+				// Create the listener on demand.

+				//

+				selectionChangedListener =

+					new ISelectionChangedListener() {

+						// This just notifies those things that are affected by the section.

+						//

+						public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {

+							setSelection(selectionChangedEvent.getSelection());

+						}

+					};

+			}

+

+			// Stop listening to the old one.

+			//

+			if (currentViewer != null) {

+				currentViewer.removeSelectionChangedListener(selectionChangedListener);

+			}

+

+			// Start listening to the new one.

+			//

+			if (viewer != null) {

+				viewer.addSelectionChangedListener(selectionChangedListener);

+			}

+

+			// Remember it.

+			//

+			currentViewer = viewer;

+

+			// Set the editors selection based on the current viewer's selection.

+			//

+			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());

+		}

+	}

+

+	/**

+	 * This returns the viewer as required by the {@link IViewerProvider} interface.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public Viewer getViewer() {

+		return currentViewer;

+	}

+

+	/**

+	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void createContextMenuFor(StructuredViewer viewer) {

+		MenuManager contextMenu = new MenuManager("#PopUp");

+		contextMenu.add(new Separator("additions"));

+		contextMenu.setRemoveAllWhenShown(true);

+		contextMenu.addMenuListener(this);

+		Menu menu= contextMenu.createContextMenu(viewer.getControl());

+		viewer.getControl().setMenu(menu);

+		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));

+

+		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;

+		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };

+		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));

+		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));

+	}

+

+	/**

+	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void createModel() {

+		URI resourceURI = EditUIUtil.getURI(getEditorInput());

+		Exception exception = null;

+		Resource resource = null;

+		try {

+			// Load the resource through the editing domain.

+			//

+			resource = editingDomain.getResourceSet().getResource(resourceURI, true);

+		}

+		catch (Exception e) {

+			exception = e;

+			resource = editingDomain.getResourceSet().getResource(resourceURI, false);

+		}

+

+		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);

+		if (diagnostic.getSeverity() != Diagnostic.OK) {

+			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));

+		}

+		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);

+	}

+

+	/**

+	 * Returns a diagnostic describing the errors and warnings listed in the resource

+	 * and the specified exception (if any).

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {

+		if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {

+			BasicDiagnostic basicDiagnostic =

+				new BasicDiagnostic

+					(Diagnostic.ERROR,

+					 "org.eclipse.papyrus.facade.editor",

+					 0,

+					 getString("_UI_CreateModelError_message", resource.getURI()),

+					 new Object [] { exception == null ? (Object)resource : exception });

+			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));

+			return basicDiagnostic;

+		}

+		else if (exception != null) {

+			return

+				new BasicDiagnostic

+					(Diagnostic.ERROR,

+					 "org.eclipse.papyrus.facade.editor",

+					 0,

+					 getString("_UI_CreateModelError_message", resource.getURI()),

+					 new Object[] { exception });

+		}

+		else {

+			return Diagnostic.OK_INSTANCE;

+		}

+	}

+

+	/**

+	 * This is the method used by the framework to install your own controls.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void createPages() {

+		// Creates the model from the editor input

+		//

+		createModel();

+

+		// Only creates the other pages if there is something that can be edited

+		//

+		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {

+			// Create a page for the selection tree view.

+			//

+			{

+				ViewerPane viewerPane =

+					new ViewerPane(getSite().getPage(), ExtensiondefinitionEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							Tree tree = new Tree(composite, SWT.MULTI);

+							TreeViewer newTreeViewer = new TreeViewer(tree);

+							return newTreeViewer;

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

+				viewerPane.createControl(getContainer());

+

+				selectionViewer = (TreeViewer)viewerPane.getViewer();

+				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

+

+				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

+				selectionViewer.setInput(editingDomain.getResourceSet());

+				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

+				viewerPane.setTitle(editingDomain.getResourceSet());

+

+				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);

+

+				createContextMenuFor(selectionViewer);

+				int pageIndex = addPage(viewerPane.getControl());

+				setPageText(pageIndex, getString("_UI_SelectionPage_label"));

+			}

+

+			// Create a page for the parent tree view.

+			//

+			{

+				ViewerPane viewerPane =

+					new ViewerPane(getSite().getPage(), ExtensiondefinitionEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							Tree tree = new Tree(composite, SWT.MULTI);

+							TreeViewer newTreeViewer = new TreeViewer(tree);

+							return newTreeViewer;

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

+				viewerPane.createControl(getContainer());

+

+				parentViewer = (TreeViewer)viewerPane.getViewer();

+				parentViewer.setAutoExpandLevel(30);

+				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));

+				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

+

+				createContextMenuFor(parentViewer);

+				int pageIndex = addPage(viewerPane.getControl());

+				setPageText(pageIndex, getString("_UI_ParentPage_label"));

+			}

+

+			// This is the page for the list viewer

+			//

+			{

+				ViewerPane viewerPane =

+					new ViewerPane(getSite().getPage(), ExtensiondefinitionEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new ListViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

+				viewerPane.createControl(getContainer());

+				listViewer = (ListViewer)viewerPane.getViewer();

+				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

+				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

+

+				createContextMenuFor(listViewer);

+				int pageIndex = addPage(viewerPane.getControl());

+				setPageText(pageIndex, getString("_UI_ListPage_label"));

+			}

+

+			// This is the page for the tree viewer

+			//

+			{

+				ViewerPane viewerPane =

+					new ViewerPane(getSite().getPage(), ExtensiondefinitionEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new TreeViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

+				viewerPane.createControl(getContainer());

+				treeViewer = (TreeViewer)viewerPane.getViewer();

+				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

+				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

+

+				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);

+

+				createContextMenuFor(treeViewer);

+				int pageIndex = addPage(viewerPane.getControl());

+				setPageText(pageIndex, getString("_UI_TreePage_label"));

+			}

+

+			// This is the page for the table viewer.

+			//

+			{

+				ViewerPane viewerPane =

+					new ViewerPane(getSite().getPage(), ExtensiondefinitionEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new TableViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

+				viewerPane.createControl(getContainer());

+				tableViewer = (TableViewer)viewerPane.getViewer();

+

+				Table table = tableViewer.getTable();

+				TableLayout layout = new TableLayout();

+				table.setLayout(layout);

+				table.setHeaderVisible(true);

+				table.setLinesVisible(true);

+

+				TableColumn objectColumn = new TableColumn(table, SWT.NONE);

+				layout.addColumnData(new ColumnWeightData(3, 100, true));

+				objectColumn.setText(getString("_UI_ObjectColumn_label"));

+				objectColumn.setResizable(true);

+

+				TableColumn selfColumn = new TableColumn(table, SWT.NONE);

+				layout.addColumnData(new ColumnWeightData(2, 100, true));

+				selfColumn.setText(getString("_UI_SelfColumn_label"));

+				selfColumn.setResizable(true);

+

+				tableViewer.setColumnProperties(new String [] {"a", "b"});

+				tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

+				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

+

+				createContextMenuFor(tableViewer);

+				int pageIndex = addPage(viewerPane.getControl());

+				setPageText(pageIndex, getString("_UI_TablePage_label"));

+			}

+

+			// This is the page for the table tree viewer.

+			//

+			{

+				ViewerPane viewerPane =

+					new ViewerPane(getSite().getPage(), ExtensiondefinitionEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new TreeViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

+				viewerPane.createControl(getContainer());

+

+				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();

+

+				Tree tree = treeViewerWithColumns.getTree();

+				tree.setLayoutData(new FillLayout());

+				tree.setHeaderVisible(true);

+				tree.setLinesVisible(true);

+

+				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);

+				objectColumn.setText(getString("_UI_ObjectColumn_label"));

+				objectColumn.setResizable(true);

+				objectColumn.setWidth(250);

+

+				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);

+				selfColumn.setText(getString("_UI_SelfColumn_label"));

+				selfColumn.setResizable(true);

+				selfColumn.setWidth(200);

+

+				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"});

+				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

+				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

+

+				createContextMenuFor(treeViewerWithColumns);

+				int pageIndex = addPage(viewerPane.getControl());

+				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label"));

+			}

+

+			getSite().getShell().getDisplay().asyncExec

+				(new Runnable() {

+					 public void run() {

+						 setActivePage(0);

+					 }

+				 });

+		}

+

+		// Ensures that this editor will only display the page's tab

+		// area if there are more than one page

+		//

+		getContainer().addControlListener

+			(new ControlAdapter() {

+				boolean guard = false;

+				@Override

+				public void controlResized(ControlEvent event) {

+					if (!guard) {

+						guard = true;

+						hideTabs();

+						guard = false;

+					}

+				}

+			 });

+

+		getSite().getShell().getDisplay().asyncExec

+			(new Runnable() {

+				 public void run() {

+					 updateProblemIndication();

+				 }

+			 });

+	}

+

+	/**

+	 * If there is just one page in the multi-page editor part,

+	 * this hides the single tab at the bottom.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void hideTabs() {

+		if (getPageCount() <= 1) {

+			setPageText(0, "");

+			if (getContainer() instanceof CTabFolder) {

+				((CTabFolder)getContainer()).setTabHeight(1);

+				Point point = getContainer().getSize();

+				getContainer().setSize(point.x, point.y + 6);

+			}

+		}

+	}

+

+	/**

+	 * If there is more than one page in the multi-page editor part,

+	 * this shows the tabs at the bottom.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void showTabs() {

+		if (getPageCount() > 1) {

+			setPageText(0, getString("_UI_SelectionPage_label"));

+			if (getContainer() instanceof CTabFolder) {

+				((CTabFolder)getContainer()).setTabHeight(SWT.DEFAULT);

+				Point point = getContainer().getSize();

+				getContainer().setSize(point.x, point.y - 6);

+			}

+		}

+	}

+

+	/**

+	 * This is used to track the active viewer.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected void pageChange(int pageIndex) {

+		super.pageChange(pageIndex);

+

+		if (contentOutlinePage != null) {

+			handleContentOutlineSelection(contentOutlinePage.getSelection());

+		}

+	}

+

+	/**

+	 * This is how the framework determines which interfaces we implement.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	@Override

+	public Object getAdapter(Class key) {

+		if (key.equals(IContentOutlinePage.class)) {

+			return showOutlineView() ? getContentOutlinePage() : null;

+		}

+		else if (key.equals(IPropertySheetPage.class)) {

+			return getPropertySheetPage();

+		}

+		else if (key.equals(IGotoMarker.class)) {

+			return this;

+		}

+		else {

+			return super.getAdapter(key);

+		}

+	}

+

+	/**

+	 * This accesses a cached version of the content outliner.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public IContentOutlinePage getContentOutlinePage() {

+		if (contentOutlinePage == null) {

+			// The content outline is just a tree.

+			//

+			class MyContentOutlinePage extends ContentOutlinePage {

+				@Override

+				public void createControl(Composite parent) {

+					super.createControl(parent);

+					contentOutlineViewer = getTreeViewer();

+					contentOutlineViewer.addSelectionChangedListener(this);

+

+					// Set up the tree viewer.

+					//

+					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

+					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

+					contentOutlineViewer.setInput(editingDomain.getResourceSet());

+

+					// Make sure our popups work.

+					//

+					createContextMenuFor(contentOutlineViewer);

+

+					if (!editingDomain.getResourceSet().getResources().isEmpty()) {

+					  // Select the root object in the view.

+					  //

+					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

+					}

+				}

+

+				@Override

+				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {

+					super.makeContributions(menuManager, toolBarManager, statusLineManager);

+					contentOutlineStatusLineManager = statusLineManager;

+				}

+

+				@Override

+				public void setActionBars(IActionBars actionBars) {

+					super.setActionBars(actionBars);

+					getActionBarContributor().shareGlobalActions(this, actionBars);

+				}

+			}

+

+			contentOutlinePage = new MyContentOutlinePage();

+

+			// Listen to selection so that we can handle it is a special way.

+			//

+			contentOutlinePage.addSelectionChangedListener

+				(new ISelectionChangedListener() {

+					 // This ensures that we handle selections correctly.

+					 //

+					 public void selectionChanged(SelectionChangedEvent event) {

+						 handleContentOutlineSelection(event.getSelection());

+					 }

+				 });

+		}

+

+		return contentOutlinePage;

+	}

+

+	/**

+	 * This accesses a cached version of the property sheet.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public IPropertySheetPage getPropertySheetPage() {

+		PropertySheetPage propertySheetPage =

+			new ExtendedPropertySheetPage(editingDomain) {

+				@Override

+				public void setSelectionToViewer(List<?> selection) {

+					ExtensiondefinitionEditor.this.setSelectionToViewer(selection);

+					ExtensiondefinitionEditor.this.setFocus();

+				}

+

+				@Override

+				public void setActionBars(IActionBars actionBars) {

+					super.setActionBars(actionBars);

+					getActionBarContributor().shareGlobalActions(this, actionBars);

+				}

+			};

+		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));

+		propertySheetPages.add(propertySheetPage);

+

+		return propertySheetPage;

+	}

+

+	/**

+	 * This deals with how we want selection in the outliner to affect the other views.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void handleContentOutlineSelection(ISelection selection) {

+		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {

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

+			if (selectedElements.hasNext()) {

+				// Get the first selected element.

+				//

+				Object selectedElement = selectedElements.next();

+

+				// If it's the selection viewer, then we want it to select the same selection as this selection.

+				//

+				if (currentViewerPane.getViewer() == selectionViewer) {

+					ArrayList<Object> selectionList = new ArrayList<Object>();

+					selectionList.add(selectedElement);

+					while (selectedElements.hasNext()) {

+						selectionList.add(selectedElements.next());

+					}

+

+					// Set the selection to the widget.

+					//

+					selectionViewer.setSelection(new StructuredSelection(selectionList));

+				}

+				else {

+					// Set the input to the widget.

+					//

+					if (currentViewerPane.getViewer().getInput() != selectedElement) {

+						currentViewerPane.getViewer().setInput(selectedElement);

+						currentViewerPane.setTitle(selectedElement);

+					}

+				}

+			}

+		}

+	}

+

+	/**

+	 * This is for implementing {@link IEditorPart} and simply tests the command stack.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean isDirty() {

+		return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded();

+	}

+

+	/**

+	 * This is for implementing {@link IEditorPart} and simply saves the model file.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void doSave(IProgressMonitor progressMonitor) {

+		// Save only resources that have actually changed.

+		//

+		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

+		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

+

+		// Do the work within an operation because this is a long running activity that modifies the workbench.

+		//

+		WorkspaceModifyOperation operation =

+			new WorkspaceModifyOperation() {

+				// This is the method that gets invoked when the operation runs.

+				//

+				@Override

+				public void execute(IProgressMonitor monitor) {

+					// Save the resources to the file system.

+					//

+					boolean first = true;

+					for (Resource resource : editingDomain.getResourceSet().getResources()) {

+						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

+							try {

+								long timeStamp = resource.getTimeStamp();

+								resource.save(saveOptions);

+								if (resource.getTimeStamp() != timeStamp) {

+									savedResources.add(resource);

+								}

+							}

+							catch (Exception exception) {

+								resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

+							}

+							first = false;

+						}

+					}

+				}

+			};

+

+		updateProblemIndication = false;

+		try {

+			// This runs the options, and shows progress.

+			//

+			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

+

+			// Refresh the necessary state.

+			//

+			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();

+			firePropertyChange(IEditorPart.PROP_DIRTY);

+		}

+		catch (Exception exception) {

+			// Something went wrong that shouldn't.

+			//

+			FacadeEditorPlugin.INSTANCE.log(exception);

+		}

+		updateProblemIndication = true;

+		updateProblemIndication();

+	}

+

+	/**

+	 * This returns whether something has been persisted to the URI of the specified resource.

+	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected boolean isPersisted(Resource resource) {

+		boolean result = false;

+		try {

+			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());

+			if (stream != null) {

+				result = true;

+				stream.close();

+			}

+		}

+		catch (IOException e) {

+			// Ignore

+		}

+		return result;

+	}

+

+	/**

+	 * This always returns true because it is not currently supported.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean isSaveAsAllowed() {

+		return true;

+	}

+

+	/**

+	 * This also changes the editor's input.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void doSaveAs() {

+		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());

+		saveAsDialog.open();

+		IPath path = saveAsDialog.getResult();

+		if (path != null) {

+			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);

+			if (file != null) {

+				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));

+			}

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void doSaveAs(URI uri, IEditorInput editorInput) {

+		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);

+		setInputWithNotify(editorInput);

+		setPartName(editorInput.getName());

+		IProgressMonitor progressMonitor =

+			getActionBars().getStatusLineManager() != null ?

+				getActionBars().getStatusLineManager().getProgressMonitor() :

+				new NullProgressMonitor();

+		doSave(progressMonitor);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void gotoMarker(IMarker marker) {

+		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);

+		if (!targetObjects.isEmpty()) {

+			setSelectionToViewer(targetObjects);

+		}

+	}

+

+	/**

+	 * This is called during startup.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void init(IEditorSite site, IEditorInput editorInput) {

+		setSite(site);

+		setInputWithNotify(editorInput);

+		setPartName(editorInput.getName());

+		site.setSelectionProvider(this);

+		site.getPage().addPartListener(partListener);

+		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void setFocus() {

+		if (currentViewerPane != null) {

+			currentViewerPane.setFocus();

+		}

+		else {

+			getControl(getActivePage()).setFocus();

+		}

+	}

+

+	/**

+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void addSelectionChangedListener(ISelectionChangedListener listener) {

+		selectionChangedListeners.add(listener);

+	}

+

+	/**

+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void removeSelectionChangedListener(ISelectionChangedListener listener) {

+		selectionChangedListeners.remove(listener);

+	}

+

+	/**

+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public ISelection getSelection() {

+		return editorSelection;

+	}

+

+	/**

+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.

+	 * Calling this result will notify the listeners.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setSelection(ISelection selection) {

+		editorSelection = selection;

+

+		for (ISelectionChangedListener listener : selectionChangedListeners) {

+			listener.selectionChanged(new SelectionChangedEvent(this, selection));

+		}

+		setStatusLineManager(selection);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setStatusLineManager(ISelection selection) {

+		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?

+			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

+

+		if (statusLineManager != null) {

+			if (selection instanceof IStructuredSelection) {

+				Collection<?> collection = ((IStructuredSelection)selection).toList();

+				switch (collection.size()) {

+					case 0: {

+						statusLineManager.setMessage(getString("_UI_NoObjectSelected"));

+						break;

+					}

+					case 1: {

+						String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());

+						statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text));

+						break;

+					}

+					default: {

+						statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size())));

+						break;

+					}

+				}

+			}

+			else {

+				statusLineManager.setMessage("");

+			}

+		}

+	}

+

+	/**

+	 * This looks up a string in the plugin's plugin.properties file.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private static String getString(String key) {

+		return FacadeEditorPlugin.INSTANCE.getString(key);

+	}

+

+	/**

+	 * This looks up a string in plugin.properties, making a substitution.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private static String getString(String key, Object s1) {

+		return FacadeEditorPlugin.INSTANCE.getString(key, new Object [] { s1 });

+	}

+

+	/**

+	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void menuAboutToShow(IMenuManager menuManager) {

+		((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EditingDomainActionBarContributor getActionBarContributor() {

+		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public IActionBars getActionBars() {

+		return getActionBarContributor().getActionBars();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public AdapterFactory getAdapterFactory() {

+		return adapterFactory;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void dispose() {

+		updateProblemIndication = false;

+

+		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);

+

+		getSite().getPage().removePartListener(partListener);

+

+		adapterFactory.dispose();

+

+		if (getActionBarContributor().getActiveEditor() == this) {

+			getActionBarContributor().setActiveEditor(null);

+		}

+

+		for (PropertySheetPage propertySheetPage : propertySheetPages) {

+			propertySheetPage.dispose();

+		}

+

+		if (contentOutlinePage != null) {

+			contentOutlinePage.dispose();

+		}

+

+		super.dispose();

+	}

+

+	/**

+	 * Returns whether the outline view should be presented to the user.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected boolean showOutlineView() {

+		return true;

+	}

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/extensiondefinition/presentation/ExtensiondefinitionModelWizard.java b/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/extensiondefinition/presentation/ExtensiondefinitionModelWizard.java
new file mode 100644
index 00000000000..3f840dcb92c
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/extensiondefinition/presentation/ExtensiondefinitionModelWizard.java
@@ -0,0 +1,640 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facade.extensiondefinition.presentation;

+

+

+import java.util.ArrayList;

+import java.util.Arrays;

+import java.util.Collection;

+import java.util.Collections;

+import java.util.HashMap;

+import java.util.List;

+import java.util.Map;

+import java.util.MissingResourceException;

+import java.util.StringTokenizer;

+

+import org.eclipse.emf.common.CommonPlugin;

+

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

+

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

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

+

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

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

+

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

+

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

+

+import org.eclipse.emf.ecore.xmi.XMLResource;

+

+import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;

+

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

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

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

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

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

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

+

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

+

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

+

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

+

+import org.eclipse.jface.wizard.Wizard;

+import org.eclipse.jface.wizard.WizardPage;

+

+import org.eclipse.swt.SWT;

+

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

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

+

+import org.eclipse.swt.layout.GridData;

+import org.eclipse.swt.layout.GridLayout;

+

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

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

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

+

+import org.eclipse.ui.INewWizard;

+import org.eclipse.ui.IWorkbench;

+

+import org.eclipse.ui.actions.WorkspaceModifyOperation;

+

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

+

+import org.eclipse.ui.part.FileEditorInput;

+import org.eclipse.ui.part.ISetSelectionTarget;

+

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionFactory;

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage;

+import org.eclipse.papyrus.facade.provider.FacadeEditPlugin;

+

+

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

+

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

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

+

+import org.eclipse.papyrus.facade.presentation.FacadeEditorPlugin;

+

+import org.eclipse.ui.IWorkbenchPage;

+import org.eclipse.ui.IWorkbenchPart;

+import org.eclipse.ui.IWorkbenchWindow;

+import org.eclipse.ui.PartInitException;

+

+

+/**

+ * This is a simple wizard for creating a new model file.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class ExtensiondefinitionModelWizard extends Wizard implements INewWizard {

+	/**

+	 * The supported extensions for created files.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static final List<String> FILE_EXTENSIONS =

+		Collections.unmodifiableList(Arrays.asList(FacadeEditorPlugin.INSTANCE.getString("_UI_ExtensiondefinitionEditorFilenameExtensions").split("\\s*,\\s*")));

+

+	/**

+	 * A formatted list of supported file extensions, suitable for display.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static final String FORMATTED_FILE_EXTENSIONS =

+		FacadeEditorPlugin.INSTANCE.getString("_UI_ExtensiondefinitionEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");

+

+	/**

+	 * This caches an instance of the model package.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected ExtensiondefinitionPackage extensiondefinitionPackage = ExtensiondefinitionPackage.eINSTANCE;

+

+	/**

+	 * This caches an instance of the model factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected ExtensiondefinitionFactory extensiondefinitionFactory = extensiondefinitionPackage.getExtensiondefinitionFactory();

+

+	/**

+	 * This is the file creation page.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected ExtensiondefinitionModelWizardNewFileCreationPage newFileCreationPage;

+

+	/**

+	 * This is the initial object creation page.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected ExtensiondefinitionModelWizardInitialObjectCreationPage initialObjectCreationPage;

+

+	/**

+	 * Remember the selection during initialization for populating the default container.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected IStructuredSelection selection;

+

+	/**

+	 * Remember the workbench during initialization.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected IWorkbench workbench;

+

+	/**

+	 * Caches the names of the types that can be created as the root object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected List<String> initialObjectNames;

+

+	/**

+	 * This just records the information.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void init(IWorkbench workbench, IStructuredSelection selection) {

+		this.workbench = workbench;

+		this.selection = selection;

+		setWindowTitle(FacadeEditorPlugin.INSTANCE.getString("_UI_Wizard_label"));

+		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(FacadeEditorPlugin.INSTANCE.getImage("full/wizban/NewExtensiondefinition")));

+	}

+

+	/**

+	 * Returns the names of the types that can be created as the root object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected Collection<String> getInitialObjectNames() {

+		if (initialObjectNames == null) {

+			initialObjectNames = new ArrayList<String>();

+			for (EClassifier eClassifier : extensiondefinitionPackage.getEClassifiers()) {

+				if (eClassifier instanceof EClass) {

+					EClass eClass = (EClass)eClassifier;

+					if (!eClass.isAbstract()) {

+						initialObjectNames.add(eClass.getName());

+					}

+				}

+			}

+			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());

+		}

+		return initialObjectNames;

+	}

+

+	/**

+	 * Create a new model.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EObject createInitialModel() {

+		EClass eClass = (EClass)extensiondefinitionPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

+		EObject rootObject = extensiondefinitionFactory.create(eClass);

+		return rootObject;

+	}

+

+	/**

+	 * Do the work after everything is specified.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean performFinish() {

+		try {

+			// Remember the file.

+			//

+			final IFile modelFile = getModelFile();

+

+			// Do the work within an operation.

+			//

+			WorkspaceModifyOperation operation =

+				new WorkspaceModifyOperation() {

+					@Override

+					protected void execute(IProgressMonitor progressMonitor) {

+						try {

+							// Create a resource set

+							//

+							ResourceSet resourceSet = new ResourceSetImpl();

+

+							// Get the URI of the model file.

+							//

+							URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);

+

+							// Create a resource for this file.

+							//

+							Resource resource = resourceSet.createResource(fileURI);

+

+							// Add the initial model object to the contents.

+							//

+							EObject rootObject = createInitialModel();

+							if (rootObject != null) {

+								resource.getContents().add(rootObject);

+							}

+

+							// Save the contents of the resource to the file system.

+							//

+							Map<Object, Object> options = new HashMap<Object, Object>();

+							options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());

+							resource.save(options);

+						}

+						catch (Exception exception) {

+							FacadeEditorPlugin.INSTANCE.log(exception);

+						}

+						finally {

+							progressMonitor.done();

+						}

+					}

+				};

+

+			getContainer().run(false, false, operation);

+

+			// Select the new file resource in the current view.

+			//

+			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();

+			IWorkbenchPage page = workbenchWindow.getActivePage();

+			final IWorkbenchPart activePart = page.getActivePart();

+			if (activePart instanceof ISetSelectionTarget) {

+				final ISelection targetSelection = new StructuredSelection(modelFile);

+				getShell().getDisplay().asyncExec

+					(new Runnable() {

+						 public void run() {

+							 ((ISetSelectionTarget)activePart).selectReveal(targetSelection);

+						 }

+					 });

+			}

+

+			// Open an editor on the new file.

+			//

+			try {

+				page.openEditor

+					(new FileEditorInput(modelFile),

+					 workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());					 	 

+			}

+			catch (PartInitException exception) {

+				MessageDialog.openError(workbenchWindow.getShell(), FacadeEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());

+				return false;

+			}

+

+			return true;

+		}

+		catch (Exception exception) {

+			FacadeEditorPlugin.INSTANCE.log(exception);

+			return false;

+		}

+	}

+

+	/**

+	 * This is the one page of the wizard.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public class ExtensiondefinitionModelWizardNewFileCreationPage extends WizardNewFileCreationPage {

+		/**

+		 * Pass in the selection.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public ExtensiondefinitionModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {

+			super(pageId, selection);

+		}

+

+		/**

+		 * The framework calls this to see if the file is correct.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		@Override

+		protected boolean validatePage() {

+			if (super.validatePage()) {

+				String extension = new Path(getFileName()).getFileExtension();

+				if (extension == null || !FILE_EXTENSIONS.contains(extension)) {

+					String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension";

+					setErrorMessage(FacadeEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));

+					return false;

+				}

+				return true;

+			}

+			return false;

+		}

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public IFile getModelFile() {

+			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));

+		}

+	}

+

+	/**

+	 * This is the page where the type of object to create is selected.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public class ExtensiondefinitionModelWizardInitialObjectCreationPage extends WizardPage {

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		protected Combo initialObjectField;

+

+		/**

+		 * @generated

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 */

+		protected List<String> encodings;

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		protected Combo encodingField;

+

+		/**

+		 * Pass in the selection.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public ExtensiondefinitionModelWizardInitialObjectCreationPage(String pageId) {

+			super(pageId);

+		}

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public void createControl(Composite parent) {

+			Composite composite = new Composite(parent, SWT.NONE); {

+				GridLayout layout = new GridLayout();

+				layout.numColumns = 1;

+				layout.verticalSpacing = 12;

+				composite.setLayout(layout);

+

+				GridData data = new GridData();

+				data.verticalAlignment = GridData.FILL;

+				data.grabExcessVerticalSpace = true;

+				data.horizontalAlignment = GridData.FILL;

+				composite.setLayoutData(data);

+			}

+

+			Label containerLabel = new Label(composite, SWT.LEFT);

+			{

+				containerLabel.setText(FacadeEditorPlugin.INSTANCE.getString("_UI_ModelObject"));

+

+				GridData data = new GridData();

+				data.horizontalAlignment = GridData.FILL;

+				containerLabel.setLayoutData(data);

+			}

+

+			initialObjectField = new Combo(composite, SWT.BORDER);

+			{

+				GridData data = new GridData();

+				data.horizontalAlignment = GridData.FILL;

+				data.grabExcessHorizontalSpace = true;

+				initialObjectField.setLayoutData(data);

+			}

+

+			for (String objectName : getInitialObjectNames()) {

+				initialObjectField.add(getLabel(objectName));

+			}

+

+			if (initialObjectField.getItemCount() == 1) {

+				initialObjectField.select(0);

+			}

+			initialObjectField.addModifyListener(validator);

+

+			Label encodingLabel = new Label(composite, SWT.LEFT);

+			{

+				encodingLabel.setText(FacadeEditorPlugin.INSTANCE.getString("_UI_XMLEncoding"));

+

+				GridData data = new GridData();

+				data.horizontalAlignment = GridData.FILL;

+				encodingLabel.setLayoutData(data);

+			}

+			encodingField = new Combo(composite, SWT.BORDER);

+			{

+				GridData data = new GridData();

+				data.horizontalAlignment = GridData.FILL;

+				data.grabExcessHorizontalSpace = true;

+				encodingField.setLayoutData(data);

+			}

+

+			for (String encoding : getEncodings()) {

+				encodingField.add(encoding);

+			}

+

+			encodingField.select(0);

+			encodingField.addModifyListener(validator);

+

+			setPageComplete(validatePage());

+			setControl(composite);

+		}

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		protected ModifyListener validator =

+			new ModifyListener() {

+				public void modifyText(ModifyEvent e) {

+					setPageComplete(validatePage());

+				}

+			};

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		protected boolean validatePage() {

+			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());

+		}

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		@Override

+		public void setVisible(boolean visible) {

+			super.setVisible(visible);

+			if (visible) {

+				if (initialObjectField.getItemCount() == 1) {

+					initialObjectField.clearSelection();

+					encodingField.setFocus();

+				}

+				else {

+					encodingField.clearSelection();

+					initialObjectField.setFocus();

+				}

+			}

+		}

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public String getInitialObjectName() {

+			String label = initialObjectField.getText();

+

+			for (String name : getInitialObjectNames()) {

+				if (getLabel(name).equals(label)) {

+					return name;

+				}

+			}

+			return null;

+		}

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public String getEncoding() {

+			return encodingField.getText();

+		}

+

+		/**

+		 * Returns the label for the specified type name.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		protected String getLabel(String typeName) {

+			try {

+				return FacadeEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type");

+			}

+			catch(MissingResourceException mre) {

+				FacadeEditorPlugin.INSTANCE.log(mre);

+			}

+			return typeName;

+		}

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		protected Collection<String> getEncodings() {

+			if (encodings == null) {

+				encodings = new ArrayList<String>();

+				for (StringTokenizer stringTokenizer = new StringTokenizer(FacadeEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) {

+					encodings.add(stringTokenizer.nextToken());

+				}

+			}

+			return encodings;

+		}

+	}

+

+	/**

+	 * The framework calls this to create the contents of the wizard.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+		@Override

+	public void addPages() {

+		// Create a page, set the title, and the initial model file name.

+		//

+		newFileCreationPage = new ExtensiondefinitionModelWizardNewFileCreationPage("Whatever", selection);

+		newFileCreationPage.setTitle(FacadeEditorPlugin.INSTANCE.getString("_UI_ExtensiondefinitionModelWizard_label"));

+		newFileCreationPage.setDescription(FacadeEditorPlugin.INSTANCE.getString("_UI_ExtensiondefinitionModelWizard_description"));

+		newFileCreationPage.setFileName(FacadeEditorPlugin.INSTANCE.getString("_UI_ExtensiondefinitionEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0));

+		addPage(newFileCreationPage);

+

+		// Try and get the resource selection to determine a current directory for the file dialog.

+		//

+		if (selection != null && !selection.isEmpty()) {

+			// Get the resource...

+			//

+			Object selectedElement = selection.iterator().next();

+			if (selectedElement instanceof IResource) {

+				// Get the resource parent, if its a file.

+				//

+				IResource selectedResource = (IResource)selectedElement;

+				if (selectedResource.getType() == IResource.FILE) {

+					selectedResource = selectedResource.getParent();

+				}

+

+				// This gives us a directory...

+				//

+				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {

+					// Set this for the container.

+					//

+					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());

+

+					// Make up a unique new name here.

+					//

+					String defaultModelBaseFilename = FacadeEditorPlugin.INSTANCE.getString("_UI_ExtensiondefinitionEditorFilenameDefaultBase");

+					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);

+					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension;

+					for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {

+						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension;

+					}

+					newFileCreationPage.setFileName(modelFilename);

+				}

+			}

+		}

+		initialObjectCreationPage = new ExtensiondefinitionModelWizardInitialObjectCreationPage("Whatever2");

+		initialObjectCreationPage.setTitle(FacadeEditorPlugin.INSTANCE.getString("_UI_ExtensiondefinitionModelWizard_label"));

+		initialObjectCreationPage.setDescription(FacadeEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description"));

+		addPage(initialObjectCreationPage);

+	}

+

+	/**

+	 * Get the file from the page.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public IFile getModelFile() {

+		return newFileCreationPage.getModelFile();

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/presentation/FacadeActionBarContributor.java b/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/presentation/FacadeActionBarContributor.java
new file mode 100644
index 00000000000..76ba15f3782
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/presentation/FacadeActionBarContributor.java
@@ -0,0 +1,434 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facade.presentation;

+

+import java.util.ArrayList;

+import java.util.Collection;

+

+import org.eclipse.emf.common.ui.viewer.IViewerProvider;

+

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

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

+

+import org.eclipse.emf.edit.ui.action.ControlAction;

+import org.eclipse.emf.edit.ui.action.CreateChildAction;

+import org.eclipse.emf.edit.ui.action.CreateSiblingAction;

+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

+import org.eclipse.emf.edit.ui.action.LoadResourceAction;

+import org.eclipse.emf.edit.ui.action.ValidateAction;

+

+import org.eclipse.jface.action.Action;

+import org.eclipse.jface.action.ActionContributionItem;

+import org.eclipse.jface.action.IAction;

+import org.eclipse.jface.action.IContributionItem;

+import org.eclipse.jface.action.IContributionManager;

+import org.eclipse.jface.action.IMenuListener;

+import org.eclipse.jface.action.IMenuManager;

+import org.eclipse.jface.action.IToolBarManager;

+import org.eclipse.jface.action.MenuManager;

+import org.eclipse.jface.action.Separator;

+import org.eclipse.jface.action.SubContributionItem;

+

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

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

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

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

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

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

+

+import org.eclipse.ui.IEditorPart;

+import org.eclipse.ui.PartInitException;

+

+/**

+ * This is the action bar contributor for the Facade model editor.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class FacadeActionBarContributor

+	extends EditingDomainActionBarContributor

+	implements ISelectionChangedListener {

+	/**

+	 * This keeps track of the active editor.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected IEditorPart activeEditorPart;

+

+	/**

+	 * This keeps track of the current selection provider.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected ISelectionProvider selectionProvider;

+

+	/**

+	 * This action opens the Properties view.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected IAction showPropertiesViewAction =

+		new Action(FacadeEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) {

+			@Override

+			public void run() {

+				try {

+					getPage().showView("org.eclipse.ui.views.PropertySheet");

+				}

+				catch (PartInitException exception) {

+					FacadeEditorPlugin.INSTANCE.log(exception);

+				}

+			}

+		};

+

+	/**

+	 * This action refreshes the viewer of the current editor if the editor

+	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected IAction refreshViewerAction =

+		new Action(FacadeEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) {

+			@Override

+			public boolean isEnabled() {

+				return activeEditorPart instanceof IViewerProvider;

+			}

+

+			@Override

+			public void run() {

+				if (activeEditorPart instanceof IViewerProvider) {

+					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();

+					if (viewer != null) {

+						viewer.refresh();

+					}

+				}

+			}

+		};

+

+	/**

+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor

+	 * generated for the current selection by the item provider.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected Collection<IAction> createChildActions;

+

+	/**

+	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected IMenuManager createChildMenuManager;

+

+	/**

+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor

+	 * generated for the current selection by the item provider.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected Collection<IAction> createSiblingActions;

+

+	/**

+	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected IMenuManager createSiblingMenuManager;

+

+	/**

+	 * This creates an instance of the contributor.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public FacadeActionBarContributor() {

+		super(ADDITIONS_LAST_STYLE);

+		loadResourceAction = new LoadResourceAction();

+		validateAction = new ValidateAction();

+		controlAction = new ControlAction();

+	}

+

+	/**

+	 * This adds Separators for editor additions to the tool bar.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void contributeToToolBar(IToolBarManager toolBarManager) {

+		toolBarManager.add(new Separator("facade-settings"));

+		toolBarManager.add(new Separator("facade-additions"));

+	}

+

+	/**

+	 * This adds to the menu bar a menu and some separators for editor additions,

+	 * as well as the sub-menus for object creation items.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void contributeToMenu(IMenuManager menuManager) {

+		super.contributeToMenu(menuManager);

+

+		IMenuManager submenuManager = new MenuManager(FacadeEditorPlugin.INSTANCE.getString("_UI_FacadeEditor_menu"), "org.eclipse.papyrus.facadeMenuID");

+		menuManager.insertAfter("additions", submenuManager);

+		submenuManager.add(new Separator("settings"));

+		submenuManager.add(new Separator("actions"));

+		submenuManager.add(new Separator("additions"));

+		submenuManager.add(new Separator("additions-end"));

+

+		// Prepare for CreateChild item addition or removal.

+		//

+		createChildMenuManager = new MenuManager(FacadeEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));

+		submenuManager.insertBefore("additions", createChildMenuManager);

+

+		// Prepare for CreateSibling item addition or removal.

+		//

+		createSiblingMenuManager = new MenuManager(FacadeEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));

+		submenuManager.insertBefore("additions", createSiblingMenuManager);

+

+		// Force an update because Eclipse hides empty menus now.

+		//

+		submenuManager.addMenuListener

+			(new IMenuListener() {

+				 public void menuAboutToShow(IMenuManager menuManager) {

+					 menuManager.updateAll(true);

+				 }

+			 });

+

+		addGlobalActions(submenuManager);

+	}

+

+	/**

+	 * When the active editor changes, this remembers the change and registers with it as a selection provider.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void setActiveEditor(IEditorPart part) {

+		super.setActiveEditor(part);

+		activeEditorPart = part;

+

+		// Switch to the new selection provider.

+		//

+		if (selectionProvider != null) {

+			selectionProvider.removeSelectionChangedListener(this);

+		}

+		if (part == null) {

+			selectionProvider = null;

+		}

+		else {

+			selectionProvider = part.getSite().getSelectionProvider();

+			selectionProvider.addSelectionChangedListener(this);

+

+			// Fake a selection changed event to update the menus.

+			//

+			if (selectionProvider.getSelection() != null) {

+				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));

+			}

+		}

+	}

+

+	/**

+	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},

+	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings

+	 * that can be added to the selected object and updating the menus accordingly.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void selectionChanged(SelectionChangedEvent event) {

+		// Remove any menu items for old selection.

+		//

+		if (createChildMenuManager != null) {

+			depopulateManager(createChildMenuManager, createChildActions);

+		}

+		if (createSiblingMenuManager != null) {

+			depopulateManager(createSiblingMenuManager, createSiblingActions);

+		}

+

+		// Query the new selection for appropriate new child/sibling descriptors

+		//

+		Collection<?> newChildDescriptors = null;

+		Collection<?> newSiblingDescriptors = null;

+

+		ISelection selection = event.getSelection();

+		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {

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

+

+			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();

+

+			newChildDescriptors = domain.getNewChildDescriptors(object, null);

+			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);

+		}

+

+		// Generate actions for selection; populate and redraw the menus.

+		//

+		createChildActions = generateCreateChildActions(newChildDescriptors, selection);

+		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);

+

+		if (createChildMenuManager != null) {

+			populateManager(createChildMenuManager, createChildActions, null);

+			createChildMenuManager.update(true);

+		}

+		if (createSiblingMenuManager != null) {

+			populateManager(createSiblingMenuManager, createSiblingActions, null);

+			createSiblingMenuManager.update(true);

+		}

+	}

+

+	/**

+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,

+	 * and returns the collection of these actions.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {

+		Collection<IAction> actions = new ArrayList<IAction>();

+		if (descriptors != null) {

+			for (Object descriptor : descriptors) {

+				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));

+			}

+		}

+		return actions;

+	}

+

+	/**

+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,

+	 * and returns the collection of these actions.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {

+		Collection<IAction> actions = new ArrayList<IAction>();

+		if (descriptors != null) {

+			for (Object descriptor : descriptors) {

+				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));

+			}

+		}

+		return actions;

+	}

+

+	/**

+	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s

+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,

+	 * by inserting them before the specified contribution item <code>contributionID</code>.

+	 * If <code>contributionID</code> is <code>null</code>, they are simply added.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {

+		if (actions != null) {

+			for (IAction action : actions) {

+				if (contributionID != null) {

+					manager.insertBefore(contributionID, action);

+				}

+				else {

+					manager.add(action);

+				}

+			}

+		}

+	}

+		

+	/**

+	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s

+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {

+		if (actions != null) {

+			IContributionItem[] items = manager.getItems();

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

+				// Look into SubContributionItems

+				//

+				IContributionItem contributionItem = items[i];

+				while (contributionItem instanceof SubContributionItem) {

+					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();

+				}

+

+				// Delete the ActionContributionItems with matching action.

+				//

+				if (contributionItem instanceof ActionContributionItem) {

+					IAction action = ((ActionContributionItem)contributionItem).getAction();

+					if (actions.contains(action)) {

+						manager.remove(contributionItem);

+					}

+				}

+			}

+		}

+	}

+

+	/**

+	 * This populates the pop-up menu before it appears.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void menuAboutToShow(IMenuManager menuManager) {

+		super.menuAboutToShow(menuManager);

+		MenuManager submenuManager = null;

+

+		submenuManager = new MenuManager(FacadeEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));

+		populateManager(submenuManager, createChildActions, null);

+		menuManager.insertBefore("edit", submenuManager);

+

+		submenuManager = new MenuManager(FacadeEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));

+		populateManager(submenuManager, createSiblingActions, null);

+		menuManager.insertBefore("edit", submenuManager);

+	}

+

+	/**

+	 * This inserts global actions before the "additions-end" separator.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected void addGlobalActions(IMenuManager menuManager) {

+		menuManager.insertAfter("additions-end", new Separator("ui-actions"));

+		menuManager.insertAfter("ui-actions", showPropertiesViewAction);

+

+		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		

+		menuManager.insertAfter("ui-actions", refreshViewerAction);

+

+		super.addGlobalActions(menuManager);

+	}

+

+	/**

+	 * This ensures that a delete action will clean up all references to deleted objects.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected boolean removeAllReferencesOnDelete() {

+		return true;

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/presentation/FacadeEditor.java b/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/presentation/FacadeEditor.java
new file mode 100644
index 00000000000..816fcc903f0
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/presentation/FacadeEditor.java
@@ -0,0 +1,1841 @@
+/*****************************************************************************

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

+ *  CEA LIST - Initial API and implementation

+ *

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

+package org.eclipse.papyrus.facade.presentation;

+

+

+import java.io.IOException;

+import java.io.InputStream;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Collections;

+import java.util.EventObject;

+import java.util.HashMap;

+import java.util.Iterator;

+import java.util.LinkedHashMap;

+import java.util.List;

+import java.util.Map;

+

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

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

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

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

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

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

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

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

+

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

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

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

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

+

+import org.eclipse.jface.action.IMenuListener;

+import org.eclipse.jface.action.IMenuManager;

+import org.eclipse.jface.action.IStatusLineManager;

+import org.eclipse.jface.action.IToolBarManager;

+import org.eclipse.jface.action.MenuManager;

+import org.eclipse.jface.action.Separator;

+

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

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

+

+import org.eclipse.jface.util.LocalSelectionTransfer;

+

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

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

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

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

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

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

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

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

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

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

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

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

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

+

+import org.eclipse.swt.SWT;

+

+import org.eclipse.swt.custom.CTabFolder;

+

+import org.eclipse.swt.dnd.DND;

+import org.eclipse.swt.dnd.FileTransfer;

+import org.eclipse.swt.dnd.Transfer;

+

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

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

+

+import org.eclipse.swt.graphics.Point;

+

+import org.eclipse.swt.layout.FillLayout;

+

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

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

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

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

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

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

+

+import org.eclipse.ui.IActionBars;

+import org.eclipse.ui.IEditorInput;

+import org.eclipse.ui.IEditorPart;

+import org.eclipse.ui.IEditorSite;

+import org.eclipse.ui.IPartListener;

+import org.eclipse.ui.IWorkbenchPart;

+import org.eclipse.ui.PartInitException;

+

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

+

+import org.eclipse.ui.ide.IGotoMarker;

+

+import org.eclipse.ui.part.FileEditorInput;

+import org.eclipse.ui.part.MultiPageEditorPart;

+

+import org.eclipse.ui.views.contentoutline.ContentOutline;

+import org.eclipse.ui.views.contentoutline.ContentOutlinePage;

+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;

+

+import org.eclipse.ui.views.properties.IPropertySheetPage;

+import org.eclipse.ui.views.properties.PropertySheet;

+import org.eclipse.ui.views.properties.PropertySheetPage;

+

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

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

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

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

+

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

+import org.eclipse.emf.common.notify.Notification;

+

+import org.eclipse.emf.common.ui.MarkerHelper;

+import org.eclipse.emf.common.ui.ViewerPane;

+

+import org.eclipse.emf.common.ui.editor.ProblemEditorPart;

+

+import org.eclipse.emf.common.ui.viewer.IViewerProvider;

+

+import org.eclipse.emf.common.util.BasicDiagnostic;

+import org.eclipse.emf.common.util.Diagnostic;

+import org.eclipse.emf.common.util.URI;

+

+

+import org.eclipse.emf.ecore.resource.Resource;

+import org.eclipse.emf.ecore.resource.ResourceSet;

+

+import org.eclipse.emf.ecore.util.EContentAdapter;

+import org.eclipse.emf.ecore.util.EcoreUtil;

+

+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

+import org.eclipse.emf.edit.domain.EditingDomain;

+import org.eclipse.emf.edit.domain.IEditingDomainProvider;

+

+import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;

+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

+import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;

+

+import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;

+

+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

+

+import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;

+

+import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;

+import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

+import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;

+

+import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;

+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

+import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;

+

+import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;

+import org.eclipse.emf.edit.ui.util.EditUIUtil;

+

+import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;

+

+import org.eclipse.papyrus.facade.provider.FacadeItemProviderAdapterFactory;

+

+import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

+

+import org.eclipse.papyrus.facade.extensiondefinition.provider.ExtensiondefinitionItemProviderAdapterFactory;

+

+import org.eclipse.papyrus.facade.virtualmetamodel.provider.VirtualmetamodelItemProviderAdapterFactory;

+

+import org.eclipse.ui.actions.WorkspaceModifyOperation;

+

+import org.eclipse.uml2.uml.edit.providers.UMLItemProviderAdapterFactory;

+

+

+/**

+ * This is an example of a Facade model editor.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class FacadeEditor

+	extends MultiPageEditorPart

+	implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {

+	/**

+	 * This keeps track of the editing domain that is used to track all changes to the model.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected AdapterFactoryEditingDomain editingDomain;

+

+	/**

+	 * This is the one adapter factory used for providing views of the model.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected ComposedAdapterFactory adapterFactory;

+

+	/**

+	 * This is the content outline page.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected IContentOutlinePage contentOutlinePage;

+

+	/**

+	 * This is a kludge...

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected IStatusLineManager contentOutlineStatusLineManager;

+

+	/**

+	 * This is the content outline page's viewer.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected TreeViewer contentOutlineViewer;

+

+	/**

+	 * This is the property sheet page.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();

+

+	/**

+	 * This is the viewer that shadows the selection in the content outline.

+	 * The parent relation must be correctly defined for this to work.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected TreeViewer selectionViewer;

+

+	/**

+	 * This inverts the roll of parent and child in the content provider and show parents as a tree.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected TreeViewer parentViewer;

+

+	/**

+	 * This shows how a tree view works.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected TreeViewer treeViewer;

+

+	/**

+	 * This shows how a list view works.

+	 * A list viewer doesn't support icons.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected ListViewer listViewer;

+

+	/**

+	 * This shows how a table view works.

+	 * A table can be used as a list with icons.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected TableViewer tableViewer;

+

+	/**

+	 * This shows how a tree view with columns works.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected TreeViewer treeViewerWithColumns;

+

+	/**

+	 * This keeps track of the active viewer pane, in the book.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected ViewerPane currentViewerPane;

+

+	/**

+	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected Viewer currentViewer;

+

+	/**

+	 * This listens to which ever viewer is active.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected ISelectionChangedListener selectionChangedListener;

+

+	/**

+	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();

+

+	/**

+	 * This keeps track of the selection of the editor as a whole.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected ISelection editorSelection = StructuredSelection.EMPTY;

+

+	/**

+	 * The MarkerHelper is responsible for creating workspace resource markers presented

+	 * in Eclipse's Problems View.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected MarkerHelper markerHelper = new EditUIMarkerHelper();

+

+	/**

+	 * This listens for when the outline becomes active

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected IPartListener partListener =

+		new IPartListener() {

+			public void partActivated(IWorkbenchPart p) {

+				if (p instanceof ContentOutline) {

+					if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {

+						getActionBarContributor().setActiveEditor(FacadeEditor.this);

+

+						setCurrentViewer(contentOutlineViewer);

+					}

+				}

+				else if (p instanceof PropertySheet) {

+					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {

+						getActionBarContributor().setActiveEditor(FacadeEditor.this);

+						handleActivate();

+					}

+				}

+				else if (p == FacadeEditor.this) {

+					handleActivate();

+				}

+			}

+			public void partBroughtToTop(IWorkbenchPart p) {

+				// Ignore.

+			}

+			public void partClosed(IWorkbenchPart p) {

+				// Ignore.

+			}

+			public void partDeactivated(IWorkbenchPart p) {

+				// Ignore.

+			}

+			public void partOpened(IWorkbenchPart p) {

+				// Ignore.

+			}

+		};

+

+	/**

+	 * Resources that have been removed since last activation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected Collection<Resource> removedResources = new ArrayList<Resource>();

+

+	/**

+	 * Resources that have been changed since last activation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected Collection<Resource> changedResources = new ArrayList<Resource>();

+

+	/**

+	 * Resources that have been saved.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected Collection<Resource> savedResources = new ArrayList<Resource>();

+

+	/**

+	 * Map to store the diagnostic associated with a resource.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();

+

+	/**

+	 * Controls whether the problem indication should be updated.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected boolean updateProblemIndication = true;

+

+	/**

+	 * Adapter used to update the problem indication when resources are demanded loaded.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EContentAdapter problemIndicationAdapter =

+		new EContentAdapter() {

+			@Override

+			public void notifyChanged(Notification notification) {

+				if (notification.getNotifier() instanceof Resource) {

+					switch (notification.getFeatureID(Resource.class)) {

+						case Resource.RESOURCE__IS_LOADED:

+						case Resource.RESOURCE__ERRORS:

+						case Resource.RESOURCE__WARNINGS: {

+							Resource resource = (Resource)notification.getNotifier();

+							Diagnostic diagnostic = analyzeResourceProblems(resource, null);

+							if (diagnostic.getSeverity() != Diagnostic.OK) {

+								resourceToDiagnosticMap.put(resource, diagnostic);

+							}

+							else {

+								resourceToDiagnosticMap.remove(resource);

+							}

+

+							if (updateProblemIndication) {

+								getSite().getShell().getDisplay().asyncExec

+									(new Runnable() {

+										 public void run() {

+											 updateProblemIndication();

+										 }

+									 });

+							}

+							break;

+						}

+					}

+				}

+				else {

+					super.notifyChanged(notification);

+				}

+			}

+

+			@Override

+			protected void setTarget(Resource target) {

+				basicSetTarget(target);

+			}

+

+			@Override

+			protected void unsetTarget(Resource target) {

+				basicUnsetTarget(target);

+				resourceToDiagnosticMap.remove(target);

+				if (updateProblemIndication) {

+					getSite().getShell().getDisplay().asyncExec

+						(new Runnable() {

+							 public void run() {

+								 updateProblemIndication();

+							 }

+						 });

+				}

+			}

+		};

+

+	/**

+	 * This listens for workspace changes.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected IResourceChangeListener resourceChangeListener =

+		new IResourceChangeListener() {

+			public void resourceChanged(IResourceChangeEvent event) {

+				IResourceDelta delta = event.getDelta();

+				try {

+					class ResourceDeltaVisitor implements IResourceDeltaVisitor {

+						protected ResourceSet resourceSet = editingDomain.getResourceSet();

+						protected Collection<Resource> changedResources = new ArrayList<Resource>();

+						protected Collection<Resource> removedResources = new ArrayList<Resource>();

+

+						public boolean visit(IResourceDelta delta) {

+							if (delta.getResource().getType() == IResource.FILE) {

+								if (delta.getKind() == IResourceDelta.REMOVED ||

+								    delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {

+									Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);

+									if (resource != null) {

+										if (delta.getKind() == IResourceDelta.REMOVED) {

+											removedResources.add(resource);

+										}

+										else if (!savedResources.remove(resource)) {

+											changedResources.add(resource);

+										}

+									}

+								}

+								return false;

+							}

+

+							return true;

+						}

+

+						public Collection<Resource> getChangedResources() {

+							return changedResources;

+						}

+

+						public Collection<Resource> getRemovedResources() {

+							return removedResources;

+						}

+					}

+

+					final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();

+					delta.accept(visitor);

+

+					if (!visitor.getRemovedResources().isEmpty()) {

+						getSite().getShell().getDisplay().asyncExec

+							(new Runnable() {

+								 public void run() {

+									 removedResources.addAll(visitor.getRemovedResources());

+									 if (!isDirty()) {

+										 getSite().getPage().closeEditor(FacadeEditor.this, false);

+									 }

+								 }

+							 });

+					}

+

+					if (!visitor.getChangedResources().isEmpty()) {

+						getSite().getShell().getDisplay().asyncExec

+							(new Runnable() {

+								 public void run() {

+									 changedResources.addAll(visitor.getChangedResources());

+									 if (getSite().getPage().getActiveEditor() == FacadeEditor.this) {

+										 handleActivate();

+									 }

+								 }

+							 });

+					}

+				}

+				catch (CoreException exception) {

+					FacadeEditorPlugin.INSTANCE.log(exception);

+				}

+			}

+		};

+

+	/**

+	 * Handles activation of the editor or it's associated views.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void handleActivate() {

+		// Recompute the read only state.

+		//

+		if (editingDomain.getResourceToReadOnlyMap() != null) {

+		  editingDomain.getResourceToReadOnlyMap().clear();

+

+		  // Refresh any actions that may become enabled or disabled.

+		  //

+		  setSelection(getSelection());

+		}

+

+		if (!removedResources.isEmpty()) {

+			if (handleDirtyConflict()) {

+				getSite().getPage().closeEditor(FacadeEditor.this, false);

+			}

+			else {

+				removedResources.clear();

+				changedResources.clear();

+				savedResources.clear();

+			}

+		}

+		else if (!changedResources.isEmpty()) {

+			changedResources.removeAll(savedResources);

+			handleChangedResources();

+			changedResources.clear();

+			savedResources.clear();

+		}

+	}

+

+	/**

+	 * Handles what to do with changed resources on activation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void handleChangedResources() {

+		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {

+			if (isDirty()) {

+				changedResources.addAll(editingDomain.getResourceSet().getResources());

+			}

+			editingDomain.getCommandStack().flush();

+

+			updateProblemIndication = false;

+			for (Resource resource : changedResources) {

+				if (resource.isLoaded()) {

+					resource.unload();

+					try {

+						resource.load(Collections.EMPTY_MAP);

+					}

+					catch (IOException exception) {

+						if (!resourceToDiagnosticMap.containsKey(resource)) {

+							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

+						}

+					}

+				}

+			}

+

+			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {

+				setSelection(StructuredSelection.EMPTY);

+			}

+

+			updateProblemIndication = true;

+			updateProblemIndication();

+		}

+	}

+

+	/**

+	 * Updates the problems indication with the information described in the specified diagnostic.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void updateProblemIndication() {

+		if (updateProblemIndication) {

+			BasicDiagnostic diagnostic =

+				new BasicDiagnostic

+					(Diagnostic.OK,

+					 "org.eclipse.papyrus.facade.editor",

+					 0,

+					 null,

+					 new Object [] { editingDomain.getResourceSet() });

+			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {

+				if (childDiagnostic.getSeverity() != Diagnostic.OK) {

+					diagnostic.add(childDiagnostic);

+				}

+			}

+

+			int lastEditorPage = getPageCount() - 1;

+			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {

+				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);

+				if (diagnostic.getSeverity() != Diagnostic.OK) {

+					setActivePage(lastEditorPage);

+				}

+			}

+			else if (diagnostic.getSeverity() != Diagnostic.OK) {

+				ProblemEditorPart problemEditorPart = new ProblemEditorPart();

+				problemEditorPart.setDiagnostic(diagnostic);

+				problemEditorPart.setMarkerHelper(markerHelper);

+				try {

+					addPage(++lastEditorPage, problemEditorPart, getEditorInput());

+					setPageText(lastEditorPage, problemEditorPart.getPartName());

+					setActivePage(lastEditorPage);

+					showTabs();

+				}

+				catch (PartInitException exception) {

+					FacadeEditorPlugin.INSTANCE.log(exception);

+				}

+			}

+

+			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {

+				markerHelper.deleteMarkers(editingDomain.getResourceSet());

+				if (diagnostic.getSeverity() != Diagnostic.OK) {

+					try {

+						markerHelper.createMarkers(diagnostic);

+					}

+					catch (CoreException exception) {

+						FacadeEditorPlugin.INSTANCE.log(exception);

+					}

+				}

+			}

+		}

+	}

+

+	/**

+	 * Shows a dialog that asks if conflicting changes should be discarded.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected boolean handleDirtyConflict() {

+		return

+			MessageDialog.openQuestion

+				(getSite().getShell(),

+				 getString("_UI_FileConflict_label"),

+				 getString("_WARN_FileConflict"));

+	}

+

+	/**

+	 * This creates a model editor.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public FacadeEditor() {

+		super();

+		initializeEditingDomain();

+	}

+

+	/**

+	 * This sets up the editing domain for the model editor.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void initializeEditingDomain() {

+		// Create an adapter factory that yields item providers.

+		//

+		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);

+

+		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());

+		adapterFactory.addAdapterFactory(new FacadeItemProviderAdapterFactory());

+		adapterFactory.addAdapterFactory(new VirtualmetamodelItemProviderAdapterFactory());

+		adapterFactory.addAdapterFactory(new ExtensiondefinitionItemProviderAdapterFactory());

+		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());

+		adapterFactory.addAdapterFactory(new UMLItemProviderAdapterFactory());

+		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());

+

+		// Create the command stack that will notify this editor as commands are executed.

+		//

+		BasicCommandStack commandStack = new BasicCommandStack();

+

+		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.

+		//

+		commandStack.addCommandStackListener

+			(new CommandStackListener() {

+				 public void commandStackChanged(final EventObject event) {

+					 getContainer().getDisplay().asyncExec

+						 (new Runnable() {

+							  public void run() {

+								  firePropertyChange(IEditorPart.PROP_DIRTY);

+

+								  // Try to select the affected objects.

+								  //

+								  Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();

+								  if (mostRecentCommand != null) {

+									  setSelectionToViewer(mostRecentCommand.getAffectedObjects());

+								  }

+								  for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext(); ) {

+									  PropertySheetPage propertySheetPage = i.next();

+									  if (propertySheetPage.getControl().isDisposed()) {

+										  i.remove();

+									  }

+									  else {

+										  propertySheetPage.refresh();

+									  }

+								  }

+							  }

+						  });

+				 }

+			 });

+

+		// Create the editing domain with a special command stack.

+		//

+		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());

+	}

+

+	/**

+	 * This is here for the listener to be able to call it.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+			@Override

+	protected void firePropertyChange(int action) {

+		super.firePropertyChange(action);

+	}

+

+	/**

+	 * This sets the selection into whichever viewer is active.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setSelectionToViewer(Collection<?> collection) {

+		final Collection<?> theSelection = collection;

+		// Make sure it's okay.

+		//

+		if (theSelection != null && !theSelection.isEmpty()) {

+			Runnable runnable =

+				new Runnable() {

+					public void run() {

+						// Try to select the items in the current content viewer of the editor.

+						//

+						if (currentViewer != null) {

+							currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);

+						}

+					}

+				};

+			getSite().getShell().getDisplay().asyncExec(runnable);

+		}

+	}

+

+	/**

+	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.

+	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain}

+	 * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EditingDomain getEditingDomain() {

+		return editingDomain;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {

+			super(adapterFactory);

+		}

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		@Override

+		public Object [] getElements(Object object) {

+			Object parent = super.getParent(object);

+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

+		}

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		@Override

+		public Object [] getChildren(Object object) {

+			Object parent = super.getParent(object);

+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

+		}

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		@Override

+		public boolean hasChildren(Object object) {

+			Object parent = super.getParent(object);

+			return parent != null;

+		}

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		@Override

+		public Object getParent(Object object) {

+			return null;

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setCurrentViewerPane(ViewerPane viewerPane) {

+		if (currentViewerPane != viewerPane) {

+			if (currentViewerPane != null) {

+				currentViewerPane.showFocus(false);

+			}

+			currentViewerPane = viewerPane;

+		}

+		setCurrentViewer(currentViewerPane.getViewer());

+	}

+

+	/**

+	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,

+	 * is the current one.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setCurrentViewer(Viewer viewer) {

+		// If it is changing...

+		//

+		if (currentViewer != viewer) {

+			if (selectionChangedListener == null) {

+				// Create the listener on demand.

+				//

+				selectionChangedListener =

+					new ISelectionChangedListener() {

+						// This just notifies those things that are affected by the section.

+						//

+						public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {

+							setSelection(selectionChangedEvent.getSelection());

+						}

+					};

+			}

+

+			// Stop listening to the old one.

+			//

+			if (currentViewer != null) {

+				currentViewer.removeSelectionChangedListener(selectionChangedListener);

+			}

+

+			// Start listening to the new one.

+			//

+			if (viewer != null) {

+				viewer.addSelectionChangedListener(selectionChangedListener);

+			}

+

+			// Remember it.

+			//

+			currentViewer = viewer;

+

+			// Set the editors selection based on the current viewer's selection.

+			//

+			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());

+		}

+	}

+

+	/**

+	 * This returns the viewer as required by the {@link IViewerProvider} interface.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public Viewer getViewer() {

+		return currentViewer;

+	}

+

+	/**

+	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void createContextMenuFor(StructuredViewer viewer) {

+		MenuManager contextMenu = new MenuManager("#PopUp");

+		contextMenu.add(new Separator("additions"));

+		contextMenu.setRemoveAllWhenShown(true);

+		contextMenu.addMenuListener(this);

+		Menu menu= contextMenu.createContextMenu(viewer.getControl());

+		viewer.getControl().setMenu(menu);

+		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));

+

+		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;

+		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };

+		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));

+		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));

+	}

+

+	/**

+	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void createModel() {

+		URI resourceURI = EditUIUtil.getURI(getEditorInput());

+		Exception exception = null;

+		Resource resource = null;

+		try {

+			// Load the resource through the editing domain.

+			//

+			resource = editingDomain.getResourceSet().getResource(resourceURI, true);

+		}

+		catch (Exception e) {

+			exception = e;

+			resource = editingDomain.getResourceSet().getResource(resourceURI, false);

+		}

+

+		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);

+		if (diagnostic.getSeverity() != Diagnostic.OK) {

+			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));

+		}

+		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);

+	}

+

+	/**

+	 * Returns a diagnostic describing the errors and warnings listed in the resource

+	 * and the specified exception (if any).

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {

+		if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {

+			BasicDiagnostic basicDiagnostic =

+				new BasicDiagnostic

+					(Diagnostic.ERROR,

+					 "org.eclipse.papyrus.facade.editor",

+					 0,

+					 getString("_UI_CreateModelError_message", resource.getURI()),

+					 new Object [] { exception == null ? (Object)resource : exception });

+			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));

+			return basicDiagnostic;

+		}

+		else if (exception != null) {

+			return

+				new BasicDiagnostic

+					(Diagnostic.ERROR,

+					 "org.eclipse.papyrus.facade.editor",

+					 0,

+					 getString("_UI_CreateModelError_message", resource.getURI()),

+					 new Object[] { exception });

+		}

+		else {

+			return Diagnostic.OK_INSTANCE;

+		}

+	}

+

+	/**

+	 * This is the method used by the framework to install your own controls.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void createPages() {

+		// Creates the model from the editor input

+		//

+		createModel();

+

+		// Only creates the other pages if there is something that can be edited

+		//

+		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {

+			// Create a page for the selection tree view.

+			//

+			{

+				ViewerPane viewerPane =

+					new ViewerPane(getSite().getPage(), FacadeEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							Tree tree = new Tree(composite, SWT.MULTI);

+							TreeViewer newTreeViewer = new TreeViewer(tree);

+							return newTreeViewer;

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

+				viewerPane.createControl(getContainer());

+

+				selectionViewer = (TreeViewer)viewerPane.getViewer();

+				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

+

+				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

+				selectionViewer.setInput(editingDomain.getResourceSet());

+				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

+				viewerPane.setTitle(editingDomain.getResourceSet());

+

+				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);

+

+				createContextMenuFor(selectionViewer);

+				int pageIndex = addPage(viewerPane.getControl());

+				setPageText(pageIndex, getString("_UI_SelectionPage_label"));

+			}

+

+			// Create a page for the parent tree view.

+			//

+			{

+				ViewerPane viewerPane =

+					new ViewerPane(getSite().getPage(), FacadeEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							Tree tree = new Tree(composite, SWT.MULTI);

+							TreeViewer newTreeViewer = new TreeViewer(tree);

+							return newTreeViewer;

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

+				viewerPane.createControl(getContainer());

+

+				parentViewer = (TreeViewer)viewerPane.getViewer();

+				parentViewer.setAutoExpandLevel(30);

+				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));

+				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

+

+				createContextMenuFor(parentViewer);

+				int pageIndex = addPage(viewerPane.getControl());

+				setPageText(pageIndex, getString("_UI_ParentPage_label"));

+			}

+

+			// This is the page for the list viewer

+			//

+			{

+				ViewerPane viewerPane =

+					new ViewerPane(getSite().getPage(), FacadeEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new ListViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

+				viewerPane.createControl(getContainer());

+				listViewer = (ListViewer)viewerPane.getViewer();

+				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

+				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

+

+				createContextMenuFor(listViewer);

+				int pageIndex = addPage(viewerPane.getControl());

+				setPageText(pageIndex, getString("_UI_ListPage_label"));

+			}

+

+			// This is the page for the tree viewer

+			//

+			{

+				ViewerPane viewerPane =

+					new ViewerPane(getSite().getPage(), FacadeEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new TreeViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

+				viewerPane.createControl(getContainer());

+				treeViewer = (TreeViewer)viewerPane.getViewer();

+				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

+				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

+

+				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);

+

+				createContextMenuFor(treeViewer);

+				int pageIndex = addPage(viewerPane.getControl());

+				setPageText(pageIndex, getString("_UI_TreePage_label"));

+			}

+

+			// This is the page for the table viewer.

+			//

+			{

+				ViewerPane viewerPane =

+					new ViewerPane(getSite().getPage(), FacadeEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new TableViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

+				viewerPane.createControl(getContainer());

+				tableViewer = (TableViewer)viewerPane.getViewer();

+

+				Table table = tableViewer.getTable();

+				TableLayout layout = new TableLayout();

+				table.setLayout(layout);

+				table.setHeaderVisible(true);

+				table.setLinesVisible(true);

+

+				TableColumn objectColumn = new TableColumn(table, SWT.NONE);

+				layout.addColumnData(new ColumnWeightData(3, 100, true));

+				objectColumn.setText(getString("_UI_ObjectColumn_label"));

+				objectColumn.setResizable(true);

+

+				TableColumn selfColumn = new TableColumn(table, SWT.NONE);

+				layout.addColumnData(new ColumnWeightData(2, 100, true));

+				selfColumn.setText(getString("_UI_SelfColumn_label"));

+				selfColumn.setResizable(true);

+

+				tableViewer.setColumnProperties(new String [] {"a", "b"});

+				tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

+				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

+

+				createContextMenuFor(tableViewer);

+				int pageIndex = addPage(viewerPane.getControl());

+				setPageText(pageIndex, getString("_UI_TablePage_label"));

+			}

+

+			// This is the page for the table tree viewer.

+			//

+			{

+				ViewerPane viewerPane =

+					new ViewerPane(getSite().getPage(), FacadeEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new TreeViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

+				viewerPane.createControl(getContainer());

+

+				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();

+

+				Tree tree = treeViewerWithColumns.getTree();

+				tree.setLayoutData(new FillLayout());

+				tree.setHeaderVisible(true);

+				tree.setLinesVisible(true);

+

+				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);

+				objectColumn.setText(getString("_UI_ObjectColumn_label"));

+				objectColumn.setResizable(true);

+				objectColumn.setWidth(250);

+

+				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);

+				selfColumn.setText(getString("_UI_SelfColumn_label"));

+				selfColumn.setResizable(true);

+				selfColumn.setWidth(200);

+

+				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"});

+				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

+				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

+

+				createContextMenuFor(treeViewerWithColumns);

+				int pageIndex = addPage(viewerPane.getControl());

+				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label"));

+			}

+

+			getSite().getShell().getDisplay().asyncExec

+				(new Runnable() {

+					 public void run() {

+						 setActivePage(0);

+					 }

+				 });

+		}

+

+		// Ensures that this editor will only display the page's tab

+		// area if there are more than one page

+		//

+		getContainer().addControlListener

+			(new ControlAdapter() {

+				boolean guard = false;

+				@Override

+				public void controlResized(ControlEvent event) {

+					if (!guard) {

+						guard = true;

+						hideTabs();

+						guard = false;

+					}

+				}

+			 });

+

+		getSite().getShell().getDisplay().asyncExec

+			(new Runnable() {

+				 public void run() {

+					 updateProblemIndication();

+				 }

+			 });

+	}

+

+	/**

+	 * If there is just one page in the multi-page editor part,

+	 * this hides the single tab at the bottom.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void hideTabs() {

+		if (getPageCount() <= 1) {

+			setPageText(0, "");

+			if (getContainer() instanceof CTabFolder) {

+				((CTabFolder)getContainer()).setTabHeight(1);

+				Point point = getContainer().getSize();

+				getContainer().setSize(point.x, point.y + 6);

+			}

+		}

+	}

+

+	/**

+	 * If there is more than one page in the multi-page editor part,

+	 * this shows the tabs at the bottom.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void showTabs() {

+		if (getPageCount() > 1) {

+			setPageText(0, getString("_UI_SelectionPage_label"));

+			if (getContainer() instanceof CTabFolder) {

+				((CTabFolder)getContainer()).setTabHeight(SWT.DEFAULT);

+				Point point = getContainer().getSize();

+				getContainer().setSize(point.x, point.y - 6);

+			}

+		}

+	}

+

+	/**

+	 * This is used to track the active viewer.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected void pageChange(int pageIndex) {

+		super.pageChange(pageIndex);

+

+		if (contentOutlinePage != null) {

+			handleContentOutlineSelection(contentOutlinePage.getSelection());

+		}

+	}

+

+	/**

+	 * This is how the framework determines which interfaces we implement.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	@Override

+	public Object getAdapter(Class key) {

+		if (key.equals(IContentOutlinePage.class)) {

+			return showOutlineView() ? getContentOutlinePage() : null;

+		}

+		else if (key.equals(IPropertySheetPage.class)) {

+			return getPropertySheetPage();

+		}

+		else if (key.equals(IGotoMarker.class)) {

+			return this;

+		}

+		else {

+			return super.getAdapter(key);

+		}

+	}

+

+	/**

+	 * This accesses a cached version of the content outliner.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public IContentOutlinePage getContentOutlinePage() {

+		if (contentOutlinePage == null) {

+			// The content outline is just a tree.

+			//

+			class MyContentOutlinePage extends ContentOutlinePage {

+				@Override

+				public void createControl(Composite parent) {

+					super.createControl(parent);

+					contentOutlineViewer = getTreeViewer();

+					contentOutlineViewer.addSelectionChangedListener(this);

+

+					// Set up the tree viewer.

+					//

+					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

+					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

+					contentOutlineViewer.setInput(editingDomain.getResourceSet());

+

+					// Make sure our popups work.

+					//

+					createContextMenuFor(contentOutlineViewer);

+

+					if (!editingDomain.getResourceSet().getResources().isEmpty()) {

+					  // Select the root object in the view.

+					  //

+					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

+					}

+				}

+

+				@Override

+				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {

+					super.makeContributions(menuManager, toolBarManager, statusLineManager);

+					contentOutlineStatusLineManager = statusLineManager;

+				}

+

+				@Override

+				public void setActionBars(IActionBars actionBars) {

+					super.setActionBars(actionBars);

+					getActionBarContributor().shareGlobalActions(this, actionBars);

+				}

+			}

+

+			contentOutlinePage = new MyContentOutlinePage();

+

+			// Listen to selection so that we can handle it is a special way.

+			//

+			contentOutlinePage.addSelectionChangedListener

+				(new ISelectionChangedListener() {

+					 // This ensures that we handle selections correctly.

+					 //

+					 public void selectionChanged(SelectionChangedEvent event) {

+						 handleContentOutlineSelection(event.getSelection());

+					 }

+				 });

+		}

+

+		return contentOutlinePage;

+	}

+

+	/**

+	 * This accesses a cached version of the property sheet.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public IPropertySheetPage getPropertySheetPage() {

+		PropertySheetPage propertySheetPage =

+			new ExtendedPropertySheetPage(editingDomain) {

+				@Override

+				public void setSelectionToViewer(List<?> selection) {

+					FacadeEditor.this.setSelectionToViewer(selection);

+					FacadeEditor.this.setFocus();

+				}

+

+				@Override

+				public void setActionBars(IActionBars actionBars) {

+					super.setActionBars(actionBars);

+					getActionBarContributor().shareGlobalActions(this, actionBars);

+				}

+			};

+		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));

+		propertySheetPages.add(propertySheetPage);

+

+		return propertySheetPage;

+	}

+

+	/**

+	 * This deals with how we want selection in the outliner to affect the other views.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void handleContentOutlineSelection(ISelection selection) {

+		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {

+			Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();

+			if (selectedElements.hasNext()) {

+				// Get the first selected element.

+				//

+				Object selectedElement = selectedElements.next();

+

+				// If it's the selection viewer, then we want it to select the same selection as this selection.

+				//

+				if (currentViewerPane.getViewer() == selectionViewer) {

+					ArrayList<Object> selectionList = new ArrayList<Object>();

+					selectionList.add(selectedElement);

+					while (selectedElements.hasNext()) {

+						selectionList.add(selectedElements.next());

+					}

+

+					// Set the selection to the widget.

+					//

+					selectionViewer.setSelection(new StructuredSelection(selectionList));

+				}

+				else {

+					// Set the input to the widget.

+					//

+					if (currentViewerPane.getViewer().getInput() != selectedElement) {

+						currentViewerPane.getViewer().setInput(selectedElement);

+						currentViewerPane.setTitle(selectedElement);

+					}

+				}

+			}

+		}

+	}

+

+	/**

+	 * This is for implementing {@link IEditorPart} and simply tests the command stack.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean isDirty() {

+		return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded();

+	}

+

+	/**

+	 * This is for implementing {@link IEditorPart} and simply saves the model file.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void doSave(IProgressMonitor progressMonitor) {

+		// Save only resources that have actually changed.

+		//

+		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

+		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

+

+		// Do the work within an operation because this is a long running activity that modifies the workbench.

+		//

+		WorkspaceModifyOperation operation =

+			new WorkspaceModifyOperation() {

+				// This is the method that gets invoked when the operation runs.

+				//

+				@Override

+				public void execute(IProgressMonitor monitor) {

+					// Save the resources to the file system.

+					//

+					boolean first = true;

+					for (Resource resource : editingDomain.getResourceSet().getResources()) {

+						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

+							try {

+								long timeStamp = resource.getTimeStamp();

+								resource.save(saveOptions);

+								if (resource.getTimeStamp() != timeStamp) {

+									savedResources.add(resource);

+								}

+							}

+							catch (Exception exception) {

+								resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

+							}

+							first = false;

+						}

+					}

+				}

+			};

+

+		updateProblemIndication = false;

+		try {

+			// This runs the options, and shows progress.

+			//

+			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

+

+			// Refresh the necessary state.

+			//

+			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();

+			firePropertyChange(IEditorPart.PROP_DIRTY);

+		}

+		catch (Exception exception) {

+			// Something went wrong that shouldn't.

+			//

+			FacadeEditorPlugin.INSTANCE.log(exception);

+		}

+		updateProblemIndication = true;

+		updateProblemIndication();

+	}

+

+	/**

+	 * This returns whether something has been persisted to the URI of the specified resource.

+	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected boolean isPersisted(Resource resource) {

+		boolean result = false;

+		try {

+			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());

+			if (stream != null) {

+				result = true;

+				stream.close();

+			}

+		}

+		catch (IOException e) {

+			// Ignore

+		}

+		return result;

+	}

+

+	/**

+	 * This always returns true because it is not currently supported.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean isSaveAsAllowed() {

+		return true;

+	}

+

+	/**

+	 * This also changes the editor's input.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void doSaveAs() {

+		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());

+		saveAsDialog.open();

+		IPath path = saveAsDialog.getResult();

+		if (path != null) {

+			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);

+			if (file != null) {

+				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));

+			}

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void doSaveAs(URI uri, IEditorInput editorInput) {

+		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);

+		setInputWithNotify(editorInput);

+		setPartName(editorInput.getName());

+		IProgressMonitor progressMonitor =

+			getActionBars().getStatusLineManager() != null ?

+				getActionBars().getStatusLineManager().getProgressMonitor() :

+				new NullProgressMonitor();

+		doSave(progressMonitor);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void gotoMarker(IMarker marker) {

+		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);

+		if (!targetObjects.isEmpty()) {

+			setSelectionToViewer(targetObjects);

+		}

+	}

+

+	/**

+	 * This is called during startup.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void init(IEditorSite site, IEditorInput editorInput) {

+		setSite(site);

+		setInputWithNotify(editorInput);

+		setPartName(editorInput.getName());

+		site.setSelectionProvider(this);

+		site.getPage().addPartListener(partListener);

+		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void setFocus() {

+		if (currentViewerPane != null) {

+			currentViewerPane.setFocus();

+		}

+		else {

+			getControl(getActivePage()).setFocus();

+		}

+	}

+

+	/**

+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void addSelectionChangedListener(ISelectionChangedListener listener) {

+		selectionChangedListeners.add(listener);

+	}

+

+	/**

+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void removeSelectionChangedListener(ISelectionChangedListener listener) {

+		selectionChangedListeners.remove(listener);

+	}

+

+	/**

+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public ISelection getSelection() {

+		return editorSelection;

+	}

+

+	/**

+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.

+	 * Calling this result will notify the listeners.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setSelection(ISelection selection) {

+		editorSelection = selection;

+

+		for (ISelectionChangedListener listener : selectionChangedListeners) {

+			listener.selectionChanged(new SelectionChangedEvent(this, selection));

+		}

+		setStatusLineManager(selection);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setStatusLineManager(ISelection selection) {

+		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?

+			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

+

+		if (statusLineManager != null) {

+			if (selection instanceof IStructuredSelection) {

+				Collection<?> collection = ((IStructuredSelection)selection).toList();

+				switch (collection.size()) {

+					case 0: {

+						statusLineManager.setMessage(getString("_UI_NoObjectSelected"));

+						break;

+					}

+					case 1: {

+						String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());

+						statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text));

+						break;

+					}

+					default: {

+						statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size())));

+						break;

+					}

+				}

+			}

+			else {

+				statusLineManager.setMessage("");

+			}

+		}

+	}

+

+	/**

+	 * This looks up a string in the plugin's plugin.properties file.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private static String getString(String key) {

+		return FacadeEditorPlugin.INSTANCE.getString(key);

+	}

+

+	/**

+	 * This looks up a string in plugin.properties, making a substitution.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private static String getString(String key, Object s1) {

+		return FacadeEditorPlugin.INSTANCE.getString(key, new Object [] { s1 });

+	}

+

+	/**

+	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void menuAboutToShow(IMenuManager menuManager) {

+		((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EditingDomainActionBarContributor getActionBarContributor() {

+		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public IActionBars getActionBars() {

+		return getActionBarContributor().getActionBars();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public AdapterFactory getAdapterFactory() {

+		return adapterFactory;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void dispose() {

+		updateProblemIndication = false;

+

+		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);

+

+		getSite().getPage().removePartListener(partListener);

+

+		adapterFactory.dispose();

+

+		if (getActionBarContributor().getActiveEditor() == this) {

+			getActionBarContributor().setActiveEditor(null);

+		}

+

+		for (PropertySheetPage propertySheetPage : propertySheetPages) {

+			propertySheetPage.dispose();

+		}

+

+		if (contentOutlinePage != null) {

+			contentOutlinePage.dispose();

+		}

+

+		super.dispose();

+	}

+

+	/**

+	 * Returns whether the outline view should be presented to the user.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected boolean showOutlineView() {

+		return true;

+	}

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/presentation/FacadeEditorPlugin.java b/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/presentation/FacadeEditorPlugin.java
new file mode 100644
index 00000000000..832d46959a4
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/presentation/FacadeEditorPlugin.java
@@ -0,0 +1,108 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.presentation;

+

+import org.eclipse.emf.common.EMFPlugin;

+

+import org.eclipse.emf.common.ui.EclipseUIPlugin;

+

+import org.eclipse.emf.common.util.ResourceLocator;

+

+import org.eclipse.emf.ecore.provider.EcoreEditPlugin;

+

+import org.eclipse.uml2.uml.edit.UMLEditPlugin;

+

+/**

+ * This is the central singleton for the Facade editor plugin.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public final class FacadeEditorPlugin extends EMFPlugin {

+	/**

+	 * Keep track of the singleton.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static final FacadeEditorPlugin INSTANCE = new FacadeEditorPlugin();

+	

+	/**

+	 * Keep track of the singleton.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private static Implementation plugin;

+

+	/**

+	 * Create the instance.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public FacadeEditorPlugin() {

+		super

+			(new ResourceLocator [] {

+				EcoreEditPlugin.INSTANCE,

+				UMLEditPlugin.INSTANCE,

+			});

+	}

+

+	/**

+	 * Returns the singleton instance of the Eclipse plugin.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the singleton instance.

+	 * @generated

+	 */

+	@Override

+	public ResourceLocator getPluginResourceLocator() {

+		return plugin;

+	}

+	

+	/**

+	 * Returns the singleton instance of the Eclipse plugin.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the singleton instance.

+	 * @generated

+	 */

+	public static Implementation getPlugin() {

+		return plugin;

+	}

+	

+	/**

+	 * The actual implementation of the Eclipse <b>Plugin</b>.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static class Implementation extends EclipseUIPlugin {

+		/**

+		 * Creates an instance.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public Implementation() {

+			super();

+	

+			// Remember the static instance.

+			//

+			plugin = this;

+		}

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/presentation/FacadeModelWizard.java b/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/presentation/FacadeModelWizard.java
new file mode 100644
index 00000000000..43356721e73
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/presentation/FacadeModelWizard.java
@@ -0,0 +1,638 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.presentation;

+

+

+import java.util.ArrayList;

+import java.util.Arrays;

+import java.util.Collection;

+import java.util.Collections;

+import java.util.HashMap;

+import java.util.List;

+import java.util.Map;

+import java.util.MissingResourceException;

+import java.util.StringTokenizer;

+

+import org.eclipse.emf.common.CommonPlugin;

+

+import org.eclipse.emf.common.util.URI;

+

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EClassifier;

+

+import org.eclipse.emf.ecore.resource.Resource;

+import org.eclipse.emf.ecore.resource.ResourceSet;

+

+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

+

+import org.eclipse.emf.ecore.EObject;

+

+import org.eclipse.emf.ecore.xmi.XMLResource;

+

+import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;

+

+import org.eclipse.core.resources.IContainer;

+import org.eclipse.core.resources.IFile;

+import org.eclipse.core.resources.IFolder;

+import org.eclipse.core.resources.IProject;

+import org.eclipse.core.resources.IResource;

+import org.eclipse.core.resources.ResourcesPlugin;

+

+import org.eclipse.core.runtime.IProgressMonitor;

+

+import org.eclipse.jface.dialogs.MessageDialog;

+

+import org.eclipse.jface.viewers.IStructuredSelection;

+

+import org.eclipse.jface.wizard.Wizard;

+import org.eclipse.jface.wizard.WizardPage;

+

+import org.eclipse.swt.SWT;

+

+import org.eclipse.swt.events.ModifyListener;

+import org.eclipse.swt.events.ModifyEvent;

+

+import org.eclipse.swt.layout.GridData;

+import org.eclipse.swt.layout.GridLayout;

+

+import org.eclipse.swt.widgets.Combo;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.swt.widgets.Label;

+

+import org.eclipse.ui.INewWizard;

+import org.eclipse.ui.IWorkbench;

+

+import org.eclipse.ui.actions.WorkspaceModifyOperation;

+

+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

+

+import org.eclipse.ui.part.FileEditorInput;

+import org.eclipse.ui.part.ISetSelectionTarget;

+

+import org.eclipse.papyrus.facade.FacadeFactory;

+import org.eclipse.papyrus.facade.FacadePackage;

+import org.eclipse.papyrus.facade.provider.FacadeEditPlugin;

+

+

+import org.eclipse.core.runtime.Path;

+

+import org.eclipse.jface.viewers.ISelection;

+import org.eclipse.jface.viewers.StructuredSelection;

+

+import org.eclipse.ui.IWorkbenchPage;

+import org.eclipse.ui.IWorkbenchPart;

+import org.eclipse.ui.IWorkbenchWindow;

+import org.eclipse.ui.PartInitException;

+

+

+/**

+ * This is a simple wizard for creating a new model file.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class FacadeModelWizard extends Wizard implements INewWizard {

+	/**

+	 * The supported extensions for created files.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static final List<String> FILE_EXTENSIONS =

+		Collections.unmodifiableList(Arrays.asList(FacadeEditorPlugin.INSTANCE.getString("_UI_FacadeEditorFilenameExtensions").split("\\s*,\\s*")));

+

+	/**

+	 * A formatted list of supported file extensions, suitable for display.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static final String FORMATTED_FILE_EXTENSIONS =

+		FacadeEditorPlugin.INSTANCE.getString("_UI_FacadeEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");

+

+	/**

+	 * This caches an instance of the model package.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected FacadePackage facadePackage = FacadePackage.eINSTANCE;

+

+	/**

+	 * This caches an instance of the model factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected FacadeFactory facadeFactory = facadePackage.getFacadeFactory();

+

+	/**

+	 * This is the file creation page.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected FacadeModelWizardNewFileCreationPage newFileCreationPage;

+

+	/**

+	 * This is the initial object creation page.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected FacadeModelWizardInitialObjectCreationPage initialObjectCreationPage;

+

+	/**

+	 * Remember the selection during initialization for populating the default container.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected IStructuredSelection selection;

+

+	/**

+	 * Remember the workbench during initialization.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected IWorkbench workbench;

+

+	/**

+	 * Caches the names of the types that can be created as the root object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected List<String> initialObjectNames;

+

+	/**

+	 * This just records the information.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void init(IWorkbench workbench, IStructuredSelection selection) {

+		this.workbench = workbench;

+		this.selection = selection;

+		setWindowTitle(FacadeEditorPlugin.INSTANCE.getString("_UI_Wizard_label"));

+		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(FacadeEditorPlugin.INSTANCE.getImage("full/wizban/NewFacade")));

+	}

+

+	/**

+	 * Returns the names of the types that can be created as the root object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected Collection<String> getInitialObjectNames() {

+		if (initialObjectNames == null) {

+			initialObjectNames = new ArrayList<String>();

+			for (EClassifier eClassifier : facadePackage.getEClassifiers()) {

+				if (eClassifier instanceof EClass) {

+					EClass eClass = (EClass)eClassifier;

+					if (!eClass.isAbstract()) {

+						initialObjectNames.add(eClass.getName());

+					}

+				}

+			}

+			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());

+		}

+		return initialObjectNames;

+	}

+

+	/**

+	 * Create a new model.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EObject createInitialModel() {

+		EClass eClass = (EClass)facadePackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

+		EObject rootObject = facadeFactory.create(eClass);

+		return rootObject;

+	}

+

+	/**

+	 * Do the work after everything is specified.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean performFinish() {

+		try {

+			// Remember the file.

+			//

+			final IFile modelFile = getModelFile();

+

+			// Do the work within an operation.

+			//

+			WorkspaceModifyOperation operation =

+				new WorkspaceModifyOperation() {

+					@Override

+					protected void execute(IProgressMonitor progressMonitor) {

+						try {

+							// Create a resource set

+							//

+							ResourceSet resourceSet = new ResourceSetImpl();

+

+							// Get the URI of the model file.

+							//

+							URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);

+

+							// Create a resource for this file.

+							//

+							Resource resource = resourceSet.createResource(fileURI);

+

+							// Add the initial model object to the contents.

+							//

+							EObject rootObject = createInitialModel();

+							if (rootObject != null) {

+								resource.getContents().add(rootObject);

+							}

+

+							// Save the contents of the resource to the file system.

+							//

+							Map<Object, Object> options = new HashMap<Object, Object>();

+							options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());

+							resource.save(options);

+						}

+						catch (Exception exception) {

+							FacadeEditorPlugin.INSTANCE.log(exception);

+						}

+						finally {

+							progressMonitor.done();

+						}

+					}

+				};

+

+			getContainer().run(false, false, operation);

+

+			// Select the new file resource in the current view.

+			//

+			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();

+			IWorkbenchPage page = workbenchWindow.getActivePage();

+			final IWorkbenchPart activePart = page.getActivePart();

+			if (activePart instanceof ISetSelectionTarget) {

+				final ISelection targetSelection = new StructuredSelection(modelFile);

+				getShell().getDisplay().asyncExec

+					(new Runnable() {

+						 public void run() {

+							 ((ISetSelectionTarget)activePart).selectReveal(targetSelection);

+						 }

+					 });

+			}

+

+			// Open an editor on the new file.

+			//

+			try {

+				page.openEditor

+					(new FileEditorInput(modelFile),

+					 workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());					 	 

+			}

+			catch (PartInitException exception) {

+				MessageDialog.openError(workbenchWindow.getShell(), FacadeEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());

+				return false;

+			}

+

+			return true;

+		}

+		catch (Exception exception) {

+			FacadeEditorPlugin.INSTANCE.log(exception);

+			return false;

+		}

+	}

+

+	/**

+	 * This is the one page of the wizard.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public class FacadeModelWizardNewFileCreationPage extends WizardNewFileCreationPage {

+		/**

+		 * Pass in the selection.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public FacadeModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {

+			super(pageId, selection);

+		}

+

+		/**

+		 * The framework calls this to see if the file is correct.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		@Override

+		protected boolean validatePage() {

+			if (super.validatePage()) {

+				String extension = new Path(getFileName()).getFileExtension();

+				if (extension == null || !FILE_EXTENSIONS.contains(extension)) {

+					String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension";

+					setErrorMessage(FacadeEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));

+					return false;

+				}

+				return true;

+			}

+			return false;

+		}

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public IFile getModelFile() {

+			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));

+		}

+	}

+

+	/**

+	 * This is the page where the type of object to create is selected.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public class FacadeModelWizardInitialObjectCreationPage extends WizardPage {

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		protected Combo initialObjectField;

+

+		/**

+		 * @generated

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 */

+		protected List<String> encodings;

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		protected Combo encodingField;

+

+		/**

+		 * Pass in the selection.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public FacadeModelWizardInitialObjectCreationPage(String pageId) {

+			super(pageId);

+		}

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public void createControl(Composite parent) {

+			Composite composite = new Composite(parent, SWT.NONE); {

+				GridLayout layout = new GridLayout();

+				layout.numColumns = 1;

+				layout.verticalSpacing = 12;

+				composite.setLayout(layout);

+

+				GridData data = new GridData();

+				data.verticalAlignment = GridData.FILL;

+				data.grabExcessVerticalSpace = true;

+				data.horizontalAlignment = GridData.FILL;

+				composite.setLayoutData(data);

+			}

+

+			Label containerLabel = new Label(composite, SWT.LEFT);

+			{

+				containerLabel.setText(FacadeEditorPlugin.INSTANCE.getString("_UI_ModelObject"));

+

+				GridData data = new GridData();

+				data.horizontalAlignment = GridData.FILL;

+				containerLabel.setLayoutData(data);

+			}

+

+			initialObjectField = new Combo(composite, SWT.BORDER);

+			{

+				GridData data = new GridData();

+				data.horizontalAlignment = GridData.FILL;

+				data.grabExcessHorizontalSpace = true;

+				initialObjectField.setLayoutData(data);

+			}

+

+			for (String objectName : getInitialObjectNames()) {

+				initialObjectField.add(getLabel(objectName));

+			}

+

+			if (initialObjectField.getItemCount() == 1) {

+				initialObjectField.select(0);

+			}

+			initialObjectField.addModifyListener(validator);

+

+			Label encodingLabel = new Label(composite, SWT.LEFT);

+			{

+				encodingLabel.setText(FacadeEditorPlugin.INSTANCE.getString("_UI_XMLEncoding"));

+

+				GridData data = new GridData();

+				data.horizontalAlignment = GridData.FILL;

+				encodingLabel.setLayoutData(data);

+			}

+			encodingField = new Combo(composite, SWT.BORDER);

+			{

+				GridData data = new GridData();

+				data.horizontalAlignment = GridData.FILL;

+				data.grabExcessHorizontalSpace = true;

+				encodingField.setLayoutData(data);

+			}

+

+			for (String encoding : getEncodings()) {

+				encodingField.add(encoding);

+			}

+

+			encodingField.select(0);

+			encodingField.addModifyListener(validator);

+

+			setPageComplete(validatePage());

+			setControl(composite);

+		}

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		protected ModifyListener validator =

+			new ModifyListener() {

+				public void modifyText(ModifyEvent e) {

+					setPageComplete(validatePage());

+				}

+			};

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		protected boolean validatePage() {

+			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());

+		}

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		@Override

+		public void setVisible(boolean visible) {

+			super.setVisible(visible);

+			if (visible) {

+				if (initialObjectField.getItemCount() == 1) {

+					initialObjectField.clearSelection();

+					encodingField.setFocus();

+				}

+				else {

+					encodingField.clearSelection();

+					initialObjectField.setFocus();

+				}

+			}

+		}

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public String getInitialObjectName() {

+			String label = initialObjectField.getText();

+

+			for (String name : getInitialObjectNames()) {

+				if (getLabel(name).equals(label)) {

+					return name;

+				}

+			}

+			return null;

+		}

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public String getEncoding() {

+			return encodingField.getText();

+		}

+

+		/**

+		 * Returns the label for the specified type name.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		protected String getLabel(String typeName) {

+			try {

+				return FacadeEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type");

+			}

+			catch(MissingResourceException mre) {

+				FacadeEditorPlugin.INSTANCE.log(mre);

+			}

+			return typeName;

+		}

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		protected Collection<String> getEncodings() {

+			if (encodings == null) {

+				encodings = new ArrayList<String>();

+				for (StringTokenizer stringTokenizer = new StringTokenizer(FacadeEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) {

+					encodings.add(stringTokenizer.nextToken());

+				}

+			}

+			return encodings;

+		}

+	}

+

+	/**

+	 * The framework calls this to create the contents of the wizard.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+		@Override

+	public void addPages() {

+		// Create a page, set the title, and the initial model file name.

+		//

+		newFileCreationPage = new FacadeModelWizardNewFileCreationPage("Whatever", selection);

+		newFileCreationPage.setTitle(FacadeEditorPlugin.INSTANCE.getString("_UI_FacadeModelWizard_label"));

+		newFileCreationPage.setDescription(FacadeEditorPlugin.INSTANCE.getString("_UI_FacadeModelWizard_description"));

+		newFileCreationPage.setFileName(FacadeEditorPlugin.INSTANCE.getString("_UI_FacadeEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0));

+		addPage(newFileCreationPage);

+

+		// Try and get the resource selection to determine a current directory for the file dialog.

+		//

+		if (selection != null && !selection.isEmpty()) {

+			// Get the resource...

+			//

+			Object selectedElement = selection.iterator().next();

+			if (selectedElement instanceof IResource) {

+				// Get the resource parent, if its a file.

+				//

+				IResource selectedResource = (IResource)selectedElement;

+				if (selectedResource.getType() == IResource.FILE) {

+					selectedResource = selectedResource.getParent();

+				}

+

+				// This gives us a directory...

+				//

+				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {

+					// Set this for the container.

+					//

+					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());

+

+					// Make up a unique new name here.

+					//

+					String defaultModelBaseFilename = FacadeEditorPlugin.INSTANCE.getString("_UI_FacadeEditorFilenameDefaultBase");

+					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);

+					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension;

+					for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {

+						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension;

+					}

+					newFileCreationPage.setFileName(modelFilename);

+				}

+			}

+		}

+		initialObjectCreationPage = new FacadeModelWizardInitialObjectCreationPage("Whatever2");

+		initialObjectCreationPage.setTitle(FacadeEditorPlugin.INSTANCE.getString("_UI_FacadeModelWizard_label"));

+		initialObjectCreationPage.setDescription(FacadeEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description"));

+		addPage(initialObjectCreationPage);

+	}

+

+	/**

+	 * Get the file from the page.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public IFile getModelFile() {

+		return newFileCreationPage.getModelFile();

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/virtualmetamodel/presentation/VirtualmetamodelActionBarContributor.java b/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/virtualmetamodel/presentation/VirtualmetamodelActionBarContributor.java
new file mode 100644
index 00000000000..9a0a2d5727f
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/virtualmetamodel/presentation/VirtualmetamodelActionBarContributor.java
@@ -0,0 +1,436 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.virtualmetamodel.presentation;

+

+import java.util.ArrayList;

+import java.util.Collection;

+

+import org.eclipse.emf.common.ui.viewer.IViewerProvider;

+

+import org.eclipse.emf.edit.domain.EditingDomain;

+import org.eclipse.emf.edit.domain.IEditingDomainProvider;

+

+import org.eclipse.emf.edit.ui.action.ControlAction;

+import org.eclipse.emf.edit.ui.action.CreateChildAction;

+import org.eclipse.emf.edit.ui.action.CreateSiblingAction;

+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

+import org.eclipse.emf.edit.ui.action.LoadResourceAction;

+import org.eclipse.emf.edit.ui.action.ValidateAction;

+

+import org.eclipse.jface.action.Action;

+import org.eclipse.jface.action.ActionContributionItem;

+import org.eclipse.jface.action.IAction;

+import org.eclipse.jface.action.IContributionItem;

+import org.eclipse.jface.action.IContributionManager;

+import org.eclipse.jface.action.IMenuListener;

+import org.eclipse.jface.action.IMenuManager;

+import org.eclipse.jface.action.IToolBarManager;

+import org.eclipse.jface.action.MenuManager;

+import org.eclipse.jface.action.Separator;

+import org.eclipse.jface.action.SubContributionItem;

+

+import org.eclipse.jface.viewers.ISelection;

+import org.eclipse.jface.viewers.ISelectionChangedListener;

+import org.eclipse.jface.viewers.ISelectionProvider;

+import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.jface.viewers.SelectionChangedEvent;

+import org.eclipse.jface.viewers.Viewer;

+

+import org.eclipse.papyrus.facade.presentation.FacadeEditorPlugin;

+

+import org.eclipse.ui.IEditorPart;

+import org.eclipse.ui.PartInitException;

+

+/**

+ * This is the action bar contributor for the Virtualmetamodel model editor.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class VirtualmetamodelActionBarContributor

+	extends EditingDomainActionBarContributor

+	implements ISelectionChangedListener {

+	/**

+	 * This keeps track of the active editor.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected IEditorPart activeEditorPart;

+

+	/**

+	 * This keeps track of the current selection provider.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected ISelectionProvider selectionProvider;

+

+	/**

+	 * This action opens the Properties view.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected IAction showPropertiesViewAction =

+		new Action(FacadeEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) {

+			@Override

+			public void run() {

+				try {

+					getPage().showView("org.eclipse.ui.views.PropertySheet");

+				}

+				catch (PartInitException exception) {

+					FacadeEditorPlugin.INSTANCE.log(exception);

+				}

+			}

+		};

+

+	/**

+	 * This action refreshes the viewer of the current editor if the editor

+	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected IAction refreshViewerAction =

+		new Action(FacadeEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) {

+			@Override

+			public boolean isEnabled() {

+				return activeEditorPart instanceof IViewerProvider;

+			}

+

+			@Override

+			public void run() {

+				if (activeEditorPart instanceof IViewerProvider) {

+					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();

+					if (viewer != null) {

+						viewer.refresh();

+					}

+				}

+			}

+		};

+

+	/**

+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor

+	 * generated for the current selection by the item provider.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected Collection<IAction> createChildActions;

+

+	/**

+	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected IMenuManager createChildMenuManager;

+

+	/**

+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor

+	 * generated for the current selection by the item provider.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected Collection<IAction> createSiblingActions;

+

+	/**

+	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected IMenuManager createSiblingMenuManager;

+

+	/**

+	 * This creates an instance of the contributor.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public VirtualmetamodelActionBarContributor() {

+		super(ADDITIONS_LAST_STYLE);

+		loadResourceAction = new LoadResourceAction();

+		validateAction = new ValidateAction();

+		controlAction = new ControlAction();

+	}

+

+	/**

+	 * This adds Separators for editor additions to the tool bar.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void contributeToToolBar(IToolBarManager toolBarManager) {

+		toolBarManager.add(new Separator("virtualmetamodel-settings"));

+		toolBarManager.add(new Separator("virtualmetamodel-additions"));

+	}

+

+	/**

+	 * This adds to the menu bar a menu and some separators for editor additions,

+	 * as well as the sub-menus for object creation items.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void contributeToMenu(IMenuManager menuManager) {

+		super.contributeToMenu(menuManager);

+

+		IMenuManager submenuManager = new MenuManager(FacadeEditorPlugin.INSTANCE.getString("_UI_VirtualmetamodelEditor_menu"), "org.eclipse.papyrus.facade.virtualmetamodelMenuID");

+		menuManager.insertAfter("additions", submenuManager);

+		submenuManager.add(new Separator("settings"));

+		submenuManager.add(new Separator("actions"));

+		submenuManager.add(new Separator("additions"));

+		submenuManager.add(new Separator("additions-end"));

+

+		// Prepare for CreateChild item addition or removal.

+		//

+		createChildMenuManager = new MenuManager(FacadeEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));

+		submenuManager.insertBefore("additions", createChildMenuManager);

+

+		// Prepare for CreateSibling item addition or removal.

+		//

+		createSiblingMenuManager = new MenuManager(FacadeEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));

+		submenuManager.insertBefore("additions", createSiblingMenuManager);

+

+		// Force an update because Eclipse hides empty menus now.

+		//

+		submenuManager.addMenuListener

+			(new IMenuListener() {

+				 public void menuAboutToShow(IMenuManager menuManager) {

+					 menuManager.updateAll(true);

+				 }

+			 });

+

+		addGlobalActions(submenuManager);

+	}

+

+	/**

+	 * When the active editor changes, this remembers the change and registers with it as a selection provider.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void setActiveEditor(IEditorPart part) {

+		super.setActiveEditor(part);

+		activeEditorPart = part;

+

+		// Switch to the new selection provider.

+		//

+		if (selectionProvider != null) {

+			selectionProvider.removeSelectionChangedListener(this);

+		}

+		if (part == null) {

+			selectionProvider = null;

+		}

+		else {

+			selectionProvider = part.getSite().getSelectionProvider();

+			selectionProvider.addSelectionChangedListener(this);

+

+			// Fake a selection changed event to update the menus.

+			//

+			if (selectionProvider.getSelection() != null) {

+				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));

+			}

+		}

+	}

+

+	/**

+	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},

+	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings

+	 * that can be added to the selected object and updating the menus accordingly.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void selectionChanged(SelectionChangedEvent event) {

+		// Remove any menu items for old selection.

+		//

+		if (createChildMenuManager != null) {

+			depopulateManager(createChildMenuManager, createChildActions);

+		}

+		if (createSiblingMenuManager != null) {

+			depopulateManager(createSiblingMenuManager, createSiblingActions);

+		}

+

+		// Query the new selection for appropriate new child/sibling descriptors

+		//

+		Collection<?> newChildDescriptors = null;

+		Collection<?> newSiblingDescriptors = null;

+

+		ISelection selection = event.getSelection();

+		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {

+			Object object = ((IStructuredSelection)selection).getFirstElement();

+

+			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();

+

+			newChildDescriptors = domain.getNewChildDescriptors(object, null);

+			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);

+		}

+

+		// Generate actions for selection; populate and redraw the menus.

+		//

+		createChildActions = generateCreateChildActions(newChildDescriptors, selection);

+		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);

+

+		if (createChildMenuManager != null) {

+			populateManager(createChildMenuManager, createChildActions, null);

+			createChildMenuManager.update(true);

+		}

+		if (createSiblingMenuManager != null) {

+			populateManager(createSiblingMenuManager, createSiblingActions, null);

+			createSiblingMenuManager.update(true);

+		}

+	}

+

+	/**

+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,

+	 * and returns the collection of these actions.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {

+		Collection<IAction> actions = new ArrayList<IAction>();

+		if (descriptors != null) {

+			for (Object descriptor : descriptors) {

+				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));

+			}

+		}

+		return actions;

+	}

+

+	/**

+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,

+	 * and returns the collection of these actions.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {

+		Collection<IAction> actions = new ArrayList<IAction>();

+		if (descriptors != null) {

+			for (Object descriptor : descriptors) {

+				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));

+			}

+		}

+		return actions;

+	}

+

+	/**

+	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s

+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,

+	 * by inserting them before the specified contribution item <code>contributionID</code>.

+	 * If <code>contributionID</code> is <code>null</code>, they are simply added.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {

+		if (actions != null) {

+			for (IAction action : actions) {

+				if (contributionID != null) {

+					manager.insertBefore(contributionID, action);

+				}

+				else {

+					manager.add(action);

+				}

+			}

+		}

+	}

+		

+	/**

+	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s

+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {

+		if (actions != null) {

+			IContributionItem[] items = manager.getItems();

+			for (int i = 0; i < items.length; i++) {

+				// Look into SubContributionItems

+				//

+				IContributionItem contributionItem = items[i];

+				while (contributionItem instanceof SubContributionItem) {

+					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();

+				}

+

+				// Delete the ActionContributionItems with matching action.

+				//

+				if (contributionItem instanceof ActionContributionItem) {

+					IAction action = ((ActionContributionItem)contributionItem).getAction();

+					if (actions.contains(action)) {

+						manager.remove(contributionItem);

+					}

+				}

+			}

+		}

+	}

+

+	/**

+	 * This populates the pop-up menu before it appears.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void menuAboutToShow(IMenuManager menuManager) {

+		super.menuAboutToShow(menuManager);

+		MenuManager submenuManager = null;

+

+		submenuManager = new MenuManager(FacadeEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));

+		populateManager(submenuManager, createChildActions, null);

+		menuManager.insertBefore("edit", submenuManager);

+

+		submenuManager = new MenuManager(FacadeEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));

+		populateManager(submenuManager, createSiblingActions, null);

+		menuManager.insertBefore("edit", submenuManager);

+	}

+

+	/**

+	 * This inserts global actions before the "additions-end" separator.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected void addGlobalActions(IMenuManager menuManager) {

+		menuManager.insertAfter("additions-end", new Separator("ui-actions"));

+		menuManager.insertAfter("ui-actions", showPropertiesViewAction);

+

+		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		

+		menuManager.insertAfter("ui-actions", refreshViewerAction);

+

+		super.addGlobalActions(menuManager);

+	}

+

+	/**

+	 * This ensures that a delete action will clean up all references to deleted objects.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected boolean removeAllReferencesOnDelete() {

+		return true;

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/virtualmetamodel/presentation/VirtualmetamodelEditor.java b/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/virtualmetamodel/presentation/VirtualmetamodelEditor.java
new file mode 100644
index 00000000000..1710b7760c4
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/virtualmetamodel/presentation/VirtualmetamodelEditor.java
@@ -0,0 +1,1843 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.virtualmetamodel.presentation;

+

+

+import java.io.IOException;

+import java.io.InputStream;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Collections;

+import java.util.EventObject;

+import java.util.HashMap;

+import java.util.Iterator;

+import java.util.LinkedHashMap;

+import java.util.List;

+import java.util.Map;

+

+import org.eclipse.core.resources.IFile;

+import org.eclipse.core.resources.IMarker;

+import org.eclipse.core.resources.IResource;

+import org.eclipse.core.resources.IResourceChangeEvent;

+import org.eclipse.core.resources.IResourceChangeListener;

+import org.eclipse.core.resources.IResourceDelta;

+import org.eclipse.core.resources.IResourceDeltaVisitor;

+import org.eclipse.core.resources.ResourcesPlugin;

+

+import org.eclipse.core.runtime.CoreException;

+import org.eclipse.core.runtime.IPath;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.core.runtime.NullProgressMonitor;

+

+import org.eclipse.jface.action.IMenuListener;

+import org.eclipse.jface.action.IMenuManager;

+import org.eclipse.jface.action.IStatusLineManager;

+import org.eclipse.jface.action.IToolBarManager;

+import org.eclipse.jface.action.MenuManager;

+import org.eclipse.jface.action.Separator;

+

+import org.eclipse.jface.dialogs.MessageDialog;

+import org.eclipse.jface.dialogs.ProgressMonitorDialog;

+

+import org.eclipse.jface.util.LocalSelectionTransfer;

+

+import org.eclipse.jface.viewers.ColumnWeightData;

+import org.eclipse.jface.viewers.ISelection;

+import org.eclipse.jface.viewers.ISelectionChangedListener;

+import org.eclipse.jface.viewers.ISelectionProvider;

+import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.jface.viewers.ListViewer;

+import org.eclipse.jface.viewers.SelectionChangedEvent;

+import org.eclipse.jface.viewers.StructuredSelection;

+import org.eclipse.jface.viewers.StructuredViewer;

+import org.eclipse.jface.viewers.TableLayout;

+import org.eclipse.jface.viewers.TableViewer;

+import org.eclipse.jface.viewers.TreeViewer;

+import org.eclipse.jface.viewers.Viewer;

+

+import org.eclipse.swt.SWT;

+

+import org.eclipse.swt.custom.CTabFolder;

+

+import org.eclipse.swt.dnd.DND;

+import org.eclipse.swt.dnd.FileTransfer;

+import org.eclipse.swt.dnd.Transfer;

+

+import org.eclipse.swt.events.ControlAdapter;

+import org.eclipse.swt.events.ControlEvent;

+

+import org.eclipse.swt.graphics.Point;

+

+import org.eclipse.swt.layout.FillLayout;

+

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.swt.widgets.Menu;

+import org.eclipse.swt.widgets.Table;

+import org.eclipse.swt.widgets.TableColumn;

+import org.eclipse.swt.widgets.Tree;

+import org.eclipse.swt.widgets.TreeColumn;

+

+import org.eclipse.ui.IActionBars;

+import org.eclipse.ui.IEditorInput;

+import org.eclipse.ui.IEditorPart;

+import org.eclipse.ui.IEditorSite;

+import org.eclipse.ui.IPartListener;

+import org.eclipse.ui.IWorkbenchPart;

+import org.eclipse.ui.PartInitException;

+

+import org.eclipse.ui.dialogs.SaveAsDialog;

+

+import org.eclipse.ui.ide.IGotoMarker;

+

+import org.eclipse.ui.part.FileEditorInput;

+import org.eclipse.ui.part.MultiPageEditorPart;

+

+import org.eclipse.ui.views.contentoutline.ContentOutline;

+import org.eclipse.ui.views.contentoutline.ContentOutlinePage;

+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;

+

+import org.eclipse.ui.views.properties.IPropertySheetPage;

+import org.eclipse.ui.views.properties.PropertySheet;

+import org.eclipse.ui.views.properties.PropertySheetPage;

+

+import org.eclipse.emf.common.command.BasicCommandStack;

+import org.eclipse.emf.common.command.Command;

+import org.eclipse.emf.common.command.CommandStack;

+import org.eclipse.emf.common.command.CommandStackListener;

+

+import org.eclipse.emf.common.notify.AdapterFactory;

+import org.eclipse.emf.common.notify.Notification;

+

+import org.eclipse.emf.common.ui.MarkerHelper;

+import org.eclipse.emf.common.ui.ViewerPane;

+

+import org.eclipse.emf.common.ui.editor.ProblemEditorPart;

+

+import org.eclipse.emf.common.ui.viewer.IViewerProvider;

+

+import org.eclipse.emf.common.util.BasicDiagnostic;

+import org.eclipse.emf.common.util.Diagnostic;

+import org.eclipse.emf.common.util.URI;

+

+

+import org.eclipse.emf.ecore.resource.Resource;

+import org.eclipse.emf.ecore.resource.ResourceSet;

+

+import org.eclipse.emf.ecore.util.EContentAdapter;

+import org.eclipse.emf.ecore.util.EcoreUtil;

+

+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

+import org.eclipse.emf.edit.domain.EditingDomain;

+import org.eclipse.emf.edit.domain.IEditingDomainProvider;

+

+import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;

+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

+import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;

+

+import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;

+

+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

+

+import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;

+

+import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;

+import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

+import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;

+

+import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;

+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

+import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;

+

+import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;

+import org.eclipse.emf.edit.ui.util.EditUIUtil;

+

+import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;

+

+import org.eclipse.papyrus.facade.virtualmetamodel.provider.VirtualmetamodelItemProviderAdapterFactory;

+

+import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

+

+import org.eclipse.papyrus.facade.extensiondefinition.provider.ExtensiondefinitionItemProviderAdapterFactory;

+

+import org.eclipse.papyrus.facade.presentation.FacadeEditorPlugin;

+

+import org.eclipse.papyrus.facade.provider.FacadeItemProviderAdapterFactory;

+

+import org.eclipse.ui.actions.WorkspaceModifyOperation;

+

+import org.eclipse.uml2.uml.edit.providers.UMLItemProviderAdapterFactory;

+

+

+/**

+ * This is an example of a Virtualmetamodel model editor.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class VirtualmetamodelEditor

+	extends MultiPageEditorPart

+	implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {

+	/**

+	 * This keeps track of the editing domain that is used to track all changes to the model.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected AdapterFactoryEditingDomain editingDomain;

+

+	/**

+	 * This is the one adapter factory used for providing views of the model.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected ComposedAdapterFactory adapterFactory;

+

+	/**

+	 * This is the content outline page.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected IContentOutlinePage contentOutlinePage;

+

+	/**

+	 * This is a kludge...

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected IStatusLineManager contentOutlineStatusLineManager;

+

+	/**

+	 * This is the content outline page's viewer.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected TreeViewer contentOutlineViewer;

+

+	/**

+	 * This is the property sheet page.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();

+

+	/**

+	 * This is the viewer that shadows the selection in the content outline.

+	 * The parent relation must be correctly defined for this to work.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected TreeViewer selectionViewer;

+

+	/**

+	 * This inverts the roll of parent and child in the content provider and show parents as a tree.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected TreeViewer parentViewer;

+

+	/**

+	 * This shows how a tree view works.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected TreeViewer treeViewer;

+

+	/**

+	 * This shows how a list view works.

+	 * A list viewer doesn't support icons.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected ListViewer listViewer;

+

+	/**

+	 * This shows how a table view works.

+	 * A table can be used as a list with icons.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected TableViewer tableViewer;

+

+	/**

+	 * This shows how a tree view with columns works.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected TreeViewer treeViewerWithColumns;

+

+	/**

+	 * This keeps track of the active viewer pane, in the book.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected ViewerPane currentViewerPane;

+

+	/**

+	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected Viewer currentViewer;

+

+	/**

+	 * This listens to which ever viewer is active.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected ISelectionChangedListener selectionChangedListener;

+

+	/**

+	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();

+

+	/**

+	 * This keeps track of the selection of the editor as a whole.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected ISelection editorSelection = StructuredSelection.EMPTY;

+

+	/**

+	 * The MarkerHelper is responsible for creating workspace resource markers presented

+	 * in Eclipse's Problems View.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected MarkerHelper markerHelper = new EditUIMarkerHelper();

+

+	/**

+	 * This listens for when the outline becomes active

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected IPartListener partListener =

+		new IPartListener() {

+			public void partActivated(IWorkbenchPart p) {

+				if (p instanceof ContentOutline) {

+					if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {

+						getActionBarContributor().setActiveEditor(VirtualmetamodelEditor.this);

+

+						setCurrentViewer(contentOutlineViewer);

+					}

+				}

+				else if (p instanceof PropertySheet) {

+					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {

+						getActionBarContributor().setActiveEditor(VirtualmetamodelEditor.this);

+						handleActivate();

+					}

+				}

+				else if (p == VirtualmetamodelEditor.this) {

+					handleActivate();

+				}

+			}

+			public void partBroughtToTop(IWorkbenchPart p) {

+				// Ignore.

+			}

+			public void partClosed(IWorkbenchPart p) {

+				// Ignore.

+			}

+			public void partDeactivated(IWorkbenchPart p) {

+				// Ignore.

+			}

+			public void partOpened(IWorkbenchPart p) {

+				// Ignore.

+			}

+		};

+

+	/**

+	 * Resources that have been removed since last activation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected Collection<Resource> removedResources = new ArrayList<Resource>();

+

+	/**

+	 * Resources that have been changed since last activation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected Collection<Resource> changedResources = new ArrayList<Resource>();

+

+	/**

+	 * Resources that have been saved.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected Collection<Resource> savedResources = new ArrayList<Resource>();

+

+	/**

+	 * Map to store the diagnostic associated with a resource.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();

+

+	/**

+	 * Controls whether the problem indication should be updated.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected boolean updateProblemIndication = true;

+

+	/**

+	 * Adapter used to update the problem indication when resources are demanded loaded.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EContentAdapter problemIndicationAdapter =

+		new EContentAdapter() {

+			@Override

+			public void notifyChanged(Notification notification) {

+				if (notification.getNotifier() instanceof Resource) {

+					switch (notification.getFeatureID(Resource.class)) {

+						case Resource.RESOURCE__IS_LOADED:

+						case Resource.RESOURCE__ERRORS:

+						case Resource.RESOURCE__WARNINGS: {

+							Resource resource = (Resource)notification.getNotifier();

+							Diagnostic diagnostic = analyzeResourceProblems(resource, null);

+							if (diagnostic.getSeverity() != Diagnostic.OK) {

+								resourceToDiagnosticMap.put(resource, diagnostic);

+							}

+							else {

+								resourceToDiagnosticMap.remove(resource);

+							}

+

+							if (updateProblemIndication) {

+								getSite().getShell().getDisplay().asyncExec

+									(new Runnable() {

+										 public void run() {

+											 updateProblemIndication();

+										 }

+									 });

+							}

+							break;

+						}

+					}

+				}

+				else {

+					super.notifyChanged(notification);

+				}

+			}

+

+			@Override

+			protected void setTarget(Resource target) {

+				basicSetTarget(target);

+			}

+

+			@Override

+			protected void unsetTarget(Resource target) {

+				basicUnsetTarget(target);

+				resourceToDiagnosticMap.remove(target);

+				if (updateProblemIndication) {

+					getSite().getShell().getDisplay().asyncExec

+						(new Runnable() {

+							 public void run() {

+								 updateProblemIndication();

+							 }

+						 });

+				}

+			}

+		};

+

+	/**

+	 * This listens for workspace changes.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected IResourceChangeListener resourceChangeListener =

+		new IResourceChangeListener() {

+			public void resourceChanged(IResourceChangeEvent event) {

+				IResourceDelta delta = event.getDelta();

+				try {

+					class ResourceDeltaVisitor implements IResourceDeltaVisitor {

+						protected ResourceSet resourceSet = editingDomain.getResourceSet();

+						protected Collection<Resource> changedResources = new ArrayList<Resource>();

+						protected Collection<Resource> removedResources = new ArrayList<Resource>();

+

+						public boolean visit(IResourceDelta delta) {

+							if (delta.getResource().getType() == IResource.FILE) {

+								if (delta.getKind() == IResourceDelta.REMOVED ||

+								    delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {

+									Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);

+									if (resource != null) {

+										if (delta.getKind() == IResourceDelta.REMOVED) {

+											removedResources.add(resource);

+										}

+										else if (!savedResources.remove(resource)) {

+											changedResources.add(resource);

+										}

+									}

+								}

+								return false;

+							}

+

+							return true;

+						}

+

+						public Collection<Resource> getChangedResources() {

+							return changedResources;

+						}

+

+						public Collection<Resource> getRemovedResources() {

+							return removedResources;

+						}

+					}

+

+					final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();

+					delta.accept(visitor);

+

+					if (!visitor.getRemovedResources().isEmpty()) {

+						getSite().getShell().getDisplay().asyncExec

+							(new Runnable() {

+								 public void run() {

+									 removedResources.addAll(visitor.getRemovedResources());

+									 if (!isDirty()) {

+										 getSite().getPage().closeEditor(VirtualmetamodelEditor.this, false);

+									 }

+								 }

+							 });

+					}

+

+					if (!visitor.getChangedResources().isEmpty()) {

+						getSite().getShell().getDisplay().asyncExec

+							(new Runnable() {

+								 public void run() {

+									 changedResources.addAll(visitor.getChangedResources());

+									 if (getSite().getPage().getActiveEditor() == VirtualmetamodelEditor.this) {

+										 handleActivate();

+									 }

+								 }

+							 });

+					}

+				}

+				catch (CoreException exception) {

+					FacadeEditorPlugin.INSTANCE.log(exception);

+				}

+			}

+		};

+

+	/**

+	 * Handles activation of the editor or it's associated views.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void handleActivate() {

+		// Recompute the read only state.

+		//

+		if (editingDomain.getResourceToReadOnlyMap() != null) {

+		  editingDomain.getResourceToReadOnlyMap().clear();

+

+		  // Refresh any actions that may become enabled or disabled.

+		  //

+		  setSelection(getSelection());

+		}

+

+		if (!removedResources.isEmpty()) {

+			if (handleDirtyConflict()) {

+				getSite().getPage().closeEditor(VirtualmetamodelEditor.this, false);

+			}

+			else {

+				removedResources.clear();

+				changedResources.clear();

+				savedResources.clear();

+			}

+		}

+		else if (!changedResources.isEmpty()) {

+			changedResources.removeAll(savedResources);

+			handleChangedResources();

+			changedResources.clear();

+			savedResources.clear();

+		}

+	}

+

+	/**

+	 * Handles what to do with changed resources on activation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void handleChangedResources() {

+		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {

+			if (isDirty()) {

+				changedResources.addAll(editingDomain.getResourceSet().getResources());

+			}

+			editingDomain.getCommandStack().flush();

+

+			updateProblemIndication = false;

+			for (Resource resource : changedResources) {

+				if (resource.isLoaded()) {

+					resource.unload();

+					try {

+						resource.load(Collections.EMPTY_MAP);

+					}

+					catch (IOException exception) {

+						if (!resourceToDiagnosticMap.containsKey(resource)) {

+							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

+						}

+					}

+				}

+			}

+

+			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {

+				setSelection(StructuredSelection.EMPTY);

+			}

+

+			updateProblemIndication = true;

+			updateProblemIndication();

+		}

+	}

+

+	/**

+	 * Updates the problems indication with the information described in the specified diagnostic.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void updateProblemIndication() {

+		if (updateProblemIndication) {

+			BasicDiagnostic diagnostic =

+				new BasicDiagnostic

+					(Diagnostic.OK,

+					 "org.eclipse.papyrus.facade.editor",

+					 0,

+					 null,

+					 new Object [] { editingDomain.getResourceSet() });

+			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {

+				if (childDiagnostic.getSeverity() != Diagnostic.OK) {

+					diagnostic.add(childDiagnostic);

+				}

+			}

+

+			int lastEditorPage = getPageCount() - 1;

+			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {

+				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);

+				if (diagnostic.getSeverity() != Diagnostic.OK) {

+					setActivePage(lastEditorPage);

+				}

+			}

+			else if (diagnostic.getSeverity() != Diagnostic.OK) {

+				ProblemEditorPart problemEditorPart = new ProblemEditorPart();

+				problemEditorPart.setDiagnostic(diagnostic);

+				problemEditorPart.setMarkerHelper(markerHelper);

+				try {

+					addPage(++lastEditorPage, problemEditorPart, getEditorInput());

+					setPageText(lastEditorPage, problemEditorPart.getPartName());

+					setActivePage(lastEditorPage);

+					showTabs();

+				}

+				catch (PartInitException exception) {

+					FacadeEditorPlugin.INSTANCE.log(exception);

+				}

+			}

+

+			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {

+				markerHelper.deleteMarkers(editingDomain.getResourceSet());

+				if (diagnostic.getSeverity() != Diagnostic.OK) {

+					try {

+						markerHelper.createMarkers(diagnostic);

+					}

+					catch (CoreException exception) {

+						FacadeEditorPlugin.INSTANCE.log(exception);

+					}

+				}

+			}

+		}

+	}

+

+	/**

+	 * Shows a dialog that asks if conflicting changes should be discarded.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected boolean handleDirtyConflict() {

+		return

+			MessageDialog.openQuestion

+				(getSite().getShell(),

+				 getString("_UI_FileConflict_label"),

+				 getString("_WARN_FileConflict"));

+	}

+

+	/**

+	 * This creates a model editor.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public VirtualmetamodelEditor() {

+		super();

+		initializeEditingDomain();

+	}

+

+	/**

+	 * This sets up the editing domain for the model editor.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void initializeEditingDomain() {

+		// Create an adapter factory that yields item providers.

+		//

+		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);

+

+		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());

+		adapterFactory.addAdapterFactory(new FacadeItemProviderAdapterFactory());

+		adapterFactory.addAdapterFactory(new VirtualmetamodelItemProviderAdapterFactory());

+		adapterFactory.addAdapterFactory(new ExtensiondefinitionItemProviderAdapterFactory());

+		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());

+		adapterFactory.addAdapterFactory(new UMLItemProviderAdapterFactory());

+		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());

+

+		// Create the command stack that will notify this editor as commands are executed.

+		//

+		BasicCommandStack commandStack = new BasicCommandStack();

+

+		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.

+		//

+		commandStack.addCommandStackListener

+			(new CommandStackListener() {

+				 public void commandStackChanged(final EventObject event) {

+					 getContainer().getDisplay().asyncExec

+						 (new Runnable() {

+							  public void run() {

+								  firePropertyChange(IEditorPart.PROP_DIRTY);

+

+								  // Try to select the affected objects.

+								  //

+								  Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();

+								  if (mostRecentCommand != null) {

+									  setSelectionToViewer(mostRecentCommand.getAffectedObjects());

+								  }

+								  for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext(); ) {

+									  PropertySheetPage propertySheetPage = i.next();

+									  if (propertySheetPage.getControl().isDisposed()) {

+										  i.remove();

+									  }

+									  else {

+										  propertySheetPage.refresh();

+									  }

+								  }

+							  }

+						  });

+				 }

+			 });

+

+		// Create the editing domain with a special command stack.

+		//

+		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());

+	}

+

+	/**

+	 * This is here for the listener to be able to call it.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+			@Override

+	protected void firePropertyChange(int action) {

+		super.firePropertyChange(action);

+	}

+

+	/**

+	 * This sets the selection into whichever viewer is active.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setSelectionToViewer(Collection<?> collection) {

+		final Collection<?> theSelection = collection;

+		// Make sure it's okay.

+		//

+		if (theSelection != null && !theSelection.isEmpty()) {

+			Runnable runnable =

+				new Runnable() {

+					public void run() {

+						// Try to select the items in the current content viewer of the editor.

+						//

+						if (currentViewer != null) {

+							currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);

+						}

+					}

+				};

+			getSite().getShell().getDisplay().asyncExec(runnable);

+		}

+	}

+

+	/**

+	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.

+	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain}

+	 * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EditingDomain getEditingDomain() {

+		return editingDomain;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {

+			super(adapterFactory);

+		}

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		@Override

+		public Object [] getElements(Object object) {

+			Object parent = super.getParent(object);

+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

+		}

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		@Override

+		public Object [] getChildren(Object object) {

+			Object parent = super.getParent(object);

+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

+		}

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		@Override

+		public boolean hasChildren(Object object) {

+			Object parent = super.getParent(object);

+			return parent != null;

+		}

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		@Override

+		public Object getParent(Object object) {

+			return null;

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setCurrentViewerPane(ViewerPane viewerPane) {

+		if (currentViewerPane != viewerPane) {

+			if (currentViewerPane != null) {

+				currentViewerPane.showFocus(false);

+			}

+			currentViewerPane = viewerPane;

+		}

+		setCurrentViewer(currentViewerPane.getViewer());

+	}

+

+	/**

+	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,

+	 * is the current one.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setCurrentViewer(Viewer viewer) {

+		// If it is changing...

+		//

+		if (currentViewer != viewer) {

+			if (selectionChangedListener == null) {

+				// Create the listener on demand.

+				//

+				selectionChangedListener =

+					new ISelectionChangedListener() {

+						// This just notifies those things that are affected by the section.

+						//

+						public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {

+							setSelection(selectionChangedEvent.getSelection());

+						}

+					};

+			}

+

+			// Stop listening to the old one.

+			//

+			if (currentViewer != null) {

+				currentViewer.removeSelectionChangedListener(selectionChangedListener);

+			}

+

+			// Start listening to the new one.

+			//

+			if (viewer != null) {

+				viewer.addSelectionChangedListener(selectionChangedListener);

+			}

+

+			// Remember it.

+			//

+			currentViewer = viewer;

+

+			// Set the editors selection based on the current viewer's selection.

+			//

+			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());

+		}

+	}

+

+	/**

+	 * This returns the viewer as required by the {@link IViewerProvider} interface.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public Viewer getViewer() {

+		return currentViewer;

+	}

+

+	/**

+	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void createContextMenuFor(StructuredViewer viewer) {

+		MenuManager contextMenu = new MenuManager("#PopUp");

+		contextMenu.add(new Separator("additions"));

+		contextMenu.setRemoveAllWhenShown(true);

+		contextMenu.addMenuListener(this);

+		Menu menu= contextMenu.createContextMenu(viewer.getControl());

+		viewer.getControl().setMenu(menu);

+		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));

+

+		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;

+		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };

+		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));

+		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));

+	}

+

+	/**

+	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void createModel() {

+		URI resourceURI = EditUIUtil.getURI(getEditorInput());

+		Exception exception = null;

+		Resource resource = null;

+		try {

+			// Load the resource through the editing domain.

+			//

+			resource = editingDomain.getResourceSet().getResource(resourceURI, true);

+		}

+		catch (Exception e) {

+			exception = e;

+			resource = editingDomain.getResourceSet().getResource(resourceURI, false);

+		}

+

+		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);

+		if (diagnostic.getSeverity() != Diagnostic.OK) {

+			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));

+		}

+		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);

+	}

+

+	/**

+	 * Returns a diagnostic describing the errors and warnings listed in the resource

+	 * and the specified exception (if any).

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {

+		if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {

+			BasicDiagnostic basicDiagnostic =

+				new BasicDiagnostic

+					(Diagnostic.ERROR,

+					 "org.eclipse.papyrus.facade.editor",

+					 0,

+					 getString("_UI_CreateModelError_message", resource.getURI()),

+					 new Object [] { exception == null ? (Object)resource : exception });

+			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));

+			return basicDiagnostic;

+		}

+		else if (exception != null) {

+			return

+				new BasicDiagnostic

+					(Diagnostic.ERROR,

+					 "org.eclipse.papyrus.facade.editor",

+					 0,

+					 getString("_UI_CreateModelError_message", resource.getURI()),

+					 new Object[] { exception });

+		}

+		else {

+			return Diagnostic.OK_INSTANCE;

+		}

+	}

+

+	/**

+	 * This is the method used by the framework to install your own controls.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void createPages() {

+		// Creates the model from the editor input

+		//

+		createModel();

+

+		// Only creates the other pages if there is something that can be edited

+		//

+		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {

+			// Create a page for the selection tree view.

+			//

+			{

+				ViewerPane viewerPane =

+					new ViewerPane(getSite().getPage(), VirtualmetamodelEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							Tree tree = new Tree(composite, SWT.MULTI);

+							TreeViewer newTreeViewer = new TreeViewer(tree);

+							return newTreeViewer;

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

+				viewerPane.createControl(getContainer());

+

+				selectionViewer = (TreeViewer)viewerPane.getViewer();

+				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

+

+				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

+				selectionViewer.setInput(editingDomain.getResourceSet());

+				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

+				viewerPane.setTitle(editingDomain.getResourceSet());

+

+				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);

+

+				createContextMenuFor(selectionViewer);

+				int pageIndex = addPage(viewerPane.getControl());

+				setPageText(pageIndex, getString("_UI_SelectionPage_label"));

+			}

+

+			// Create a page for the parent tree view.

+			//

+			{

+				ViewerPane viewerPane =

+					new ViewerPane(getSite().getPage(), VirtualmetamodelEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							Tree tree = new Tree(composite, SWT.MULTI);

+							TreeViewer newTreeViewer = new TreeViewer(tree);

+							return newTreeViewer;

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

+				viewerPane.createControl(getContainer());

+

+				parentViewer = (TreeViewer)viewerPane.getViewer();

+				parentViewer.setAutoExpandLevel(30);

+				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));

+				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

+

+				createContextMenuFor(parentViewer);

+				int pageIndex = addPage(viewerPane.getControl());

+				setPageText(pageIndex, getString("_UI_ParentPage_label"));

+			}

+

+			// This is the page for the list viewer

+			//

+			{

+				ViewerPane viewerPane =

+					new ViewerPane(getSite().getPage(), VirtualmetamodelEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new ListViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

+				viewerPane.createControl(getContainer());

+				listViewer = (ListViewer)viewerPane.getViewer();

+				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

+				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

+

+				createContextMenuFor(listViewer);

+				int pageIndex = addPage(viewerPane.getControl());

+				setPageText(pageIndex, getString("_UI_ListPage_label"));

+			}

+

+			// This is the page for the tree viewer

+			//

+			{

+				ViewerPane viewerPane =

+					new ViewerPane(getSite().getPage(), VirtualmetamodelEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new TreeViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

+				viewerPane.createControl(getContainer());

+				treeViewer = (TreeViewer)viewerPane.getViewer();

+				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

+				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

+

+				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);

+

+				createContextMenuFor(treeViewer);

+				int pageIndex = addPage(viewerPane.getControl());

+				setPageText(pageIndex, getString("_UI_TreePage_label"));

+			}

+

+			// This is the page for the table viewer.

+			//

+			{

+				ViewerPane viewerPane =

+					new ViewerPane(getSite().getPage(), VirtualmetamodelEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new TableViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

+				viewerPane.createControl(getContainer());

+				tableViewer = (TableViewer)viewerPane.getViewer();

+

+				Table table = tableViewer.getTable();

+				TableLayout layout = new TableLayout();

+				table.setLayout(layout);

+				table.setHeaderVisible(true);

+				table.setLinesVisible(true);

+

+				TableColumn objectColumn = new TableColumn(table, SWT.NONE);

+				layout.addColumnData(new ColumnWeightData(3, 100, true));

+				objectColumn.setText(getString("_UI_ObjectColumn_label"));

+				objectColumn.setResizable(true);

+

+				TableColumn selfColumn = new TableColumn(table, SWT.NONE);

+				layout.addColumnData(new ColumnWeightData(2, 100, true));

+				selfColumn.setText(getString("_UI_SelfColumn_label"));

+				selfColumn.setResizable(true);

+

+				tableViewer.setColumnProperties(new String [] {"a", "b"});

+				tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

+				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

+

+				createContextMenuFor(tableViewer);

+				int pageIndex = addPage(viewerPane.getControl());

+				setPageText(pageIndex, getString("_UI_TablePage_label"));

+			}

+

+			// This is the page for the table tree viewer.

+			//

+			{

+				ViewerPane viewerPane =

+					new ViewerPane(getSite().getPage(), VirtualmetamodelEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new TreeViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

+				viewerPane.createControl(getContainer());

+

+				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();

+

+				Tree tree = treeViewerWithColumns.getTree();

+				tree.setLayoutData(new FillLayout());

+				tree.setHeaderVisible(true);

+				tree.setLinesVisible(true);

+

+				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);

+				objectColumn.setText(getString("_UI_ObjectColumn_label"));

+				objectColumn.setResizable(true);

+				objectColumn.setWidth(250);

+

+				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);

+				selfColumn.setText(getString("_UI_SelfColumn_label"));

+				selfColumn.setResizable(true);

+				selfColumn.setWidth(200);

+

+				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"});

+				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

+				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

+

+				createContextMenuFor(treeViewerWithColumns);

+				int pageIndex = addPage(viewerPane.getControl());

+				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label"));

+			}

+

+			getSite().getShell().getDisplay().asyncExec

+				(new Runnable() {

+					 public void run() {

+						 setActivePage(0);

+					 }

+				 });

+		}

+

+		// Ensures that this editor will only display the page's tab

+		// area if there are more than one page

+		//

+		getContainer().addControlListener

+			(new ControlAdapter() {

+				boolean guard = false;

+				@Override

+				public void controlResized(ControlEvent event) {

+					if (!guard) {

+						guard = true;

+						hideTabs();

+						guard = false;

+					}

+				}

+			 });

+

+		getSite().getShell().getDisplay().asyncExec

+			(new Runnable() {

+				 public void run() {

+					 updateProblemIndication();

+				 }

+			 });

+	}

+

+	/**

+	 * If there is just one page in the multi-page editor part,

+	 * this hides the single tab at the bottom.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void hideTabs() {

+		if (getPageCount() <= 1) {

+			setPageText(0, "");

+			if (getContainer() instanceof CTabFolder) {

+				((CTabFolder)getContainer()).setTabHeight(1);

+				Point point = getContainer().getSize();

+				getContainer().setSize(point.x, point.y + 6);

+			}

+		}

+	}

+

+	/**

+	 * If there is more than one page in the multi-page editor part,

+	 * this shows the tabs at the bottom.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void showTabs() {

+		if (getPageCount() > 1) {

+			setPageText(0, getString("_UI_SelectionPage_label"));

+			if (getContainer() instanceof CTabFolder) {

+				((CTabFolder)getContainer()).setTabHeight(SWT.DEFAULT);

+				Point point = getContainer().getSize();

+				getContainer().setSize(point.x, point.y - 6);

+			}

+		}

+	}

+

+	/**

+	 * This is used to track the active viewer.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected void pageChange(int pageIndex) {

+		super.pageChange(pageIndex);

+

+		if (contentOutlinePage != null) {

+			handleContentOutlineSelection(contentOutlinePage.getSelection());

+		}

+	}

+

+	/**

+	 * This is how the framework determines which interfaces we implement.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	@Override

+	public Object getAdapter(Class key) {

+		if (key.equals(IContentOutlinePage.class)) {

+			return showOutlineView() ? getContentOutlinePage() : null;

+		}

+		else if (key.equals(IPropertySheetPage.class)) {

+			return getPropertySheetPage();

+		}

+		else if (key.equals(IGotoMarker.class)) {

+			return this;

+		}

+		else {

+			return super.getAdapter(key);

+		}

+	}

+

+	/**

+	 * This accesses a cached version of the content outliner.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public IContentOutlinePage getContentOutlinePage() {

+		if (contentOutlinePage == null) {

+			// The content outline is just a tree.

+			//

+			class MyContentOutlinePage extends ContentOutlinePage {

+				@Override

+				public void createControl(Composite parent) {

+					super.createControl(parent);

+					contentOutlineViewer = getTreeViewer();

+					contentOutlineViewer.addSelectionChangedListener(this);

+

+					// Set up the tree viewer.

+					//

+					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

+					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

+					contentOutlineViewer.setInput(editingDomain.getResourceSet());

+

+					// Make sure our popups work.

+					//

+					createContextMenuFor(contentOutlineViewer);

+

+					if (!editingDomain.getResourceSet().getResources().isEmpty()) {

+					  // Select the root object in the view.

+					  //

+					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

+					}

+				}

+

+				@Override

+				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {

+					super.makeContributions(menuManager, toolBarManager, statusLineManager);

+					contentOutlineStatusLineManager = statusLineManager;

+				}

+

+				@Override

+				public void setActionBars(IActionBars actionBars) {

+					super.setActionBars(actionBars);

+					getActionBarContributor().shareGlobalActions(this, actionBars);

+				}

+			}

+

+			contentOutlinePage = new MyContentOutlinePage();

+

+			// Listen to selection so that we can handle it is a special way.

+			//

+			contentOutlinePage.addSelectionChangedListener

+				(new ISelectionChangedListener() {

+					 // This ensures that we handle selections correctly.

+					 //

+					 public void selectionChanged(SelectionChangedEvent event) {

+						 handleContentOutlineSelection(event.getSelection());

+					 }

+				 });

+		}

+

+		return contentOutlinePage;

+	}

+

+	/**

+	 * This accesses a cached version of the property sheet.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public IPropertySheetPage getPropertySheetPage() {

+		PropertySheetPage propertySheetPage =

+			new ExtendedPropertySheetPage(editingDomain) {

+				@Override

+				public void setSelectionToViewer(List<?> selection) {

+					VirtualmetamodelEditor.this.setSelectionToViewer(selection);

+					VirtualmetamodelEditor.this.setFocus();

+				}

+

+				@Override

+				public void setActionBars(IActionBars actionBars) {

+					super.setActionBars(actionBars);

+					getActionBarContributor().shareGlobalActions(this, actionBars);

+				}

+			};

+		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));

+		propertySheetPages.add(propertySheetPage);

+

+		return propertySheetPage;

+	}

+

+	/**

+	 * This deals with how we want selection in the outliner to affect the other views.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void handleContentOutlineSelection(ISelection selection) {

+		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {

+			Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();

+			if (selectedElements.hasNext()) {

+				// Get the first selected element.

+				//

+				Object selectedElement = selectedElements.next();

+

+				// If it's the selection viewer, then we want it to select the same selection as this selection.

+				//

+				if (currentViewerPane.getViewer() == selectionViewer) {

+					ArrayList<Object> selectionList = new ArrayList<Object>();

+					selectionList.add(selectedElement);

+					while (selectedElements.hasNext()) {

+						selectionList.add(selectedElements.next());

+					}

+

+					// Set the selection to the widget.

+					//

+					selectionViewer.setSelection(new StructuredSelection(selectionList));

+				}

+				else {

+					// Set the input to the widget.

+					//

+					if (currentViewerPane.getViewer().getInput() != selectedElement) {

+						currentViewerPane.getViewer().setInput(selectedElement);

+						currentViewerPane.setTitle(selectedElement);

+					}

+				}

+			}

+		}

+	}

+

+	/**

+	 * This is for implementing {@link IEditorPart} and simply tests the command stack.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean isDirty() {

+		return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded();

+	}

+

+	/**

+	 * This is for implementing {@link IEditorPart} and simply saves the model file.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void doSave(IProgressMonitor progressMonitor) {

+		// Save only resources that have actually changed.

+		//

+		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

+		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

+

+		// Do the work within an operation because this is a long running activity that modifies the workbench.

+		//

+		WorkspaceModifyOperation operation =

+			new WorkspaceModifyOperation() {

+				// This is the method that gets invoked when the operation runs.

+				//

+				@Override

+				public void execute(IProgressMonitor monitor) {

+					// Save the resources to the file system.

+					//

+					boolean first = true;

+					for (Resource resource : editingDomain.getResourceSet().getResources()) {

+						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

+							try {

+								long timeStamp = resource.getTimeStamp();

+								resource.save(saveOptions);

+								if (resource.getTimeStamp() != timeStamp) {

+									savedResources.add(resource);

+								}

+							}

+							catch (Exception exception) {

+								resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

+							}

+							first = false;

+						}

+					}

+				}

+			};

+

+		updateProblemIndication = false;

+		try {

+			// This runs the options, and shows progress.

+			//

+			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

+

+			// Refresh the necessary state.

+			//

+			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();

+			firePropertyChange(IEditorPart.PROP_DIRTY);

+		}

+		catch (Exception exception) {

+			// Something went wrong that shouldn't.

+			//

+			FacadeEditorPlugin.INSTANCE.log(exception);

+		}

+		updateProblemIndication = true;

+		updateProblemIndication();

+	}

+

+	/**

+	 * This returns whether something has been persisted to the URI of the specified resource.

+	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected boolean isPersisted(Resource resource) {

+		boolean result = false;

+		try {

+			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());

+			if (stream != null) {

+				result = true;

+				stream.close();

+			}

+		}

+		catch (IOException e) {

+			// Ignore

+		}

+		return result;

+	}

+

+	/**

+	 * This always returns true because it is not currently supported.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean isSaveAsAllowed() {

+		return true;

+	}

+

+	/**

+	 * This also changes the editor's input.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void doSaveAs() {

+		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());

+		saveAsDialog.open();

+		IPath path = saveAsDialog.getResult();

+		if (path != null) {

+			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);

+			if (file != null) {

+				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));

+			}

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void doSaveAs(URI uri, IEditorInput editorInput) {

+		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);

+		setInputWithNotify(editorInput);

+		setPartName(editorInput.getName());

+		IProgressMonitor progressMonitor =

+			getActionBars().getStatusLineManager() != null ?

+				getActionBars().getStatusLineManager().getProgressMonitor() :

+				new NullProgressMonitor();

+		doSave(progressMonitor);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void gotoMarker(IMarker marker) {

+		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);

+		if (!targetObjects.isEmpty()) {

+			setSelectionToViewer(targetObjects);

+		}

+	}

+

+	/**

+	 * This is called during startup.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void init(IEditorSite site, IEditorInput editorInput) {

+		setSite(site);

+		setInputWithNotify(editorInput);

+		setPartName(editorInput.getName());

+		site.setSelectionProvider(this);

+		site.getPage().addPartListener(partListener);

+		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void setFocus() {

+		if (currentViewerPane != null) {

+			currentViewerPane.setFocus();

+		}

+		else {

+			getControl(getActivePage()).setFocus();

+		}

+	}

+

+	/**

+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void addSelectionChangedListener(ISelectionChangedListener listener) {

+		selectionChangedListeners.add(listener);

+	}

+

+	/**

+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void removeSelectionChangedListener(ISelectionChangedListener listener) {

+		selectionChangedListeners.remove(listener);

+	}

+

+	/**

+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public ISelection getSelection() {

+		return editorSelection;

+	}

+

+	/**

+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.

+	 * Calling this result will notify the listeners.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setSelection(ISelection selection) {

+		editorSelection = selection;

+

+		for (ISelectionChangedListener listener : selectionChangedListeners) {

+			listener.selectionChanged(new SelectionChangedEvent(this, selection));

+		}

+		setStatusLineManager(selection);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setStatusLineManager(ISelection selection) {

+		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?

+			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

+

+		if (statusLineManager != null) {

+			if (selection instanceof IStructuredSelection) {

+				Collection<?> collection = ((IStructuredSelection)selection).toList();

+				switch (collection.size()) {

+					case 0: {

+						statusLineManager.setMessage(getString("_UI_NoObjectSelected"));

+						break;

+					}

+					case 1: {

+						String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());

+						statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text));

+						break;

+					}

+					default: {

+						statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size())));

+						break;

+					}

+				}

+			}

+			else {

+				statusLineManager.setMessage("");

+			}

+		}

+	}

+

+	/**

+	 * This looks up a string in the plugin's plugin.properties file.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private static String getString(String key) {

+		return FacadeEditorPlugin.INSTANCE.getString(key);

+	}

+

+	/**

+	 * This looks up a string in plugin.properties, making a substitution.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private static String getString(String key, Object s1) {

+		return FacadeEditorPlugin.INSTANCE.getString(key, new Object [] { s1 });

+	}

+

+	/**

+	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void menuAboutToShow(IMenuManager menuManager) {

+		((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EditingDomainActionBarContributor getActionBarContributor() {

+		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public IActionBars getActionBars() {

+		return getActionBarContributor().getActionBars();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public AdapterFactory getAdapterFactory() {

+		return adapterFactory;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void dispose() {

+		updateProblemIndication = false;

+

+		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);

+

+		getSite().getPage().removePartListener(partListener);

+

+		adapterFactory.dispose();

+

+		if (getActionBarContributor().getActiveEditor() == this) {

+			getActionBarContributor().setActiveEditor(null);

+		}

+

+		for (PropertySheetPage propertySheetPage : propertySheetPages) {

+			propertySheetPage.dispose();

+		}

+

+		if (contentOutlinePage != null) {

+			contentOutlinePage.dispose();

+		}

+

+		super.dispose();

+	}

+

+	/**

+	 * Returns whether the outline view should be presented to the user.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected boolean showOutlineView() {

+		return true;

+	}

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/virtualmetamodel/presentation/VirtualmetamodelModelWizard.java b/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/virtualmetamodel/presentation/VirtualmetamodelModelWizard.java
new file mode 100644
index 00000000000..bf18db68a5b
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facade/virtualmetamodel/presentation/VirtualmetamodelModelWizard.java
@@ -0,0 +1,640 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.virtualmetamodel.presentation;

+

+

+import java.util.ArrayList;

+import java.util.Arrays;

+import java.util.Collection;

+import java.util.Collections;

+import java.util.HashMap;

+import java.util.List;

+import java.util.Map;

+import java.util.MissingResourceException;

+import java.util.StringTokenizer;

+

+import org.eclipse.emf.common.CommonPlugin;

+

+import org.eclipse.emf.common.util.URI;

+

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EClassifier;

+

+import org.eclipse.emf.ecore.resource.Resource;

+import org.eclipse.emf.ecore.resource.ResourceSet;

+

+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

+

+import org.eclipse.emf.ecore.EObject;

+

+import org.eclipse.emf.ecore.xmi.XMLResource;

+

+import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;

+

+import org.eclipse.core.resources.IContainer;

+import org.eclipse.core.resources.IFile;

+import org.eclipse.core.resources.IFolder;

+import org.eclipse.core.resources.IProject;

+import org.eclipse.core.resources.IResource;

+import org.eclipse.core.resources.ResourcesPlugin;

+

+import org.eclipse.core.runtime.IProgressMonitor;

+

+import org.eclipse.jface.dialogs.MessageDialog;

+

+import org.eclipse.jface.viewers.IStructuredSelection;

+

+import org.eclipse.jface.wizard.Wizard;

+import org.eclipse.jface.wizard.WizardPage;

+

+import org.eclipse.swt.SWT;

+

+import org.eclipse.swt.events.ModifyListener;

+import org.eclipse.swt.events.ModifyEvent;

+

+import org.eclipse.swt.layout.GridData;

+import org.eclipse.swt.layout.GridLayout;

+

+import org.eclipse.swt.widgets.Combo;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.swt.widgets.Label;

+

+import org.eclipse.ui.INewWizard;

+import org.eclipse.ui.IWorkbench;

+

+import org.eclipse.ui.actions.WorkspaceModifyOperation;

+

+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

+

+import org.eclipse.ui.part.FileEditorInput;

+import org.eclipse.ui.part.ISetSelectionTarget;

+

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelFactory;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

+import org.eclipse.papyrus.facade.provider.FacadeEditPlugin;

+

+

+import org.eclipse.core.runtime.Path;

+

+import org.eclipse.jface.viewers.ISelection;

+import org.eclipse.jface.viewers.StructuredSelection;

+

+import org.eclipse.papyrus.facade.presentation.FacadeEditorPlugin;

+

+import org.eclipse.ui.IWorkbenchPage;

+import org.eclipse.ui.IWorkbenchPart;

+import org.eclipse.ui.IWorkbenchWindow;

+import org.eclipse.ui.PartInitException;

+

+

+/**

+ * This is a simple wizard for creating a new model file.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class VirtualmetamodelModelWizard extends Wizard implements INewWizard {

+	/**

+	 * The supported extensions for created files.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static final List<String> FILE_EXTENSIONS =

+		Collections.unmodifiableList(Arrays.asList(FacadeEditorPlugin.INSTANCE.getString("_UI_VirtualmetamodelEditorFilenameExtensions").split("\\s*,\\s*")));

+

+	/**

+	 * A formatted list of supported file extensions, suitable for display.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static final String FORMATTED_FILE_EXTENSIONS =

+		FacadeEditorPlugin.INSTANCE.getString("_UI_VirtualmetamodelEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");

+

+	/**

+	 * This caches an instance of the model package.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected VirtualmetamodelPackage virtualmetamodelPackage = VirtualmetamodelPackage.eINSTANCE;

+

+	/**

+	 * This caches an instance of the model factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected VirtualmetamodelFactory virtualmetamodelFactory = virtualmetamodelPackage.getVirtualmetamodelFactory();

+

+	/**

+	 * This is the file creation page.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected VirtualmetamodelModelWizardNewFileCreationPage newFileCreationPage;

+

+	/**

+	 * This is the initial object creation page.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected VirtualmetamodelModelWizardInitialObjectCreationPage initialObjectCreationPage;

+

+	/**

+	 * Remember the selection during initialization for populating the default container.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected IStructuredSelection selection;

+

+	/**

+	 * Remember the workbench during initialization.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected IWorkbench workbench;

+

+	/**

+	 * Caches the names of the types that can be created as the root object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected List<String> initialObjectNames;

+

+	/**

+	 * This just records the information.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void init(IWorkbench workbench, IStructuredSelection selection) {

+		this.workbench = workbench;

+		this.selection = selection;

+		setWindowTitle(FacadeEditorPlugin.INSTANCE.getString("_UI_Wizard_label"));

+		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(FacadeEditorPlugin.INSTANCE.getImage("full/wizban/NewVirtualmetamodel")));

+	}

+

+	/**

+	 * Returns the names of the types that can be created as the root object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected Collection<String> getInitialObjectNames() {

+		if (initialObjectNames == null) {

+			initialObjectNames = new ArrayList<String>();

+			for (EClassifier eClassifier : virtualmetamodelPackage.getEClassifiers()) {

+				if (eClassifier instanceof EClass) {

+					EClass eClass = (EClass)eClassifier;

+					if (!eClass.isAbstract()) {

+						initialObjectNames.add(eClass.getName());

+					}

+				}

+			}

+			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());

+		}

+		return initialObjectNames;

+	}

+

+	/**

+	 * Create a new model.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EObject createInitialModel() {

+		EClass eClass = (EClass)virtualmetamodelPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

+		EObject rootObject = virtualmetamodelFactory.create(eClass);

+		return rootObject;

+	}

+

+	/**

+	 * Do the work after everything is specified.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean performFinish() {

+		try {

+			// Remember the file.

+			//

+			final IFile modelFile = getModelFile();

+

+			// Do the work within an operation.

+			//

+			WorkspaceModifyOperation operation =

+				new WorkspaceModifyOperation() {

+					@Override

+					protected void execute(IProgressMonitor progressMonitor) {

+						try {

+							// Create a resource set

+							//

+							ResourceSet resourceSet = new ResourceSetImpl();

+

+							// Get the URI of the model file.

+							//

+							URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);

+

+							// Create a resource for this file.

+							//

+							Resource resource = resourceSet.createResource(fileURI);

+

+							// Add the initial model object to the contents.

+							//

+							EObject rootObject = createInitialModel();

+							if (rootObject != null) {

+								resource.getContents().add(rootObject);

+							}

+

+							// Save the contents of the resource to the file system.

+							//

+							Map<Object, Object> options = new HashMap<Object, Object>();

+							options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());

+							resource.save(options);

+						}

+						catch (Exception exception) {

+							FacadeEditorPlugin.INSTANCE.log(exception);

+						}

+						finally {

+							progressMonitor.done();

+						}

+					}

+				};

+

+			getContainer().run(false, false, operation);

+

+			// Select the new file resource in the current view.

+			//

+			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();

+			IWorkbenchPage page = workbenchWindow.getActivePage();

+			final IWorkbenchPart activePart = page.getActivePart();

+			if (activePart instanceof ISetSelectionTarget) {

+				final ISelection targetSelection = new StructuredSelection(modelFile);

+				getShell().getDisplay().asyncExec

+					(new Runnable() {

+						 public void run() {

+							 ((ISetSelectionTarget)activePart).selectReveal(targetSelection);

+						 }

+					 });

+			}

+

+			// Open an editor on the new file.

+			//

+			try {

+				page.openEditor

+					(new FileEditorInput(modelFile),

+					 workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());					 	 

+			}

+			catch (PartInitException exception) {

+				MessageDialog.openError(workbenchWindow.getShell(), FacadeEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());

+				return false;

+			}

+

+			return true;

+		}

+		catch (Exception exception) {

+			FacadeEditorPlugin.INSTANCE.log(exception);

+			return false;

+		}

+	}

+

+	/**

+	 * This is the one page of the wizard.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public class VirtualmetamodelModelWizardNewFileCreationPage extends WizardNewFileCreationPage {

+		/**

+		 * Pass in the selection.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public VirtualmetamodelModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {

+			super(pageId, selection);

+		}

+

+		/**

+		 * The framework calls this to see if the file is correct.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		@Override

+		protected boolean validatePage() {

+			if (super.validatePage()) {

+				String extension = new Path(getFileName()).getFileExtension();

+				if (extension == null || !FILE_EXTENSIONS.contains(extension)) {

+					String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension";

+					setErrorMessage(FacadeEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));

+					return false;

+				}

+				return true;

+			}

+			return false;

+		}

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public IFile getModelFile() {

+			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));

+		}

+	}

+

+	/**

+	 * This is the page where the type of object to create is selected.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public class VirtualmetamodelModelWizardInitialObjectCreationPage extends WizardPage {

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		protected Combo initialObjectField;

+

+		/**

+		 * @generated

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 */

+		protected List<String> encodings;

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		protected Combo encodingField;

+

+		/**

+		 * Pass in the selection.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public VirtualmetamodelModelWizardInitialObjectCreationPage(String pageId) {

+			super(pageId);

+		}

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public void createControl(Composite parent) {

+			Composite composite = new Composite(parent, SWT.NONE); {

+				GridLayout layout = new GridLayout();

+				layout.numColumns = 1;

+				layout.verticalSpacing = 12;

+				composite.setLayout(layout);

+

+				GridData data = new GridData();

+				data.verticalAlignment = GridData.FILL;

+				data.grabExcessVerticalSpace = true;

+				data.horizontalAlignment = GridData.FILL;

+				composite.setLayoutData(data);

+			}

+

+			Label containerLabel = new Label(composite, SWT.LEFT);

+			{

+				containerLabel.setText(FacadeEditorPlugin.INSTANCE.getString("_UI_ModelObject"));

+

+				GridData data = new GridData();

+				data.horizontalAlignment = GridData.FILL;

+				containerLabel.setLayoutData(data);

+			}

+

+			initialObjectField = new Combo(composite, SWT.BORDER);

+			{

+				GridData data = new GridData();

+				data.horizontalAlignment = GridData.FILL;

+				data.grabExcessHorizontalSpace = true;

+				initialObjectField.setLayoutData(data);

+			}

+

+			for (String objectName : getInitialObjectNames()) {

+				initialObjectField.add(getLabel(objectName));

+			}

+

+			if (initialObjectField.getItemCount() == 1) {

+				initialObjectField.select(0);

+			}

+			initialObjectField.addModifyListener(validator);

+

+			Label encodingLabel = new Label(composite, SWT.LEFT);

+			{

+				encodingLabel.setText(FacadeEditorPlugin.INSTANCE.getString("_UI_XMLEncoding"));

+

+				GridData data = new GridData();

+				data.horizontalAlignment = GridData.FILL;

+				encodingLabel.setLayoutData(data);

+			}

+			encodingField = new Combo(composite, SWT.BORDER);

+			{

+				GridData data = new GridData();

+				data.horizontalAlignment = GridData.FILL;

+				data.grabExcessHorizontalSpace = true;

+				encodingField.setLayoutData(data);

+			}

+

+			for (String encoding : getEncodings()) {

+				encodingField.add(encoding);

+			}

+

+			encodingField.select(0);

+			encodingField.addModifyListener(validator);

+

+			setPageComplete(validatePage());

+			setControl(composite);

+		}

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		protected ModifyListener validator =

+			new ModifyListener() {

+				public void modifyText(ModifyEvent e) {

+					setPageComplete(validatePage());

+				}

+			};

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		protected boolean validatePage() {

+			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());

+		}

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		@Override

+		public void setVisible(boolean visible) {

+			super.setVisible(visible);

+			if (visible) {

+				if (initialObjectField.getItemCount() == 1) {

+					initialObjectField.clearSelection();

+					encodingField.setFocus();

+				}

+				else {

+					encodingField.clearSelection();

+					initialObjectField.setFocus();

+				}

+			}

+		}

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public String getInitialObjectName() {

+			String label = initialObjectField.getText();

+

+			for (String name : getInitialObjectNames()) {

+				if (getLabel(name).equals(label)) {

+					return name;

+				}

+			}

+			return null;

+		}

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public String getEncoding() {

+			return encodingField.getText();

+		}

+

+		/**

+		 * Returns the label for the specified type name.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		protected String getLabel(String typeName) {

+			try {

+				return FacadeEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type");

+			}

+			catch(MissingResourceException mre) {

+				FacadeEditorPlugin.INSTANCE.log(mre);

+			}

+			return typeName;

+		}

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		protected Collection<String> getEncodings() {

+			if (encodings == null) {

+				encodings = new ArrayList<String>();

+				for (StringTokenizer stringTokenizer = new StringTokenizer(FacadeEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) {

+					encodings.add(stringTokenizer.nextToken());

+				}

+			}

+			return encodings;

+		}

+	}

+

+	/**

+	 * The framework calls this to create the contents of the wizard.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+		@Override

+	public void addPages() {

+		// Create a page, set the title, and the initial model file name.

+		//

+		newFileCreationPage = new VirtualmetamodelModelWizardNewFileCreationPage("Whatever", selection);

+		newFileCreationPage.setTitle(FacadeEditorPlugin.INSTANCE.getString("_UI_VirtualmetamodelModelWizard_label"));

+		newFileCreationPage.setDescription(FacadeEditorPlugin.INSTANCE.getString("_UI_VirtualmetamodelModelWizard_description"));

+		newFileCreationPage.setFileName(FacadeEditorPlugin.INSTANCE.getString("_UI_VirtualmetamodelEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0));

+		addPage(newFileCreationPage);

+

+		// Try and get the resource selection to determine a current directory for the file dialog.

+		//

+		if (selection != null && !selection.isEmpty()) {

+			// Get the resource...

+			//

+			Object selectedElement = selection.iterator().next();

+			if (selectedElement instanceof IResource) {

+				// Get the resource parent, if its a file.

+				//

+				IResource selectedResource = (IResource)selectedElement;

+				if (selectedResource.getType() == IResource.FILE) {

+					selectedResource = selectedResource.getParent();

+				}

+

+				// This gives us a directory...

+				//

+				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {

+					// Set this for the container.

+					//

+					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());

+

+					// Make up a unique new name here.

+					//

+					String defaultModelBaseFilename = FacadeEditorPlugin.INSTANCE.getString("_UI_VirtualmetamodelEditorFilenameDefaultBase");

+					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);

+					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension;

+					for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {

+						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension;

+					}

+					newFileCreationPage.setFileName(modelFilename);

+				}

+			}

+		}

+		initialObjectCreationPage = new VirtualmetamodelModelWizardInitialObjectCreationPage("Whatever2");

+		initialObjectCreationPage.setTitle(FacadeEditorPlugin.INSTANCE.getString("_UI_VirtualmetamodelModelWizard_label"));

+		initialObjectCreationPage.setDescription(FacadeEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description"));

+		addPage(initialObjectCreationPage);

+	}

+

+	/**

+	 * Get the file from the page.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public IFile getModelFile() {

+		return newFileCreationPage.getModelFile();

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facademapping/presentation/FacademappingActionBarContributor.java b/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facademapping/presentation/FacademappingActionBarContributor.java
new file mode 100644
index 00000000000..3bb39a269d2
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facademapping/presentation/FacademappingActionBarContributor.java
@@ -0,0 +1,434 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facademapping.presentation;

+

+import java.util.ArrayList;

+import java.util.Collection;

+

+import org.eclipse.emf.common.ui.viewer.IViewerProvider;

+

+import org.eclipse.emf.edit.domain.EditingDomain;

+import org.eclipse.emf.edit.domain.IEditingDomainProvider;

+

+import org.eclipse.emf.edit.ui.action.ControlAction;

+import org.eclipse.emf.edit.ui.action.CreateChildAction;

+import org.eclipse.emf.edit.ui.action.CreateSiblingAction;

+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

+import org.eclipse.emf.edit.ui.action.LoadResourceAction;

+import org.eclipse.emf.edit.ui.action.ValidateAction;

+

+import org.eclipse.jface.action.Action;

+import org.eclipse.jface.action.ActionContributionItem;

+import org.eclipse.jface.action.IAction;

+import org.eclipse.jface.action.IContributionItem;

+import org.eclipse.jface.action.IContributionManager;

+import org.eclipse.jface.action.IMenuListener;

+import org.eclipse.jface.action.IMenuManager;

+import org.eclipse.jface.action.IToolBarManager;

+import org.eclipse.jface.action.MenuManager;

+import org.eclipse.jface.action.Separator;

+import org.eclipse.jface.action.SubContributionItem;

+

+import org.eclipse.jface.viewers.ISelection;

+import org.eclipse.jface.viewers.ISelectionChangedListener;

+import org.eclipse.jface.viewers.ISelectionProvider;

+import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.jface.viewers.SelectionChangedEvent;

+import org.eclipse.jface.viewers.Viewer;

+

+import org.eclipse.ui.IEditorPart;

+import org.eclipse.ui.PartInitException;

+

+/**

+ * This is the action bar contributor for the Facademapping model editor.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class FacademappingActionBarContributor

+	extends EditingDomainActionBarContributor

+	implements ISelectionChangedListener {

+	/**

+	 * This keeps track of the active editor.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected IEditorPart activeEditorPart;

+

+	/**

+	 * This keeps track of the current selection provider.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected ISelectionProvider selectionProvider;

+

+	/**

+	 * This action opens the Properties view.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected IAction showPropertiesViewAction =

+		new Action(FacademappingEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) {

+			@Override

+			public void run() {

+				try {

+					getPage().showView("org.eclipse.ui.views.PropertySheet");

+				}

+				catch (PartInitException exception) {

+					FacademappingEditorPlugin.INSTANCE.log(exception);

+				}

+			}

+		};

+

+	/**

+	 * This action refreshes the viewer of the current editor if the editor

+	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected IAction refreshViewerAction =

+		new Action(FacademappingEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) {

+			@Override

+			public boolean isEnabled() {

+				return activeEditorPart instanceof IViewerProvider;

+			}

+

+			@Override

+			public void run() {

+				if (activeEditorPart instanceof IViewerProvider) {

+					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();

+					if (viewer != null) {

+						viewer.refresh();

+					}

+				}

+			}

+		};

+

+	/**

+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor

+	 * generated for the current selection by the item provider.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected Collection<IAction> createChildActions;

+

+	/**

+	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected IMenuManager createChildMenuManager;

+

+	/**

+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor

+	 * generated for the current selection by the item provider.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected Collection<IAction> createSiblingActions;

+

+	/**

+	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected IMenuManager createSiblingMenuManager;

+

+	/**

+	 * This creates an instance of the contributor.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public FacademappingActionBarContributor() {

+		super(ADDITIONS_LAST_STYLE);

+		loadResourceAction = new LoadResourceAction();

+		validateAction = new ValidateAction();

+		controlAction = new ControlAction();

+	}

+

+	/**

+	 * This adds Separators for editor additions to the tool bar.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void contributeToToolBar(IToolBarManager toolBarManager) {

+		toolBarManager.add(new Separator("facademapping-settings"));

+		toolBarManager.add(new Separator("facademapping-additions"));

+	}

+

+	/**

+	 * This adds to the menu bar a menu and some separators for editor additions,

+	 * as well as the sub-menus for object creation items.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void contributeToMenu(IMenuManager menuManager) {

+		super.contributeToMenu(menuManager);

+

+		IMenuManager submenuManager = new MenuManager(FacademappingEditorPlugin.INSTANCE.getString("_UI_FacademappingEditor_menu"), "org.eclipse.papyrus.facademappingMenuID");

+		menuManager.insertAfter("additions", submenuManager);

+		submenuManager.add(new Separator("settings"));

+		submenuManager.add(new Separator("actions"));

+		submenuManager.add(new Separator("additions"));

+		submenuManager.add(new Separator("additions-end"));

+

+		// Prepare for CreateChild item addition or removal.

+		//

+		createChildMenuManager = new MenuManager(FacademappingEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));

+		submenuManager.insertBefore("additions", createChildMenuManager);

+

+		// Prepare for CreateSibling item addition or removal.

+		//

+		createSiblingMenuManager = new MenuManager(FacademappingEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));

+		submenuManager.insertBefore("additions", createSiblingMenuManager);

+

+		// Force an update because Eclipse hides empty menus now.

+		//

+		submenuManager.addMenuListener

+			(new IMenuListener() {

+				 public void menuAboutToShow(IMenuManager menuManager) {

+					 menuManager.updateAll(true);

+				 }

+			 });

+

+		addGlobalActions(submenuManager);

+	}

+

+	/**

+	 * When the active editor changes, this remembers the change and registers with it as a selection provider.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void setActiveEditor(IEditorPart part) {

+		super.setActiveEditor(part);

+		activeEditorPart = part;

+

+		// Switch to the new selection provider.

+		//

+		if (selectionProvider != null) {

+			selectionProvider.removeSelectionChangedListener(this);

+		}

+		if (part == null) {

+			selectionProvider = null;

+		}

+		else {

+			selectionProvider = part.getSite().getSelectionProvider();

+			selectionProvider.addSelectionChangedListener(this);

+

+			// Fake a selection changed event to update the menus.

+			//

+			if (selectionProvider.getSelection() != null) {

+				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));

+			}

+		}

+	}

+

+	/**

+	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},

+	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings

+	 * that can be added to the selected object and updating the menus accordingly.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void selectionChanged(SelectionChangedEvent event) {

+		// Remove any menu items for old selection.

+		//

+		if (createChildMenuManager != null) {

+			depopulateManager(createChildMenuManager, createChildActions);

+		}

+		if (createSiblingMenuManager != null) {

+			depopulateManager(createSiblingMenuManager, createSiblingActions);

+		}

+

+		// Query the new selection for appropriate new child/sibling descriptors

+		//

+		Collection<?> newChildDescriptors = null;

+		Collection<?> newSiblingDescriptors = null;

+

+		ISelection selection = event.getSelection();

+		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {

+			Object object = ((IStructuredSelection)selection).getFirstElement();

+

+			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();

+

+			newChildDescriptors = domain.getNewChildDescriptors(object, null);

+			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);

+		}

+

+		// Generate actions for selection; populate and redraw the menus.

+		//

+		createChildActions = generateCreateChildActions(newChildDescriptors, selection);

+		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);

+

+		if (createChildMenuManager != null) {

+			populateManager(createChildMenuManager, createChildActions, null);

+			createChildMenuManager.update(true);

+		}

+		if (createSiblingMenuManager != null) {

+			populateManager(createSiblingMenuManager, createSiblingActions, null);

+			createSiblingMenuManager.update(true);

+		}

+	}

+

+	/**

+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,

+	 * and returns the collection of these actions.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {

+		Collection<IAction> actions = new ArrayList<IAction>();

+		if (descriptors != null) {

+			for (Object descriptor : descriptors) {

+				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));

+			}

+		}

+		return actions;

+	}

+

+	/**

+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,

+	 * and returns the collection of these actions.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {

+		Collection<IAction> actions = new ArrayList<IAction>();

+		if (descriptors != null) {

+			for (Object descriptor : descriptors) {

+				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));

+			}

+		}

+		return actions;

+	}

+

+	/**

+	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s

+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,

+	 * by inserting them before the specified contribution item <code>contributionID</code>.

+	 * If <code>contributionID</code> is <code>null</code>, they are simply added.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {

+		if (actions != null) {

+			for (IAction action : actions) {

+				if (contributionID != null) {

+					manager.insertBefore(contributionID, action);

+				}

+				else {

+					manager.add(action);

+				}

+			}

+		}

+	}

+		

+	/**

+	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s

+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {

+		if (actions != null) {

+			IContributionItem[] items = manager.getItems();

+			for (int i = 0; i < items.length; i++) {

+				// Look into SubContributionItems

+				//

+				IContributionItem contributionItem = items[i];

+				while (contributionItem instanceof SubContributionItem) {

+					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();

+				}

+

+				// Delete the ActionContributionItems with matching action.

+				//

+				if (contributionItem instanceof ActionContributionItem) {

+					IAction action = ((ActionContributionItem)contributionItem).getAction();

+					if (actions.contains(action)) {

+						manager.remove(contributionItem);

+					}

+				}

+			}

+		}

+	}

+

+	/**

+	 * This populates the pop-up menu before it appears.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void menuAboutToShow(IMenuManager menuManager) {

+		super.menuAboutToShow(menuManager);

+		MenuManager submenuManager = null;

+

+		submenuManager = new MenuManager(FacademappingEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));

+		populateManager(submenuManager, createChildActions, null);

+		menuManager.insertBefore("edit", submenuManager);

+

+		submenuManager = new MenuManager(FacademappingEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));

+		populateManager(submenuManager, createSiblingActions, null);

+		menuManager.insertBefore("edit", submenuManager);

+	}

+

+	/**

+	 * This inserts global actions before the "additions-end" separator.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected void addGlobalActions(IMenuManager menuManager) {

+		menuManager.insertAfter("additions-end", new Separator("ui-actions"));

+		menuManager.insertAfter("ui-actions", showPropertiesViewAction);

+

+		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		

+		menuManager.insertAfter("ui-actions", refreshViewerAction);

+

+		super.addGlobalActions(menuManager);

+	}

+

+	/**

+	 * This ensures that a delete action will clean up all references to deleted objects.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected boolean removeAllReferencesOnDelete() {

+		return true;

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facademapping/presentation/FacademappingEditor.java b/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facademapping/presentation/FacademappingEditor.java
new file mode 100644
index 00000000000..0fa2b9fd3cd
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facademapping/presentation/FacademappingEditor.java
@@ -0,0 +1,1829 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facademapping.presentation;

+

+

+import java.io.IOException;

+import java.io.InputStream;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Collections;

+import java.util.EventObject;

+import java.util.HashMap;

+import java.util.Iterator;

+import java.util.LinkedHashMap;

+import java.util.List;

+import java.util.Map;

+

+import org.eclipse.core.resources.IFile;

+import org.eclipse.core.resources.IMarker;

+import org.eclipse.core.resources.IResource;

+import org.eclipse.core.resources.IResourceChangeEvent;

+import org.eclipse.core.resources.IResourceChangeListener;

+import org.eclipse.core.resources.IResourceDelta;

+import org.eclipse.core.resources.IResourceDeltaVisitor;

+import org.eclipse.core.resources.ResourcesPlugin;

+

+import org.eclipse.core.runtime.CoreException;

+import org.eclipse.core.runtime.IPath;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.core.runtime.NullProgressMonitor;

+

+import org.eclipse.jface.action.IMenuListener;

+import org.eclipse.jface.action.IMenuManager;

+import org.eclipse.jface.action.IStatusLineManager;

+import org.eclipse.jface.action.IToolBarManager;

+import org.eclipse.jface.action.MenuManager;

+import org.eclipse.jface.action.Separator;

+

+import org.eclipse.jface.dialogs.MessageDialog;

+import org.eclipse.jface.dialogs.ProgressMonitorDialog;

+

+import org.eclipse.jface.util.LocalSelectionTransfer;

+

+import org.eclipse.jface.viewers.ColumnWeightData;

+import org.eclipse.jface.viewers.ISelection;

+import org.eclipse.jface.viewers.ISelectionChangedListener;

+import org.eclipse.jface.viewers.ISelectionProvider;

+import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.jface.viewers.ListViewer;

+import org.eclipse.jface.viewers.SelectionChangedEvent;

+import org.eclipse.jface.viewers.StructuredSelection;

+import org.eclipse.jface.viewers.StructuredViewer;

+import org.eclipse.jface.viewers.TableLayout;

+import org.eclipse.jface.viewers.TableViewer;

+import org.eclipse.jface.viewers.TreeViewer;

+import org.eclipse.jface.viewers.Viewer;

+

+import org.eclipse.swt.SWT;

+

+import org.eclipse.swt.custom.CTabFolder;

+

+import org.eclipse.swt.dnd.DND;

+import org.eclipse.swt.dnd.FileTransfer;

+import org.eclipse.swt.dnd.Transfer;

+

+import org.eclipse.swt.events.ControlAdapter;

+import org.eclipse.swt.events.ControlEvent;

+

+import org.eclipse.swt.graphics.Point;

+

+import org.eclipse.swt.layout.FillLayout;

+

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.swt.widgets.Menu;

+import org.eclipse.swt.widgets.Table;

+import org.eclipse.swt.widgets.TableColumn;

+import org.eclipse.swt.widgets.Tree;

+import org.eclipse.swt.widgets.TreeColumn;

+

+import org.eclipse.ui.IActionBars;

+import org.eclipse.ui.IEditorInput;

+import org.eclipse.ui.IEditorPart;

+import org.eclipse.ui.IEditorSite;

+import org.eclipse.ui.IPartListener;

+import org.eclipse.ui.IWorkbenchPart;

+import org.eclipse.ui.PartInitException;

+

+import org.eclipse.ui.dialogs.SaveAsDialog;

+

+import org.eclipse.ui.ide.IGotoMarker;

+

+import org.eclipse.ui.part.FileEditorInput;

+import org.eclipse.ui.part.MultiPageEditorPart;

+

+import org.eclipse.ui.views.contentoutline.ContentOutline;

+import org.eclipse.ui.views.contentoutline.ContentOutlinePage;

+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;

+

+import org.eclipse.ui.views.properties.IPropertySheetPage;

+import org.eclipse.ui.views.properties.PropertySheet;

+import org.eclipse.ui.views.properties.PropertySheetPage;

+

+import org.eclipse.emf.common.command.BasicCommandStack;

+import org.eclipse.emf.common.command.Command;

+import org.eclipse.emf.common.command.CommandStack;

+import org.eclipse.emf.common.command.CommandStackListener;

+

+import org.eclipse.emf.common.notify.AdapterFactory;

+import org.eclipse.emf.common.notify.Notification;

+

+import org.eclipse.emf.common.ui.MarkerHelper;

+import org.eclipse.emf.common.ui.ViewerPane;

+

+import org.eclipse.emf.common.ui.editor.ProblemEditorPart;

+

+import org.eclipse.emf.common.ui.viewer.IViewerProvider;

+

+import org.eclipse.emf.common.util.BasicDiagnostic;

+import org.eclipse.emf.common.util.Diagnostic;

+import org.eclipse.emf.common.util.URI;

+

+

+import org.eclipse.emf.ecore.resource.Resource;

+import org.eclipse.emf.ecore.resource.ResourceSet;

+

+import org.eclipse.emf.ecore.util.EContentAdapter;

+import org.eclipse.emf.ecore.util.EcoreUtil;

+

+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

+import org.eclipse.emf.edit.domain.EditingDomain;

+import org.eclipse.emf.edit.domain.IEditingDomainProvider;

+

+import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;

+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

+import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;

+

+import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;

+

+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;

+

+import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;

+

+import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;

+import org.eclipse.emf.edit.ui.dnd.LocalTransfer;

+import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;

+

+import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;

+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;

+import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;

+

+import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;

+import org.eclipse.emf.edit.ui.util.EditUIUtil;

+

+import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;

+

+import org.eclipse.papyrus.facademapping.provider.FacademappingItemProviderAdapterFactory;

+

+import org.eclipse.ui.actions.WorkspaceModifyOperation;

+

+

+/**

+ * This is an example of a Facademapping model editor.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class FacademappingEditor

+	extends MultiPageEditorPart

+	implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {

+	/**

+	 * This keeps track of the editing domain that is used to track all changes to the model.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected AdapterFactoryEditingDomain editingDomain;

+

+	/**

+	 * This is the one adapter factory used for providing views of the model.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected ComposedAdapterFactory adapterFactory;

+

+	/**

+	 * This is the content outline page.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected IContentOutlinePage contentOutlinePage;

+

+	/**

+	 * This is a kludge...

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected IStatusLineManager contentOutlineStatusLineManager;

+

+	/**

+	 * This is the content outline page's viewer.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected TreeViewer contentOutlineViewer;

+

+	/**

+	 * This is the property sheet page.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected List<PropertySheetPage> propertySheetPages = new ArrayList<PropertySheetPage>();

+

+	/**

+	 * This is the viewer that shadows the selection in the content outline.

+	 * The parent relation must be correctly defined for this to work.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected TreeViewer selectionViewer;

+

+	/**

+	 * This inverts the roll of parent and child in the content provider and show parents as a tree.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected TreeViewer parentViewer;

+

+	/**

+	 * This shows how a tree view works.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected TreeViewer treeViewer;

+

+	/**

+	 * This shows how a list view works.

+	 * A list viewer doesn't support icons.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected ListViewer listViewer;

+

+	/**

+	 * This shows how a table view works.

+	 * A table can be used as a list with icons.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected TableViewer tableViewer;

+

+	/**

+	 * This shows how a tree view with columns works.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected TreeViewer treeViewerWithColumns;

+

+	/**

+	 * This keeps track of the active viewer pane, in the book.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected ViewerPane currentViewerPane;

+

+	/**

+	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected Viewer currentViewer;

+

+	/**

+	 * This listens to which ever viewer is active.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected ISelectionChangedListener selectionChangedListener;

+

+	/**

+	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();

+

+	/**

+	 * This keeps track of the selection of the editor as a whole.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected ISelection editorSelection = StructuredSelection.EMPTY;

+

+	/**

+	 * The MarkerHelper is responsible for creating workspace resource markers presented

+	 * in Eclipse's Problems View.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected MarkerHelper markerHelper = new EditUIMarkerHelper();

+

+	/**

+	 * This listens for when the outline becomes active

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected IPartListener partListener =

+		new IPartListener() {

+			public void partActivated(IWorkbenchPart p) {

+				if (p instanceof ContentOutline) {

+					if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {

+						getActionBarContributor().setActiveEditor(FacademappingEditor.this);

+

+						setCurrentViewer(contentOutlineViewer);

+					}

+				}

+				else if (p instanceof PropertySheet) {

+					if (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {

+						getActionBarContributor().setActiveEditor(FacademappingEditor.this);

+						handleActivate();

+					}

+				}

+				else if (p == FacademappingEditor.this) {

+					handleActivate();

+				}

+			}

+			public void partBroughtToTop(IWorkbenchPart p) {

+				// Ignore.

+			}

+			public void partClosed(IWorkbenchPart p) {

+				// Ignore.

+			}

+			public void partDeactivated(IWorkbenchPart p) {

+				// Ignore.

+			}

+			public void partOpened(IWorkbenchPart p) {

+				// Ignore.

+			}

+		};

+

+	/**

+	 * Resources that have been removed since last activation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected Collection<Resource> removedResources = new ArrayList<Resource>();

+

+	/**

+	 * Resources that have been changed since last activation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected Collection<Resource> changedResources = new ArrayList<Resource>();

+

+	/**

+	 * Resources that have been saved.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected Collection<Resource> savedResources = new ArrayList<Resource>();

+

+	/**

+	 * Map to store the diagnostic associated with a resource.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();

+

+	/**

+	 * Controls whether the problem indication should be updated.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected boolean updateProblemIndication = true;

+

+	/**

+	 * Adapter used to update the problem indication when resources are demanded loaded.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EContentAdapter problemIndicationAdapter =

+		new EContentAdapter() {

+			@Override

+			public void notifyChanged(Notification notification) {

+				if (notification.getNotifier() instanceof Resource) {

+					switch (notification.getFeatureID(Resource.class)) {

+						case Resource.RESOURCE__IS_LOADED:

+						case Resource.RESOURCE__ERRORS:

+						case Resource.RESOURCE__WARNINGS: {

+							Resource resource = (Resource)notification.getNotifier();

+							Diagnostic diagnostic = analyzeResourceProblems(resource, null);

+							if (diagnostic.getSeverity() != Diagnostic.OK) {

+								resourceToDiagnosticMap.put(resource, diagnostic);

+							}

+							else {

+								resourceToDiagnosticMap.remove(resource);

+							}

+

+							if (updateProblemIndication) {

+								getSite().getShell().getDisplay().asyncExec

+									(new Runnable() {

+										 public void run() {

+											 updateProblemIndication();

+										 }

+									 });

+							}

+							break;

+						}

+					}

+				}

+				else {

+					super.notifyChanged(notification);

+				}

+			}

+

+			@Override

+			protected void setTarget(Resource target) {

+				basicSetTarget(target);

+			}

+

+			@Override

+			protected void unsetTarget(Resource target) {

+				basicUnsetTarget(target);

+				resourceToDiagnosticMap.remove(target);

+				if (updateProblemIndication) {

+					getSite().getShell().getDisplay().asyncExec

+						(new Runnable() {

+							 public void run() {

+								 updateProblemIndication();

+							 }

+						 });

+				}

+			}

+		};

+

+	/**

+	 * This listens for workspace changes.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected IResourceChangeListener resourceChangeListener =

+		new IResourceChangeListener() {

+			public void resourceChanged(IResourceChangeEvent event) {

+				IResourceDelta delta = event.getDelta();

+				try {

+					class ResourceDeltaVisitor implements IResourceDeltaVisitor {

+						protected ResourceSet resourceSet = editingDomain.getResourceSet();

+						protected Collection<Resource> changedResources = new ArrayList<Resource>();

+						protected Collection<Resource> removedResources = new ArrayList<Resource>();

+

+						public boolean visit(IResourceDelta delta) {

+							if (delta.getResource().getType() == IResource.FILE) {

+								if (delta.getKind() == IResourceDelta.REMOVED ||

+								    delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {

+									Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);

+									if (resource != null) {

+										if (delta.getKind() == IResourceDelta.REMOVED) {

+											removedResources.add(resource);

+										}

+										else if (!savedResources.remove(resource)) {

+											changedResources.add(resource);

+										}

+									}

+								}

+								return false;

+							}

+

+							return true;

+						}

+

+						public Collection<Resource> getChangedResources() {

+							return changedResources;

+						}

+

+						public Collection<Resource> getRemovedResources() {

+							return removedResources;

+						}

+					}

+

+					final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();

+					delta.accept(visitor);

+

+					if (!visitor.getRemovedResources().isEmpty()) {

+						getSite().getShell().getDisplay().asyncExec

+							(new Runnable() {

+								 public void run() {

+									 removedResources.addAll(visitor.getRemovedResources());

+									 if (!isDirty()) {

+										 getSite().getPage().closeEditor(FacademappingEditor.this, false);

+									 }

+								 }

+							 });

+					}

+

+					if (!visitor.getChangedResources().isEmpty()) {

+						getSite().getShell().getDisplay().asyncExec

+							(new Runnable() {

+								 public void run() {

+									 changedResources.addAll(visitor.getChangedResources());

+									 if (getSite().getPage().getActiveEditor() == FacademappingEditor.this) {

+										 handleActivate();

+									 }

+								 }

+							 });

+					}

+				}

+				catch (CoreException exception) {

+					FacademappingEditorPlugin.INSTANCE.log(exception);

+				}

+			}

+		};

+

+	/**

+	 * Handles activation of the editor or it's associated views.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void handleActivate() {

+		// Recompute the read only state.

+		//

+		if (editingDomain.getResourceToReadOnlyMap() != null) {

+		  editingDomain.getResourceToReadOnlyMap().clear();

+

+		  // Refresh any actions that may become enabled or disabled.

+		  //

+		  setSelection(getSelection());

+		}

+

+		if (!removedResources.isEmpty()) {

+			if (handleDirtyConflict()) {

+				getSite().getPage().closeEditor(FacademappingEditor.this, false);

+			}

+			else {

+				removedResources.clear();

+				changedResources.clear();

+				savedResources.clear();

+			}

+		}

+		else if (!changedResources.isEmpty()) {

+			changedResources.removeAll(savedResources);

+			handleChangedResources();

+			changedResources.clear();

+			savedResources.clear();

+		}

+	}

+

+	/**

+	 * Handles what to do with changed resources on activation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void handleChangedResources() {

+		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {

+			if (isDirty()) {

+				changedResources.addAll(editingDomain.getResourceSet().getResources());

+			}

+			editingDomain.getCommandStack().flush();

+

+			updateProblemIndication = false;

+			for (Resource resource : changedResources) {

+				if (resource.isLoaded()) {

+					resource.unload();

+					try {

+						resource.load(Collections.EMPTY_MAP);

+					}

+					catch (IOException exception) {

+						if (!resourceToDiagnosticMap.containsKey(resource)) {

+							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

+						}

+					}

+				}

+			}

+

+			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {

+				setSelection(StructuredSelection.EMPTY);

+			}

+

+			updateProblemIndication = true;

+			updateProblemIndication();

+		}

+	}

+

+	/**

+	 * Updates the problems indication with the information described in the specified diagnostic.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void updateProblemIndication() {

+		if (updateProblemIndication) {

+			BasicDiagnostic diagnostic =

+				new BasicDiagnostic

+					(Diagnostic.OK,

+					 "org.eclipse.papyrus.facade.editor",

+					 0,

+					 null,

+					 new Object [] { editingDomain.getResourceSet() });

+			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {

+				if (childDiagnostic.getSeverity() != Diagnostic.OK) {

+					diagnostic.add(childDiagnostic);

+				}

+			}

+

+			int lastEditorPage = getPageCount() - 1;

+			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {

+				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);

+				if (diagnostic.getSeverity() != Diagnostic.OK) {

+					setActivePage(lastEditorPage);

+				}

+			}

+			else if (diagnostic.getSeverity() != Diagnostic.OK) {

+				ProblemEditorPart problemEditorPart = new ProblemEditorPart();

+				problemEditorPart.setDiagnostic(diagnostic);

+				problemEditorPart.setMarkerHelper(markerHelper);

+				try {

+					addPage(++lastEditorPage, problemEditorPart, getEditorInput());

+					setPageText(lastEditorPage, problemEditorPart.getPartName());

+					setActivePage(lastEditorPage);

+					showTabs();

+				}

+				catch (PartInitException exception) {

+					FacademappingEditorPlugin.INSTANCE.log(exception);

+				}

+			}

+

+			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {

+				markerHelper.deleteMarkers(editingDomain.getResourceSet());

+				if (diagnostic.getSeverity() != Diagnostic.OK) {

+					try {

+						markerHelper.createMarkers(diagnostic);

+					}

+					catch (CoreException exception) {

+						FacademappingEditorPlugin.INSTANCE.log(exception);

+					}

+				}

+			}

+		}

+	}

+

+	/**

+	 * Shows a dialog that asks if conflicting changes should be discarded.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected boolean handleDirtyConflict() {

+		return

+			MessageDialog.openQuestion

+				(getSite().getShell(),

+				 getString("_UI_FileConflict_label"),

+				 getString("_WARN_FileConflict"));

+	}

+

+	/**

+	 * This creates a model editor.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public FacademappingEditor() {

+		super();

+		initializeEditingDomain();

+	}

+

+	/**

+	 * This sets up the editing domain for the model editor.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void initializeEditingDomain() {

+		// Create an adapter factory that yields item providers.

+		//

+		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);

+

+		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());

+		adapterFactory.addAdapterFactory(new FacademappingItemProviderAdapterFactory());

+		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());

+

+		// Create the command stack that will notify this editor as commands are executed.

+		//

+		BasicCommandStack commandStack = new BasicCommandStack();

+

+		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.

+		//

+		commandStack.addCommandStackListener

+			(new CommandStackListener() {

+				 public void commandStackChanged(final EventObject event) {

+					 getContainer().getDisplay().asyncExec

+						 (new Runnable() {

+							  public void run() {

+								  firePropertyChange(IEditorPart.PROP_DIRTY);

+

+								  // Try to select the affected objects.

+								  //

+								  Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();

+								  if (mostRecentCommand != null) {

+									  setSelectionToViewer(mostRecentCommand.getAffectedObjects());

+								  }

+								  for (Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext(); ) {

+									  PropertySheetPage propertySheetPage = i.next();

+									  if (propertySheetPage.getControl().isDisposed()) {

+										  i.remove();

+									  }

+									  else {

+										  propertySheetPage.refresh();

+									  }

+								  }

+							  }

+						  });

+				 }

+			 });

+

+		// Create the editing domain with a special command stack.

+		//

+		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());

+	}

+

+	/**

+	 * This is here for the listener to be able to call it.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+			@Override

+	protected void firePropertyChange(int action) {

+		super.firePropertyChange(action);

+	}

+

+	/**

+	 * This sets the selection into whichever viewer is active.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setSelectionToViewer(Collection<?> collection) {

+		final Collection<?> theSelection = collection;

+		// Make sure it's okay.

+		//

+		if (theSelection != null && !theSelection.isEmpty()) {

+			Runnable runnable =

+				new Runnable() {

+					public void run() {

+						// Try to select the items in the current content viewer of the editor.

+						//

+						if (currentViewer != null) {

+							currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);

+						}

+					}

+				};

+			getSite().getShell().getDisplay().asyncExec(runnable);

+		}

+	}

+

+	/**

+	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.

+	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain}

+	 * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EditingDomain getEditingDomain() {

+		return editingDomain;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {

+			super(adapterFactory);

+		}

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		@Override

+		public Object [] getElements(Object object) {

+			Object parent = super.getParent(object);

+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

+		}

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		@Override

+		public Object [] getChildren(Object object) {

+			Object parent = super.getParent(object);

+			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();

+		}

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		@Override

+		public boolean hasChildren(Object object) {

+			Object parent = super.getParent(object);

+			return parent != null;

+		}

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		@Override

+		public Object getParent(Object object) {

+			return null;

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setCurrentViewerPane(ViewerPane viewerPane) {

+		if (currentViewerPane != viewerPane) {

+			if (currentViewerPane != null) {

+				currentViewerPane.showFocus(false);

+			}

+			currentViewerPane = viewerPane;

+		}

+		setCurrentViewer(currentViewerPane.getViewer());

+	}

+

+	/**

+	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,

+	 * is the current one.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setCurrentViewer(Viewer viewer) {

+		// If it is changing...

+		//

+		if (currentViewer != viewer) {

+			if (selectionChangedListener == null) {

+				// Create the listener on demand.

+				//

+				selectionChangedListener =

+					new ISelectionChangedListener() {

+						// This just notifies those things that are affected by the section.

+						//

+						public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {

+							setSelection(selectionChangedEvent.getSelection());

+						}

+					};

+			}

+

+			// Stop listening to the old one.

+			//

+			if (currentViewer != null) {

+				currentViewer.removeSelectionChangedListener(selectionChangedListener);

+			}

+

+			// Start listening to the new one.

+			//

+			if (viewer != null) {

+				viewer.addSelectionChangedListener(selectionChangedListener);

+			}

+

+			// Remember it.

+			//

+			currentViewer = viewer;

+

+			// Set the editors selection based on the current viewer's selection.

+			//

+			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());

+		}

+	}

+

+	/**

+	 * This returns the viewer as required by the {@link IViewerProvider} interface.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public Viewer getViewer() {

+		return currentViewer;

+	}

+

+	/**

+	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void createContextMenuFor(StructuredViewer viewer) {

+		MenuManager contextMenu = new MenuManager("#PopUp");

+		contextMenu.add(new Separator("additions"));

+		contextMenu.setRemoveAllWhenShown(true);

+		contextMenu.addMenuListener(this);

+		Menu menu= contextMenu.createContextMenu(viewer.getControl());

+		viewer.getControl().setMenu(menu);

+		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));

+

+		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;

+		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance(), LocalSelectionTransfer.getTransfer(), FileTransfer.getInstance() };

+		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));

+		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));

+	}

+

+	/**

+	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void createModel() {

+		URI resourceURI = EditUIUtil.getURI(getEditorInput());

+		Exception exception = null;

+		Resource resource = null;

+		try {

+			// Load the resource through the editing domain.

+			//

+			resource = editingDomain.getResourceSet().getResource(resourceURI, true);

+		}

+		catch (Exception e) {

+			exception = e;

+			resource = editingDomain.getResourceSet().getResource(resourceURI, false);

+		}

+

+		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);

+		if (diagnostic.getSeverity() != Diagnostic.OK) {

+			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));

+		}

+		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);

+	}

+

+	/**

+	 * Returns a diagnostic describing the errors and warnings listed in the resource

+	 * and the specified exception (if any).

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {

+		if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {

+			BasicDiagnostic basicDiagnostic =

+				new BasicDiagnostic

+					(Diagnostic.ERROR,

+					 "org.eclipse.papyrus.facade.editor",

+					 0,

+					 getString("_UI_CreateModelError_message", resource.getURI()),

+					 new Object [] { exception == null ? (Object)resource : exception });

+			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));

+			return basicDiagnostic;

+		}

+		else if (exception != null) {

+			return

+				new BasicDiagnostic

+					(Diagnostic.ERROR,

+					 "org.eclipse.papyrus.facade.editor",

+					 0,

+					 getString("_UI_CreateModelError_message", resource.getURI()),

+					 new Object[] { exception });

+		}

+		else {

+			return Diagnostic.OK_INSTANCE;

+		}

+	}

+

+	/**

+	 * This is the method used by the framework to install your own controls.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void createPages() {

+		// Creates the model from the editor input

+		//

+		createModel();

+

+		// Only creates the other pages if there is something that can be edited

+		//

+		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {

+			// Create a page for the selection tree view.

+			//

+			{

+				ViewerPane viewerPane =

+					new ViewerPane(getSite().getPage(), FacademappingEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							Tree tree = new Tree(composite, SWT.MULTI);

+							TreeViewer newTreeViewer = new TreeViewer(tree);

+							return newTreeViewer;

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

+				viewerPane.createControl(getContainer());

+

+				selectionViewer = (TreeViewer)viewerPane.getViewer();

+				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

+

+				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

+				selectionViewer.setInput(editingDomain.getResourceSet());

+				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

+				viewerPane.setTitle(editingDomain.getResourceSet());

+

+				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);

+

+				createContextMenuFor(selectionViewer);

+				int pageIndex = addPage(viewerPane.getControl());

+				setPageText(pageIndex, getString("_UI_SelectionPage_label"));

+			}

+

+			// Create a page for the parent tree view.

+			//

+			{

+				ViewerPane viewerPane =

+					new ViewerPane(getSite().getPage(), FacademappingEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							Tree tree = new Tree(composite, SWT.MULTI);

+							TreeViewer newTreeViewer = new TreeViewer(tree);

+							return newTreeViewer;

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

+				viewerPane.createControl(getContainer());

+

+				parentViewer = (TreeViewer)viewerPane.getViewer();

+				parentViewer.setAutoExpandLevel(30);

+				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));

+				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

+

+				createContextMenuFor(parentViewer);

+				int pageIndex = addPage(viewerPane.getControl());

+				setPageText(pageIndex, getString("_UI_ParentPage_label"));

+			}

+

+			// This is the page for the list viewer

+			//

+			{

+				ViewerPane viewerPane =

+					new ViewerPane(getSite().getPage(), FacademappingEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new ListViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

+				viewerPane.createControl(getContainer());

+				listViewer = (ListViewer)viewerPane.getViewer();

+				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

+				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

+

+				createContextMenuFor(listViewer);

+				int pageIndex = addPage(viewerPane.getControl());

+				setPageText(pageIndex, getString("_UI_ListPage_label"));

+			}

+

+			// This is the page for the tree viewer

+			//

+			{

+				ViewerPane viewerPane =

+					new ViewerPane(getSite().getPage(), FacademappingEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new TreeViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

+				viewerPane.createControl(getContainer());

+				treeViewer = (TreeViewer)viewerPane.getViewer();

+				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

+				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

+

+				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);

+

+				createContextMenuFor(treeViewer);

+				int pageIndex = addPage(viewerPane.getControl());

+				setPageText(pageIndex, getString("_UI_TreePage_label"));

+			}

+

+			// This is the page for the table viewer.

+			//

+			{

+				ViewerPane viewerPane =

+					new ViewerPane(getSite().getPage(), FacademappingEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new TableViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

+				viewerPane.createControl(getContainer());

+				tableViewer = (TableViewer)viewerPane.getViewer();

+

+				Table table = tableViewer.getTable();

+				TableLayout layout = new TableLayout();

+				table.setLayout(layout);

+				table.setHeaderVisible(true);

+				table.setLinesVisible(true);

+

+				TableColumn objectColumn = new TableColumn(table, SWT.NONE);

+				layout.addColumnData(new ColumnWeightData(3, 100, true));

+				objectColumn.setText(getString("_UI_ObjectColumn_label"));

+				objectColumn.setResizable(true);

+

+				TableColumn selfColumn = new TableColumn(table, SWT.NONE);

+				layout.addColumnData(new ColumnWeightData(2, 100, true));

+				selfColumn.setText(getString("_UI_SelfColumn_label"));

+				selfColumn.setResizable(true);

+

+				tableViewer.setColumnProperties(new String [] {"a", "b"});

+				tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

+				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

+

+				createContextMenuFor(tableViewer);

+				int pageIndex = addPage(viewerPane.getControl());

+				setPageText(pageIndex, getString("_UI_TablePage_label"));

+			}

+

+			// This is the page for the table tree viewer.

+			//

+			{

+				ViewerPane viewerPane =

+					new ViewerPane(getSite().getPage(), FacademappingEditor.this) {

+						@Override

+						public Viewer createViewer(Composite composite) {

+							return new TreeViewer(composite);

+						}

+						@Override

+						public void requestActivation() {

+							super.requestActivation();

+							setCurrentViewerPane(this);

+						}

+					};

+				viewerPane.createControl(getContainer());

+

+				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();

+

+				Tree tree = treeViewerWithColumns.getTree();

+				tree.setLayoutData(new FillLayout());

+				tree.setHeaderVisible(true);

+				tree.setLinesVisible(true);

+

+				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);

+				objectColumn.setText(getString("_UI_ObjectColumn_label"));

+				objectColumn.setResizable(true);

+				objectColumn.setWidth(250);

+

+				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);

+				selfColumn.setText(getString("_UI_SelfColumn_label"));

+				selfColumn.setResizable(true);

+				selfColumn.setWidth(200);

+

+				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"});

+				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

+				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

+

+				createContextMenuFor(treeViewerWithColumns);

+				int pageIndex = addPage(viewerPane.getControl());

+				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label"));

+			}

+

+			getSite().getShell().getDisplay().asyncExec

+				(new Runnable() {

+					 public void run() {

+						 setActivePage(0);

+					 }

+				 });

+		}

+

+		// Ensures that this editor will only display the page's tab

+		// area if there are more than one page

+		//

+		getContainer().addControlListener

+			(new ControlAdapter() {

+				boolean guard = false;

+				@Override

+				public void controlResized(ControlEvent event) {

+					if (!guard) {

+						guard = true;

+						hideTabs();

+						guard = false;

+					}

+				}

+			 });

+

+		getSite().getShell().getDisplay().asyncExec

+			(new Runnable() {

+				 public void run() {

+					 updateProblemIndication();

+				 }

+			 });

+	}

+

+	/**

+	 * If there is just one page in the multi-page editor part,

+	 * this hides the single tab at the bottom.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void hideTabs() {

+		if (getPageCount() <= 1) {

+			setPageText(0, "");

+			if (getContainer() instanceof CTabFolder) {

+				((CTabFolder)getContainer()).setTabHeight(1);

+				Point point = getContainer().getSize();

+				getContainer().setSize(point.x, point.y + 6);

+			}

+		}

+	}

+

+	/**

+	 * If there is more than one page in the multi-page editor part,

+	 * this shows the tabs at the bottom.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void showTabs() {

+		if (getPageCount() > 1) {

+			setPageText(0, getString("_UI_SelectionPage_label"));

+			if (getContainer() instanceof CTabFolder) {

+				((CTabFolder)getContainer()).setTabHeight(SWT.DEFAULT);

+				Point point = getContainer().getSize();

+				getContainer().setSize(point.x, point.y - 6);

+			}

+		}

+	}

+

+	/**

+	 * This is used to track the active viewer.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected void pageChange(int pageIndex) {

+		super.pageChange(pageIndex);

+

+		if (contentOutlinePage != null) {

+			handleContentOutlineSelection(contentOutlinePage.getSelection());

+		}

+	}

+

+	/**

+	 * This is how the framework determines which interfaces we implement.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	@Override

+	public Object getAdapter(Class key) {

+		if (key.equals(IContentOutlinePage.class)) {

+			return showOutlineView() ? getContentOutlinePage() : null;

+		}

+		else if (key.equals(IPropertySheetPage.class)) {

+			return getPropertySheetPage();

+		}

+		else if (key.equals(IGotoMarker.class)) {

+			return this;

+		}

+		else {

+			return super.getAdapter(key);

+		}

+	}

+

+	/**

+	 * This accesses a cached version of the content outliner.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public IContentOutlinePage getContentOutlinePage() {

+		if (contentOutlinePage == null) {

+			// The content outline is just a tree.

+			//

+			class MyContentOutlinePage extends ContentOutlinePage {

+				@Override

+				public void createControl(Composite parent) {

+					super.createControl(parent);

+					contentOutlineViewer = getTreeViewer();

+					contentOutlineViewer.addSelectionChangedListener(this);

+

+					// Set up the tree viewer.

+					//

+					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));

+					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));

+					contentOutlineViewer.setInput(editingDomain.getResourceSet());

+

+					// Make sure our popups work.

+					//

+					createContextMenuFor(contentOutlineViewer);

+

+					if (!editingDomain.getResourceSet().getResources().isEmpty()) {

+					  // Select the root object in the view.

+					  //

+					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);

+					}

+				}

+

+				@Override

+				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {

+					super.makeContributions(menuManager, toolBarManager, statusLineManager);

+					contentOutlineStatusLineManager = statusLineManager;

+				}

+

+				@Override

+				public void setActionBars(IActionBars actionBars) {

+					super.setActionBars(actionBars);

+					getActionBarContributor().shareGlobalActions(this, actionBars);

+				}

+			}

+

+			contentOutlinePage = new MyContentOutlinePage();

+

+			// Listen to selection so that we can handle it is a special way.

+			//

+			contentOutlinePage.addSelectionChangedListener

+				(new ISelectionChangedListener() {

+					 // This ensures that we handle selections correctly.

+					 //

+					 public void selectionChanged(SelectionChangedEvent event) {

+						 handleContentOutlineSelection(event.getSelection());

+					 }

+				 });

+		}

+

+		return contentOutlinePage;

+	}

+

+	/**

+	 * This accesses a cached version of the property sheet.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public IPropertySheetPage getPropertySheetPage() {

+		PropertySheetPage propertySheetPage =

+			new ExtendedPropertySheetPage(editingDomain) {

+				@Override

+				public void setSelectionToViewer(List<?> selection) {

+					FacademappingEditor.this.setSelectionToViewer(selection);

+					FacademappingEditor.this.setFocus();

+				}

+

+				@Override

+				public void setActionBars(IActionBars actionBars) {

+					super.setActionBars(actionBars);

+					getActionBarContributor().shareGlobalActions(this, actionBars);

+				}

+			};

+		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));

+		propertySheetPages.add(propertySheetPage);

+

+		return propertySheetPage;

+	}

+

+	/**

+	 * This deals with how we want selection in the outliner to affect the other views.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void handleContentOutlineSelection(ISelection selection) {

+		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {

+			Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();

+			if (selectedElements.hasNext()) {

+				// Get the first selected element.

+				//

+				Object selectedElement = selectedElements.next();

+

+				// If it's the selection viewer, then we want it to select the same selection as this selection.

+				//

+				if (currentViewerPane.getViewer() == selectionViewer) {

+					ArrayList<Object> selectionList = new ArrayList<Object>();

+					selectionList.add(selectedElement);

+					while (selectedElements.hasNext()) {

+						selectionList.add(selectedElements.next());

+					}

+

+					// Set the selection to the widget.

+					//

+					selectionViewer.setSelection(new StructuredSelection(selectionList));

+				}

+				else {

+					// Set the input to the widget.

+					//

+					if (currentViewerPane.getViewer().getInput() != selectedElement) {

+						currentViewerPane.getViewer().setInput(selectedElement);

+						currentViewerPane.setTitle(selectedElement);

+					}

+				}

+			}

+		}

+	}

+

+	/**

+	 * This is for implementing {@link IEditorPart} and simply tests the command stack.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean isDirty() {

+		return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded();

+	}

+

+	/**

+	 * This is for implementing {@link IEditorPart} and simply saves the model file.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void doSave(IProgressMonitor progressMonitor) {

+		// Save only resources that have actually changed.

+		//

+		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();

+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

+		saveOptions.put(Resource.OPTION_LINE_DELIMITER, Resource.OPTION_LINE_DELIMITER_UNSPECIFIED);

+

+		// Do the work within an operation because this is a long running activity that modifies the workbench.

+		//

+		WorkspaceModifyOperation operation =

+			new WorkspaceModifyOperation() {

+				// This is the method that gets invoked when the operation runs.

+				//

+				@Override

+				public void execute(IProgressMonitor monitor) {

+					// Save the resources to the file system.

+					//

+					boolean first = true;

+					for (Resource resource : editingDomain.getResourceSet().getResources()) {

+						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {

+							try {

+								long timeStamp = resource.getTimeStamp();

+								resource.save(saveOptions);

+								if (resource.getTimeStamp() != timeStamp) {

+									savedResources.add(resource);

+								}

+							}

+							catch (Exception exception) {

+								resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));

+							}

+							first = false;

+						}

+					}

+				}

+			};

+

+		updateProblemIndication = false;

+		try {

+			// This runs the options, and shows progress.

+			//

+			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);

+

+			// Refresh the necessary state.

+			//

+			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();

+			firePropertyChange(IEditorPart.PROP_DIRTY);

+		}

+		catch (Exception exception) {

+			// Something went wrong that shouldn't.

+			//

+			FacademappingEditorPlugin.INSTANCE.log(exception);

+		}

+		updateProblemIndication = true;

+		updateProblemIndication();

+	}

+

+	/**

+	 * This returns whether something has been persisted to the URI of the specified resource.

+	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected boolean isPersisted(Resource resource) {

+		boolean result = false;

+		try {

+			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());

+			if (stream != null) {

+				result = true;

+				stream.close();

+			}

+		}

+		catch (IOException e) {

+			// Ignore

+		}

+		return result;

+	}

+

+	/**

+	 * This always returns true because it is not currently supported.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean isSaveAsAllowed() {

+		return true;

+	}

+

+	/**

+	 * This also changes the editor's input.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void doSaveAs() {

+		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());

+		saveAsDialog.open();

+		IPath path = saveAsDialog.getResult();

+		if (path != null) {

+			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);

+			if (file != null) {

+				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));

+			}

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected void doSaveAs(URI uri, IEditorInput editorInput) {

+		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);

+		setInputWithNotify(editorInput);

+		setPartName(editorInput.getName());

+		IProgressMonitor progressMonitor =

+			getActionBars().getStatusLineManager() != null ?

+				getActionBars().getStatusLineManager().getProgressMonitor() :

+				new NullProgressMonitor();

+		doSave(progressMonitor);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void gotoMarker(IMarker marker) {

+		List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);

+		if (!targetObjects.isEmpty()) {

+			setSelectionToViewer(targetObjects);

+		}

+	}

+

+	/**

+	 * This is called during startup.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void init(IEditorSite site, IEditorInput editorInput) {

+		setSite(site);

+		setInputWithNotify(editorInput);

+		setPartName(editorInput.getName());

+		site.setSelectionProvider(this);

+		site.getPage().addPartListener(partListener);

+		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void setFocus() {

+		if (currentViewerPane != null) {

+			currentViewerPane.setFocus();

+		}

+		else {

+			getControl(getActivePage()).setFocus();

+		}

+	}

+

+	/**

+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void addSelectionChangedListener(ISelectionChangedListener listener) {

+		selectionChangedListeners.add(listener);

+	}

+

+	/**

+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void removeSelectionChangedListener(ISelectionChangedListener listener) {

+		selectionChangedListeners.remove(listener);

+	}

+

+	/**

+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public ISelection getSelection() {

+		return editorSelection;

+	}

+

+	/**

+	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.

+	 * Calling this result will notify the listeners.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setSelection(ISelection selection) {

+		editorSelection = selection;

+

+		for (ISelectionChangedListener listener : selectionChangedListeners) {

+			listener.selectionChanged(new SelectionChangedEvent(this, selection));

+		}

+		setStatusLineManager(selection);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setStatusLineManager(ISelection selection) {

+		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?

+			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();

+

+		if (statusLineManager != null) {

+			if (selection instanceof IStructuredSelection) {

+				Collection<?> collection = ((IStructuredSelection)selection).toList();

+				switch (collection.size()) {

+					case 0: {

+						statusLineManager.setMessage(getString("_UI_NoObjectSelected"));

+						break;

+					}

+					case 1: {

+						String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());

+						statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text));

+						break;

+					}

+					default: {

+						statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size())));

+						break;

+					}

+				}

+			}

+			else {

+				statusLineManager.setMessage("");

+			}

+		}

+	}

+

+	/**

+	 * This looks up a string in the plugin's plugin.properties file.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private static String getString(String key) {

+		return FacademappingEditorPlugin.INSTANCE.getString(key);

+	}

+

+	/**

+	 * This looks up a string in plugin.properties, making a substitution.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private static String getString(String key, Object s1) {

+		return FacademappingEditorPlugin.INSTANCE.getString(key, new Object [] { s1 });

+	}

+

+	/**

+	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void menuAboutToShow(IMenuManager menuManager) {

+		((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EditingDomainActionBarContributor getActionBarContributor() {

+		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public IActionBars getActionBars() {

+		return getActionBarContributor().getActionBars();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public AdapterFactory getAdapterFactory() {

+		return adapterFactory;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void dispose() {

+		updateProblemIndication = false;

+

+		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);

+

+		getSite().getPage().removePartListener(partListener);

+

+		adapterFactory.dispose();

+

+		if (getActionBarContributor().getActiveEditor() == this) {

+			getActionBarContributor().setActiveEditor(null);

+		}

+

+		for (PropertySheetPage propertySheetPage : propertySheetPages) {

+			propertySheetPage.dispose();

+		}

+

+		if (contentOutlinePage != null) {

+			contentOutlinePage.dispose();

+		}

+

+		super.dispose();

+	}

+

+	/**

+	 * Returns whether the outline view should be presented to the user.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected boolean showOutlineView() {

+		return true;

+	}

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facademapping/presentation/FacademappingEditorPlugin.java b/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facademapping/presentation/FacademappingEditorPlugin.java
new file mode 100644
index 00000000000..196e507c472
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facademapping/presentation/FacademappingEditorPlugin.java
@@ -0,0 +1,102 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facademapping.presentation;

+

+import org.eclipse.emf.common.EMFPlugin;

+

+import org.eclipse.emf.common.ui.EclipseUIPlugin;

+

+import org.eclipse.emf.common.util.ResourceLocator;

+

+/**

+ * This is the central singleton for the Facademapping editor plugin.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public final class FacademappingEditorPlugin extends EMFPlugin {

+	/**

+	 * Keep track of the singleton.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static final FacademappingEditorPlugin INSTANCE = new FacademappingEditorPlugin();

+	

+	/**

+	 * Keep track of the singleton.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private static Implementation plugin;

+

+	/**

+	 * Create the instance.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public FacademappingEditorPlugin() {

+		super

+			(new ResourceLocator [] {

+			});

+	}

+

+	/**

+	 * Returns the singleton instance of the Eclipse plugin.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the singleton instance.

+	 * @generated

+	 */

+	@Override

+	public ResourceLocator getPluginResourceLocator() {

+		return plugin;

+	}

+	

+	/**

+	 * Returns the singleton instance of the Eclipse plugin.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the singleton instance.

+	 * @generated

+	 */

+	public static Implementation getPlugin() {

+		return plugin;

+	}

+	

+	/**

+	 * The actual implementation of the Eclipse <b>Plugin</b>.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static class Implementation extends EclipseUIPlugin {

+		/**

+		 * Creates an instance.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public Implementation() {

+			super();

+	

+			// Remember the static instance.

+			//

+			plugin = this;

+		}

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facademapping/presentation/FacademappingModelWizard.java b/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facademapping/presentation/FacademappingModelWizard.java
new file mode 100644
index 00000000000..37492ec1cb6
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.editor/src/org/eclipse/papyrus/facademapping/presentation/FacademappingModelWizard.java
@@ -0,0 +1,639 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facademapping.presentation;

+

+

+import java.util.ArrayList;

+import java.util.Arrays;

+import java.util.Collection;

+import java.util.Collections;

+import java.util.HashMap;

+import java.util.List;

+import java.util.Map;

+import java.util.MissingResourceException;

+import java.util.StringTokenizer;

+

+import org.eclipse.emf.common.CommonPlugin;

+

+import org.eclipse.emf.common.util.URI;

+

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EClassifier;

+

+import org.eclipse.emf.ecore.resource.Resource;

+import org.eclipse.emf.ecore.resource.ResourceSet;

+

+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

+

+import org.eclipse.emf.ecore.EObject;

+

+import org.eclipse.emf.ecore.xmi.XMLResource;

+

+import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;

+

+import org.eclipse.core.resources.IContainer;

+import org.eclipse.core.resources.IFile;

+import org.eclipse.core.resources.IFolder;

+import org.eclipse.core.resources.IProject;

+import org.eclipse.core.resources.IResource;

+import org.eclipse.core.resources.ResourcesPlugin;

+

+import org.eclipse.core.runtime.IProgressMonitor;

+

+import org.eclipse.jface.dialogs.MessageDialog;

+

+import org.eclipse.jface.viewers.IStructuredSelection;

+

+import org.eclipse.jface.wizard.Wizard;

+import org.eclipse.jface.wizard.WizardPage;

+

+import org.eclipse.swt.SWT;

+

+import org.eclipse.swt.events.ModifyListener;

+import org.eclipse.swt.events.ModifyEvent;

+

+import org.eclipse.swt.layout.GridData;

+import org.eclipse.swt.layout.GridLayout;

+

+import org.eclipse.swt.widgets.Combo;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.swt.widgets.Label;

+

+import org.eclipse.ui.INewWizard;

+import org.eclipse.ui.IWorkbench;

+

+import org.eclipse.ui.actions.WorkspaceModifyOperation;

+

+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

+

+import org.eclipse.ui.part.FileEditorInput;

+import org.eclipse.ui.part.ISetSelectionTarget;

+

+import org.eclipse.papyrus.facademapping.FacademappingFactory;

+import org.eclipse.papyrus.facademapping.FacademappingPackage;

+import org.eclipse.papyrus.facademapping.provider.FacademappingEditPlugin;

+

+

+import org.eclipse.core.runtime.Path;

+

+import org.eclipse.jface.viewers.ISelection;

+import org.eclipse.jface.viewers.StructuredSelection;

+

+import org.eclipse.ui.IWorkbenchPage;

+import org.eclipse.ui.IWorkbenchPart;

+import org.eclipse.ui.IWorkbenchWindow;

+import org.eclipse.ui.PartInitException;

+

+

+/**

+ * This is a simple wizard for creating a new model file.

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class FacademappingModelWizard extends Wizard implements INewWizard {

+	/**

+	 * The supported extensions for created files.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static final List<String> FILE_EXTENSIONS =

+		Collections.unmodifiableList(Arrays.asList(FacademappingEditorPlugin.INSTANCE.getString("_UI_FacademappingEditorFilenameExtensions").split("\\s*,\\s*")));

+

+	/**

+	 * A formatted list of supported file extensions, suitable for display.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static final String FORMATTED_FILE_EXTENSIONS =

+		FacademappingEditorPlugin.INSTANCE.getString("_UI_FacademappingEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");

+

+	/**

+	 * This caches an instance of the model package.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected FacademappingPackage facademappingPackage = FacademappingPackage.eINSTANCE;

+

+	/**

+	 * This caches an instance of the model factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected FacademappingFactory facademappingFactory = facademappingPackage.getFacademappingFactory();

+

+	/**

+	 * This is the file creation page.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected FacademappingModelWizardNewFileCreationPage newFileCreationPage;

+

+	/**

+	 * This is the initial object creation page.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected FacademappingModelWizardInitialObjectCreationPage initialObjectCreationPage;

+

+	/**

+	 * Remember the selection during initialization for populating the default container.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected IStructuredSelection selection;

+

+	/**

+	 * Remember the workbench during initialization.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected IWorkbench workbench;

+

+	/**

+	 * Caches the names of the types that can be created as the root object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected List<String> initialObjectNames;

+

+	/**

+	 * This just records the information.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void init(IWorkbench workbench, IStructuredSelection selection) {

+		this.workbench = workbench;

+		this.selection = selection;

+		setWindowTitle(FacademappingEditorPlugin.INSTANCE.getString("_UI_Wizard_label"));

+		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(FacademappingEditorPlugin.INSTANCE.getImage("full/wizban/NewFacademapping")));

+	}

+

+	/**

+	 * Returns the names of the types that can be created as the root object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected Collection<String> getInitialObjectNames() {

+		if (initialObjectNames == null) {

+			initialObjectNames = new ArrayList<String>();

+			for (EClassifier eClassifier : facademappingPackage.getEClassifiers()) {

+				if (eClassifier instanceof EClass) {

+					EClass eClass = (EClass)eClassifier;

+					if (!eClass.isAbstract()) {

+						initialObjectNames.add(eClass.getName());

+					}

+				}

+			}

+			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());

+		}

+		return initialObjectNames;

+	}

+

+	/**

+	 * Create a new model.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected EObject createInitialModel() {

+		EClass eClass = (EClass)facademappingPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());

+		EObject rootObject = facademappingFactory.create(eClass);

+		return rootObject;

+	}

+

+	/**

+	 * Do the work after everything is specified.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean performFinish() {

+		try {

+			// Remember the file.

+			//

+			final IFile modelFile = getModelFile();

+

+			// Do the work within an operation.

+			//

+			WorkspaceModifyOperation operation =

+				new WorkspaceModifyOperation() {

+					@Override

+					protected void execute(IProgressMonitor progressMonitor) {

+						try {

+							// Create a resource set

+							//

+							ResourceSet resourceSet = new ResourceSetImpl();

+

+							// Get the URI of the model file.

+							//

+							URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);

+

+							// Create a resource for this file.

+							//

+							Resource resource = resourceSet.createResource(fileURI);

+

+							// Add the initial model object to the contents.

+							//

+							EObject rootObject = createInitialModel();

+							if (rootObject != null) {

+								resource.getContents().add(rootObject);

+							}

+

+							// Save the contents of the resource to the file system.

+							//

+							Map<Object, Object> options = new HashMap<Object, Object>();

+							options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());

+							resource.save(options);

+						}

+						catch (Exception exception) {

+							FacademappingEditorPlugin.INSTANCE.log(exception);

+						}

+						finally {

+							progressMonitor.done();

+						}

+					}

+				};

+

+			getContainer().run(false, false, operation);

+

+			// Select the new file resource in the current view.

+			//

+			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();

+			IWorkbenchPage page = workbenchWindow.getActivePage();

+			final IWorkbenchPart activePart = page.getActivePart();

+			if (activePart instanceof ISetSelectionTarget) {

+				final ISelection targetSelection = new StructuredSelection(modelFile);

+				getShell().getDisplay().asyncExec

+					(new Runnable() {

+						 public void run() {

+							 ((ISetSelectionTarget)activePart).selectReveal(targetSelection);

+						 }

+					 });

+			}

+

+			// Open an editor on the new file.

+			//

+			try {

+				page.openEditor

+					(new FileEditorInput(modelFile),

+					 workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());					 	 

+			}

+			catch (PartInitException exception) {

+				MessageDialog.openError(workbenchWindow.getShell(), FacademappingEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());

+				return false;

+			}

+

+			return true;

+		}

+		catch (Exception exception) {

+			FacademappingEditorPlugin.INSTANCE.log(exception);

+			return false;

+		}

+	}

+

+	/**

+	 * This is the one page of the wizard.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public class FacademappingModelWizardNewFileCreationPage extends WizardNewFileCreationPage {

+		/**

+		 * Pass in the selection.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public FacademappingModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {

+			super(pageId, selection);

+		}

+

+		/**

+		 * The framework calls this to see if the file is correct.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		@Override

+		protected boolean validatePage() {

+			if (super.validatePage()) {

+				String extension = new Path(getFileName()).getFileExtension();

+				if (extension == null || !FILE_EXTENSIONS.contains(extension)) {

+					String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension";

+					setErrorMessage(FacademappingEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));

+					return false;

+				}

+				return true;

+			}

+			return false;

+		}

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public IFile getModelFile() {

+			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));

+		}

+	}

+

+	/**

+	 * This is the page where the type of object to create is selected.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public class FacademappingModelWizardInitialObjectCreationPage extends WizardPage {

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		protected Combo initialObjectField;

+

+		/**

+		 * @generated

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 */

+		protected List<String> encodings;

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		protected Combo encodingField;

+

+		/**

+		 * Pass in the selection.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public FacademappingModelWizardInitialObjectCreationPage(String pageId) {

+			super(pageId);

+		}

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public void createControl(Composite parent) {

+			Composite composite = new Composite(parent, SWT.NONE);

+			{

+				GridLayout layout = new GridLayout();

+				layout.numColumns = 1;

+				layout.verticalSpacing = 12;

+				composite.setLayout(layout);

+

+				GridData data = new GridData();

+				data.verticalAlignment = GridData.FILL;

+				data.grabExcessVerticalSpace = true;

+				data.horizontalAlignment = GridData.FILL;

+				composite.setLayoutData(data);

+			}

+

+			Label containerLabel = new Label(composite, SWT.LEFT);

+			{

+				containerLabel.setText(FacademappingEditorPlugin.INSTANCE.getString("_UI_ModelObject"));

+

+				GridData data = new GridData();

+				data.horizontalAlignment = GridData.FILL;

+				containerLabel.setLayoutData(data);

+			}

+

+			initialObjectField = new Combo(composite, SWT.BORDER);

+			{

+				GridData data = new GridData();

+				data.horizontalAlignment = GridData.FILL;

+				data.grabExcessHorizontalSpace = true;

+				initialObjectField.setLayoutData(data);

+			}

+

+			for (String objectName : getInitialObjectNames()) {

+				initialObjectField.add(getLabel(objectName));

+			}

+

+			if (initialObjectField.getItemCount() == 1) {

+				initialObjectField.select(0);

+			}

+			initialObjectField.addModifyListener(validator);

+

+			Label encodingLabel = new Label(composite, SWT.LEFT);

+			{

+				encodingLabel.setText(FacademappingEditorPlugin.INSTANCE.getString("_UI_XMLEncoding"));

+

+				GridData data = new GridData();

+				data.horizontalAlignment = GridData.FILL;

+				encodingLabel.setLayoutData(data);

+			}

+			encodingField = new Combo(composite, SWT.BORDER);

+			{

+				GridData data = new GridData();

+				data.horizontalAlignment = GridData.FILL;

+				data.grabExcessHorizontalSpace = true;

+				encodingField.setLayoutData(data);

+			}

+

+			for (String encoding : getEncodings()) {

+				encodingField.add(encoding);

+			}

+

+			encodingField.select(0);

+			encodingField.addModifyListener(validator);

+

+			setPageComplete(validatePage());

+			setControl(composite);

+		}

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		protected ModifyListener validator =

+			new ModifyListener() {

+				public void modifyText(ModifyEvent e) {

+					setPageComplete(validatePage());

+				}

+			};

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		protected boolean validatePage() {

+			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());

+		}

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		@Override

+		public void setVisible(boolean visible) {

+			super.setVisible(visible);

+			if (visible) {

+				if (initialObjectField.getItemCount() == 1) {

+					initialObjectField.clearSelection();

+					encodingField.setFocus();

+				}

+				else {

+					encodingField.clearSelection();

+					initialObjectField.setFocus();

+				}

+			}

+		}

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public String getInitialObjectName() {

+			String label = initialObjectField.getText();

+

+			for (String name : getInitialObjectNames()) {

+				if (getLabel(name).equals(label)) {

+					return name;

+				}

+			}

+			return null;

+		}

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		public String getEncoding() {

+			return encodingField.getText();

+		}

+

+		/**

+		 * Returns the label for the specified type name.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		protected String getLabel(String typeName) {

+			try {

+				return FacademappingEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type");

+			}

+			catch(MissingResourceException mre) {

+				FacademappingEditorPlugin.INSTANCE.log(mre);

+			}

+			return typeName;

+		}

+

+		/**

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		protected Collection<String> getEncodings() {

+			if (encodings == null) {

+				encodings = new ArrayList<String>();

+				for (StringTokenizer stringTokenizer = new StringTokenizer(FacademappingEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) {

+					encodings.add(stringTokenizer.nextToken());

+				}

+			}

+			return encodings;

+		}

+	}

+

+	/**

+	 * The framework calls this to create the contents of the wizard.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+		@Override

+	public void addPages() {

+		// Create a page, set the title, and the initial model file name.

+		//

+		newFileCreationPage = new FacademappingModelWizardNewFileCreationPage("Whatever", selection);

+		newFileCreationPage.setTitle(FacademappingEditorPlugin.INSTANCE.getString("_UI_FacademappingModelWizard_label"));

+		newFileCreationPage.setDescription(FacademappingEditorPlugin.INSTANCE.getString("_UI_FacademappingModelWizard_description"));

+		newFileCreationPage.setFileName(FacademappingEditorPlugin.INSTANCE.getString("_UI_FacademappingEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0));

+		addPage(newFileCreationPage);

+

+		// Try and get the resource selection to determine a current directory for the file dialog.

+		//

+		if (selection != null && !selection.isEmpty()) {

+			// Get the resource...

+			//

+			Object selectedElement = selection.iterator().next();

+			if (selectedElement instanceof IResource) {

+				// Get the resource parent, if its a file.

+				//

+				IResource selectedResource = (IResource)selectedElement;

+				if (selectedResource.getType() == IResource.FILE) {

+					selectedResource = selectedResource.getParent();

+				}

+

+				// This gives us a directory...

+				//

+				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {

+					// Set this for the container.

+					//

+					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());

+

+					// Make up a unique new name here.

+					//

+					String defaultModelBaseFilename = FacademappingEditorPlugin.INSTANCE.getString("_UI_FacademappingEditorFilenameDefaultBase");

+					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);

+					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension;

+					for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {

+						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension;

+					}

+					newFileCreationPage.setFileName(modelFilename);

+				}

+			}

+		}

+		initialObjectCreationPage = new FacademappingModelWizardInitialObjectCreationPage("Whatever2");

+		initialObjectCreationPage.setTitle(FacademappingEditorPlugin.INSTANCE.getString("_UI_FacademappingModelWizard_label"));

+		initialObjectCreationPage.setDescription(FacademappingEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description"));

+		addPage(initialObjectCreationPage);

+	}

+

+	/**

+	 * Get the file from the page.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public IFile getModelFile() {

+		return newFileCreationPage.getModelFile();

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.utils/.classpath b/extraplugins/facade/org.eclipse.papyrus.facade.utils/.classpath
new file mode 100644
index 00000000000..8a8f1668cdc
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.utils/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<classpath>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

+	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="output" path="bin"/>

+</classpath>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.utils/.project b/extraplugins/facade/org.eclipse.papyrus.facade.utils/.project
new file mode 100644
index 00000000000..144fa985ce3
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.utils/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.papyrus.facade.utils</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.jdt.core.javabuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.ManifestBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.SchemaBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.pde.PluginNature</nature>

+		<nature>org.eclipse.jdt.core.javanature</nature>

+	</natures>

+</projectDescription>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.utils/.settings/org.eclipse.jdt.core.prefs b/extraplugins/facade/org.eclipse.papyrus.facade.utils/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..f287d53cf45
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.utils/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1

+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6

+org.eclipse.jdt.core.compiler.compliance=1.6

+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

+org.eclipse.jdt.core.compiler.source=1.6

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.utils/META-INF/MANIFEST.MF b/extraplugins/facade/org.eclipse.papyrus.facade.utils/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..1f8e2120399
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.utils/META-INF/MANIFEST.MF
@@ -0,0 +1,15 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Utils
+Bundle-SymbolicName: org.eclipse.papyrus.facade.utils
+Bundle-Version: 0.10.0.qualifier
+Bundle-Activator: org.eclipse.papyrus.facade.utils.FacadeUtilsActivator
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;bundle-version="2.9.0",
+ org.eclipse.uml2.uml;bundle-version="4.1.0",
+ org.eclipse.emf.common
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-ActivationPolicy: lazy
+Export-Package: org.eclipse.papyrus.facade.utils,
+ org.eclipse.papyrus.facade.utils.wrappinglist,
+ org.eclipse.papyrus.facade.utils.wrappinglist.subset
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.utils/build.properties b/extraplugins/facade/org.eclipse.papyrus.facade.utils/build.properties
new file mode 100644
index 00000000000..41eb6ade2b4
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.utils/build.properties
@@ -0,0 +1,4 @@
+source.. = src/

+output.. = bin/

+bin.includes = META-INF/,\

+               .

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/CombinationGenerator.java b/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/CombinationGenerator.java
new file mode 100644
index 00000000000..2a36a6e662e
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/CombinationGenerator.java
@@ -0,0 +1,123 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.utils;

+

+import java.math.BigInteger;

+

+public class CombinationGenerator {

+

+	private int[] a;

+

+	private int n;

+

+	private int r;

+

+	private BigInteger numLeft;

+

+	private BigInteger total;

+

+	public CombinationGenerator(int n, int r) {

+		if(r > n) {

+			throw new IllegalArgumentException();

+		}

+		if(n < 1) {

+			throw new IllegalArgumentException();

+		}

+		this.n = n;

+		this.r = r;

+		a = new int[r];

+		BigInteger nFact = getFactorial(n);

+		BigInteger rFact = getFactorial(r);

+		BigInteger nminusrFact = getFactorial(n - r);

+		total = nFact.divide(rFact.multiply(nminusrFact));

+		reset();

+	}

+

+	/**

+	 * Reset the generator

+	 */

+	public void reset() {

+		for(int i = 0; i < a.length; i++) {

+			a[i] = i;

+		}

+		numLeft = new BigInteger(total.toString());

+	}

+

+

+	/**

+	 * 

+	 * @return

+	 *         number of combinations not yet generated

+	 */

+	public BigInteger getNumLeft() {

+		return numLeft;

+	}

+

+	/**

+	 * 

+	 * @return true if there are more combinations

+	 */

+	public boolean hasMore() {

+		return numLeft.compareTo(BigInteger.ZERO) == 1;

+	}

+

+	/**

+	 * 

+	 * @return total number of combinations

+	 */

+	public BigInteger getTotal() {

+		return total;

+	}

+

+

+	/**

+	 * Compute the factorial of n

+	 * 

+	 * @param n

+	 * @return fact(n)

+	 */

+	private static BigInteger getFactorial(int n) {

+		BigInteger fact = BigInteger.ONE;

+		for(int i = n; i > 1; i--) {

+			fact = fact.multiply(new BigInteger(Integer.toString(i)));

+		}

+		return fact;

+	}

+

+	/**

+	 * Generate next combination (algorithm from Rosen)

+	 * 

+	 * @return next combination from generator

+	 */

+	public int[] getNext() {

+

+		if(numLeft.equals(total)) {

+			numLeft = numLeft.subtract(BigInteger.ONE);

+			return a;

+		}

+

+		int i = r - 1;

+		while(a[i] == n - r + i) {

+			i--;

+		}

+		a[i] = a[i] + 1;

+		for(int j = i + 1; j < r; j++) {

+			a[j] = a[i] + j - i;

+		}

+

+		numLeft = numLeft.subtract(BigInteger.ONE);

+		return a;

+

+	}

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/FacadeUtilsActivator.java b/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/FacadeUtilsActivator.java
new file mode 100644
index 00000000000..82baa70e6ea
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/FacadeUtilsActivator.java
@@ -0,0 +1,43 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.utils;

+

+import org.osgi.framework.BundleActivator;

+import org.osgi.framework.BundleContext;

+

+public class FacadeUtilsActivator implements BundleActivator {

+

+	private static BundleContext context;

+

+	static BundleContext getContext() {

+		return context;

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)

+	 */

+	public void start(BundleContext bundleContext) throws Exception {

+		FacadeUtilsActivator.context = bundleContext;

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)

+	 */

+	public void stop(BundleContext bundleContext) throws Exception {

+		FacadeUtilsActivator.context = null;

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/RepresentingElement.java b/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/RepresentingElement.java
new file mode 100644
index 00000000000..8fc3d8e8d8c
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/RepresentingElement.java
@@ -0,0 +1,26 @@
+/*****************************************************************************
+ * 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:
+ *  CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.facade.utils;
+
+import org.eclipse.emf.ecore.EObject;
+
+
+
+public interface RepresentingElement {
+
+	public EObject get__Represented();
+
+	public void set__Represented(EObject represented);
+
+}
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/WrappingEObjectContainmentEList.java b/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/WrappingEObjectContainmentEList.java
new file mode 100644
index 00000000000..7e24cdc34e1
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/WrappingEObjectContainmentEList.java
@@ -0,0 +1,237 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.utils.wrappinglist;

+

+import java.util.Collection;

+

+import org.eclipse.emf.ecore.InternalEObject;

+import org.eclipse.emf.ecore.util.EObjectContainmentEList;

+import org.eclipse.papyrus.facade.utils.RepresentingElement;

+import org.eclipse.uml2.uml.Element;

+

+

+public class WrappingEObjectContainmentEList<E extends RepresentingElement> extends EObjectContainmentEList<E> implements WrappingList<E> {

+

+	protected Collection<Element> representedElementList;

+

+	public WrappingEObjectContainmentEList(Class<?> dataClass, InternalEObject owner, int featureID, Collection<Element> representedElementList) {

+		super(dataClass, owner, featureID);

+		this.representedElementList = representedElementList;

+	}

+

+	@Override

+	public boolean add(E object) {

+

+		if(!representedElementList.contains(((E)object).get__Represented())) {

+			representedElementList.add((Element)((E)object).get__Represented());

+		}

+

+		if(isUnique() && contains(object)) {

+			return false;

+		} else {

+			super.doAddUnique(object);

+			if(hasInverse()) {

+				inverseAdd(object, null);

+			}

+

+			return true;

+		}

+

+		//		return super.add(object);

+	}

+

+	@Override

+	public void add(int index, E e) {

+		if(!representedElementList.contains((e).get__Represented())) {

+			representedElementList.add((Element)(e).get__Represented());

+		}

+

+		super.doAddUnique(index, e);

+		if(hasInverse()) {

+			inverseAdd(e, null);

+		}

+

+		//		super.add(index, e);

+	}

+

+	@Override

+	public boolean addAll(Collection<? extends E> collection) {

+		for(E e : collection) {

+			if(!representedElementList.contains(e.get__Represented())) {

+				representedElementList.add((Element)e.get__Represented());

+			}

+		}

+

+		if(collection.isEmpty()) {

+			return false;

+		} else {

+			for(E e : collection) {

+				super.doAddUnique(e);

+				if(hasInverse()) {

+					inverseAdd(e, null);

+				}

+			}

+			return true;

+		}

+

+		//		return super.addAll(collection);

+	}

+

+	@Override

+	public boolean addAll(int index, Collection<? extends E> collection) {

+		for(E e : collection) {

+			if(!representedElementList.contains(e.get__Represented())) {

+				representedElementList.add((Element)e.get__Represented());

+			}

+		}

+

+		if(collection.isEmpty()) {

+			return false;

+		} else {

+			int collectionSize = collection.size();

+

+			super.doAddAllUnique(index, collection);

+

+			if(hasInverse()) {

+				int lastIndex = index + collectionSize;

+				for(int i = index; i < lastIndex; ++i) {

+					@SuppressWarnings("unchecked")

+					E object = (E)data[i];

+					inverseAdd(object, null);

+				}

+			}

+			return true;

+		}

+	}

+

+

+	@Override

+	public boolean remove(Object object) {

+		Object representedElement = ((RepresentingElement)object).get__Represented();

+		representedElementList.remove(representedElement);

+

+		if(this.contains(object)) {

+			E oldObject = doRemove(indexOf(object));

+			if(hasInverse() && oldObject != null) {

+				inverseRemove(oldObject, null);

+			}

+			return true;

+		} else {

+			return false;

+		}

+		//		return oldObject;

+

+		//		return super.remove(object);

+	}

+

+	@Override

+	public E remove(int index) {

+		Object representedElement = ((RepresentingElement)this.get(index)).get__Represented();

+		representedElementList.remove(representedElement);

+

+

+		E oldObject = doRemove(index);

+		if(hasInverse() && oldObject != null) {

+			inverseRemove(oldObject, null);

+		}

+		return oldObject;

+

+		//		return super.remove(index);

+	}

+

+	@Override

+	public boolean removeAll(Collection<?> collection) {

+		for(Object object : collection) {

+			Object representedElement = ((RepresentingElement)object).get__Represented();

+			representedElementList.remove(representedElement);

+		}

+

+		boolean result = false;

+

+		for(Object object : collection) {

+			if(this.contains(object)) {

+				E oldObject = doRemove(indexOf(object));

+				if(hasInverse() && oldObject != null) {

+					inverseRemove(oldObject, null);

+				}

+				result = true;

+			}

+		}

+		return result;

+

+		//		return super.removeAll(collection);

+	}

+

+	@Override

+	public void clear() {

+

+		representedElementList.clear();

+

+		for(Object object : this) {

+			if(this.contains(object)) {

+				E oldObject = doRemove(indexOf(object));

+				if(hasInverse() && oldObject != null) {

+					inverseRemove(oldObject, null);

+				}

+

+			}

+		}

+

+

+		//		super.clear();

+	}

+

+	@Override

+	public void notWrappingAdd(E object) {

+		doAddUnique(object);

+

+

+

+	}

+

+	@Override

+	public E notWrappingRemove(E object) {

+

+		return doRemove(indexOf(object));

+	}

+

+

+

+

+	@Override

+	public void silentAdd(int index, E object) {

+

+		super.doAddUnique(index, object);

+		if(hasInverse()) {

+			inverseAdd(object, null);

+		}

+

+	}

+

+

+	@Override

+	public E silentRemove(int index) {

+		E oldObject = super.doRemove(index);

+		if(hasInverse() && oldObject != null) {

+			inverseRemove(oldObject, null);

+

+		}

+		return oldObject;

+	}

+

+

+

+

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/WrappingEObjectContainmentWithInverseEList.java b/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/WrappingEObjectContainmentWithInverseEList.java
new file mode 100644
index 00000000000..687ec82a940
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/WrappingEObjectContainmentWithInverseEList.java
@@ -0,0 +1,217 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.utils.wrappinglist;

+

+import java.util.Collection;

+

+import org.eclipse.emf.ecore.InternalEObject;

+import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;

+import org.eclipse.papyrus.facade.utils.RepresentingElement;

+import org.eclipse.uml2.uml.Element;

+

+

+public class WrappingEObjectContainmentWithInverseEList<E extends RepresentingElement> extends EObjectContainmentWithInverseEList<E> implements WrappingList<E> {

+

+	protected Collection<Element> representedElementList;

+

+	public WrappingEObjectContainmentWithInverseEList(Class<?> dataClass, InternalEObject owner, int featureID, int inverseFeatureID, Collection<Element> representedElementList) {

+		super(dataClass, owner, featureID, inverseFeatureID);

+		this.representedElementList = representedElementList;

+	}

+

+	@Override

+	public boolean add(E object) {

+

+		if(!representedElementList.contains(((E)object).get__Represented())) {

+			representedElementList.add((Element)((E)object).get__Represented());

+		}

+

+		if(isUnique() && contains(object)) {

+			return false;

+		} else {

+			super.doAddUnique(object);

+			if(hasInverse()) {

+				inverseAdd(object, null);

+			}

+			return true;

+		}

+

+		//		return super.add(object);

+	}

+

+	@Override

+	public void add(int index, E e) {

+		if(!representedElementList.contains((e).get__Represented())) {

+			representedElementList.add((Element)(e).get__Represented());

+		}

+

+		super.doAddUnique(index, e);

+		if(hasInverse()) {

+			inverseAdd(e, null);

+		}

+

+		//		super.add(index, e);

+	}

+

+	@Override

+	public boolean addAll(Collection<? extends E> collection) {

+		for(E e : collection) {

+			if(!representedElementList.contains(e.get__Represented())) {

+				representedElementList.add((Element)e.get__Represented());

+			}

+		}

+

+		if(collection.isEmpty()) {

+			return false;

+		} else {

+			for(E e : collection) {

+				super.doAddUnique(e);

+				if(hasInverse()) {

+					inverseAdd(e, null);

+				}

+			}

+			return true;

+		}

+

+		//		return super.addAll(collection);

+	}

+

+	@Override

+	public boolean addAll(int index, Collection<? extends E> collection) {

+		for(E e : collection) {

+			if(!representedElementList.contains(e.get__Represented())) {

+				representedElementList.add((Element)e.get__Represented());

+			}

+		}

+

+		if(collection.isEmpty()) {

+			return false;

+		} else {

+			int collectionSize = collection.size();

+

+			super.doAddAllUnique(index, collection);

+

+			if(hasInverse()) {

+				int lastIndex = index + collectionSize;

+				for(int i = index; i < lastIndex; ++i) {

+					@SuppressWarnings("unchecked")

+					E object = (E)data[i];

+					inverseAdd(object, null);

+				}

+			}

+			return true;

+		}

+	}

+

+	@Override

+	public boolean remove(Object object) {

+		Object representedElement = ((RepresentingElement)object).get__Represented();

+		representedElementList.remove(representedElement);

+

+		if(this.contains(object)) {

+			E oldObject = doRemove(indexOf(object));

+			if(hasInverse() && oldObject != null) {

+				inverseRemove(oldObject, null);

+			}

+			return true;

+		} else {

+			return false;

+		}

+		//		return oldObject;

+

+		//		return super.remove(object);

+	}

+

+	@Override

+	public E remove(int index) {

+		Object representedElement = ((RepresentingElement)this.get(index)).get__Represented();

+		representedElementList.remove(representedElement);

+

+

+		E oldObject = doRemove(index);

+		if(hasInverse() && oldObject != null) {

+			inverseRemove(oldObject, null);

+		}

+		return oldObject;

+

+		//		return super.remove(index);

+	}

+

+	@Override

+	public boolean removeAll(Collection<?> collection) {

+		for(Object object : collection) {

+			Object representedElement = ((RepresentingElement)object).get__Represented();

+			representedElementList.remove(representedElement);

+		}

+

+		boolean result = false;

+

+		for(Object object : collection) {

+			if(this.contains(object)) {

+				E oldObject = doRemove(indexOf(object));

+				if(hasInverse() && oldObject != null) {

+					inverseRemove(oldObject, null);

+				}

+				result = true;

+			}

+		}

+		return result;

+

+		//		return super.removeAll(collection);

+	}

+

+	@Override

+	public void clear() {

+		representedElementList.clear();

+

+		for(Object object : this) {

+			if(this.contains(object)) {

+				E oldObject = doRemove(indexOf(object));

+				if(hasInverse() && oldObject != null) {

+					inverseRemove(oldObject, null);

+				}

+			}

+		}

+

+		//		super.clear();

+	}

+

+	@Override

+	public void notWrappingAdd(E object) {

+		doAddUnique(object);

+	}

+

+	@Override

+	public E notWrappingRemove(E object) {

+		return doRemove(indexOf(object));

+	}

+

+	@Override

+	public void silentAdd(int index, E object) {

+		super.doAddUnique(index, object);

+		if(hasInverse()) {

+			inverseAdd(object, null);

+		}

+	}

+

+	@Override

+	public E silentRemove(int index) {

+		E oldObject = super.doRemove(index);

+		if(hasInverse() && oldObject != null) {

+			inverseRemove(oldObject, null);

+

+		}

+		return oldObject;

+	}

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/WrappingEObjectEList.java b/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/WrappingEObjectEList.java
new file mode 100644
index 00000000000..003f90e1f01
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/WrappingEObjectEList.java
@@ -0,0 +1,228 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.utils.wrappinglist;

+

+import java.util.Collection;

+

+import org.eclipse.emf.ecore.InternalEObject;

+import org.eclipse.emf.ecore.util.EObjectEList;

+import org.eclipse.papyrus.facade.utils.RepresentingElement;

+import org.eclipse.uml2.uml.Element;

+

+

+public class WrappingEObjectEList<E extends RepresentingElement> extends EObjectEList<E> implements WrappingList<E> {

+

+	protected Collection<Element> representedElementList;

+

+	public WrappingEObjectEList(Class<?> dataClass, InternalEObject owner, int featureID, Collection<Element> representedElementList) {

+		super(dataClass, owner, featureID);

+		this.representedElementList = representedElementList;

+	}

+

+	@Override

+	public boolean add(E object) {

+

+		if(!representedElementList.contains(((E)object).get__Represented())) {

+			representedElementList.add((Element)((E)object).get__Represented());

+		}

+

+		if(isUnique() && contains(object)) {

+			return false;

+		} else {

+			super.doAddUnique(object);

+			if(hasInverse()) {

+				inverseAdd(object, null);

+			}

+

+			return true;

+		}

+

+		//		return super.add(object);

+	}

+

+	@Override

+	public void add(int index, E e) {

+		if(!representedElementList.contains((e).get__Represented())) {

+			representedElementList.add((Element)(e).get__Represented());

+		}

+

+		super.doAddUnique(index, e);

+		if(hasInverse()) {

+			inverseAdd(e, null);

+		}

+

+		//		super.add(index, e);

+	}

+

+	@Override

+	public boolean addAll(Collection<? extends E> collection) {

+		for(E e : collection) {

+			if(!representedElementList.contains(e.get__Represented())) {

+				representedElementList.add((Element)e.get__Represented());

+			}

+		}

+

+		if(collection.isEmpty()) {

+			return false;

+		} else {

+			for(E e : collection) {

+				super.doAddUnique(e);

+				if(hasInverse()) {

+					inverseAdd(e, null);

+				}

+			}

+			return true;

+		}

+

+		//		return super.addAll(collection);

+	}

+

+	@Override

+	public boolean addAll(int index, Collection<? extends E> collection) {

+		for(E e : collection) {

+			if(!representedElementList.contains(e.get__Represented())) {

+				representedElementList.add((Element)e.get__Represented());

+			}

+		}

+

+		if(collection.isEmpty()) {

+			return false;

+		} else {

+			int collectionSize = collection.size();

+

+			super.doAddAllUnique(index, collection);

+

+			if(hasInverse()) {

+				int lastIndex = index + collectionSize;

+				for(int i = index; i < lastIndex; ++i) {

+					@SuppressWarnings("unchecked")

+					E object = (E)data[i];

+					inverseAdd(object, null);

+				}

+			}

+			return true;

+		}

+	}

+

+

+	@Override

+	public boolean remove(Object object) {

+		Object representedElement = ((RepresentingElement)object).get__Represented();

+		representedElementList.remove(representedElement);

+

+		if(this.contains(object)) {

+			E oldObject = doRemove(indexOf(object));

+			if(hasInverse() && oldObject != null) {

+				inverseRemove(oldObject, null);

+			}

+			return true;

+		} else {

+			return false;

+		}

+		//		return oldObject;

+

+		//		return super.remove(object);

+	}

+

+	@Override

+	public E remove(int index) {

+		Object representedElement = ((RepresentingElement)this.get(index)).get__Represented();

+		representedElementList.remove(representedElement);

+

+

+		E oldObject = doRemove(index);

+		if(hasInverse() && oldObject != null) {

+			inverseRemove(oldObject, null);

+		}

+		return oldObject;

+

+		//		return super.remove(index);

+	}

+

+	@Override

+	public boolean removeAll(Collection<?> collection) {

+		for(Object object : collection) {

+			Object representedElement = ((RepresentingElement)object).get__Represented();

+			representedElementList.remove(representedElement);

+		}

+

+		boolean result = false;

+

+		for(Object object : collection) {

+			if(this.contains(object)) {

+				E oldObject = doRemove(indexOf(object));

+				if(hasInverse() && oldObject != null) {

+					inverseRemove(oldObject, null);

+				}

+				result = true;

+			}

+		}

+		return result;

+

+		//		return super.removeAll(collection);

+	}

+

+	@Override

+	public void clear() {

+

+		representedElementList.clear();

+

+		for(Object object : this) {

+			if(this.contains(object)) {

+				E oldObject = doRemove(indexOf(object));

+				if(hasInverse() && oldObject != null) {

+					inverseRemove(oldObject, null);

+				}

+

+			}

+		}

+

+

+		//		super.clear();

+	}

+

+	@Override

+	public void notWrappingAdd(E object) {

+		doAddUnique(object);

+

+

+

+	}

+

+	@Override

+	public E notWrappingRemove(E object) {

+

+		return doRemove(indexOf(object));

+	}

+

+

+

+

+	@Override

+	public void silentAdd(int index, E object) {

+

+		super.doAddUnique(index, object);

+

+	}

+

+

+	@Override

+	public E silentRemove(int index) {

+		return super.doRemove(index);

+

+	}

+

+

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/WrappingEObjectWithInverseEList.java b/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/WrappingEObjectWithInverseEList.java
new file mode 100644
index 00000000000..1c66135c8d1
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/WrappingEObjectWithInverseEList.java
@@ -0,0 +1,186 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.utils.wrappinglist;

+

+import java.util.Collection;

+

+import org.eclipse.emf.ecore.InternalEObject;

+import org.eclipse.emf.ecore.util.EObjectWithInverseEList;

+import org.eclipse.papyrus.facade.utils.RepresentingElement;

+import org.eclipse.uml2.uml.Element;

+

+

+public class WrappingEObjectWithInverseEList<E extends RepresentingElement> extends EObjectWithInverseEList<E> implements WrappingList<E> {

+

+	public static class WrappingManyInverse<E> extends WrappingEObjectWithInverseEList {

+

+		private static final long serialVersionUID = 1L;

+

+		public WrappingManyInverse(Class<?> dataClass, InternalEObject owner, int featureID, int inverseFeatureID, Collection<Element> representedElementList) {

+			super(dataClass, owner, featureID, inverseFeatureID, representedElementList);

+		}

+

+		@Override

+		protected boolean hasManyInverse() {

+			return true;

+		}

+	}

+

+	protected Collection<Element> representedElementList;

+

+	public WrappingEObjectWithInverseEList(Class<?> dataClass, InternalEObject owner, int featureID, int inverseFeatureID, Collection<Element> representedElementList) {

+		super(dataClass, owner, featureID, inverseFeatureID);

+		this.representedElementList = representedElementList;

+	}

+

+	@Override

+	public boolean add(E object) {

+

+		if(!representedElementList.contains(((E)object).get__Represented())) {

+			representedElementList.add((Element)((E)object).get__Represented());

+		}

+

+		if(isUnique() && contains(object)) {

+			return false;

+		} else {

+			super.doAddUnique(object);

+

+			return true;

+		}

+

+	}

+

+	@Override

+	public void add(int index, E e) {

+		if(!representedElementList.contains((e).get__Represented())) {

+			representedElementList.add((Element)(e).get__Represented());

+		}

+

+		super.doAddUnique(index, e);

+	}

+

+	@Override

+	public boolean addAll(Collection<? extends E> collection) {

+		for(E e : collection) {

+			if(!representedElementList.contains(e.get__Represented())) {

+				representedElementList.add((Element)e.get__Represented());

+			}

+		}

+

+		if(collection.isEmpty()) {

+			return false;

+		} else {

+			for(E e : collection) {

+				super.doAddUnique(e);

+			}

+			return true;

+		}

+

+	}

+

+	@Override

+	public boolean addAll(int index, Collection<? extends E> collection) {

+		for(E e : collection) {

+			if(!representedElementList.contains(e.get__Represented())) {

+				representedElementList.add((Element)e.get__Represented());

+			}

+		}

+

+		if(collection.isEmpty()) {

+			return false;

+		} else {

+			super.doAddAllUnique(index, collection);

+			return true;

+		}

+	}

+

+

+	@Override

+	public boolean remove(Object object) {

+		Object representedElement = ((RepresentingElement)object).get__Represented();

+		representedElementList.remove(representedElement);

+

+		if(this.contains(object)) {

+			E oldObject = doRemove(indexOf(object));

+			return true;

+		} else {

+			return false;

+		}

+

+	}

+

+	@Override

+	public E remove(int index) {

+		Object representedElement = ((RepresentingElement)this.get(index)).get__Represented();

+		representedElementList.remove(representedElement);

+

+

+		E oldObject = doRemove(index);

+

+		return oldObject;

+	}

+

+	@Override

+	public boolean removeAll(Collection<?> collection) {

+		for(Object object : collection) {

+			Object representedElement = ((RepresentingElement)object).get__Represented();

+			representedElementList.remove(representedElement);

+		}

+

+		boolean result = false;

+

+		for(Object object : collection) {

+			if(this.contains(object)) {

+				E oldObject = doRemove(indexOf(object));

+				result = true;

+			}

+		}

+		return result;

+	}

+

+	@Override

+	public void clear() {

+

+		representedElementList.clear();

+

+		for(Object object : this) {

+			if(this.contains(object)) {

+				E oldObject = doRemove(indexOf(object));

+

+			}

+		}

+	}

+

+	@Override

+	public void notWrappingAdd(E object) {

+		doAddUnique(object);

+	}

+

+	@Override

+	public E notWrappingRemove(E object) {

+		return doRemove(indexOf(object));

+	}

+

+	@Override

+	public void silentAdd(int index, E object) {

+		super.doAddUnique(index, object);

+	}

+

+

+	@Override

+	public E silentRemove(int index) {

+		return super.doRemove(index);

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/WrappingList.java b/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/WrappingList.java
new file mode 100644
index 00000000000..923d14dd4f1
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/WrappingList.java
@@ -0,0 +1,31 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.utils.wrappinglist;

+

+import org.eclipse.emf.common.util.EList;

+import org.eclipse.papyrus.facade.utils.RepresentingElement;

+

+

+public interface WrappingList<E extends RepresentingElement> extends EList<E> {

+

+	public void notWrappingAdd(E object);

+

+	public E notWrappingRemove(E object);

+

+	public void silentAdd(int i, E object);

+

+	public E silentRemove(int index);

+

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/subset/WrappingSubsetEObjectContainmentEList.java b/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/subset/WrappingSubsetEObjectContainmentEList.java
new file mode 100644
index 00000000000..d4cdc0f8ed1
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/subset/WrappingSubsetEObjectContainmentEList.java
@@ -0,0 +1,188 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.utils.wrappinglist.subset;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.List;

+

+import org.eclipse.emf.ecore.InternalEObject;

+import org.eclipse.papyrus.facade.utils.RepresentingElement;

+import org.eclipse.papyrus.facade.utils.wrappinglist.WrappingEObjectContainmentEList;

+import org.eclipse.papyrus.facade.utils.wrappinglist.WrappingList;

+import org.eclipse.uml2.uml.Element;

+

+

+public class WrappingSubsetEObjectContainmentEList<E extends RepresentingElement> extends WrappingEObjectContainmentEList<E> {

+

+	protected List<WrappingList<E>> representingSuperSets;

+

+	public WrappingSubsetEObjectContainmentEList(Class<?> dataClass, InternalEObject owner, int featureID, Collection<Element> representedElementList, WrappingList<E>... representingSuperSets) {

+		super(dataClass, owner, featureID, representedElementList);

+		this.representingSuperSets = new ArrayList<WrappingList<E>>();

+		for(int i = 0; i < representingSuperSets.length; i++) {

+			this.representingSuperSets.add(representingSuperSets[i]);

+		}

+	}

+

+	//	@Override

+	//	public boolean add(E object) {

+	//		for(WrappingList representingSuperSet : representingSuperSets) {

+	//			EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

+	//

+	//			Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.ADD, list.getEStructuralFeature(), null, object, list.size(), true);

+	//

+	//			list.getEObject().eNotify(notification);

+	//

+	//			//			if(!representingSuperSet.contains(object)) {

+	//			//				representingSuperSet.notWrappingAdd(object);

+	//			//			}

+	//		}

+	//

+	//

+	//		return super.add(object);

+	//	}

+	//

+	//	@Override

+	//	public void add(int index, E object) {

+	//		for(WrappingList representingSuperSet : representingSuperSets) {

+	//			if(!representingSuperSet.contains(object)) {

+	//				//				representingSuperSet.notWrappingAdd(object);

+	//				EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

+	//

+	//				Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.ADD, list.getEStructuralFeature(), null, object, list.size(), true);

+	//

+	//				list.getEObject().eNotify(notification);

+	//			}

+	//		}

+	//

+	//		super.add(index, object);

+	//	}

+	//

+	//	@Override

+	//	public boolean addAll(Collection<? extends E> collection) {

+	//		for(WrappingList representingSuperSet : representingSuperSets) {

+	//			for(E e : collection) {

+	//				if(!representingSuperSet.contains(e)) {

+	//					//					representingSuperSet.notWrappingAdd(e);

+	//					EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

+	//

+	//					Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.ADD, list.getEStructuralFeature(), null, e, list.size(), true);

+	//

+	//					list.getEObject().eNotify(notification);

+	//				}

+	//			}

+	//		}

+	//

+	//		return super.addAll(collection);

+	//	}

+	//

+	//	@Override

+	//	public boolean addAll(int index, Collection<? extends E> collection) {

+	//		for(WrappingList representingSuperSet : representingSuperSets) {

+	//			for(E e : collection) {

+	//				if(!representingSuperSet.contains(e)) {

+	//					//					representingSuperSet.notWrappingAdd(e);

+	//					EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

+	//

+	//					Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.ADD, list.getEStructuralFeature(), null, e, list.size(), true);

+	//

+	//					list.getEObject().eNotify(notification);

+	//				}

+	//			}

+	//		}

+	//

+	//		return super.addAll(index, collection);

+	//	}

+	//

+	//	@Override

+	//	public boolean remove(Object object) {

+	//		for(WrappingList representingSuperSet : representingSuperSets) {

+	//			//			representingSuperSet.notWrappingRemove((E)object);

+	//			EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

+	//

+	//			Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.REMOVE, list.getEStructuralFeature(), object, null, list.size() - 1, true);

+	//

+	//			list.getEObject().eNotify(notification);

+	//		}

+	//

+	//		return super.remove(object);

+	//	}

+	//

+	//	@Override

+	//	public E remove(int index) {

+	//		for(WrappingList representingSuperSet : representingSuperSets) {

+	//			//			representingSuperSet.notWrappingRemove(get(index));

+	//			EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

+	//

+	//			Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.REMOVE, list.getEStructuralFeature(), get(index), null, list.size() - 1, true);

+	//

+	//			list.getEObject().eNotify(notification);

+	//		}

+	//

+	//		return super.remove(index);

+	//	}

+	//

+	//	@Override

+	//	public boolean removeAll(Collection<?> collection) {

+	//		for(WrappingList representingSuperSet : representingSuperSets) {

+	//			for(Object e : collection) {

+	//				//				representingSuperSet.notWrappingRemove((E)e);

+	//				EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

+	//

+	//				Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.REMOVE, list.getEStructuralFeature(), e, null, list.size() - 1, true);

+	//

+	//				list.getEObject().eNotify(notification);

+	//			}

+	//		}

+	//

+	//		return super.removeAll(collection);

+	//	}

+	//

+	//	@Override

+	//	public void clear() {

+	//		for(WrappingList representingSuperSet : representingSuperSets) {

+	//			for(Object e : this) {

+	//				//				representingSuperSet.notWrappingRemove((E)e);

+	//				EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

+	//

+	//				Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.REMOVE, list.getEStructuralFeature(), e, null, list.size() - 1, true);

+	//

+	//				list.getEObject().eNotify(notification);

+	//			}

+	//		}

+	//

+	//		super.clear();

+	//	}

+	//

+	//	@Override

+	//	public void notWrappingAdd(E object) {

+	//		for(WrappingList representingSuperSet : representingSuperSets) {

+	//			if(!representingSuperSet.contains(object)) {

+	//				representingSuperSet.notWrappingAdd(object);

+	//			}

+	//		}

+	//

+	//		doAddUnique(object);

+	//	}

+	//

+	//	@Override

+	//	public E notWrappingRemove(E object) {

+	//		for(WrappingList representingSuperSet : representingSuperSets) {

+	//			representingSuperSet.notWrappingRemove(object);

+	//		}

+	//

+	//		return doRemove(indexOf(object));

+	//	}

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/subset/WrappingSubsetEObjectContainmentWithInverseEList.java b/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/subset/WrappingSubsetEObjectContainmentWithInverseEList.java
new file mode 100644
index 00000000000..520b9474cc2
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/subset/WrappingSubsetEObjectContainmentWithInverseEList.java
@@ -0,0 +1,193 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.utils.wrappinglist.subset;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.List;

+

+import org.eclipse.emf.ecore.InternalEObject;

+import org.eclipse.papyrus.facade.utils.RepresentingElement;

+import org.eclipse.papyrus.facade.utils.wrappinglist.WrappingEObjectContainmentWithInverseEList;

+import org.eclipse.papyrus.facade.utils.wrappinglist.WrappingList;

+import org.eclipse.uml2.uml.Element;

+

+

+public class WrappingSubsetEObjectContainmentWithInverseEList<E extends RepresentingElement> extends WrappingEObjectContainmentWithInverseEList<E> {

+

+	protected List<WrappingList<E>> representingSuperSets;

+

+	public WrappingSubsetEObjectContainmentWithInverseEList(Class<?> dataClass, InternalEObject owner, int featureID, int inverseFeatureID, Collection<Element> representedElementList, WrappingList<E>... representingSuperSets) {

+		super(dataClass, owner, featureID, inverseFeatureID, representedElementList);

+		this.representingSuperSets = new ArrayList<WrappingList<E>>();

+		for(int i = 0; i < representingSuperSets.length; i++) {

+			this.representingSuperSets.add(representingSuperSets[i]);

+		}

+	}

+

+	//	@Override

+	//	public boolean add(E object) {

+	//		for(WrappingList representingSuperSet : representingSuperSets) {

+	//			EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

+	//

+	//			Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.ADD, list.getEStructuralFeature(), null, object, list.size(), true);

+	//

+	//			list.getEObject().eNotify(notification);

+	//

+	//			//			if(!representingSuperSet.contains(object)) {

+	//			//				representingSuperSet.notWrappingAdd(object);

+	//			//			}

+	//		}

+	//

+	//

+	//		return super.add(object);

+	//	}

+	//

+	//	@Override

+	//	public void add(int index, E object) {

+	//		for(WrappingList representingSuperSet : representingSuperSets) {

+	//			if(!representingSuperSet.contains(object)) {

+	//				//				representingSuperSet.notWrappingAdd(object);

+	//				EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

+	//

+	//				Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.ADD, list.getEStructuralFeature(), null, object, list.size(), true);

+	//

+	//				list.getEObject().eNotify(notification);

+	//			}

+	//		}

+	//

+	//		super.add(index, object);

+	//	}

+	//

+	//	@Override

+	//	public boolean addAll(Collection<? extends E> collection) {

+	//		for(WrappingList representingSuperSet : representingSuperSets) {

+	//			for(E e : collection) {

+	//				if(!representingSuperSet.contains(e)) {

+	//					//					representingSuperSet.notWrappingAdd(e);

+	//					EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

+	//

+	//					Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.ADD, list.getEStructuralFeature(), null, e, list.size(), true);

+	//

+	//					list.getEObject().eNotify(notification);

+	//				}

+	//			}

+	//		}

+	//

+	//		return super.addAll(collection);

+	//	}

+	//

+	//	@Override

+	//	public boolean addAll(int index, Collection<? extends E> collection) {

+	//		for(WrappingList representingSuperSet : representingSuperSets) {

+	//			for(E e : collection) {

+	//				if(!representingSuperSet.contains(e)) {

+	//					//					representingSuperSet.notWrappingAdd(e);

+	//					EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

+	//

+	//					Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.ADD, list.getEStructuralFeature(), null, e, list.size(), true);

+	//

+	//					list.getEObject().eNotify(notification);

+	//				}

+	//			}

+	//		}

+	//

+	//		return super.addAll(index, collection);

+	//	}

+	//

+	//	@Override

+	//	public boolean remove(Object object) {

+	//		for(WrappingList representingSuperSet : representingSuperSets) {

+	//			//			representingSuperSet.notWrappingRemove((E)object);

+	//			EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

+	//

+	//			Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.REMOVE, list.getEStructuralFeature(), object, null, list.size() - 1, true);

+	//

+	//			list.getEObject().eNotify(notification);

+	//		}

+	//

+	//		return super.remove(object);

+	//	}

+	//

+	//	@Override

+	//	public E remove(int index) {

+	//		for(WrappingList representingSuperSet : representingSuperSets) {

+	//			//			representingSuperSet.notWrappingRemove(get(index));

+	//			EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

+	//

+	//			Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.REMOVE, list.getEStructuralFeature(), get(index), null, list.size() - 1, true);

+	//

+	//			list.getEObject().eNotify(notification);

+	//		}

+	//

+	//		return super.remove(index);

+	//	}

+	//

+	//	@Override

+	//	public boolean removeAll(Collection<?> collection) {

+	//		for(WrappingList representingSuperSet : representingSuperSets) {

+	//			for(Object e : collection) {

+	//				//				representingSuperSet.notWrappingRemove((E)e);

+	//				EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

+	//

+	//				Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.REMOVE, list.getEStructuralFeature(), e, null, list.size() - 1, true);

+	//

+	//				list.getEObject().eNotify(notification);

+	//			}

+	//		}

+	//

+	//		return super.removeAll(collection);

+	//	}

+	//

+	//	@Override

+	//	public void clear() {

+	//		for(WrappingList representingSuperSet : representingSuperSets) {

+	//			for(Object e : this) {

+	//				//				representingSuperSet.notWrappingRemove((E)e);

+	//				EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

+	//

+	//				Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.REMOVE, list.getEStructuralFeature(), e, null, list.size() - 1, true);

+	//

+	//				list.getEObject().eNotify(notification);

+	//			}

+	//		}

+	//

+	//		super.clear();

+	//	}

+	//

+	//	@Override

+	//	public void notWrappingAdd(E object) {

+	//		for(WrappingList representingSuperSet : representingSuperSets) {

+	//			if(!representingSuperSet.contains(object)) {

+	//				representingSuperSet.notWrappingAdd(object);

+	//			}

+	//		}

+	//

+	//		doAddUnique(object);

+	//	}

+	//

+	//	@Override

+	//	public E notWrappingRemove(E object) {

+	//		for(WrappingList representingSuperSet : representingSuperSets) {

+	//			representingSuperSet.notWrappingRemove(object);

+	//		}

+	//

+	//		return doRemove(indexOf(object));

+	//	}

+

+

+

+

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/subset/WrappingSubsetEObjectEList.java b/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/subset/WrappingSubsetEObjectEList.java
new file mode 100644
index 00000000000..c71cc49f253
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/subset/WrappingSubsetEObjectEList.java
@@ -0,0 +1,194 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.utils.wrappinglist.subset;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.List;

+

+import org.eclipse.emf.ecore.InternalEObject;

+import org.eclipse.papyrus.facade.utils.RepresentingElement;

+import org.eclipse.papyrus.facade.utils.wrappinglist.WrappingEObjectEList;

+import org.eclipse.papyrus.facade.utils.wrappinglist.WrappingList;

+import org.eclipse.uml2.uml.Element;

+

+

+public class WrappingSubsetEObjectEList<E extends RepresentingElement> extends WrappingEObjectEList<E> {

+

+	protected List<WrappingList<E>> representingSuperSets;

+

+

+	public WrappingSubsetEObjectEList(Class<?> dataClass, InternalEObject owner, int featureID, Collection<Element> representedElementList, WrappingList<E>... representingSuperSets) {

+		super(dataClass, owner, featureID, representedElementList);

+		this.representingSuperSets = new ArrayList<WrappingList<E>>();

+		for(int i = 0; i < representingSuperSets.length; i++) {

+			this.representingSuperSets.add(representingSuperSets[i]);

+		}

+	}

+	//

+	//	@Override

+	//	public boolean add(E object) {

+	//		for(WrappingList representingSuperSet : representingSuperSets) {

+	//			EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

+	//

+	//			Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.ADD, list.getEStructuralFeature(), null, object, list.size(), true);

+	//

+	//			list.getEObject().eNotify(notification);

+	//

+	//			//			if(!representingSuperSet.contains(object)) {

+	//			//				representingSuperSet.notWrappingAdd(object);

+	//			//			}

+	//		}

+	//

+	//

+	//		return super.add(object);

+	//	}

+	//

+	//	@Override

+	//	public void add(int index, E object) {

+	//		for(WrappingList representingSuperSet : representingSuperSets) {

+	//			if(!representingSuperSet.contains(object)) {

+	//				//				representingSuperSet.notWrappingAdd(object);

+	//				EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

+	//

+	//				Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.ADD, list.getEStructuralFeature(), null, object, list.size(), true);

+	//

+	//				list.getEObject().eNotify(notification);

+	//			}

+	//		}

+	//

+	//		super.add(index, object);

+	//	}

+	//

+	//	@Override

+	//	public boolean addAll(Collection<? extends E> collection) {

+	//		for(WrappingList representingSuperSet : representingSuperSets) {

+	//			for(E e : collection) {

+	//				if(!representingSuperSet.contains(e)) {

+	//					//					representingSuperSet.notWrappingAdd(e);

+	//					EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

+	//

+	//					Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.ADD, list.getEStructuralFeature(), null, e, list.size(), true);

+	//

+	//					list.getEObject().eNotify(notification);

+	//				}

+	//			}

+	//		}

+	//

+	//		return super.addAll(collection);

+	//	}

+	//

+	//	@Override

+	//	public boolean addAll(int index, Collection<? extends E> collection) {

+	//		for(WrappingList representingSuperSet : representingSuperSets) {

+	//			for(E e : collection) {

+	//				if(!representingSuperSet.contains(e)) {

+	//					//					representingSuperSet.notWrappingAdd(e);

+	//					EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

+	//

+	//					Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.ADD, list.getEStructuralFeature(), null, e, list.size(), true);

+	//

+	//					list.getEObject().eNotify(notification);

+	//				}

+	//			}

+	//		}

+	//

+	//		return super.addAll(index, collection);

+	//	}

+	//

+	//	@Override

+	//	public boolean remove(Object object) {

+	//		for(WrappingList representingSuperSet : representingSuperSets) {

+	//			//			representingSuperSet.notWrappingRemove((E)object);

+	//			EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

+	//

+	//			Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.REMOVE, list.getEStructuralFeature(), object, null, list.size() - 1, true);

+	//

+	//			list.getEObject().eNotify(notification);

+	//		}

+	//

+	//		return super.remove(object);

+	//	}

+	//

+	//	@Override

+	//	public E remove(int index) {

+	//		for(WrappingList representingSuperSet : representingSuperSets) {

+	//			//			representingSuperSet.notWrappingRemove(get(index));

+	//			EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

+	//

+	//			Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.REMOVE, list.getEStructuralFeature(), get(index), null, list.size() - 1, true);

+	//

+	//			list.getEObject().eNotify(notification);

+	//		}

+	//

+	//		return super.remove(index);

+	//	}

+	//

+	//	@Override

+	//	public boolean removeAll(Collection<?> collection) {

+	//		for(WrappingList representingSuperSet : representingSuperSets) {

+	//			for(Object e : collection) {

+	//				//				representingSuperSet.notWrappingRemove((E)e);

+	//				EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

+	//

+	//				Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.REMOVE, list.getEStructuralFeature(), e, null, list.size() - 1, true);

+	//

+	//				list.getEObject().eNotify(notification);

+	//			}

+	//		}

+	//

+	//		return super.removeAll(collection);

+	//	}

+	//

+	//	@Override

+	//	public void clear() {

+	//		for(WrappingList representingSuperSet : representingSuperSets) {

+	//			for(Object e : this) {

+	//				//				representingSuperSet.notWrappingRemove((E)e);

+	//				EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

+	//

+	//				Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.REMOVE, list.getEStructuralFeature(), e, null, list.size() - 1, true);

+	//

+	//				list.getEObject().eNotify(notification);

+	//			}

+	//		}

+	//

+	//		super.clear();

+	//	}

+	//

+	//	@Override

+	//	public void notWrappingAdd(E object) {

+	//		for(WrappingList representingSuperSet : representingSuperSets) {

+	//			if(!representingSuperSet.contains(object)) {

+	//				representingSuperSet.notWrappingAdd(object);

+	//			}

+	//		}

+	//

+	//		super.notWrappingAdd(object);

+	//	}

+	//

+	//	@Override

+	//	public E notWrappingRemove(E object) {

+	//		for(WrappingList representingSuperSet : representingSuperSets) {

+	//			representingSuperSet.notWrappingRemove(object);

+	//		}

+	//

+	//		return super.notWrappingRemove(object);

+	//	}

+	//

+	//

+

+

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/subset/WrappingSubsetEObjectWithInverseEList.java b/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/subset/WrappingSubsetEObjectWithInverseEList.java
new file mode 100644
index 00000000000..be82b916c77
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.utils/src/org/eclipse/papyrus/facade/utils/wrappinglist/subset/WrappingSubsetEObjectWithInverseEList.java
@@ -0,0 +1,203 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.utils.wrappinglist.subset;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.List;

+

+import org.eclipse.emf.ecore.InternalEObject;

+import org.eclipse.papyrus.facade.utils.RepresentingElement;

+import org.eclipse.papyrus.facade.utils.wrappinglist.WrappingEObjectWithInverseEList;

+import org.eclipse.papyrus.facade.utils.wrappinglist.WrappingList;

+import org.eclipse.uml2.uml.Element;

+

+

+public class WrappingSubsetEObjectWithInverseEList<E extends RepresentingElement> extends WrappingEObjectWithInverseEList<E> {

+

+	public static class WrappingSubsetManyInverse<E> extends WrappingSubsetEObjectWithInverseEList {

+

+		private static final long serialVersionUID = 1L;

+

+		public WrappingSubsetManyInverse(Class<?> dataClass, InternalEObject owner, int featureID, int inverseFeatureID, Collection<Element> representedElementList, WrappingList... representingSuperSets) {

+			super(dataClass, owner, featureID, inverseFeatureID, representedElementList, representingSuperSets);

+		}

+

+		@Override

+		protected boolean hasManyInverse() {

+			return true;

+		}

+	}

+

+	protected List<WrappingList<E>> representingSuperSets;

+

+	public WrappingSubsetEObjectWithInverseEList(Class<?> dataClass, InternalEObject owner, int featureID, int inverseFeatureID, Collection<Element> representedElementList, WrappingList<E>... representingSuperSets) {

+		super(dataClass, owner, featureID, inverseFeatureID, representedElementList);

+		this.representingSuperSets = new ArrayList<WrappingList<E>>();

+		for(int i = 0; i < representingSuperSets.length; i++) {

+			this.representingSuperSets.add(representingSuperSets[i]);

+		}

+

+	}

+

+	//	@Override

+	//	public boolean add(E object) {

+	//		for(WrappingList representingSuperSet : representingSuperSets) {

+	//			EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

+	//

+	//			Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.ADD, list.getEStructuralFeature(), null, object, list.size(), true);

+	//

+	//			list.getEObject().eNotify(notification);

+	//

+	//			//			if(!representingSuperSet.contains(object)) {

+	//			//				representingSuperSet.notWrappingAdd(object);

+	//			//			}

+	//		}

+	//

+	//

+	//		return super.add(object);

+	//	}

+	//

+	//	@Override

+	//	public void add(int index, E object) {

+	//		for(WrappingList representingSuperSet : representingSuperSets) {

+	//			if(!representingSuperSet.contains(object)) {

+	//				//				representingSuperSet.notWrappingAdd(object);

+	//				EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

+	//

+	//				Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.ADD, list.getEStructuralFeature(), null, object, list.size(), true);

+	//

+	//				list.getEObject().eNotify(notification);

+	//			}

+	//		}

+	//

+	//		super.add(index, object);

+	//	}

+	//

+	//	@Override

+	//	public boolean addAll(Collection<? extends E> collection) {

+	//		for(WrappingList representingSuperSet : representingSuperSets) {

+	//			for(E e : collection) {

+	//				if(!representingSuperSet.contains(e)) {

+	//					//					representingSuperSet.notWrappingAdd(e);

+	//					EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

+	//

+	//					Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.ADD, list.getEStructuralFeature(), null, e, list.size(), true);

+	//

+	//					list.getEObject().eNotify(notification);

+	//				}

+	//			}

+	//		}

+	//

+	//		return super.addAll(collection);

+	//	}

+	//

+	//	@Override

+	//	public boolean addAll(int index, Collection<? extends E> collection) {

+	//		for(WrappingList representingSuperSet : representingSuperSets) {

+	//			for(E e : collection) {

+	//				if(!representingSuperSet.contains(e)) {

+	//					//					representingSuperSet.notWrappingAdd(e);

+	//					EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

+	//

+	//					Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.ADD, list.getEStructuralFeature(), null, e, list.size(), true);

+	//

+	//					list.getEObject().eNotify(notification);

+	//				}

+	//			}

+	//		}

+	//

+	//		return super.addAll(index, collection);

+	//	}

+	//

+	//	@Override

+	//	public boolean remove(Object object) {

+	//		for(WrappingList representingSuperSet : representingSuperSets) {

+	//			//			representingSuperSet.notWrappingRemove((E)object);

+	//			EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

+	//

+	//			Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.REMOVE, list.getEStructuralFeature(), object, null, list.size() - 1, true);

+	//

+	//			list.getEObject().eNotify(notification);

+	//		}

+	//

+	//		return super.remove(object);

+	//	}

+	//

+	//	@Override

+	//	public E remove(int index) {

+	//		for(WrappingList representingSuperSet : representingSuperSets) {

+	//			//			representingSuperSet.notWrappingRemove(get(index));

+	//			EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

+	//

+	//			Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.REMOVE, list.getEStructuralFeature(), get(index), null, list.size() - 1, true);

+	//

+	//			list.getEObject().eNotify(notification);

+	//		}

+	//

+	//		return super.remove(index);

+	//	}

+	//

+	//	@Override

+	//	public boolean removeAll(Collection<?> collection) {

+	//		for(WrappingList representingSuperSet : representingSuperSets) {

+	//			for(Object e : collection) {

+	//				//				representingSuperSet.notWrappingRemove((E)e);

+	//				EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

+	//

+	//				Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.REMOVE, list.getEStructuralFeature(), e, null, list.size() - 1, true);

+	//

+	//				list.getEObject().eNotify(notification);

+	//			}

+	//		}

+	//

+	//		return super.removeAll(collection);

+	//	}

+	//

+	//	@Override

+	//	public void clear() {

+	//		for(WrappingList representingSuperSet : representingSuperSets) {

+	//			for(Object e : this) {

+	//				//				representingSuperSet.notWrappingRemove((E)e);

+	//				EcoreEList<E> list = ((EcoreEList<E>)representingSuperSet);

+	//

+	//				Notification notification = new ENotificationImpl((InternalEObject)list.getEObject(), Notification.REMOVE, list.getEStructuralFeature(), e, null, list.size() - 1, true);

+	//

+	//				list.getEObject().eNotify(notification);

+	//			}

+	//		}

+	//

+	//		super.clear();

+	//	}

+	//

+	//	@Override

+	//	public void notWrappingAdd(E object) {

+	//		for(WrappingList representingSuperSet : representingSuperSets) {

+	//			if(!representingSuperSet.contains(object)) {

+	//				representingSuperSet.notWrappingAdd(object);

+	//			}

+	//		}

+	//

+	//		doAddUnique(object);

+	//	}

+	//

+	//	@Override

+	//	public E notWrappingRemove(E object) {

+	//		for(WrappingList representingSuperSet : representingSuperSets) {

+	//			representingSuperSet.notWrappingRemove(object);

+	//		}

+	//

+	//		return doRemove(indexOf(object));

+	//	}

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/.classpath b/extraplugins/facade/org.eclipse.papyrus.facade/.classpath
new file mode 100644
index 00000000000..ed2bc1287f0
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<classpath>

+	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

+	<classpathentry kind="output" path="bin"/>

+</classpath>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/.project b/extraplugins/facade/org.eclipse.papyrus.facade/.project
new file mode 100644
index 00000000000..99d20c7e0f0
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.papyrus.facade</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.jdt.core.javabuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.ManifestBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.SchemaBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.jdt.core.javanature</nature>

+		<nature>org.eclipse.pde.PluginNature</nature>

+	</natures>

+</projectDescription>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/META-INF/MANIFEST.MF b/extraplugins/facade/org.eclipse.papyrus.facade/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..f5a16b5df33
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/META-INF/MANIFEST.MF
@@ -0,0 +1,33 @@
+Manifest-Version: 1.0

+Bundle-ManifestVersion: 2

+Bundle-Name: %pluginName

+Bundle-SymbolicName: org.eclipse.papyrus.facade;singleton:=true

+Bundle-Version: 0.10.1.qualifier

+Bundle-ClassPath: .

+Bundle-Vendor: %vendorName

+Bundle-Localization: plugin

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Export-Package: org.eclipse.papyrus.facade,

+ org.eclipse.papyrus.facade.extensiondefinition,

+ org.eclipse.papyrus.facade.extensiondefinition.impl,

+ org.eclipse.papyrus.facade.extensiondefinition.util,

+ org.eclipse.papyrus.facade.impl,

+ org.eclipse.papyrus.facade.util,

+ org.eclipse.papyrus.facade.virtualmetamodel,

+ org.eclipse.papyrus.facade.virtualmetamodel.impl,

+ org.eclipse.papyrus.facade.virtualmetamodel.util,

+ org.eclipse.papyrus.facademapping,

+ org.eclipse.papyrus.facademapping.impl,

+ org.eclipse.papyrus.facademapping.util

+Require-Bundle: org.eclipse.core.runtime,

+ org.eclipse.emf.ecore;visibility:=reexport,

+ org.eclipse.emf.ecore.xmi;visibility:=reexport,

+ org.eclipse.uml2;bundle-version="3.2.0",

+ org.eclipse.uml2.uml;bundle-version="4.1.0",

+ org.eclipse.uml2.types;visibility:=reexport,

+ org.eclipse.ui;bundle-version="3.105.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="0.10.1",

+ org.eclipse.papyrus.infra.onefile;bundle-version="0.10.1",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="0.10.1"

+Bundle-ActivationPolicy: lazy

+Bundle-Activator: org.eclipse.papyrus.facade.FacadeActivator

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/build.properties b/extraplugins/facade/org.eclipse.papyrus.facade/build.properties
new file mode 100644
index 00000000000..6a92258361f
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/build.properties
@@ -0,0 +1,16 @@
+

+# <copyright>

+# </copyright>

+#

+# $Id$

+

+bin.includes = .,\

+               model/,\

+               META-INF/,\

+               plugin.xml,\

+               plugin.properties,\

+               bin/,\

+               icons/

+jars.compile.order = .

+source.. = src/

+output.. = bin/

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/icons/facade.png b/extraplugins/facade/org.eclipse.papyrus.facade/icons/facade.png
new file mode 100644
index 00000000000..779a7b8b123
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/icons/facade.png
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/model/facade.ecore b/extraplugins/facade/org.eclipse.papyrus.facade/model/facade.ecore
new file mode 100644
index 00000000000..c689e44cc4d
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/model/facade.ecore
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="facade" nsURI="http://www.eclipse.org/papyrus/facade" nsPrefix="facade">

+  <eClassifiers xsi:type="ecore:EClass" name="Facade">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="extensionDefinitions" upperBound="-1"

+        eType="#//extensiondefinition/ExtensionDefinition" containment="true" eOpposite="#//extensiondefinition/ExtensionDefinition/facade"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="virtualmetamodel" eType="#//virtualmetamodel/VirtualMetamodel"

+        containment="true" eOpposite="#//virtualmetamodel/VirtualMetamodel/facade"/>

+  </eClassifiers>

+  <eSubpackages name="virtualmetamodel" nsURI="http://www.eclipse.org/papyrus/virtualmetamodel"

+      nsPrefix="virtualmetamodel">

+    <eClassifiers xsi:type="ecore:EClass" name="VirtualMetamodel">

+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="nsPrefix" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="nsURI" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="virtualClassifiers" upperBound="-1"

+          eType="#//virtualmetamodel/VirtualClassifier" containment="true" eOpposite="#//virtualmetamodel/VirtualClassifier/metamodel"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="facade" lowerBound="1"

+          eType="#//Facade" eOpposite="#//Facade/virtualmetamodel"/>

+    </eClassifiers>

+    <eClassifiers xsi:type="ecore:EClass" name="VirtualElement" abstract="true">

+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="aliasName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="kept" lowerBound="1"

+          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="representedElement" lowerBound="1"

+          eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>

+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="useRepresented" lowerBound="1"

+          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+    </eClassifiers>

+    <eClassifiers xsi:type="ecore:EClass" name="VirtualClassifier" abstract="true"

+        eSuperTypes="#//virtualmetamodel/VirtualElement">

+      <eStructuralFeatures xsi:type="ecore:EReference" name="metamodel" lowerBound="1"

+          eType="#//virtualmetamodel/VirtualMetamodel" eOpposite="#//virtualmetamodel/VirtualMetamodel/virtualClassifiers"/>

+    </eClassifiers>

+    <eClassifiers xsi:type="ecore:EClass" name="VirtualMetaclass" eSuperTypes="#//virtualmetamodel/VirtualClassifier">

+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="abstract" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="appliedStereotypes" upperBound="-1"

+          eType="#//extensiondefinition/BaseMetaclass"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="operations" upperBound="-1"

+          eType="#//virtualmetamodel/VirtualOperation" containment="true"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="parents" upperBound="-1"

+          eType="#//virtualmetamodel/VirtualMetaclass"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="properties" upperBound="-1"

+          eType="#//virtualmetamodel/VirtualProperty" containment="true" eOpposite="#//virtualmetamodel/VirtualProperty/virtualMetaclass"/>

+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="stereotypeInterface"

+          lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//Boolean"/>

+    </eClassifiers>

+    <eClassifiers xsi:type="ecore:EClass" name="VirtualProperty" eSuperTypes="#//virtualmetamodel/VirtualTypedElement">

+      <eStructuralFeatures xsi:type="ecore:EReference" name="virtualMetaclass" lowerBound="1"

+          eType="#//virtualmetamodel/VirtualMetaclass" eOpposite="#//virtualmetamodel/VirtualMetaclass/properties"/>

+    </eClassifiers>

+    <eClassifiers xsi:type="ecore:EClass" name="VirtualOperation" eSuperTypes="#//virtualmetamodel/VirtualTypedElement">

+      <eStructuralFeatures xsi:type="ecore:EReference" name="parameters" upperBound="-1"

+          eType="#//virtualmetamodel/VirtualParameter" containment="true"/>

+    </eClassifiers>

+    <eClassifiers xsi:type="ecore:EClass" name="VirtualParameter" eSuperTypes="#//virtualmetamodel/VirtualTypedElement"/>

+    <eClassifiers xsi:type="ecore:EClass" name="VirtualDatatype" eSuperTypes="#//virtualmetamodel/VirtualClassifier"/>

+    <eClassifiers xsi:type="ecore:EClass" name="VirtualEnum" eSuperTypes="#//virtualmetamodel/VirtualClassifier">

+      <eStructuralFeatures xsi:type="ecore:EReference" name="literals" upperBound="-1"

+          eType="#//virtualmetamodel/VirtualLiteral" containment="true"/>

+    </eClassifiers>

+    <eClassifiers xsi:type="ecore:EClass" name="VirtualLiteral" eSuperTypes="#//virtualmetamodel/VirtualElement"/>

+    <eClassifiers xsi:type="ecore:EClass" name="VirtualTypedElement" abstract="true"

+        eSuperTypes="#//virtualmetamodel/VirtualElement">

+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="lower" lowerBound="1"

+          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>

+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="upper" lowerBound="1"

+          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="type" lowerBound="1"

+          eType="#//virtualmetamodel/VirtualClassifier"/>

+    </eClassifiers>

+  </eSubpackages>

+  <eSubpackages name="extensiondefinition" nsURI="http://www.eclipse.org/papyrus/extensiondefinition"

+      nsPrefix="extensiondefinition">

+    <eClassifiers xsi:type="ecore:EClass" name="ExtensionDefinition">

+      <eStructuralFeatures xsi:type="ecore:EReference" name="extension" lowerBound="1"

+          eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Extension"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="baseMetaclasses" upperBound="-1"

+          eType="#//extensiondefinition/BaseMetaclass" containment="true" eOpposite="#//extensiondefinition/BaseMetaclass/extensionDefinition"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="facade" lowerBound="1"

+          eType="#//Facade" eOpposite="#//Facade/extensionDefinitions"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="stereotype" lowerBound="1"

+          eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Stereotype"/>

+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" lowerBound="1"

+          eType="#//extensiondefinition/ExtensionDefinitionKind"/>

+    </eClassifiers>

+    <eClassifiers xsi:type="ecore:EEnum" name="ExtensionDefinitionKind">

+      <eLiterals name="Association" literal="Association"/>

+      <eLiterals name="Generalization" value="1"/>

+      <eLiterals name="MultiGeneralization" value="2"/>

+      <eLiterals name="Fusion" value="3" literal="Fusion"/>

+    </eClassifiers>

+    <eClassifiers xsi:type="ecore:EClass" name="BaseMetaclass">

+      <eStructuralFeatures xsi:type="ecore:EReference" name="incompatibleStereotypes"

+          upperBound="-1" eType="#//extensiondefinition/Combination" containment="true"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="base" lowerBound="1"

+          eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="extensionDefinition"

+          lowerBound="1" eType="#//extensiondefinition/ExtensionDefinition" eOpposite="#//extensiondefinition/ExtensionDefinition/baseMetaclasses"/>

+      <eStructuralFeatures xsi:type="ecore:EReference" name="compatibleStereotypes"

+          upperBound="-1" eType="#//extensiondefinition/Combination" containment="true"/>

+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="possible" lowerBound="1"

+          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+    </eClassifiers>

+    <eClassifiers xsi:type="ecore:EClass" name="Combination">

+      <eStructuralFeatures xsi:type="ecore:EReference" name="members" upperBound="-1"

+          eType="#//extensiondefinition/BaseMetaclass"/>

+    </eClassifiers>

+  </eSubpackages>

+</ecore:EPackage>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/model/facade.genmodel b/extraplugins/facade/org.eclipse.papyrus.facade/model/facade.genmodel
new file mode 100644
index 00000000000..7de7c462bfd
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/model/facade.genmodel
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.papyrus.facade/src" modelPluginID="org.eclipse.papyrus.facade"

+    modelName="Facade" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"

+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="7.0" copyrightFields="false"

+    usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.uml2.types/model/Types.genmodel#//types ../../org.eclipse.uml2.uml/model/UML.genmodel#//uml"

+    operationReflection="true" importOrganizing="true">

+  <foreignModel>facade.ecore</foreignModel>

+  <genPackages prefix="Facade" basePackage="org.eclipse.papyrus" resource="XML" disposableProviderFactory="true"

+      ecorePackage="facade.ecore#/">

+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="facade.ecore#//ExtensionDefinitionKind">

+      <genEnumLiterals ecoreEnumLiteral="facade.ecore#//ExtensionDefinitionKind/Tag"/>

+      <genEnumLiterals ecoreEnumLiteral="facade.ecore#//ExtensionDefinitionKind/Metaclass"/>

+      <genEnumLiterals ecoreEnumLiteral="facade.ecore#//ExtensionDefinitionKind/Fusion"/>

+    </genEnums>

+    <genClasses ecoreClass="facade.ecore#//Facade">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference facade.ecore#//Facade/facadeConstraints"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference facade.ecore#//Facade/extensionDefinitions"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute facade.ecore#//Facade/name"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute facade.ecore#//Facade/nsPrefix"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute facade.ecore#//Facade/nsURI"/>

+    </genClasses>

+    <genClasses ecoreClass="facade.ecore#//ExtensionDefinition">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference facade.ecore#//ExtensionDefinition/extension"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference facade.ecore#//ExtensionDefinition/baseMetaclasses"/>

+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference facade.ecore#//ExtensionDefinition/facade"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference facade.ecore#//ExtensionDefinition/stereotype"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute facade.ecore#//ExtensionDefinition/kind"/>

+    </genClasses>

+    <genClasses ecoreClass="facade.ecore#//BaseMetaclass">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference facade.ecore#//BaseMetaclass/incompatibleStereotypes"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference facade.ecore#//BaseMetaclass/base"/>

+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference facade.ecore#//BaseMetaclass/extensionDefinition"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference facade.ecore#//BaseMetaclass/compatibleStereotypes"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute facade.ecore#//BaseMetaclass/possible"/>

+    </genClasses>

+    <genClasses ecoreClass="facade.ecore#//Combination">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference facade.ecore#//Combination/members"/>

+    </genClasses>

+    <genClasses image="false" ecoreClass="facade.ecore#//FacadeConstraint">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference facade.ecore#//FacadeConstraint/constrainedElement"/>

+    </genClasses>

+    <genClasses ecoreClass="facade.ecore#//FilterConstraint">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute facade.ecore#//FilterConstraint/isInclusion"/>

+    </genClasses>

+    <genClasses ecoreClass="facade.ecore#//AbstractConstraint"/>

+    <genClasses ecoreClass="facade.ecore#//AliasConstraint">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute facade.ecore#//AliasConstraint/aliasName"/>

+    </genClasses>

+    <genClasses ecoreClass="facade.ecore#//MultiplicityConstraint">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute facade.ecore#//MultiplicityConstraint/lower"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute facade.ecore#//MultiplicityConstraint/upper"/>

+    </genClasses>

+  </genPackages>

+</genmodel:GenModel>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/model/facademapping.ecore b/extraplugins/facade/org.eclipse.papyrus.facade/model/facademapping.ecore
new file mode 100644
index 00000000000..713432f7619
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/model/facademapping.ecore
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="facademapping" nsURI="http://www.eclipse.org/papyrus/facademapping"

+    nsPrefix="facademapping">

+  <eClassifiers xsi:type="ecore:EClass" name="Mapping">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="umlElement" lowerBound="1"

+        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="specificDomainElement"

+        lowerBound="1" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="StereotypedMapping" eSuperTypes="#//Mapping">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="appliedStereotypes" lowerBound="1"

+        upperBound="-1" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="#//ExtensionDefinitionKind"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="FacadeMappping">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="mappings" upperBound="-1"

+        eType="#//Mapping" containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EEnum" name="ExtensionDefinitionKind">

+    <eLiterals name="Association" literal="Association"/>

+    <eLiterals name="Generalization" value="1"/>

+    <eLiterals name="MultiGeneralization" value="2"/>

+    <eLiterals name="Fusion" value="3" literal="Fusion"/>

+  </eClassifiers>

+</ecore:EPackage>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/model/facademapping.genmodel b/extraplugins/facade/org.eclipse.papyrus.facade/model/facademapping.genmodel
new file mode 100644
index 00000000000..c2af11c0380
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/model/facademapping.genmodel
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.papyrus.facade/src" modelPluginID="org.eclipse.papyrus.facade"

+    modelName="Facademapping" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"

+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="7.0" copyrightFields="false"

+    operationReflection="true" importOrganizing="true">

+  <foreignModel>facademapping.ecore</foreignModel>

+  <genPackages prefix="Facademapping" basePackage="org.eclipse.papyrus" disposableProviderFactory="true"

+      ecorePackage="facademapping.ecore#/">

+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="facademapping.ecore#//ExtensionDefinitionKind">

+      <genEnumLiterals ecoreEnumLiteral="facademapping.ecore#//ExtensionDefinitionKind/Association"/>

+      <genEnumLiterals ecoreEnumLiteral="facademapping.ecore#//ExtensionDefinitionKind/Generalization"/>

+      <genEnumLiterals ecoreEnumLiteral="facademapping.ecore#//ExtensionDefinitionKind/MultiGeneralization"/>

+      <genEnumLiterals ecoreEnumLiteral="facademapping.ecore#//ExtensionDefinitionKind/Fusion"/>

+    </genEnums>

+    <genClasses ecoreClass="facademapping.ecore#//Mapping">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference facademapping.ecore#//Mapping/umlElement"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference facademapping.ecore#//Mapping/specificDomainElement"/>

+    </genClasses>

+    <genClasses ecoreClass="facademapping.ecore#//StereotypedMapping">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference facademapping.ecore#//StereotypedMapping/appliedStereotypes"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute facademapping.ecore#//StereotypedMapping/kind"/>

+    </genClasses>

+    <genClasses ecoreClass="facademapping.ecore#//FacadeMappping">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference facademapping.ecore#//FacadeMappping/mappings"/>

+    </genClasses>

+  </genPackages>

+</genmodel:GenModel>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/plugin.properties b/extraplugins/facade/org.eclipse.papyrus.facade/plugin.properties
new file mode 100644
index 00000000000..58eeb7d30cd
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/plugin.properties
@@ -0,0 +1,3 @@
+pluginName=Papyrus Facade CodeGen (Incubation)

+vendorName=Eclipse Modeling Project

+providerName = www.example.org

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/plugin.xml b/extraplugins/facade/org.eclipse.papyrus.facade/plugin.xml
new file mode 100644
index 00000000000..266a176742a
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/plugin.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<?eclipse version="3.0"?>

+

+<!--

+ <copyright>

+ </copyright>

+

+ $Id$

+-->

+

+<plugin>

+   <extension-point id="facadeDefinition" name="facadeDefinition" schema="schema/facadeDefinition.exsd"/>

+

+

+
+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated facade -->

+      <package

+            uri="http://www.eclipse.org/papyrus/facade"

+            class="org.eclipse.papyrus.facade.FacadePackage"

+            genModel="model/facade.genmodel"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.extension_parser">

+      <!-- @generated facade -->

+      <parser

+            type="facade"

+            class="org.eclipse.papyrus.facade.util.FacadeResourceFactoryImpl"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated facade -->

+      <package

+            uri="http://www.eclipse.org/papyrus/virtualmetamodel"

+            class="org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage"

+            genModel="model/facade.genmodel"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.extension_parser">

+      <!-- @generated facade -->

+      <parser

+            type="virtualmetamodel"

+            class="org.eclipse.papyrus.facade.virtualmetamodel.util.VirtualmetamodelResourceFactoryImpl"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated facade -->

+      <package

+            uri="http://www.eclipse.org/papyrus/extensiondefinition"

+            class="org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage"

+            genModel="model/facade.genmodel"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.extension_parser">

+      <!-- @generated facade -->

+      <parser

+            type="extensiondefinition"

+            class="org.eclipse.papyrus.facade.extensiondefinition.util.ExtensiondefinitionResourceFactoryImpl"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated facademapping -->

+      <package

+            uri="http://www.eclipse.org/papyrus/facademapping"

+            class="org.eclipse.papyrus.facademapping.FacademappingPackage"

+            genModel="model/facademapping.genmodel"/>

+   </extension>

+   

+      <extension

+         point="org.eclipse.ui.commands">

+      <command

+            categoryId="org.eclipse.papyrus.facade.category"

+            id="org.eclipse.papyrus.facade.applyFacadeCommand"

+            name="Apply a facade">

+      </command>

+   </extension>

+   <extension

+         point="org.eclipse.ui.handlers">

+      <handler

+            class="org.eclipse.papyrus.facade.handlers.ApplyFacade"

+            commandId="org.eclipse.papyrus.facade.applyFacadeCommand">

+      </handler>

+   </extension>

+ 

+   <extension

+         point="org.eclipse.ui.menus">

+      <menuContribution

+            locationURI="popup:org.eclipse.ui.navigator.ProjectExplorer#PopupMenu">

+            <command

+                  commandId="org.eclipse.papyrus.facade.applyFacadeCommand"

+                  icon="icons/facade.png"

+                  id="org.eclipse.papyrus.facade.menu.applyFacadeCommand">

+ 

+                    <visibleWhen>

+				           <with variable="activeMenuSelection">

+				            <iterate

+				                 ifEmpty="false">

+				             <adapt type="org.eclipse.core.resources.IResource">

+

+				             </adapt>

+				            </iterate>

+				           </with>

+         			</visibleWhen>

+            </command>

+      </menuContribution>

+   </extension>

+

+</plugin>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/schema/facadeDefinition.exsd b/extraplugins/facade/org.eclipse.papyrus.facade/schema/facadeDefinition.exsd
new file mode 100644
index 00000000000..c11b1078a7a
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/schema/facadeDefinition.exsd
@@ -0,0 +1,145 @@
+<?xml version='1.0' encoding='UTF-8'?>

+<!-- Schema file written by PDE -->

+<schema targetNamespace="org.eclipse.papyrus.facade" xmlns="http://www.w3.org/2001/XMLSchema">

+<annotation>

+      <appInfo>

+         <meta.schema plugin="org.eclipse.papyrus.facade" id="facadeDefinition" name="facadeDefinition"/>

+      </appInfo>

+      <documentation>

+         Extension point used to define available facade.

+      </documentation>

+   </annotation>

+

+   <element name="extension">

+      <annotation>

+         <appInfo>

+            <meta.element />

+         </appInfo>

+      </annotation>

+      <complexType>

+         <sequence minOccurs="1" maxOccurs="unbounded">

+            <element ref="facadeDefinition"/>

+         </sequence>

+         <attribute name="point" type="string" use="required">

+            <annotation>

+               <documentation>

+                  

+               </documentation>

+            </annotation>

+         </attribute>

+         <attribute name="id" type="string">

+            <annotation>

+               <documentation>

+                  

+               </documentation>

+            </annotation>

+         </attribute>

+         <attribute name="name" type="string">

+            <annotation>

+               <documentation>

+                  

+               </documentation>

+               <appInfo>

+                  <meta.attribute translatable="true"/>

+               </appInfo>

+            </annotation>

+         </attribute>

+      </complexType>

+   </element>

+

+   <element name="facadeDefinition">

+      <complexType>

+         <sequence minOccurs="1" maxOccurs="unbounded">

+            <element ref="profileURI"/>

+         </sequence>

+         <attribute name="id" type="string" use="default" value="0">

+            <annotation>

+               <documentation>

+                  The non-negative priority of the scope provider; the default is 0 (zero).  Providers are invoked by the search framework in priority order, from highest to lowest.

+               </documentation>

+            </annotation>

+         </attribute>

+         <attribute name="fileExtension" type="string" use="required">

+            <annotation>

+               <documentation>

+                  

+               </documentation>

+            </annotation>

+         </attribute>

+      </complexType>

+   </element>

+

+   <element name="profileURI">

+      <complexType>

+         <attribute name="uri" type="string">

+            <annotation>

+               <documentation>

+                  

+               </documentation>

+            </annotation>

+         </attribute>

+      </complexType>

+   </element>

+

+   <annotation>

+      <appInfo>

+         <meta.section type="since"/>

+      </appInfo>

+      <documentation>

+         1.0.0

+      </documentation>

+   </annotation>

+

+   <annotation>

+      <appInfo>

+         <meta.section type="examples"/>

+      </appInfo>

+      <documentation>

+         &lt;extension point=&quot;org.eclipse.papyrus.facade.facadeDefinition&quot;&gt;

+	&lt;facadeDefinition fileExtension=&quot;umlrtdsl&quot; id=&quot;umlrtdsl&quot;&gt;

+         &lt;profileURI uri=&quot;pathmap://UMLRT_PROFILES/uml-rt.profile.uml&quot;&gt;&lt;/profileURI&gt;

+	&lt;/facadeDefinition&gt;

+&lt;/extension&gt;

+      </documentation>

+   </annotation>

+

+   <annotation>

+      <appInfo>

+         <meta.section type="apiinfo"/>

+      </appInfo>

+      <documentation>

+         [Enter API information here.]

+      </documentation>

+   </annotation>

+

+   <annotation>

+      <appInfo>

+         <meta.section type="implementation"/>

+      </appInfo>

+      <documentation>

+         [Enter information about supplied implementation of this extension point.]

+      </documentation>

+   </annotation>

+

+   <annotation>

+      <appInfo>

+         <meta.section type="copyright"/>

+      </appInfo>

+      <documentation>

+         /*****************************************************************************

+ * Copyright (c) 2013 CEA LIST and others.

+ *

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+      </documentation>

+   </annotation>

+

+</schema>

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/Facade.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/Facade.java
new file mode 100644
index 00000000000..dbd3ff5c558
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/Facade.java
@@ -0,0 +1,89 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade;

+

+import org.eclipse.emf.common.util.EList;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Facade</b></em>'.

+ * <!-- end-user-doc -->

+ * 

+ * <p>

+ * The following features are supported:

+ * <ul>

+ * <li>{@link org.eclipse.papyrus.facade.Facade#getExtensionDefinitions <em>Extension Definitions</em>}</li>

+ * <li>{@link org.eclipse.papyrus.facade.Facade#getVirtualmetamodel <em>Virtualmetamodel</em>}</li>

+ * </ul>

+ * </p>

+ * 

+ * @see org.eclipse.papyrus.facade.FacadePackage#getFacade()

+ * @model

+ * @generated

+ */

+public interface Facade extends EObject {

+

+	/**

+	 * Returns the value of the '<em><b>Extension Definitions</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition}.

+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition#getFacade <em>Facade</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Extension Definitions</em>' containment reference list isn't clear, there really should be more of a description

+	 * here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the value of the '<em>Extension Definitions</em>' containment reference list.

+	 * @see org.eclipse.papyrus.facade.FacadePackage#getFacade_ExtensionDefinitions()

+	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition#getFacade

+	 * @model opposite="facade" containment="true"

+	 * @generated

+	 */

+	EList<ExtensionDefinition> getExtensionDefinitions();

+

+	/**

+	 * Returns the value of the '<em><b>Virtualmetamodel</b></em>' containment reference.

+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel#getFacade <em>Facade</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Virtualmetamodel</em>' containment reference isn't clear, there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * 

+	 * @return the value of the '<em>Virtualmetamodel</em>' containment reference.

+	 * @see #setVirtualmetamodel(VirtualMetamodel)

+	 * @see org.eclipse.papyrus.facade.FacadePackage#getFacade_Virtualmetamodel()

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel#getFacade

+	 * @model opposite="facade" containment="true"

+	 * @generated

+	 */

+	VirtualMetamodel getVirtualmetamodel();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.facade.Facade#getVirtualmetamodel <em>Virtualmetamodel</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @param value

+	 *        the new value of the '<em>Virtualmetamodel</em>' containment reference.

+	 * @see #getVirtualmetamodel()

+	 * @generated

+	 */

+	void setVirtualmetamodel(VirtualMetamodel value);

+

+} // Facade

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/FacadeActivator.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/FacadeActivator.java
new file mode 100644
index 00000000000..e12cf20f787
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/FacadeActivator.java
@@ -0,0 +1,77 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade;

+

+import org.eclipse.papyrus.infra.core.log.LogHelper;

+import org.eclipse.ui.plugin.AbstractUIPlugin;

+import org.osgi.framework.BundleContext;

+

+

+public class FacadeActivator extends AbstractUIPlugin {

+

+	/** The context. */

+	private static BundleContext context;

+

+	// The plug-in ID

+	/** The Constant PLUGIN_ID. */

+	public static final String PLUGIN_ID = "org.eclipse.papyrus.facade"; //$NON-NLS-1$

+

+	/** The log. */

+	public static LogHelper log;

+

+	/**

+	 * Gets the context.

+	 * 

+	 * @return the context

+	 */

+	static BundleContext getContext() {

+		return context;

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)

+	 */

+	/**

+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

+	 * 

+	 * @param bundleContext

+	 * @throws Exception

+	 */

+

+	@Override

+	public void start(BundleContext bundleContext) throws Exception {

+		FacadeActivator.context = bundleContext;

+		log = new LogHelper(this);

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)

+	 */

+	/**

+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

+	 * 

+	 * @param bundleContext

+	 * @throws Exception

+	 */

+

+	@Override

+	public void stop(BundleContext bundleContext) throws Exception {

+		FacadeActivator.context = null;

+	}

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/FacadeFactory.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/FacadeFactory.java
new file mode 100644
index 00000000000..5f04c5f44b2
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/FacadeFactory.java
@@ -0,0 +1,53 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade;

+

+import org.eclipse.emf.ecore.EFactory;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Factory</b> for the model.

+ * It provides a create method for each non-abstract class of the model.

+ * <!-- end-user-doc -->

+ * @see org.eclipse.papyrus.facade.FacadePackage

+ * @generated

+ */

+public interface FacadeFactory extends EFactory {

+	/**

+	 * The singleton instance of the factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	FacadeFactory eINSTANCE = org.eclipse.papyrus.facade.impl.FacadeFactoryImpl.init();

+

+	/**

+	 * Returns a new object of class '<em>Facade</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return a new object of class '<em>Facade</em>'.

+	 * @generated

+	 */

+	Facade createFacade();

+

+	/**

+	 * Returns the package supported by this factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the package supported by this factory.

+	 * @generated

+	 */

+	FacadePackage getFacadePackage();

+

+} //FacadeFactory

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/FacadePackage.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/FacadePackage.java
new file mode 100644
index 00000000000..baca9d18fb7
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/FacadePackage.java
@@ -0,0 +1,199 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade;

+

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EPackage;

+import org.eclipse.emf.ecore.EReference;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Package</b> for the model.

+ * It contains accessors for the meta objects to represent

+ * <ul>

+ *   <li>each class,</li>

+ *   <li>each feature of each class,</li>

+ *   <li>each operation of each class,</li>

+ *   <li>each enum,</li>

+ *   <li>and each data type</li>

+ * </ul>

+ * <!-- end-user-doc -->

+ * @see org.eclipse.papyrus.facade.FacadeFactory

+ * @model kind="package"

+ * @generated

+ */

+public interface FacadePackage extends EPackage {

+	/**

+	 * The package name.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	String eNAME = "facade";

+

+	/**

+	 * The package namespace URI.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	String eNS_URI = "http://www.eclipse.org/papyrus/facade";

+

+	/**

+	 * The package namespace name.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	String eNS_PREFIX = "facade";

+

+	/**

+	 * The singleton instance of the package.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	FacadePackage eINSTANCE = org.eclipse.papyrus.facade.impl.FacadePackageImpl.init();

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.facade.impl.FacadeImpl <em>Facade</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.papyrus.facade.impl.FacadeImpl

+	 * @see org.eclipse.papyrus.facade.impl.FacadePackageImpl#getFacade()

+	 * @generated

+	 */

+	int FACADE = 0;

+

+	/**

+	 * The feature id for the '<em><b>Extension Definitions</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int FACADE__EXTENSION_DEFINITIONS = 0;

+

+	/**

+	 * The feature id for the '<em><b>Virtualmetamodel</b></em>' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int FACADE__VIRTUALMETAMODEL = 1;

+

+	/**

+	 * The number of structural features of the '<em>Facade</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int FACADE_FEATURE_COUNT = 2;

+

+	/**

+	 * The number of operations of the '<em>Facade</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int FACADE_OPERATION_COUNT = 0;

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.facade.Facade <em>Facade</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>Facade</em>'.

+	 * @see org.eclipse.papyrus.facade.Facade

+	 * @generated

+	 */

+	EClass getFacade();

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.facade.Facade#getExtensionDefinitions <em>Extension Definitions</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference list '<em>Extension Definitions</em>'.

+	 * @see org.eclipse.papyrus.facade.Facade#getExtensionDefinitions()

+	 * @see #getFacade()

+	 * @generated

+	 */

+	EReference getFacade_ExtensionDefinitions();

+

+	/**

+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.facade.Facade#getVirtualmetamodel <em>Virtualmetamodel</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference '<em>Virtualmetamodel</em>'.

+	 * @see org.eclipse.papyrus.facade.Facade#getVirtualmetamodel()

+	 * @see #getFacade()

+	 * @generated

+	 */

+	EReference getFacade_Virtualmetamodel();

+

+	/**

+	 * Returns the factory that creates the instances of the model.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the factory that creates the instances of the model.

+	 * @generated

+	 */

+	FacadeFactory getFacadeFactory();

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * Defines literals for the meta objects that represent

+	 * <ul>

+	 *   <li>each class,</li>

+	 *   <li>each feature of each class,</li>

+	 *   <li>each operation of each class,</li>

+	 *   <li>each enum,</li>

+	 *   <li>and each data type</li>

+	 * </ul>

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	interface Literals {

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.facade.impl.FacadeImpl <em>Facade</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.papyrus.facade.impl.FacadeImpl

+		 * @see org.eclipse.papyrus.facade.impl.FacadePackageImpl#getFacade()

+		 * @generated

+		 */

+		EClass FACADE = eINSTANCE.getFacade();

+

+		/**

+		 * The meta object literal for the '<em><b>Extension Definitions</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EReference FACADE__EXTENSION_DEFINITIONS = eINSTANCE.getFacade_ExtensionDefinitions();

+

+		/**

+		 * The meta object literal for the '<em><b>Virtualmetamodel</b></em>' containment reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EReference FACADE__VIRTUALMETAMODEL = eINSTANCE.getFacade_Virtualmetamodel();

+

+	}

+

+} //FacadePackage

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/Messages.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/Messages.java
new file mode 100644
index 00000000000..591feb59e96
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/Messages.java
@@ -0,0 +1,68 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade;

+

+import org.eclipse.osgi.util.NLS;

+

+public class Messages extends NLS {

+

+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.facade.messages"; //$NON-NLS-1$

+

+	public static String ApplyFacade_0;

+

+	public static String ApplyFacade_1;

+

+	public static String FacadeDefinitionManager_0;

+

+	public static String FacadeDefinitionManager_1;

+

+	public static String FacadeDefinitionManager_10;

+

+	public static String FacadeDefinitionManager_11;

+

+	public static String FacadeDefinitionManager_12;

+

+	public static String FacadeDefinitionManager_13;

+

+	public static String FacadeDefinitionManager_14;

+

+	public static String FacadeDefinitionManager_15;

+

+	public static String FacadeDefinitionManager_16;

+

+	public static String FacadeDefinitionManager_17;

+

+	public static String FacadeDefinitionManager_2;

+

+	public static String FacadeDefinitionManager_3;

+

+	public static String FacadeDefinitionManager_4;

+

+	public static String FacadeDefinitionManager_5;

+

+	public static String FacadeDefinitionManager_6;

+

+	public static String FacadeDefinitionManager_7;

+

+	public static String FacadeDefinitionManager_8;

+

+	public static String FacadeDefinitionManager_9;

+	static {

+		// initialize resource bundle

+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);

+	}

+

+	private Messages() {

+	}

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/BaseMetaclass.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/BaseMetaclass.java
new file mode 100644
index 00000000000..12af73d2ab3
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/BaseMetaclass.java
@@ -0,0 +1,153 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.extensiondefinition;

+

+import org.eclipse.emf.common.util.EList;

+

+import org.eclipse.emf.ecore.EObject;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Base Metaclass</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass#getIncompatibleStereotypes <em>Incompatible Stereotypes</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass#getBase <em>Base</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass#getExtensionDefinition <em>Extension Definition</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass#getCompatibleStereotypes <em>Compatible Stereotypes</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass#isPossible <em>Possible</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage#getBaseMetaclass()

+ * @model

+ * @generated

+ */

+public interface BaseMetaclass extends EObject {

+	/**

+	 * Returns the value of the '<em><b>Incompatible Stereotypes</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.papyrus.facade.extensiondefinition.Combination}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Incompatible Stereotypes</em>' containment reference list isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Incompatible Stereotypes</em>' containment reference list.

+	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage#getBaseMetaclass_IncompatibleStereotypes()

+	 * @model containment="true"

+	 * @generated

+	 */

+	EList<Combination> getIncompatibleStereotypes();

+

+	/**

+	 * Returns the value of the '<em><b>Base</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Base</em>' reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Base</em>' reference.

+	 * @see #setBase(EObject)

+	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage#getBaseMetaclass_Base()

+	 * @model required="true"

+	 * @generated

+	 */

+	EObject getBase();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass#getBase <em>Base</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Base</em>' reference.

+	 * @see #getBase()

+	 * @generated

+	 */

+	void setBase(EObject value);

+

+	/**

+	 * Returns the value of the '<em><b>Extension Definition</b></em>' container reference.

+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition#getBaseMetaclasses <em>Base Metaclasses</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Extension Definition</em>' container reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Extension Definition</em>' container reference.

+	 * @see #setExtensionDefinition(ExtensionDefinition)

+	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage#getBaseMetaclass_ExtensionDefinition()

+	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition#getBaseMetaclasses

+	 * @model opposite="baseMetaclasses" required="true" transient="false"

+	 * @generated

+	 */

+	ExtensionDefinition getExtensionDefinition();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass#getExtensionDefinition <em>Extension Definition</em>}' container reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Extension Definition</em>' container reference.

+	 * @see #getExtensionDefinition()

+	 * @generated

+	 */

+	void setExtensionDefinition(ExtensionDefinition value);

+

+	/**

+	 * Returns the value of the '<em><b>Compatible Stereotypes</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.papyrus.facade.extensiondefinition.Combination}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Compatible Stereotypes</em>' containment reference list isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Compatible Stereotypes</em>' containment reference list.

+	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage#getBaseMetaclass_CompatibleStereotypes()

+	 * @model containment="true"

+	 * @generated

+	 */

+	EList<Combination> getCompatibleStereotypes();

+

+	/**

+	 * Returns the value of the '<em><b>Possible</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Possible</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Possible</em>' attribute.

+	 * @see #setPossible(boolean)

+	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage#getBaseMetaclass_Possible()

+	 * @model required="true"

+	 * @generated

+	 */

+	boolean isPossible();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass#isPossible <em>Possible</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Possible</em>' attribute.

+	 * @see #isPossible()

+	 * @generated

+	 */

+	void setPossible(boolean value);

+

+} // BaseMetaclass

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/Combination.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/Combination.java
new file mode 100644
index 00000000000..7cdd737aa62
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/Combination.java
@@ -0,0 +1,53 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.extensiondefinition;

+

+import org.eclipse.emf.common.util.EList;

+

+import org.eclipse.emf.ecore.EObject;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Combination</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.papyrus.facade.extensiondefinition.Combination#getMembers <em>Members</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage#getCombination()

+ * @model

+ * @generated

+ */

+public interface Combination extends EObject {

+	/**

+	 * Returns the value of the '<em><b>Members</b></em>' reference list.

+	 * The list contents are of type {@link org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Members</em>' reference list isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Members</em>' reference list.

+	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage#getCombination_Members()

+	 * @model

+	 * @generated

+	 */

+	EList<BaseMetaclass> getMembers();

+

+} // Combination

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/ExtensionDefinition.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/ExtensionDefinition.java
new file mode 100644
index 00000000000..2ec7c5abd30
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/ExtensionDefinition.java
@@ -0,0 +1,173 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.extensiondefinition;

+

+import org.eclipse.emf.common.util.EList;

+

+import org.eclipse.emf.ecore.EObject;

+

+import org.eclipse.papyrus.facade.Facade;

+

+import org.eclipse.uml2.uml.Extension;

+import org.eclipse.uml2.uml.Stereotype;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Extension Definition</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition#getExtension <em>Extension</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition#getBaseMetaclasses <em>Base Metaclasses</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition#getFacade <em>Facade</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition#getStereotype <em>Stereotype</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition#getKind <em>Kind</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage#getExtensionDefinition()

+ * @model

+ * @generated

+ */

+public interface ExtensionDefinition extends EObject {

+	/**

+	 * Returns the value of the '<em><b>Extension</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Extension</em>' reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Extension</em>' reference.

+	 * @see #setExtension(Extension)

+	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage#getExtensionDefinition_Extension()

+	 * @model required="true"

+	 * @generated

+	 */

+	Extension getExtension();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition#getExtension <em>Extension</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Extension</em>' reference.

+	 * @see #getExtension()

+	 * @generated

+	 */

+	void setExtension(Extension value);

+

+	/**

+	 * Returns the value of the '<em><b>Base Metaclasses</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass}.

+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass#getExtensionDefinition <em>Extension Definition</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Base Metaclasses</em>' containment reference list isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Base Metaclasses</em>' containment reference list.

+	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage#getExtensionDefinition_BaseMetaclasses()

+	 * @see org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass#getExtensionDefinition

+	 * @model opposite="extensionDefinition" containment="true"

+	 * @generated

+	 */

+	EList<BaseMetaclass> getBaseMetaclasses();

+

+	/**

+	 * Returns the value of the '<em><b>Facade</b></em>' container reference.

+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.facade.Facade#getExtensionDefinitions <em>Extension Definitions</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Facade</em>' container reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Facade</em>' container reference.

+	 * @see #setFacade(Facade)

+	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage#getExtensionDefinition_Facade()

+	 * @see org.eclipse.papyrus.facade.Facade#getExtensionDefinitions

+	 * @model opposite="extensionDefinitions" required="true" transient="false"

+	 * @generated

+	 */

+	Facade getFacade();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition#getFacade <em>Facade</em>}' container reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Facade</em>' container reference.

+	 * @see #getFacade()

+	 * @generated

+	 */

+	void setFacade(Facade value);

+

+	/**

+	 * Returns the value of the '<em><b>Stereotype</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Stereotype</em>' reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Stereotype</em>' reference.

+	 * @see #setStereotype(Stereotype)

+	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage#getExtensionDefinition_Stereotype()

+	 * @model required="true"

+	 * @generated

+	 */

+	Stereotype getStereotype();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition#getStereotype <em>Stereotype</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Stereotype</em>' reference.

+	 * @see #getStereotype()

+	 * @generated

+	 */

+	void setStereotype(Stereotype value);

+

+	/**

+	 * Returns the value of the '<em><b>Kind</b></em>' attribute.

+	 * The literals are from the enumeration {@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinitionKind}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Kind</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Kind</em>' attribute.

+	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinitionKind

+	 * @see #setKind(ExtensionDefinitionKind)

+	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage#getExtensionDefinition_Kind()

+	 * @model required="true"

+	 * @generated

+	 */

+	ExtensionDefinitionKind getKind();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition#getKind <em>Kind</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Kind</em>' attribute.

+	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinitionKind

+	 * @see #getKind()

+	 * @generated

+	 */

+	void setKind(ExtensionDefinitionKind value);

+

+} // ExtensionDefinition

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/ExtensionDefinitionKind.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/ExtensionDefinitionKind.java
new file mode 100644
index 00000000000..bc28f92de5e
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/ExtensionDefinitionKind.java
@@ -0,0 +1,273 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.extensiondefinition;

+

+import java.util.Arrays;

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.emf.common.util.Enumerator;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the literals of the enumeration '<em><b>Extension Definition Kind</b></em>',

+ * and utility methods for working with them.

+ * <!-- end-user-doc -->

+ * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage#getExtensionDefinitionKind()

+ * @model

+ * @generated

+ */

+public enum ExtensionDefinitionKind implements Enumerator {

+	/**

+	 * The '<em><b>Association</b></em>' literal object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #ASSOCIATION_VALUE

+	 * @generated

+	 * @ordered

+	 */

+	ASSOCIATION(0, "Association", "Association"),

+

+	/**

+	 * The '<em><b>Generalization</b></em>' literal object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #GENERALIZATION_VALUE

+	 * @generated

+	 * @ordered

+	 */

+	GENERALIZATION(1, "Generalization", "Generalization"),

+

+	/**

+	 * The '<em><b>Multi Generalization</b></em>' literal object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #MULTI_GENERALIZATION_VALUE

+	 * @generated

+	 * @ordered

+	 */

+	MULTI_GENERALIZATION(2, "MultiGeneralization", "MultiGeneralization"),

+

+	/**

+	 * The '<em><b>Fusion</b></em>' literal object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #FUSION_VALUE

+	 * @generated

+	 * @ordered

+	 */

+	FUSION(3, "Fusion", "Fusion");

+

+	/**

+	 * The '<em><b>Association</b></em>' literal value.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of '<em><b>Association</b></em>' literal object isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @see #ASSOCIATION

+	 * @model name="Association"

+	 * @generated

+	 * @ordered

+	 */

+	public static final int ASSOCIATION_VALUE = 0;

+

+	/**

+	 * The '<em><b>Generalization</b></em>' literal value.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of '<em><b>Generalization</b></em>' literal object isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @see #GENERALIZATION

+	 * @model name="Generalization"

+	 * @generated

+	 * @ordered

+	 */

+	public static final int GENERALIZATION_VALUE = 1;

+

+	/**

+	 * The '<em><b>Multi Generalization</b></em>' literal value.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of '<em><b>Multi Generalization</b></em>' literal object isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @see #MULTI_GENERALIZATION

+	 * @model name="MultiGeneralization"

+	 * @generated

+	 * @ordered

+	 */

+	public static final int MULTI_GENERALIZATION_VALUE = 2;

+

+	/**

+	 * The '<em><b>Fusion</b></em>' literal value.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of '<em><b>Fusion</b></em>' literal object isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @see #FUSION

+	 * @model name="Fusion"

+	 * @generated

+	 * @ordered

+	 */

+	public static final int FUSION_VALUE = 3;

+

+	/**

+	 * An array of all the '<em><b>Extension Definition Kind</b></em>' enumerators.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private static final ExtensionDefinitionKind[] VALUES_ARRAY =

+		new ExtensionDefinitionKind[] {

+			ASSOCIATION,

+			GENERALIZATION,

+			MULTI_GENERALIZATION,

+			FUSION,

+		};

+

+	/**

+	 * A public read-only list of all the '<em><b>Extension Definition Kind</b></em>' enumerators.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static final List<ExtensionDefinitionKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));

+

+	/**

+	 * Returns the '<em><b>Extension Definition Kind</b></em>' literal with the specified literal value.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static ExtensionDefinitionKind get(String literal) {

+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

+			ExtensionDefinitionKind result = VALUES_ARRAY[i];

+			if (result.toString().equals(literal)) {

+				return result;

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * Returns the '<em><b>Extension Definition Kind</b></em>' literal with the specified name.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static ExtensionDefinitionKind getByName(String name) {

+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

+			ExtensionDefinitionKind result = VALUES_ARRAY[i];

+			if (result.getName().equals(name)) {

+				return result;

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * Returns the '<em><b>Extension Definition Kind</b></em>' literal with the specified integer value.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static ExtensionDefinitionKind get(int value) {

+		switch (value) {

+			case ASSOCIATION_VALUE: return ASSOCIATION;

+			case GENERALIZATION_VALUE: return GENERALIZATION;

+			case MULTI_GENERALIZATION_VALUE: return MULTI_GENERALIZATION;

+			case FUSION_VALUE: return FUSION;

+		}

+		return null;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private final int value;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private final String name;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private final String literal;

+

+	/**

+	 * Only this class can construct instances.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private ExtensionDefinitionKind(int value, String name, String literal) {

+		this.value = value;

+		this.name = name;

+		this.literal = literal;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public int getValue() {

+	  return value;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public String getName() {

+	  return name;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public String getLiteral() {

+	  return literal;

+	}

+

+	/**

+	 * Returns the literal value of the enumerator, which is its string representation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String toString() {

+		return literal;

+	}

+	

+} //ExtensionDefinitionKind

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/ExtensiondefinitionFactory.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/ExtensiondefinitionFactory.java
new file mode 100644
index 00000000000..e27620f6dd9
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/ExtensiondefinitionFactory.java
@@ -0,0 +1,71 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.extensiondefinition;

+

+import org.eclipse.emf.ecore.EFactory;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Factory</b> for the model.

+ * It provides a create method for each non-abstract class of the model.

+ * <!-- end-user-doc -->

+ * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage

+ * @generated

+ */

+public interface ExtensiondefinitionFactory extends EFactory {

+	/**

+	 * The singleton instance of the factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	ExtensiondefinitionFactory eINSTANCE = org.eclipse.papyrus.facade.extensiondefinition.impl.ExtensiondefinitionFactoryImpl.init();

+

+	/**

+	 * Returns a new object of class '<em>Extension Definition</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return a new object of class '<em>Extension Definition</em>'.

+	 * @generated

+	 */

+	ExtensionDefinition createExtensionDefinition();

+

+	/**

+	 * Returns a new object of class '<em>Base Metaclass</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return a new object of class '<em>Base Metaclass</em>'.

+	 * @generated

+	 */

+	BaseMetaclass createBaseMetaclass();

+

+	/**

+	 * Returns a new object of class '<em>Combination</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return a new object of class '<em>Combination</em>'.

+	 * @generated

+	 */

+	Combination createCombination();

+

+	/**

+	 * Returns the package supported by this factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the package supported by this factory.

+	 * @generated

+	 */

+	ExtensiondefinitionPackage getExtensiondefinitionPackage();

+

+} //ExtensiondefinitionFactory

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/ExtensiondefinitionPackage.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/ExtensiondefinitionPackage.java
new file mode 100644
index 00000000000..b1f9cc40a6e
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/ExtensiondefinitionPackage.java
@@ -0,0 +1,579 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.extensiondefinition;

+

+import org.eclipse.emf.ecore.EAttribute;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EEnum;

+import org.eclipse.emf.ecore.EPackage;

+import org.eclipse.emf.ecore.EReference;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Package</b> for the model.

+ * It contains accessors for the meta objects to represent

+ * <ul>

+ *   <li>each class,</li>

+ *   <li>each feature of each class,</li>

+ *   <li>each operation of each class,</li>

+ *   <li>each enum,</li>

+ *   <li>and each data type</li>

+ * </ul>

+ * <!-- end-user-doc -->

+ * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionFactory

+ * @model kind="package"

+ * @generated

+ */

+public interface ExtensiondefinitionPackage extends EPackage {

+	/**

+	 * The package name.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	String eNAME = "extensiondefinition";

+

+	/**

+	 * The package namespace URI.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	String eNS_URI = "http://www.eclipse.org/papyrus/extensiondefinition";

+

+	/**

+	 * The package namespace name.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	String eNS_PREFIX = "extensiondefinition";

+

+	/**

+	 * The singleton instance of the package.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	ExtensiondefinitionPackage eINSTANCE = org.eclipse.papyrus.facade.extensiondefinition.impl.ExtensiondefinitionPackageImpl.init();

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.facade.extensiondefinition.impl.ExtensionDefinitionImpl <em>Extension Definition</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.papyrus.facade.extensiondefinition.impl.ExtensionDefinitionImpl

+	 * @see org.eclipse.papyrus.facade.extensiondefinition.impl.ExtensiondefinitionPackageImpl#getExtensionDefinition()

+	 * @generated

+	 */

+	int EXTENSION_DEFINITION = 0;

+

+	/**

+	 * The feature id for the '<em><b>Extension</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int EXTENSION_DEFINITION__EXTENSION = 0;

+

+	/**

+	 * The feature id for the '<em><b>Base Metaclasses</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int EXTENSION_DEFINITION__BASE_METACLASSES = 1;

+

+	/**

+	 * The feature id for the '<em><b>Facade</b></em>' container reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int EXTENSION_DEFINITION__FACADE = 2;

+

+	/**

+	 * The feature id for the '<em><b>Stereotype</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int EXTENSION_DEFINITION__STEREOTYPE = 3;

+

+	/**

+	 * The feature id for the '<em><b>Kind</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int EXTENSION_DEFINITION__KIND = 4;

+

+	/**

+	 * The number of structural features of the '<em>Extension Definition</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int EXTENSION_DEFINITION_FEATURE_COUNT = 5;

+

+	/**

+	 * The number of operations of the '<em>Extension Definition</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int EXTENSION_DEFINITION_OPERATION_COUNT = 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.facade.extensiondefinition.impl.BaseMetaclassImpl <em>Base Metaclass</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.papyrus.facade.extensiondefinition.impl.BaseMetaclassImpl

+	 * @see org.eclipse.papyrus.facade.extensiondefinition.impl.ExtensiondefinitionPackageImpl#getBaseMetaclass()

+	 * @generated

+	 */

+	int BASE_METACLASS = 1;

+

+	/**

+	 * The feature id for the '<em><b>Incompatible Stereotypes</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int BASE_METACLASS__INCOMPATIBLE_STEREOTYPES = 0;

+

+	/**

+	 * The feature id for the '<em><b>Base</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int BASE_METACLASS__BASE = 1;

+

+	/**

+	 * The feature id for the '<em><b>Extension Definition</b></em>' container reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int BASE_METACLASS__EXTENSION_DEFINITION = 2;

+

+	/**

+	 * The feature id for the '<em><b>Compatible Stereotypes</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int BASE_METACLASS__COMPATIBLE_STEREOTYPES = 3;

+

+	/**

+	 * The feature id for the '<em><b>Possible</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int BASE_METACLASS__POSSIBLE = 4;

+

+	/**

+	 * The number of structural features of the '<em>Base Metaclass</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int BASE_METACLASS_FEATURE_COUNT = 5;

+

+	/**

+	 * The number of operations of the '<em>Base Metaclass</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int BASE_METACLASS_OPERATION_COUNT = 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.facade.extensiondefinition.impl.CombinationImpl <em>Combination</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.papyrus.facade.extensiondefinition.impl.CombinationImpl

+	 * @see org.eclipse.papyrus.facade.extensiondefinition.impl.ExtensiondefinitionPackageImpl#getCombination()

+	 * @generated

+	 */

+	int COMBINATION = 2;

+

+	/**

+	 * The feature id for the '<em><b>Members</b></em>' reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int COMBINATION__MEMBERS = 0;

+

+	/**

+	 * The number of structural features of the '<em>Combination</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int COMBINATION_FEATURE_COUNT = 1;

+

+	/**

+	 * The number of operations of the '<em>Combination</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int COMBINATION_OPERATION_COUNT = 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinitionKind <em>Extension Definition Kind</em>}' enum.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinitionKind

+	 * @see org.eclipse.papyrus.facade.extensiondefinition.impl.ExtensiondefinitionPackageImpl#getExtensionDefinitionKind()

+	 * @generated

+	 */

+	int EXTENSION_DEFINITION_KIND = 3;

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition <em>Extension Definition</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>Extension Definition</em>'.

+	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition

+	 * @generated

+	 */

+	EClass getExtensionDefinition();

+

+	/**

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition#getExtension <em>Extension</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the reference '<em>Extension</em>'.

+	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition#getExtension()

+	 * @see #getExtensionDefinition()

+	 * @generated

+	 */

+	EReference getExtensionDefinition_Extension();

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition#getBaseMetaclasses <em>Base Metaclasses</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference list '<em>Base Metaclasses</em>'.

+	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition#getBaseMetaclasses()

+	 * @see #getExtensionDefinition()

+	 * @generated

+	 */

+	EReference getExtensionDefinition_BaseMetaclasses();

+

+	/**

+	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition#getFacade <em>Facade</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the container reference '<em>Facade</em>'.

+	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition#getFacade()

+	 * @see #getExtensionDefinition()

+	 * @generated

+	 */

+	EReference getExtensionDefinition_Facade();

+

+	/**

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition#getStereotype <em>Stereotype</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the reference '<em>Stereotype</em>'.

+	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition#getStereotype()

+	 * @see #getExtensionDefinition()

+	 * @generated

+	 */

+	EReference getExtensionDefinition_Stereotype();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition#getKind <em>Kind</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Kind</em>'.

+	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition#getKind()

+	 * @see #getExtensionDefinition()

+	 * @generated

+	 */

+	EAttribute getExtensionDefinition_Kind();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass <em>Base Metaclass</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>Base Metaclass</em>'.

+	 * @see org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass

+	 * @generated

+	 */

+	EClass getBaseMetaclass();

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass#getIncompatibleStereotypes <em>Incompatible Stereotypes</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference list '<em>Incompatible Stereotypes</em>'.

+	 * @see org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass#getIncompatibleStereotypes()

+	 * @see #getBaseMetaclass()

+	 * @generated

+	 */

+	EReference getBaseMetaclass_IncompatibleStereotypes();

+

+	/**

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass#getBase <em>Base</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the reference '<em>Base</em>'.

+	 * @see org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass#getBase()

+	 * @see #getBaseMetaclass()

+	 * @generated

+	 */

+	EReference getBaseMetaclass_Base();

+

+	/**

+	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass#getExtensionDefinition <em>Extension Definition</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the container reference '<em>Extension Definition</em>'.

+	 * @see org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass#getExtensionDefinition()

+	 * @see #getBaseMetaclass()

+	 * @generated

+	 */

+	EReference getBaseMetaclass_ExtensionDefinition();

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass#getCompatibleStereotypes <em>Compatible Stereotypes</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference list '<em>Compatible Stereotypes</em>'.

+	 * @see org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass#getCompatibleStereotypes()

+	 * @see #getBaseMetaclass()

+	 * @generated

+	 */

+	EReference getBaseMetaclass_CompatibleStereotypes();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass#isPossible <em>Possible</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Possible</em>'.

+	 * @see org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass#isPossible()

+	 * @see #getBaseMetaclass()

+	 * @generated

+	 */

+	EAttribute getBaseMetaclass_Possible();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.facade.extensiondefinition.Combination <em>Combination</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>Combination</em>'.

+	 * @see org.eclipse.papyrus.facade.extensiondefinition.Combination

+	 * @generated

+	 */

+	EClass getCombination();

+

+	/**

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.facade.extensiondefinition.Combination#getMembers <em>Members</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the reference list '<em>Members</em>'.

+	 * @see org.eclipse.papyrus.facade.extensiondefinition.Combination#getMembers()

+	 * @see #getCombination()

+	 * @generated

+	 */

+	EReference getCombination_Members();

+

+	/**

+	 * Returns the meta object for enum '{@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinitionKind <em>Extension Definition Kind</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for enum '<em>Extension Definition Kind</em>'.

+	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinitionKind

+	 * @generated

+	 */

+	EEnum getExtensionDefinitionKind();

+

+	/**

+	 * Returns the factory that creates the instances of the model.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the factory that creates the instances of the model.

+	 * @generated

+	 */

+	ExtensiondefinitionFactory getExtensiondefinitionFactory();

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * Defines literals for the meta objects that represent

+	 * <ul>

+	 *   <li>each class,</li>

+	 *   <li>each feature of each class,</li>

+	 *   <li>each operation of each class,</li>

+	 *   <li>each enum,</li>

+	 *   <li>and each data type</li>

+	 * </ul>

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	interface Literals {

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.facade.extensiondefinition.impl.ExtensionDefinitionImpl <em>Extension Definition</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.papyrus.facade.extensiondefinition.impl.ExtensionDefinitionImpl

+		 * @see org.eclipse.papyrus.facade.extensiondefinition.impl.ExtensiondefinitionPackageImpl#getExtensionDefinition()

+		 * @generated

+		 */

+		EClass EXTENSION_DEFINITION = eINSTANCE.getExtensionDefinition();

+

+		/**

+		 * The meta object literal for the '<em><b>Extension</b></em>' reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EReference EXTENSION_DEFINITION__EXTENSION = eINSTANCE.getExtensionDefinition_Extension();

+

+		/**

+		 * The meta object literal for the '<em><b>Base Metaclasses</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EReference EXTENSION_DEFINITION__BASE_METACLASSES = eINSTANCE.getExtensionDefinition_BaseMetaclasses();

+

+		/**

+		 * The meta object literal for the '<em><b>Facade</b></em>' container reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EReference EXTENSION_DEFINITION__FACADE = eINSTANCE.getExtensionDefinition_Facade();

+

+		/**

+		 * The meta object literal for the '<em><b>Stereotype</b></em>' reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EReference EXTENSION_DEFINITION__STEREOTYPE = eINSTANCE.getExtensionDefinition_Stereotype();

+

+		/**

+		 * The meta object literal for the '<em><b>Kind</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EAttribute EXTENSION_DEFINITION__KIND = eINSTANCE.getExtensionDefinition_Kind();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.facade.extensiondefinition.impl.BaseMetaclassImpl <em>Base Metaclass</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.papyrus.facade.extensiondefinition.impl.BaseMetaclassImpl

+		 * @see org.eclipse.papyrus.facade.extensiondefinition.impl.ExtensiondefinitionPackageImpl#getBaseMetaclass()

+		 * @generated

+		 */

+		EClass BASE_METACLASS = eINSTANCE.getBaseMetaclass();

+

+		/**

+		 * The meta object literal for the '<em><b>Incompatible Stereotypes</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EReference BASE_METACLASS__INCOMPATIBLE_STEREOTYPES = eINSTANCE.getBaseMetaclass_IncompatibleStereotypes();

+

+		/**

+		 * The meta object literal for the '<em><b>Base</b></em>' reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EReference BASE_METACLASS__BASE = eINSTANCE.getBaseMetaclass_Base();

+

+		/**

+		 * The meta object literal for the '<em><b>Extension Definition</b></em>' container reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EReference BASE_METACLASS__EXTENSION_DEFINITION = eINSTANCE.getBaseMetaclass_ExtensionDefinition();

+

+		/**

+		 * The meta object literal for the '<em><b>Compatible Stereotypes</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EReference BASE_METACLASS__COMPATIBLE_STEREOTYPES = eINSTANCE.getBaseMetaclass_CompatibleStereotypes();

+

+		/**

+		 * The meta object literal for the '<em><b>Possible</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EAttribute BASE_METACLASS__POSSIBLE = eINSTANCE.getBaseMetaclass_Possible();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.facade.extensiondefinition.impl.CombinationImpl <em>Combination</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.papyrus.facade.extensiondefinition.impl.CombinationImpl

+		 * @see org.eclipse.papyrus.facade.extensiondefinition.impl.ExtensiondefinitionPackageImpl#getCombination()

+		 * @generated

+		 */

+		EClass COMBINATION = eINSTANCE.getCombination();

+

+		/**

+		 * The meta object literal for the '<em><b>Members</b></em>' reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EReference COMBINATION__MEMBERS = eINSTANCE.getCombination_Members();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinitionKind <em>Extension Definition Kind</em>}' enum.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinitionKind

+		 * @see org.eclipse.papyrus.facade.extensiondefinition.impl.ExtensiondefinitionPackageImpl#getExtensionDefinitionKind()

+		 * @generated

+		 */

+		EEnum EXTENSION_DEFINITION_KIND = eINSTANCE.getExtensionDefinitionKind();

+

+	}

+

+} //ExtensiondefinitionPackage

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/impl/BaseMetaclassImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/impl/BaseMetaclassImpl.java
new file mode 100644
index 00000000000..18c745ae4e4
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/impl/BaseMetaclassImpl.java
@@ -0,0 +1,416 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.extensiondefinition.impl;

+

+import java.util.Collection;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.notify.NotificationChain;

+

+import org.eclipse.emf.common.util.EList;

+

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.InternalEObject;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+

+import org.eclipse.emf.ecore.util.EObjectContainmentEList;

+import org.eclipse.emf.ecore.util.EcoreUtil;

+import org.eclipse.emf.ecore.util.InternalEList;

+

+import org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass;

+import org.eclipse.papyrus.facade.extensiondefinition.Combination;

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition;

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Base Metaclass</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ *   <li>{@link org.eclipse.papyrus.facade.extensiondefinition.impl.BaseMetaclassImpl#getIncompatibleStereotypes <em>Incompatible Stereotypes</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facade.extensiondefinition.impl.BaseMetaclassImpl#getBase <em>Base</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facade.extensiondefinition.impl.BaseMetaclassImpl#getExtensionDefinition <em>Extension Definition</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facade.extensiondefinition.impl.BaseMetaclassImpl#getCompatibleStereotypes <em>Compatible Stereotypes</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facade.extensiondefinition.impl.BaseMetaclassImpl#isPossible <em>Possible</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @generated

+ */

+public class BaseMetaclassImpl extends MinimalEObjectImpl.Container implements BaseMetaclass {

+	/**

+	 * The cached value of the '{@link #getIncompatibleStereotypes() <em>Incompatible Stereotypes</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getIncompatibleStereotypes()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<Combination> incompatibleStereotypes;

+

+	/**

+	 * The cached value of the '{@link #getBase() <em>Base</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getBase()

+	 * @generated

+	 * @ordered

+	 */

+	protected EObject base;

+

+	/**

+	 * The cached value of the '{@link #getCompatibleStereotypes() <em>Compatible Stereotypes</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getCompatibleStereotypes()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<Combination> compatibleStereotypes;

+

+	/**

+	 * The default value of the '{@link #isPossible() <em>Possible</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isPossible()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean POSSIBLE_EDEFAULT = false;

+

+	/**

+	 * The cached value of the '{@link #isPossible() <em>Possible</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isPossible()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean possible = POSSIBLE_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected BaseMetaclassImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return ExtensiondefinitionPackage.Literals.BASE_METACLASS;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EList<Combination> getIncompatibleStereotypes() {

+		if (incompatibleStereotypes == null) {

+			incompatibleStereotypes = new EObjectContainmentEList<Combination>(Combination.class, this, ExtensiondefinitionPackage.BASE_METACLASS__INCOMPATIBLE_STEREOTYPES);

+		}

+		return incompatibleStereotypes;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EObject getBase() {

+		if (base != null && base.eIsProxy()) {

+			InternalEObject oldBase = (InternalEObject)base;

+			base = eResolveProxy(oldBase);

+			if (base != oldBase) {

+				if (eNotificationRequired())

+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ExtensiondefinitionPackage.BASE_METACLASS__BASE, oldBase, base));

+			}

+		}

+		return base;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EObject basicGetBase() {

+		return base;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setBase(EObject newBase) {

+		EObject oldBase = base;

+		base = newBase;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, ExtensiondefinitionPackage.BASE_METACLASS__BASE, oldBase, base));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public ExtensionDefinition getExtensionDefinition() {

+		if (eContainerFeatureID() != ExtensiondefinitionPackage.BASE_METACLASS__EXTENSION_DEFINITION) return null;

+		return (ExtensionDefinition)eInternalContainer();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public NotificationChain basicSetExtensionDefinition(ExtensionDefinition newExtensionDefinition, NotificationChain msgs) {

+		msgs = eBasicSetContainer((InternalEObject)newExtensionDefinition, ExtensiondefinitionPackage.BASE_METACLASS__EXTENSION_DEFINITION, msgs);

+		return msgs;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setExtensionDefinition(ExtensionDefinition newExtensionDefinition) {

+		if (newExtensionDefinition != eInternalContainer() || (eContainerFeatureID() != ExtensiondefinitionPackage.BASE_METACLASS__EXTENSION_DEFINITION && newExtensionDefinition != null)) {

+			if (EcoreUtil.isAncestor(this, newExtensionDefinition))

+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());

+			NotificationChain msgs = null;

+			if (eInternalContainer() != null)

+				msgs = eBasicRemoveFromContainer(msgs);

+			if (newExtensionDefinition != null)

+				msgs = ((InternalEObject)newExtensionDefinition).eInverseAdd(this, ExtensiondefinitionPackage.EXTENSION_DEFINITION__BASE_METACLASSES, ExtensionDefinition.class, msgs);

+			msgs = basicSetExtensionDefinition(newExtensionDefinition, msgs);

+			if (msgs != null) msgs.dispatch();

+		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, ExtensiondefinitionPackage.BASE_METACLASS__EXTENSION_DEFINITION, newExtensionDefinition, newExtensionDefinition));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EList<Combination> getCompatibleStereotypes() {

+		if (compatibleStereotypes == null) {

+			compatibleStereotypes = new EObjectContainmentEList<Combination>(Combination.class, this, ExtensiondefinitionPackage.BASE_METACLASS__COMPATIBLE_STEREOTYPES);

+		}

+		return compatibleStereotypes;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean isPossible() {

+		return possible;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setPossible(boolean newPossible) {

+		boolean oldPossible = possible;

+		possible = newPossible;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, ExtensiondefinitionPackage.BASE_METACLASS__POSSIBLE, oldPossible, possible));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

+		switch (featureID) {

+			case ExtensiondefinitionPackage.BASE_METACLASS__EXTENSION_DEFINITION:

+				if (eInternalContainer() != null)

+					msgs = eBasicRemoveFromContainer(msgs);

+				return basicSetExtensionDefinition((ExtensionDefinition)otherEnd, msgs);

+		}

+		return super.eInverseAdd(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

+		switch (featureID) {

+			case ExtensiondefinitionPackage.BASE_METACLASS__INCOMPATIBLE_STEREOTYPES:

+				return ((InternalEList<?>)getIncompatibleStereotypes()).basicRemove(otherEnd, msgs);

+			case ExtensiondefinitionPackage.BASE_METACLASS__EXTENSION_DEFINITION:

+				return basicSetExtensionDefinition(null, msgs);

+			case ExtensiondefinitionPackage.BASE_METACLASS__COMPATIBLE_STEREOTYPES:

+				return ((InternalEList<?>)getCompatibleStereotypes()).basicRemove(otherEnd, msgs);

+		}

+		return super.eInverseRemove(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {

+		switch (eContainerFeatureID()) {

+			case ExtensiondefinitionPackage.BASE_METACLASS__EXTENSION_DEFINITION:

+				return eInternalContainer().eInverseRemove(this, ExtensiondefinitionPackage.EXTENSION_DEFINITION__BASE_METACLASSES, ExtensionDefinition.class, msgs);

+		}

+		return super.eBasicRemoveFromContainerFeature(msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch (featureID) {

+			case ExtensiondefinitionPackage.BASE_METACLASS__INCOMPATIBLE_STEREOTYPES:

+				return getIncompatibleStereotypes();

+			case ExtensiondefinitionPackage.BASE_METACLASS__BASE:

+				if (resolve) return getBase();

+				return basicGetBase();

+			case ExtensiondefinitionPackage.BASE_METACLASS__EXTENSION_DEFINITION:

+				return getExtensionDefinition();

+			case ExtensiondefinitionPackage.BASE_METACLASS__COMPATIBLE_STEREOTYPES:

+				return getCompatibleStereotypes();

+			case ExtensiondefinitionPackage.BASE_METACLASS__POSSIBLE:

+				return isPossible();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch (featureID) {

+			case ExtensiondefinitionPackage.BASE_METACLASS__INCOMPATIBLE_STEREOTYPES:

+				getIncompatibleStereotypes().clear();

+				getIncompatibleStereotypes().addAll((Collection<? extends Combination>)newValue);

+				return;

+			case ExtensiondefinitionPackage.BASE_METACLASS__BASE:

+				setBase((EObject)newValue);

+				return;

+			case ExtensiondefinitionPackage.BASE_METACLASS__EXTENSION_DEFINITION:

+				setExtensionDefinition((ExtensionDefinition)newValue);

+				return;

+			case ExtensiondefinitionPackage.BASE_METACLASS__COMPATIBLE_STEREOTYPES:

+				getCompatibleStereotypes().clear();

+				getCompatibleStereotypes().addAll((Collection<? extends Combination>)newValue);

+				return;

+			case ExtensiondefinitionPackage.BASE_METACLASS__POSSIBLE:

+				setPossible((Boolean)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch (featureID) {

+			case ExtensiondefinitionPackage.BASE_METACLASS__INCOMPATIBLE_STEREOTYPES:

+				getIncompatibleStereotypes().clear();

+				return;

+			case ExtensiondefinitionPackage.BASE_METACLASS__BASE:

+				setBase((EObject)null);

+				return;

+			case ExtensiondefinitionPackage.BASE_METACLASS__EXTENSION_DEFINITION:

+				setExtensionDefinition((ExtensionDefinition)null);

+				return;

+			case ExtensiondefinitionPackage.BASE_METACLASS__COMPATIBLE_STEREOTYPES:

+				getCompatibleStereotypes().clear();

+				return;

+			case ExtensiondefinitionPackage.BASE_METACLASS__POSSIBLE:

+				setPossible(POSSIBLE_EDEFAULT);

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch (featureID) {

+			case ExtensiondefinitionPackage.BASE_METACLASS__INCOMPATIBLE_STEREOTYPES:

+				return incompatibleStereotypes != null && !incompatibleStereotypes.isEmpty();

+			case ExtensiondefinitionPackage.BASE_METACLASS__BASE:

+				return base != null;

+			case ExtensiondefinitionPackage.BASE_METACLASS__EXTENSION_DEFINITION:

+				return getExtensionDefinition() != null;

+			case ExtensiondefinitionPackage.BASE_METACLASS__COMPATIBLE_STEREOTYPES:

+				return compatibleStereotypes != null && !compatibleStereotypes.isEmpty();

+			case ExtensiondefinitionPackage.BASE_METACLASS__POSSIBLE:

+				return possible != POSSIBLE_EDEFAULT;

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String toString() {

+		if (eIsProxy()) return super.toString();

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (possible: ");

+		result.append(possible);

+		result.append(')');

+		return result.toString();

+	}

+

+} //BaseMetaclassImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/impl/CombinationImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/impl/CombinationImpl.java
new file mode 100644
index 00000000000..83226abb3d7
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/impl/CombinationImpl.java
@@ -0,0 +1,145 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.extensiondefinition.impl;

+

+import java.util.Collection;

+

+import org.eclipse.emf.common.util.EList;

+

+import org.eclipse.emf.ecore.EClass;

+

+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+

+import org.eclipse.emf.ecore.util.EObjectResolvingEList;

+

+import org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass;

+import org.eclipse.papyrus.facade.extensiondefinition.Combination;

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Combination</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ *   <li>{@link org.eclipse.papyrus.facade.extensiondefinition.impl.CombinationImpl#getMembers <em>Members</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @generated

+ */

+public class CombinationImpl extends MinimalEObjectImpl.Container implements Combination {

+	/**

+	 * The cached value of the '{@link #getMembers() <em>Members</em>}' reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getMembers()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<BaseMetaclass> members;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected CombinationImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return ExtensiondefinitionPackage.Literals.COMBINATION;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EList<BaseMetaclass> getMembers() {

+		if (members == null) {

+			members = new EObjectResolvingEList<BaseMetaclass>(BaseMetaclass.class, this, ExtensiondefinitionPackage.COMBINATION__MEMBERS);

+		}

+		return members;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch (featureID) {

+			case ExtensiondefinitionPackage.COMBINATION__MEMBERS:

+				return getMembers();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch (featureID) {

+			case ExtensiondefinitionPackage.COMBINATION__MEMBERS:

+				getMembers().clear();

+				getMembers().addAll((Collection<? extends BaseMetaclass>)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch (featureID) {

+			case ExtensiondefinitionPackage.COMBINATION__MEMBERS:

+				getMembers().clear();

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch (featureID) {

+			case ExtensiondefinitionPackage.COMBINATION__MEMBERS:

+				return members != null && !members.isEmpty();

+		}

+		return super.eIsSet(featureID);

+	}

+

+} //CombinationImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/impl/ExtensionDefinitionImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/impl/ExtensionDefinitionImpl.java
new file mode 100644
index 00000000000..de353f188c6
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/impl/ExtensionDefinitionImpl.java
@@ -0,0 +1,448 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.extensiondefinition.impl;

+

+import java.util.Collection;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.notify.NotificationChain;

+

+import org.eclipse.emf.common.util.EList;

+

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.InternalEObject;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+

+import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;

+import org.eclipse.emf.ecore.util.EcoreUtil;

+import org.eclipse.emf.ecore.util.InternalEList;

+

+import org.eclipse.papyrus.facade.Facade;

+import org.eclipse.papyrus.facade.FacadePackage;

+

+import org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass;

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition;

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinitionKind;

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage;

+

+import org.eclipse.uml2.uml.Extension;

+import org.eclipse.uml2.uml.Stereotype;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Extension Definition</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ *   <li>{@link org.eclipse.papyrus.facade.extensiondefinition.impl.ExtensionDefinitionImpl#getExtension <em>Extension</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facade.extensiondefinition.impl.ExtensionDefinitionImpl#getBaseMetaclasses <em>Base Metaclasses</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facade.extensiondefinition.impl.ExtensionDefinitionImpl#getFacade <em>Facade</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facade.extensiondefinition.impl.ExtensionDefinitionImpl#getStereotype <em>Stereotype</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facade.extensiondefinition.impl.ExtensionDefinitionImpl#getKind <em>Kind</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @generated

+ */

+public class ExtensionDefinitionImpl extends MinimalEObjectImpl.Container implements ExtensionDefinition {

+	/**

+	 * The cached value of the '{@link #getExtension() <em>Extension</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getExtension()

+	 * @generated

+	 * @ordered

+	 */

+	protected Extension extension;

+

+	/**

+	 * The cached value of the '{@link #getBaseMetaclasses() <em>Base Metaclasses</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getBaseMetaclasses()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<BaseMetaclass> baseMetaclasses;

+

+	/**

+	 * The cached value of the '{@link #getStereotype() <em>Stereotype</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getStereotype()

+	 * @generated

+	 * @ordered

+	 */

+	protected Stereotype stereotype;

+

+	/**

+	 * The default value of the '{@link #getKind() <em>Kind</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getKind()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final ExtensionDefinitionKind KIND_EDEFAULT = ExtensionDefinitionKind.ASSOCIATION;

+

+	/**

+	 * The cached value of the '{@link #getKind() <em>Kind</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getKind()

+	 * @generated

+	 * @ordered

+	 */

+	protected ExtensionDefinitionKind kind = KIND_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected ExtensionDefinitionImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return ExtensiondefinitionPackage.Literals.EXTENSION_DEFINITION;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public Extension getExtension() {

+		if (extension != null && extension.eIsProxy()) {

+			InternalEObject oldExtension = (InternalEObject)extension;

+			extension = (Extension)eResolveProxy(oldExtension);

+			if (extension != oldExtension) {

+				if (eNotificationRequired())

+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ExtensiondefinitionPackage.EXTENSION_DEFINITION__EXTENSION, oldExtension, extension));

+			}

+		}

+		return extension;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public Extension basicGetExtension() {

+		return extension;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setExtension(Extension newExtension) {

+		Extension oldExtension = extension;

+		extension = newExtension;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, ExtensiondefinitionPackage.EXTENSION_DEFINITION__EXTENSION, oldExtension, extension));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EList<BaseMetaclass> getBaseMetaclasses() {

+		if (baseMetaclasses == null) {

+			baseMetaclasses = new EObjectContainmentWithInverseEList<BaseMetaclass>(BaseMetaclass.class, this, ExtensiondefinitionPackage.EXTENSION_DEFINITION__BASE_METACLASSES, ExtensiondefinitionPackage.BASE_METACLASS__EXTENSION_DEFINITION);

+		}

+		return baseMetaclasses;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public Facade getFacade() {

+		if (eContainerFeatureID() != ExtensiondefinitionPackage.EXTENSION_DEFINITION__FACADE) return null;

+		return (Facade)eInternalContainer();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public NotificationChain basicSetFacade(Facade newFacade, NotificationChain msgs) {

+		msgs = eBasicSetContainer((InternalEObject)newFacade, ExtensiondefinitionPackage.EXTENSION_DEFINITION__FACADE, msgs);

+		return msgs;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setFacade(Facade newFacade) {

+		if (newFacade != eInternalContainer() || (eContainerFeatureID() != ExtensiondefinitionPackage.EXTENSION_DEFINITION__FACADE && newFacade != null)) {

+			if (EcoreUtil.isAncestor(this, newFacade))

+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());

+			NotificationChain msgs = null;

+			if (eInternalContainer() != null)

+				msgs = eBasicRemoveFromContainer(msgs);

+			if (newFacade != null)

+				msgs = ((InternalEObject)newFacade).eInverseAdd(this, FacadePackage.FACADE__EXTENSION_DEFINITIONS, Facade.class, msgs);

+			msgs = basicSetFacade(newFacade, msgs);

+			if (msgs != null) msgs.dispatch();

+		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, ExtensiondefinitionPackage.EXTENSION_DEFINITION__FACADE, newFacade, newFacade));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public Stereotype getStereotype() {

+		if (stereotype != null && stereotype.eIsProxy()) {

+			InternalEObject oldStereotype = (InternalEObject)stereotype;

+			stereotype = (Stereotype)eResolveProxy(oldStereotype);

+			if (stereotype != oldStereotype) {

+				if (eNotificationRequired())

+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ExtensiondefinitionPackage.EXTENSION_DEFINITION__STEREOTYPE, oldStereotype, stereotype));

+			}

+		}

+		return stereotype;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public Stereotype basicGetStereotype() {

+		return stereotype;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setStereotype(Stereotype newStereotype) {

+		Stereotype oldStereotype = stereotype;

+		stereotype = newStereotype;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, ExtensiondefinitionPackage.EXTENSION_DEFINITION__STEREOTYPE, oldStereotype, stereotype));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public ExtensionDefinitionKind getKind() {

+		return kind;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setKind(ExtensionDefinitionKind newKind) {

+		ExtensionDefinitionKind oldKind = kind;

+		kind = newKind == null ? KIND_EDEFAULT : newKind;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, ExtensiondefinitionPackage.EXTENSION_DEFINITION__KIND, oldKind, kind));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

+		switch (featureID) {

+			case ExtensiondefinitionPackage.EXTENSION_DEFINITION__BASE_METACLASSES:

+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getBaseMetaclasses()).basicAdd(otherEnd, msgs);

+			case ExtensiondefinitionPackage.EXTENSION_DEFINITION__FACADE:

+				if (eInternalContainer() != null)

+					msgs = eBasicRemoveFromContainer(msgs);

+				return basicSetFacade((Facade)otherEnd, msgs);

+		}

+		return super.eInverseAdd(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

+		switch (featureID) {

+			case ExtensiondefinitionPackage.EXTENSION_DEFINITION__BASE_METACLASSES:

+				return ((InternalEList<?>)getBaseMetaclasses()).basicRemove(otherEnd, msgs);

+			case ExtensiondefinitionPackage.EXTENSION_DEFINITION__FACADE:

+				return basicSetFacade(null, msgs);

+		}

+		return super.eInverseRemove(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {

+		switch (eContainerFeatureID()) {

+			case ExtensiondefinitionPackage.EXTENSION_DEFINITION__FACADE:

+				return eInternalContainer().eInverseRemove(this, FacadePackage.FACADE__EXTENSION_DEFINITIONS, Facade.class, msgs);

+		}

+		return super.eBasicRemoveFromContainerFeature(msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch (featureID) {

+			case ExtensiondefinitionPackage.EXTENSION_DEFINITION__EXTENSION:

+				if (resolve) return getExtension();

+				return basicGetExtension();

+			case ExtensiondefinitionPackage.EXTENSION_DEFINITION__BASE_METACLASSES:

+				return getBaseMetaclasses();

+			case ExtensiondefinitionPackage.EXTENSION_DEFINITION__FACADE:

+				return getFacade();

+			case ExtensiondefinitionPackage.EXTENSION_DEFINITION__STEREOTYPE:

+				if (resolve) return getStereotype();

+				return basicGetStereotype();

+			case ExtensiondefinitionPackage.EXTENSION_DEFINITION__KIND:

+				return getKind();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch (featureID) {

+			case ExtensiondefinitionPackage.EXTENSION_DEFINITION__EXTENSION:

+				setExtension((Extension)newValue);

+				return;

+			case ExtensiondefinitionPackage.EXTENSION_DEFINITION__BASE_METACLASSES:

+				getBaseMetaclasses().clear();

+				getBaseMetaclasses().addAll((Collection<? extends BaseMetaclass>)newValue);

+				return;

+			case ExtensiondefinitionPackage.EXTENSION_DEFINITION__FACADE:

+				setFacade((Facade)newValue);

+				return;

+			case ExtensiondefinitionPackage.EXTENSION_DEFINITION__STEREOTYPE:

+				setStereotype((Stereotype)newValue);

+				return;

+			case ExtensiondefinitionPackage.EXTENSION_DEFINITION__KIND:

+				setKind((ExtensionDefinitionKind)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch (featureID) {

+			case ExtensiondefinitionPackage.EXTENSION_DEFINITION__EXTENSION:

+				setExtension((Extension)null);

+				return;

+			case ExtensiondefinitionPackage.EXTENSION_DEFINITION__BASE_METACLASSES:

+				getBaseMetaclasses().clear();

+				return;

+			case ExtensiondefinitionPackage.EXTENSION_DEFINITION__FACADE:

+				setFacade((Facade)null);

+				return;

+			case ExtensiondefinitionPackage.EXTENSION_DEFINITION__STEREOTYPE:

+				setStereotype((Stereotype)null);

+				return;

+			case ExtensiondefinitionPackage.EXTENSION_DEFINITION__KIND:

+				setKind(KIND_EDEFAULT);

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch (featureID) {

+			case ExtensiondefinitionPackage.EXTENSION_DEFINITION__EXTENSION:

+				return extension != null;

+			case ExtensiondefinitionPackage.EXTENSION_DEFINITION__BASE_METACLASSES:

+				return baseMetaclasses != null && !baseMetaclasses.isEmpty();

+			case ExtensiondefinitionPackage.EXTENSION_DEFINITION__FACADE:

+				return getFacade() != null;

+			case ExtensiondefinitionPackage.EXTENSION_DEFINITION__STEREOTYPE:

+				return stereotype != null;

+			case ExtensiondefinitionPackage.EXTENSION_DEFINITION__KIND:

+				return kind != KIND_EDEFAULT;

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String toString() {

+		if (eIsProxy()) return super.toString();

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (kind: ");

+		result.append(kind);

+		result.append(')');

+		return result.toString();

+	}

+

+} //ExtensionDefinitionImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/impl/ExtensiondefinitionFactoryImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/impl/ExtensiondefinitionFactoryImpl.java
new file mode 100644
index 00000000000..1579e918529
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/impl/ExtensiondefinitionFactoryImpl.java
@@ -0,0 +1,179 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.extensiondefinition.impl;

+

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EDataType;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EPackage;

+

+import org.eclipse.emf.ecore.impl.EFactoryImpl;

+

+import org.eclipse.emf.ecore.plugin.EcorePlugin;

+

+import org.eclipse.papyrus.facade.extensiondefinition.*;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model <b>Factory</b>.

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class ExtensiondefinitionFactoryImpl extends EFactoryImpl implements ExtensiondefinitionFactory {

+	/**

+	 * Creates the default factory implementation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static ExtensiondefinitionFactory init() {

+		try {

+			ExtensiondefinitionFactory theExtensiondefinitionFactory = (ExtensiondefinitionFactory)EPackage.Registry.INSTANCE.getEFactory(ExtensiondefinitionPackage.eNS_URI);

+			if (theExtensiondefinitionFactory != null) {

+				return theExtensiondefinitionFactory;

+			}

+		}

+		catch (Exception exception) {

+			EcorePlugin.INSTANCE.log(exception);

+		}

+		return new ExtensiondefinitionFactoryImpl();

+	}

+

+	/**

+	 * Creates an instance of the factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public ExtensiondefinitionFactoryImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public EObject create(EClass eClass) {

+		switch (eClass.getClassifierID()) {

+			case ExtensiondefinitionPackage.EXTENSION_DEFINITION: return createExtensionDefinition();

+			case ExtensiondefinitionPackage.BASE_METACLASS: return createBaseMetaclass();

+			case ExtensiondefinitionPackage.COMBINATION: return createCombination();

+			default:

+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object createFromString(EDataType eDataType, String initialValue) {

+		switch (eDataType.getClassifierID()) {

+			case ExtensiondefinitionPackage.EXTENSION_DEFINITION_KIND:

+				return createExtensionDefinitionKindFromString(eDataType, initialValue);

+			default:

+				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String convertToString(EDataType eDataType, Object instanceValue) {

+		switch (eDataType.getClassifierID()) {

+			case ExtensiondefinitionPackage.EXTENSION_DEFINITION_KIND:

+				return convertExtensionDefinitionKindToString(eDataType, instanceValue);

+			default:

+				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public ExtensionDefinition createExtensionDefinition() {

+		ExtensionDefinitionImpl extensionDefinition = new ExtensionDefinitionImpl();

+		return extensionDefinition;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public BaseMetaclass createBaseMetaclass() {

+		BaseMetaclassImpl baseMetaclass = new BaseMetaclassImpl();

+		return baseMetaclass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public Combination createCombination() {

+		CombinationImpl combination = new CombinationImpl();

+		return combination;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public ExtensionDefinitionKind createExtensionDefinitionKindFromString(EDataType eDataType, String initialValue) {

+		ExtensionDefinitionKind result = ExtensionDefinitionKind.get(initialValue);

+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");

+		return result;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public String convertExtensionDefinitionKindToString(EDataType eDataType, Object instanceValue) {

+		return instanceValue == null ? null : instanceValue.toString();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public ExtensiondefinitionPackage getExtensiondefinitionPackage() {

+		return (ExtensiondefinitionPackage)getEPackage();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @deprecated

+	 * @generated

+	 */

+	@Deprecated

+	public static ExtensiondefinitionPackage getPackage() {

+		return ExtensiondefinitionPackage.eINSTANCE;

+	}

+

+} //ExtensiondefinitionFactoryImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/impl/ExtensiondefinitionPackageImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/impl/ExtensiondefinitionPackageImpl.java
new file mode 100644
index 00000000000..36401e929c8
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/impl/ExtensiondefinitionPackageImpl.java
@@ -0,0 +1,391 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.extensiondefinition.impl;

+

+import org.eclipse.emf.ecore.EAttribute;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EEnum;

+import org.eclipse.emf.ecore.EPackage;

+import org.eclipse.emf.ecore.EReference;

+

+import org.eclipse.emf.ecore.impl.EPackageImpl;

+

+import org.eclipse.papyrus.facade.FacadePackage;

+

+import org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass;

+import org.eclipse.papyrus.facade.extensiondefinition.Combination;

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition;

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinitionKind;

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionFactory;

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage;

+

+import org.eclipse.papyrus.facade.impl.FacadePackageImpl;

+

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

+

+import org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl;

+

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model <b>Package</b>.

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class ExtensiondefinitionPackageImpl extends EPackageImpl implements ExtensiondefinitionPackage {

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass extensionDefinitionEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass baseMetaclassEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass combinationEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EEnum extensionDefinitionKindEEnum = null;

+

+	/**

+	 * Creates an instance of the model <b>Package</b>, registered with

+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

+	 * package URI value.

+	 * <p>Note: the correct way to create the package is via the static

+	 * factory method {@link #init init()}, which also performs

+	 * initialization of the package, or returns the registered package,

+	 * if one already exists.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.emf.ecore.EPackage.Registry

+	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage#eNS_URI

+	 * @see #init()

+	 * @generated

+	 */

+	private ExtensiondefinitionPackageImpl() {

+		super(eNS_URI, ExtensiondefinitionFactory.eINSTANCE);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private static boolean isInited = false;

+

+	/**

+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

+	 * 

+	 * <p>This method is used to initialize {@link ExtensiondefinitionPackage#eINSTANCE} when that field is accessed.

+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #eNS_URI

+	 * @see #createPackageContents()

+	 * @see #initializePackageContents()

+	 * @generated

+	 */

+	public static ExtensiondefinitionPackage init() {

+		if (isInited) return (ExtensiondefinitionPackage)EPackage.Registry.INSTANCE.getEPackage(ExtensiondefinitionPackage.eNS_URI);

+

+		// Obtain or create and register package

+		ExtensiondefinitionPackageImpl theExtensiondefinitionPackage = (ExtensiondefinitionPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ExtensiondefinitionPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ExtensiondefinitionPackageImpl());

+

+		isInited = true;

+

+		// Initialize simple dependencies

+		UMLPackage.eINSTANCE.eClass();

+

+		// Obtain or create and register interdependencies

+		FacadePackageImpl theFacadePackage = (FacadePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(FacadePackage.eNS_URI) instanceof FacadePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(FacadePackage.eNS_URI) : FacadePackage.eINSTANCE);

+		VirtualmetamodelPackageImpl theVirtualmetamodelPackage = (VirtualmetamodelPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(VirtualmetamodelPackage.eNS_URI) instanceof VirtualmetamodelPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(VirtualmetamodelPackage.eNS_URI) : VirtualmetamodelPackage.eINSTANCE);

+

+		// Create package meta-data objects

+		theExtensiondefinitionPackage.createPackageContents();

+		theFacadePackage.createPackageContents();

+		theVirtualmetamodelPackage.createPackageContents();

+

+		// Initialize created meta-data

+		theExtensiondefinitionPackage.initializePackageContents();

+		theFacadePackage.initializePackageContents();

+		theVirtualmetamodelPackage.initializePackageContents();

+

+		// Mark meta-data to indicate it can't be changed

+		theExtensiondefinitionPackage.freeze();

+

+  

+		// Update the registry and return the package

+		EPackage.Registry.INSTANCE.put(ExtensiondefinitionPackage.eNS_URI, theExtensiondefinitionPackage);

+		return theExtensiondefinitionPackage;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EClass getExtensionDefinition() {

+		return extensionDefinitionEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EReference getExtensionDefinition_Extension() {

+		return (EReference)extensionDefinitionEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EReference getExtensionDefinition_BaseMetaclasses() {

+		return (EReference)extensionDefinitionEClass.getEStructuralFeatures().get(1);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EReference getExtensionDefinition_Facade() {

+		return (EReference)extensionDefinitionEClass.getEStructuralFeatures().get(2);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EReference getExtensionDefinition_Stereotype() {

+		return (EReference)extensionDefinitionEClass.getEStructuralFeatures().get(3);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EAttribute getExtensionDefinition_Kind() {

+		return (EAttribute)extensionDefinitionEClass.getEStructuralFeatures().get(4);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EClass getBaseMetaclass() {

+		return baseMetaclassEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EReference getBaseMetaclass_IncompatibleStereotypes() {

+		return (EReference)baseMetaclassEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EReference getBaseMetaclass_Base() {

+		return (EReference)baseMetaclassEClass.getEStructuralFeatures().get(1);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EReference getBaseMetaclass_ExtensionDefinition() {

+		return (EReference)baseMetaclassEClass.getEStructuralFeatures().get(2);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EReference getBaseMetaclass_CompatibleStereotypes() {

+		return (EReference)baseMetaclassEClass.getEStructuralFeatures().get(3);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EAttribute getBaseMetaclass_Possible() {

+		return (EAttribute)baseMetaclassEClass.getEStructuralFeatures().get(4);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EClass getCombination() {

+		return combinationEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EReference getCombination_Members() {

+		return (EReference)combinationEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EEnum getExtensionDefinitionKind() {

+		return extensionDefinitionKindEEnum;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public ExtensiondefinitionFactory getExtensiondefinitionFactory() {

+		return (ExtensiondefinitionFactory)getEFactoryInstance();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private boolean isCreated = false;

+

+	/**

+	 * Creates the meta-model objects for the package.  This method is

+	 * guarded to have no affect on any invocation but its first.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void createPackageContents() {

+		if (isCreated) return;

+		isCreated = true;

+

+		// Create classes and their features

+		extensionDefinitionEClass = createEClass(EXTENSION_DEFINITION);

+		createEReference(extensionDefinitionEClass, EXTENSION_DEFINITION__EXTENSION);

+		createEReference(extensionDefinitionEClass, EXTENSION_DEFINITION__BASE_METACLASSES);

+		createEReference(extensionDefinitionEClass, EXTENSION_DEFINITION__FACADE);

+		createEReference(extensionDefinitionEClass, EXTENSION_DEFINITION__STEREOTYPE);

+		createEAttribute(extensionDefinitionEClass, EXTENSION_DEFINITION__KIND);

+

+		baseMetaclassEClass = createEClass(BASE_METACLASS);

+		createEReference(baseMetaclassEClass, BASE_METACLASS__INCOMPATIBLE_STEREOTYPES);

+		createEReference(baseMetaclassEClass, BASE_METACLASS__BASE);

+		createEReference(baseMetaclassEClass, BASE_METACLASS__EXTENSION_DEFINITION);

+		createEReference(baseMetaclassEClass, BASE_METACLASS__COMPATIBLE_STEREOTYPES);

+		createEAttribute(baseMetaclassEClass, BASE_METACLASS__POSSIBLE);

+

+		combinationEClass = createEClass(COMBINATION);

+		createEReference(combinationEClass, COMBINATION__MEMBERS);

+

+		// Create enums

+		extensionDefinitionKindEEnum = createEEnum(EXTENSION_DEFINITION_KIND);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private boolean isInitialized = false;

+

+	/**

+	 * Complete the initialization of the package and its meta-model.  This

+	 * method is guarded to have no affect on any invocation but its first.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void initializePackageContents() {

+		if (isInitialized) return;

+		isInitialized = true;

+

+		// Initialize package

+		setName(eNAME);

+		setNsPrefix(eNS_PREFIX);

+		setNsURI(eNS_URI);

+

+		// Obtain other dependent packages

+		UMLPackage theUMLPackage = (UMLPackage)EPackage.Registry.INSTANCE.getEPackage(UMLPackage.eNS_URI);

+		FacadePackage theFacadePackage = (FacadePackage)EPackage.Registry.INSTANCE.getEPackage(FacadePackage.eNS_URI);

+

+		// Create type parameters

+

+		// Set bounds for type parameters

+

+		// Add supertypes to classes

+

+		// Initialize classes, features, and operations; add parameters

+		initEClass(extensionDefinitionEClass, ExtensionDefinition.class, "ExtensionDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getExtensionDefinition_Extension(), theUMLPackage.getExtension(), null, "extension", null, 1, 1, ExtensionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getExtensionDefinition_BaseMetaclasses(), this.getBaseMetaclass(), this.getBaseMetaclass_ExtensionDefinition(), "baseMetaclasses", null, 0, -1, ExtensionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getExtensionDefinition_Facade(), theFacadePackage.getFacade(), theFacadePackage.getFacade_ExtensionDefinitions(), "facade", null, 1, 1, ExtensionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getExtensionDefinition_Stereotype(), theUMLPackage.getStereotype(), null, "stereotype", null, 1, 1, ExtensionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getExtensionDefinition_Kind(), this.getExtensionDefinitionKind(), "kind", null, 1, 1, ExtensionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(baseMetaclassEClass, BaseMetaclass.class, "BaseMetaclass", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getBaseMetaclass_IncompatibleStereotypes(), this.getCombination(), null, "incompatibleStereotypes", null, 0, -1, BaseMetaclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getBaseMetaclass_Base(), ecorePackage.getEObject(), null, "base", null, 1, 1, BaseMetaclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getBaseMetaclass_ExtensionDefinition(), this.getExtensionDefinition(), this.getExtensionDefinition_BaseMetaclasses(), "extensionDefinition", null, 1, 1, BaseMetaclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getBaseMetaclass_CompatibleStereotypes(), this.getCombination(), null, "compatibleStereotypes", null, 0, -1, BaseMetaclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getBaseMetaclass_Possible(), ecorePackage.getEBoolean(), "possible", null, 1, 1, BaseMetaclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(combinationEClass, Combination.class, "Combination", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getCombination_Members(), this.getBaseMetaclass(), null, "members", null, 0, -1, Combination.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		// Initialize enums and add enum literals

+		initEEnum(extensionDefinitionKindEEnum, ExtensionDefinitionKind.class, "ExtensionDefinitionKind");

+		addEEnumLiteral(extensionDefinitionKindEEnum, ExtensionDefinitionKind.ASSOCIATION);

+		addEEnumLiteral(extensionDefinitionKindEEnum, ExtensionDefinitionKind.GENERALIZATION);

+		addEEnumLiteral(extensionDefinitionKindEEnum, ExtensionDefinitionKind.MULTI_GENERALIZATION);

+		addEEnumLiteral(extensionDefinitionKindEEnum, ExtensionDefinitionKind.FUSION);

+	}

+

+} //ExtensiondefinitionPackageImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/util/ExtensiondefinitionAdapterFactory.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/util/ExtensiondefinitionAdapterFactory.java
new file mode 100644
index 00000000000..aa877467eb2
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/util/ExtensiondefinitionAdapterFactory.java
@@ -0,0 +1,167 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.extensiondefinition.util;

+

+import org.eclipse.emf.common.notify.Adapter;

+import org.eclipse.emf.common.notify.Notifier;

+

+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

+

+import org.eclipse.emf.ecore.EObject;

+

+import org.eclipse.papyrus.facade.extensiondefinition.*;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Adapter Factory</b> for the model.

+ * It provides an adapter <code>createXXX</code> method for each class of the model.

+ * <!-- end-user-doc -->

+ * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage

+ * @generated

+ */

+public class ExtensiondefinitionAdapterFactory extends AdapterFactoryImpl {

+	/**

+	 * The cached model package.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected static ExtensiondefinitionPackage modelPackage;

+

+	/**

+	 * Creates an instance of the adapter factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public ExtensiondefinitionAdapterFactory() {

+		if (modelPackage == null) {

+			modelPackage = ExtensiondefinitionPackage.eINSTANCE;

+		}

+	}

+

+	/**

+	 * Returns whether this factory is applicable for the type of the object.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

+	 * <!-- end-user-doc -->

+	 * @return whether this factory is applicable for the type of the object.

+	 * @generated

+	 */

+	@Override

+	public boolean isFactoryForType(Object object) {

+		if (object == modelPackage) {

+			return true;

+		}

+		if (object instanceof EObject) {

+			return ((EObject)object).eClass().getEPackage() == modelPackage;

+		}

+		return false;

+	}

+

+	/**

+	 * The switch that delegates to the <code>createXXX</code> methods.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected ExtensiondefinitionSwitch<Adapter> modelSwitch =

+		new ExtensiondefinitionSwitch<Adapter>() {

+			@Override

+			public Adapter caseExtensionDefinition(ExtensionDefinition object) {

+				return createExtensionDefinitionAdapter();

+			}

+			@Override

+			public Adapter caseBaseMetaclass(BaseMetaclass object) {

+				return createBaseMetaclassAdapter();

+			}

+			@Override

+			public Adapter caseCombination(Combination object) {

+				return createCombinationAdapter();

+			}

+			@Override

+			public Adapter defaultCase(EObject object) {

+				return createEObjectAdapter();

+			}

+		};

+

+	/**

+	 * Creates an adapter for the <code>target</code>.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param target the object to adapt.

+	 * @return the adapter for the <code>target</code>.

+	 * @generated

+	 */

+	@Override

+	public Adapter createAdapter(Notifier target) {

+		return modelSwitch.doSwitch((EObject)target);

+	}

+

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition <em>Extension Definition</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition

+	 * @generated

+	 */

+	public Adapter createExtensionDefinitionAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass <em>Base Metaclass</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass

+	 * @generated

+	 */

+	public Adapter createBaseMetaclassAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.facade.extensiondefinition.Combination <em>Combination</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.facade.extensiondefinition.Combination

+	 * @generated

+	 */

+	public Adapter createCombinationAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for the default case.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null.

+	 * <!-- end-user-doc -->

+	 * @return the new adapter.

+	 * @generated

+	 */

+	public Adapter createEObjectAdapter() {

+		return null;

+	}

+

+} //ExtensiondefinitionAdapterFactory

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/util/ExtensiondefinitionResourceFactoryImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/util/ExtensiondefinitionResourceFactoryImpl.java
new file mode 100644
index 00000000000..9a454a4be70
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/util/ExtensiondefinitionResourceFactoryImpl.java
@@ -0,0 +1,63 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.extensiondefinition.util;

+

+import org.eclipse.emf.common.util.URI;

+

+import org.eclipse.emf.ecore.resource.Resource;

+

+import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;

+

+import org.eclipse.emf.ecore.xmi.XMLResource;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Resource Factory</b> associated with the package.

+ * <!-- end-user-doc -->

+ * @see org.eclipse.papyrus.facade.extensiondefinition.util.ExtensiondefinitionResourceImpl

+ * @generated

+ */

+public class ExtensiondefinitionResourceFactoryImpl extends ResourceFactoryImpl {

+	/**

+	 * Creates an instance of the resource factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public ExtensiondefinitionResourceFactoryImpl() {

+		super();

+	}

+

+	/**

+	 * Creates an instance of the resource.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Resource createResource(URI uri) {

+		XMLResource result = new ExtensiondefinitionResourceImpl(uri);

+		result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);

+		result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);

+

+		result.getDefaultSaveOptions().put(XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE);

+

+		result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);

+		result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);

+

+		result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);

+		return result;

+	}

+

+} //ExtensiondefinitionResourceFactoryImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/util/ExtensiondefinitionResourceImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/util/ExtensiondefinitionResourceImpl.java
new file mode 100644
index 00000000000..a7f8565be37
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/util/ExtensiondefinitionResourceImpl.java
@@ -0,0 +1,39 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.extensiondefinition.util;

+

+import org.eclipse.emf.common.util.URI;

+

+import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Resource </b> associated with the package.

+ * <!-- end-user-doc -->

+ * @see org.eclipse.papyrus.facade.extensiondefinition.util.ExtensiondefinitionResourceFactoryImpl

+ * @generated

+ */

+public class ExtensiondefinitionResourceImpl extends XMLResourceImpl {

+	/**

+	 * Creates an instance of the resource.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param uri the URI of the new resource.

+	 * @generated

+	 */

+	public ExtensiondefinitionResourceImpl(URI uri) {

+		super(uri);

+	}

+

+} //ExtensiondefinitionResourceImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/util/ExtensiondefinitionSwitch.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/util/ExtensiondefinitionSwitch.java
new file mode 100644
index 00000000000..98c443886b2
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/util/ExtensiondefinitionSwitch.java
@@ -0,0 +1,163 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.extensiondefinition.util;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EPackage;

+

+import org.eclipse.emf.ecore.util.Switch;

+

+import org.eclipse.papyrus.facade.extensiondefinition.*;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Switch</b> for the model's inheritance hierarchy.

+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)}

+ * to invoke the <code>caseXXX</code> method for each class of the model,

+ * starting with the actual class of the object

+ * and proceeding up the inheritance hierarchy

+ * until a non-null result is returned,

+ * which is the result of the switch.

+ * <!-- end-user-doc -->

+ * @see org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage

+ * @generated

+ */

+public class ExtensiondefinitionSwitch<T> extends Switch<T> {

+	/**

+	 * The cached model package

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected static ExtensiondefinitionPackage modelPackage;

+

+	/**

+	 * Creates an instance of the switch.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public ExtensiondefinitionSwitch() {

+		if (modelPackage == null) {

+			modelPackage = ExtensiondefinitionPackage.eINSTANCE;

+		}

+	}

+

+	/**

+	 * Checks whether this is a switch for the given package.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @parameter ePackage the package in question.

+	 * @return whether this is a switch for the given package.

+	 * @generated

+	 */

+	@Override

+	protected boolean isSwitchFor(EPackage ePackage) {

+		return ePackage == modelPackage;

+	}

+

+	/**

+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the first non-null result returned by a <code>caseXXX</code> call.

+	 * @generated

+	 */

+	@Override

+	protected T doSwitch(int classifierID, EObject theEObject) {

+		switch (classifierID) {

+			case ExtensiondefinitionPackage.EXTENSION_DEFINITION: {

+				ExtensionDefinition extensionDefinition = (ExtensionDefinition)theEObject;

+				T result = caseExtensionDefinition(extensionDefinition);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case ExtensiondefinitionPackage.BASE_METACLASS: {

+				BaseMetaclass baseMetaclass = (BaseMetaclass)theEObject;

+				T result = caseBaseMetaclass(baseMetaclass);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case ExtensiondefinitionPackage.COMBINATION: {

+				Combination combination = (Combination)theEObject;

+				T result = caseCombination(combination);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			default: return defaultCase(theEObject);

+		}

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Extension Definition</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 * @param object the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Extension Definition</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseExtensionDefinition(ExtensionDefinition object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Base Metaclass</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 * @param object the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Base Metaclass</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseBaseMetaclass(BaseMetaclass object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Combination</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 * @param object the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Combination</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseCombination(Combination object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch, but this is the last case anyway.

+	 * <!-- end-user-doc -->

+	 * @param object the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

+	 * @generated

+	 */

+	@Override

+	public T defaultCase(EObject object) {

+		return null;

+	}

+

+} //ExtensiondefinitionSwitch

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/util/ExtensiondefinitionXMLProcessor.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/util/ExtensiondefinitionXMLProcessor.java
new file mode 100644
index 00000000000..1bcc65ad363
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/util/ExtensiondefinitionXMLProcessor.java
@@ -0,0 +1,61 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.extensiondefinition.util;

+

+import java.util.Map;

+

+import org.eclipse.emf.ecore.EPackage;

+

+import org.eclipse.emf.ecore.resource.Resource;

+

+import org.eclipse.emf.ecore.xmi.util.XMLProcessor;

+

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage;

+

+/**

+ * This class contains helper methods to serialize and deserialize XML documents

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class ExtensiondefinitionXMLProcessor extends XMLProcessor {

+

+	/**

+	 * Public constructor to instantiate the helper.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public ExtensiondefinitionXMLProcessor() {

+		super((EPackage.Registry.INSTANCE));

+		ExtensiondefinitionPackage.eINSTANCE.eClass();

+	}

+	

+	/**

+	 * Register for "*" and "xml" file extensions the ExtensiondefinitionResourceFactoryImpl factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected Map<String, Resource.Factory> getRegistrations() {

+		if (registrations == null) {

+			super.getRegistrations();

+			registrations.put(XML_EXTENSION, new ExtensiondefinitionResourceFactoryImpl());

+			registrations.put(STAR_EXTENSION, new ExtensiondefinitionResourceFactoryImpl());

+		}

+		return registrations;

+	}

+

+} //ExtensiondefinitionXMLProcessor

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/validation/BaseMetaclassValidator.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/validation/BaseMetaclassValidator.java
new file mode 100644
index 00000000000..f500459e0e5
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/validation/BaseMetaclassValidator.java
@@ -0,0 +1,37 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.extensiondefinition.validation;

+

+import org.eclipse.emf.common.util.EList;

+

+import org.eclipse.emf.ecore.EObject;

+

+import org.eclipse.papyrus.facade.extensiondefinition.Combination;

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition;

+

+/**

+ * A sample validator interface for {@link org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass}.

+ * This doesn't really do anything, and it's not a real EMF artifact.

+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.

+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.

+ */

+public interface BaseMetaclassValidator {

+	boolean validate();

+

+	boolean validateIncompatibleStereotypes(EList<Combination> value);

+	boolean validateBase(EObject value);

+	boolean validateExtensionDefinition(ExtensionDefinition value);

+	boolean validateCompatibleStereotypes(EList<Combination> value);

+	boolean validatePossible(boolean value);

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/validation/CombinationValidator.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/validation/CombinationValidator.java
new file mode 100644
index 00000000000..ed1c600b7bc
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/validation/CombinationValidator.java
@@ -0,0 +1,30 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.extensiondefinition.validation;

+

+import org.eclipse.emf.common.util.EList;

+

+import org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass;

+

+/**

+ * A sample validator interface for {@link org.eclipse.papyrus.facade.extensiondefinition.Combination}.

+ * This doesn't really do anything, and it's not a real EMF artifact.

+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.

+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.

+ */

+public interface CombinationValidator {

+	boolean validate();

+

+	boolean validateMembers(EList<BaseMetaclass> value);

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/validation/ExtensionDefinitionValidator.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/validation/ExtensionDefinitionValidator.java
new file mode 100644
index 00000000000..2dd343ab42a
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/extensiondefinition/validation/ExtensionDefinitionValidator.java
@@ -0,0 +1,40 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.extensiondefinition.validation;

+

+import org.eclipse.emf.common.util.EList;

+

+import org.eclipse.papyrus.facade.Facade;

+

+import org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass;

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinitionKind;

+

+import org.eclipse.uml2.uml.Extension;

+import org.eclipse.uml2.uml.Stereotype;

+

+/**

+ * A sample validator interface for {@link org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition}.

+ * This doesn't really do anything, and it's not a real EMF artifact.

+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.

+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.

+ */

+public interface ExtensionDefinitionValidator {

+	boolean validate();

+

+	boolean validateExtension(Extension value);

+	boolean validateBaseMetaclasses(EList<BaseMetaclass> value);

+	boolean validateFacade(Facade value);

+	boolean validateStereotype(Stereotype value);

+	boolean validateKind(ExtensionDefinitionKind value);

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/impl/FacadeFactoryImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/impl/FacadeFactoryImpl.java
new file mode 100644
index 00000000000..b5ae72f9bfe
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/impl/FacadeFactoryImpl.java
@@ -0,0 +1,106 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.impl;

+

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EPackage;

+

+import org.eclipse.emf.ecore.impl.EFactoryImpl;

+

+import org.eclipse.emf.ecore.plugin.EcorePlugin;

+

+import org.eclipse.papyrus.facade.*;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model <b>Factory</b>.

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class FacadeFactoryImpl extends EFactoryImpl implements FacadeFactory {

+	/**

+	 * Creates the default factory implementation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static FacadeFactory init() {

+		try {

+			FacadeFactory theFacadeFactory = (FacadeFactory)EPackage.Registry.INSTANCE.getEFactory(FacadePackage.eNS_URI);

+			if (theFacadeFactory != null) {

+				return theFacadeFactory;

+			}

+		}

+		catch (Exception exception) {

+			EcorePlugin.INSTANCE.log(exception);

+		}

+		return new FacadeFactoryImpl();

+	}

+

+	/**

+	 * Creates an instance of the factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public FacadeFactoryImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public EObject create(EClass eClass) {

+		switch (eClass.getClassifierID()) {

+			case FacadePackage.FACADE: return createFacade();

+			default:

+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public Facade createFacade() {

+		FacadeImpl facade = new FacadeImpl();

+		return facade;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public FacadePackage getFacadePackage() {

+		return (FacadePackage)getEPackage();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @deprecated

+	 * @generated

+	 */

+	@Deprecated

+	public static FacadePackage getPackage() {

+		return FacadePackage.eINSTANCE;

+	}

+

+} //FacadeFactoryImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/impl/FacadeImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/impl/FacadeImpl.java
new file mode 100644
index 00000000000..94092fd6282
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/impl/FacadeImpl.java
@@ -0,0 +1,255 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.impl;

+

+import java.util.Collection;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.notify.NotificationChain;

+

+import org.eclipse.emf.common.util.EList;

+

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.InternalEObject;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+

+import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;

+import org.eclipse.emf.ecore.util.InternalEList;

+

+import org.eclipse.papyrus.facade.Facade;

+import org.eclipse.papyrus.facade.FacadePackage;

+

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition;

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage;

+

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Facade</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ *   <li>{@link org.eclipse.papyrus.facade.impl.FacadeImpl#getExtensionDefinitions <em>Extension Definitions</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facade.impl.FacadeImpl#getVirtualmetamodel <em>Virtualmetamodel</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @generated

+ */

+public class FacadeImpl extends MinimalEObjectImpl.Container implements Facade {

+	/**

+	 * The cached value of the '{@link #getExtensionDefinitions() <em>Extension Definitions</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getExtensionDefinitions()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<ExtensionDefinition> extensionDefinitions;

+

+	/**

+	 * The cached value of the '{@link #getVirtualmetamodel() <em>Virtualmetamodel</em>}' containment reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getVirtualmetamodel()

+	 * @generated

+	 * @ordered

+	 */

+	protected VirtualMetamodel virtualmetamodel;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected FacadeImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return FacadePackage.Literals.FACADE;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EList<ExtensionDefinition> getExtensionDefinitions() {

+		if (extensionDefinitions == null) {

+			extensionDefinitions = new EObjectContainmentWithInverseEList<ExtensionDefinition>(ExtensionDefinition.class, this, FacadePackage.FACADE__EXTENSION_DEFINITIONS, ExtensiondefinitionPackage.EXTENSION_DEFINITION__FACADE);

+		}

+		return extensionDefinitions;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public VirtualMetamodel getVirtualmetamodel() {

+		return virtualmetamodel;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public NotificationChain basicSetVirtualmetamodel(VirtualMetamodel newVirtualmetamodel, NotificationChain msgs) {

+		VirtualMetamodel oldVirtualmetamodel = virtualmetamodel;

+		virtualmetamodel = newVirtualmetamodel;

+		if (eNotificationRequired()) {

+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FacadePackage.FACADE__VIRTUALMETAMODEL, oldVirtualmetamodel, newVirtualmetamodel);

+			if (msgs == null) msgs = notification; else msgs.add(notification);

+		}

+		return msgs;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setVirtualmetamodel(VirtualMetamodel newVirtualmetamodel) {

+		if (newVirtualmetamodel != virtualmetamodel) {

+			NotificationChain msgs = null;

+			if (virtualmetamodel != null)

+				msgs = ((InternalEObject)virtualmetamodel).eInverseRemove(this, VirtualmetamodelPackage.VIRTUAL_METAMODEL__FACADE, VirtualMetamodel.class, msgs);

+			if (newVirtualmetamodel != null)

+				msgs = ((InternalEObject)newVirtualmetamodel).eInverseAdd(this, VirtualmetamodelPackage.VIRTUAL_METAMODEL__FACADE, VirtualMetamodel.class, msgs);

+			msgs = basicSetVirtualmetamodel(newVirtualmetamodel, msgs);

+			if (msgs != null) msgs.dispatch();

+		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, FacadePackage.FACADE__VIRTUALMETAMODEL, newVirtualmetamodel, newVirtualmetamodel));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

+		switch (featureID) {

+			case FacadePackage.FACADE__EXTENSION_DEFINITIONS:

+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getExtensionDefinitions()).basicAdd(otherEnd, msgs);

+			case FacadePackage.FACADE__VIRTUALMETAMODEL:

+				if (virtualmetamodel != null)

+					msgs = ((InternalEObject)virtualmetamodel).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FacadePackage.FACADE__VIRTUALMETAMODEL, null, msgs);

+				return basicSetVirtualmetamodel((VirtualMetamodel)otherEnd, msgs);

+		}

+		return super.eInverseAdd(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

+		switch (featureID) {

+			case FacadePackage.FACADE__EXTENSION_DEFINITIONS:

+				return ((InternalEList<?>)getExtensionDefinitions()).basicRemove(otherEnd, msgs);

+			case FacadePackage.FACADE__VIRTUALMETAMODEL:

+				return basicSetVirtualmetamodel(null, msgs);

+		}

+		return super.eInverseRemove(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch (featureID) {

+			case FacadePackage.FACADE__EXTENSION_DEFINITIONS:

+				return getExtensionDefinitions();

+			case FacadePackage.FACADE__VIRTUALMETAMODEL:

+				return getVirtualmetamodel();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch (featureID) {

+			case FacadePackage.FACADE__EXTENSION_DEFINITIONS:

+				getExtensionDefinitions().clear();

+				getExtensionDefinitions().addAll((Collection<? extends ExtensionDefinition>)newValue);

+				return;

+			case FacadePackage.FACADE__VIRTUALMETAMODEL:

+				setVirtualmetamodel((VirtualMetamodel)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch (featureID) {

+			case FacadePackage.FACADE__EXTENSION_DEFINITIONS:

+				getExtensionDefinitions().clear();

+				return;

+			case FacadePackage.FACADE__VIRTUALMETAMODEL:

+				setVirtualmetamodel((VirtualMetamodel)null);

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch (featureID) {

+			case FacadePackage.FACADE__EXTENSION_DEFINITIONS:

+				return extensionDefinitions != null && !extensionDefinitions.isEmpty();

+			case FacadePackage.FACADE__VIRTUALMETAMODEL:

+				return virtualmetamodel != null;

+		}

+		return super.eIsSet(featureID);

+	}

+

+} //FacadeImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/impl/FacadePackageImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/impl/FacadePackageImpl.java
new file mode 100644
index 00000000000..8e007b82c48
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/impl/FacadePackageImpl.java
@@ -0,0 +1,228 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.impl;

+

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EPackage;

+import org.eclipse.emf.ecore.EReference;

+

+import org.eclipse.emf.ecore.impl.EPackageImpl;

+

+import org.eclipse.papyrus.facade.Facade;

+import org.eclipse.papyrus.facade.FacadeFactory;

+import org.eclipse.papyrus.facade.FacadePackage;

+

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage;

+

+import org.eclipse.papyrus.facade.extensiondefinition.impl.ExtensiondefinitionPackageImpl;

+

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

+

+import org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl;

+

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model <b>Package</b>.

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class FacadePackageImpl extends EPackageImpl implements FacadePackage {

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass facadeEClass = null;

+

+	/**

+	 * Creates an instance of the model <b>Package</b>, registered with

+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

+	 * package URI value.

+	 * <p>Note: the correct way to create the package is via the static

+	 * factory method {@link #init init()}, which also performs

+	 * initialization of the package, or returns the registered package,

+	 * if one already exists.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.emf.ecore.EPackage.Registry

+	 * @see org.eclipse.papyrus.facade.FacadePackage#eNS_URI

+	 * @see #init()

+	 * @generated

+	 */

+	private FacadePackageImpl() {

+		super(eNS_URI, FacadeFactory.eINSTANCE);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private static boolean isInited = false;

+

+	/**

+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

+	 * 

+	 * <p>This method is used to initialize {@link FacadePackage#eINSTANCE} when that field is accessed.

+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #eNS_URI

+	 * @see #createPackageContents()

+	 * @see #initializePackageContents()

+	 * @generated

+	 */

+	public static FacadePackage init() {

+		if (isInited) return (FacadePackage)EPackage.Registry.INSTANCE.getEPackage(FacadePackage.eNS_URI);

+

+		// Obtain or create and register package

+		FacadePackageImpl theFacadePackage = (FacadePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof FacadePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new FacadePackageImpl());

+

+		isInited = true;

+

+		// Initialize simple dependencies

+		UMLPackage.eINSTANCE.eClass();

+

+		// Obtain or create and register interdependencies

+		VirtualmetamodelPackageImpl theVirtualmetamodelPackage = (VirtualmetamodelPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(VirtualmetamodelPackage.eNS_URI) instanceof VirtualmetamodelPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(VirtualmetamodelPackage.eNS_URI) : VirtualmetamodelPackage.eINSTANCE);

+		ExtensiondefinitionPackageImpl theExtensiondefinitionPackage = (ExtensiondefinitionPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ExtensiondefinitionPackage.eNS_URI) instanceof ExtensiondefinitionPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ExtensiondefinitionPackage.eNS_URI) : ExtensiondefinitionPackage.eINSTANCE);

+

+		// Create package meta-data objects

+		theFacadePackage.createPackageContents();

+		theVirtualmetamodelPackage.createPackageContents();

+		theExtensiondefinitionPackage.createPackageContents();

+

+		// Initialize created meta-data

+		theFacadePackage.initializePackageContents();

+		theVirtualmetamodelPackage.initializePackageContents();

+		theExtensiondefinitionPackage.initializePackageContents();

+

+		// Mark meta-data to indicate it can't be changed

+		theFacadePackage.freeze();

+

+  

+		// Update the registry and return the package

+		EPackage.Registry.INSTANCE.put(FacadePackage.eNS_URI, theFacadePackage);

+		return theFacadePackage;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EClass getFacade() {

+		return facadeEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EReference getFacade_ExtensionDefinitions() {

+		return (EReference)facadeEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EReference getFacade_Virtualmetamodel() {

+		return (EReference)facadeEClass.getEStructuralFeatures().get(1);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public FacadeFactory getFacadeFactory() {

+		return (FacadeFactory)getEFactoryInstance();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private boolean isCreated = false;

+

+	/**

+	 * Creates the meta-model objects for the package.  This method is

+	 * guarded to have no affect on any invocation but its first.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void createPackageContents() {

+		if (isCreated) return;

+		isCreated = true;

+

+		// Create classes and their features

+		facadeEClass = createEClass(FACADE);

+		createEReference(facadeEClass, FACADE__EXTENSION_DEFINITIONS);

+		createEReference(facadeEClass, FACADE__VIRTUALMETAMODEL);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private boolean isInitialized = false;

+

+	/**

+	 * Complete the initialization of the package and its meta-model.  This

+	 * method is guarded to have no affect on any invocation but its first.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void initializePackageContents() {

+		if (isInitialized) return;

+		isInitialized = true;

+

+		// Initialize package

+		setName(eNAME);

+		setNsPrefix(eNS_PREFIX);

+		setNsURI(eNS_URI);

+

+		// Obtain other dependent packages

+		VirtualmetamodelPackage theVirtualmetamodelPackage = (VirtualmetamodelPackage)EPackage.Registry.INSTANCE.getEPackage(VirtualmetamodelPackage.eNS_URI);

+		ExtensiondefinitionPackage theExtensiondefinitionPackage = (ExtensiondefinitionPackage)EPackage.Registry.INSTANCE.getEPackage(ExtensiondefinitionPackage.eNS_URI);

+

+		// Add subpackages

+		getESubpackages().add(theVirtualmetamodelPackage);

+		getESubpackages().add(theExtensiondefinitionPackage);

+

+		// Create type parameters

+

+		// Set bounds for type parameters

+

+		// Add supertypes to classes

+

+		// Initialize classes, features, and operations; add parameters

+		initEClass(facadeEClass, Facade.class, "Facade", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getFacade_ExtensionDefinitions(), theExtensiondefinitionPackage.getExtensionDefinition(), theExtensiondefinitionPackage.getExtensionDefinition_Facade(), "extensionDefinitions", null, 0, -1, Facade.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getFacade_Virtualmetamodel(), theVirtualmetamodelPackage.getVirtualMetamodel(), theVirtualmetamodelPackage.getVirtualMetamodel_Facade(), "virtualmetamodel", null, 0, 1, Facade.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		// Create resource

+		createResource(eNS_URI);

+	}

+

+} //FacadePackageImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/messages.properties b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/messages.properties
new file mode 100644
index 00000000000..fe99cdc6e98
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/messages.properties
@@ -0,0 +1,20 @@
+ApplyFacade_0=Select the facade

+ApplyFacade_1=Select the facade to apply : 

+FacadeDefinitionManager_0=The plug-in

+FacadeDefinitionManager_1=\ contributed an invalid extension for 

+FacadeDefinitionManager_10=. The facadeDefinition

+FacadeDefinitionManager_11=must be set. 

+FacadeDefinitionManager_12=The plug-in

+FacadeDefinitionManager_13=\ contributed an invalid extension for 

+FacadeDefinitionManager_14=. The facadeDefinition

+FacadeDefinitionManager_15=must be set. 

+FacadeDefinitionManager_16=The facade ID 

+FacadeDefinitionManager_17=\ is already contributed. 

+FacadeDefinitionManager_2=. The facadeDefinition

+FacadeDefinitionManager_3=must be set. 

+FacadeDefinitionManager_4=The plug-in

+FacadeDefinitionManager_5=\ contributed an invalid extension for 

+FacadeDefinitionManager_6=. The facadeDefinition

+FacadeDefinitionManager_7=must be set. 

+FacadeDefinitionManager_8=The plug-in

+FacadeDefinitionManager_9=\ contributed an invalid extension for 

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/util/FacadeAdapterFactory.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/util/FacadeAdapterFactory.java
new file mode 100644
index 00000000000..4354eb5fc51
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/util/FacadeAdapterFactory.java
@@ -0,0 +1,131 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.util;

+

+import org.eclipse.emf.common.notify.Adapter;

+import org.eclipse.emf.common.notify.Notifier;

+

+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

+

+import org.eclipse.emf.ecore.EObject;

+

+import org.eclipse.papyrus.facade.*;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Adapter Factory</b> for the model.

+ * It provides an adapter <code>createXXX</code> method for each class of the model.

+ * <!-- end-user-doc -->

+ * @see org.eclipse.papyrus.facade.FacadePackage

+ * @generated

+ */

+public class FacadeAdapterFactory extends AdapterFactoryImpl {

+	/**

+	 * The cached model package.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected static FacadePackage modelPackage;

+

+	/**

+	 * Creates an instance of the adapter factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public FacadeAdapterFactory() {

+		if (modelPackage == null) {

+			modelPackage = FacadePackage.eINSTANCE;

+		}

+	}

+

+	/**

+	 * Returns whether this factory is applicable for the type of the object.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

+	 * <!-- end-user-doc -->

+	 * @return whether this factory is applicable for the type of the object.

+	 * @generated

+	 */

+	@Override

+	public boolean isFactoryForType(Object object) {

+		if (object == modelPackage) {

+			return true;

+		}

+		if (object instanceof EObject) {

+			return ((EObject)object).eClass().getEPackage() == modelPackage;

+		}

+		return false;

+	}

+

+	/**

+	 * The switch that delegates to the <code>createXXX</code> methods.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected FacadeSwitch<Adapter> modelSwitch =

+		new FacadeSwitch<Adapter>() {

+			@Override

+			public Adapter caseFacade(Facade object) {

+				return createFacadeAdapter();

+			}

+			@Override

+			public Adapter defaultCase(EObject object) {

+				return createEObjectAdapter();

+			}

+		};

+

+	/**

+	 * Creates an adapter for the <code>target</code>.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param target the object to adapt.

+	 * @return the adapter for the <code>target</code>.

+	 * @generated

+	 */

+	@Override

+	public Adapter createAdapter(Notifier target) {

+		return modelSwitch.doSwitch((EObject)target);

+	}

+

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.facade.Facade <em>Facade</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.facade.Facade

+	 * @generated

+	 */

+	public Adapter createFacadeAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for the default case.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null.

+	 * <!-- end-user-doc -->

+	 * @return the new adapter.

+	 * @generated

+	 */

+	public Adapter createEObjectAdapter() {

+		return null;

+	}

+

+} //FacadeAdapterFactory

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/util/FacadeResourceFactoryImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/util/FacadeResourceFactoryImpl.java
new file mode 100644
index 00000000000..be981087833
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/util/FacadeResourceFactoryImpl.java
@@ -0,0 +1,63 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.util;

+

+import org.eclipse.emf.common.util.URI;

+

+import org.eclipse.emf.ecore.resource.Resource;

+

+import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;

+

+import org.eclipse.emf.ecore.xmi.XMLResource;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Resource Factory</b> associated with the package.

+ * <!-- end-user-doc -->

+ * @see org.eclipse.papyrus.facade.util.FacadeResourceImpl

+ * @generated

+ */

+public class FacadeResourceFactoryImpl extends ResourceFactoryImpl {

+	/**

+	 * Creates an instance of the resource factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public FacadeResourceFactoryImpl() {

+		super();

+	}

+

+	/**

+	 * Creates an instance of the resource.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Resource createResource(URI uri) {

+		XMLResource result = new FacadeResourceImpl(uri);

+		result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);

+		result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);

+

+		result.getDefaultSaveOptions().put(XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE);

+

+		result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);

+		result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);

+

+		result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);

+		return result;

+	}

+

+} //FacadeResourceFactoryImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/util/FacadeResourceImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/util/FacadeResourceImpl.java
new file mode 100644
index 00000000000..81be26f04c4
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/util/FacadeResourceImpl.java
@@ -0,0 +1,39 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.util;

+

+import org.eclipse.emf.common.util.URI;

+

+import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Resource </b> associated with the package.

+ * <!-- end-user-doc -->

+ * @see org.eclipse.papyrus.facade.util.FacadeResourceFactoryImpl

+ * @generated

+ */

+public class FacadeResourceImpl extends XMLResourceImpl {

+	/**

+	 * Creates an instance of the resource.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param uri the URI of the new resource.

+	 * @generated

+	 */

+	public FacadeResourceImpl(URI uri) {

+		super(uri);

+	}

+

+} //FacadeResourceImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/util/FacadeSwitch.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/util/FacadeSwitch.java
new file mode 100644
index 00000000000..66a22660fc8
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/util/FacadeSwitch.java
@@ -0,0 +1,121 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.util;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EPackage;

+

+import org.eclipse.emf.ecore.util.Switch;

+

+import org.eclipse.papyrus.facade.*;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Switch</b> for the model's inheritance hierarchy.

+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)}

+ * to invoke the <code>caseXXX</code> method for each class of the model,

+ * starting with the actual class of the object

+ * and proceeding up the inheritance hierarchy

+ * until a non-null result is returned,

+ * which is the result of the switch.

+ * <!-- end-user-doc -->

+ * @see org.eclipse.papyrus.facade.FacadePackage

+ * @generated

+ */

+public class FacadeSwitch<T> extends Switch<T> {

+	/**

+	 * The cached model package

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected static FacadePackage modelPackage;

+

+	/**

+	 * Creates an instance of the switch.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public FacadeSwitch() {

+		if (modelPackage == null) {

+			modelPackage = FacadePackage.eINSTANCE;

+		}

+	}

+

+	/**

+	 * Checks whether this is a switch for the given package.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @parameter ePackage the package in question.

+	 * @return whether this is a switch for the given package.

+	 * @generated

+	 */

+	@Override

+	protected boolean isSwitchFor(EPackage ePackage) {

+		return ePackage == modelPackage;

+	}

+

+	/**

+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the first non-null result returned by a <code>caseXXX</code> call.

+	 * @generated

+	 */

+	@Override

+	protected T doSwitch(int classifierID, EObject theEObject) {

+		switch (classifierID) {

+			case FacadePackage.FACADE: {

+				Facade facade = (Facade)theEObject;

+				T result = caseFacade(facade);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			default: return defaultCase(theEObject);

+		}

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Facade</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 * @param object the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Facade</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseFacade(Facade object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch, but this is the last case anyway.

+	 * <!-- end-user-doc -->

+	 * @param object the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

+	 * @generated

+	 */

+	@Override

+	public T defaultCase(EObject object) {

+		return null;

+	}

+

+} //FacadeSwitch

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/util/FacadeXMLProcessor.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/util/FacadeXMLProcessor.java
new file mode 100644
index 00000000000..afa54db84f3
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/util/FacadeXMLProcessor.java
@@ -0,0 +1,61 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.util;

+

+import java.util.Map;

+

+import org.eclipse.emf.ecore.EPackage;

+

+import org.eclipse.emf.ecore.resource.Resource;

+

+import org.eclipse.emf.ecore.xmi.util.XMLProcessor;

+

+import org.eclipse.papyrus.facade.FacadePackage;

+

+/**

+ * This class contains helper methods to serialize and deserialize XML documents

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class FacadeXMLProcessor extends XMLProcessor {

+

+	/**

+	 * Public constructor to instantiate the helper.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public FacadeXMLProcessor() {

+		super((EPackage.Registry.INSTANCE));

+		FacadePackage.eINSTANCE.eClass();

+	}

+	

+	/**

+	 * Register for "*" and "xml" file extensions the FacadeResourceFactoryImpl factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected Map<String, Resource.Factory> getRegistrations() {

+		if (registrations == null) {

+			super.getRegistrations();

+			registrations.put(XML_EXTENSION, new FacadeResourceFactoryImpl());

+			registrations.put(STAR_EXTENSION, new FacadeResourceFactoryImpl());

+		}

+		return registrations;

+	}

+

+} //FacadeXMLProcessor

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/validation/FacadeValidator.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/validation/FacadeValidator.java
new file mode 100644
index 00000000000..70d6fa82599
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/validation/FacadeValidator.java
@@ -0,0 +1,33 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.validation;

+

+import org.eclipse.emf.common.util.EList;

+

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensionDefinition;

+

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel;

+

+/**

+ * A sample validator interface for {@link org.eclipse.papyrus.facade.Facade}.

+ * This doesn't really do anything, and it's not a real EMF artifact.

+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.

+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.

+ */

+public interface FacadeValidator {

+	boolean validate();

+

+	boolean validateExtensionDefinitions(EList<ExtensionDefinition> value);

+	boolean validateVirtualmetamodel(VirtualMetamodel value);

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualClassifier.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualClassifier.java
new file mode 100644
index 00000000000..3b02cb8cd65
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualClassifier.java
@@ -0,0 +1,62 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.virtualmetamodel;

+

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Virtual Classifier</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier#getMetamodel <em>Metamodel</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualClassifier()

+ * @model abstract="true"

+ * @generated

+ */

+public interface VirtualClassifier extends VirtualElement {

+	/**

+	 * Returns the value of the '<em><b>Metamodel</b></em>' container reference.

+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel#getVirtualClassifiers <em>Virtual Classifiers</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Metamodel</em>' container reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Metamodel</em>' container reference.

+	 * @see #setMetamodel(VirtualMetamodel)

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualClassifier_Metamodel()

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel#getVirtualClassifiers

+	 * @model opposite="virtualClassifiers" required="true" transient="false"

+	 * @generated

+	 */

+	VirtualMetamodel getMetamodel();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier#getMetamodel <em>Metamodel</em>}' container reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Metamodel</em>' container reference.

+	 * @see #getMetamodel()

+	 * @generated

+	 */

+	void setMetamodel(VirtualMetamodel value);

+

+} // VirtualClassifier

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualDatatype.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualDatatype.java
new file mode 100644
index 00000000000..4555bafad17
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualDatatype.java
@@ -0,0 +1,28 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.virtualmetamodel;

+

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Virtual Datatype</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ *

+ * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualDatatype()

+ * @model

+ * @generated

+ */

+public interface VirtualDatatype extends VirtualClassifier {

+} // VirtualDatatype

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualElement.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualElement.java
new file mode 100644
index 00000000000..5ed677fce08
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualElement.java
@@ -0,0 +1,142 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.virtualmetamodel;

+

+import org.eclipse.emf.ecore.EObject;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Virtual Element</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement#getAliasName <em>Alias Name</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement#isKept <em>Kept</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement#getRepresentedElement <em>Represented Element</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement#isUseRepresented <em>Use Represented</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualElement()

+ * @model abstract="true"

+ * @generated

+ */

+public interface VirtualElement extends EObject {

+	/**

+	 * Returns the value of the '<em><b>Alias Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Alias Name</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Alias Name</em>' attribute.

+	 * @see #setAliasName(String)

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualElement_AliasName()

+	 * @model

+	 * @generated

+	 */

+	String getAliasName();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement#getAliasName <em>Alias Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Alias Name</em>' attribute.

+	 * @see #getAliasName()

+	 * @generated

+	 */

+	void setAliasName(String value);

+

+	/**

+	 * Returns the value of the '<em><b>Kept</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Kept</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Kept</em>' attribute.

+	 * @see #setKept(boolean)

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualElement_Kept()

+	 * @model required="true"

+	 * @generated

+	 */

+	boolean isKept();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement#isKept <em>Kept</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Kept</em>' attribute.

+	 * @see #isKept()

+	 * @generated

+	 */

+	void setKept(boolean value);

+

+	/**

+	 * Returns the value of the '<em><b>Represented Element</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Represented Element</em>' reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Represented Element</em>' reference.

+	 * @see #setRepresentedElement(EObject)

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualElement_RepresentedElement()

+	 * @model required="true"

+	 * @generated

+	 */

+	EObject getRepresentedElement();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement#getRepresentedElement <em>Represented Element</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Represented Element</em>' reference.

+	 * @see #getRepresentedElement()

+	 * @generated

+	 */

+	void setRepresentedElement(EObject value);

+

+	/**

+	 * Returns the value of the '<em><b>Use Represented</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Use Represented</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Use Represented</em>' attribute.

+	 * @see #setUseRepresented(boolean)

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualElement_UseRepresented()

+	 * @model required="true"

+	 * @generated

+	 */

+	boolean isUseRepresented();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement#isUseRepresented <em>Use Represented</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Use Represented</em>' attribute.

+	 * @see #isUseRepresented()

+	 * @generated

+	 */

+	void setUseRepresented(boolean value);

+

+} // VirtualElement

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualEnum.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualEnum.java
new file mode 100644
index 00000000000..48f6927d654
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualEnum.java
@@ -0,0 +1,51 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.virtualmetamodel;

+

+import org.eclipse.emf.common.util.EList;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Virtual Enum</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualEnum#getLiterals <em>Literals</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualEnum()

+ * @model

+ * @generated

+ */

+public interface VirtualEnum extends VirtualClassifier {

+	/**

+	 * Returns the value of the '<em><b>Literals</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualLiteral}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Literals</em>' containment reference list isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Literals</em>' containment reference list.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualEnum_Literals()

+	 * @model containment="true"

+	 * @generated

+	 */

+	EList<VirtualLiteral> getLiterals();

+

+} // VirtualEnum

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualLiteral.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualLiteral.java
new file mode 100644
index 00000000000..603511899ad
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualLiteral.java
@@ -0,0 +1,28 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.virtualmetamodel;

+

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Virtual Literal</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ *

+ * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualLiteral()

+ * @model

+ * @generated

+ */

+public interface VirtualLiteral extends VirtualElement {

+} // VirtualLiteral

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualMetaclass.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualMetaclass.java
new file mode 100644
index 00000000000..96e532c9afe
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualMetaclass.java
@@ -0,0 +1,160 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.virtualmetamodel;

+

+import org.eclipse.emf.common.util.EList;

+

+import org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Virtual Metaclass</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass#isAbstract <em>Abstract</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass#getAppliedStereotypes <em>Applied Stereotypes</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass#getOperations <em>Operations</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass#getParents <em>Parents</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass#getProperties <em>Properties</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass#isStereotypeInterface <em>Stereotype Interface</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualMetaclass()

+ * @model

+ * @generated

+ */

+public interface VirtualMetaclass extends VirtualClassifier {

+	/**

+	 * Returns the value of the '<em><b>Abstract</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Abstract</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Abstract</em>' attribute.

+	 * @see #setAbstract(boolean)

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualMetaclass_Abstract()

+	 * @model

+	 * @generated

+	 */

+	boolean isAbstract();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass#isAbstract <em>Abstract</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Abstract</em>' attribute.

+	 * @see #isAbstract()

+	 * @generated

+	 */

+	void setAbstract(boolean value);

+

+	/**

+	 * Returns the value of the '<em><b>Applied Stereotypes</b></em>' reference list.

+	 * The list contents are of type {@link org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Applied Stereotypes</em>' reference list isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Applied Stereotypes</em>' reference list.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualMetaclass_AppliedStereotypes()

+	 * @model

+	 * @generated

+	 */

+	EList<BaseMetaclass> getAppliedStereotypes();

+

+	/**

+	 * Returns the value of the '<em><b>Operations</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualOperation}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Operations</em>' containment reference list isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Operations</em>' containment reference list.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualMetaclass_Operations()

+	 * @model containment="true"

+	 * @generated

+	 */

+	EList<VirtualOperation> getOperations();

+

+	/**

+	 * Returns the value of the '<em><b>Parents</b></em>' reference list.

+	 * The list contents are of type {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Parents</em>' reference list isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Parents</em>' reference list.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualMetaclass_Parents()

+	 * @model

+	 * @generated

+	 */

+	EList<VirtualMetaclass> getParents();

+

+	/**

+	 * Returns the value of the '<em><b>Properties</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty}.

+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty#getVirtualMetaclass <em>Virtual Metaclass</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Properties</em>' containment reference list isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Properties</em>' containment reference list.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualMetaclass_Properties()

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty#getVirtualMetaclass

+	 * @model opposite="virtualMetaclass" containment="true"

+	 * @generated

+	 */

+	EList<VirtualProperty> getProperties();

+

+	/**

+	 * Returns the value of the '<em><b>Stereotype Interface</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Stereotype Interface</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Stereotype Interface</em>' attribute.

+	 * @see #setStereotypeInterface(boolean)

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualMetaclass_StereotypeInterface()

+	 * @model dataType="org.eclipse.uml2.types.Boolean" required="true"

+	 * @generated

+	 */

+	boolean isStereotypeInterface();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass#isStereotypeInterface <em>Stereotype Interface</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Stereotype Interface</em>' attribute.

+	 * @see #isStereotypeInterface()

+	 * @generated

+	 */

+	void setStereotypeInterface(boolean value);

+

+} // VirtualMetaclass

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualMetamodel.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualMetamodel.java
new file mode 100644
index 00000000000..322f9f60cea
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualMetamodel.java
@@ -0,0 +1,167 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.virtualmetamodel;

+

+import org.eclipse.emf.common.util.EList;

+

+import org.eclipse.emf.ecore.EObject;

+

+import org.eclipse.papyrus.facade.Facade;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Virtual Metamodel</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel#getName <em>Name</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel#getNsPrefix <em>Ns Prefix</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel#getNsURI <em>Ns URI</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel#getVirtualClassifiers <em>Virtual Classifiers</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel#getFacade <em>Facade</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualMetamodel()

+ * @model

+ * @generated

+ */

+public interface VirtualMetamodel extends EObject {

+	/**

+	 * Returns the value of the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Name</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Name</em>' attribute.

+	 * @see #setName(String)

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualMetamodel_Name()

+	 * @model

+	 * @generated

+	 */

+	String getName();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel#getName <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Name</em>' attribute.

+	 * @see #getName()

+	 * @generated

+	 */

+	void setName(String value);

+

+	/**

+	 * Returns the value of the '<em><b>Ns Prefix</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Ns Prefix</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Ns Prefix</em>' attribute.

+	 * @see #setNsPrefix(String)

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualMetamodel_NsPrefix()

+	 * @model

+	 * @generated

+	 */

+	String getNsPrefix();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel#getNsPrefix <em>Ns Prefix</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Ns Prefix</em>' attribute.

+	 * @see #getNsPrefix()

+	 * @generated

+	 */

+	void setNsPrefix(String value);

+

+	/**

+	 * Returns the value of the '<em><b>Ns URI</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Ns URI</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Ns URI</em>' attribute.

+	 * @see #setNsURI(String)

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualMetamodel_NsURI()

+	 * @model

+	 * @generated

+	 */

+	String getNsURI();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel#getNsURI <em>Ns URI</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Ns URI</em>' attribute.

+	 * @see #getNsURI()

+	 * @generated

+	 */

+	void setNsURI(String value);

+

+	/**

+	 * Returns the value of the '<em><b>Virtual Classifiers</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier}.

+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier#getMetamodel <em>Metamodel</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Virtual Classifiers</em>' containment reference list isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Virtual Classifiers</em>' containment reference list.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualMetamodel_VirtualClassifiers()

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier#getMetamodel

+	 * @model opposite="metamodel" containment="true"

+	 * @generated

+	 */

+	EList<VirtualClassifier> getVirtualClassifiers();

+

+	/**

+	 * Returns the value of the '<em><b>Facade</b></em>' container reference.

+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.facade.Facade#getVirtualmetamodel <em>Virtualmetamodel</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Facade</em>' container reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Facade</em>' container reference.

+	 * @see #setFacade(Facade)

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualMetamodel_Facade()

+	 * @see org.eclipse.papyrus.facade.Facade#getVirtualmetamodel

+	 * @model opposite="virtualmetamodel" required="true" transient="false"

+	 * @generated

+	 */

+	Facade getFacade();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel#getFacade <em>Facade</em>}' container reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Facade</em>' container reference.

+	 * @see #getFacade()

+	 * @generated

+	 */

+	void setFacade(Facade value);

+

+} // VirtualMetamodel

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualOperation.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualOperation.java
new file mode 100644
index 00000000000..9d6941f4a33
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualOperation.java
@@ -0,0 +1,51 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.virtualmetamodel;

+

+import org.eclipse.emf.common.util.EList;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Virtual Operation</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualOperation#getParameters <em>Parameters</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualOperation()

+ * @model

+ * @generated

+ */

+public interface VirtualOperation extends VirtualTypedElement {

+	/**

+	 * Returns the value of the '<em><b>Parameters</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualParameter}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Parameters</em>' containment reference list isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Parameters</em>' containment reference list.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualOperation_Parameters()

+	 * @model containment="true"

+	 * @generated

+	 */

+	EList<VirtualParameter> getParameters();

+

+} // VirtualOperation

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualParameter.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualParameter.java
new file mode 100644
index 00000000000..d561bf38d74
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualParameter.java
@@ -0,0 +1,28 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.virtualmetamodel;

+

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Virtual Parameter</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ *

+ * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualParameter()

+ * @model

+ * @generated

+ */

+public interface VirtualParameter extends VirtualTypedElement {

+} // VirtualParameter

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualProperty.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualProperty.java
new file mode 100644
index 00000000000..7e206dd27c6
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualProperty.java
@@ -0,0 +1,62 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.virtualmetamodel;

+

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Virtual Property</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty#getVirtualMetaclass <em>Virtual Metaclass</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualProperty()

+ * @model

+ * @generated

+ */

+public interface VirtualProperty extends VirtualTypedElement {

+	/**

+	 * Returns the value of the '<em><b>Virtual Metaclass</b></em>' container reference.

+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass#getProperties <em>Properties</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Virtual Metaclass</em>' container reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Virtual Metaclass</em>' container reference.

+	 * @see #setVirtualMetaclass(VirtualMetaclass)

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualProperty_VirtualMetaclass()

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass#getProperties

+	 * @model opposite="properties" required="true" transient="false"

+	 * @generated

+	 */

+	VirtualMetaclass getVirtualMetaclass();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty#getVirtualMetaclass <em>Virtual Metaclass</em>}' container reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Virtual Metaclass</em>' container reference.

+	 * @see #getVirtualMetaclass()

+	 * @generated

+	 */

+	void setVirtualMetaclass(VirtualMetaclass value);

+

+} // VirtualProperty

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualTypedElement.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualTypedElement.java
new file mode 100644
index 00000000000..5f5bf0964e3
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualTypedElement.java
@@ -0,0 +1,114 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.virtualmetamodel;

+

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Virtual Typed Element</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement#getLower <em>Lower</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement#getUpper <em>Upper</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement#getType <em>Type</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualTypedElement()

+ * @model abstract="true"

+ * @generated

+ */

+public interface VirtualTypedElement extends VirtualElement {

+	/**

+	 * Returns the value of the '<em><b>Lower</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Lower</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Lower</em>' attribute.

+	 * @see #setLower(int)

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualTypedElement_Lower()

+	 * @model required="true"

+	 * @generated

+	 */

+	int getLower();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement#getLower <em>Lower</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Lower</em>' attribute.

+	 * @see #getLower()

+	 * @generated

+	 */

+	void setLower(int value);

+

+	/**

+	 * Returns the value of the '<em><b>Upper</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Upper</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Upper</em>' attribute.

+	 * @see #setUpper(int)

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualTypedElement_Upper()

+	 * @model required="true"

+	 * @generated

+	 */

+	int getUpper();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement#getUpper <em>Upper</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Upper</em>' attribute.

+	 * @see #getUpper()

+	 * @generated

+	 */

+	void setUpper(int value);

+

+	/**

+	 * Returns the value of the '<em><b>Type</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Type</em>' reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Type</em>' reference.

+	 * @see #setType(VirtualClassifier)

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#getVirtualTypedElement_Type()

+	 * @model required="true"

+	 * @generated

+	 */

+	VirtualClassifier getType();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement#getType <em>Type</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Type</em>' reference.

+	 * @see #getType()

+	 * @generated

+	 */

+	void setType(VirtualClassifier value);

+

+} // VirtualTypedElement

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualmetamodelFactory.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualmetamodelFactory.java
new file mode 100644
index 00000000000..3dcc2eb90d2
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualmetamodelFactory.java
@@ -0,0 +1,116 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.virtualmetamodel;

+

+import org.eclipse.emf.ecore.EFactory;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Factory</b> for the model.

+ * It provides a create method for each non-abstract class of the model.

+ * <!-- end-user-doc -->

+ * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage

+ * @generated

+ */

+public interface VirtualmetamodelFactory extends EFactory {

+	/**

+	 * The singleton instance of the factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	VirtualmetamodelFactory eINSTANCE = org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelFactoryImpl.init();

+

+	/**

+	 * Returns a new object of class '<em>Virtual Metamodel</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return a new object of class '<em>Virtual Metamodel</em>'.

+	 * @generated

+	 */

+	VirtualMetamodel createVirtualMetamodel();

+

+	/**

+	 * Returns a new object of class '<em>Virtual Metaclass</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return a new object of class '<em>Virtual Metaclass</em>'.

+	 * @generated

+	 */

+	VirtualMetaclass createVirtualMetaclass();

+

+	/**

+	 * Returns a new object of class '<em>Virtual Property</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return a new object of class '<em>Virtual Property</em>'.

+	 * @generated

+	 */

+	VirtualProperty createVirtualProperty();

+

+	/**

+	 * Returns a new object of class '<em>Virtual Operation</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return a new object of class '<em>Virtual Operation</em>'.

+	 * @generated

+	 */

+	VirtualOperation createVirtualOperation();

+

+	/**

+	 * Returns a new object of class '<em>Virtual Parameter</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return a new object of class '<em>Virtual Parameter</em>'.

+	 * @generated

+	 */

+	VirtualParameter createVirtualParameter();

+

+	/**

+	 * Returns a new object of class '<em>Virtual Datatype</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return a new object of class '<em>Virtual Datatype</em>'.

+	 * @generated

+	 */

+	VirtualDatatype createVirtualDatatype();

+

+	/**

+	 * Returns a new object of class '<em>Virtual Enum</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return a new object of class '<em>Virtual Enum</em>'.

+	 * @generated

+	 */

+	VirtualEnum createVirtualEnum();

+

+	/**

+	 * Returns a new object of class '<em>Virtual Literal</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return a new object of class '<em>Virtual Literal</em>'.

+	 * @generated

+	 */

+	VirtualLiteral createVirtualLiteral();

+

+	/**

+	 * Returns the package supported by this factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the package supported by this factory.

+	 * @generated

+	 */

+	VirtualmetamodelPackage getVirtualmetamodelPackage();

+

+} //VirtualmetamodelFactory

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualmetamodelPackage.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualmetamodelPackage.java
new file mode 100644
index 00000000000..7fa7e813107
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/VirtualmetamodelPackage.java
@@ -0,0 +1,1672 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.virtualmetamodel;

+

+import org.eclipse.emf.ecore.EAttribute;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EPackage;

+import org.eclipse.emf.ecore.EReference;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Package</b> for the model.

+ * It contains accessors for the meta objects to represent

+ * <ul>

+ *   <li>each class,</li>

+ *   <li>each feature of each class,</li>

+ *   <li>each operation of each class,</li>

+ *   <li>each enum,</li>

+ *   <li>and each data type</li>

+ * </ul>

+ * <!-- end-user-doc -->

+ * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelFactory

+ * @model kind="package"

+ * @generated

+ */

+public interface VirtualmetamodelPackage extends EPackage {

+	/**

+	 * The package name.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	String eNAME = "virtualmetamodel";

+

+	/**

+	 * The package namespace URI.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	String eNS_URI = "http://www.eclipse.org/papyrus/virtualmetamodel";

+

+	/**

+	 * The package namespace name.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	String eNS_PREFIX = "virtualmetamodel";

+

+	/**

+	 * The singleton instance of the package.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	VirtualmetamodelPackage eINSTANCE = org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl.init();

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualMetamodelImpl <em>Virtual Metamodel</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualMetamodelImpl

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl#getVirtualMetamodel()

+	 * @generated

+	 */

+	int VIRTUAL_METAMODEL = 0;

+

+	/**

+	 * The feature id for the '<em><b>Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_METAMODEL__NAME = 0;

+

+	/**

+	 * The feature id for the '<em><b>Ns Prefix</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_METAMODEL__NS_PREFIX = 1;

+

+	/**

+	 * The feature id for the '<em><b>Ns URI</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_METAMODEL__NS_URI = 2;

+

+	/**

+	 * The feature id for the '<em><b>Virtual Classifiers</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_METAMODEL__VIRTUAL_CLASSIFIERS = 3;

+

+	/**

+	 * The feature id for the '<em><b>Facade</b></em>' container reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_METAMODEL__FACADE = 4;

+

+	/**

+	 * The number of structural features of the '<em>Virtual Metamodel</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_METAMODEL_FEATURE_COUNT = 5;

+

+	/**

+	 * The number of operations of the '<em>Virtual Metamodel</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_METAMODEL_OPERATION_COUNT = 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualElementImpl <em>Virtual Element</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualElementImpl

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl#getVirtualElement()

+	 * @generated

+	 */

+	int VIRTUAL_ELEMENT = 1;

+

+	/**

+	 * The feature id for the '<em><b>Alias Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_ELEMENT__ALIAS_NAME = 0;

+

+	/**

+	 * The feature id for the '<em><b>Kept</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_ELEMENT__KEPT = 1;

+

+	/**

+	 * The feature id for the '<em><b>Represented Element</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_ELEMENT__REPRESENTED_ELEMENT = 2;

+

+	/**

+	 * The feature id for the '<em><b>Use Represented</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_ELEMENT__USE_REPRESENTED = 3;

+

+	/**

+	 * The number of structural features of the '<em>Virtual Element</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_ELEMENT_FEATURE_COUNT = 4;

+

+	/**

+	 * The number of operations of the '<em>Virtual Element</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_ELEMENT_OPERATION_COUNT = 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualClassifierImpl <em>Virtual Classifier</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualClassifierImpl

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl#getVirtualClassifier()

+	 * @generated

+	 */

+	int VIRTUAL_CLASSIFIER = 2;

+

+	/**

+	 * The feature id for the '<em><b>Alias Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_CLASSIFIER__ALIAS_NAME = VIRTUAL_ELEMENT__ALIAS_NAME;

+

+	/**

+	 * The feature id for the '<em><b>Kept</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_CLASSIFIER__KEPT = VIRTUAL_ELEMENT__KEPT;

+

+	/**

+	 * The feature id for the '<em><b>Represented Element</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_CLASSIFIER__REPRESENTED_ELEMENT = VIRTUAL_ELEMENT__REPRESENTED_ELEMENT;

+

+	/**

+	 * The feature id for the '<em><b>Use Represented</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_CLASSIFIER__USE_REPRESENTED = VIRTUAL_ELEMENT__USE_REPRESENTED;

+

+	/**

+	 * The feature id for the '<em><b>Metamodel</b></em>' container reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_CLASSIFIER__METAMODEL = VIRTUAL_ELEMENT_FEATURE_COUNT + 0;

+

+	/**

+	 * The number of structural features of the '<em>Virtual Classifier</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_CLASSIFIER_FEATURE_COUNT = VIRTUAL_ELEMENT_FEATURE_COUNT + 1;

+

+	/**

+	 * The number of operations of the '<em>Virtual Classifier</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_CLASSIFIER_OPERATION_COUNT = VIRTUAL_ELEMENT_OPERATION_COUNT + 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualMetaclassImpl <em>Virtual Metaclass</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualMetaclassImpl

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl#getVirtualMetaclass()

+	 * @generated

+	 */

+	int VIRTUAL_METACLASS = 3;

+

+	/**

+	 * The feature id for the '<em><b>Alias Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_METACLASS__ALIAS_NAME = VIRTUAL_CLASSIFIER__ALIAS_NAME;

+

+	/**

+	 * The feature id for the '<em><b>Kept</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_METACLASS__KEPT = VIRTUAL_CLASSIFIER__KEPT;

+

+	/**

+	 * The feature id for the '<em><b>Represented Element</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_METACLASS__REPRESENTED_ELEMENT = VIRTUAL_CLASSIFIER__REPRESENTED_ELEMENT;

+

+	/**

+	 * The feature id for the '<em><b>Use Represented</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_METACLASS__USE_REPRESENTED = VIRTUAL_CLASSIFIER__USE_REPRESENTED;

+

+	/**

+	 * The feature id for the '<em><b>Metamodel</b></em>' container reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_METACLASS__METAMODEL = VIRTUAL_CLASSIFIER__METAMODEL;

+

+	/**

+	 * The feature id for the '<em><b>Abstract</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_METACLASS__ABSTRACT = VIRTUAL_CLASSIFIER_FEATURE_COUNT + 0;

+

+	/**

+	 * The feature id for the '<em><b>Applied Stereotypes</b></em>' reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_METACLASS__APPLIED_STEREOTYPES = VIRTUAL_CLASSIFIER_FEATURE_COUNT + 1;

+

+	/**

+	 * The feature id for the '<em><b>Operations</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_METACLASS__OPERATIONS = VIRTUAL_CLASSIFIER_FEATURE_COUNT + 2;

+

+	/**

+	 * The feature id for the '<em><b>Parents</b></em>' reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_METACLASS__PARENTS = VIRTUAL_CLASSIFIER_FEATURE_COUNT + 3;

+

+	/**

+	 * The feature id for the '<em><b>Properties</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_METACLASS__PROPERTIES = VIRTUAL_CLASSIFIER_FEATURE_COUNT + 4;

+

+	/**

+	 * The feature id for the '<em><b>Stereotype Interface</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_METACLASS__STEREOTYPE_INTERFACE = VIRTUAL_CLASSIFIER_FEATURE_COUNT + 5;

+

+	/**

+	 * The number of structural features of the '<em>Virtual Metaclass</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_METACLASS_FEATURE_COUNT = VIRTUAL_CLASSIFIER_FEATURE_COUNT + 6;

+

+	/**

+	 * The number of operations of the '<em>Virtual Metaclass</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_METACLASS_OPERATION_COUNT = VIRTUAL_CLASSIFIER_OPERATION_COUNT + 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualTypedElementImpl <em>Virtual Typed Element</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualTypedElementImpl

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl#getVirtualTypedElement()

+	 * @generated

+	 */

+	int VIRTUAL_TYPED_ELEMENT = 10;

+

+	/**

+	 * The feature id for the '<em><b>Alias Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_TYPED_ELEMENT__ALIAS_NAME = VIRTUAL_ELEMENT__ALIAS_NAME;

+

+	/**

+	 * The feature id for the '<em><b>Kept</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_TYPED_ELEMENT__KEPT = VIRTUAL_ELEMENT__KEPT;

+

+	/**

+	 * The feature id for the '<em><b>Represented Element</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_TYPED_ELEMENT__REPRESENTED_ELEMENT = VIRTUAL_ELEMENT__REPRESENTED_ELEMENT;

+

+	/**

+	 * The feature id for the '<em><b>Use Represented</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_TYPED_ELEMENT__USE_REPRESENTED = VIRTUAL_ELEMENT__USE_REPRESENTED;

+

+	/**

+	 * The feature id for the '<em><b>Lower</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_TYPED_ELEMENT__LOWER = VIRTUAL_ELEMENT_FEATURE_COUNT + 0;

+

+	/**

+	 * The feature id for the '<em><b>Upper</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_TYPED_ELEMENT__UPPER = VIRTUAL_ELEMENT_FEATURE_COUNT + 1;

+

+	/**

+	 * The feature id for the '<em><b>Type</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_TYPED_ELEMENT__TYPE = VIRTUAL_ELEMENT_FEATURE_COUNT + 2;

+

+	/**

+	 * The number of structural features of the '<em>Virtual Typed Element</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_TYPED_ELEMENT_FEATURE_COUNT = VIRTUAL_ELEMENT_FEATURE_COUNT + 3;

+

+	/**

+	 * The number of operations of the '<em>Virtual Typed Element</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_TYPED_ELEMENT_OPERATION_COUNT = VIRTUAL_ELEMENT_OPERATION_COUNT + 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualPropertyImpl <em>Virtual Property</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualPropertyImpl

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl#getVirtualProperty()

+	 * @generated

+	 */

+	int VIRTUAL_PROPERTY = 4;

+

+	/**

+	 * The feature id for the '<em><b>Alias Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_PROPERTY__ALIAS_NAME = VIRTUAL_TYPED_ELEMENT__ALIAS_NAME;

+

+	/**

+	 * The feature id for the '<em><b>Kept</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_PROPERTY__KEPT = VIRTUAL_TYPED_ELEMENT__KEPT;

+

+	/**

+	 * The feature id for the '<em><b>Represented Element</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_PROPERTY__REPRESENTED_ELEMENT = VIRTUAL_TYPED_ELEMENT__REPRESENTED_ELEMENT;

+

+	/**

+	 * The feature id for the '<em><b>Use Represented</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_PROPERTY__USE_REPRESENTED = VIRTUAL_TYPED_ELEMENT__USE_REPRESENTED;

+

+	/**

+	 * The feature id for the '<em><b>Lower</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_PROPERTY__LOWER = VIRTUAL_TYPED_ELEMENT__LOWER;

+

+	/**

+	 * The feature id for the '<em><b>Upper</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_PROPERTY__UPPER = VIRTUAL_TYPED_ELEMENT__UPPER;

+

+	/**

+	 * The feature id for the '<em><b>Type</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_PROPERTY__TYPE = VIRTUAL_TYPED_ELEMENT__TYPE;

+

+	/**

+	 * The feature id for the '<em><b>Virtual Metaclass</b></em>' container reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_PROPERTY__VIRTUAL_METACLASS = VIRTUAL_TYPED_ELEMENT_FEATURE_COUNT + 0;

+

+	/**

+	 * The number of structural features of the '<em>Virtual Property</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_PROPERTY_FEATURE_COUNT = VIRTUAL_TYPED_ELEMENT_FEATURE_COUNT + 1;

+

+	/**

+	 * The number of operations of the '<em>Virtual Property</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_PROPERTY_OPERATION_COUNT = VIRTUAL_TYPED_ELEMENT_OPERATION_COUNT + 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualOperationImpl <em>Virtual Operation</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualOperationImpl

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl#getVirtualOperation()

+	 * @generated

+	 */

+	int VIRTUAL_OPERATION = 5;

+

+	/**

+	 * The feature id for the '<em><b>Alias Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_OPERATION__ALIAS_NAME = VIRTUAL_TYPED_ELEMENT__ALIAS_NAME;

+

+	/**

+	 * The feature id for the '<em><b>Kept</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_OPERATION__KEPT = VIRTUAL_TYPED_ELEMENT__KEPT;

+

+	/**

+	 * The feature id for the '<em><b>Represented Element</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_OPERATION__REPRESENTED_ELEMENT = VIRTUAL_TYPED_ELEMENT__REPRESENTED_ELEMENT;

+

+	/**

+	 * The feature id for the '<em><b>Use Represented</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_OPERATION__USE_REPRESENTED = VIRTUAL_TYPED_ELEMENT__USE_REPRESENTED;

+

+	/**

+	 * The feature id for the '<em><b>Lower</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_OPERATION__LOWER = VIRTUAL_TYPED_ELEMENT__LOWER;

+

+	/**

+	 * The feature id for the '<em><b>Upper</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_OPERATION__UPPER = VIRTUAL_TYPED_ELEMENT__UPPER;

+

+	/**

+	 * The feature id for the '<em><b>Type</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_OPERATION__TYPE = VIRTUAL_TYPED_ELEMENT__TYPE;

+

+	/**

+	 * The feature id for the '<em><b>Parameters</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_OPERATION__PARAMETERS = VIRTUAL_TYPED_ELEMENT_FEATURE_COUNT + 0;

+

+	/**

+	 * The number of structural features of the '<em>Virtual Operation</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_OPERATION_FEATURE_COUNT = VIRTUAL_TYPED_ELEMENT_FEATURE_COUNT + 1;

+

+	/**

+	 * The number of operations of the '<em>Virtual Operation</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_OPERATION_OPERATION_COUNT = VIRTUAL_TYPED_ELEMENT_OPERATION_COUNT + 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualParameterImpl <em>Virtual Parameter</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualParameterImpl

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl#getVirtualParameter()

+	 * @generated

+	 */

+	int VIRTUAL_PARAMETER = 6;

+

+	/**

+	 * The feature id for the '<em><b>Alias Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_PARAMETER__ALIAS_NAME = VIRTUAL_TYPED_ELEMENT__ALIAS_NAME;

+

+	/**

+	 * The feature id for the '<em><b>Kept</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_PARAMETER__KEPT = VIRTUAL_TYPED_ELEMENT__KEPT;

+

+	/**

+	 * The feature id for the '<em><b>Represented Element</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_PARAMETER__REPRESENTED_ELEMENT = VIRTUAL_TYPED_ELEMENT__REPRESENTED_ELEMENT;

+

+	/**

+	 * The feature id for the '<em><b>Use Represented</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_PARAMETER__USE_REPRESENTED = VIRTUAL_TYPED_ELEMENT__USE_REPRESENTED;

+

+	/**

+	 * The feature id for the '<em><b>Lower</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_PARAMETER__LOWER = VIRTUAL_TYPED_ELEMENT__LOWER;

+

+	/**

+	 * The feature id for the '<em><b>Upper</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_PARAMETER__UPPER = VIRTUAL_TYPED_ELEMENT__UPPER;

+

+	/**

+	 * The feature id for the '<em><b>Type</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_PARAMETER__TYPE = VIRTUAL_TYPED_ELEMENT__TYPE;

+

+	/**

+	 * The number of structural features of the '<em>Virtual Parameter</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_PARAMETER_FEATURE_COUNT = VIRTUAL_TYPED_ELEMENT_FEATURE_COUNT + 0;

+

+	/**

+	 * The number of operations of the '<em>Virtual Parameter</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_PARAMETER_OPERATION_COUNT = VIRTUAL_TYPED_ELEMENT_OPERATION_COUNT + 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualDatatypeImpl <em>Virtual Datatype</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualDatatypeImpl

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl#getVirtualDatatype()

+	 * @generated

+	 */

+	int VIRTUAL_DATATYPE = 7;

+

+	/**

+	 * The feature id for the '<em><b>Alias Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_DATATYPE__ALIAS_NAME = VIRTUAL_CLASSIFIER__ALIAS_NAME;

+

+	/**

+	 * The feature id for the '<em><b>Kept</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_DATATYPE__KEPT = VIRTUAL_CLASSIFIER__KEPT;

+

+	/**

+	 * The feature id for the '<em><b>Represented Element</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_DATATYPE__REPRESENTED_ELEMENT = VIRTUAL_CLASSIFIER__REPRESENTED_ELEMENT;

+

+	/**

+	 * The feature id for the '<em><b>Use Represented</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_DATATYPE__USE_REPRESENTED = VIRTUAL_CLASSIFIER__USE_REPRESENTED;

+

+	/**

+	 * The feature id for the '<em><b>Metamodel</b></em>' container reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_DATATYPE__METAMODEL = VIRTUAL_CLASSIFIER__METAMODEL;

+

+	/**

+	 * The number of structural features of the '<em>Virtual Datatype</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_DATATYPE_FEATURE_COUNT = VIRTUAL_CLASSIFIER_FEATURE_COUNT + 0;

+

+	/**

+	 * The number of operations of the '<em>Virtual Datatype</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_DATATYPE_OPERATION_COUNT = VIRTUAL_CLASSIFIER_OPERATION_COUNT + 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualEnumImpl <em>Virtual Enum</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualEnumImpl

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl#getVirtualEnum()

+	 * @generated

+	 */

+	int VIRTUAL_ENUM = 8;

+

+	/**

+	 * The feature id for the '<em><b>Alias Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_ENUM__ALIAS_NAME = VIRTUAL_CLASSIFIER__ALIAS_NAME;

+

+	/**

+	 * The feature id for the '<em><b>Kept</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_ENUM__KEPT = VIRTUAL_CLASSIFIER__KEPT;

+

+	/**

+	 * The feature id for the '<em><b>Represented Element</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_ENUM__REPRESENTED_ELEMENT = VIRTUAL_CLASSIFIER__REPRESENTED_ELEMENT;

+

+	/**

+	 * The feature id for the '<em><b>Use Represented</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_ENUM__USE_REPRESENTED = VIRTUAL_CLASSIFIER__USE_REPRESENTED;

+

+	/**

+	 * The feature id for the '<em><b>Metamodel</b></em>' container reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_ENUM__METAMODEL = VIRTUAL_CLASSIFIER__METAMODEL;

+

+	/**

+	 * The feature id for the '<em><b>Literals</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_ENUM__LITERALS = VIRTUAL_CLASSIFIER_FEATURE_COUNT + 0;

+

+	/**

+	 * The number of structural features of the '<em>Virtual Enum</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_ENUM_FEATURE_COUNT = VIRTUAL_CLASSIFIER_FEATURE_COUNT + 1;

+

+	/**

+	 * The number of operations of the '<em>Virtual Enum</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_ENUM_OPERATION_COUNT = VIRTUAL_CLASSIFIER_OPERATION_COUNT + 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualLiteralImpl <em>Virtual Literal</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualLiteralImpl

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl#getVirtualLiteral()

+	 * @generated

+	 */

+	int VIRTUAL_LITERAL = 9;

+

+	/**

+	 * The feature id for the '<em><b>Alias Name</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_LITERAL__ALIAS_NAME = VIRTUAL_ELEMENT__ALIAS_NAME;

+

+	/**

+	 * The feature id for the '<em><b>Kept</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_LITERAL__KEPT = VIRTUAL_ELEMENT__KEPT;

+

+	/**

+	 * The feature id for the '<em><b>Represented Element</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_LITERAL__REPRESENTED_ELEMENT = VIRTUAL_ELEMENT__REPRESENTED_ELEMENT;

+

+	/**

+	 * The feature id for the '<em><b>Use Represented</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_LITERAL__USE_REPRESENTED = VIRTUAL_ELEMENT__USE_REPRESENTED;

+

+	/**

+	 * The number of structural features of the '<em>Virtual Literal</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_LITERAL_FEATURE_COUNT = VIRTUAL_ELEMENT_FEATURE_COUNT + 0;

+

+	/**

+	 * The number of operations of the '<em>Virtual Literal</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int VIRTUAL_LITERAL_OPERATION_COUNT = VIRTUAL_ELEMENT_OPERATION_COUNT + 0;

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel <em>Virtual Metamodel</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>Virtual Metamodel</em>'.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel

+	 * @generated

+	 */

+	EClass getVirtualMetamodel();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel#getName <em>Name</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Name</em>'.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel#getName()

+	 * @see #getVirtualMetamodel()

+	 * @generated

+	 */

+	EAttribute getVirtualMetamodel_Name();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel#getNsPrefix <em>Ns Prefix</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Ns Prefix</em>'.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel#getNsPrefix()

+	 * @see #getVirtualMetamodel()

+	 * @generated

+	 */

+	EAttribute getVirtualMetamodel_NsPrefix();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel#getNsURI <em>Ns URI</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Ns URI</em>'.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel#getNsURI()

+	 * @see #getVirtualMetamodel()

+	 * @generated

+	 */

+	EAttribute getVirtualMetamodel_NsURI();

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel#getVirtualClassifiers <em>Virtual Classifiers</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference list '<em>Virtual Classifiers</em>'.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel#getVirtualClassifiers()

+	 * @see #getVirtualMetamodel()

+	 * @generated

+	 */

+	EReference getVirtualMetamodel_VirtualClassifiers();

+

+	/**

+	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel#getFacade <em>Facade</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the container reference '<em>Facade</em>'.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel#getFacade()

+	 * @see #getVirtualMetamodel()

+	 * @generated

+	 */

+	EReference getVirtualMetamodel_Facade();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement <em>Virtual Element</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>Virtual Element</em>'.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement

+	 * @generated

+	 */

+	EClass getVirtualElement();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement#getAliasName <em>Alias Name</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Alias Name</em>'.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement#getAliasName()

+	 * @see #getVirtualElement()

+	 * @generated

+	 */

+	EAttribute getVirtualElement_AliasName();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement#isKept <em>Kept</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Kept</em>'.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement#isKept()

+	 * @see #getVirtualElement()

+	 * @generated

+	 */

+	EAttribute getVirtualElement_Kept();

+

+	/**

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement#getRepresentedElement <em>Represented Element</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the reference '<em>Represented Element</em>'.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement#getRepresentedElement()

+	 * @see #getVirtualElement()

+	 * @generated

+	 */

+	EReference getVirtualElement_RepresentedElement();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement#isUseRepresented <em>Use Represented</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Use Represented</em>'.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement#isUseRepresented()

+	 * @see #getVirtualElement()

+	 * @generated

+	 */

+	EAttribute getVirtualElement_UseRepresented();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier <em>Virtual Classifier</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>Virtual Classifier</em>'.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier

+	 * @generated

+	 */

+	EClass getVirtualClassifier();

+

+	/**

+	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier#getMetamodel <em>Metamodel</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the container reference '<em>Metamodel</em>'.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier#getMetamodel()

+	 * @see #getVirtualClassifier()

+	 * @generated

+	 */

+	EReference getVirtualClassifier_Metamodel();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass <em>Virtual Metaclass</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>Virtual Metaclass</em>'.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass

+	 * @generated

+	 */

+	EClass getVirtualMetaclass();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass#isAbstract <em>Abstract</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Abstract</em>'.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass#isAbstract()

+	 * @see #getVirtualMetaclass()

+	 * @generated

+	 */

+	EAttribute getVirtualMetaclass_Abstract();

+

+	/**

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass#getAppliedStereotypes <em>Applied Stereotypes</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the reference list '<em>Applied Stereotypes</em>'.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass#getAppliedStereotypes()

+	 * @see #getVirtualMetaclass()

+	 * @generated

+	 */

+	EReference getVirtualMetaclass_AppliedStereotypes();

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass#getOperations <em>Operations</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference list '<em>Operations</em>'.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass#getOperations()

+	 * @see #getVirtualMetaclass()

+	 * @generated

+	 */

+	EReference getVirtualMetaclass_Operations();

+

+	/**

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass#getParents <em>Parents</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the reference list '<em>Parents</em>'.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass#getParents()

+	 * @see #getVirtualMetaclass()

+	 * @generated

+	 */

+	EReference getVirtualMetaclass_Parents();

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass#getProperties <em>Properties</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference list '<em>Properties</em>'.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass#getProperties()

+	 * @see #getVirtualMetaclass()

+	 * @generated

+	 */

+	EReference getVirtualMetaclass_Properties();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass#isStereotypeInterface <em>Stereotype Interface</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Stereotype Interface</em>'.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass#isStereotypeInterface()

+	 * @see #getVirtualMetaclass()

+	 * @generated

+	 */

+	EAttribute getVirtualMetaclass_StereotypeInterface();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty <em>Virtual Property</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>Virtual Property</em>'.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty

+	 * @generated

+	 */

+	EClass getVirtualProperty();

+

+	/**

+	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty#getVirtualMetaclass <em>Virtual Metaclass</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the container reference '<em>Virtual Metaclass</em>'.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty#getVirtualMetaclass()

+	 * @see #getVirtualProperty()

+	 * @generated

+	 */

+	EReference getVirtualProperty_VirtualMetaclass();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualOperation <em>Virtual Operation</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>Virtual Operation</em>'.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualOperation

+	 * @generated

+	 */

+	EClass getVirtualOperation();

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualOperation#getParameters <em>Parameters</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference list '<em>Parameters</em>'.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualOperation#getParameters()

+	 * @see #getVirtualOperation()

+	 * @generated

+	 */

+	EReference getVirtualOperation_Parameters();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualParameter <em>Virtual Parameter</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>Virtual Parameter</em>'.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualParameter

+	 * @generated

+	 */

+	EClass getVirtualParameter();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualDatatype <em>Virtual Datatype</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>Virtual Datatype</em>'.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualDatatype

+	 * @generated

+	 */

+	EClass getVirtualDatatype();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualEnum <em>Virtual Enum</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>Virtual Enum</em>'.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualEnum

+	 * @generated

+	 */

+	EClass getVirtualEnum();

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualEnum#getLiterals <em>Literals</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference list '<em>Literals</em>'.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualEnum#getLiterals()

+	 * @see #getVirtualEnum()

+	 * @generated

+	 */

+	EReference getVirtualEnum_Literals();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualLiteral <em>Virtual Literal</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>Virtual Literal</em>'.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualLiteral

+	 * @generated

+	 */

+	EClass getVirtualLiteral();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement <em>Virtual Typed Element</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>Virtual Typed Element</em>'.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement

+	 * @generated

+	 */

+	EClass getVirtualTypedElement();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement#getLower <em>Lower</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Lower</em>'.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement#getLower()

+	 * @see #getVirtualTypedElement()

+	 * @generated

+	 */

+	EAttribute getVirtualTypedElement_Lower();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement#getUpper <em>Upper</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Upper</em>'.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement#getUpper()

+	 * @see #getVirtualTypedElement()

+	 * @generated

+	 */

+	EAttribute getVirtualTypedElement_Upper();

+

+	/**

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement#getType <em>Type</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the reference '<em>Type</em>'.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement#getType()

+	 * @see #getVirtualTypedElement()

+	 * @generated

+	 */

+	EReference getVirtualTypedElement_Type();

+

+	/**

+	 * Returns the factory that creates the instances of the model.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the factory that creates the instances of the model.

+	 * @generated

+	 */

+	VirtualmetamodelFactory getVirtualmetamodelFactory();

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * Defines literals for the meta objects that represent

+	 * <ul>

+	 *   <li>each class,</li>

+	 *   <li>each feature of each class,</li>

+	 *   <li>each operation of each class,</li>

+	 *   <li>each enum,</li>

+	 *   <li>and each data type</li>

+	 * </ul>

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	interface Literals {

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualMetamodelImpl <em>Virtual Metamodel</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualMetamodelImpl

+		 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl#getVirtualMetamodel()

+		 * @generated

+		 */

+		EClass VIRTUAL_METAMODEL = eINSTANCE.getVirtualMetamodel();

+

+		/**

+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EAttribute VIRTUAL_METAMODEL__NAME = eINSTANCE.getVirtualMetamodel_Name();

+

+		/**

+		 * The meta object literal for the '<em><b>Ns Prefix</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EAttribute VIRTUAL_METAMODEL__NS_PREFIX = eINSTANCE.getVirtualMetamodel_NsPrefix();

+

+		/**

+		 * The meta object literal for the '<em><b>Ns URI</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EAttribute VIRTUAL_METAMODEL__NS_URI = eINSTANCE.getVirtualMetamodel_NsURI();

+

+		/**

+		 * The meta object literal for the '<em><b>Virtual Classifiers</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EReference VIRTUAL_METAMODEL__VIRTUAL_CLASSIFIERS = eINSTANCE.getVirtualMetamodel_VirtualClassifiers();

+

+		/**

+		 * The meta object literal for the '<em><b>Facade</b></em>' container reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EReference VIRTUAL_METAMODEL__FACADE = eINSTANCE.getVirtualMetamodel_Facade();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualElementImpl <em>Virtual Element</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualElementImpl

+		 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl#getVirtualElement()

+		 * @generated

+		 */

+		EClass VIRTUAL_ELEMENT = eINSTANCE.getVirtualElement();

+

+		/**

+		 * The meta object literal for the '<em><b>Alias Name</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EAttribute VIRTUAL_ELEMENT__ALIAS_NAME = eINSTANCE.getVirtualElement_AliasName();

+

+		/**

+		 * The meta object literal for the '<em><b>Kept</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EAttribute VIRTUAL_ELEMENT__KEPT = eINSTANCE.getVirtualElement_Kept();

+

+		/**

+		 * The meta object literal for the '<em><b>Represented Element</b></em>' reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EReference VIRTUAL_ELEMENT__REPRESENTED_ELEMENT = eINSTANCE.getVirtualElement_RepresentedElement();

+

+		/**

+		 * The meta object literal for the '<em><b>Use Represented</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EAttribute VIRTUAL_ELEMENT__USE_REPRESENTED = eINSTANCE.getVirtualElement_UseRepresented();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualClassifierImpl <em>Virtual Classifier</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualClassifierImpl

+		 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl#getVirtualClassifier()

+		 * @generated

+		 */

+		EClass VIRTUAL_CLASSIFIER = eINSTANCE.getVirtualClassifier();

+

+		/**

+		 * The meta object literal for the '<em><b>Metamodel</b></em>' container reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EReference VIRTUAL_CLASSIFIER__METAMODEL = eINSTANCE.getVirtualClassifier_Metamodel();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualMetaclassImpl <em>Virtual Metaclass</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualMetaclassImpl

+		 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl#getVirtualMetaclass()

+		 * @generated

+		 */

+		EClass VIRTUAL_METACLASS = eINSTANCE.getVirtualMetaclass();

+

+		/**

+		 * The meta object literal for the '<em><b>Abstract</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EAttribute VIRTUAL_METACLASS__ABSTRACT = eINSTANCE.getVirtualMetaclass_Abstract();

+

+		/**

+		 * The meta object literal for the '<em><b>Applied Stereotypes</b></em>' reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EReference VIRTUAL_METACLASS__APPLIED_STEREOTYPES = eINSTANCE.getVirtualMetaclass_AppliedStereotypes();

+

+		/**

+		 * The meta object literal for the '<em><b>Operations</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EReference VIRTUAL_METACLASS__OPERATIONS = eINSTANCE.getVirtualMetaclass_Operations();

+

+		/**

+		 * The meta object literal for the '<em><b>Parents</b></em>' reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EReference VIRTUAL_METACLASS__PARENTS = eINSTANCE.getVirtualMetaclass_Parents();

+

+		/**

+		 * The meta object literal for the '<em><b>Properties</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EReference VIRTUAL_METACLASS__PROPERTIES = eINSTANCE.getVirtualMetaclass_Properties();

+

+		/**

+		 * The meta object literal for the '<em><b>Stereotype Interface</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EAttribute VIRTUAL_METACLASS__STEREOTYPE_INTERFACE = eINSTANCE.getVirtualMetaclass_StereotypeInterface();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualPropertyImpl <em>Virtual Property</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualPropertyImpl

+		 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl#getVirtualProperty()

+		 * @generated

+		 */

+		EClass VIRTUAL_PROPERTY = eINSTANCE.getVirtualProperty();

+

+		/**

+		 * The meta object literal for the '<em><b>Virtual Metaclass</b></em>' container reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EReference VIRTUAL_PROPERTY__VIRTUAL_METACLASS = eINSTANCE.getVirtualProperty_VirtualMetaclass();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualOperationImpl <em>Virtual Operation</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualOperationImpl

+		 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl#getVirtualOperation()

+		 * @generated

+		 */

+		EClass VIRTUAL_OPERATION = eINSTANCE.getVirtualOperation();

+

+		/**

+		 * The meta object literal for the '<em><b>Parameters</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EReference VIRTUAL_OPERATION__PARAMETERS = eINSTANCE.getVirtualOperation_Parameters();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualParameterImpl <em>Virtual Parameter</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualParameterImpl

+		 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl#getVirtualParameter()

+		 * @generated

+		 */

+		EClass VIRTUAL_PARAMETER = eINSTANCE.getVirtualParameter();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualDatatypeImpl <em>Virtual Datatype</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualDatatypeImpl

+		 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl#getVirtualDatatype()

+		 * @generated

+		 */

+		EClass VIRTUAL_DATATYPE = eINSTANCE.getVirtualDatatype();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualEnumImpl <em>Virtual Enum</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualEnumImpl

+		 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl#getVirtualEnum()

+		 * @generated

+		 */

+		EClass VIRTUAL_ENUM = eINSTANCE.getVirtualEnum();

+

+		/**

+		 * The meta object literal for the '<em><b>Literals</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EReference VIRTUAL_ENUM__LITERALS = eINSTANCE.getVirtualEnum_Literals();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualLiteralImpl <em>Virtual Literal</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualLiteralImpl

+		 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl#getVirtualLiteral()

+		 * @generated

+		 */

+		EClass VIRTUAL_LITERAL = eINSTANCE.getVirtualLiteral();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualTypedElementImpl <em>Virtual Typed Element</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualTypedElementImpl

+		 * @see org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualmetamodelPackageImpl#getVirtualTypedElement()

+		 * @generated

+		 */

+		EClass VIRTUAL_TYPED_ELEMENT = eINSTANCE.getVirtualTypedElement();

+

+		/**

+		 * The meta object literal for the '<em><b>Lower</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EAttribute VIRTUAL_TYPED_ELEMENT__LOWER = eINSTANCE.getVirtualTypedElement_Lower();

+

+		/**

+		 * The meta object literal for the '<em><b>Upper</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EAttribute VIRTUAL_TYPED_ELEMENT__UPPER = eINSTANCE.getVirtualTypedElement_Upper();

+

+		/**

+		 * The meta object literal for the '<em><b>Type</b></em>' reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EReference VIRTUAL_TYPED_ELEMENT__TYPE = eINSTANCE.getVirtualTypedElement_Type();

+

+	}

+

+} //VirtualmetamodelPackage

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualClassifierImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualClassifierImpl.java
new file mode 100644
index 00000000000..dbf1fba6541
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualClassifierImpl.java
@@ -0,0 +1,206 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.virtualmetamodel.impl;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.notify.NotificationChain;

+

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.InternalEObject;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+

+import org.eclipse.emf.ecore.util.EcoreUtil;

+

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Virtual Classifier</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ *   <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualClassifierImpl#getMetamodel <em>Metamodel</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @generated

+ */

+public abstract class VirtualClassifierImpl extends VirtualElementImpl implements VirtualClassifier {

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected VirtualClassifierImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return VirtualmetamodelPackage.Literals.VIRTUAL_CLASSIFIER;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public VirtualMetamodel getMetamodel() {

+		if (eContainerFeatureID() != VirtualmetamodelPackage.VIRTUAL_CLASSIFIER__METAMODEL) return null;

+		return (VirtualMetamodel)eInternalContainer();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public NotificationChain basicSetMetamodel(VirtualMetamodel newMetamodel, NotificationChain msgs) {

+		msgs = eBasicSetContainer((InternalEObject)newMetamodel, VirtualmetamodelPackage.VIRTUAL_CLASSIFIER__METAMODEL, msgs);

+		return msgs;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setMetamodel(VirtualMetamodel newMetamodel) {

+		if (newMetamodel != eInternalContainer() || (eContainerFeatureID() != VirtualmetamodelPackage.VIRTUAL_CLASSIFIER__METAMODEL && newMetamodel != null)) {

+			if (EcoreUtil.isAncestor(this, newMetamodel))

+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());

+			NotificationChain msgs = null;

+			if (eInternalContainer() != null)

+				msgs = eBasicRemoveFromContainer(msgs);

+			if (newMetamodel != null)

+				msgs = ((InternalEObject)newMetamodel).eInverseAdd(this, VirtualmetamodelPackage.VIRTUAL_METAMODEL__VIRTUAL_CLASSIFIERS, VirtualMetamodel.class, msgs);

+			msgs = basicSetMetamodel(newMetamodel, msgs);

+			if (msgs != null) msgs.dispatch();

+		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, VirtualmetamodelPackage.VIRTUAL_CLASSIFIER__METAMODEL, newMetamodel, newMetamodel));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

+		switch (featureID) {

+			case VirtualmetamodelPackage.VIRTUAL_CLASSIFIER__METAMODEL:

+				if (eInternalContainer() != null)

+					msgs = eBasicRemoveFromContainer(msgs);

+				return basicSetMetamodel((VirtualMetamodel)otherEnd, msgs);

+		}

+		return super.eInverseAdd(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

+		switch (featureID) {

+			case VirtualmetamodelPackage.VIRTUAL_CLASSIFIER__METAMODEL:

+				return basicSetMetamodel(null, msgs);

+		}

+		return super.eInverseRemove(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {

+		switch (eContainerFeatureID()) {

+			case VirtualmetamodelPackage.VIRTUAL_CLASSIFIER__METAMODEL:

+				return eInternalContainer().eInverseRemove(this, VirtualmetamodelPackage.VIRTUAL_METAMODEL__VIRTUAL_CLASSIFIERS, VirtualMetamodel.class, msgs);

+		}

+		return super.eBasicRemoveFromContainerFeature(msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch (featureID) {

+			case VirtualmetamodelPackage.VIRTUAL_CLASSIFIER__METAMODEL:

+				return getMetamodel();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch (featureID) {

+			case VirtualmetamodelPackage.VIRTUAL_CLASSIFIER__METAMODEL:

+				setMetamodel((VirtualMetamodel)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch (featureID) {

+			case VirtualmetamodelPackage.VIRTUAL_CLASSIFIER__METAMODEL:

+				setMetamodel((VirtualMetamodel)null);

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch (featureID) {

+			case VirtualmetamodelPackage.VIRTUAL_CLASSIFIER__METAMODEL:

+				return getMetamodel() != null;

+		}

+		return super.eIsSet(featureID);

+	}

+

+} //VirtualClassifierImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualDatatypeImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualDatatypeImpl.java
new file mode 100644
index 00000000000..5fbe8c5b0a0
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualDatatypeImpl.java
@@ -0,0 +1,50 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.virtualmetamodel.impl;

+

+import org.eclipse.emf.ecore.EClass;

+

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualDatatype;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Virtual Datatype</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * </p>

+ *

+ * @generated

+ */

+public class VirtualDatatypeImpl extends VirtualClassifierImpl implements VirtualDatatype {

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected VirtualDatatypeImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return VirtualmetamodelPackage.Literals.VIRTUAL_DATATYPE;

+	}

+

+} //VirtualDatatypeImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualElementImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualElementImpl.java
new file mode 100644
index 00000000000..5b4f901d543
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualElementImpl.java
@@ -0,0 +1,344 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.virtualmetamodel.impl;

+

+import org.eclipse.emf.common.notify.Notification;

+

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.InternalEObject;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Virtual Element</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ *   <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualElementImpl#getAliasName <em>Alias Name</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualElementImpl#isKept <em>Kept</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualElementImpl#getRepresentedElement <em>Represented Element</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualElementImpl#isUseRepresented <em>Use Represented</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @generated

+ */

+public abstract class VirtualElementImpl extends MinimalEObjectImpl.Container implements VirtualElement {

+	/**

+	 * The default value of the '{@link #getAliasName() <em>Alias Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getAliasName()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String ALIAS_NAME_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getAliasName() <em>Alias Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getAliasName()

+	 * @generated

+	 * @ordered

+	 */

+	protected String aliasName = ALIAS_NAME_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #isKept() <em>Kept</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isKept()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean KEPT_EDEFAULT = false;

+

+	/**

+	 * The cached value of the '{@link #isKept() <em>Kept</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isKept()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean kept = KEPT_EDEFAULT;

+

+	/**

+	 * The cached value of the '{@link #getRepresentedElement() <em>Represented Element</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getRepresentedElement()

+	 * @generated

+	 * @ordered

+	 */

+	protected EObject representedElement;

+

+	/**

+	 * The default value of the '{@link #isUseRepresented() <em>Use Represented</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isUseRepresented()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean USE_REPRESENTED_EDEFAULT = false;

+

+	/**

+	 * The cached value of the '{@link #isUseRepresented() <em>Use Represented</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isUseRepresented()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean useRepresented = USE_REPRESENTED_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected VirtualElementImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return VirtualmetamodelPackage.Literals.VIRTUAL_ELEMENT;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public String getAliasName() {

+		return aliasName;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setAliasName(String newAliasName) {

+		String oldAliasName = aliasName;

+		aliasName = newAliasName;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, VirtualmetamodelPackage.VIRTUAL_ELEMENT__ALIAS_NAME, oldAliasName, aliasName));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean isKept() {

+		return kept;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setKept(boolean newKept) {

+		boolean oldKept = kept;

+		kept = newKept;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, VirtualmetamodelPackage.VIRTUAL_ELEMENT__KEPT, oldKept, kept));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EObject getRepresentedElement() {

+		if (representedElement != null && representedElement.eIsProxy()) {

+			InternalEObject oldRepresentedElement = (InternalEObject)representedElement;

+			representedElement = eResolveProxy(oldRepresentedElement);

+			if (representedElement != oldRepresentedElement) {

+				if (eNotificationRequired())

+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, VirtualmetamodelPackage.VIRTUAL_ELEMENT__REPRESENTED_ELEMENT, oldRepresentedElement, representedElement));

+			}

+		}

+		return representedElement;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EObject basicGetRepresentedElement() {

+		return representedElement;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setRepresentedElement(EObject newRepresentedElement) {

+		EObject oldRepresentedElement = representedElement;

+		representedElement = newRepresentedElement;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, VirtualmetamodelPackage.VIRTUAL_ELEMENT__REPRESENTED_ELEMENT, oldRepresentedElement, representedElement));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean isUseRepresented() {

+		return useRepresented;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setUseRepresented(boolean newUseRepresented) {

+		boolean oldUseRepresented = useRepresented;

+		useRepresented = newUseRepresented;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, VirtualmetamodelPackage.VIRTUAL_ELEMENT__USE_REPRESENTED, oldUseRepresented, useRepresented));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch (featureID) {

+			case VirtualmetamodelPackage.VIRTUAL_ELEMENT__ALIAS_NAME:

+				return getAliasName();

+			case VirtualmetamodelPackage.VIRTUAL_ELEMENT__KEPT:

+				return isKept();

+			case VirtualmetamodelPackage.VIRTUAL_ELEMENT__REPRESENTED_ELEMENT:

+				if (resolve) return getRepresentedElement();

+				return basicGetRepresentedElement();

+			case VirtualmetamodelPackage.VIRTUAL_ELEMENT__USE_REPRESENTED:

+				return isUseRepresented();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch (featureID) {

+			case VirtualmetamodelPackage.VIRTUAL_ELEMENT__ALIAS_NAME:

+				setAliasName((String)newValue);

+				return;

+			case VirtualmetamodelPackage.VIRTUAL_ELEMENT__KEPT:

+				setKept((Boolean)newValue);

+				return;

+			case VirtualmetamodelPackage.VIRTUAL_ELEMENT__REPRESENTED_ELEMENT:

+				setRepresentedElement((EObject)newValue);

+				return;

+			case VirtualmetamodelPackage.VIRTUAL_ELEMENT__USE_REPRESENTED:

+				setUseRepresented((Boolean)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch (featureID) {

+			case VirtualmetamodelPackage.VIRTUAL_ELEMENT__ALIAS_NAME:

+				setAliasName(ALIAS_NAME_EDEFAULT);

+				return;

+			case VirtualmetamodelPackage.VIRTUAL_ELEMENT__KEPT:

+				setKept(KEPT_EDEFAULT);

+				return;

+			case VirtualmetamodelPackage.VIRTUAL_ELEMENT__REPRESENTED_ELEMENT:

+				setRepresentedElement((EObject)null);

+				return;

+			case VirtualmetamodelPackage.VIRTUAL_ELEMENT__USE_REPRESENTED:

+				setUseRepresented(USE_REPRESENTED_EDEFAULT);

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch (featureID) {

+			case VirtualmetamodelPackage.VIRTUAL_ELEMENT__ALIAS_NAME:

+				return ALIAS_NAME_EDEFAULT == null ? aliasName != null : !ALIAS_NAME_EDEFAULT.equals(aliasName);

+			case VirtualmetamodelPackage.VIRTUAL_ELEMENT__KEPT:

+				return kept != KEPT_EDEFAULT;

+			case VirtualmetamodelPackage.VIRTUAL_ELEMENT__REPRESENTED_ELEMENT:

+				return representedElement != null;

+			case VirtualmetamodelPackage.VIRTUAL_ELEMENT__USE_REPRESENTED:

+				return useRepresented != USE_REPRESENTED_EDEFAULT;

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String toString() {

+		if (eIsProxy()) return super.toString();

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (aliasName: ");

+		result.append(aliasName);

+		result.append(", kept: ");

+		result.append(kept);

+		result.append(", useRepresented: ");

+		result.append(useRepresented);

+		result.append(')');

+		return result.toString();

+	}

+

+} //VirtualElementImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualEnumImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualEnumImpl.java
new file mode 100644
index 00000000000..a86508fc03d
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualEnumImpl.java
@@ -0,0 +1,161 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.virtualmetamodel.impl;

+

+import java.util.Collection;

+

+import org.eclipse.emf.common.notify.NotificationChain;

+

+import org.eclipse.emf.common.util.EList;

+

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.InternalEObject;

+

+import org.eclipse.emf.ecore.util.EObjectContainmentEList;

+import org.eclipse.emf.ecore.util.InternalEList;

+

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualEnum;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualLiteral;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Virtual Enum</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ *   <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualEnumImpl#getLiterals <em>Literals</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @generated

+ */

+public class VirtualEnumImpl extends VirtualClassifierImpl implements VirtualEnum {

+	/**

+	 * The cached value of the '{@link #getLiterals() <em>Literals</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getLiterals()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<VirtualLiteral> literals;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected VirtualEnumImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return VirtualmetamodelPackage.Literals.VIRTUAL_ENUM;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EList<VirtualLiteral> getLiterals() {

+		if (literals == null) {

+			literals = new EObjectContainmentEList<VirtualLiteral>(VirtualLiteral.class, this, VirtualmetamodelPackage.VIRTUAL_ENUM__LITERALS);

+		}

+		return literals;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

+		switch (featureID) {

+			case VirtualmetamodelPackage.VIRTUAL_ENUM__LITERALS:

+				return ((InternalEList<?>)getLiterals()).basicRemove(otherEnd, msgs);

+		}

+		return super.eInverseRemove(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch (featureID) {

+			case VirtualmetamodelPackage.VIRTUAL_ENUM__LITERALS:

+				return getLiterals();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch (featureID) {

+			case VirtualmetamodelPackage.VIRTUAL_ENUM__LITERALS:

+				getLiterals().clear();

+				getLiterals().addAll((Collection<? extends VirtualLiteral>)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch (featureID) {

+			case VirtualmetamodelPackage.VIRTUAL_ENUM__LITERALS:

+				getLiterals().clear();

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch (featureID) {

+			case VirtualmetamodelPackage.VIRTUAL_ENUM__LITERALS:

+				return literals != null && !literals.isEmpty();

+		}

+		return super.eIsSet(featureID);

+	}

+

+} //VirtualEnumImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualLiteralImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualLiteralImpl.java
new file mode 100644
index 00000000000..64d6ba11a07
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualLiteralImpl.java
@@ -0,0 +1,50 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.virtualmetamodel.impl;

+

+import org.eclipse.emf.ecore.EClass;

+

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualLiteral;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Virtual Literal</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * </p>

+ *

+ * @generated

+ */

+public class VirtualLiteralImpl extends VirtualElementImpl implements VirtualLiteral {

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected VirtualLiteralImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return VirtualmetamodelPackage.Literals.VIRTUAL_LITERAL;

+	}

+

+} //VirtualLiteralImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualMetaclassImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualMetaclassImpl.java
new file mode 100644
index 00000000000..0c335a03307
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualMetaclassImpl.java
@@ -0,0 +1,410 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.virtualmetamodel.impl;

+

+import java.util.Collection;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.notify.NotificationChain;

+

+import org.eclipse.emf.common.util.EList;

+

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.InternalEObject;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+

+import org.eclipse.emf.ecore.util.EObjectContainmentEList;

+import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;

+import org.eclipse.emf.ecore.util.EObjectResolvingEList;

+import org.eclipse.emf.ecore.util.InternalEList;

+

+import org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass;

+

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualOperation;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Virtual Metaclass</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ *   <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualMetaclassImpl#isAbstract <em>Abstract</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualMetaclassImpl#getAppliedStereotypes <em>Applied Stereotypes</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualMetaclassImpl#getOperations <em>Operations</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualMetaclassImpl#getParents <em>Parents</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualMetaclassImpl#getProperties <em>Properties</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualMetaclassImpl#isStereotypeInterface <em>Stereotype Interface</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @generated

+ */

+public class VirtualMetaclassImpl extends VirtualClassifierImpl implements VirtualMetaclass {

+	/**

+	 * The default value of the '{@link #isAbstract() <em>Abstract</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isAbstract()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean ABSTRACT_EDEFAULT = false;

+

+	/**

+	 * The cached value of the '{@link #isAbstract() <em>Abstract</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isAbstract()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean abstract_ = ABSTRACT_EDEFAULT;

+

+	/**

+	 * The cached value of the '{@link #getAppliedStereotypes() <em>Applied Stereotypes</em>}' reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getAppliedStereotypes()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<BaseMetaclass> appliedStereotypes;

+

+	/**

+	 * The cached value of the '{@link #getOperations() <em>Operations</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getOperations()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<VirtualOperation> operations;

+

+	/**

+	 * The cached value of the '{@link #getParents() <em>Parents</em>}' reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getParents()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<VirtualMetaclass> parents;

+

+	/**

+	 * The cached value of the '{@link #getProperties() <em>Properties</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getProperties()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<VirtualProperty> properties;

+

+	/**

+	 * The default value of the '{@link #isStereotypeInterface() <em>Stereotype Interface</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isStereotypeInterface()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean STEREOTYPE_INTERFACE_EDEFAULT = false;

+

+	/**

+	 * The cached value of the '{@link #isStereotypeInterface() <em>Stereotype Interface</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isStereotypeInterface()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean stereotypeInterface = STEREOTYPE_INTERFACE_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected VirtualMetaclassImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return VirtualmetamodelPackage.Literals.VIRTUAL_METACLASS;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean isAbstract() {

+		return abstract_;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setAbstract(boolean newAbstract) {

+		boolean oldAbstract = abstract_;

+		abstract_ = newAbstract;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, VirtualmetamodelPackage.VIRTUAL_METACLASS__ABSTRACT, oldAbstract, abstract_));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EList<BaseMetaclass> getAppliedStereotypes() {

+		if (appliedStereotypes == null) {

+			appliedStereotypes = new EObjectResolvingEList<BaseMetaclass>(BaseMetaclass.class, this, VirtualmetamodelPackage.VIRTUAL_METACLASS__APPLIED_STEREOTYPES);

+		}

+		return appliedStereotypes;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EList<VirtualOperation> getOperations() {

+		if (operations == null) {

+			operations = new EObjectContainmentEList<VirtualOperation>(VirtualOperation.class, this, VirtualmetamodelPackage.VIRTUAL_METACLASS__OPERATIONS);

+		}

+		return operations;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EList<VirtualMetaclass> getParents() {

+		if (parents == null) {

+			parents = new EObjectResolvingEList<VirtualMetaclass>(VirtualMetaclass.class, this, VirtualmetamodelPackage.VIRTUAL_METACLASS__PARENTS);

+		}

+		return parents;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EList<VirtualProperty> getProperties() {

+		if (properties == null) {

+			properties = new EObjectContainmentWithInverseEList<VirtualProperty>(VirtualProperty.class, this, VirtualmetamodelPackage.VIRTUAL_METACLASS__PROPERTIES, VirtualmetamodelPackage.VIRTUAL_PROPERTY__VIRTUAL_METACLASS);

+		}

+		return properties;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean isStereotypeInterface() {

+		return stereotypeInterface;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setStereotypeInterface(boolean newStereotypeInterface) {

+		boolean oldStereotypeInterface = stereotypeInterface;

+		stereotypeInterface = newStereotypeInterface;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, VirtualmetamodelPackage.VIRTUAL_METACLASS__STEREOTYPE_INTERFACE, oldStereotypeInterface, stereotypeInterface));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

+		switch (featureID) {

+			case VirtualmetamodelPackage.VIRTUAL_METACLASS__PROPERTIES:

+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getProperties()).basicAdd(otherEnd, msgs);

+		}

+		return super.eInverseAdd(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

+		switch (featureID) {

+			case VirtualmetamodelPackage.VIRTUAL_METACLASS__OPERATIONS:

+				return ((InternalEList<?>)getOperations()).basicRemove(otherEnd, msgs);

+			case VirtualmetamodelPackage.VIRTUAL_METACLASS__PROPERTIES:

+				return ((InternalEList<?>)getProperties()).basicRemove(otherEnd, msgs);

+		}

+		return super.eInverseRemove(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch (featureID) {

+			case VirtualmetamodelPackage.VIRTUAL_METACLASS__ABSTRACT:

+				return isAbstract();

+			case VirtualmetamodelPackage.VIRTUAL_METACLASS__APPLIED_STEREOTYPES:

+				return getAppliedStereotypes();

+			case VirtualmetamodelPackage.VIRTUAL_METACLASS__OPERATIONS:

+				return getOperations();

+			case VirtualmetamodelPackage.VIRTUAL_METACLASS__PARENTS:

+				return getParents();

+			case VirtualmetamodelPackage.VIRTUAL_METACLASS__PROPERTIES:

+				return getProperties();

+			case VirtualmetamodelPackage.VIRTUAL_METACLASS__STEREOTYPE_INTERFACE:

+				return isStereotypeInterface();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch (featureID) {

+			case VirtualmetamodelPackage.VIRTUAL_METACLASS__ABSTRACT:

+				setAbstract((Boolean)newValue);

+				return;

+			case VirtualmetamodelPackage.VIRTUAL_METACLASS__APPLIED_STEREOTYPES:

+				getAppliedStereotypes().clear();

+				getAppliedStereotypes().addAll((Collection<? extends BaseMetaclass>)newValue);

+				return;

+			case VirtualmetamodelPackage.VIRTUAL_METACLASS__OPERATIONS:

+				getOperations().clear();

+				getOperations().addAll((Collection<? extends VirtualOperation>)newValue);

+				return;

+			case VirtualmetamodelPackage.VIRTUAL_METACLASS__PARENTS:

+				getParents().clear();

+				getParents().addAll((Collection<? extends VirtualMetaclass>)newValue);

+				return;

+			case VirtualmetamodelPackage.VIRTUAL_METACLASS__PROPERTIES:

+				getProperties().clear();

+				getProperties().addAll((Collection<? extends VirtualProperty>)newValue);

+				return;

+			case VirtualmetamodelPackage.VIRTUAL_METACLASS__STEREOTYPE_INTERFACE:

+				setStereotypeInterface((Boolean)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch (featureID) {

+			case VirtualmetamodelPackage.VIRTUAL_METACLASS__ABSTRACT:

+				setAbstract(ABSTRACT_EDEFAULT);

+				return;

+			case VirtualmetamodelPackage.VIRTUAL_METACLASS__APPLIED_STEREOTYPES:

+				getAppliedStereotypes().clear();

+				return;

+			case VirtualmetamodelPackage.VIRTUAL_METACLASS__OPERATIONS:

+				getOperations().clear();

+				return;

+			case VirtualmetamodelPackage.VIRTUAL_METACLASS__PARENTS:

+				getParents().clear();

+				return;

+			case VirtualmetamodelPackage.VIRTUAL_METACLASS__PROPERTIES:

+				getProperties().clear();

+				return;

+			case VirtualmetamodelPackage.VIRTUAL_METACLASS__STEREOTYPE_INTERFACE:

+				setStereotypeInterface(STEREOTYPE_INTERFACE_EDEFAULT);

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch (featureID) {

+			case VirtualmetamodelPackage.VIRTUAL_METACLASS__ABSTRACT:

+				return abstract_ != ABSTRACT_EDEFAULT;

+			case VirtualmetamodelPackage.VIRTUAL_METACLASS__APPLIED_STEREOTYPES:

+				return appliedStereotypes != null && !appliedStereotypes.isEmpty();

+			case VirtualmetamodelPackage.VIRTUAL_METACLASS__OPERATIONS:

+				return operations != null && !operations.isEmpty();

+			case VirtualmetamodelPackage.VIRTUAL_METACLASS__PARENTS:

+				return parents != null && !parents.isEmpty();

+			case VirtualmetamodelPackage.VIRTUAL_METACLASS__PROPERTIES:

+				return properties != null && !properties.isEmpty();

+			case VirtualmetamodelPackage.VIRTUAL_METACLASS__STEREOTYPE_INTERFACE:

+				return stereotypeInterface != STEREOTYPE_INTERFACE_EDEFAULT;

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String toString() {

+		if (eIsProxy()) return super.toString();

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (abstract: ");

+		result.append(abstract_);

+		result.append(", stereotypeInterface: ");

+		result.append(stereotypeInterface);

+		result.append(')');

+		return result.toString();

+	}

+

+} //VirtualMetaclassImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualMetamodelImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualMetamodelImpl.java
new file mode 100644
index 00000000000..ba502115ecf
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualMetamodelImpl.java
@@ -0,0 +1,432 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.virtualmetamodel.impl;

+

+import java.util.Collection;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.notify.NotificationChain;

+

+import org.eclipse.emf.common.util.EList;

+

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.InternalEObject;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+

+import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;

+import org.eclipse.emf.ecore.util.EcoreUtil;

+import org.eclipse.emf.ecore.util.InternalEList;

+

+import org.eclipse.papyrus.facade.Facade;

+import org.eclipse.papyrus.facade.FacadePackage;

+

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Virtual Metamodel</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ *   <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualMetamodelImpl#getName <em>Name</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualMetamodelImpl#getNsPrefix <em>Ns Prefix</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualMetamodelImpl#getNsURI <em>Ns URI</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualMetamodelImpl#getVirtualClassifiers <em>Virtual Classifiers</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualMetamodelImpl#getFacade <em>Facade</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @generated

+ */

+public class VirtualMetamodelImpl extends MinimalEObjectImpl.Container implements VirtualMetamodel {

+	/**

+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getName()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String NAME_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getName()

+	 * @generated

+	 * @ordered

+	 */

+	protected String name = NAME_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #getNsPrefix() <em>Ns Prefix</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getNsPrefix()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String NS_PREFIX_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getNsPrefix() <em>Ns Prefix</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getNsPrefix()

+	 * @generated

+	 * @ordered

+	 */

+	protected String nsPrefix = NS_PREFIX_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #getNsURI() <em>Ns URI</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getNsURI()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String NS_URI_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getNsURI() <em>Ns URI</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getNsURI()

+	 * @generated

+	 * @ordered

+	 */

+	protected String nsURI = NS_URI_EDEFAULT;

+

+	/**

+	 * The cached value of the '{@link #getVirtualClassifiers() <em>Virtual Classifiers</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getVirtualClassifiers()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<VirtualClassifier> virtualClassifiers;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected VirtualMetamodelImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return VirtualmetamodelPackage.Literals.VIRTUAL_METAMODEL;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public String getName() {

+		return name;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setName(String newName) {

+		String oldName = name;

+		name = newName;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, VirtualmetamodelPackage.VIRTUAL_METAMODEL__NAME, oldName, name));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public String getNsPrefix() {

+		return nsPrefix;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setNsPrefix(String newNsPrefix) {

+		String oldNsPrefix = nsPrefix;

+		nsPrefix = newNsPrefix;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, VirtualmetamodelPackage.VIRTUAL_METAMODEL__NS_PREFIX, oldNsPrefix, nsPrefix));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public String getNsURI() {

+		return nsURI;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setNsURI(String newNsURI) {

+		String oldNsURI = nsURI;

+		nsURI = newNsURI;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, VirtualmetamodelPackage.VIRTUAL_METAMODEL__NS_URI, oldNsURI, nsURI));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EList<VirtualClassifier> getVirtualClassifiers() {

+		if (virtualClassifiers == null) {

+			virtualClassifiers = new EObjectContainmentWithInverseEList<VirtualClassifier>(VirtualClassifier.class, this, VirtualmetamodelPackage.VIRTUAL_METAMODEL__VIRTUAL_CLASSIFIERS, VirtualmetamodelPackage.VIRTUAL_CLASSIFIER__METAMODEL);

+		}

+		return virtualClassifiers;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public Facade getFacade() {

+		if (eContainerFeatureID() != VirtualmetamodelPackage.VIRTUAL_METAMODEL__FACADE) return null;

+		return (Facade)eInternalContainer();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public NotificationChain basicSetFacade(Facade newFacade, NotificationChain msgs) {

+		msgs = eBasicSetContainer((InternalEObject)newFacade, VirtualmetamodelPackage.VIRTUAL_METAMODEL__FACADE, msgs);

+		return msgs;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setFacade(Facade newFacade) {

+		if (newFacade != eInternalContainer() || (eContainerFeatureID() != VirtualmetamodelPackage.VIRTUAL_METAMODEL__FACADE && newFacade != null)) {

+			if (EcoreUtil.isAncestor(this, newFacade))

+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());

+			NotificationChain msgs = null;

+			if (eInternalContainer() != null)

+				msgs = eBasicRemoveFromContainer(msgs);

+			if (newFacade != null)

+				msgs = ((InternalEObject)newFacade).eInverseAdd(this, FacadePackage.FACADE__VIRTUALMETAMODEL, Facade.class, msgs);

+			msgs = basicSetFacade(newFacade, msgs);

+			if (msgs != null) msgs.dispatch();

+		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, VirtualmetamodelPackage.VIRTUAL_METAMODEL__FACADE, newFacade, newFacade));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

+		switch (featureID) {

+			case VirtualmetamodelPackage.VIRTUAL_METAMODEL__VIRTUAL_CLASSIFIERS:

+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getVirtualClassifiers()).basicAdd(otherEnd, msgs);

+			case VirtualmetamodelPackage.VIRTUAL_METAMODEL__FACADE:

+				if (eInternalContainer() != null)

+					msgs = eBasicRemoveFromContainer(msgs);

+				return basicSetFacade((Facade)otherEnd, msgs);

+		}

+		return super.eInverseAdd(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

+		switch (featureID) {

+			case VirtualmetamodelPackage.VIRTUAL_METAMODEL__VIRTUAL_CLASSIFIERS:

+				return ((InternalEList<?>)getVirtualClassifiers()).basicRemove(otherEnd, msgs);

+			case VirtualmetamodelPackage.VIRTUAL_METAMODEL__FACADE:

+				return basicSetFacade(null, msgs);

+		}

+		return super.eInverseRemove(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {

+		switch (eContainerFeatureID()) {

+			case VirtualmetamodelPackage.VIRTUAL_METAMODEL__FACADE:

+				return eInternalContainer().eInverseRemove(this, FacadePackage.FACADE__VIRTUALMETAMODEL, Facade.class, msgs);

+		}

+		return super.eBasicRemoveFromContainerFeature(msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch (featureID) {

+			case VirtualmetamodelPackage.VIRTUAL_METAMODEL__NAME:

+				return getName();

+			case VirtualmetamodelPackage.VIRTUAL_METAMODEL__NS_PREFIX:

+				return getNsPrefix();

+			case VirtualmetamodelPackage.VIRTUAL_METAMODEL__NS_URI:

+				return getNsURI();

+			case VirtualmetamodelPackage.VIRTUAL_METAMODEL__VIRTUAL_CLASSIFIERS:

+				return getVirtualClassifiers();

+			case VirtualmetamodelPackage.VIRTUAL_METAMODEL__FACADE:

+				return getFacade();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch (featureID) {

+			case VirtualmetamodelPackage.VIRTUAL_METAMODEL__NAME:

+				setName((String)newValue);

+				return;

+			case VirtualmetamodelPackage.VIRTUAL_METAMODEL__NS_PREFIX:

+				setNsPrefix((String)newValue);

+				return;

+			case VirtualmetamodelPackage.VIRTUAL_METAMODEL__NS_URI:

+				setNsURI((String)newValue);

+				return;

+			case VirtualmetamodelPackage.VIRTUAL_METAMODEL__VIRTUAL_CLASSIFIERS:

+				getVirtualClassifiers().clear();

+				getVirtualClassifiers().addAll((Collection<? extends VirtualClassifier>)newValue);

+				return;

+			case VirtualmetamodelPackage.VIRTUAL_METAMODEL__FACADE:

+				setFacade((Facade)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch (featureID) {

+			case VirtualmetamodelPackage.VIRTUAL_METAMODEL__NAME:

+				setName(NAME_EDEFAULT);

+				return;

+			case VirtualmetamodelPackage.VIRTUAL_METAMODEL__NS_PREFIX:

+				setNsPrefix(NS_PREFIX_EDEFAULT);

+				return;

+			case VirtualmetamodelPackage.VIRTUAL_METAMODEL__NS_URI:

+				setNsURI(NS_URI_EDEFAULT);

+				return;

+			case VirtualmetamodelPackage.VIRTUAL_METAMODEL__VIRTUAL_CLASSIFIERS:

+				getVirtualClassifiers().clear();

+				return;

+			case VirtualmetamodelPackage.VIRTUAL_METAMODEL__FACADE:

+				setFacade((Facade)null);

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch (featureID) {

+			case VirtualmetamodelPackage.VIRTUAL_METAMODEL__NAME:

+				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

+			case VirtualmetamodelPackage.VIRTUAL_METAMODEL__NS_PREFIX:

+				return NS_PREFIX_EDEFAULT == null ? nsPrefix != null : !NS_PREFIX_EDEFAULT.equals(nsPrefix);

+			case VirtualmetamodelPackage.VIRTUAL_METAMODEL__NS_URI:

+				return NS_URI_EDEFAULT == null ? nsURI != null : !NS_URI_EDEFAULT.equals(nsURI);

+			case VirtualmetamodelPackage.VIRTUAL_METAMODEL__VIRTUAL_CLASSIFIERS:

+				return virtualClassifiers != null && !virtualClassifiers.isEmpty();

+			case VirtualmetamodelPackage.VIRTUAL_METAMODEL__FACADE:

+				return getFacade() != null;

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String toString() {

+		if (eIsProxy()) return super.toString();

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (name: ");

+		result.append(name);

+		result.append(", nsPrefix: ");

+		result.append(nsPrefix);

+		result.append(", nsURI: ");

+		result.append(nsURI);

+		result.append(')');

+		return result.toString();

+	}

+

+} //VirtualMetamodelImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualOperationImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualOperationImpl.java
new file mode 100644
index 00000000000..1ea2414ac9e
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualOperationImpl.java
@@ -0,0 +1,161 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.virtualmetamodel.impl;

+

+import java.util.Collection;

+

+import org.eclipse.emf.common.notify.NotificationChain;

+

+import org.eclipse.emf.common.util.EList;

+

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.InternalEObject;

+

+import org.eclipse.emf.ecore.util.EObjectContainmentEList;

+import org.eclipse.emf.ecore.util.InternalEList;

+

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualOperation;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualParameter;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Virtual Operation</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ *   <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualOperationImpl#getParameters <em>Parameters</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @generated

+ */

+public class VirtualOperationImpl extends VirtualTypedElementImpl implements VirtualOperation {

+	/**

+	 * The cached value of the '{@link #getParameters() <em>Parameters</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getParameters()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<VirtualParameter> parameters;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected VirtualOperationImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return VirtualmetamodelPackage.Literals.VIRTUAL_OPERATION;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EList<VirtualParameter> getParameters() {

+		if (parameters == null) {

+			parameters = new EObjectContainmentEList<VirtualParameter>(VirtualParameter.class, this, VirtualmetamodelPackage.VIRTUAL_OPERATION__PARAMETERS);

+		}

+		return parameters;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

+		switch (featureID) {

+			case VirtualmetamodelPackage.VIRTUAL_OPERATION__PARAMETERS:

+				return ((InternalEList<?>)getParameters()).basicRemove(otherEnd, msgs);

+		}

+		return super.eInverseRemove(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch (featureID) {

+			case VirtualmetamodelPackage.VIRTUAL_OPERATION__PARAMETERS:

+				return getParameters();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch (featureID) {

+			case VirtualmetamodelPackage.VIRTUAL_OPERATION__PARAMETERS:

+				getParameters().clear();

+				getParameters().addAll((Collection<? extends VirtualParameter>)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch (featureID) {

+			case VirtualmetamodelPackage.VIRTUAL_OPERATION__PARAMETERS:

+				getParameters().clear();

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch (featureID) {

+			case VirtualmetamodelPackage.VIRTUAL_OPERATION__PARAMETERS:

+				return parameters != null && !parameters.isEmpty();

+		}

+		return super.eIsSet(featureID);

+	}

+

+} //VirtualOperationImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualParameterImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualParameterImpl.java
new file mode 100644
index 00000000000..727b3b36d57
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualParameterImpl.java
@@ -0,0 +1,50 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.virtualmetamodel.impl;

+

+import org.eclipse.emf.ecore.EClass;

+

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualParameter;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Virtual Parameter</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * </p>

+ *

+ * @generated

+ */

+public class VirtualParameterImpl extends VirtualTypedElementImpl implements VirtualParameter {

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected VirtualParameterImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return VirtualmetamodelPackage.Literals.VIRTUAL_PARAMETER;

+	}

+

+} //VirtualParameterImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualPropertyImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualPropertyImpl.java
new file mode 100644
index 00000000000..fa9e3835ea5
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualPropertyImpl.java
@@ -0,0 +1,206 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.virtualmetamodel.impl;

+

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.notify.NotificationChain;

+

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.InternalEObject;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+

+import org.eclipse.emf.ecore.util.EcoreUtil;

+

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Virtual Property</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ *   <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualPropertyImpl#getVirtualMetaclass <em>Virtual Metaclass</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @generated

+ */

+public class VirtualPropertyImpl extends VirtualTypedElementImpl implements VirtualProperty {

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected VirtualPropertyImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return VirtualmetamodelPackage.Literals.VIRTUAL_PROPERTY;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public VirtualMetaclass getVirtualMetaclass() {

+		if (eContainerFeatureID() != VirtualmetamodelPackage.VIRTUAL_PROPERTY__VIRTUAL_METACLASS) return null;

+		return (VirtualMetaclass)eInternalContainer();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public NotificationChain basicSetVirtualMetaclass(VirtualMetaclass newVirtualMetaclass, NotificationChain msgs) {

+		msgs = eBasicSetContainer((InternalEObject)newVirtualMetaclass, VirtualmetamodelPackage.VIRTUAL_PROPERTY__VIRTUAL_METACLASS, msgs);

+		return msgs;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setVirtualMetaclass(VirtualMetaclass newVirtualMetaclass) {

+		if (newVirtualMetaclass != eInternalContainer() || (eContainerFeatureID() != VirtualmetamodelPackage.VIRTUAL_PROPERTY__VIRTUAL_METACLASS && newVirtualMetaclass != null)) {

+			if (EcoreUtil.isAncestor(this, newVirtualMetaclass))

+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());

+			NotificationChain msgs = null;

+			if (eInternalContainer() != null)

+				msgs = eBasicRemoveFromContainer(msgs);

+			if (newVirtualMetaclass != null)

+				msgs = ((InternalEObject)newVirtualMetaclass).eInverseAdd(this, VirtualmetamodelPackage.VIRTUAL_METACLASS__PROPERTIES, VirtualMetaclass.class, msgs);

+			msgs = basicSetVirtualMetaclass(newVirtualMetaclass, msgs);

+			if (msgs != null) msgs.dispatch();

+		}

+		else if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, VirtualmetamodelPackage.VIRTUAL_PROPERTY__VIRTUAL_METACLASS, newVirtualMetaclass, newVirtualMetaclass));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

+		switch (featureID) {

+			case VirtualmetamodelPackage.VIRTUAL_PROPERTY__VIRTUAL_METACLASS:

+				if (eInternalContainer() != null)

+					msgs = eBasicRemoveFromContainer(msgs);

+				return basicSetVirtualMetaclass((VirtualMetaclass)otherEnd, msgs);

+		}

+		return super.eInverseAdd(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

+		switch (featureID) {

+			case VirtualmetamodelPackage.VIRTUAL_PROPERTY__VIRTUAL_METACLASS:

+				return basicSetVirtualMetaclass(null, msgs);

+		}

+		return super.eInverseRemove(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {

+		switch (eContainerFeatureID()) {

+			case VirtualmetamodelPackage.VIRTUAL_PROPERTY__VIRTUAL_METACLASS:

+				return eInternalContainer().eInverseRemove(this, VirtualmetamodelPackage.VIRTUAL_METACLASS__PROPERTIES, VirtualMetaclass.class, msgs);

+		}

+		return super.eBasicRemoveFromContainerFeature(msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch (featureID) {

+			case VirtualmetamodelPackage.VIRTUAL_PROPERTY__VIRTUAL_METACLASS:

+				return getVirtualMetaclass();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch (featureID) {

+			case VirtualmetamodelPackage.VIRTUAL_PROPERTY__VIRTUAL_METACLASS:

+				setVirtualMetaclass((VirtualMetaclass)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch (featureID) {

+			case VirtualmetamodelPackage.VIRTUAL_PROPERTY__VIRTUAL_METACLASS:

+				setVirtualMetaclass((VirtualMetaclass)null);

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch (featureID) {

+			case VirtualmetamodelPackage.VIRTUAL_PROPERTY__VIRTUAL_METACLASS:

+				return getVirtualMetaclass() != null;

+		}

+		return super.eIsSet(featureID);

+	}

+

+} //VirtualPropertyImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualTypedElementImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualTypedElementImpl.java
new file mode 100644
index 00000000000..22e7c04a874
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualTypedElementImpl.java
@@ -0,0 +1,289 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.virtualmetamodel.impl;

+

+import org.eclipse.emf.common.notify.Notification;

+

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.InternalEObject;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Virtual Typed Element</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ *   <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualTypedElementImpl#getLower <em>Lower</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualTypedElementImpl#getUpper <em>Upper</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facade.virtualmetamodel.impl.VirtualTypedElementImpl#getType <em>Type</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @generated

+ */

+public abstract class VirtualTypedElementImpl extends VirtualElementImpl implements VirtualTypedElement {

+	/**

+	 * The default value of the '{@link #getLower() <em>Lower</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getLower()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final int LOWER_EDEFAULT = 0;

+

+	/**

+	 * The cached value of the '{@link #getLower() <em>Lower</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getLower()

+	 * @generated

+	 * @ordered

+	 */

+	protected int lower = LOWER_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #getUpper() <em>Upper</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getUpper()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final int UPPER_EDEFAULT = 0;

+

+	/**

+	 * The cached value of the '{@link #getUpper() <em>Upper</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getUpper()

+	 * @generated

+	 * @ordered

+	 */

+	protected int upper = UPPER_EDEFAULT;

+

+	/**

+	 * The cached value of the '{@link #getType() <em>Type</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getType()

+	 * @generated

+	 * @ordered

+	 */

+	protected VirtualClassifier type;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected VirtualTypedElementImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return VirtualmetamodelPackage.Literals.VIRTUAL_TYPED_ELEMENT;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public int getLower() {

+		return lower;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setLower(int newLower) {

+		int oldLower = lower;

+		lower = newLower;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, VirtualmetamodelPackage.VIRTUAL_TYPED_ELEMENT__LOWER, oldLower, lower));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public int getUpper() {

+		return upper;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setUpper(int newUpper) {

+		int oldUpper = upper;

+		upper = newUpper;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, VirtualmetamodelPackage.VIRTUAL_TYPED_ELEMENT__UPPER, oldUpper, upper));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public VirtualClassifier getType() {

+		if (type != null && type.eIsProxy()) {

+			InternalEObject oldType = (InternalEObject)type;

+			type = (VirtualClassifier)eResolveProxy(oldType);

+			if (type != oldType) {

+				if (eNotificationRequired())

+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, VirtualmetamodelPackage.VIRTUAL_TYPED_ELEMENT__TYPE, oldType, type));

+			}

+		}

+		return type;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public VirtualClassifier basicGetType() {

+		return type;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setType(VirtualClassifier newType) {

+		VirtualClassifier oldType = type;

+		type = newType;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, VirtualmetamodelPackage.VIRTUAL_TYPED_ELEMENT__TYPE, oldType, type));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch (featureID) {

+			case VirtualmetamodelPackage.VIRTUAL_TYPED_ELEMENT__LOWER:

+				return getLower();

+			case VirtualmetamodelPackage.VIRTUAL_TYPED_ELEMENT__UPPER:

+				return getUpper();

+			case VirtualmetamodelPackage.VIRTUAL_TYPED_ELEMENT__TYPE:

+				if (resolve) return getType();

+				return basicGetType();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch (featureID) {

+			case VirtualmetamodelPackage.VIRTUAL_TYPED_ELEMENT__LOWER:

+				setLower((Integer)newValue);

+				return;

+			case VirtualmetamodelPackage.VIRTUAL_TYPED_ELEMENT__UPPER:

+				setUpper((Integer)newValue);

+				return;

+			case VirtualmetamodelPackage.VIRTUAL_TYPED_ELEMENT__TYPE:

+				setType((VirtualClassifier)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch (featureID) {

+			case VirtualmetamodelPackage.VIRTUAL_TYPED_ELEMENT__LOWER:

+				setLower(LOWER_EDEFAULT);

+				return;

+			case VirtualmetamodelPackage.VIRTUAL_TYPED_ELEMENT__UPPER:

+				setUpper(UPPER_EDEFAULT);

+				return;

+			case VirtualmetamodelPackage.VIRTUAL_TYPED_ELEMENT__TYPE:

+				setType((VirtualClassifier)null);

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch (featureID) {

+			case VirtualmetamodelPackage.VIRTUAL_TYPED_ELEMENT__LOWER:

+				return lower != LOWER_EDEFAULT;

+			case VirtualmetamodelPackage.VIRTUAL_TYPED_ELEMENT__UPPER:

+				return upper != UPPER_EDEFAULT;

+			case VirtualmetamodelPackage.VIRTUAL_TYPED_ELEMENT__TYPE:

+				return type != null;

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String toString() {

+		if (eIsProxy()) return super.toString();

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (lower: ");

+		result.append(lower);

+		result.append(", upper: ");

+		result.append(upper);

+		result.append(')');

+		return result.toString();

+	}

+

+} //VirtualTypedElementImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualmetamodelFactoryImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualmetamodelFactoryImpl.java
new file mode 100644
index 00000000000..46a1d0a00fd
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualmetamodelFactoryImpl.java
@@ -0,0 +1,183 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.virtualmetamodel.impl;

+

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EPackage;

+

+import org.eclipse.emf.ecore.impl.EFactoryImpl;

+

+import org.eclipse.emf.ecore.plugin.EcorePlugin;

+

+import org.eclipse.papyrus.facade.virtualmetamodel.*;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model <b>Factory</b>.

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class VirtualmetamodelFactoryImpl extends EFactoryImpl implements VirtualmetamodelFactory {

+	/**

+	 * Creates the default factory implementation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static VirtualmetamodelFactory init() {

+		try {

+			VirtualmetamodelFactory theVirtualmetamodelFactory = (VirtualmetamodelFactory)EPackage.Registry.INSTANCE.getEFactory(VirtualmetamodelPackage.eNS_URI);

+			if (theVirtualmetamodelFactory != null) {

+				return theVirtualmetamodelFactory;

+			}

+		}

+		catch (Exception exception) {

+			EcorePlugin.INSTANCE.log(exception);

+		}

+		return new VirtualmetamodelFactoryImpl();

+	}

+

+	/**

+	 * Creates an instance of the factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public VirtualmetamodelFactoryImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public EObject create(EClass eClass) {

+		switch (eClass.getClassifierID()) {

+			case VirtualmetamodelPackage.VIRTUAL_METAMODEL: return createVirtualMetamodel();

+			case VirtualmetamodelPackage.VIRTUAL_METACLASS: return createVirtualMetaclass();

+			case VirtualmetamodelPackage.VIRTUAL_PROPERTY: return createVirtualProperty();

+			case VirtualmetamodelPackage.VIRTUAL_OPERATION: return createVirtualOperation();

+			case VirtualmetamodelPackage.VIRTUAL_PARAMETER: return createVirtualParameter();

+			case VirtualmetamodelPackage.VIRTUAL_DATATYPE: return createVirtualDatatype();

+			case VirtualmetamodelPackage.VIRTUAL_ENUM: return createVirtualEnum();

+			case VirtualmetamodelPackage.VIRTUAL_LITERAL: return createVirtualLiteral();

+			default:

+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public VirtualMetamodel createVirtualMetamodel() {

+		VirtualMetamodelImpl virtualMetamodel = new VirtualMetamodelImpl();

+		return virtualMetamodel;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public VirtualMetaclass createVirtualMetaclass() {

+		VirtualMetaclassImpl virtualMetaclass = new VirtualMetaclassImpl();

+		return virtualMetaclass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public VirtualProperty createVirtualProperty() {

+		VirtualPropertyImpl virtualProperty = new VirtualPropertyImpl();

+		return virtualProperty;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public VirtualOperation createVirtualOperation() {

+		VirtualOperationImpl virtualOperation = new VirtualOperationImpl();

+		return virtualOperation;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public VirtualParameter createVirtualParameter() {

+		VirtualParameterImpl virtualParameter = new VirtualParameterImpl();

+		return virtualParameter;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public VirtualDatatype createVirtualDatatype() {

+		VirtualDatatypeImpl virtualDatatype = new VirtualDatatypeImpl();

+		return virtualDatatype;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public VirtualEnum createVirtualEnum() {

+		VirtualEnumImpl virtualEnum = new VirtualEnumImpl();

+		return virtualEnum;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public VirtualLiteral createVirtualLiteral() {

+		VirtualLiteralImpl virtualLiteral = new VirtualLiteralImpl();

+		return virtualLiteral;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public VirtualmetamodelPackage getVirtualmetamodelPackage() {

+		return (VirtualmetamodelPackage)getEPackage();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @deprecated

+	 * @generated

+	 */

+	@Deprecated

+	public static VirtualmetamodelPackage getPackage() {

+		return VirtualmetamodelPackage.eINSTANCE;

+	}

+

+} //VirtualmetamodelFactoryImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualmetamodelPackageImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualmetamodelPackageImpl.java
new file mode 100644
index 00000000000..a2efbae1a48
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/impl/VirtualmetamodelPackageImpl.java
@@ -0,0 +1,666 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.virtualmetamodel.impl;

+

+import org.eclipse.emf.ecore.EAttribute;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EPackage;

+import org.eclipse.emf.ecore.EReference;

+import org.eclipse.emf.ecore.EcorePackage;

+

+import org.eclipse.emf.ecore.impl.EPackageImpl;

+

+import org.eclipse.papyrus.facade.FacadePackage;

+

+import org.eclipse.papyrus.facade.extensiondefinition.ExtensiondefinitionPackage;

+

+import org.eclipse.papyrus.facade.extensiondefinition.impl.ExtensiondefinitionPackageImpl;

+

+import org.eclipse.papyrus.facade.impl.FacadePackageImpl;

+

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualDatatype;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualEnum;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualLiteral;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualOperation;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualParameter;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelFactory;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

+

+import org.eclipse.uml2.types.TypesPackage;

+

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model <b>Package</b>.

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class VirtualmetamodelPackageImpl extends EPackageImpl implements VirtualmetamodelPackage {

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass virtualMetamodelEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass virtualElementEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass virtualClassifierEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass virtualMetaclassEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass virtualPropertyEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass virtualOperationEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass virtualParameterEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass virtualDatatypeEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass virtualEnumEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass virtualLiteralEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass virtualTypedElementEClass = null;

+

+	/**

+	 * Creates an instance of the model <b>Package</b>, registered with

+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

+	 * package URI value.

+	 * <p>Note: the correct way to create the package is via the static

+	 * factory method {@link #init init()}, which also performs

+	 * initialization of the package, or returns the registered package,

+	 * if one already exists.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.emf.ecore.EPackage.Registry

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage#eNS_URI

+	 * @see #init()

+	 * @generated

+	 */

+	private VirtualmetamodelPackageImpl() {

+		super(eNS_URI, VirtualmetamodelFactory.eINSTANCE);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private static boolean isInited = false;

+

+	/**

+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

+	 * 

+	 * <p>This method is used to initialize {@link VirtualmetamodelPackage#eINSTANCE} when that field is accessed.

+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #eNS_URI

+	 * @see #createPackageContents()

+	 * @see #initializePackageContents()

+	 * @generated

+	 */

+	public static VirtualmetamodelPackage init() {

+		if (isInited) return (VirtualmetamodelPackage)EPackage.Registry.INSTANCE.getEPackage(VirtualmetamodelPackage.eNS_URI);

+

+		// Obtain or create and register package

+		VirtualmetamodelPackageImpl theVirtualmetamodelPackage = (VirtualmetamodelPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof VirtualmetamodelPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new VirtualmetamodelPackageImpl());

+

+		isInited = true;

+

+		// Initialize simple dependencies

+		UMLPackage.eINSTANCE.eClass();

+

+		// Obtain or create and register interdependencies

+		FacadePackageImpl theFacadePackage = (FacadePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(FacadePackage.eNS_URI) instanceof FacadePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(FacadePackage.eNS_URI) : FacadePackage.eINSTANCE);

+		ExtensiondefinitionPackageImpl theExtensiondefinitionPackage = (ExtensiondefinitionPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ExtensiondefinitionPackage.eNS_URI) instanceof ExtensiondefinitionPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ExtensiondefinitionPackage.eNS_URI) : ExtensiondefinitionPackage.eINSTANCE);

+

+		// Create package meta-data objects

+		theVirtualmetamodelPackage.createPackageContents();

+		theFacadePackage.createPackageContents();

+		theExtensiondefinitionPackage.createPackageContents();

+

+		// Initialize created meta-data

+		theVirtualmetamodelPackage.initializePackageContents();

+		theFacadePackage.initializePackageContents();

+		theExtensiondefinitionPackage.initializePackageContents();

+

+		// Mark meta-data to indicate it can't be changed

+		theVirtualmetamodelPackage.freeze();

+

+  

+		// Update the registry and return the package

+		EPackage.Registry.INSTANCE.put(VirtualmetamodelPackage.eNS_URI, theVirtualmetamodelPackage);

+		return theVirtualmetamodelPackage;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EClass getVirtualMetamodel() {

+		return virtualMetamodelEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EAttribute getVirtualMetamodel_Name() {

+		return (EAttribute)virtualMetamodelEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EAttribute getVirtualMetamodel_NsPrefix() {

+		return (EAttribute)virtualMetamodelEClass.getEStructuralFeatures().get(1);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EAttribute getVirtualMetamodel_NsURI() {

+		return (EAttribute)virtualMetamodelEClass.getEStructuralFeatures().get(2);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EReference getVirtualMetamodel_VirtualClassifiers() {

+		return (EReference)virtualMetamodelEClass.getEStructuralFeatures().get(3);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EReference getVirtualMetamodel_Facade() {

+		return (EReference)virtualMetamodelEClass.getEStructuralFeatures().get(4);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EClass getVirtualElement() {

+		return virtualElementEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EAttribute getVirtualElement_AliasName() {

+		return (EAttribute)virtualElementEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EAttribute getVirtualElement_Kept() {

+		return (EAttribute)virtualElementEClass.getEStructuralFeatures().get(1);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EReference getVirtualElement_RepresentedElement() {

+		return (EReference)virtualElementEClass.getEStructuralFeatures().get(2);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EAttribute getVirtualElement_UseRepresented() {

+		return (EAttribute)virtualElementEClass.getEStructuralFeatures().get(3);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EClass getVirtualClassifier() {

+		return virtualClassifierEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EReference getVirtualClassifier_Metamodel() {

+		return (EReference)virtualClassifierEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EClass getVirtualMetaclass() {

+		return virtualMetaclassEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EAttribute getVirtualMetaclass_Abstract() {

+		return (EAttribute)virtualMetaclassEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EReference getVirtualMetaclass_AppliedStereotypes() {

+		return (EReference)virtualMetaclassEClass.getEStructuralFeatures().get(1);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EReference getVirtualMetaclass_Operations() {

+		return (EReference)virtualMetaclassEClass.getEStructuralFeatures().get(2);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EReference getVirtualMetaclass_Parents() {

+		return (EReference)virtualMetaclassEClass.getEStructuralFeatures().get(3);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EReference getVirtualMetaclass_Properties() {

+		return (EReference)virtualMetaclassEClass.getEStructuralFeatures().get(4);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EAttribute getVirtualMetaclass_StereotypeInterface() {

+		return (EAttribute)virtualMetaclassEClass.getEStructuralFeatures().get(5);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EClass getVirtualProperty() {

+		return virtualPropertyEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EReference getVirtualProperty_VirtualMetaclass() {

+		return (EReference)virtualPropertyEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EClass getVirtualOperation() {

+		return virtualOperationEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EReference getVirtualOperation_Parameters() {

+		return (EReference)virtualOperationEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EClass getVirtualParameter() {

+		return virtualParameterEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EClass getVirtualDatatype() {

+		return virtualDatatypeEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EClass getVirtualEnum() {

+		return virtualEnumEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EReference getVirtualEnum_Literals() {

+		return (EReference)virtualEnumEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EClass getVirtualLiteral() {

+		return virtualLiteralEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EClass getVirtualTypedElement() {

+		return virtualTypedElementEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EAttribute getVirtualTypedElement_Lower() {

+		return (EAttribute)virtualTypedElementEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EAttribute getVirtualTypedElement_Upper() {

+		return (EAttribute)virtualTypedElementEClass.getEStructuralFeatures().get(1);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EReference getVirtualTypedElement_Type() {

+		return (EReference)virtualTypedElementEClass.getEStructuralFeatures().get(2);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public VirtualmetamodelFactory getVirtualmetamodelFactory() {

+		return (VirtualmetamodelFactory)getEFactoryInstance();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private boolean isCreated = false;

+

+	/**

+	 * Creates the meta-model objects for the package.  This method is

+	 * guarded to have no affect on any invocation but its first.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void createPackageContents() {

+		if (isCreated) return;

+		isCreated = true;

+

+		// Create classes and their features

+		virtualMetamodelEClass = createEClass(VIRTUAL_METAMODEL);

+		createEAttribute(virtualMetamodelEClass, VIRTUAL_METAMODEL__NAME);

+		createEAttribute(virtualMetamodelEClass, VIRTUAL_METAMODEL__NS_PREFIX);

+		createEAttribute(virtualMetamodelEClass, VIRTUAL_METAMODEL__NS_URI);

+		createEReference(virtualMetamodelEClass, VIRTUAL_METAMODEL__VIRTUAL_CLASSIFIERS);

+		createEReference(virtualMetamodelEClass, VIRTUAL_METAMODEL__FACADE);

+

+		virtualElementEClass = createEClass(VIRTUAL_ELEMENT);

+		createEAttribute(virtualElementEClass, VIRTUAL_ELEMENT__ALIAS_NAME);

+		createEAttribute(virtualElementEClass, VIRTUAL_ELEMENT__KEPT);

+		createEReference(virtualElementEClass, VIRTUAL_ELEMENT__REPRESENTED_ELEMENT);

+		createEAttribute(virtualElementEClass, VIRTUAL_ELEMENT__USE_REPRESENTED);

+

+		virtualClassifierEClass = createEClass(VIRTUAL_CLASSIFIER);

+		createEReference(virtualClassifierEClass, VIRTUAL_CLASSIFIER__METAMODEL);

+

+		virtualMetaclassEClass = createEClass(VIRTUAL_METACLASS);

+		createEAttribute(virtualMetaclassEClass, VIRTUAL_METACLASS__ABSTRACT);

+		createEReference(virtualMetaclassEClass, VIRTUAL_METACLASS__APPLIED_STEREOTYPES);

+		createEReference(virtualMetaclassEClass, VIRTUAL_METACLASS__OPERATIONS);

+		createEReference(virtualMetaclassEClass, VIRTUAL_METACLASS__PARENTS);

+		createEReference(virtualMetaclassEClass, VIRTUAL_METACLASS__PROPERTIES);

+		createEAttribute(virtualMetaclassEClass, VIRTUAL_METACLASS__STEREOTYPE_INTERFACE);

+

+		virtualPropertyEClass = createEClass(VIRTUAL_PROPERTY);

+		createEReference(virtualPropertyEClass, VIRTUAL_PROPERTY__VIRTUAL_METACLASS);

+

+		virtualOperationEClass = createEClass(VIRTUAL_OPERATION);

+		createEReference(virtualOperationEClass, VIRTUAL_OPERATION__PARAMETERS);

+

+		virtualParameterEClass = createEClass(VIRTUAL_PARAMETER);

+

+		virtualDatatypeEClass = createEClass(VIRTUAL_DATATYPE);

+

+		virtualEnumEClass = createEClass(VIRTUAL_ENUM);

+		createEReference(virtualEnumEClass, VIRTUAL_ENUM__LITERALS);

+

+		virtualLiteralEClass = createEClass(VIRTUAL_LITERAL);

+

+		virtualTypedElementEClass = createEClass(VIRTUAL_TYPED_ELEMENT);

+		createEAttribute(virtualTypedElementEClass, VIRTUAL_TYPED_ELEMENT__LOWER);

+		createEAttribute(virtualTypedElementEClass, VIRTUAL_TYPED_ELEMENT__UPPER);

+		createEReference(virtualTypedElementEClass, VIRTUAL_TYPED_ELEMENT__TYPE);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private boolean isInitialized = false;

+

+	/**

+	 * Complete the initialization of the package and its meta-model.  This

+	 * method is guarded to have no affect on any invocation but its first.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void initializePackageContents() {

+		if (isInitialized) return;

+		isInitialized = true;

+

+		// Initialize package

+		setName(eNAME);

+		setNsPrefix(eNS_PREFIX);

+		setNsURI(eNS_URI);

+

+		// Obtain other dependent packages

+		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);

+		FacadePackage theFacadePackage = (FacadePackage)EPackage.Registry.INSTANCE.getEPackage(FacadePackage.eNS_URI);

+		ExtensiondefinitionPackage theExtensiondefinitionPackage = (ExtensiondefinitionPackage)EPackage.Registry.INSTANCE.getEPackage(ExtensiondefinitionPackage.eNS_URI);

+		TypesPackage theTypesPackage = (TypesPackage)EPackage.Registry.INSTANCE.getEPackage(TypesPackage.eNS_URI);

+

+		// Create type parameters

+

+		// Set bounds for type parameters

+

+		// Add supertypes to classes

+		virtualClassifierEClass.getESuperTypes().add(this.getVirtualElement());

+		virtualMetaclassEClass.getESuperTypes().add(this.getVirtualClassifier());

+		virtualPropertyEClass.getESuperTypes().add(this.getVirtualTypedElement());

+		virtualOperationEClass.getESuperTypes().add(this.getVirtualTypedElement());

+		virtualParameterEClass.getESuperTypes().add(this.getVirtualTypedElement());

+		virtualDatatypeEClass.getESuperTypes().add(this.getVirtualClassifier());

+		virtualEnumEClass.getESuperTypes().add(this.getVirtualClassifier());

+		virtualLiteralEClass.getESuperTypes().add(this.getVirtualElement());

+		virtualTypedElementEClass.getESuperTypes().add(this.getVirtualElement());

+

+		// Initialize classes, features, and operations; add parameters

+		initEClass(virtualMetamodelEClass, VirtualMetamodel.class, "VirtualMetamodel", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getVirtualMetamodel_Name(), theEcorePackage.getEString(), "name", null, 0, 1, VirtualMetamodel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getVirtualMetamodel_NsPrefix(), theEcorePackage.getEString(), "nsPrefix", null, 0, 1, VirtualMetamodel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getVirtualMetamodel_NsURI(), theEcorePackage.getEString(), "nsURI", null, 0, 1, VirtualMetamodel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getVirtualMetamodel_VirtualClassifiers(), this.getVirtualClassifier(), this.getVirtualClassifier_Metamodel(), "virtualClassifiers", null, 0, -1, VirtualMetamodel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getVirtualMetamodel_Facade(), theFacadePackage.getFacade(), theFacadePackage.getFacade_Virtualmetamodel(), "facade", null, 1, 1, VirtualMetamodel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(virtualElementEClass, VirtualElement.class, "VirtualElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getVirtualElement_AliasName(), ecorePackage.getEString(), "aliasName", null, 0, 1, VirtualElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getVirtualElement_Kept(), ecorePackage.getEBoolean(), "kept", null, 1, 1, VirtualElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getVirtualElement_RepresentedElement(), theEcorePackage.getEObject(), null, "representedElement", null, 1, 1, VirtualElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getVirtualElement_UseRepresented(), ecorePackage.getEBoolean(), "useRepresented", null, 1, 1, VirtualElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(virtualClassifierEClass, VirtualClassifier.class, "VirtualClassifier", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getVirtualClassifier_Metamodel(), this.getVirtualMetamodel(), this.getVirtualMetamodel_VirtualClassifiers(), "metamodel", null, 1, 1, VirtualClassifier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(virtualMetaclassEClass, VirtualMetaclass.class, "VirtualMetaclass", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getVirtualMetaclass_Abstract(), ecorePackage.getEBoolean(), "abstract", null, 0, 1, VirtualMetaclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getVirtualMetaclass_AppliedStereotypes(), theExtensiondefinitionPackage.getBaseMetaclass(), null, "appliedStereotypes", null, 0, -1, VirtualMetaclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getVirtualMetaclass_Operations(), this.getVirtualOperation(), null, "operations", null, 0, -1, VirtualMetaclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getVirtualMetaclass_Parents(), this.getVirtualMetaclass(), null, "parents", null, 0, -1, VirtualMetaclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getVirtualMetaclass_Properties(), this.getVirtualProperty(), this.getVirtualProperty_VirtualMetaclass(), "properties", null, 0, -1, VirtualMetaclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getVirtualMetaclass_StereotypeInterface(), theTypesPackage.getBoolean(), "stereotypeInterface", null, 1, 1, VirtualMetaclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(virtualPropertyEClass, VirtualProperty.class, "VirtualProperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getVirtualProperty_VirtualMetaclass(), this.getVirtualMetaclass(), this.getVirtualMetaclass_Properties(), "virtualMetaclass", null, 1, 1, VirtualProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(virtualOperationEClass, VirtualOperation.class, "VirtualOperation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getVirtualOperation_Parameters(), this.getVirtualParameter(), null, "parameters", null, 0, -1, VirtualOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(virtualParameterEClass, VirtualParameter.class, "VirtualParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+

+		initEClass(virtualDatatypeEClass, VirtualDatatype.class, "VirtualDatatype", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+

+		initEClass(virtualEnumEClass, VirtualEnum.class, "VirtualEnum", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getVirtualEnum_Literals(), this.getVirtualLiteral(), null, "literals", null, 0, -1, VirtualEnum.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(virtualLiteralEClass, VirtualLiteral.class, "VirtualLiteral", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+

+		initEClass(virtualTypedElementEClass, VirtualTypedElement.class, "VirtualTypedElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getVirtualTypedElement_Lower(), ecorePackage.getEInt(), "lower", null, 1, 1, VirtualTypedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getVirtualTypedElement_Upper(), ecorePackage.getEInt(), "upper", null, 1, 1, VirtualTypedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getVirtualTypedElement_Type(), this.getVirtualClassifier(), null, "type", null, 1, 1, VirtualTypedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+	}

+

+} //VirtualmetamodelPackageImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/util/VirtualmetamodelAdapterFactory.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/util/VirtualmetamodelAdapterFactory.java
new file mode 100644
index 00000000000..0858a849101
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/util/VirtualmetamodelAdapterFactory.java
@@ -0,0 +1,311 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.virtualmetamodel.util;

+

+import org.eclipse.emf.common.notify.Adapter;

+import org.eclipse.emf.common.notify.Notifier;

+

+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

+

+import org.eclipse.emf.ecore.EObject;

+

+import org.eclipse.papyrus.facade.virtualmetamodel.*;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Adapter Factory</b> for the model.

+ * It provides an adapter <code>createXXX</code> method for each class of the model.

+ * <!-- end-user-doc -->

+ * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage

+ * @generated

+ */

+public class VirtualmetamodelAdapterFactory extends AdapterFactoryImpl {

+	/**

+	 * The cached model package.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected static VirtualmetamodelPackage modelPackage;

+

+	/**

+	 * Creates an instance of the adapter factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public VirtualmetamodelAdapterFactory() {

+		if (modelPackage == null) {

+			modelPackage = VirtualmetamodelPackage.eINSTANCE;

+		}

+	}

+

+	/**

+	 * Returns whether this factory is applicable for the type of the object.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

+	 * <!-- end-user-doc -->

+	 * @return whether this factory is applicable for the type of the object.

+	 * @generated

+	 */

+	@Override

+	public boolean isFactoryForType(Object object) {

+		if (object == modelPackage) {

+			return true;

+		}

+		if (object instanceof EObject) {

+			return ((EObject)object).eClass().getEPackage() == modelPackage;

+		}

+		return false;

+	}

+

+	/**

+	 * The switch that delegates to the <code>createXXX</code> methods.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected VirtualmetamodelSwitch<Adapter> modelSwitch =

+		new VirtualmetamodelSwitch<Adapter>() {

+			@Override

+			public Adapter caseVirtualMetamodel(VirtualMetamodel object) {

+				return createVirtualMetamodelAdapter();

+			}

+			@Override

+			public Adapter caseVirtualElement(VirtualElement object) {

+				return createVirtualElementAdapter();

+			}

+			@Override

+			public Adapter caseVirtualClassifier(VirtualClassifier object) {

+				return createVirtualClassifierAdapter();

+			}

+			@Override

+			public Adapter caseVirtualMetaclass(VirtualMetaclass object) {

+				return createVirtualMetaclassAdapter();

+			}

+			@Override

+			public Adapter caseVirtualProperty(VirtualProperty object) {

+				return createVirtualPropertyAdapter();

+			}

+			@Override

+			public Adapter caseVirtualOperation(VirtualOperation object) {

+				return createVirtualOperationAdapter();

+			}

+			@Override

+			public Adapter caseVirtualParameter(VirtualParameter object) {

+				return createVirtualParameterAdapter();

+			}

+			@Override

+			public Adapter caseVirtualDatatype(VirtualDatatype object) {

+				return createVirtualDatatypeAdapter();

+			}

+			@Override

+			public Adapter caseVirtualEnum(VirtualEnum object) {

+				return createVirtualEnumAdapter();

+			}

+			@Override

+			public Adapter caseVirtualLiteral(VirtualLiteral object) {

+				return createVirtualLiteralAdapter();

+			}

+			@Override

+			public Adapter caseVirtualTypedElement(VirtualTypedElement object) {

+				return createVirtualTypedElementAdapter();

+			}

+			@Override

+			public Adapter defaultCase(EObject object) {

+				return createEObjectAdapter();

+			}

+		};

+

+	/**

+	 * Creates an adapter for the <code>target</code>.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param target the object to adapt.

+	 * @return the adapter for the <code>target</code>.

+	 * @generated

+	 */

+	@Override

+	public Adapter createAdapter(Notifier target) {

+		return modelSwitch.doSwitch((EObject)target);

+	}

+

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel <em>Virtual Metamodel</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel

+	 * @generated

+	 */

+	public Adapter createVirtualMetamodelAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement <em>Virtual Element</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement

+	 * @generated

+	 */

+	public Adapter createVirtualElementAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier <em>Virtual Classifier</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier

+	 * @generated

+	 */

+	public Adapter createVirtualClassifierAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass <em>Virtual Metaclass</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass

+	 * @generated

+	 */

+	public Adapter createVirtualMetaclassAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty <em>Virtual Property</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty

+	 * @generated

+	 */

+	public Adapter createVirtualPropertyAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualOperation <em>Virtual Operation</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualOperation

+	 * @generated

+	 */

+	public Adapter createVirtualOperationAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualParameter <em>Virtual Parameter</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualParameter

+	 * @generated

+	 */

+	public Adapter createVirtualParameterAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualDatatype <em>Virtual Datatype</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualDatatype

+	 * @generated

+	 */

+	public Adapter createVirtualDatatypeAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualEnum <em>Virtual Enum</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualEnum

+	 * @generated

+	 */

+	public Adapter createVirtualEnumAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualLiteral <em>Virtual Literal</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualLiteral

+	 * @generated

+	 */

+	public Adapter createVirtualLiteralAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement <em>Virtual Typed Element</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement

+	 * @generated

+	 */

+	public Adapter createVirtualTypedElementAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for the default case.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null.

+	 * <!-- end-user-doc -->

+	 * @return the new adapter.

+	 * @generated

+	 */

+	public Adapter createEObjectAdapter() {

+		return null;

+	}

+

+} //VirtualmetamodelAdapterFactory

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/util/VirtualmetamodelResourceFactoryImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/util/VirtualmetamodelResourceFactoryImpl.java
new file mode 100644
index 00000000000..590d1547367
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/util/VirtualmetamodelResourceFactoryImpl.java
@@ -0,0 +1,63 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.virtualmetamodel.util;

+

+import org.eclipse.emf.common.util.URI;

+

+import org.eclipse.emf.ecore.resource.Resource;

+

+import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;

+

+import org.eclipse.emf.ecore.xmi.XMLResource;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Resource Factory</b> associated with the package.

+ * <!-- end-user-doc -->

+ * @see org.eclipse.papyrus.facade.virtualmetamodel.util.VirtualmetamodelResourceImpl

+ * @generated

+ */

+public class VirtualmetamodelResourceFactoryImpl extends ResourceFactoryImpl {

+	/**

+	 * Creates an instance of the resource factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public VirtualmetamodelResourceFactoryImpl() {

+		super();

+	}

+

+	/**

+	 * Creates an instance of the resource.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Resource createResource(URI uri) {

+		XMLResource result = new VirtualmetamodelResourceImpl(uri);

+		result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);

+		result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);

+

+		result.getDefaultSaveOptions().put(XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE);

+

+		result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);

+		result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);

+

+		result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);

+		return result;

+	}

+

+} //VirtualmetamodelResourceFactoryImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/util/VirtualmetamodelResourceImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/util/VirtualmetamodelResourceImpl.java
new file mode 100644
index 00000000000..18f48fa354c
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/util/VirtualmetamodelResourceImpl.java
@@ -0,0 +1,39 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.virtualmetamodel.util;

+

+import org.eclipse.emf.common.util.URI;

+

+import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Resource </b> associated with the package.

+ * <!-- end-user-doc -->

+ * @see org.eclipse.papyrus.facade.virtualmetamodel.util.VirtualmetamodelResourceFactoryImpl

+ * @generated

+ */

+public class VirtualmetamodelResourceImpl extends XMLResourceImpl {

+	/**

+	 * Creates an instance of the resource.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param uri the URI of the new resource.

+	 * @generated

+	 */

+	public VirtualmetamodelResourceImpl(URI uri) {

+		super(uri);

+	}

+

+} //VirtualmetamodelResourceImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/util/VirtualmetamodelSwitch.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/util/VirtualmetamodelSwitch.java
new file mode 100644
index 00000000000..e449716a0e3
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/util/VirtualmetamodelSwitch.java
@@ -0,0 +1,346 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.virtualmetamodel.util;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EPackage;

+

+import org.eclipse.emf.ecore.util.Switch;

+

+import org.eclipse.papyrus.facade.virtualmetamodel.*;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Switch</b> for the model's inheritance hierarchy.

+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)}

+ * to invoke the <code>caseXXX</code> method for each class of the model,

+ * starting with the actual class of the object

+ * and proceeding up the inheritance hierarchy

+ * until a non-null result is returned,

+ * which is the result of the switch.

+ * <!-- end-user-doc -->

+ * @see org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage

+ * @generated

+ */

+public class VirtualmetamodelSwitch<T> extends Switch<T> {

+	/**

+	 * The cached model package

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected static VirtualmetamodelPackage modelPackage;

+

+	/**

+	 * Creates an instance of the switch.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public VirtualmetamodelSwitch() {

+		if (modelPackage == null) {

+			modelPackage = VirtualmetamodelPackage.eINSTANCE;

+		}

+	}

+

+	/**

+	 * Checks whether this is a switch for the given package.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @parameter ePackage the package in question.

+	 * @return whether this is a switch for the given package.

+	 * @generated

+	 */

+	@Override

+	protected boolean isSwitchFor(EPackage ePackage) {

+		return ePackage == modelPackage;

+	}

+

+	/**

+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the first non-null result returned by a <code>caseXXX</code> call.

+	 * @generated

+	 */

+	@Override

+	protected T doSwitch(int classifierID, EObject theEObject) {

+		switch (classifierID) {

+			case VirtualmetamodelPackage.VIRTUAL_METAMODEL: {

+				VirtualMetamodel virtualMetamodel = (VirtualMetamodel)theEObject;

+				T result = caseVirtualMetamodel(virtualMetamodel);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case VirtualmetamodelPackage.VIRTUAL_ELEMENT: {

+				VirtualElement virtualElement = (VirtualElement)theEObject;

+				T result = caseVirtualElement(virtualElement);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case VirtualmetamodelPackage.VIRTUAL_CLASSIFIER: {

+				VirtualClassifier virtualClassifier = (VirtualClassifier)theEObject;

+				T result = caseVirtualClassifier(virtualClassifier);

+				if (result == null) result = caseVirtualElement(virtualClassifier);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case VirtualmetamodelPackage.VIRTUAL_METACLASS: {

+				VirtualMetaclass virtualMetaclass = (VirtualMetaclass)theEObject;

+				T result = caseVirtualMetaclass(virtualMetaclass);

+				if (result == null) result = caseVirtualClassifier(virtualMetaclass);

+				if (result == null) result = caseVirtualElement(virtualMetaclass);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case VirtualmetamodelPackage.VIRTUAL_PROPERTY: {

+				VirtualProperty virtualProperty = (VirtualProperty)theEObject;

+				T result = caseVirtualProperty(virtualProperty);

+				if (result == null) result = caseVirtualTypedElement(virtualProperty);

+				if (result == null) result = caseVirtualElement(virtualProperty);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case VirtualmetamodelPackage.VIRTUAL_OPERATION: {

+				VirtualOperation virtualOperation = (VirtualOperation)theEObject;

+				T result = caseVirtualOperation(virtualOperation);

+				if (result == null) result = caseVirtualTypedElement(virtualOperation);

+				if (result == null) result = caseVirtualElement(virtualOperation);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case VirtualmetamodelPackage.VIRTUAL_PARAMETER: {

+				VirtualParameter virtualParameter = (VirtualParameter)theEObject;

+				T result = caseVirtualParameter(virtualParameter);

+				if (result == null) result = caseVirtualTypedElement(virtualParameter);

+				if (result == null) result = caseVirtualElement(virtualParameter);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case VirtualmetamodelPackage.VIRTUAL_DATATYPE: {

+				VirtualDatatype virtualDatatype = (VirtualDatatype)theEObject;

+				T result = caseVirtualDatatype(virtualDatatype);

+				if (result == null) result = caseVirtualClassifier(virtualDatatype);

+				if (result == null) result = caseVirtualElement(virtualDatatype);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case VirtualmetamodelPackage.VIRTUAL_ENUM: {

+				VirtualEnum virtualEnum = (VirtualEnum)theEObject;

+				T result = caseVirtualEnum(virtualEnum);

+				if (result == null) result = caseVirtualClassifier(virtualEnum);

+				if (result == null) result = caseVirtualElement(virtualEnum);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case VirtualmetamodelPackage.VIRTUAL_LITERAL: {

+				VirtualLiteral virtualLiteral = (VirtualLiteral)theEObject;

+				T result = caseVirtualLiteral(virtualLiteral);

+				if (result == null) result = caseVirtualElement(virtualLiteral);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case VirtualmetamodelPackage.VIRTUAL_TYPED_ELEMENT: {

+				VirtualTypedElement virtualTypedElement = (VirtualTypedElement)theEObject;

+				T result = caseVirtualTypedElement(virtualTypedElement);

+				if (result == null) result = caseVirtualElement(virtualTypedElement);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			default: return defaultCase(theEObject);

+		}

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Virtual Metamodel</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 * @param object the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Virtual Metamodel</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseVirtualMetamodel(VirtualMetamodel object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Virtual Element</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 * @param object the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Virtual Element</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseVirtualElement(VirtualElement object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Virtual Classifier</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 * @param object the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Virtual Classifier</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseVirtualClassifier(VirtualClassifier object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Virtual Metaclass</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 * @param object the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Virtual Metaclass</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseVirtualMetaclass(VirtualMetaclass object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Virtual Property</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 * @param object the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Virtual Property</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseVirtualProperty(VirtualProperty object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Virtual Operation</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 * @param object the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Virtual Operation</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseVirtualOperation(VirtualOperation object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Virtual Parameter</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 * @param object the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Virtual Parameter</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseVirtualParameter(VirtualParameter object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Virtual Datatype</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 * @param object the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Virtual Datatype</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseVirtualDatatype(VirtualDatatype object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Virtual Enum</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 * @param object the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Virtual Enum</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseVirtualEnum(VirtualEnum object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Virtual Literal</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 * @param object the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Virtual Literal</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseVirtualLiteral(VirtualLiteral object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Virtual Typed Element</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 * @param object the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Virtual Typed Element</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseVirtualTypedElement(VirtualTypedElement object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch, but this is the last case anyway.

+	 * <!-- end-user-doc -->

+	 * @param object the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

+	 * @generated

+	 */

+	@Override

+	public T defaultCase(EObject object) {

+		return null;

+	}

+

+} //VirtualmetamodelSwitch

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/util/VirtualmetamodelXMLProcessor.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/util/VirtualmetamodelXMLProcessor.java
new file mode 100644
index 00000000000..a1c0e852e76
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/util/VirtualmetamodelXMLProcessor.java
@@ -0,0 +1,61 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.virtualmetamodel.util;

+

+import java.util.Map;

+

+import org.eclipse.emf.ecore.EPackage;

+

+import org.eclipse.emf.ecore.resource.Resource;

+

+import org.eclipse.emf.ecore.xmi.util.XMLProcessor;

+

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualmetamodelPackage;

+

+/**

+ * This class contains helper methods to serialize and deserialize XML documents

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class VirtualmetamodelXMLProcessor extends XMLProcessor {

+

+	/**

+	 * Public constructor to instantiate the helper.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public VirtualmetamodelXMLProcessor() {

+		super((EPackage.Registry.INSTANCE));

+		VirtualmetamodelPackage.eINSTANCE.eClass();

+	}

+	

+	/**

+	 * Register for "*" and "xml" file extensions the VirtualmetamodelResourceFactoryImpl factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected Map<String, Resource.Factory> getRegistrations() {

+		if (registrations == null) {

+			super.getRegistrations();

+			registrations.put(XML_EXTENSION, new VirtualmetamodelResourceFactoryImpl());

+			registrations.put(STAR_EXTENSION, new VirtualmetamodelResourceFactoryImpl());

+		}

+		return registrations;

+	}

+

+} //VirtualmetamodelXMLProcessor

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualClassifierValidator.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualClassifierValidator.java
new file mode 100644
index 00000000000..f3d1abc2b6a
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualClassifierValidator.java
@@ -0,0 +1,28 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.virtualmetamodel.validation;

+

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel;

+

+/**

+ * A sample validator interface for {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier}.

+ * This doesn't really do anything, and it's not a real EMF artifact.

+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.

+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.

+ */

+public interface VirtualClassifierValidator {

+	boolean validate();

+

+	boolean validateMetamodel(VirtualMetamodel value);

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualDatatypeValidator.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualDatatypeValidator.java
new file mode 100644
index 00000000000..fd4ff4333ea
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualDatatypeValidator.java
@@ -0,0 +1,26 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.virtualmetamodel.validation;

+

+

+/**

+ * A sample validator interface for {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualDatatype}.

+ * This doesn't really do anything, and it's not a real EMF artifact.

+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.

+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.

+ */

+public interface VirtualDatatypeValidator {

+	boolean validate();

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualElementValidator.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualElementValidator.java
new file mode 100644
index 00000000000..1247cec29b8
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualElementValidator.java
@@ -0,0 +1,31 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.virtualmetamodel.validation;

+

+import org.eclipse.emf.ecore.EObject;

+

+/**

+ * A sample validator interface for {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualElement}.

+ * This doesn't really do anything, and it's not a real EMF artifact.

+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.

+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.

+ */

+public interface VirtualElementValidator {

+	boolean validate();

+

+	boolean validateAliasName(String value);

+	boolean validateKept(boolean value);

+	boolean validateRepresentedElement(EObject value);

+	boolean validateUseRepresented(boolean value);

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualEnumValidator.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualEnumValidator.java
new file mode 100644
index 00000000000..dc20313b1a0
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualEnumValidator.java
@@ -0,0 +1,30 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.virtualmetamodel.validation;

+

+import org.eclipse.emf.common.util.EList;

+

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualLiteral;

+

+/**

+ * A sample validator interface for {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualEnum}.

+ * This doesn't really do anything, and it's not a real EMF artifact.

+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.

+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.

+ */

+public interface VirtualEnumValidator {

+	boolean validate();

+

+	boolean validateLiterals(EList<VirtualLiteral> value);

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualLiteralValidator.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualLiteralValidator.java
new file mode 100644
index 00000000000..9e736ed0b3d
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualLiteralValidator.java
@@ -0,0 +1,26 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.virtualmetamodel.validation;

+

+

+/**

+ * A sample validator interface for {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualLiteral}.

+ * This doesn't really do anything, and it's not a real EMF artifact.

+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.

+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.

+ */

+public interface VirtualLiteralValidator {

+	boolean validate();

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualMetaclassValidator.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualMetaclassValidator.java
new file mode 100644
index 00000000000..1d6add9be35
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualMetaclassValidator.java
@@ -0,0 +1,39 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.virtualmetamodel.validation;

+

+import org.eclipse.emf.common.util.EList;

+

+import org.eclipse.papyrus.facade.extensiondefinition.BaseMetaclass;

+

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualOperation;

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty;

+

+/**

+ * A sample validator interface for {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass}.

+ * This doesn't really do anything, and it's not a real EMF artifact.

+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.

+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.

+ */

+public interface VirtualMetaclassValidator {

+	boolean validate();

+

+	boolean validateAbstract(boolean value);

+	boolean validateAppliedStereotypes(EList<BaseMetaclass> value);

+	boolean validateOperations(EList<VirtualOperation> value);

+	boolean validateParents(EList<VirtualMetaclass> value);

+	boolean validateProperties(EList<VirtualProperty> value);

+	boolean validateStereotypeInterface(boolean value);

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualMetamodelValidator.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualMetamodelValidator.java
new file mode 100644
index 00000000000..1de291b0507
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualMetamodelValidator.java
@@ -0,0 +1,36 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.virtualmetamodel.validation;

+

+import org.eclipse.emf.common.util.EList;

+

+import org.eclipse.papyrus.facade.Facade;

+

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier;

+

+/**

+ * A sample validator interface for {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetamodel}.

+ * This doesn't really do anything, and it's not a real EMF artifact.

+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.

+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.

+ */

+public interface VirtualMetamodelValidator {

+	boolean validate();

+

+	boolean validateName(String value);

+	boolean validateNsPrefix(String value);

+	boolean validateNsURI(String value);

+	boolean validateVirtualClassifiers(EList<VirtualClassifier> value);

+	boolean validateFacade(Facade value);

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualOperationValidator.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualOperationValidator.java
new file mode 100644
index 00000000000..c3c6b9c7a2d
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualOperationValidator.java
@@ -0,0 +1,30 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.virtualmetamodel.validation;

+

+import org.eclipse.emf.common.util.EList;

+

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualParameter;

+

+/**

+ * A sample validator interface for {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualOperation}.

+ * This doesn't really do anything, and it's not a real EMF artifact.

+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.

+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.

+ */

+public interface VirtualOperationValidator {

+	boolean validate();

+

+	boolean validateParameters(EList<VirtualParameter> value);

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualParameterValidator.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualParameterValidator.java
new file mode 100644
index 00000000000..832c52b2b3e
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualParameterValidator.java
@@ -0,0 +1,26 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.virtualmetamodel.validation;

+

+

+/**

+ * A sample validator interface for {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualParameter}.

+ * This doesn't really do anything, and it's not a real EMF artifact.

+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.

+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.

+ */

+public interface VirtualParameterValidator {

+	boolean validate();

+

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualPropertyValidator.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualPropertyValidator.java
new file mode 100644
index 00000000000..9dfc62dc8d7
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualPropertyValidator.java
@@ -0,0 +1,28 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.virtualmetamodel.validation;

+

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualMetaclass;

+

+/**

+ * A sample validator interface for {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualProperty}.

+ * This doesn't really do anything, and it's not a real EMF artifact.

+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.

+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.

+ */

+public interface VirtualPropertyValidator {

+	boolean validate();

+

+	boolean validateVirtualMetaclass(VirtualMetaclass value);

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualTypedElementValidator.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualTypedElementValidator.java
new file mode 100644
index 00000000000..49d3ef4acd6
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facade/virtualmetamodel/validation/VirtualTypedElementValidator.java
@@ -0,0 +1,30 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facade.virtualmetamodel.validation;

+

+import org.eclipse.papyrus.facade.virtualmetamodel.VirtualClassifier;

+

+/**

+ * A sample validator interface for {@link org.eclipse.papyrus.facade.virtualmetamodel.VirtualTypedElement}.

+ * This doesn't really do anything, and it's not a real EMF artifact.

+ * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.

+ * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.

+ */

+public interface VirtualTypedElementValidator {

+	boolean validate();

+

+	boolean validateLower(int value);

+	boolean validateUpper(int value);

+	boolean validateType(VirtualClassifier value);

+}

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/ExtensionDefinitionKind.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/ExtensionDefinitionKind.java
new file mode 100644
index 00000000000..81561e57555
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/ExtensionDefinitionKind.java
@@ -0,0 +1,273 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facademapping;

+

+import java.util.Arrays;

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.emf.common.util.Enumerator;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the literals of the enumeration '<em><b>Extension Definition Kind</b></em>',

+ * and utility methods for working with them.

+ * <!-- end-user-doc -->

+ * @see org.eclipse.papyrus.facademapping.FacademappingPackage#getExtensionDefinitionKind()

+ * @model

+ * @generated

+ */

+public enum ExtensionDefinitionKind implements Enumerator {

+	/**

+	 * The '<em><b>Association</b></em>' literal object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #ASSOCIATION_VALUE

+	 * @generated

+	 * @ordered

+	 */

+	ASSOCIATION(0, "Association", "Association"),

+

+	/**

+	 * The '<em><b>Generalization</b></em>' literal object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #GENERALIZATION_VALUE

+	 * @generated

+	 * @ordered

+	 */

+	GENERALIZATION(1, "Generalization", "Generalization"),

+

+	/**

+	 * The '<em><b>Multi Generalization</b></em>' literal object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #MULTI_GENERALIZATION_VALUE

+	 * @generated

+	 * @ordered

+	 */

+	MULTI_GENERALIZATION(2, "MultiGeneralization", "MultiGeneralization"),

+

+	/**

+	 * The '<em><b>Fusion</b></em>' literal object.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #FUSION_VALUE

+	 * @generated

+	 * @ordered

+	 */

+	FUSION(3, "Fusion", "Fusion");

+

+	/**

+	 * The '<em><b>Association</b></em>' literal value.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of '<em><b>Association</b></em>' literal object isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @see #ASSOCIATION

+	 * @model name="Association"

+	 * @generated

+	 * @ordered

+	 */

+	public static final int ASSOCIATION_VALUE = 0;

+

+	/**

+	 * The '<em><b>Generalization</b></em>' literal value.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of '<em><b>Generalization</b></em>' literal object isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @see #GENERALIZATION

+	 * @model name="Generalization"

+	 * @generated

+	 * @ordered

+	 */

+	public static final int GENERALIZATION_VALUE = 1;

+

+	/**

+	 * The '<em><b>Multi Generalization</b></em>' literal value.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of '<em><b>Multi Generalization</b></em>' literal object isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @see #MULTI_GENERALIZATION

+	 * @model name="MultiGeneralization"

+	 * @generated

+	 * @ordered

+	 */

+	public static final int MULTI_GENERALIZATION_VALUE = 2;

+

+	/**

+	 * The '<em><b>Fusion</b></em>' literal value.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of '<em><b>Fusion</b></em>' literal object isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @see #FUSION

+	 * @model name="Fusion"

+	 * @generated

+	 * @ordered

+	 */

+	public static final int FUSION_VALUE = 3;

+

+	/**

+	 * An array of all the '<em><b>Extension Definition Kind</b></em>' enumerators.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private static final ExtensionDefinitionKind[] VALUES_ARRAY =

+		new ExtensionDefinitionKind[] {

+			ASSOCIATION,

+			GENERALIZATION,

+			MULTI_GENERALIZATION,

+			FUSION,

+		};

+

+	/**

+	 * A public read-only list of all the '<em><b>Extension Definition Kind</b></em>' enumerators.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static final List<ExtensionDefinitionKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));

+

+	/**

+	 * Returns the '<em><b>Extension Definition Kind</b></em>' literal with the specified literal value.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static ExtensionDefinitionKind get(String literal) {

+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

+			ExtensionDefinitionKind result = VALUES_ARRAY[i];

+			if (result.toString().equals(literal)) {

+				return result;

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * Returns the '<em><b>Extension Definition Kind</b></em>' literal with the specified name.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static ExtensionDefinitionKind getByName(String name) {

+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {

+			ExtensionDefinitionKind result = VALUES_ARRAY[i];

+			if (result.getName().equals(name)) {

+				return result;

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * Returns the '<em><b>Extension Definition Kind</b></em>' literal with the specified integer value.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static ExtensionDefinitionKind get(int value) {

+		switch (value) {

+			case ASSOCIATION_VALUE: return ASSOCIATION;

+			case GENERALIZATION_VALUE: return GENERALIZATION;

+			case MULTI_GENERALIZATION_VALUE: return MULTI_GENERALIZATION;

+			case FUSION_VALUE: return FUSION;

+		}

+		return null;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private final int value;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private final String name;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private final String literal;

+

+	/**

+	 * Only this class can construct instances.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private ExtensionDefinitionKind(int value, String name, String literal) {

+		this.value = value;

+		this.name = name;

+		this.literal = literal;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public int getValue() {

+	  return value;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public String getName() {

+	  return name;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public String getLiteral() {

+	  return literal;

+	}

+

+	/**

+	 * Returns the literal value of the enumerator, which is its string representation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String toString() {

+		return literal;

+	}

+	

+} //ExtensionDefinitionKind

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/FacadeMappping.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/FacadeMappping.java
new file mode 100644
index 00000000000..9deacd57b8a
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/FacadeMappping.java
@@ -0,0 +1,53 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facademapping;

+

+import org.eclipse.emf.common.util.EList;

+

+import org.eclipse.emf.ecore.EObject;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Facade Mappping</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.papyrus.facademapping.FacadeMappping#getMappings <em>Mappings</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.papyrus.facademapping.FacademappingPackage#getFacadeMappping()

+ * @model

+ * @generated

+ */

+public interface FacadeMappping extends EObject {

+	/**

+	 * Returns the value of the '<em><b>Mappings</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.papyrus.facademapping.Mapping}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Mappings</em>' containment reference list isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Mappings</em>' containment reference list.

+	 * @see org.eclipse.papyrus.facademapping.FacademappingPackage#getFacadeMappping_Mappings()

+	 * @model containment="true"

+	 * @generated

+	 */

+	EList<Mapping> getMappings();

+

+} // FacadeMappping

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/FacademappingFactory.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/FacademappingFactory.java
new file mode 100644
index 00000000000..b0db3005c29
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/FacademappingFactory.java
@@ -0,0 +1,71 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facademapping;

+

+import org.eclipse.emf.ecore.EFactory;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Factory</b> for the model.

+ * It provides a create method for each non-abstract class of the model.

+ * <!-- end-user-doc -->

+ * @see org.eclipse.papyrus.facademapping.FacademappingPackage

+ * @generated

+ */

+public interface FacademappingFactory extends EFactory {

+	/**

+	 * The singleton instance of the factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	FacademappingFactory eINSTANCE = org.eclipse.papyrus.facademapping.impl.FacademappingFactoryImpl.init();

+

+	/**

+	 * Returns a new object of class '<em>Mapping</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return a new object of class '<em>Mapping</em>'.

+	 * @generated

+	 */

+	Mapping createMapping();

+

+	/**

+	 * Returns a new object of class '<em>Stereotyped Mapping</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return a new object of class '<em>Stereotyped Mapping</em>'.

+	 * @generated

+	 */

+	StereotypedMapping createStereotypedMapping();

+

+	/**

+	 * Returns a new object of class '<em>Facade Mappping</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return a new object of class '<em>Facade Mappping</em>'.

+	 * @generated

+	 */

+	FacadeMappping createFacadeMappping();

+

+	/**

+	 * Returns the package supported by this factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the package supported by this factory.

+	 * @generated

+	 */

+	FacademappingPackage getFacademappingPackage();

+

+} //FacademappingFactory

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/FacademappingPackage.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/FacademappingPackage.java
new file mode 100644
index 00000000000..6cb348b3d0d
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/FacademappingPackage.java
@@ -0,0 +1,429 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facademapping;

+

+import org.eclipse.emf.ecore.EAttribute;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EEnum;

+import org.eclipse.emf.ecore.EPackage;

+import org.eclipse.emf.ecore.EReference;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Package</b> for the model.

+ * It contains accessors for the meta objects to represent

+ * <ul>

+ *   <li>each class,</li>

+ *   <li>each feature of each class,</li>

+ *   <li>each operation of each class,</li>

+ *   <li>each enum,</li>

+ *   <li>and each data type</li>

+ * </ul>

+ * <!-- end-user-doc -->

+ * @see org.eclipse.papyrus.facademapping.FacademappingFactory

+ * @model kind="package"

+ * @generated

+ */

+public interface FacademappingPackage extends EPackage {

+	/**

+	 * The package name.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	String eNAME = "facademapping";

+

+	/**

+	 * The package namespace URI.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	String eNS_URI = "http://www.eclipse.org/papyrus/facademapping";

+

+	/**

+	 * The package namespace name.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	String eNS_PREFIX = "facademapping";

+

+	/**

+	 * The singleton instance of the package.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	FacademappingPackage eINSTANCE = org.eclipse.papyrus.facademapping.impl.FacademappingPackageImpl.init();

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.facademapping.impl.MappingImpl <em>Mapping</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.papyrus.facademapping.impl.MappingImpl

+	 * @see org.eclipse.papyrus.facademapping.impl.FacademappingPackageImpl#getMapping()

+	 * @generated

+	 */

+	int MAPPING = 0;

+

+	/**

+	 * The feature id for the '<em><b>Uml Element</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int MAPPING__UML_ELEMENT = 0;

+

+	/**

+	 * The feature id for the '<em><b>Specific Domain Element</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int MAPPING__SPECIFIC_DOMAIN_ELEMENT = 1;

+

+	/**

+	 * The number of structural features of the '<em>Mapping</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int MAPPING_FEATURE_COUNT = 2;

+

+	/**

+	 * The number of operations of the '<em>Mapping</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int MAPPING_OPERATION_COUNT = 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.facademapping.impl.StereotypedMappingImpl <em>Stereotyped Mapping</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.papyrus.facademapping.impl.StereotypedMappingImpl

+	 * @see org.eclipse.papyrus.facademapping.impl.FacademappingPackageImpl#getStereotypedMapping()

+	 * @generated

+	 */

+	int STEREOTYPED_MAPPING = 1;

+

+	/**

+	 * The feature id for the '<em><b>Uml Element</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int STEREOTYPED_MAPPING__UML_ELEMENT = MAPPING__UML_ELEMENT;

+

+	/**

+	 * The feature id for the '<em><b>Specific Domain Element</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int STEREOTYPED_MAPPING__SPECIFIC_DOMAIN_ELEMENT = MAPPING__SPECIFIC_DOMAIN_ELEMENT;

+

+	/**

+	 * The feature id for the '<em><b>Applied Stereotypes</b></em>' reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int STEREOTYPED_MAPPING__APPLIED_STEREOTYPES = MAPPING_FEATURE_COUNT + 0;

+

+	/**

+	 * The feature id for the '<em><b>Kind</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int STEREOTYPED_MAPPING__KIND = MAPPING_FEATURE_COUNT + 1;

+

+	/**

+	 * The number of structural features of the '<em>Stereotyped Mapping</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int STEREOTYPED_MAPPING_FEATURE_COUNT = MAPPING_FEATURE_COUNT + 2;

+

+	/**

+	 * The number of operations of the '<em>Stereotyped Mapping</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int STEREOTYPED_MAPPING_OPERATION_COUNT = MAPPING_OPERATION_COUNT + 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.facademapping.impl.FacadeMapppingImpl <em>Facade Mappping</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.papyrus.facademapping.impl.FacadeMapppingImpl

+	 * @see org.eclipse.papyrus.facademapping.impl.FacademappingPackageImpl#getFacadeMappping()

+	 * @generated

+	 */

+	int FACADE_MAPPPING = 2;

+

+	/**

+	 * The feature id for the '<em><b>Mappings</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int FACADE_MAPPPING__MAPPINGS = 0;

+

+	/**

+	 * The number of structural features of the '<em>Facade Mappping</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int FACADE_MAPPPING_FEATURE_COUNT = 1;

+

+	/**

+	 * The number of operations of the '<em>Facade Mappping</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int FACADE_MAPPPING_OPERATION_COUNT = 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.facademapping.ExtensionDefinitionKind <em>Extension Definition Kind</em>}' enum.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.papyrus.facademapping.ExtensionDefinitionKind

+	 * @see org.eclipse.papyrus.facademapping.impl.FacademappingPackageImpl#getExtensionDefinitionKind()

+	 * @generated

+	 */

+	int EXTENSION_DEFINITION_KIND = 3;

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.facademapping.Mapping <em>Mapping</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>Mapping</em>'.

+	 * @see org.eclipse.papyrus.facademapping.Mapping

+	 * @generated

+	 */

+	EClass getMapping();

+

+	/**

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.facademapping.Mapping#getUmlElement <em>Uml Element</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the reference '<em>Uml Element</em>'.

+	 * @see org.eclipse.papyrus.facademapping.Mapping#getUmlElement()

+	 * @see #getMapping()

+	 * @generated

+	 */

+	EReference getMapping_UmlElement();

+

+	/**

+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.facademapping.Mapping#getSpecificDomainElement <em>Specific Domain Element</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the reference '<em>Specific Domain Element</em>'.

+	 * @see org.eclipse.papyrus.facademapping.Mapping#getSpecificDomainElement()

+	 * @see #getMapping()

+	 * @generated

+	 */

+	EReference getMapping_SpecificDomainElement();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.facademapping.StereotypedMapping <em>Stereotyped Mapping</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>Stereotyped Mapping</em>'.

+	 * @see org.eclipse.papyrus.facademapping.StereotypedMapping

+	 * @generated

+	 */

+	EClass getStereotypedMapping();

+

+	/**

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.facademapping.StereotypedMapping#getAppliedStereotypes <em>Applied Stereotypes</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the reference list '<em>Applied Stereotypes</em>'.

+	 * @see org.eclipse.papyrus.facademapping.StereotypedMapping#getAppliedStereotypes()

+	 * @see #getStereotypedMapping()

+	 * @generated

+	 */

+	EReference getStereotypedMapping_AppliedStereotypes();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.facademapping.StereotypedMapping#getKind <em>Kind</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Kind</em>'.

+	 * @see org.eclipse.papyrus.facademapping.StereotypedMapping#getKind()

+	 * @see #getStereotypedMapping()

+	 * @generated

+	 */

+	EAttribute getStereotypedMapping_Kind();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.facademapping.FacadeMappping <em>Facade Mappping</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>Facade Mappping</em>'.

+	 * @see org.eclipse.papyrus.facademapping.FacadeMappping

+	 * @generated

+	 */

+	EClass getFacadeMappping();

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.facademapping.FacadeMappping#getMappings <em>Mappings</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference list '<em>Mappings</em>'.

+	 * @see org.eclipse.papyrus.facademapping.FacadeMappping#getMappings()

+	 * @see #getFacadeMappping()

+	 * @generated

+	 */

+	EReference getFacadeMappping_Mappings();

+

+	/**

+	 * Returns the meta object for enum '{@link org.eclipse.papyrus.facademapping.ExtensionDefinitionKind <em>Extension Definition Kind</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for enum '<em>Extension Definition Kind</em>'.

+	 * @see org.eclipse.papyrus.facademapping.ExtensionDefinitionKind

+	 * @generated

+	 */

+	EEnum getExtensionDefinitionKind();

+

+	/**

+	 * Returns the factory that creates the instances of the model.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the factory that creates the instances of the model.

+	 * @generated

+	 */

+	FacademappingFactory getFacademappingFactory();

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * Defines literals for the meta objects that represent

+	 * <ul>

+	 *   <li>each class,</li>

+	 *   <li>each feature of each class,</li>

+	 *   <li>each operation of each class,</li>

+	 *   <li>each enum,</li>

+	 *   <li>and each data type</li>

+	 * </ul>

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	interface Literals {

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.facademapping.impl.MappingImpl <em>Mapping</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.papyrus.facademapping.impl.MappingImpl

+		 * @see org.eclipse.papyrus.facademapping.impl.FacademappingPackageImpl#getMapping()

+		 * @generated

+		 */

+		EClass MAPPING = eINSTANCE.getMapping();

+

+		/**

+		 * The meta object literal for the '<em><b>Uml Element</b></em>' reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EReference MAPPING__UML_ELEMENT = eINSTANCE.getMapping_UmlElement();

+

+		/**

+		 * The meta object literal for the '<em><b>Specific Domain Element</b></em>' reference feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EReference MAPPING__SPECIFIC_DOMAIN_ELEMENT = eINSTANCE.getMapping_SpecificDomainElement();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.facademapping.impl.StereotypedMappingImpl <em>Stereotyped Mapping</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.papyrus.facademapping.impl.StereotypedMappingImpl

+		 * @see org.eclipse.papyrus.facademapping.impl.FacademappingPackageImpl#getStereotypedMapping()

+		 * @generated

+		 */

+		EClass STEREOTYPED_MAPPING = eINSTANCE.getStereotypedMapping();

+

+		/**

+		 * The meta object literal for the '<em><b>Applied Stereotypes</b></em>' reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EReference STEREOTYPED_MAPPING__APPLIED_STEREOTYPES = eINSTANCE.getStereotypedMapping_AppliedStereotypes();

+

+		/**

+		 * The meta object literal for the '<em><b>Kind</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EAttribute STEREOTYPED_MAPPING__KIND = eINSTANCE.getStereotypedMapping_Kind();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.facademapping.impl.FacadeMapppingImpl <em>Facade Mappping</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.papyrus.facademapping.impl.FacadeMapppingImpl

+		 * @see org.eclipse.papyrus.facademapping.impl.FacademappingPackageImpl#getFacadeMappping()

+		 * @generated

+		 */

+		EClass FACADE_MAPPPING = eINSTANCE.getFacadeMappping();

+

+		/**

+		 * The meta object literal for the '<em><b>Mappings</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EReference FACADE_MAPPPING__MAPPINGS = eINSTANCE.getFacadeMappping_Mappings();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.facademapping.ExtensionDefinitionKind <em>Extension Definition Kind</em>}' enum.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.papyrus.facademapping.ExtensionDefinitionKind

+		 * @see org.eclipse.papyrus.facademapping.impl.FacademappingPackageImpl#getExtensionDefinitionKind()

+		 * @generated

+		 */

+		EEnum EXTENSION_DEFINITION_KIND = eINSTANCE.getExtensionDefinitionKind();

+

+	}

+

+} //FacademappingPackage

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/Mapping.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/Mapping.java
new file mode 100644
index 00000000000..50dc8b688df
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/Mapping.java
@@ -0,0 +1,88 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facademapping;

+

+import org.eclipse.emf.ecore.EObject;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Mapping</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.papyrus.facademapping.Mapping#getUmlElement <em>Uml Element</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facademapping.Mapping#getSpecificDomainElement <em>Specific Domain Element</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.papyrus.facademapping.FacademappingPackage#getMapping()

+ * @model

+ * @generated

+ */

+public interface Mapping extends EObject {

+	/**

+	 * Returns the value of the '<em><b>Uml Element</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Uml Element</em>' reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Uml Element</em>' reference.

+	 * @see #setUmlElement(EObject)

+	 * @see org.eclipse.papyrus.facademapping.FacademappingPackage#getMapping_UmlElement()

+	 * @model required="true"

+	 * @generated

+	 */

+	EObject getUmlElement();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.facademapping.Mapping#getUmlElement <em>Uml Element</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Uml Element</em>' reference.

+	 * @see #getUmlElement()

+	 * @generated

+	 */

+	void setUmlElement(EObject value);

+

+	/**

+	 * Returns the value of the '<em><b>Specific Domain Element</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Specific Domain Element</em>' reference isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Specific Domain Element</em>' reference.

+	 * @see #setSpecificDomainElement(EObject)

+	 * @see org.eclipse.papyrus.facademapping.FacademappingPackage#getMapping_SpecificDomainElement()

+	 * @model required="true"

+	 * @generated

+	 */

+	EObject getSpecificDomainElement();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.facademapping.Mapping#getSpecificDomainElement <em>Specific Domain Element</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Specific Domain Element</em>' reference.

+	 * @see #getSpecificDomainElement()

+	 * @generated

+	 */

+	void setSpecificDomainElement(EObject value);

+

+} // Mapping

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/StereotypedMapping.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/StereotypedMapping.java
new file mode 100644
index 00000000000..293fc9fd2ca
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/StereotypedMapping.java
@@ -0,0 +1,83 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facademapping;

+

+import org.eclipse.emf.common.util.EList;

+

+import org.eclipse.emf.ecore.EObject;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Stereotyped Mapping</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.papyrus.facademapping.StereotypedMapping#getAppliedStereotypes <em>Applied Stereotypes</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facademapping.StereotypedMapping#getKind <em>Kind</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.papyrus.facademapping.FacademappingPackage#getStereotypedMapping()

+ * @model

+ * @generated

+ */

+public interface StereotypedMapping extends Mapping {

+	/**

+	 * Returns the value of the '<em><b>Applied Stereotypes</b></em>' reference list.

+	 * The list contents are of type {@link org.eclipse.emf.ecore.EObject}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Applied Stereotypes</em>' reference list isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Applied Stereotypes</em>' reference list.

+	 * @see org.eclipse.papyrus.facademapping.FacademappingPackage#getStereotypedMapping_AppliedStereotypes()

+	 * @model required="true"

+	 * @generated

+	 */

+	EList<EObject> getAppliedStereotypes();

+

+	/**

+	 * Returns the value of the '<em><b>Kind</b></em>' attribute.

+	 * The literals are from the enumeration {@link org.eclipse.papyrus.facademapping.ExtensionDefinitionKind}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Kind</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Kind</em>' attribute.

+	 * @see org.eclipse.papyrus.facademapping.ExtensionDefinitionKind

+	 * @see #setKind(ExtensionDefinitionKind)

+	 * @see org.eclipse.papyrus.facademapping.FacademappingPackage#getStereotypedMapping_Kind()

+	 * @model

+	 * @generated

+	 */

+	ExtensionDefinitionKind getKind();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.facademapping.StereotypedMapping#getKind <em>Kind</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Kind</em>' attribute.

+	 * @see org.eclipse.papyrus.facademapping.ExtensionDefinitionKind

+	 * @see #getKind()

+	 * @generated

+	 */

+	void setKind(ExtensionDefinitionKind value);

+

+} // StereotypedMapping

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/impl/FacadeMapppingImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/impl/FacadeMapppingImpl.java
new file mode 100644
index 00000000000..a2c1c64665f
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/impl/FacadeMapppingImpl.java
@@ -0,0 +1,163 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facademapping.impl;

+

+import java.util.Collection;

+

+import org.eclipse.emf.common.notify.NotificationChain;

+

+import org.eclipse.emf.common.util.EList;

+

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.InternalEObject;

+

+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+

+import org.eclipse.emf.ecore.util.EObjectContainmentEList;

+import org.eclipse.emf.ecore.util.InternalEList;

+

+import org.eclipse.papyrus.facademapping.FacadeMappping;

+import org.eclipse.papyrus.facademapping.FacademappingPackage;

+import org.eclipse.papyrus.facademapping.Mapping;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Facade Mappping</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ *   <li>{@link org.eclipse.papyrus.facademapping.impl.FacadeMapppingImpl#getMappings <em>Mappings</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @generated

+ */

+public class FacadeMapppingImpl extends MinimalEObjectImpl.Container implements FacadeMappping {

+	/**

+	 * The cached value of the '{@link #getMappings() <em>Mappings</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getMappings()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<Mapping> mappings;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected FacadeMapppingImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return FacademappingPackage.Literals.FACADE_MAPPPING;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EList<Mapping> getMappings() {

+		if (mappings == null) {

+			mappings = new EObjectContainmentEList<Mapping>(Mapping.class, this, FacademappingPackage.FACADE_MAPPPING__MAPPINGS);

+		}

+		return mappings;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

+		switch (featureID) {

+			case FacademappingPackage.FACADE_MAPPPING__MAPPINGS:

+				return ((InternalEList<?>)getMappings()).basicRemove(otherEnd, msgs);

+		}

+		return super.eInverseRemove(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch (featureID) {

+			case FacademappingPackage.FACADE_MAPPPING__MAPPINGS:

+				return getMappings();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch (featureID) {

+			case FacademappingPackage.FACADE_MAPPPING__MAPPINGS:

+				getMappings().clear();

+				getMappings().addAll((Collection<? extends Mapping>)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch (featureID) {

+			case FacademappingPackage.FACADE_MAPPPING__MAPPINGS:

+				getMappings().clear();

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch (featureID) {

+			case FacademappingPackage.FACADE_MAPPPING__MAPPINGS:

+				return mappings != null && !mappings.isEmpty();

+		}

+		return super.eIsSet(featureID);

+	}

+

+} //FacadeMapppingImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/impl/FacademappingFactoryImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/impl/FacademappingFactoryImpl.java
new file mode 100644
index 00000000000..fac2ff51410
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/impl/FacademappingFactoryImpl.java
@@ -0,0 +1,179 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facademapping.impl;

+

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EDataType;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EPackage;

+

+import org.eclipse.emf.ecore.impl.EFactoryImpl;

+

+import org.eclipse.emf.ecore.plugin.EcorePlugin;

+

+import org.eclipse.papyrus.facademapping.*;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model <b>Factory</b>.

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class FacademappingFactoryImpl extends EFactoryImpl implements FacademappingFactory {

+	/**

+	 * Creates the default factory implementation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public static FacademappingFactory init() {

+		try {

+			FacademappingFactory theFacademappingFactory = (FacademappingFactory)EPackage.Registry.INSTANCE.getEFactory(FacademappingPackage.eNS_URI);

+			if (theFacademappingFactory != null) {

+				return theFacademappingFactory;

+			}

+		}

+		catch (Exception exception) {

+			EcorePlugin.INSTANCE.log(exception);

+		}

+		return new FacademappingFactoryImpl();

+	}

+

+	/**

+	 * Creates an instance of the factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public FacademappingFactoryImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public EObject create(EClass eClass) {

+		switch (eClass.getClassifierID()) {

+			case FacademappingPackage.MAPPING: return createMapping();

+			case FacademappingPackage.STEREOTYPED_MAPPING: return createStereotypedMapping();

+			case FacademappingPackage.FACADE_MAPPPING: return createFacadeMappping();

+			default:

+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object createFromString(EDataType eDataType, String initialValue) {

+		switch (eDataType.getClassifierID()) {

+			case FacademappingPackage.EXTENSION_DEFINITION_KIND:

+				return createExtensionDefinitionKindFromString(eDataType, initialValue);

+			default:

+				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String convertToString(EDataType eDataType, Object instanceValue) {

+		switch (eDataType.getClassifierID()) {

+			case FacademappingPackage.EXTENSION_DEFINITION_KIND:

+				return convertExtensionDefinitionKindToString(eDataType, instanceValue);

+			default:

+				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public Mapping createMapping() {

+		MappingImpl mapping = new MappingImpl();

+		return mapping;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public StereotypedMapping createStereotypedMapping() {

+		StereotypedMappingImpl stereotypedMapping = new StereotypedMappingImpl();

+		return stereotypedMapping;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public FacadeMappping createFacadeMappping() {

+		FacadeMapppingImpl facadeMappping = new FacadeMapppingImpl();

+		return facadeMappping;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public ExtensionDefinitionKind createExtensionDefinitionKindFromString(EDataType eDataType, String initialValue) {

+		ExtensionDefinitionKind result = ExtensionDefinitionKind.get(initialValue);

+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");

+		return result;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public String convertExtensionDefinitionKindToString(EDataType eDataType, Object instanceValue) {

+		return instanceValue == null ? null : instanceValue.toString();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public FacademappingPackage getFacademappingPackage() {

+		return (FacademappingPackage)getEPackage();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @deprecated

+	 * @generated

+	 */

+	@Deprecated

+	public static FacademappingPackage getPackage() {

+		return FacademappingPackage.eINSTANCE;

+	}

+

+} //FacademappingFactoryImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/impl/FacademappingPackageImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/impl/FacademappingPackageImpl.java
new file mode 100644
index 00000000000..4b9aadff35a
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/impl/FacademappingPackageImpl.java
@@ -0,0 +1,304 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facademapping.impl;

+

+import org.eclipse.emf.ecore.EAttribute;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EEnum;

+import org.eclipse.emf.ecore.EPackage;

+import org.eclipse.emf.ecore.EReference;

+

+import org.eclipse.emf.ecore.impl.EPackageImpl;

+

+import org.eclipse.papyrus.facademapping.ExtensionDefinitionKind;

+import org.eclipse.papyrus.facademapping.FacadeMappping;

+import org.eclipse.papyrus.facademapping.FacademappingFactory;

+import org.eclipse.papyrus.facademapping.FacademappingPackage;

+import org.eclipse.papyrus.facademapping.Mapping;

+import org.eclipse.papyrus.facademapping.StereotypedMapping;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model <b>Package</b>.

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class FacademappingPackageImpl extends EPackageImpl implements FacademappingPackage {

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass mappingEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass stereotypedMappingEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass facadeMapppingEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EEnum extensionDefinitionKindEEnum = null;

+

+	/**

+	 * Creates an instance of the model <b>Package</b>, registered with

+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

+	 * package URI value.

+	 * <p>Note: the correct way to create the package is via the static

+	 * factory method {@link #init init()}, which also performs

+	 * initialization of the package, or returns the registered package,

+	 * if one already exists.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.emf.ecore.EPackage.Registry

+	 * @see org.eclipse.papyrus.facademapping.FacademappingPackage#eNS_URI

+	 * @see #init()

+	 * @generated

+	 */

+	private FacademappingPackageImpl() {

+		super(eNS_URI, FacademappingFactory.eINSTANCE);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private static boolean isInited = false;

+

+	/**

+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

+	 * 

+	 * <p>This method is used to initialize {@link FacademappingPackage#eINSTANCE} when that field is accessed.

+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #eNS_URI

+	 * @see #createPackageContents()

+	 * @see #initializePackageContents()

+	 * @generated

+	 */

+	public static FacademappingPackage init() {

+		if (isInited) return (FacademappingPackage)EPackage.Registry.INSTANCE.getEPackage(FacademappingPackage.eNS_URI);

+

+		// Obtain or create and register package

+		FacademappingPackageImpl theFacademappingPackage = (FacademappingPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof FacademappingPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new FacademappingPackageImpl());

+

+		isInited = true;

+

+		// Create package meta-data objects

+		theFacademappingPackage.createPackageContents();

+

+		// Initialize created meta-data

+		theFacademappingPackage.initializePackageContents();

+

+		// Mark meta-data to indicate it can't be changed

+		theFacademappingPackage.freeze();

+

+  

+		// Update the registry and return the package

+		EPackage.Registry.INSTANCE.put(FacademappingPackage.eNS_URI, theFacademappingPackage);

+		return theFacademappingPackage;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EClass getMapping() {

+		return mappingEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EReference getMapping_UmlElement() {

+		return (EReference)mappingEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EReference getMapping_SpecificDomainElement() {

+		return (EReference)mappingEClass.getEStructuralFeatures().get(1);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EClass getStereotypedMapping() {

+		return stereotypedMappingEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EReference getStereotypedMapping_AppliedStereotypes() {

+		return (EReference)stereotypedMappingEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EAttribute getStereotypedMapping_Kind() {

+		return (EAttribute)stereotypedMappingEClass.getEStructuralFeatures().get(1);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EClass getFacadeMappping() {

+		return facadeMapppingEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EReference getFacadeMappping_Mappings() {

+		return (EReference)facadeMapppingEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EEnum getExtensionDefinitionKind() {

+		return extensionDefinitionKindEEnum;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public FacademappingFactory getFacademappingFactory() {

+		return (FacademappingFactory)getEFactoryInstance();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private boolean isCreated = false;

+

+	/**

+	 * Creates the meta-model objects for the package.  This method is

+	 * guarded to have no affect on any invocation but its first.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void createPackageContents() {

+		if (isCreated) return;

+		isCreated = true;

+

+		// Create classes and their features

+		mappingEClass = createEClass(MAPPING);

+		createEReference(mappingEClass, MAPPING__UML_ELEMENT);

+		createEReference(mappingEClass, MAPPING__SPECIFIC_DOMAIN_ELEMENT);

+

+		stereotypedMappingEClass = createEClass(STEREOTYPED_MAPPING);

+		createEReference(stereotypedMappingEClass, STEREOTYPED_MAPPING__APPLIED_STEREOTYPES);

+		createEAttribute(stereotypedMappingEClass, STEREOTYPED_MAPPING__KIND);

+

+		facadeMapppingEClass = createEClass(FACADE_MAPPPING);

+		createEReference(facadeMapppingEClass, FACADE_MAPPPING__MAPPINGS);

+

+		// Create enums

+		extensionDefinitionKindEEnum = createEEnum(EXTENSION_DEFINITION_KIND);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private boolean isInitialized = false;

+

+	/**

+	 * Complete the initialization of the package and its meta-model.  This

+	 * method is guarded to have no affect on any invocation but its first.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void initializePackageContents() {

+		if (isInitialized) return;

+		isInitialized = true;

+

+		// Initialize package

+		setName(eNAME);

+		setNsPrefix(eNS_PREFIX);

+		setNsURI(eNS_URI);

+

+		// Create type parameters

+

+		// Set bounds for type parameters

+

+		// Add supertypes to classes

+		stereotypedMappingEClass.getESuperTypes().add(this.getMapping());

+

+		// Initialize classes, features, and operations; add parameters

+		initEClass(mappingEClass, Mapping.class, "Mapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getMapping_UmlElement(), ecorePackage.getEObject(), null, "umlElement", null, 1, 1, Mapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEReference(getMapping_SpecificDomainElement(), ecorePackage.getEObject(), null, "specificDomainElement", null, 1, 1, Mapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(stereotypedMappingEClass, StereotypedMapping.class, "StereotypedMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getStereotypedMapping_AppliedStereotypes(), ecorePackage.getEObject(), null, "appliedStereotypes", null, 1, -1, StereotypedMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+		initEAttribute(getStereotypedMapping_Kind(), this.getExtensionDefinitionKind(), "kind", null, 0, 1, StereotypedMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(facadeMapppingEClass, FacadeMappping.class, "FacadeMappping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getFacadeMappping_Mappings(), this.getMapping(), null, "mappings", null, 0, -1, FacadeMappping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		// Initialize enums and add enum literals

+		initEEnum(extensionDefinitionKindEEnum, ExtensionDefinitionKind.class, "ExtensionDefinitionKind");

+		addEEnumLiteral(extensionDefinitionKindEEnum, ExtensionDefinitionKind.ASSOCIATION);

+		addEEnumLiteral(extensionDefinitionKindEEnum, ExtensionDefinitionKind.GENERALIZATION);

+		addEEnumLiteral(extensionDefinitionKindEEnum, ExtensionDefinitionKind.MULTI_GENERALIZATION);

+		addEEnumLiteral(extensionDefinitionKindEEnum, ExtensionDefinitionKind.FUSION);

+

+		// Create resource

+		createResource(eNS_URI);

+	}

+

+} //FacademappingPackageImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/impl/MappingImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/impl/MappingImpl.java
new file mode 100644
index 00000000000..2b04d97253e
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/impl/MappingImpl.java
@@ -0,0 +1,228 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facademapping.impl;

+

+import org.eclipse.emf.common.notify.Notification;

+

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.InternalEObject;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+

+import org.eclipse.papyrus.facademapping.FacademappingPackage;

+import org.eclipse.papyrus.facademapping.Mapping;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Mapping</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ *   <li>{@link org.eclipse.papyrus.facademapping.impl.MappingImpl#getUmlElement <em>Uml Element</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facademapping.impl.MappingImpl#getSpecificDomainElement <em>Specific Domain Element</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @generated

+ */

+public class MappingImpl extends MinimalEObjectImpl.Container implements Mapping {

+	/**

+	 * The cached value of the '{@link #getUmlElement() <em>Uml Element</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getUmlElement()

+	 * @generated

+	 * @ordered

+	 */

+	protected EObject umlElement;

+

+	/**

+	 * The cached value of the '{@link #getSpecificDomainElement() <em>Specific Domain Element</em>}' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getSpecificDomainElement()

+	 * @generated

+	 * @ordered

+	 */

+	protected EObject specificDomainElement;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected MappingImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return FacademappingPackage.Literals.MAPPING;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EObject getUmlElement() {

+		if (umlElement != null && umlElement.eIsProxy()) {

+			InternalEObject oldUmlElement = (InternalEObject)umlElement;

+			umlElement = eResolveProxy(oldUmlElement);

+			if (umlElement != oldUmlElement) {

+				if (eNotificationRequired())

+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, FacademappingPackage.MAPPING__UML_ELEMENT, oldUmlElement, umlElement));

+			}

+		}

+		return umlElement;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EObject basicGetUmlElement() {

+		return umlElement;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setUmlElement(EObject newUmlElement) {

+		EObject oldUmlElement = umlElement;

+		umlElement = newUmlElement;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, FacademappingPackage.MAPPING__UML_ELEMENT, oldUmlElement, umlElement));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EObject getSpecificDomainElement() {

+		if (specificDomainElement != null && specificDomainElement.eIsProxy()) {

+			InternalEObject oldSpecificDomainElement = (InternalEObject)specificDomainElement;

+			specificDomainElement = eResolveProxy(oldSpecificDomainElement);

+			if (specificDomainElement != oldSpecificDomainElement) {

+				if (eNotificationRequired())

+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, FacademappingPackage.MAPPING__SPECIFIC_DOMAIN_ELEMENT, oldSpecificDomainElement, specificDomainElement));

+			}

+		}

+		return specificDomainElement;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EObject basicGetSpecificDomainElement() {

+		return specificDomainElement;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setSpecificDomainElement(EObject newSpecificDomainElement) {

+		EObject oldSpecificDomainElement = specificDomainElement;

+		specificDomainElement = newSpecificDomainElement;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, FacademappingPackage.MAPPING__SPECIFIC_DOMAIN_ELEMENT, oldSpecificDomainElement, specificDomainElement));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch (featureID) {

+			case FacademappingPackage.MAPPING__UML_ELEMENT:

+				if (resolve) return getUmlElement();

+				return basicGetUmlElement();

+			case FacademappingPackage.MAPPING__SPECIFIC_DOMAIN_ELEMENT:

+				if (resolve) return getSpecificDomainElement();

+				return basicGetSpecificDomainElement();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch (featureID) {

+			case FacademappingPackage.MAPPING__UML_ELEMENT:

+				setUmlElement((EObject)newValue);

+				return;

+			case FacademappingPackage.MAPPING__SPECIFIC_DOMAIN_ELEMENT:

+				setSpecificDomainElement((EObject)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch (featureID) {

+			case FacademappingPackage.MAPPING__UML_ELEMENT:

+				setUmlElement((EObject)null);

+				return;

+			case FacademappingPackage.MAPPING__SPECIFIC_DOMAIN_ELEMENT:

+				setSpecificDomainElement((EObject)null);

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch (featureID) {

+			case FacademappingPackage.MAPPING__UML_ELEMENT:

+				return umlElement != null;

+			case FacademappingPackage.MAPPING__SPECIFIC_DOMAIN_ELEMENT:

+				return specificDomainElement != null;

+		}

+		return super.eIsSet(featureID);

+	}

+

+} //MappingImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/impl/StereotypedMappingImpl.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/impl/StereotypedMappingImpl.java
new file mode 100644
index 00000000000..91cf2fad01a
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/impl/StereotypedMappingImpl.java
@@ -0,0 +1,216 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facademapping.impl;

+

+import java.util.Collection;

+

+import org.eclipse.emf.common.notify.Notification;

+

+import org.eclipse.emf.common.util.EList;

+

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EObject;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+

+import org.eclipse.emf.ecore.util.EObjectResolvingEList;

+

+import org.eclipse.papyrus.facademapping.ExtensionDefinitionKind;

+import org.eclipse.papyrus.facademapping.FacademappingPackage;

+import org.eclipse.papyrus.facademapping.StereotypedMapping;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Stereotyped Mapping</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ *   <li>{@link org.eclipse.papyrus.facademapping.impl.StereotypedMappingImpl#getAppliedStereotypes <em>Applied Stereotypes</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.facademapping.impl.StereotypedMappingImpl#getKind <em>Kind</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @generated

+ */

+public class StereotypedMappingImpl extends MappingImpl implements StereotypedMapping {

+	/**

+	 * The cached value of the '{@link #getAppliedStereotypes() <em>Applied Stereotypes</em>}' reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getAppliedStereotypes()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<EObject> appliedStereotypes;

+

+	/**

+	 * The default value of the '{@link #getKind() <em>Kind</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getKind()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final ExtensionDefinitionKind KIND_EDEFAULT = ExtensionDefinitionKind.ASSOCIATION;

+

+	/**

+	 * The cached value of the '{@link #getKind() <em>Kind</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getKind()

+	 * @generated

+	 * @ordered

+	 */

+	protected ExtensionDefinitionKind kind = KIND_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected StereotypedMappingImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return FacademappingPackage.Literals.STEREOTYPED_MAPPING;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EList<EObject> getAppliedStereotypes() {

+		if (appliedStereotypes == null) {

+			appliedStereotypes = new EObjectResolvingEList<EObject>(EObject.class, this, FacademappingPackage.STEREOTYPED_MAPPING__APPLIED_STEREOTYPES);

+		}

+		return appliedStereotypes;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public ExtensionDefinitionKind getKind() {

+		return kind;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setKind(ExtensionDefinitionKind newKind) {

+		ExtensionDefinitionKind oldKind = kind;

+		kind = newKind == null ? KIND_EDEFAULT : newKind;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, FacademappingPackage.STEREOTYPED_MAPPING__KIND, oldKind, kind));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch (featureID) {

+			case FacademappingPackage.STEREOTYPED_MAPPING__APPLIED_STEREOTYPES:

+				return getAppliedStereotypes();

+			case FacademappingPackage.STEREOTYPED_MAPPING__KIND:

+				return getKind();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch (featureID) {

+			case FacademappingPackage.STEREOTYPED_MAPPING__APPLIED_STEREOTYPES:

+				getAppliedStereotypes().clear();

+				getAppliedStereotypes().addAll((Collection<? extends EObject>)newValue);

+				return;

+			case FacademappingPackage.STEREOTYPED_MAPPING__KIND:

+				setKind((ExtensionDefinitionKind)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch (featureID) {

+			case FacademappingPackage.STEREOTYPED_MAPPING__APPLIED_STEREOTYPES:

+				getAppliedStereotypes().clear();

+				return;

+			case FacademappingPackage.STEREOTYPED_MAPPING__KIND:

+				setKind(KIND_EDEFAULT);

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch (featureID) {

+			case FacademappingPackage.STEREOTYPED_MAPPING__APPLIED_STEREOTYPES:

+				return appliedStereotypes != null && !appliedStereotypes.isEmpty();

+			case FacademappingPackage.STEREOTYPED_MAPPING__KIND:

+				return kind != KIND_EDEFAULT;

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String toString() {

+		if (eIsProxy()) return super.toString();

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (kind: ");

+		result.append(kind);

+		result.append(')');

+		return result.toString();

+	}

+

+} //StereotypedMappingImpl

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/util/FacademappingAdapterFactory.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/util/FacademappingAdapterFactory.java
new file mode 100644
index 00000000000..c7668725040
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/util/FacademappingAdapterFactory.java
@@ -0,0 +1,167 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facademapping.util;

+

+import org.eclipse.emf.common.notify.Adapter;

+import org.eclipse.emf.common.notify.Notifier;

+

+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

+

+import org.eclipse.emf.ecore.EObject;

+

+import org.eclipse.papyrus.facademapping.*;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Adapter Factory</b> for the model.

+ * It provides an adapter <code>createXXX</code> method for each class of the model.

+ * <!-- end-user-doc -->

+ * @see org.eclipse.papyrus.facademapping.FacademappingPackage

+ * @generated

+ */

+public class FacademappingAdapterFactory extends AdapterFactoryImpl {

+	/**

+	 * The cached model package.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected static FacademappingPackage modelPackage;

+

+	/**

+	 * Creates an instance of the adapter factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public FacademappingAdapterFactory() {

+		if (modelPackage == null) {

+			modelPackage = FacademappingPackage.eINSTANCE;

+		}

+	}

+

+	/**

+	 * Returns whether this factory is applicable for the type of the object.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

+	 * <!-- end-user-doc -->

+	 * @return whether this factory is applicable for the type of the object.

+	 * @generated

+	 */

+	@Override

+	public boolean isFactoryForType(Object object) {

+		if (object == modelPackage) {

+			return true;

+		}

+		if (object instanceof EObject) {

+			return ((EObject)object).eClass().getEPackage() == modelPackage;

+		}

+		return false;

+	}

+

+	/**

+	 * The switch that delegates to the <code>createXXX</code> methods.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected FacademappingSwitch<Adapter> modelSwitch =

+		new FacademappingSwitch<Adapter>() {

+			@Override

+			public Adapter caseMapping(Mapping object) {

+				return createMappingAdapter();

+			}

+			@Override

+			public Adapter caseStereotypedMapping(StereotypedMapping object) {

+				return createStereotypedMappingAdapter();

+			}

+			@Override

+			public Adapter caseFacadeMappping(FacadeMappping object) {

+				return createFacadeMapppingAdapter();

+			}

+			@Override

+			public Adapter defaultCase(EObject object) {

+				return createEObjectAdapter();

+			}

+		};

+

+	/**

+	 * Creates an adapter for the <code>target</code>.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param target the object to adapt.

+	 * @return the adapter for the <code>target</code>.

+	 * @generated

+	 */

+	@Override

+	public Adapter createAdapter(Notifier target) {

+		return modelSwitch.doSwitch((EObject)target);

+	}

+

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.facademapping.Mapping <em>Mapping</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.facademapping.Mapping

+	 * @generated

+	 */

+	public Adapter createMappingAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.facademapping.StereotypedMapping <em>Stereotyped Mapping</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.facademapping.StereotypedMapping

+	 * @generated

+	 */

+	public Adapter createStereotypedMappingAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.facademapping.FacadeMappping <em>Facade Mappping</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.facademapping.FacadeMappping

+	 * @generated

+	 */

+	public Adapter createFacadeMapppingAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for the default case.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null.

+	 * <!-- end-user-doc -->

+	 * @return the new adapter.

+	 * @generated

+	 */

+	public Adapter createEObjectAdapter() {

+		return null;

+	}

+

+} //FacademappingAdapterFactory

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/util/FacademappingSwitch.java b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/util/FacademappingSwitch.java
new file mode 100644
index 00000000000..4b9dc80c100
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/src/org/eclipse/papyrus/facademapping/util/FacademappingSwitch.java
@@ -0,0 +1,164 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.facademapping.util;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EPackage;

+

+import org.eclipse.emf.ecore.util.Switch;

+

+import org.eclipse.papyrus.facademapping.*;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Switch</b> for the model's inheritance hierarchy.

+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)}

+ * to invoke the <code>caseXXX</code> method for each class of the model,

+ * starting with the actual class of the object

+ * and proceeding up the inheritance hierarchy

+ * until a non-null result is returned,

+ * which is the result of the switch.

+ * <!-- end-user-doc -->

+ * @see org.eclipse.papyrus.facademapping.FacademappingPackage

+ * @generated

+ */

+public class FacademappingSwitch<T> extends Switch<T> {

+	/**

+	 * The cached model package

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected static FacademappingPackage modelPackage;

+

+	/**

+	 * Creates an instance of the switch.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public FacademappingSwitch() {

+		if (modelPackage == null) {

+			modelPackage = FacademappingPackage.eINSTANCE;

+		}

+	}

+

+	/**

+	 * Checks whether this is a switch for the given package.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @parameter ePackage the package in question.

+	 * @return whether this is a switch for the given package.

+	 * @generated

+	 */

+	@Override

+	protected boolean isSwitchFor(EPackage ePackage) {

+		return ePackage == modelPackage;

+	}

+

+	/**

+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the first non-null result returned by a <code>caseXXX</code> call.

+	 * @generated

+	 */

+	@Override

+	protected T doSwitch(int classifierID, EObject theEObject) {

+		switch (classifierID) {

+			case FacademappingPackage.MAPPING: {

+				Mapping mapping = (Mapping)theEObject;

+				T result = caseMapping(mapping);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case FacademappingPackage.STEREOTYPED_MAPPING: {

+				StereotypedMapping stereotypedMapping = (StereotypedMapping)theEObject;

+				T result = caseStereotypedMapping(stereotypedMapping);

+				if (result == null) result = caseMapping(stereotypedMapping);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case FacademappingPackage.FACADE_MAPPPING: {

+				FacadeMappping facadeMappping = (FacadeMappping)theEObject;

+				T result = caseFacadeMappping(facadeMappping);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			default: return defaultCase(theEObject);

+		}

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Mapping</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 * @param object the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Mapping</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseMapping(Mapping object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Stereotyped Mapping</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 * @param object the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Stereotyped Mapping</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseStereotypedMapping(StereotypedMapping object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Facade Mappping</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 * @param object the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Facade Mappping</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseFacadeMappping(FacadeMappping object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch, but this is the last case anyway.

+	 * <!-- end-user-doc -->

+	 * @param object the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

+	 * @generated

+	 */

+	@Override

+	public T defaultCase(EObject object) {

+		return null;

+	}

+

+} //FacademappingSwitch

diff --git a/extraplugins/facade/org.eclipse.papyrus.facade/text/description.txt b/extraplugins/facade/org.eclipse.papyrus.facade/text/description.txt
new file mode 100644
index 00000000000..1dbba509fba
--- /dev/null
+++ b/extraplugins/facade/org.eclipse.papyrus.facade/text/description.txt
@@ -0,0 +1,12 @@
+Model Facade

+

+This model description is not a real EMF artifact. It was generated by the

+org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's

+code generator can be extended.

+This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.

+

+Package facade <http://www.eclipse.org/papyrus/facade>

+

+  Class Facade

+    Reference extensionDefinitions : ExtensionDefinition<<0..*>>

+    Reference virtualmetamodel : VirtualMetamodel

diff --git a/extraplugins/org.eclipse.papyrus.qvtTransformation/src/org/eclipse/papyrus/qvttransformation/Activator.java b/extraplugins/org.eclipse.papyrus.qvtTransformation/src/org/eclipse/papyrus/qvttransformation/Activator.java
index 0696dd4859c..bed24bdc18a 100644
--- a/extraplugins/org.eclipse.papyrus.qvtTransformation/src/org/eclipse/papyrus/qvttransformation/Activator.java
+++ b/extraplugins/org.eclipse.papyrus.qvtTransformation/src/org/eclipse/papyrus/qvttransformation/Activator.java
@@ -8,7 +8,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *  Florian Noyrit  florian.noyrit@cea.fr - Initial API and implementation

+ *  CEA LIST - Initial API and implementation

  *

  *****************************************************************************/

 package org.eclipse.papyrus.qvttransformation;

diff --git a/extraplugins/org.eclipse.papyrus.qvtTransformation/src/org/eclipse/papyrus/qvttransformation/popup/actions/SelectQVTTransformation.java b/extraplugins/org.eclipse.papyrus.qvtTransformation/src/org/eclipse/papyrus/qvttransformation/popup/actions/SelectQVTTransformation.java
index 982b4ae4f07..33d9fc465f1 100644
--- a/extraplugins/org.eclipse.papyrus.qvtTransformation/src/org/eclipse/papyrus/qvttransformation/popup/actions/SelectQVTTransformation.java
+++ b/extraplugins/org.eclipse.papyrus.qvtTransformation/src/org/eclipse/papyrus/qvttransformation/popup/actions/SelectQVTTransformation.java
@@ -8,7 +8,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *  Florian Noyrit  florian.noyrit@cea.fr - Initial API and implementation
+ *  CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
 package org.eclipse.papyrus.qvttransformation.popup.actions;
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/.classpath b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/.classpath
index 304e86186aa..ad32c83a788 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/.classpath
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/META-INF/MANIFEST.MF b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/META-INF/MANIFEST.MF
index 4c09d0e4447..5c9a4e1319d 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/META-INF/MANIFEST.MF
@@ -21,5 +21,5 @@ Bundle-Name: %pluginName
 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.fcm.profile;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

 

diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/build.properties b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/build.properties
index 5348e5d6f39..cb863c1cf51 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/build.properties
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/build.properties
@@ -16,6 +16,4 @@ bin.includes = .,\
 jars.compile.order = .

 source.. = src/

 output.. = bin/

-bin.excludes = model/uml.ecore,\

-               model/ecore.ecore

 src.includes = about.html

diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.ecore b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.ecore
index 3c0879c3851..c432bc318ce 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.ecore
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.ecore
@@ -5,33 +5,17 @@
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="The template parameters list defines the parameters that are passed to the Acceleo template. If empty, the formal parameter list of the package template is used."/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="templateParams" ordered="false"
-        unique="false" upperBound="-1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Classifier"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_Element" ordered="false"
         unique="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Element"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" ordered="false" unique="false"
-        lowerBound="1" eType="#//TemplateKind"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actualChoice" ordered="false"
-        unique="false" eType="#//ActualChoice"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="TemplateKind">
-    <eLiterals name="PassFormal"/>
-    <eLiterals name="LoopOperations" value="1"/>
-    <eLiterals name="LoopProperty" value="2"/>
-    <eLiterals name="Accumulate" value="3"/>
-    <eLiterals name="LoopLiterals" value="4"/>
-    <eLiterals name="LateEvaluation" value="5">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="LateEvaluation is more a tempalte binding rather than a template definition. In"/>
-      </eAnnotations>
-    </eLiterals>
-    <eLiterals name="LoopPorts" value="6"/>
-    <eLiterals name="PassClassifier" value="7"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="ActualChoice">
-    <eLiterals name="PassActual"/>
-    <eLiterals name="InterfaceOfPPort" value="1"/>
-    <eLiterals name="InterfaceOfRport" value="2"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="helper" ordered="false"
+        eType="#//BindingHelper"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="BindingHelper">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="A binding helper is responsible for creating sub-elements. For instance, if the formal parameter of a template is an interface, it might be required to instantiate an operation for each operation of the interface."/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="base_Class" ordered="false"
+        lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Class"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ConfigurationProperty">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
@@ -132,6 +116,8 @@
   <eClassifiers xsi:type="ecore:EClass" name="InstanceConfigurator">
     <eStructuralFeatures xsi:type="ecore:EReference" name="base_Class" ordered="false"
         lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Class"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="onNodeModel" ordered="false"
+        eType="ecore:EDataType platform:/plugin/org.eclipse.uml2.types/model/Types.ecore#//Boolean"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="RuleApplication">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
@@ -306,10 +292,4 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="connector" ordered="false"
         lowerBound="1" eType="#//Connector"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ExtendedSignature">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="base_TemplateSignature"
-        ordered="false" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//TemplateSignature"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="baseSignature" ordered="false"
-        lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//TemplateSignature"/>
-  </eClassifiers>
 </ecore:EPackage>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.genmodel b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.genmodel
index 4641df976dc..46a1cbba5ab 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.genmodel
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.genmodel
@@ -7,21 +7,6 @@
   <foreignModel>FCM.ecore</foreignModel>
   <genPackages prefix="FCM" basePackage="org.eclipse.papyrus" resource="XML" disposableProviderFactory="true"
       ecorePackage="FCM.ecore#/">
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="FCM.ecore#//TemplateKind">
-      <genEnumLiterals ecoreEnumLiteral="FCM.ecore#//TemplateKind/PassFormal"/>
-      <genEnumLiterals ecoreEnumLiteral="FCM.ecore#//TemplateKind/LoopOperations"/>
-      <genEnumLiterals ecoreEnumLiteral="FCM.ecore#//TemplateKind/LoopProperty"/>
-      <genEnumLiterals ecoreEnumLiteral="FCM.ecore#//TemplateKind/Accumulate"/>
-      <genEnumLiterals ecoreEnumLiteral="FCM.ecore#//TemplateKind/LoopLiterals"/>
-      <genEnumLiterals ecoreEnumLiteral="FCM.ecore#//TemplateKind/LateEvaluation"/>
-      <genEnumLiterals ecoreEnumLiteral="FCM.ecore#//TemplateKind/LoopPorts"/>
-      <genEnumLiterals ecoreEnumLiteral="FCM.ecore#//TemplateKind/PassClassifier"/>
-    </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="FCM.ecore#//ActualChoice">
-      <genEnumLiterals ecoreEnumLiteral="FCM.ecore#//ActualChoice/PassActual"/>
-      <genEnumLiterals ecoreEnumLiteral="FCM.ecore#//ActualChoice/InterfaceOfPPort"/>
-      <genEnumLiterals ecoreEnumLiteral="FCM.ecore#//ActualChoice/InterfaceOfRport"/>
-    </genEnums>
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="FCM.ecore#//ContainerRuleKind">
       <genEnumLiterals ecoreEnumLiteral="FCM.ecore#//ContainerRuleKind/ComponentRule"/>
       <genEnumLiterals ecoreEnumLiteral="FCM.ecore#//ContainerRuleKind/LightWeightOORule"/>
@@ -33,10 +18,11 @@
       <genEnumLiterals ecoreEnumLiteral="FCM.ecore#//InterceptionKind/InterceptAllIn"/>
     </genEnums>
     <genClasses ecoreClass="FCM.ecore#//Template">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference FCM.ecore#//Template/templateParams"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference FCM.ecore#//Template/base_Element"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute FCM.ecore#//Template/kind"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute FCM.ecore#//Template/actualChoice"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference FCM.ecore#//Template/helper"/>
+    </genClasses>
+    <genClasses ecoreClass="FCM.ecore#//BindingHelper">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference FCM.ecore#//BindingHelper/base_Class"/>
     </genClasses>
     <genClasses ecoreClass="FCM.ecore#//ConfigurationProperty">
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference FCM.ecore#//ConfigurationProperty/base_Property"/>
@@ -83,6 +69,7 @@
     </genClasses>
     <genClasses ecoreClass="FCM.ecore#//InstanceConfigurator">
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference FCM.ecore#//InstanceConfigurator/base_Class"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute FCM.ecore#//InstanceConfigurator/onNodeModel"/>
     </genClasses>
     <genClasses ecoreClass="FCM.ecore#//RuleApplication">
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference FCM.ecore#//RuleApplication/base_Class"/>
@@ -181,9 +168,5 @@
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference FCM.ecore#//ConnectorConfiguration/base_Slot"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference FCM.ecore#//ConnectorConfiguration/connector"/>
     </genClasses>
-    <genClasses ecoreClass="FCM.ecore#//ExtendedSignature">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference FCM.ecore#//ExtendedSignature/base_TemplateSignature"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference FCM.ecore#//ExtendedSignature/baseSignature"/>
-    </genClasses>
   </genPackages>
 </genmodel:GenModel>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.profile.notation b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.profile.notation
index 2b6b95700a7..c95b92fa8b2 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.profile.notation
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.profile.notation
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:l2="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">
   <notation:Diagram xmi:id="_Va74cGE3Ed-1rN74nkR_XQ" type="PapyrusUMLProfileDiagram" name="Components" measurementUnit="Pixel">
     <children xmi:type="notation:Shape" xmi:id="_iXBUYGE3Ed-1rN74nkR_XQ" type="1026" fontName="Sans Serif" fontHeight="10" lineColor="0">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8yLrAE2lEeG8L5eAOYvthg" source="QualifiedName">
@@ -23,6 +23,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_iXGz9mE3Ed-1rN74nkR_XQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iXGz92E3Ed-1rN74nkR_XQ"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4GZmgHI0EeOZxcUd14vDog" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4GZmgXI0EeOZxcUd14vDog"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4GZmgnI0EeOZxcUd14vDog"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_iXB7cGE3Ed-1rN74nkR_XQ"/>
       <element xmi:type="uml:Stereotype" href="FCM.profile.uml#_te7YAMtkEd2H_o0jIC6qDQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iXB7cWE3Ed-1rN74nkR_XQ" x="576" y="153" width="226" height="73"/>
@@ -42,6 +46,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_jAr8d2E3Ed-1rN74nkR_XQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jAr8eGE3Ed-1rN74nkR_XQ"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4GgUMHI0EeOZxcUd14vDog" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4GgUMXI0EeOZxcUd14vDog"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4GgUMnI0EeOZxcUd14vDog"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_jArVYWE3Ed-1rN74nkR_XQ"/>
       <element xmi:type="uml:Stereotype" href="FCM.profile.uml#_zjaC8MtkEd2H_o0jIC6qDQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jArVYmE3Ed-1rN74nkR_XQ" x="9" y="153" width="181" height="73"/>
@@ -66,12 +74,25 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_nvEXJ2E3Ed-1rN74nkR_XQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nvEXKGE3Ed-1rN74nkR_XQ"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4GiJYHI0EeOZxcUd14vDog" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4GiJYXI0EeOZxcUd14vDog"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4GiJYnI0EeOZxcUd14vDog"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_nvDwEWE3Ed-1rN74nkR_XQ"/>
       <element xmi:type="uml:Stereotype" href="FCM.profile.uml#_Z1W68MtlEd2H_o0jIC6qDQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nvDwEmE3Ed-1rN74nkR_XQ" x="9" y="459" width="208" height="85"/>
     </children>
     <children xmi:type="notation:Shape" xmi:id="_kOCSoG1nEd-XwOGM-uryhg" type="1031" fontName="Sans Serif" fontHeight="10" lineColor="0">
       <children xmi:type="notation:DecorationNode" xmi:id="_kOC5sW1nEd-XwOGM-uryhg" type="1084"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4GlMsHI0EeOZxcUd14vDog" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4GlMsXI0EeOZxcUd14vDog" showTitle="true"/>
+        <element xmi:type="l2:Metaclass" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_Sh6H8KtKEeGF4uwJob34Mw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4GlMsnI0EeOZxcUd14vDog"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4GlMs3I0EeOZxcUd14vDog" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4GlMtHI0EeOZxcUd14vDog"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4GlMtXI0EeOZxcUd14vDog"/>
+      </children>
       <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kOC5sG1nEd-XwOGM-uryhg" x="9" y="378" width="415"/>
     </children>
@@ -100,6 +121,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_6kgsfZD1Ed-I9dVdNhZAGQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6kgsfpD1Ed-I9dVdNhZAGQ"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4Gno8HI0EeOZxcUd14vDog" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4Gno8XI0EeOZxcUd14vDog"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4Gno8nI0EeOZxcUd14vDog"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_6kgFYZD1Ed-I9dVdNhZAGQ"/>
       <element xmi:type="uml:Stereotype" href="FCM.profile.uml#_JWD9UMttEd2H_o0jIC6qDQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6kgFYpD1Ed-I9dVdNhZAGQ" x="489" y="459" width="205" height="82"/>
@@ -115,6 +140,15 @@
         <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6lF7R5D1Ed-I9dVdNhZAGQ" key="QualifiedNameDepth" value="1000"/>
       </eAnnotations>
       <children xmi:type="notation:DecorationNode" xmi:id="_6lF7SJD1Ed-I9dVdNhZAGQ" type="1084"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4GqFMHI0EeOZxcUd14vDog" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4GqFMXI0EeOZxcUd14vDog" showTitle="true"/>
+        <element xmi:type="l2:Metaclass" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_Sizf0KtKEeGF4uwJob34Mw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4GqFMnI0EeOZxcUd14vDog"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4GqsQHI0EeOZxcUd14vDog" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4GqsQXI0EeOZxcUd14vDog"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4GqsQnI0EeOZxcUd14vDog"/>
+      </children>
       <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Connector"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6lF7QZD1Ed-I9dVdNhZAGQ" x="489" y="378" width="91" height="46"/>
     </children>
@@ -129,6 +163,15 @@
         <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__1h6J5D1Ed-I9dVdNhZAGQ" key="QualifiedNameDepth" value="1000"/>
       </eAnnotations>
       <children xmi:type="notation:DecorationNode" xmi:id="__1h6KJD1Ed-I9dVdNhZAGQ" type="1084"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4GtIgHI0EeOZxcUd14vDog" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4GtIgXI0EeOZxcUd14vDog" showTitle="true"/>
+        <element xmi:type="l2:Metaclass" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_SlSMEKtKEeGF4uwJob34Mw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4GtIgnI0EeOZxcUd14vDog"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4GtIg3I0EeOZxcUd14vDog" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4GtIhHI0EeOZxcUd14vDog"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4GtIhXI0EeOZxcUd14vDog"/>
+      </children>
       <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="__1h6IZD1Ed-I9dVdNhZAGQ" x="603" y="378" width="91" height="46"/>
     </children>
@@ -153,6 +196,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_kB3h1qFPEd-Ow8yfE2PGoA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kB3h16FPEd-Ow8yfE2PGoA"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4Gu9sHI0EeOZxcUd14vDog" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4Gu9sXI0EeOZxcUd14vDog"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4Gu9snI0EeOZxcUd14vDog"/>
+      </children>
       <element xmi:type="uml:Stereotype" href="FCM.profile.uml#_aQTf0FSdEd-w9f5DG2hQCA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kBqtgaFPEd-Ow8yfE2PGoA" x="243" y="459" width="181" height="82"/>
     </children>
@@ -195,6 +242,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_be7rzEZ0EeCLCJBkU67iDQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_be7rzUZ0EeCLCJBkU67iDQ"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4GxZ8HI0EeOZxcUd14vDog" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4GxZ8XI0EeOZxcUd14vDog"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4GxZ8nI0EeOZxcUd14vDog"/>
+      </children>
       <element xmi:type="uml:Stereotype" href="FCM.profile.uml#_beqmAEZ0EeCLCJBkU67iDQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_be7EsUZ0EeCLCJBkU67iDQ" x="207" y="153" width="181" height="73"/>
     </children>
@@ -216,6 +267,15 @@
         <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_eJwp1MogEeGKstsYRuxdvw" key="StereotypePropertyLocation" value="Compartment"/>
       </eAnnotations>
       <children xmi:type="notation:DecorationNode" xmi:id="_dMeLpkZ0EeCLCJBkU67iDQ" type="1084"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4Gz2MHI0EeOZxcUd14vDog" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4Gz2MXI0EeOZxcUd14vDog" showTitle="true"/>
+        <element xmi:type="l2:Metaclass" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_Sh6H8KtKEeGF4uwJob34Mw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4Gz2MnI0EeOZxcUd14vDog"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4Gz2M3I0EeOZxcUd14vDog" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4Gz2NHI0EeOZxcUd14vDog"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4Gz2NXI0EeOZxcUd14vDog"/>
+      </children>
       <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dMdkkUZ0EeCLCJBkU67iDQ" x="9" y="63" width="631"/>
     </children>
@@ -231,6 +291,10 @@
       </eAnnotations>
       <children xmi:type="notation:DecorationNode" xmi:id="_kD0d9kZ0EeCLCJBkU67iDQ" type="1034"/>
       <children xmi:type="notation:BasicCompartment" xmi:id="_kD1FAEZ0EeCLCJBkU67iDQ" type="1071">
+        <children xmi:type="notation:Shape" xmi:id="_sFLEQGm4EeOEG7lSPuRLag" type="3002">
+          <element xmi:type="uml:Property" href="FCM.profile.uml#_sE27MGm4EeOEG7lSPuRLag"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_sFLrUGm4EeOEG7lSPuRLag"/>
+        </children>
         <styles xmi:type="notation:SortingStyle" xmi:id="_kD1FAUZ0EeCLCJBkU67iDQ"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_kD1FAkZ0EeCLCJBkU67iDQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kD1FA0Z0EeCLCJBkU67iDQ"/>
@@ -240,6 +304,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_kD1FBkZ0EeCLCJBkU67iDQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kD1FB0Z0EeCLCJBkU67iDQ"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4G2ScHI0EeOZxcUd14vDog" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4G2ScXI0EeOZxcUd14vDog"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4G2ScnI0EeOZxcUd14vDog"/>
+      </children>
       <element xmi:type="uml:Stereotype" href="FCM.profile.uml#_kDGFMEZ0EeCLCJBkU67iDQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kDz24UZ0EeCLCJBkU67iDQ" x="406" y="153" width="144" height="73"/>
     </children>
@@ -261,6 +329,15 @@
         <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9Q3z1CNZEeKGuM7MKNu-KA" key="StereotypePropertyLocation" value="Compartment"/>
       </eAnnotations>
       <children xmi:type="notation:DecorationNode" xmi:id="_9Q2ltSNZEeKGuM7MKNu-KA" type="1084"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4G4usHI0EeOZxcUd14vDog" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4G4usXI0EeOZxcUd14vDog" showTitle="true"/>
+        <element xmi:type="l2:Metaclass" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_Sk8N0KtKEeGF4uwJob34Mw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4G4usnI0EeOZxcUd14vDog"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4G5VwHI0EeOZxcUd14vDog" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4G5VwXI0EeOZxcUd14vDog"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4G5VwnI0EeOZxcUd14vDog"/>
+      </children>
       <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9Q2ltiNZEeKGuM7MKNu-KA" x="666" y="63" width="136"/>
     </children>
@@ -494,6 +571,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_GNzDyHiMEd-iNcV8QPhhiQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GNzDyXiMEd-iNcV8QPhhiQ"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4KTPEHI0EeOZxcUd14vDog" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4KTPEXI0EeOZxcUd14vDog"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4KTPEnI0EeOZxcUd14vDog"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_GNycsXiMEd-iNcV8QPhhiQ"/>
       <element xmi:type="uml:Enumeration" href="FCM.profile.uml#_-ZqycAAhEd-0dMgailnZgA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GNycsniMEd-iNcV8QPhhiQ" x="306" y="252" width="163" height="181"/>
@@ -527,6 +608,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_Gw9bPXiMEd-iNcV8QPhhiQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Gw9bPniMEd-iNcV8QPhhiQ"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4KVrUHI0EeOZxcUd14vDog" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4KVrUXI0EeOZxcUd14vDog"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4KVrUnI0EeOZxcUd14vDog"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_Gw80IXiMEd-iNcV8QPhhiQ"/>
       <element xmi:type="uml:Stereotype" href="FCM.profile.uml#_5SI38AAhEd-0dMgailnZgA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Gw80IniMEd-iNcV8QPhhiQ" x="198" y="126" width="191" height="91"/>
@@ -552,6 +637,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_cwWb9niSEd-iNcV8QPhhiQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cwWb93iSEd-iNcV8QPhhiQ"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4KYHkHI0EeOZxcUd14vDog" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4KYHkXI0EeOZxcUd14vDog"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4KYHknI0EeOZxcUd14vDog"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_cwV04XiSEd-iNcV8QPhhiQ"/>
       <element xmi:type="uml:Stereotype" href="FCM.profile.uml#_JSKpIHiLEd-iNcV8QPhhiQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cwV04niSEd-iNcV8QPhhiQ" x="18" y="126" width="134" height="91"/>
@@ -565,6 +654,15 @@
         <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_kQCypSq3EeKWMcuhL1C5sA" key="StereotypePropertyLocation" value="Compartment"/>
       </eAnnotations>
       <children xmi:type="notation:DecorationNode" xmi:id="_kTGUUXiVEd-owss_ACqnJA" type="1084"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4Kaj0HI0EeOZxcUd14vDog" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4Kaj0XI0EeOZxcUd14vDog" showTitle="true"/>
+        <element xmi:type="l2:Metaclass" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_Sh6H8KtKEeGF4uwJob34Mw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4Kaj0nI0EeOZxcUd14vDog"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4Kaj03I0EeOZxcUd14vDog" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4Kaj1HI0EeOZxcUd14vDog"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4Kaj1XI0EeOZxcUd14vDog"/>
+      </children>
       <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kTGUUniVEd-owss_ACqnJA" x="18" y="19" width="577"/>
     </children>
@@ -597,6 +695,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_JXH-fZDxEd-I9dVdNhZAGQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JXH-fpDxEd-I9dVdNhZAGQ"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4KdAEHI0EeOZxcUd14vDog" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4KdAEXI0EeOZxcUd14vDog"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4KdAEnI0EeOZxcUd14vDog"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_JXHXYZDxEd-I9dVdNhZAGQ"/>
       <element xmi:type="uml:Stereotype" href="FCM.profile.uml#_JWyAMJDxEd-I9dVdNhZAGQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JXHXYpDxEd-I9dVdNhZAGQ" x="18" y="342" width="235" height="91"/>
@@ -619,6 +721,15 @@
         <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jUDEcyq3EeKWMcuhL1C5sA" key="StereotypePropertyLocation" value="Compartment"/>
       </eAnnotations>
       <children xmi:type="notation:DecorationNode" xmi:id="_9aDbofS2EeCLI_ythlfGJw" type="1084"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4KgDYHI0EeOZxcUd14vDog" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4KgDYXI0EeOZxcUd14vDog" showTitle="true"/>
+        <element xmi:type="l2:Metaclass" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_SlSMEKtKEeGF4uwJob34Mw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4KgDYnI0EeOZxcUd14vDog"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4KgDY3I0EeOZxcUd14vDog" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4KgDZHI0EeOZxcUd14vDog"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4KgDZXI0EeOZxcUd14vDog"/>
+      </children>
       <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9aDbovS2EeCLI_ythlfGJw" x="18" y="252" width="109"/>
     </children>
@@ -647,6 +758,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_FF4aaCm_EeKgOdm6HirHfA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FF4aaSm_EeKgOdm6HirHfA"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4KifoHI0EeOZxcUd14vDog" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4KifoXI0EeOZxcUd14vDog"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4KifonI0EeOZxcUd14vDog"/>
+      </children>
       <element xmi:type="uml:Enumeration" href="FCM.profile.uml#_FFvQcCm_EeKgOdm6HirHfA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FFzh4Sm_EeKgOdm6HirHfA" x="513" y="252"/>
     </children>
@@ -668,6 +783,15 @@
         <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_bc5iBSq3EeKWMcuhL1C5sA" key="StereotypePropertyLocation" value="Compartment"/>
       </eAnnotations>
       <children xmi:type="notation:DecorationNode" xmi:id="_bc4T5Sq3EeKWMcuhL1C5sA" type="1084"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4Kk74HI0EeOZxcUd14vDog" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4Kk74XI0EeOZxcUd14vDog" showTitle="true"/>
+        <element xmi:type="l2:Metaclass" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_Sk2HMKtKEeGF4uwJob34Mw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4Kk74nI0EeOZxcUd14vDog"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4Kli8HI0EeOZxcUd14vDog" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4Kli8XI0EeOZxcUd14vDog"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4Kli8nI0EeOZxcUd14vDog"/>
+      </children>
       <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bc468Cq3EeKWMcuhL1C5sA" x="153" y="252"/>
     </children>
@@ -732,6 +856,15 @@
         <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1gtiJYKhEd-aI_x8ivV7vQ" key="QualifiedNameDepth" value="1000"/>
       </eAnnotations>
       <children xmi:type="notation:DecorationNode" xmi:id="_1gtiJoKhEd-aI_x8ivV7vQ" type="1084"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4Ng7IHI0EeOZxcUd14vDog" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4Ng7IXI0EeOZxcUd14vDog" showTitle="true"/>
+        <element xmi:type="l2:Metaclass" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_Sk8N0KtKEeGF4uwJob34Mw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4Ng7InI0EeOZxcUd14vDog"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4NhiMHI0EeOZxcUd14vDog" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4NhiMXI0EeOZxcUd14vDog"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4NhiMnI0EeOZxcUd14vDog"/>
+      </children>
       <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1gsUAYKhEd-aI_x8ivV7vQ" x="144" y="27" width="298" height="49"/>
     </children>
@@ -766,6 +899,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_C-SO3dRwEeKiLbHSN_MIRQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C-SO3tRwEeKiLbHSN_MIRQ"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4NjXYHI0EeOZxcUd14vDog" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4NjXYXI0EeOZxcUd14vDog"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4NjXYnI0EeOZxcUd14vDog"/>
+      </children>
       <element xmi:type="uml:Stereotype" href="FCM.profile.uml#_C-GooNRwEeKiLbHSN_MIRQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C-RnwdRwEeKiLbHSN_MIRQ" x="144" y="126" width="298" height="73"/>
     </children>
@@ -792,6 +929,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_HjQ179RwEeKiLbHSN_MIRQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HjQ18NRwEeKiLbHSN_MIRQ"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4NlzoHI0EeOZxcUd14vDog" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4NlzoXI0EeOZxcUd14vDog"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4NlzonI0EeOZxcUd14vDog"/>
+      </children>
       <element xmi:type="uml:Stereotype" href="FCM.profile.uml#_HjF2wNRwEeKiLbHSN_MIRQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HjQO0dRwEeKiLbHSN_MIRQ" x="639" y="126" width="136" height="73"/>
     </children>
@@ -813,6 +954,15 @@
         <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QdUm1dRwEeKiLbHSN_MIRQ" key="StereotypePropertyLocation" value="Compartment"/>
       </eAnnotations>
       <children xmi:type="notation:DecorationNode" xmi:id="_QdT_xtRwEeKiLbHSN_MIRQ" type="1084"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4NoP4HI0EeOZxcUd14vDog" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4NoP4XI0EeOZxcUd14vDog" showTitle="true"/>
+        <element xmi:type="l2:Metaclass" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_Sh6H8KtKEeGF4uwJob34Mw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4NoP4nI0EeOZxcUd14vDog"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4NoP43I0EeOZxcUd14vDog" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4NoP5HI0EeOZxcUd14vDog"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4NoP5XI0EeOZxcUd14vDog"/>
+      </children>
       <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QdT_x9RwEeKiLbHSN_MIRQ" x="513" y="27" width="262"/>
     </children>
@@ -839,6 +989,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="__QaZf9RwEeKiLbHSN_MIRQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="__QaZgNRwEeKiLbHSN_MIRQ"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4NqsIHI0EeOZxcUd14vDog" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4NqsIXI0EeOZxcUd14vDog"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4NqsInI0EeOZxcUd14vDog"/>
+      </children>
       <element xmi:type="uml:Stereotype" href="FCM.profile.uml#__QLv8NRwEeKiLbHSN_MIRQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="__QZyYdRwEeKiLbHSN_MIRQ" x="513" y="126" width="109" height="73"/>
     </children>
@@ -1547,6 +1701,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_VShZF5WJEd-xqrYFQVL_qg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VShZGJWJEd-xqrYFQVL_qg"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4RA7EHI0EeOZxcUd14vDog" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4RA7EXI0EeOZxcUd14vDog"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4RA7EnI0EeOZxcUd14vDog"/>
+      </children>
       <element xmi:type="uml:Stereotype" href="FCM.profile.uml#_tBRZYMtpEd2H_o0jIC6qDQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VSgyAZWJEd-xqrYFQVL_qg" x="450" y="165" width="271" height="106"/>
     </children>
@@ -1606,6 +1764,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_V3ixvZWJEd-xqrYFQVL_qg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V3ixvpWJEd-xqrYFQVL_qg"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4RElcHI0EeOZxcUd14vDog" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4RElcXI0EeOZxcUd14vDog"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4RElcnI0EeOZxcUd14vDog"/>
+      </children>
       <element xmi:type="uml:Stereotype" href="FCM.profile.uml#_pP-ckMtqEd2H_o0jIC6qDQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V3iKoZWJEd-xqrYFQVL_qg" x="108" y="165" width="307" height="106"/>
     </children>
@@ -1620,6 +1782,15 @@
         <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iw1_Y5WJEd-xqrYFQVL_qg" key="QualifiedNameDepth" value="1000"/>
       </eAnnotations>
       <children xmi:type="notation:DecorationNode" xmi:id="_iw1_ZJWJEd-xqrYFQVL_qg" type="1084"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4RHowHI0EeOZxcUd14vDog" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4RHowXI0EeOZxcUd14vDog" showTitle="true"/>
+        <element xmi:type="l2:Metaclass" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_SlLeYatKEeGF4uwJob34Mw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4RHownI0EeOZxcUd14vDog"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4RIP0HI0EeOZxcUd14vDog" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4RIP0XI0EeOZxcUd14vDog"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4RIP0nI0EeOZxcUd14vDog"/>
+      </children>
       <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Port"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iw1YUZWJEd-xqrYFQVL_qg" x="108" y="63" width="307"/>
     </children>
@@ -1634,6 +1805,15 @@
         <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jWfqJ5WJEd-xqrYFQVL_qg" key="QualifiedNameDepth" value="1000"/>
       </eAnnotations>
       <children xmi:type="notation:DecorationNode" xmi:id="_jWgRMJWJEd-xqrYFQVL_qg" type="1084"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4RKsEHI0EeOZxcUd14vDog" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4RKsEXI0EeOZxcUd14vDog" showTitle="true"/>
+        <element xmi:type="l2:Metaclass" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_Sh6H8KtKEeGF4uwJob34Mw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4RKsEnI0EeOZxcUd14vDog"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4RLTIHI0EeOZxcUd14vDog" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4RLTIXI0EeOZxcUd14vDog"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4RLTInI0EeOZxcUd14vDog"/>
+      </children>
       <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jWfqIZWJEd-xqrYFQVL_qg" x="450" y="60" width="271"/>
     </children>
@@ -1672,6 +1852,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_KCWkKTyEEeCYGtteoBz6vQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KCWkKjyEEeCYGtteoBz6vQ"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4RNvYHI0EeOZxcUd14vDog" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4RNvYXI0EeOZxcUd14vDog"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4RNvYnI0EeOZxcUd14vDog"/>
+      </children>
       <element xmi:type="uml:Stereotype" href="FCM.profile.uml#_KBrOsDyEEeCYGtteoBz6vQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KCSSsTyEEeCYGtteoBz6vQ" x="108" y="306" width="307" height="82"/>
     </children>
@@ -1731,17 +1915,9 @@
       </eAnnotations>
       <children xmi:type="notation:DecorationNode" xmi:id="_3dfMUObEEd-oHsJhS1620Q" type="1034"/>
       <children xmi:type="notation:BasicCompartment" xmi:id="_3dfMUebEEd-oHsJhS1620Q" type="1071">
-        <children xmi:type="notation:Shape" xmi:id="_OXaKYObFEd-oHsJhS1620Q" type="3002" fontName="Sans Serif" fontHeight="10" lineColor="0">
-          <element xmi:type="uml:Property" href="FCM.profile.uml#_aPnHoAswEd-UGs2QNFrwPw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_OXaKYebFEd-oHsJhS1620Q" x="52" y="6"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_PAY18ObFEd-oHsJhS1620Q" type="3002" fontName="Sans Serif" fontHeight="10" lineColor="0">
-          <element xmi:type="uml:Property" href="FCM.profile.uml#_W5NH0FLpEd6rYflXebIz1g"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_PAY18ebFEd-oHsJhS1620Q" x="56" y="22"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_AICWEObPEd-oHsJhS1620Q" type="3002" fontName="Sans Serif" fontHeight="10" lineColor="0">
-          <element xmi:type="uml:Property" href="FCM.profile.uml#_AAI-UObPEd-oHsJhS1620Q"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_AICWEebPEd-oHsJhS1620Q"/>
+        <children xmi:type="notation:Shape" xmi:id="_ASHDsHI1EeOZxcUd14vDog" type="3002" fontName="Sans Serif" lineColor="0">
+          <element xmi:type="uml:Property" href="FCM.profile.uml#_AROS4HI1EeOZxcUd14vDog"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_ASHDsXI1EeOZxcUd14vDog"/>
         </children>
         <styles xmi:type="notation:SortingStyle" xmi:id="_3dfMUubEEd-oHsJhS1620Q"/>
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3dfMU-bEEd-oHsJhS1620Q"/>
@@ -1752,141 +1928,101 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3dfMV-bEEd-oHsJhS1620Q"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3dfMWObEEd-oHsJhS1620Q"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4TtCsHI0EeOZxcUd14vDog" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4TtCsXI0EeOZxcUd14vDog"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4TtCsnI0EeOZxcUd14vDog"/>
+      </children>
       <element xmi:type="uml:Stereotype" href="FCM.profile.uml#_BOnDoFLpEd6rYflXebIz1g"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3dcwEebEEd-oHsJhS1620Q" x="72" y="58" width="253" height="109"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_6YkdYObEEd-oHsJhS1620Q" type="2006" fontName="Sans Serif" fontHeight="10" lineColor="0">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6YlEcObEEd-oHsJhS1620Q" source="ShadowFigure">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6YmSkObEEd-oHsJhS1620Q" key="ShadowFigure_Value" value="false"/>
+    <children xmi:type="notation:Shape" xmi:id="_8I7AwHI0EeOZxcUd14vDog" type="1026" fontName="Sans Serif" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8I818HI0EeOZxcUd14vDog" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8I818XI0EeOZxcUd14vDog" key="ShadowFigure_Value" value="false"/>
       </eAnnotations>
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6YmSkebEEd-oHsJhS1620Q" source="displayNameLabelIcon">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6YmSkubEEd-oHsJhS1620Q" key="displayNameLabelIcon_value" value="false"/>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8I818nI0EeOZxcUd14vDog" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8I8183I0EeOZxcUd14vDog" key="displayNameLabelIcon_value" value="false"/>
       </eAnnotations>
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6YmSk-bEEd-oHsJhS1620Q" source="QualifiedName">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6YmSlObEEd-oHsJhS1620Q" key="QualifiedNameDepth" value="1000"/>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8I9dAHI0EeOZxcUd14vDog" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8I9dAXI0EeOZxcUd14vDog" key="QualifiedNameDepth" value="1000"/>
       </eAnnotations>
-      <children xmi:type="notation:DecorationNode" xmi:id="_6YmSlebEEd-oHsJhS1620Q" type="5023"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_6YmSlubEEd-oHsJhS1620Q" type="1063">
-        <children xmi:type="notation:Shape" xmi:id="_KNw0cObFEd-oHsJhS1620Q" type="1037" fontName="Sans Serif" fontHeight="10" lineColor="0">
-          <element xmi:type="uml:EnumerationLiteral" href="FCM.profile.uml#_T3PQUAswEd-UGs2QNFrwPw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_KNw0cebFEd-oHsJhS1620Q" x="47" y="34"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_KcJ1wObFEd-oHsJhS1620Q" type="1037" fontName="Sans Serif" fontHeight="10" lineColor="0">
-          <element xmi:type="uml:EnumerationLiteral" href="FCM.profile.uml#_Mn7J8AswEd-UGs2QNFrwPw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_KcJ1webFEd-oHsJhS1620Q" x="47" y="34"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_KpsigObFEd-oHsJhS1620Q" type="1037" fontName="Sans Serif" fontHeight="10" lineColor="0">
-          <element xmi:type="uml:EnumerationLiteral" href="FCM.profile.uml#_zZEPQDR4Ed-aL8GNXYXa-Q"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_KpsigebFEd-oHsJhS1620Q" x="47" y="34"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_K3OBIObFEd-oHsJhS1620Q" type="1037" fontName="Sans Serif" fontHeight="10" lineColor="0">
-          <element xmi:type="uml:EnumerationLiteral" href="FCM.profile.uml#_3YQuwDNyEd-l9qP5D2-iXA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_K3OBIebFEd-oHsJhS1620Q" x="47" y="34"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_LF-O0ObFEd-oHsJhS1620Q" type="1037" fontName="Sans Serif" fontHeight="10" lineColor="0">
-          <element xmi:type="uml:EnumerationLiteral" href="FCM.profile.uml#_NRzNYAswEd-UGs2QNFrwPw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_LF-O0ebFEd-oHsJhS1620Q" x="47" y="34"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_LTP10ObFEd-oHsJhS1620Q" type="1037" fontName="Sans Serif" fontHeight="10" lineColor="0">
-          <element xmi:type="uml:EnumerationLiteral" href="FCM.profile.uml#_Ub5RUDNYEd-t359GOtEoBQ"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_LTP10ebFEd-oHsJhS1620Q" x="47" y="34"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_p-k4kOhjEd-oHsJhS1620Q" type="1037" fontName="Sans Serif" fontHeight="10" lineColor="0">
-          <element xmi:type="uml:EnumerationLiteral" href="FCM.profile.uml#_p-jDYOhjEd-oHsJhS1620Q"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_p-k4kehjEd-oHsJhS1620Q"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_8oZEwDWzEeKiyvmIR-KbrA" type="1037" fontName="Sans Serif" lineColor="0">
-          <element xmi:type="uml:EnumerationLiteral" href="FCM.profile.uml#_8n-OADWzEeKiyvmIR-KbrA"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_8oZEwTWzEeKiyvmIR-KbrA"/>
-        </children>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_6YmSl-bEEd-oHsJhS1620Q"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_6YmSmObEEd-oHsJhS1620Q"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6YmSmebEEd-oHsJhS1620Q"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_8I9dAnI0EeOZxcUd14vDog" type="1034"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_8I9dA3I0EeOZxcUd14vDog" type="1071">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_8I9dBHI0EeOZxcUd14vDog"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_8I9dBXI0EeOZxcUd14vDog"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_8I9dBnI0EeOZxcUd14vDog"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8I9dB3I0EeOZxcUd14vDog"/>
       </children>
-      <element xmi:type="uml:Enumeration" href="FCM.profile.uml#_HSVlUAswEd-UGs2QNFrwPw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6YkdYebEEd-oHsJhS1620Q" x="378" y="54" width="181" height="163"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_jxAlMObFEd-oHsJhS1620Q" type="2006" fontName="Sans Serif" fontHeight="10" lineColor="0">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jxBMQObFEd-oHsJhS1620Q" source="ShadowFigure">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jxBMQebFEd-oHsJhS1620Q" key="ShadowFigure_Value" value="false"/>
-      </eAnnotations>
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jxBMQubFEd-oHsJhS1620Q" source="displayNameLabelIcon">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jxBMQ-bFEd-oHsJhS1620Q" key="displayNameLabelIcon_value" value="false"/>
-      </eAnnotations>
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jxBMRObFEd-oHsJhS1620Q" source="QualifiedName">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jxBMRebFEd-oHsJhS1620Q" key="QualifiedNameDepth" value="1000"/>
-      </eAnnotations>
-      <children xmi:type="notation:DecorationNode" xmi:id="_jxBMRubFEd-oHsJhS1620Q" type="5023"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_jxBMR-bFEd-oHsJhS1620Q" type="1063">
-        <children xmi:type="notation:Shape" xmi:id="_ukD4EObFEd-oHsJhS1620Q" type="1037" fontName="Sans Serif" fontHeight="10" lineColor="0">
-          <element xmi:type="uml:EnumerationLiteral" href="FCM.profile.uml#_udxp4ObFEd-oHsJhS1620Q"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_ukD4EebFEd-oHsJhS1620Q"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_vYpWsObFEd-oHsJhS1620Q" type="1037" fontName="Sans Serif" fontHeight="10" lineColor="0">
-          <element xmi:type="uml:EnumerationLiteral" href="FCM.profile.uml#_vSnAIObFEd-oHsJhS1620Q"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_vYpWsebFEd-oHsJhS1620Q"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_6wLgkObOEd-oHsJhS1620Q" type="1037" fontName="Sans Serif" fontHeight="10" lineColor="0">
-          <element xmi:type="uml:EnumerationLiteral" href="FCM.profile.uml#_6qjZsObOEd-oHsJhS1620Q"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_6wLgkebOEd-oHsJhS1620Q"/>
-        </children>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_jxBMSObFEd-oHsJhS1620Q"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_jxBMSebFEd-oHsJhS1620Q"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jxBMSubFEd-oHsJhS1620Q"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_8I9dCHI0EeOZxcUd14vDog" visible="false" type="1019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_8I9dCXI0EeOZxcUd14vDog"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_8I9dCnI0EeOZxcUd14vDog"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_8I9dC3I0EeOZxcUd14vDog"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8I9dDHI0EeOZxcUd14vDog"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_8JGm8HI0EeOZxcUd14vDog" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_8JGm8XI0EeOZxcUd14vDog"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8JGm8nI0EeOZxcUd14vDog"/>
       </children>
-      <element xmi:type="uml:Enumeration" href="FCM.profile.uml#_jnxwsObFEd-oHsJhS1620Q"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jxAlMebFEd-oHsJhS1620Q" x="378" y="252" width="181" height="109"/>
+      <element xmi:type="uml:Stereotype" href="FCM.profile.uml#_8IkbcHI0EeOZxcUd14vDog"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8I7AwXI0EeOZxcUd14vDog" x="441" y="144" width="136" height="73"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_Qwmu8PPBEd-Tz5tQ_F9baw" type="1031" fontName="Sans Serif" fontHeight="10" lineColor="0">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Qwn9EPPBEd-Tz5tQ_F9baw" source="ShadowFigure">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Qwn9EfPBEd-Tz5tQ_F9baw" key="ShadowFigure_Value" value="false"/>
+    <children xmi:type="notation:Shape" xmi:id="_NdO50HI4EeOCrdvV8oxOKA" type="1031" fontName="Sans Serif" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NdPg4HI4EeOCrdvV8oxOKA" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NdPg4XI4EeOCrdvV8oxOKA" key="ShadowFigure_Value" value="false"/>
       </eAnnotations>
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Qwn9EvPBEd-Tz5tQ_F9baw" source="displayNameLabelIcon">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Qwn9E_PBEd-Tz5tQ_F9baw" key="displayNameLabelIcon_value" value="false"/>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NdPg4nI4EeOCrdvV8oxOKA" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NdPg43I4EeOCrdvV8oxOKA" key="displayNameLabelIcon_value" value="false"/>
       </eAnnotations>
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Qwn9FPPBEd-Tz5tQ_F9baw" source="QualifiedName">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Qwn9FfPBEd-Tz5tQ_F9baw" key="QualifiedNameDepth" value="1000"/>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NdPg5HI4EeOCrdvV8oxOKA" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NdPg5XI4EeOCrdvV8oxOKA" key="QualifiedNameDepth" value="1000"/>
       </eAnnotations>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Qwn9FvPBEd-Tz5tQ_F9baw" type="1084"/>
-      <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TemplateSignature"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qwmu8fPBEd-Tz5tQ_F9baw" x="72" y="202" width="253" height="55"/>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NdQvAHI4EeOCrdvV8oxOKA" source="Stereotype_Annotation">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NdQvAXI4EeOCrdvV8oxOKA" key="StereotypeWithQualifiedNameList" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NdQvAnI4EeOCrdvV8oxOKA" key="StereotypeList" value="StandardProfileL2::Metaclass"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NdQvA3I4EeOCrdvV8oxOKA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NdQvBHI4EeOCrdvV8oxOKA" key="PropStereoDisplay" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NdQvBXI4EeOCrdvV8oxOKA" key="StereotypePropertyLocation" value="Compartment"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_NdPg5nI4EeOCrdvV8oxOKA" type="1084"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Ndk4EHI4EeOCrdvV8oxOKA" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Ndk4EXI4EeOCrdvV8oxOKA" showTitle="true"/>
+        <element xmi:type="l2:Metaclass" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_Sh6H8KtKEeGF4uwJob34Mw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ndk4EnI4EeOCrdvV8oxOKA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_NdlfIHI4EeOCrdvV8oxOKA" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_NdlfIXI4EeOCrdvV8oxOKA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NdlfInI4EeOCrdvV8oxOKA"/>
+      </children>
+      <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NdPg53I4EeOCrdvV8oxOKA" x="441" y="54" width="136"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_UzxpcPPBEd-Tz5tQ_F9baw" type="1026" fontName="Sans Serif" fontHeight="10" lineColor="0">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UzyQgPPBEd-Tz5tQ_F9baw" source="ShadowFigure">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UzyQgfPBEd-Tz5tQ_F9baw" key="ShadowFigure_Value" value="false"/>
+    <children xmi:type="notation:Shape" xmi:id="_MyjSYHJqEeOMF7YEvnQt5g" type="1002" fontName="Sans Serif" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Myj5cHJqEeOMF7YEvnQt5g" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Myj5cXJqEeOMF7YEvnQt5g" key="ShadowFigure_Value" value="false"/>
       </eAnnotations>
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UzyQgvPBEd-Tz5tQ_F9baw" source="displayNameLabelIcon">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UzyQg_PBEd-Tz5tQ_F9baw" key="displayNameLabelIcon_value" value="false"/>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Myj5cnJqEeOMF7YEvnQt5g" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Myj5c3JqEeOMF7YEvnQt5g" key="displayNameLabelIcon_value" value="false"/>
       </eAnnotations>
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Uzy3kPPBEd-Tz5tQ_F9baw" source="QualifiedName">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Uzy3kfPBEd-Tz5tQ_F9baw" key="QualifiedNameDepth" value="1000"/>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Myj5dHJqEeOMF7YEvnQt5g" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Myj5dXJqEeOMF7YEvnQt5g" key="QualifiedNameDepth" value="1000"/>
       </eAnnotations>
-      <children xmi:type="notation:DecorationNode" xmi:id="_Uzy3kvPBEd-Tz5tQ_F9baw" type="1034"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_Uzy3k_PBEd-Tz5tQ_F9baw" type="1071">
-        <children xmi:type="notation:Shape" xmi:id="_cyfzgPPBEd-Tz5tQ_F9baw" type="3002" fontName="Sans Serif" fontHeight="10" lineColor="0">
-          <element xmi:type="uml:Property" href="FCM.profile.uml#_cqIhsPPBEd-Tz5tQ_F9baw"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_cyfzgfPBEd-Tz5tQ_F9baw"/>
-        </children>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_Uzy3lPPBEd-Tz5tQ_F9baw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Uzy3lfPBEd-Tz5tQ_F9baw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Uzy3lvPBEd-Tz5tQ_F9baw"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_Uzy3l_PBEd-Tz5tQ_F9baw" visible="false" type="1019">
-        <styles xmi:type="notation:SortingStyle" xmi:id="_Uzy3mPPBEd-Tz5tQ_F9baw"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Uzy3mfPBEd-Tz5tQ_F9baw"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Uzy3mvPBEd-Tz5tQ_F9baw"/>
-      </children>
-      <element xmi:type="uml:Stereotype" href="FCM.profile.uml#_UsmDYPPBEd-Tz5tQ_F9baw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UzxpcfPBEd-Tz5tQ_F9baw" x="69" y="288" width="256" height="77"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Myj5dnJqEeOMF7YEvnQt5g" type="3"/>
+      <element xmi:type="uml:Comment" href="FCM.profile.uml#_MyfoAHJqEeOMF7YEvnQt5g"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MyjSYXJqEeOMF7YEvnQt5g" x="621" y="126" width="208" height="82"/>
     </children>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_1hRXQebEEd-oHsJhS1620Q"/>
     <element xmi:type="uml:Profile" href="FCM.profile.uml#_5mvT0MtjEd2H_o0jIC6qDQ"/>
-    <edges xmi:type="notation:Connector" xmi:id="_ZqDb4PPBEd-Tz5tQ_F9baw" type="1013" source="_UzxpcPPBEd-Tz5tQ_F9baw" target="_Qwmu8PPBEd-Tz5tQ_F9baw" lineColor="0">
-      <styles xmi:type="notation:FontStyle" xmi:id="_ZqDb4fPBEd-Tz5tQ_F9baw" fontName="Sans Serif" fontHeight="10"/>
-      <element xmi:type="uml:Extension" href="FCM.profile.uml#_ZiRY4PPBEd-Tz5tQ_F9baw"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ZqDb4vPBEd-Tz5tQ_F9baw" points="[0, -7, 0, 37]$[-2, -93, -2, -49]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Z3T0wPPBEd-Tz5tQ_F9baw" id="(0.5084033613445378,0.08333333333333333)"/>
-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Z3T0wfPBEd-Tz5tQ_F9baw" id="(0.502127659574468,0.8909090909090909)"/>
+    <edges xmi:type="notation:Connector" xmi:id="_SdsjAHI4EeOCrdvV8oxOKA" type="1013" source="_8I7AwHI0EeOZxcUd14vDog" target="_NdO50HI4EeOCrdvV8oxOKA" lineColor="0">
+      <styles xmi:type="notation:FontStyle" xmi:id="_SdsjAXI4EeOCrdvV8oxOKA" fontName="Sans Serif"/>
+      <element xmi:type="uml:Extension" href="FCM.profile.uml#_SdnDcHI4EeOCrdvV8oxOKA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SdsjAnI4EeOCrdvV8oxOKA" points="[0, -10, 0, 65]$[0, -50, 0, 25]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Sd5XUHI4EeOCrdvV8oxOKA" id="(0.5,0.136986301369863)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_OUiCgHJqEeOMF7YEvnQt5g" type="1022" source="_MyjSYHJqEeOMF7YEvnQt5g" target="_8I7AwHI0EeOZxcUd14vDog" routing="Rectilinear" lineColor="0">
+      <styles xmi:type="notation:FontStyle" xmi:id="_OUiCgXJqEeOMF7YEvnQt5g" fontName="Sans Serif"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OUiCgnJqEeOMF7YEvnQt5g" points="[29, 21, -58, -43]$[64, 58, -23, -6]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OUm7AHJqEeOMF7YEvnQt5g" id="(0.7716535433070866,0.4146341463414634)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OUniEHJqEeOMF7YEvnQt5g" id="(0.16911764705882354,0.3561643835616438)"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_w-KvwMniEeCWXsgs0yuyKQ" type="PapyrusUMLProfileDiagram" name="Hardware" measurementUnit="Pixel">
@@ -1935,6 +2071,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_x968kcniEeCWXsgs0yuyKQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x968ksniEeCWXsgs0yuyKQ"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4WIEkHI0EeOZxcUd14vDog" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4WIEkXI0EeOZxcUd14vDog"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4WIEknI0EeOZxcUd14vDog"/>
+      </children>
       <element xmi:type="uml:Stereotype" href="FCM.profile.uml#_0KEH0JOCEd-5qPBhYeIVtw"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x935QcniEeCWXsgs0yuyKQ" x="111" y="253" width="223" height="135"/>
     </children>
@@ -1949,6 +2089,15 @@
         <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0A79NMniEeCWXsgs0yuyKQ" key="QualifiedNameDepth" value="1000"/>
       </eAnnotations>
       <children xmi:type="notation:DecorationNode" xmi:id="_0A79NcniEeCWXsgs0yuyKQ" type="1084"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4WLu8HI0EeOZxcUd14vDog" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4WLu8XI0EeOZxcUd14vDog" showTitle="true"/>
+        <element xmi:type="l2:Metaclass" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_SksWMKtKEeGF4uwJob34Mw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4WLu8nI0EeOZxcUd14vDog"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4WLu83I0EeOZxcUd14vDog" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4WLu9HI0EeOZxcUd14vDog"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4WLu9XI0EeOZxcUd14vDog"/>
+      </children>
       <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Node"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0A7WIcniEeCWXsgs0yuyKQ" x="108" y="126" width="226"/>
     </children>
@@ -1975,6 +2124,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_7Vk_67MkEeKKMNfz1DLnog"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7Vk_7LMkEeKKMNfz1DLnog"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4WOLMHI0EeOZxcUd14vDog" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4WOLMXI0EeOZxcUd14vDog"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4WOLMnI0EeOZxcUd14vDog"/>
+      </children>
       <element xmi:type="uml:Stereotype" href="FCM.profile.uml#_361C4FapEd-w9f5DG2hQCA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7VhVgbMkEeKKMNfz1DLnog" x="396" y="256" width="145" height="132"/>
     </children>
@@ -1996,6 +2149,15 @@
         <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_86DqZLMkEeKKMNfz1DLnog" key="StereotypePropertyLocation" value="Compartment"/>
       </eAnnotations>
       <children xmi:type="notation:DecorationNode" xmi:id="_85-K0rMkEeKKMNfz1DLnog" type="1084"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4WQncHI0EeOZxcUd14vDog" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4WQncXI0EeOZxcUd14vDog" showTitle="true"/>
+        <element xmi:type="l2:Metaclass" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_Sh6H8KtKEeGF4uwJob34Mw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4WQncnI0EeOZxcUd14vDog"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4WROgHI0EeOZxcUd14vDog" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4WROgXI0EeOZxcUd14vDog"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4WROgnI0EeOZxcUd14vDog"/>
+      </children>
       <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8588sbMkEeKKMNfz1DLnog" x="396" y="126" width="145"/>
     </children>
@@ -2036,6 +2198,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_jOcuKcnpEeK-j9yGRHQ3Jw"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jOcuKsnpEeK-j9yGRHQ3Jw"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4ZXl0HI0EeOZxcUd14vDog" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4ZXl0XI0EeOZxcUd14vDog"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4ZXl0nI0EeOZxcUd14vDog"/>
+      </children>
       <element xmi:type="uml:Stereotype" href="FCM.profile.uml#_maLdwLCJEd-D5aqfqbr7IQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jOZq0cnpEeK-j9yGRHQ3Jw" x="54" y="149" width="136" height="73"/>
     </children>
@@ -2057,6 +2223,15 @@
         <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nq2A9cnpEeK-j9yGRHQ3Jw" key="StereotypePropertyLocation" value="Compartment"/>
       </eAnnotations>
       <children xmi:type="notation:DecorationNode" xmi:id="_nq1Z5cnpEeK-j9yGRHQ3Jw" type="1084"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4ZbQMHI0EeOZxcUd14vDog" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4ZbQMXI0EeOZxcUd14vDog" showTitle="true"/>
+        <element xmi:type="l2:Metaclass" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_Sh6H8KtKEeGF4uwJob34Mw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4ZbQMnI0EeOZxcUd14vDog"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4Zb3QHI0EeOZxcUd14vDog" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4Zb3QXI0EeOZxcUd14vDog"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4Zb3QnI0EeOZxcUd14vDog"/>
+      </children>
       <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nq1Z5snpEeK-j9yGRHQ3Jw" x="54" y="50" width="469"/>
     </children>
@@ -2083,6 +2258,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_D8uXGtM-EeKflOoYwofqLA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D8uXG9M-EeKflOoYwofqLA"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4ZdscHI0EeOZxcUd14vDog" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4ZdscXI0EeOZxcUd14vDog"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4ZdscnI0EeOZxcUd14vDog"/>
+      </children>
       <element xmi:type="uml:Stereotype" href="FCM.profile.uml#_D8dRUNM-EeKflOoYwofqLA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D8tI8dM-EeKflOoYwofqLA" x="387" y="149" width="136" height="73"/>
     </children>
@@ -2123,6 +2302,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_0dFWn9RsEeKiLbHSN_MIRQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0dFWoNRsEeKiLbHSN_MIRQ"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4ZgIsHI0EeOZxcUd14vDog" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4ZgIsXI0EeOZxcUd14vDog"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4ZgIsnI0EeOZxcUd14vDog"/>
+      </children>
       <element xmi:type="uml:Stereotype" href="FCM.profile.uml#_0c1e8NRsEeKiLbHSN_MIRQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0dEvgdRsEeKiLbHSN_MIRQ" x="225" y="149" width="136" height="73"/>
     </children>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.profile.uml b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.profile.uml
index b1d1bfc96df..292df8596b2 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.profile.uml
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/model/FCM.profile.uml
@@ -8,7 +8,7 @@ of a particular PortKind). Further experiments are still needed to confirm that
     <ownedComment xmi:type="uml:Comment" xmi:id="_dxcGcDTvEd-aL8GNXYXa-Q" annotatedElement="_BOnDoFLpEd6rYflXebIz1g">
       <body>The template parameters list defines the parameters that are passed to the Acceleo template. If empty, the formal parameter list of the package template is used.</body>
     </ownedComment>
-    <ownedComment xmi:type="uml:Comment" xmi:id="_2Lq5wDR4Ed-aL8GNXYXa-Q" annotatedElement="_zZEPQDR4Ed-aL8GNXYXa-Q">
+    <ownedComment xmi:type="uml:Comment" xmi:id="_2Lq5wDR4Ed-aL8GNXYXa-Q">
       <body>LateEvaluation is more a tempalte binding rather than a template definition. In</body>
     </ownedComment>
     <ownedComment xmi:type="uml:Comment" xmi:id="_tP3jMLy-Ed-9GLEvRgvEyg" annotatedElement="_L8b3wMtvEd2H_o0jIC6qDQ">
@@ -61,6 +61,9 @@ The system component is also an assembly</body>
       <body>Template ports are ports that enable the binding of an extended port with an actual parameter: the resulting port kind is the port kind bound to the current port type.
 For instance, we cound type a port with &quot;MyType&quot; and use an extended port Writer with a template with formal parameter T. Resulting port would be Writer with T bound to MyType.</body>
     </ownedComment>
+    <ownedComment xmi:type="uml:Comment" xmi:id="_MyfoAHJqEeOMF7YEvnQt5g" annotatedElement="_8IkbcHI0EeOZxcUd14vDog">
+      <body>A binding helper is responsible for creating sub-elements. For instance, if the formal parameter of a template is an interface, it might be required to instantiate an operation for each operation of the interface.</body>
+    </ownedComment>
     <elementImport xmi:type="uml:ElementImport" xmi:id="_NYUA4MtkEd2H_o0jIC6qDQ" alias="Package">
       <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>
     </elementImport>
@@ -286,24 +289,12 @@ For instance, we cound type a port with &quot;MyType&quot; and use an extended p
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Stereotype" xmi:id="_BOnDoFLpEd6rYflXebIz1g" name="Template">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_W5NH0FLpEd6rYflXebIz1g" name="templateParams" isUnique="false">
-        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Classifier"/>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZHrGADTvEd-aL8GNXYXa-Q"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZHzB0DTvEd-aL8GNXYXa-Q" value="*"/>
-      </ownedAttribute>
       <ownedAttribute xmi:type="uml:Property" xmi:id="_hEi6cFLpEd6rYflXebIz1g" name="base_Element" isUnique="false" association="_hC4tkFLpEd6rYflXebIz1g">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_aPnHoAswEd-UGs2QNFrwPw" name="kind" visibility="public" type="_HSVlUAswEd-UGs2QNFrwPw" isUnique="false">
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_fFnNQAswEd-UGs2QNFrwPw" value="1"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fFt68AswEd-UGs2QNFrwPw" value="1"/>
-        <defaultValue xmi:type="uml:LiteralString" xmi:id="_fF1PsAswEd-UGs2QNFrwPw">
-          <value xsi:nil="true"/>
-        </defaultValue>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_AAI-UObPEd-oHsJhS1620Q" name="actualChoice" visibility="public" type="_jnxwsObFEd-oHsJhS1620Q" isUnique="false">
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_GdgDUObPEd-oHsJhS1620Q"/>
-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Gdh4gObPEd-oHsJhS1620Q" value="1"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_AROS4HI1EeOZxcUd14vDog" name="helper" type="_8IkbcHI0EeOZxcUd14vDog">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IRor8HJqEeOMF7YEvnQt5g"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IRpTAHJqEeOMF7YEvnQt5g" value="1"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Extension" xmi:id="_eamcsFLpEd6rYflXebIz1g" name="Extension_DeploymentPlan" memberEnd="_ecAK4FLpEd6rYflXebIz1g _ecD1QFLpEd6rYflXebIz1g">
@@ -366,16 +357,6 @@ For instance, we cound type a port with &quot;MyType&quot; and use an extended p
     <packagedElement xmi:type="uml:Extension" xmi:id="_s6giAAAjEd-0dMgailnZgA" name="E_ContainerRule_Class0" memberEnd="_s9YP0AAjEd-0dMgailnZgA _s9dIUAAjEd-0dMgailnZgA">
       <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_s9YP0AAjEd-0dMgailnZgA" name="extension_ContainerRule" type="_5SI38AAhEd-0dMgailnZgA" aggregation="composite" association="_s6giAAAjEd-0dMgailnZgA"/>
     </packagedElement>
-    <packagedElement xmi:type="uml:Enumeration" xmi:id="_HSVlUAswEd-UGs2QNFrwPw" name="TemplateKind">
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Mn7J8AswEd-UGs2QNFrwPw" name="PassFormal"/>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_NRzNYAswEd-UGs2QNFrwPw" name="LoopOperations"/>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_T3PQUAswEd-UGs2QNFrwPw" name="LoopProperty"/>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_Ub5RUDNYEd-t359GOtEoBQ" name="Accumulate"/>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_3YQuwDNyEd-l9qP5D2-iXA" name="LoopLiterals"/>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_zZEPQDR4Ed-aL8GNXYXa-Q" name="LateEvaluation"/>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_p-jDYOhjEd-oHsJhS1620Q" name="LoopPorts"/>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_8n-OADWzEeKiyvmIR-KbrA" name="PassClassifier"/>
-    </packagedElement>
     <packagedElement xmi:type="uml:Stereotype" xmi:id="_aQTf0FSdEd-w9f5DG2hQCA" name="ImplementationGroup">
       <ownedAttribute xmi:type="uml:Property" xmi:id="_5OkHcEzuEeG_JK8KIEXPxQ" name="base_Class" association="_5OkugEzuEeG_JK8KIEXPxQ">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
@@ -598,22 +579,6 @@ For instance, we cound type a port with &quot;MyType&quot; and use an extended p
     <packagedElement xmi:type="uml:Extension" xmi:id="_ZfRJoNXwEd-CUqOXH3INsw" name="E_ConnectorConfiguration_Slot0" memberEnd="_ZfRJodXwEd-CUqOXH3INsw _ZfQikNXwEd-CUqOXH3INsw">
       <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_ZfRJodXwEd-CUqOXH3INsw" name="extension_ConnectorConfiguration" type="_mditANXnEd-CUqOXH3INsw" aggregation="composite" association="_ZfRJoNXwEd-CUqOXH3INsw"/>
     </packagedElement>
-    <packagedElement xmi:type="uml:Enumeration" xmi:id="_jnxwsObFEd-oHsJhS1620Q" name="ActualChoice">
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_udxp4ObFEd-oHsJhS1620Q" name="PassActual"/>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_vSnAIObFEd-oHsJhS1620Q" name="InterfaceOfPPort"/>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_6qjZsObOEd-oHsJhS1620Q" name="InterfaceOfRport"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Stereotype" xmi:id="_UsmDYPPBEd-Tz5tQ_F9baw" name="ExtendedSignature">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_ZiQx0PPBEd-Tz5tQ_F9baw" name="base_TemplateSignature" association="_ZiRY4PPBEd-Tz5tQ_F9baw">
-        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TemplateSignature"/>
-      </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_cqIhsPPBEd-Tz5tQ_F9baw" name="baseSignature">
-        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#TemplateSignature"/>
-      </ownedAttribute>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Extension" xmi:id="_ZiRY4PPBEd-Tz5tQ_F9baw" name="E_ExtendedSignature_TemplateSignature0" memberEnd="_ZiRY4fPBEd-Tz5tQ_F9baw _ZiQx0PPBEd-Tz5tQ_F9baw">
-      <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_ZiRY4fPBEd-Tz5tQ_F9baw" name="extension_ExtendedSignature" type="_UsmDYPPBEd-Tz5tQ_F9baw" aggregation="composite" association="_ZiRY4PPBEd-Tz5tQ_F9baw"/>
-    </packagedElement>
     <packagedElement xmi:type="uml:Stereotype" xmi:id="_KBrOsDyEEeCYGtteoBz6vQ" name="TemplatePort">
       <generalization xmi:type="uml:Generalization" xmi:id="_OUdSgDyEEeCYGtteoBz6vQ" general="_pP-ckMtqEd2H_o0jIC6qDQ"/>
       <ownedAttribute xmi:type="uml:Property" xmi:id="_RgadAOHNEeKl1vaXi7stuw" name="boundType" visibility="public" type="_tBRZYMtpEd2H_o0jIC6qDQ" isDerived="true">
@@ -643,6 +608,11 @@ For instance, we cound type a port with &quot;MyType&quot; and use an extended p
       <ownedAttribute xmi:type="uml:Property" xmi:id="_rsCMgEZ0EeCLCJBkU67iDQ" name="base_Class" association="_rsCMgUZ0EeCLCJBkU67iDQ">
         <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
       </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_sE27MGm4EeOEG7lSPuRLag" name="onNodeModel">
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ceiysGsuEeOoCYTKo-XKlQ"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_cekA0GsuEeOoCYTKo-XKlQ" value="1"/>
+      </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Extension" xmi:id="_rsCMgUZ0EeCLCJBkU67iDQ" name="E_InstanceConfigurator_Class0" memberEnd="_rsCMgkZ0EeCLCJBkU67iDQ _rsCMgEZ0EeCLCJBkU67iDQ">
       <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_rsCMgkZ0EeCLCJBkU67iDQ" name="extension_InstanceConfigurator" type="_kDGFMEZ0EeCLCJBkU67iDQ" aggregation="composite" association="_rsCMgUZ0EeCLCJBkU67iDQ"/>
@@ -731,6 +701,14 @@ For instance, we cound type a port with &quot;MyType&quot; and use an extended p
     <packagedElement xmi:type="uml:Extension" xmi:id="_jzYnINRxEeKiLbHSN_MIRQ" name="E_CompilerChain_Class1" memberEnd="_jzYnIdRxEeKiLbHSN_MIRQ _jzVj0NRxEeKiLbHSN_MIRQ">
       <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_jzYnIdRxEeKiLbHSN_MIRQ" name="extension_CompilerChain" type="_iDiaINRxEeKiLbHSN_MIRQ" aggregation="composite" association="_jzYnINRxEeKiLbHSN_MIRQ"/>
     </packagedElement>
+    <packagedElement xmi:type="uml:Stereotype" xmi:id="_8IkbcHI0EeOZxcUd14vDog" name="BindingHelper">
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_SdmcYHI4EeOCrdvV8oxOKA" name="base_Class" association="_SdnDcHI4EeOCrdvV8oxOKA">
+        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Extension" xmi:id="_SdnDcHI4EeOCrdvV8oxOKA" name="E_BindingHelper_Class1" memberEnd="_SdnDcXI4EeOCrdvV8oxOKA _SdmcYHI4EeOCrdvV8oxOKA">
+      <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_SdnDcXI4EeOCrdvV8oxOKA" name="extension_BindingHelper" type="_8IkbcHI0EeOZxcUd14vDog" aggregation="composite" association="_SdnDcHI4EeOCrdvV8oxOKA"/>
+    </packagedElement>
     <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_aTo0UC27Ed6q9cO948d5Fw">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_aa7vIC27Ed6q9cO948d5Fw" source="http://www.eclipse.org/uml2/2.0.0/UML">
         <references xmi:type="ecore:EPackage" href="pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA"/>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/plugin.xml b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/plugin.xml
index 3d535ba6e19..fd9d5ec828a 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/plugin.xml
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/plugin.xml
@@ -11,7 +11,8 @@
 <plugin>

 	<extension-point id="fcmPortMappingRule" name="Port Mapping Rule" schema="schema/fcmPortMappingRule.exsd"/>

 	<extension-point id="fcmEmbeddingRule" name="Connector embedding rule" schema="schema/fcmPortMappingRule.exsd"/>

-

+	<extension-point id="fcmBindingHelper" name="Helper for template binnding" schema="schema/fcmBindingHelper.exsd"/>

+	

 	<extension point="org.eclipse.emf.ecore.generated_package">

 		<package

 			uri = "http://www.eclipse.org/papyrus/FCM/1" 

diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/schema/fcmBindingHelper.exsd b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/schema/fcmBindingHelper.exsd
new file mode 100644
index 00000000000..e51291f98af
--- /dev/null
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/schema/fcmBindingHelper.exsd
@@ -0,0 +1,99 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.papyrus.fcm.profile" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="org.eclipse.papyrus.fcm.profile" id="fcmBindingHelper" name="Binding Helper"/>
+      </appInfo>
+      <documentation>
+         [Enter description of this extension point.]
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <annotation>
+         <appInfo>
+            <meta.element />
+         </appInfo>
+      </annotation>
+      <complexType>
+         <sequence minOccurs="1" maxOccurs="unbounded">
+            <element ref="client"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="client">
+      <complexType>
+         <attribute name="bindingHelperName" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="class" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute kind="java" basedOn=":org.eclipse.papyrus.FCM.util.IBindingHelper"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         [Enter the first release in which this extension point appears.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="examples"/>
+      </appInfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="apiinfo"/>
+      </appInfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="implementation"/>
+      </appInfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+
+</schema>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/schema/fcmEmbeddingRule.exsd b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/schema/fcmEmbeddingRule.exsd
index 34bef832e9d..82aa794425b 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/schema/fcmEmbeddingRule.exsd
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/schema/fcmEmbeddingRule.exsd
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- Schema file written by PDE -->
-<schema targetNamespace="com.cea.profiles.fcm" xmlns="http://www.w3.org/2001/XMLSchema">
+<schema targetNamespace="org.eclipse.papyrus.fcm.profile" xmlns="http://www.w3.org/2001/XMLSchema">
 <annotation>
       <appInfo>
-         <meta.schema plugin="com.cea.profiles.fcm" id="fcmEmbeddingRule" name="Port Mapping Rule"/>
+         <meta.schema plugin="org.eclipse.papyrus.fcm.profile" id="fcmEmbeddingRule" name="FCM embedding rule"/>
       </appInfo>
       <documentation>
          [Enter description of this extension point.]
@@ -17,6 +17,9 @@
          </appInfo>
       </annotation>
       <complexType>
+         <sequence minOccurs="1" maxOccurs="unbounded">
+            <element ref="client"/>
+         </sequence>
          <attribute name="point" type="string" use="required">
             <annotation>
                <documentation>
@@ -31,16 +34,6 @@
                </documentation>
             </annotation>
          </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
       </complexType>
    </element>
 
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/schema/fcmPortMappingRule.exsd b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/schema/fcmPortMappingRule.exsd
index 2659350b49c..77f6e9cb5e4 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/schema/fcmPortMappingRule.exsd
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/schema/fcmPortMappingRule.exsd
@@ -1,12 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- Schema file written by PDE -->
-<schema targetNamespace="com.cea.profiles.fcm" xmlns="http://www.w3.org/2001/XMLSchema">
+<schema targetNamespace="org.eclipse.papyrus.fcm.profile" xmlns="http://www.w3.org/2001/XMLSchema">
 <annotation>
       <appInfo>
-         <meta.schema plugin="com.cea.profiles.fcm" id="fcmPortMappingRule" name="Port Mapping Rule"/>
+         <meta.schema plugin="org.eclipse.papyrus.fcm.profile" id="fcmPortMappingRule" name="Port Mapping Rule"/>
       </appInfo>
       <documentation>
-         [Enter description of this extension point.]
+         A port mapping rule, i.e. a rule that maps port kinds to a provider and/or required interface
       </documentation>
    </annotation>
 
@@ -17,6 +17,9 @@
          </appInfo>
       </annotation>
       <complexType>
+         <sequence minOccurs="1" maxOccurs="unbounded">
+            <element ref="client"/>
+         </sequence>
          <attribute name="point" type="string" use="required">
             <annotation>
                <documentation>
@@ -31,16 +34,6 @@
                </documentation>
             </annotation>
          </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
       </complexType>
    </element>
 
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/ActualChoice.java b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/ActualChoice.java
deleted file mode 100644
index 79e369c1e4b..00000000000
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/ActualChoice.java
+++ /dev/null
@@ -1,245 +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
- * 
- * Contributors:
- *    Ansgar Radermacher - Initial API and implementation
- * 
- */
-package org.eclipse.papyrus.FCM;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Actual Choice</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.FCM.FCMPackage#getActualChoice()
- * @model
- * @generated
- */
-public enum ActualChoice implements Enumerator {
-	/**
-	 * The '<em><b>Pass Actual</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #PASS_ACTUAL_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	PASS_ACTUAL(0, "PassActual", "PassActual"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Interface Of PPort</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #INTERFACE_OF_PPORT_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	INTERFACE_OF_PPORT(1, "InterfaceOfPPort", "InterfaceOfPPort"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Interface Of Rport</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #INTERFACE_OF_RPORT_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	INTERFACE_OF_RPORT(2, "InterfaceOfRport", "InterfaceOfRport"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Pass Actual</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Pass Actual</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #PASS_ACTUAL
-	 * @model name="PassActual"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int PASS_ACTUAL_VALUE = 0;
-
-	/**
-	 * The '<em><b>Interface Of PPort</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Interface Of PPort</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #INTERFACE_OF_PPORT
-	 * @model name="InterfaceOfPPort"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int INTERFACE_OF_PPORT_VALUE = 1;
-
-	/**
-	 * The '<em><b>Interface Of Rport</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Interface Of Rport</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #INTERFACE_OF_RPORT
-	 * @model name="InterfaceOfRport"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int INTERFACE_OF_RPORT_VALUE = 2;
-
-	/**
-	 * An array of all the '<em><b>Actual Choice</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final ActualChoice[] VALUES_ARRAY =
-		new ActualChoice[] {
-			PASS_ACTUAL,
-			INTERFACE_OF_PPORT,
-			INTERFACE_OF_RPORT,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Actual Choice</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<ActualChoice> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Actual Choice</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ActualChoice get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ActualChoice result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Actual Choice</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ActualChoice getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ActualChoice result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Actual Choice</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ActualChoice get(int value) {
-		switch (value) {
-			case PASS_ACTUAL_VALUE: return PASS_ACTUAL;
-			case INTERFACE_OF_PPORT_VALUE: return INTERFACE_OF_PPORT;
-			case INTERFACE_OF_RPORT_VALUE: return INTERFACE_OF_RPORT;
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private ActualChoice(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-	  return literal;
-	}
-
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
-	
-} //ActualChoice
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/BindingHelper.java b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/BindingHelper.java
new file mode 100644
index 00000000000..8087e0ea9fe
--- /dev/null
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/BindingHelper.java
@@ -0,0 +1,64 @@
+/**
+ * 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:
+ *    Ansgar Radermacher - Initial API and implementation
+ * 
+ */
+package org.eclipse.papyrus.FCM;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Binding Helper</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * A binding helper is responsible for creating sub-elements. For instance, if the formal parameter of a template is an interface, it might be required to instantiate an operation for each operation of the interface.
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.FCM.BindingHelper#getBase_Class <em>Base Class</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.papyrus.FCM.FCMPackage#getBindingHelper()
+ * @model
+ * @generated
+ */
+public interface BindingHelper extends EObject {
+
+	/**
+	 * Returns the value of the '<em><b>Base Class</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Base Class</em>' reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Base Class</em>' reference.
+	 * @see #setBase_Class(org.eclipse.uml2.uml.Class)
+	 * @see org.eclipse.papyrus.FCM.FCMPackage#getBindingHelper_Base_Class()
+	 * @model required="true" ordered="false"
+	 * @generated
+	 */
+	org.eclipse.uml2.uml.Class getBase_Class();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.FCM.BindingHelper#getBase_Class <em>Base Class</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Base Class</em>' reference.
+	 * @see #getBase_Class()
+	 * @generated
+	 */
+	void setBase_Class(org.eclipse.uml2.uml.Class value);
+} // BindingHelper
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/ExtendedSignature.java b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/ExtendedSignature.java
deleted file mode 100644
index fc0a3eefd27..00000000000
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/ExtendedSignature.java
+++ /dev/null
@@ -1,89 +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
- * 
- * Contributors:
- *    Ansgar Radermacher - Initial API and implementation
- * 
- */
-package org.eclipse.papyrus.FCM;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.uml2.uml.TemplateSignature;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Extended Signature</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.FCM.ExtendedSignature#getBase_TemplateSignature <em>Base Template Signature</em>}</li>
- *   <li>{@link org.eclipse.papyrus.FCM.ExtendedSignature#getBaseSignature <em>Base Signature</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.FCM.FCMPackage#getExtendedSignature()
- * @model
- * @generated
- */
-public interface ExtendedSignature extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Base Template Signature</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Base Template Signature</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Base Template Signature</em>' reference.
-	 * @see #setBase_TemplateSignature(TemplateSignature)
-	 * @see org.eclipse.papyrus.FCM.FCMPackage#getExtendedSignature_Base_TemplateSignature()
-	 * @model required="true" ordered="false"
-	 * @generated
-	 */
-	TemplateSignature getBase_TemplateSignature();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.FCM.ExtendedSignature#getBase_TemplateSignature <em>Base Template Signature</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Template Signature</em>' reference.
-	 * @see #getBase_TemplateSignature()
-	 * @generated
-	 */
-	void setBase_TemplateSignature(TemplateSignature value);
-
-	/**
-	 * Returns the value of the '<em><b>Base Signature</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Base Signature</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Base Signature</em>' reference.
-	 * @see #setBaseSignature(TemplateSignature)
-	 * @see org.eclipse.papyrus.FCM.FCMPackage#getExtendedSignature_BaseSignature()
-	 * @model required="true" ordered="false"
-	 * @generated
-	 */
-	TemplateSignature getBaseSignature();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.FCM.ExtendedSignature#getBaseSignature <em>Base Signature</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Signature</em>' reference.
-	 * @see #getBaseSignature()
-	 * @generated
-	 */
-	void setBaseSignature(TemplateSignature value);
-
-} // ExtendedSignature
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/FCMFactory.java b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/FCMFactory.java
index 7efbad07cc6..3b98a6743f8 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/FCMFactory.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/FCMFactory.java
@@ -41,6 +41,15 @@ public interface FCMFactory extends EFactory {
 	Template createTemplate();
 
 	/**
+	 * Returns a new object of class '<em>Binding Helper</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Binding Helper</em>'.
+	 * @generated
+	 */
+	BindingHelper createBindingHelper();
+
+	/**
 	 * Returns a new object of class '<em>Configuration Property</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -347,15 +356,6 @@ public interface FCMFactory extends EFactory {
 	ConnectorConfiguration createConnectorConfiguration();
 
 	/**
-	 * Returns a new object of class '<em>Extended Signature</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Extended Signature</em>'.
-	 * @generated
-	 */
-	ExtendedSignature createExtendedSignature();
-
-	/**
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/FCMPackage.java b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/FCMPackage.java
index 5ceb9c6c24d..5ae5e903c14 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/FCMPackage.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/FCMPackage.java
@@ -77,49 +77,59 @@ public interface FCMPackage extends EPackage {
 	int TEMPLATE = 0;
 
 	/**
-	 * The feature id for the '<em><b>Template Params</b></em>' reference list.
+	 * The feature id for the '<em><b>Base Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int TEMPLATE__TEMPLATE_PARAMS = 0;
+	int TEMPLATE__BASE_ELEMENT = 0;
 
 	/**
-	 * The feature id for the '<em><b>Base Element</b></em>' reference.
+	 * The feature id for the '<em><b>Helper</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int TEMPLATE__BASE_ELEMENT = 1;
+	int TEMPLATE__HELPER = 1;
 
 	/**
-	 * The feature id for the '<em><b>Kind</b></em>' attribute.
+	 * The number of structural features of the '<em>Template</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int TEMPLATE__KIND = 2;
+	int TEMPLATE_FEATURE_COUNT = 2;
 
 	/**
-	 * The feature id for the '<em><b>Actual Choice</b></em>' attribute.
+	 * The meta object id for the '{@link org.eclipse.papyrus.FCM.impl.BindingHelperImpl <em>Binding Helper</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.FCM.impl.BindingHelperImpl
+	 * @see org.eclipse.papyrus.FCM.impl.FCMPackageImpl#getBindingHelper()
+	 * @generated
+	 */
+	int BINDING_HELPER = 1;
+
+	/**
+	 * The feature id for the '<em><b>Base Class</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int TEMPLATE__ACTUAL_CHOICE = 3;
+	int BINDING_HELPER__BASE_CLASS = 0;
 
 	/**
-	 * The number of structural features of the '<em>Template</em>' class.
+	 * The number of structural features of the '<em>Binding Helper</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int TEMPLATE_FEATURE_COUNT = 4;
+	int BINDING_HELPER_FEATURE_COUNT = 1;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.FCM.impl.ConfigurationPropertyImpl <em>Configuration Property</em>}' class.
@@ -129,7 +139,7 @@ public interface FCMPackage extends EPackage {
 	 * @see org.eclipse.papyrus.FCM.impl.FCMPackageImpl#getConfigurationProperty()
 	 * @generated
 	 */
-	int CONFIGURATION_PROPERTY = 1;
+	int CONFIGURATION_PROPERTY = 2;
 
 	/**
 	 * The feature id for the '<em><b>Base Property</b></em>' reference.
@@ -157,7 +167,7 @@ public interface FCMPackage extends EPackage {
 	 * @see org.eclipse.papyrus.FCM.impl.FCMPackageImpl#getImplementationGroup()
 	 * @generated
 	 */
-	int IMPLEMENTATION_GROUP = 2;
+	int IMPLEMENTATION_GROUP = 3;
 
 	/**
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
@@ -185,7 +195,7 @@ public interface FCMPackage extends EPackage {
 	 * @see org.eclipse.papyrus.FCM.impl.FCMPackageImpl#getAssembly()
 	 * @generated
 	 */
-	int ASSEMBLY = 3;
+	int ASSEMBLY = 4;
 
 	/**
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
@@ -213,7 +223,7 @@ public interface FCMPackage extends EPackage {
 	 * @see org.eclipse.papyrus.FCM.impl.FCMPackageImpl#getFlatten()
 	 * @generated
 	 */
-	int FLATTEN = 4;
+	int FLATTEN = 5;
 
 	/**
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
@@ -241,7 +251,7 @@ public interface FCMPackage extends EPackage {
 	 * @see org.eclipse.papyrus.FCM.impl.FCMPackageImpl#getCompToOOmapping()
 	 * @generated
 	 */
-	int COMP_TO_OOMAPPING = 5;
+	int COMP_TO_OOMAPPING = 6;
 
 	/**
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
@@ -269,7 +279,7 @@ public interface FCMPackage extends EPackage {
 	 * @see org.eclipse.papyrus.FCM.impl.FCMPackageImpl#getProgLanguage()
 	 * @generated
 	 */
-	int PROG_LANGUAGE = 6;
+	int PROG_LANGUAGE = 7;
 
 	/**
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
@@ -297,7 +307,7 @@ public interface FCMPackage extends EPackage {
 	 * @see org.eclipse.papyrus.FCM.impl.FCMPackageImpl#getCodeGenOptions()
 	 * @generated
 	 */
-	int CODE_GEN_OPTIONS = 7;
+	int CODE_GEN_OPTIONS = 8;
 
 	/**
 	 * The feature id for the '<em><b>Base Package</b></em>' reference.
@@ -343,7 +353,7 @@ public interface FCMPackage extends EPackage {
 	 * @see org.eclipse.papyrus.FCM.impl.FCMPackageImpl#getInteractionComponent()
 	 * @generated
 	 */
-	int INTERACTION_COMPONENT = 8;
+	int INTERACTION_COMPONENT = 9;
 
 	/**
 	 * The feature id for the '<em><b>For Distribution</b></em>' attribute.
@@ -389,7 +399,7 @@ public interface FCMPackage extends EPackage {
 	 * @see org.eclipse.papyrus.FCM.impl.FCMPackageImpl#getSingleton()
 	 * @generated
 	 */
-	int SINGLETON = 9;
+	int SINGLETON = 10;
 
 	/**
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
@@ -417,7 +427,7 @@ public interface FCMPackage extends EPackage {
 	 * @see org.eclipse.papyrus.FCM.impl.FCMPackageImpl#getConfigurableElementInstance()
 	 * @generated
 	 */
-	int CONFIGURABLE_ELEMENT_INSTANCE = 11;
+	int CONFIGURABLE_ELEMENT_INSTANCE = 12;
 
 	/**
 	 * The feature id for the '<em><b>Configuration</b></em>' reference.
@@ -445,7 +455,7 @@ public interface FCMPackage extends EPackage {
 	 * @see org.eclipse.papyrus.FCM.impl.FCMPackageImpl#getConnector()
 	 * @generated
 	 */
-	int CONNECTOR = 10;
+	int CONNECTOR = 11;
 
 	/**
 	 * The feature id for the '<em><b>Configuration</b></em>' reference.
@@ -500,7 +510,7 @@ public interface FCMPackage extends EPackage {
 	 * @see org.eclipse.papyrus.FCM.impl.FCMPackageImpl#getUseInstanceConfigurator()
 	 * @generated
 	 */
-	int USE_INSTANCE_CONFIGURATOR = 12;
+	int USE_INSTANCE_CONFIGURATOR = 13;
 
 	/**
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
@@ -537,7 +547,7 @@ public interface FCMPackage extends EPackage {
 	 * @see org.eclipse.papyrus.FCM.impl.FCMPackageImpl#getInstanceConfigurator()
 	 * @generated
 	 */
-	int INSTANCE_CONFIGURATOR = 13;
+	int INSTANCE_CONFIGURATOR = 14;
 
 	/**
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
@@ -549,13 +559,22 @@ public interface FCMPackage extends EPackage {
 	int INSTANCE_CONFIGURATOR__BASE_CLASS = 0;
 
 	/**
+	 * The feature id for the '<em><b>On Node Model</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int INSTANCE_CONFIGURATOR__ON_NODE_MODEL = 1;
+
+	/**
 	 * The number of structural features of the '<em>Instance Configurator</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int INSTANCE_CONFIGURATOR_FEATURE_COUNT = 1;
+	int INSTANCE_CONFIGURATOR_FEATURE_COUNT = 2;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.FCM.impl.RuleApplicationImpl <em>Rule Application</em>}' class.
@@ -565,7 +584,7 @@ public interface FCMPackage extends EPackage {
 	 * @see org.eclipse.papyrus.FCM.impl.FCMPackageImpl#getRuleApplication()
 	 * @generated
 	 */
-	int RULE_APPLICATION = 14;
+	int RULE_APPLICATION = 15;
 
 	/**
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
@@ -611,7 +630,7 @@ public interface FCMPackage extends EPackage {
 	 * @see org.eclipse.papyrus.FCM.impl.FCMPackageImpl#getContainerRule()
 	 * @generated
 	 */
-	int CONTAINER_RULE = 15;
+	int CONTAINER_RULE = 16;
 
 	/**
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
@@ -657,7 +676,7 @@ public interface FCMPackage extends EPackage {
 	 * @see org.eclipse.papyrus.FCM.impl.FCMPackageImpl#getConfigOption()
 	 * @generated
 	 */
-	int CONFIG_OPTION = 16;
+	int CONFIG_OPTION = 17;
 
 	/**
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
@@ -685,7 +704,7 @@ public interface FCMPackage extends EPackage {
 	 * @see org.eclipse.papyrus.FCM.impl.FCMPackageImpl#getPort()
 	 * @generated
 	 */
-	int PORT = 18;
+	int PORT = 19;
 
 	/**
 	 * The feature id for the '<em><b>Configuration</b></em>' reference.
@@ -749,7 +768,7 @@ public interface FCMPackage extends EPackage {
 	 * @see org.eclipse.papyrus.FCM.impl.FCMPackageImpl#getTemplatePort()
 	 * @generated
 	 */
-	int TEMPLATE_PORT = 17;
+	int TEMPLATE_PORT = 18;
 
 	/**
 	 * The feature id for the '<em><b>Configuration</b></em>' reference.
@@ -822,7 +841,7 @@ public interface FCMPackage extends EPackage {
 	 * @see org.eclipse.papyrus.FCM.impl.FCMPackageImpl#getPortKind()
 	 * @generated
 	 */
-	int PORT_KIND = 19;
+	int PORT_KIND = 20;
 
 	/**
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
@@ -877,7 +896,7 @@ public interface FCMPackage extends EPackage {
 	 * @see org.eclipse.papyrus.FCM.impl.FCMPackageImpl#getDeploymentPlan()
 	 * @generated
 	 */
-	int DEPLOYMENT_PLAN = 20;
+	int DEPLOYMENT_PLAN = 21;
 
 	/**
 	 * The feature id for the '<em><b>Main Instance</b></em>' reference.
@@ -914,7 +933,7 @@ public interface FCMPackage extends EPackage {
 	 * @see org.eclipse.papyrus.FCM.impl.FCMPackageImpl#getDerivedElement()
 	 * @generated
 	 */
-	int DERIVED_ELEMENT = 21;
+	int DERIVED_ELEMENT = 22;
 
 	/**
 	 * The feature id for the '<em><b>Base Element</b></em>' reference.
@@ -951,7 +970,7 @@ public interface FCMPackage extends EPackage {
 	 * @see org.eclipse.papyrus.FCM.impl.FCMPackageImpl#getCompImplTemplate()
 	 * @generated
 	 */
-	int COMP_IMPL_TEMPLATE = 22;
+	int COMP_IMPL_TEMPLATE = 23;
 
 	/**
 	 * The feature id for the '<em><b>Template Defs</b></em>' attribute.
@@ -988,7 +1007,7 @@ public interface FCMPackage extends EPackage {
 	 * @see org.eclipse.papyrus.FCM.impl.FCMPackageImpl#getImplementationProperties()
 	 * @generated
 	 */
-	int IMPLEMENTATION_PROPERTIES = 23;
+	int IMPLEMENTATION_PROPERTIES = 24;
 
 	/**
 	 * The feature id for the '<em><b>Size RAM</b></em>' attribute.
@@ -1061,7 +1080,7 @@ public interface FCMPackage extends EPackage {
 	 * @see org.eclipse.papyrus.FCM.impl.FCMPackageImpl#getOperatingSystem()
 	 * @generated
 	 */
-	int OPERATING_SYSTEM = 24;
+	int OPERATING_SYSTEM = 25;
 
 	/**
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
@@ -1089,7 +1108,7 @@ public interface FCMPackage extends EPackage {
 	 * @see org.eclipse.papyrus.FCM.impl.FCMPackageImpl#getTargetArchitecture()
 	 * @generated
 	 */
-	int TARGET_ARCHITECTURE = 25;
+	int TARGET_ARCHITECTURE = 26;
 
 	/**
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
@@ -1117,7 +1136,7 @@ public interface FCMPackage extends EPackage {
 	 * @see org.eclipse.papyrus.FCM.impl.FCMPackageImpl#getConfiguration()
 	 * @generated
 	 */
-	int CONFIGURATION = 26;
+	int CONFIGURATION = 27;
 
 	/**
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
@@ -1163,7 +1182,7 @@ public interface FCMPackage extends EPackage {
 	 * @see org.eclipse.papyrus.FCM.impl.FCMPackageImpl#getInterceptionRule()
 	 * @generated
 	 */
-	int INTERCEPTION_RULE = 27;
+	int INTERCEPTION_RULE = 28;
 
 	/**
 	 * The feature id for the '<em><b>Interception Kind</b></em>' attribute.
@@ -1218,7 +1237,7 @@ public interface FCMPackage extends EPackage {
 	 * @see org.eclipse.papyrus.FCM.impl.FCMPackageImpl#getTarget()
 	 * @generated
 	 */
-	int TARGET = 28;
+	int TARGET = 29;
 
 	/**
 	 * The feature id for the '<em><b>Target Arch</b></em>' reference.
@@ -1300,7 +1319,7 @@ public interface FCMPackage extends EPackage {
 	 * @see org.eclipse.papyrus.FCM.impl.FCMPackageImpl#getCompilerChain()
 	 * @generated
 	 */
-	int COMPILER_CHAIN = 29;
+	int COMPILER_CHAIN = 30;
 
 	/**
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
@@ -1328,7 +1347,7 @@ public interface FCMPackage extends EPackage {
 	 * @see org.eclipse.papyrus.FCM.impl.FCMPackageImpl#getFragment()
 	 * @generated
 	 */
-	int FRAGMENT = 30;
+	int FRAGMENT = 31;
 
 	/**
 	 * The feature id for the '<em><b>Base Class</b></em>' reference.
@@ -1356,7 +1375,7 @@ public interface FCMPackage extends EPackage {
 	 * @see org.eclipse.papyrus.FCM.impl.FCMPackageImpl#getCopyAttributeValue()
 	 * @generated
 	 */
-	int COPY_ATTRIBUTE_VALUE = 31;
+	int COPY_ATTRIBUTE_VALUE = 32;
 
 	/**
 	 * The feature id for the '<em><b>Source</b></em>' reference.
@@ -1393,7 +1412,7 @@ public interface FCMPackage extends EPackage {
 	 * @see org.eclipse.papyrus.FCM.impl.FCMPackageImpl#getAutoIndex()
 	 * @generated
 	 */
-	int AUTO_INDEX = 32;
+	int AUTO_INDEX = 33;
 
 	/**
 	 * The feature id for the '<em><b>Base Property</b></em>' reference.
@@ -1421,7 +1440,7 @@ public interface FCMPackage extends EPackage {
 	 * @see org.eclipse.papyrus.FCM.impl.FCMPackageImpl#getAutoIndexPerNode()
 	 * @generated
 	 */
-	int AUTO_INDEX_PER_NODE = 33;
+	int AUTO_INDEX_PER_NODE = 34;
 
 	/**
 	 * The feature id for the '<em><b>Base Property</b></em>' reference.
@@ -1449,7 +1468,7 @@ public interface FCMPackage extends EPackage {
 	 * @see org.eclipse.papyrus.FCM.impl.FCMPackageImpl#getInitPrecedence()
 	 * @generated
 	 */
-	int INIT_PRECEDENCE = 34;
+	int INIT_PRECEDENCE = 35;
 
 	/**
 	 * The feature id for the '<em><b>Invoke After</b></em>' reference list.
@@ -1495,7 +1514,7 @@ public interface FCMPackage extends EPackage {
 	 * @see org.eclipse.papyrus.FCM.impl.FCMPackageImpl#getConnectorConfiguration()
 	 * @generated
 	 */
-	int CONNECTOR_CONFIGURATION = 35;
+	int CONNECTOR_CONFIGURATION = 36;
 
 	/**
 	 * The feature id for the '<em><b>Base Slot</b></em>' reference.
@@ -1525,63 +1544,6 @@ public interface FCMPackage extends EPackage {
 	int CONNECTOR_CONFIGURATION_FEATURE_COUNT = 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.FCM.impl.ExtendedSignatureImpl <em>Extended Signature</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.FCM.impl.ExtendedSignatureImpl
-	 * @see org.eclipse.papyrus.FCM.impl.FCMPackageImpl#getExtendedSignature()
-	 * @generated
-	 */
-	int EXTENDED_SIGNATURE = 36;
-
-	/**
-	 * The feature id for the '<em><b>Base Template Signature</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENDED_SIGNATURE__BASE_TEMPLATE_SIGNATURE = 0;
-
-	/**
-	 * The feature id for the '<em><b>Base Signature</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENDED_SIGNATURE__BASE_SIGNATURE = 1;
-
-	/**
-	 * The number of structural features of the '<em>Extended Signature</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXTENDED_SIGNATURE_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.FCM.TemplateKind <em>Template Kind</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.FCM.TemplateKind
-	 * @see org.eclipse.papyrus.FCM.impl.FCMPackageImpl#getTemplateKind()
-	 * @generated
-	 */
-	int TEMPLATE_KIND = 37;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.FCM.ActualChoice <em>Actual Choice</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.FCM.ActualChoice
-	 * @see org.eclipse.papyrus.FCM.impl.FCMPackageImpl#getActualChoice()
-	 * @generated
-	 */
-	int ACTUAL_CHOICE = 38;
-
-	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.FCM.ContainerRuleKind <em>Container Rule Kind</em>}' enum.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1589,7 +1551,7 @@ public interface FCMPackage extends EPackage {
 	 * @see org.eclipse.papyrus.FCM.impl.FCMPackageImpl#getContainerRuleKind()
 	 * @generated
 	 */
-	int CONTAINER_RULE_KIND = 39;
+	int CONTAINER_RULE_KIND = 37;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.FCM.InterceptionKind <em>Interception Kind</em>}' enum.
@@ -1599,7 +1561,7 @@ public interface FCMPackage extends EPackage {
 	 * @see org.eclipse.papyrus.FCM.impl.FCMPackageImpl#getInterceptionKind()
 	 * @generated
 	 */
-	int INTERCEPTION_KIND = 40;
+	int INTERCEPTION_KIND = 38;
 
 
 	/**
@@ -1613,48 +1575,47 @@ public interface FCMPackage extends EPackage {
 	EClass getTemplate();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.FCM.Template#getTemplateParams <em>Template Params</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.FCM.Template#getBase_Element <em>Base Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Template Params</em>'.
-	 * @see org.eclipse.papyrus.FCM.Template#getTemplateParams()
+	 * @return the meta object for the reference '<em>Base Element</em>'.
+	 * @see org.eclipse.papyrus.FCM.Template#getBase_Element()
 	 * @see #getTemplate()
 	 * @generated
 	 */
-	EReference getTemplate_TemplateParams();
+	EReference getTemplate_Base_Element();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.FCM.Template#getBase_Element <em>Base Element</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.FCM.Template#getHelper <em>Helper</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Base Element</em>'.
-	 * @see org.eclipse.papyrus.FCM.Template#getBase_Element()
+	 * @return the meta object for the reference '<em>Helper</em>'.
+	 * @see org.eclipse.papyrus.FCM.Template#getHelper()
 	 * @see #getTemplate()
 	 * @generated
 	 */
-	EReference getTemplate_Base_Element();
+	EReference getTemplate_Helper();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.FCM.Template#getKind <em>Kind</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.FCM.BindingHelper <em>Binding Helper</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Kind</em>'.
-	 * @see org.eclipse.papyrus.FCM.Template#getKind()
-	 * @see #getTemplate()
+	 * @return the meta object for class '<em>Binding Helper</em>'.
+	 * @see org.eclipse.papyrus.FCM.BindingHelper
 	 * @generated
 	 */
-	EAttribute getTemplate_Kind();
+	EClass getBindingHelper();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.FCM.Template#getActualChoice <em>Actual Choice</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.FCM.BindingHelper#getBase_Class <em>Base Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Actual Choice</em>'.
-	 * @see org.eclipse.papyrus.FCM.Template#getActualChoice()
-	 * @see #getTemplate()
+	 * @return the meta object for the reference '<em>Base Class</em>'.
+	 * @see org.eclipse.papyrus.FCM.BindingHelper#getBase_Class()
+	 * @see #getBindingHelper()
 	 * @generated
 	 */
-	EAttribute getTemplate_ActualChoice();
+	EReference getBindingHelper_Base_Class();
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.FCM.ConfigurationProperty <em>Configuration Property</em>}'.
@@ -2007,6 +1968,17 @@ public interface FCMPackage extends EPackage {
 	EReference getInstanceConfigurator_Base_Class();
 
 	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.FCM.InstanceConfigurator#isOnNodeModel <em>On Node Model</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>On Node Model</em>'.
+	 * @see org.eclipse.papyrus.FCM.InstanceConfigurator#isOnNodeModel()
+	 * @see #getInstanceConfigurator()
+	 * @generated
+	 */
+	EAttribute getInstanceConfigurator_OnNodeModel();
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.FCM.RuleApplication <em>Rule Application</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -2821,58 +2793,6 @@ public interface FCMPackage extends EPackage {
 	EReference getConnectorConfiguration_Connector();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.FCM.ExtendedSignature <em>Extended Signature</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Extended Signature</em>'.
-	 * @see org.eclipse.papyrus.FCM.ExtendedSignature
-	 * @generated
-	 */
-	EClass getExtendedSignature();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.FCM.ExtendedSignature#getBase_TemplateSignature <em>Base Template Signature</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Base Template Signature</em>'.
-	 * @see org.eclipse.papyrus.FCM.ExtendedSignature#getBase_TemplateSignature()
-	 * @see #getExtendedSignature()
-	 * @generated
-	 */
-	EReference getExtendedSignature_Base_TemplateSignature();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.FCM.ExtendedSignature#getBaseSignature <em>Base Signature</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Base Signature</em>'.
-	 * @see org.eclipse.papyrus.FCM.ExtendedSignature#getBaseSignature()
-	 * @see #getExtendedSignature()
-	 * @generated
-	 */
-	EReference getExtendedSignature_BaseSignature();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.FCM.TemplateKind <em>Template Kind</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Template Kind</em>'.
-	 * @see org.eclipse.papyrus.FCM.TemplateKind
-	 * @generated
-	 */
-	EEnum getTemplateKind();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.FCM.ActualChoice <em>Actual Choice</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Actual Choice</em>'.
-	 * @see org.eclipse.papyrus.FCM.ActualChoice
-	 * @generated
-	 */
-	EEnum getActualChoice();
-
-	/**
 	 * Returns the meta object for enum '{@link org.eclipse.papyrus.FCM.ContainerRuleKind <em>Container Rule Kind</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -2925,36 +2845,38 @@ public interface FCMPackage extends EPackage {
 		EClass TEMPLATE = eINSTANCE.getTemplate();
 
 		/**
-		 * The meta object literal for the '<em><b>Template Params</b></em>' reference list feature.
+		 * The meta object literal for the '<em><b>Base Element</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference TEMPLATE__TEMPLATE_PARAMS = eINSTANCE.getTemplate_TemplateParams();
+		EReference TEMPLATE__BASE_ELEMENT = eINSTANCE.getTemplate_Base_Element();
 
 		/**
-		 * The meta object literal for the '<em><b>Base Element</b></em>' reference feature.
+		 * The meta object literal for the '<em><b>Helper</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference TEMPLATE__BASE_ELEMENT = eINSTANCE.getTemplate_Base_Element();
+		EReference TEMPLATE__HELPER = eINSTANCE.getTemplate_Helper();
 
 		/**
-		 * The meta object literal for the '<em><b>Kind</b></em>' attribute feature.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.FCM.impl.BindingHelperImpl <em>Binding Helper</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.FCM.impl.BindingHelperImpl
+		 * @see org.eclipse.papyrus.FCM.impl.FCMPackageImpl#getBindingHelper()
 		 * @generated
 		 */
-		EAttribute TEMPLATE__KIND = eINSTANCE.getTemplate_Kind();
+		EClass BINDING_HELPER = eINSTANCE.getBindingHelper();
 
 		/**
-		 * The meta object literal for the '<em><b>Actual Choice</b></em>' attribute feature.
+		 * The meta object literal for the '<em><b>Base Class</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute TEMPLATE__ACTUAL_CHOICE = eINSTANCE.getTemplate_ActualChoice();
+		EReference BINDING_HELPER__BASE_CLASS = eINSTANCE.getBindingHelper_Base_Class();
 
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.FCM.impl.ConfigurationPropertyImpl <em>Configuration Property</em>}' class.
@@ -3247,6 +3169,14 @@ public interface FCMPackage extends EPackage {
 		EReference INSTANCE_CONFIGURATOR__BASE_CLASS = eINSTANCE.getInstanceConfigurator_Base_Class();
 
 		/**
+		 * The meta object literal for the '<em><b>On Node Model</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute INSTANCE_CONFIGURATOR__ON_NODE_MODEL = eINSTANCE.getInstanceConfigurator_OnNodeModel();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.FCM.impl.RuleApplicationImpl <em>Rule Application</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -3899,52 +3829,6 @@ public interface FCMPackage extends EPackage {
 		EReference CONNECTOR_CONFIGURATION__CONNECTOR = eINSTANCE.getConnectorConfiguration_Connector();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.FCM.impl.ExtendedSignatureImpl <em>Extended Signature</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.FCM.impl.ExtendedSignatureImpl
-		 * @see org.eclipse.papyrus.FCM.impl.FCMPackageImpl#getExtendedSignature()
-		 * @generated
-		 */
-		EClass EXTENDED_SIGNATURE = eINSTANCE.getExtendedSignature();
-
-		/**
-		 * The meta object literal for the '<em><b>Base Template Signature</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EXTENDED_SIGNATURE__BASE_TEMPLATE_SIGNATURE = eINSTANCE.getExtendedSignature_Base_TemplateSignature();
-
-		/**
-		 * The meta object literal for the '<em><b>Base Signature</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference EXTENDED_SIGNATURE__BASE_SIGNATURE = eINSTANCE.getExtendedSignature_BaseSignature();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.FCM.TemplateKind <em>Template Kind</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.FCM.TemplateKind
-		 * @see org.eclipse.papyrus.FCM.impl.FCMPackageImpl#getTemplateKind()
-		 * @generated
-		 */
-		EEnum TEMPLATE_KIND = eINSTANCE.getTemplateKind();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.FCM.ActualChoice <em>Actual Choice</em>}' enum.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.FCM.ActualChoice
-		 * @see org.eclipse.papyrus.FCM.impl.FCMPackageImpl#getActualChoice()
-		 * @generated
-		 */
-		EEnum ACTUAL_CHOICE = eINSTANCE.getActualChoice();
-
-		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.FCM.ContainerRuleKind <em>Container Rule Kind</em>}' enum.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/InstanceConfigurator.java b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/InstanceConfigurator.java
index ea8df0b12f3..1985f855d45 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/InstanceConfigurator.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/InstanceConfigurator.java
@@ -23,6 +23,7 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * <ul>
  *   <li>{@link org.eclipse.papyrus.FCM.InstanceConfigurator#getBase_Class <em>Base Class</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.FCM.InstanceConfigurator#isOnNodeModel <em>On Node Model</em>}</li>
  * </ul>
  * </p>
  *
@@ -57,4 +58,30 @@ public interface InstanceConfigurator extends EObject {
 	 */
 	void setBase_Class(org.eclipse.uml2.uml.Class value);
 
+	/**
+	 * Returns the value of the '<em><b>On Node Model</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>On Node Model</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>On Node Model</em>' attribute.
+	 * @see #setOnNodeModel(boolean)
+	 * @see org.eclipse.papyrus.FCM.FCMPackage#getInstanceConfigurator_OnNodeModel()
+	 * @model dataType="org.eclipse.uml2.types.Boolean" ordered="false"
+	 * @generated
+	 */
+	boolean isOnNodeModel();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.FCM.InstanceConfigurator#isOnNodeModel <em>On Node Model</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>On Node Model</em>' attribute.
+	 * @see #isOnNodeModel()
+	 * @generated
+	 */
+	void setOnNodeModel(boolean value);
+
 } // InstanceConfigurator
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Template.java b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Template.java
index d4b3af7562a..f092edf336a 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Template.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/Template.java
@@ -31,10 +31,8 @@ import org.eclipse.uml2.uml.Element;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.FCM.Template#getTemplateParams <em>Template Params</em>}</li>
  *   <li>{@link org.eclipse.papyrus.FCM.Template#getBase_Element <em>Base Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.FCM.Template#getKind <em>Kind</em>}</li>
- *   <li>{@link org.eclipse.papyrus.FCM.Template#getActualChoice <em>Actual Choice</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.FCM.Template#getHelper <em>Helper</em>}</li>
  * </ul>
  * </p>
  *
@@ -44,22 +42,6 @@ import org.eclipse.uml2.uml.Element;
  */
 public interface Template extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Template Params</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.uml2.uml.Classifier}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Template Params</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Template Params</em>' reference list.
-	 * @see org.eclipse.papyrus.FCM.FCMPackage#getTemplate_TemplateParams()
-	 * @model ordered="false"
-	 * @generated
-	 */
-	EList<Classifier> getTemplateParams();
-
-	/**
 	 * Returns the value of the '<em><b>Base Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
@@ -86,61 +68,29 @@ public interface Template extends EObject {
 	void setBase_Element(Element value);
 
 	/**
-	 * Returns the value of the '<em><b>Kind</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.papyrus.FCM.TemplateKind}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Kind</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Kind</em>' attribute.
-	 * @see org.eclipse.papyrus.FCM.TemplateKind
-	 * @see #setKind(TemplateKind)
-	 * @see org.eclipse.papyrus.FCM.FCMPackage#getTemplate_Kind()
-	 * @model unique="false" required="true" ordered="false"
-	 * @generated
-	 */
-	TemplateKind getKind();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.FCM.Template#getKind <em>Kind</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Kind</em>' attribute.
-	 * @see org.eclipse.papyrus.FCM.TemplateKind
-	 * @see #getKind()
-	 * @generated
-	 */
-	void setKind(TemplateKind value);
-
-	/**
-	 * Returns the value of the '<em><b>Actual Choice</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.papyrus.FCM.ActualChoice}.
+	 * Returns the value of the '<em><b>Helper</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Actual Choice</em>' attribute isn't clear,
+	 * If the meaning of the '<em>Helper</em>' reference isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Actual Choice</em>' attribute.
-	 * @see org.eclipse.papyrus.FCM.ActualChoice
-	 * @see #setActualChoice(ActualChoice)
-	 * @see org.eclipse.papyrus.FCM.FCMPackage#getTemplate_ActualChoice()
-	 * @model unique="false" ordered="false"
+	 * @return the value of the '<em>Helper</em>' reference.
+	 * @see #setHelper(BindingHelper)
+	 * @see org.eclipse.papyrus.FCM.FCMPackage#getTemplate_Helper()
+	 * @model ordered="false"
 	 * @generated
 	 */
-	ActualChoice getActualChoice();
+	BindingHelper getHelper();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.FCM.Template#getActualChoice <em>Actual Choice</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.FCM.Template#getHelper <em>Helper</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Actual Choice</em>' attribute.
-	 * @see org.eclipse.papyrus.FCM.ActualChoice
-	 * @see #getActualChoice()
+	 * @param value the new value of the '<em>Helper</em>' reference.
+	 * @see #getHelper()
 	 * @generated
 	 */
-	void setActualChoice(ActualChoice value);
+	void setHelper(BindingHelper value);
 
 } // Template
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/TemplateKind.java b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/TemplateKind.java
deleted file mode 100644
index 8232b914de1..00000000000
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/TemplateKind.java
+++ /dev/null
@@ -1,379 +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
- * 
- * Contributors:
- *    Ansgar Radermacher - Initial API and implementation
- * 
- */
-package org.eclipse.papyrus.FCM;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Template Kind</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.FCM.FCMPackage#getTemplateKind()
- * @model
- * @generated
- */
-public enum TemplateKind implements Enumerator {
-	/**
-	 * The '<em><b>Pass Formal</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #PASS_FORMAL_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	PASS_FORMAL(0, "PassFormal", "PassFormal"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Loop Operations</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #LOOP_OPERATIONS_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	LOOP_OPERATIONS(1, "LoopOperations", "LoopOperations"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Loop Property</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #LOOP_PROPERTY_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	LOOP_PROPERTY(2, "LoopProperty", "LoopProperty"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Accumulate</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #ACCUMULATE_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	ACCUMULATE(3, "Accumulate", "Accumulate"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Loop Literals</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #LOOP_LITERALS_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	LOOP_LITERALS(4, "LoopLiterals", "LoopLiterals"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Late Evaluation</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #LATE_EVALUATION_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	LATE_EVALUATION(5, "LateEvaluation", "LateEvaluation"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Loop Ports</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #LOOP_PORTS_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	LOOP_PORTS(6, "LoopPorts", "LoopPorts"), //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Pass Classifier</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #PASS_CLASSIFIER_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	PASS_CLASSIFIER(7, "PassClassifier", "PassClassifier"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	/**
-	 * The '<em><b>Pass Formal</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Pass Formal</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #PASS_FORMAL
-	 * @model name="PassFormal"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int PASS_FORMAL_VALUE = 0;
-
-	/**
-	 * The '<em><b>Loop Operations</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Loop Operations</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #LOOP_OPERATIONS
-	 * @model name="LoopOperations"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int LOOP_OPERATIONS_VALUE = 1;
-
-	/**
-	 * The '<em><b>Loop Property</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Loop Property</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #LOOP_PROPERTY
-	 * @model name="LoopProperty"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int LOOP_PROPERTY_VALUE = 2;
-
-	/**
-	 * The '<em><b>Accumulate</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Accumulate</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #ACCUMULATE
-	 * @model name="Accumulate"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ACCUMULATE_VALUE = 3;
-
-	/**
-	 * The '<em><b>Loop Literals</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Loop Literals</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #LOOP_LITERALS
-	 * @model name="LoopLiterals"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int LOOP_LITERALS_VALUE = 4;
-
-	/**
-	 * The '<em><b>Late Evaluation</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * LateEvaluation is more a tempalte binding rather than a template definition. In
-	 * <!-- end-model-doc -->
-	 * @see #LATE_EVALUATION
-	 * @model name="LateEvaluation"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int LATE_EVALUATION_VALUE = 5;
-
-	/**
-	 * The '<em><b>Loop Ports</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Loop Ports</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #LOOP_PORTS
-	 * @model name="LoopPorts"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int LOOP_PORTS_VALUE = 6;
-
-	/**
-	 * The '<em><b>Pass Classifier</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Pass Classifier</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #PASS_CLASSIFIER
-	 * @model name="PassClassifier"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int PASS_CLASSIFIER_VALUE = 7;
-
-	/**
-	 * An array of all the '<em><b>Template Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final TemplateKind[] VALUES_ARRAY =
-		new TemplateKind[] {
-			PASS_FORMAL,
-			LOOP_OPERATIONS,
-			LOOP_PROPERTY,
-			ACCUMULATE,
-			LOOP_LITERALS,
-			LATE_EVALUATION,
-			LOOP_PORTS,
-			PASS_CLASSIFIER,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Template Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<TemplateKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Template Kind</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static TemplateKind get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			TemplateKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Template Kind</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static TemplateKind getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			TemplateKind result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Template Kind</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static TemplateKind get(int value) {
-		switch (value) {
-			case PASS_FORMAL_VALUE: return PASS_FORMAL;
-			case LOOP_OPERATIONS_VALUE: return LOOP_OPERATIONS;
-			case LOOP_PROPERTY_VALUE: return LOOP_PROPERTY;
-			case ACCUMULATE_VALUE: return ACCUMULATE;
-			case LOOP_LITERALS_VALUE: return LOOP_LITERALS;
-			case LATE_EVALUATION_VALUE: return LATE_EVALUATION;
-			case LOOP_PORTS_VALUE: return LOOP_PORTS;
-			case PASS_CLASSIFIER_VALUE: return PASS_CLASSIFIER;
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private TemplateKind(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-	  return literal;
-	}
-
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
-	
-} //TemplateKind
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/BindingHelperImpl.java b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/BindingHelperImpl.java
new file mode 100644
index 00000000000..6c65ad464f2
--- /dev/null
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/BindingHelperImpl.java
@@ -0,0 +1,165 @@
+/**
+ * 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:
+ *    Ansgar Radermacher - Initial API and implementation
+ * 
+ */
+package org.eclipse.papyrus.FCM.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+
+import org.eclipse.papyrus.FCM.BindingHelper;
+import org.eclipse.papyrus.FCM.FCMPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Binding Helper</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.FCM.impl.BindingHelperImpl#getBase_Class <em>Base Class</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class BindingHelperImpl extends EObjectImpl implements BindingHelper {
+	/**
+	 * The cached value of the '{@link #getBase_Class() <em>Base Class</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getBase_Class()
+	 * @generated
+	 * @ordered
+	 */
+	protected org.eclipse.uml2.uml.Class base_Class;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected BindingHelperImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return FCMPackage.Literals.BINDING_HELPER;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public org.eclipse.uml2.uml.Class getBase_Class() {
+		if (base_Class != null && base_Class.eIsProxy()) {
+			InternalEObject oldBase_Class = (InternalEObject)base_Class;
+			base_Class = (org.eclipse.uml2.uml.Class)eResolveProxy(oldBase_Class);
+			if (base_Class != oldBase_Class) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, FCMPackage.BINDING_HELPER__BASE_CLASS, oldBase_Class, base_Class));
+			}
+		}
+		return base_Class;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public org.eclipse.uml2.uml.Class basicGetBase_Class() {
+		return base_Class;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setBase_Class(org.eclipse.uml2.uml.Class newBase_Class) {
+		org.eclipse.uml2.uml.Class oldBase_Class = base_Class;
+		base_Class = newBase_Class;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, FCMPackage.BINDING_HELPER__BASE_CLASS, oldBase_Class, base_Class));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case FCMPackage.BINDING_HELPER__BASE_CLASS:
+				if (resolve) return getBase_Class();
+				return basicGetBase_Class();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case FCMPackage.BINDING_HELPER__BASE_CLASS:
+				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case FCMPackage.BINDING_HELPER__BASE_CLASS:
+				setBase_Class((org.eclipse.uml2.uml.Class)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case FCMPackage.BINDING_HELPER__BASE_CLASS:
+				return base_Class != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+} //BindingHelperImpl
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/ExtendedSignatureImpl.java b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/ExtendedSignatureImpl.java
deleted file mode 100644
index add46b13ca1..00000000000
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/ExtendedSignatureImpl.java
+++ /dev/null
@@ -1,228 +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
- * 
- * Contributors:
- *    Ansgar Radermacher - Initial API and implementation
- * 
- */
-package org.eclipse.papyrus.FCM.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.papyrus.FCM.ExtendedSignature;
-import org.eclipse.papyrus.FCM.FCMPackage;
-
-import org.eclipse.uml2.uml.TemplateSignature;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Extended Signature</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.FCM.impl.ExtendedSignatureImpl#getBase_TemplateSignature <em>Base Template Signature</em>}</li>
- *   <li>{@link org.eclipse.papyrus.FCM.impl.ExtendedSignatureImpl#getBaseSignature <em>Base Signature</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ExtendedSignatureImpl extends EObjectImpl implements ExtendedSignature {
-	/**
-	 * The cached value of the '{@link #getBase_TemplateSignature() <em>Base Template Signature</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBase_TemplateSignature()
-	 * @generated
-	 * @ordered
-	 */
-	protected TemplateSignature base_TemplateSignature;
-
-	/**
-	 * The cached value of the '{@link #getBaseSignature() <em>Base Signature</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBaseSignature()
-	 * @generated
-	 * @ordered
-	 */
-	protected TemplateSignature baseSignature;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ExtendedSignatureImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return FCMPackage.Literals.EXTENDED_SIGNATURE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TemplateSignature getBase_TemplateSignature() {
-		if (base_TemplateSignature != null && base_TemplateSignature.eIsProxy()) {
-			InternalEObject oldBase_TemplateSignature = (InternalEObject)base_TemplateSignature;
-			base_TemplateSignature = (TemplateSignature)eResolveProxy(oldBase_TemplateSignature);
-			if (base_TemplateSignature != oldBase_TemplateSignature) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, FCMPackage.EXTENDED_SIGNATURE__BASE_TEMPLATE_SIGNATURE, oldBase_TemplateSignature, base_TemplateSignature));
-			}
-		}
-		return base_TemplateSignature;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TemplateSignature basicGetBase_TemplateSignature() {
-		return base_TemplateSignature;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBase_TemplateSignature(TemplateSignature newBase_TemplateSignature) {
-		TemplateSignature oldBase_TemplateSignature = base_TemplateSignature;
-		base_TemplateSignature = newBase_TemplateSignature;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, FCMPackage.EXTENDED_SIGNATURE__BASE_TEMPLATE_SIGNATURE, oldBase_TemplateSignature, base_TemplateSignature));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TemplateSignature getBaseSignature() {
-		if (baseSignature != null && baseSignature.eIsProxy()) {
-			InternalEObject oldBaseSignature = (InternalEObject)baseSignature;
-			baseSignature = (TemplateSignature)eResolveProxy(oldBaseSignature);
-			if (baseSignature != oldBaseSignature) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, FCMPackage.EXTENDED_SIGNATURE__BASE_SIGNATURE, oldBaseSignature, baseSignature));
-			}
-		}
-		return baseSignature;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TemplateSignature basicGetBaseSignature() {
-		return baseSignature;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBaseSignature(TemplateSignature newBaseSignature) {
-		TemplateSignature oldBaseSignature = baseSignature;
-		baseSignature = newBaseSignature;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, FCMPackage.EXTENDED_SIGNATURE__BASE_SIGNATURE, oldBaseSignature, baseSignature));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case FCMPackage.EXTENDED_SIGNATURE__BASE_TEMPLATE_SIGNATURE:
-				if (resolve) return getBase_TemplateSignature();
-				return basicGetBase_TemplateSignature();
-			case FCMPackage.EXTENDED_SIGNATURE__BASE_SIGNATURE:
-				if (resolve) return getBaseSignature();
-				return basicGetBaseSignature();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case FCMPackage.EXTENDED_SIGNATURE__BASE_TEMPLATE_SIGNATURE:
-				setBase_TemplateSignature((TemplateSignature)newValue);
-				return;
-			case FCMPackage.EXTENDED_SIGNATURE__BASE_SIGNATURE:
-				setBaseSignature((TemplateSignature)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case FCMPackage.EXTENDED_SIGNATURE__BASE_TEMPLATE_SIGNATURE:
-				setBase_TemplateSignature((TemplateSignature)null);
-				return;
-			case FCMPackage.EXTENDED_SIGNATURE__BASE_SIGNATURE:
-				setBaseSignature((TemplateSignature)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case FCMPackage.EXTENDED_SIGNATURE__BASE_TEMPLATE_SIGNATURE:
-				return base_TemplateSignature != null;
-			case FCMPackage.EXTENDED_SIGNATURE__BASE_SIGNATURE:
-				return baseSignature != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //ExtendedSignatureImpl
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/FCMFactoryImpl.java b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/FCMFactoryImpl.java
index b3f9b991c7c..220b9d4ee85 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/FCMFactoryImpl.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/FCMFactoryImpl.java
@@ -68,6 +68,7 @@ public class FCMFactoryImpl extends EFactoryImpl implements FCMFactory {
 	public EObject create(EClass eClass) {
 		switch (eClass.getClassifierID()) {
 			case FCMPackage.TEMPLATE: return createTemplate();
+			case FCMPackage.BINDING_HELPER: return createBindingHelper();
 			case FCMPackage.CONFIGURATION_PROPERTY: return createConfigurationProperty();
 			case FCMPackage.IMPLEMENTATION_GROUP: return createImplementationGroup();
 			case FCMPackage.ASSEMBLY: return createAssembly();
@@ -102,7 +103,6 @@ public class FCMFactoryImpl extends EFactoryImpl implements FCMFactory {
 			case FCMPackage.AUTO_INDEX_PER_NODE: return createAutoIndexPerNode();
 			case FCMPackage.INIT_PRECEDENCE: return createInitPrecedence();
 			case FCMPackage.CONNECTOR_CONFIGURATION: return createConnectorConfiguration();
-			case FCMPackage.EXTENDED_SIGNATURE: return createExtendedSignature();
 			default:
 				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
 		}
@@ -116,10 +116,6 @@ public class FCMFactoryImpl extends EFactoryImpl implements FCMFactory {
 	@Override
 	public Object createFromString(EDataType eDataType, String initialValue) {
 		switch (eDataType.getClassifierID()) {
-			case FCMPackage.TEMPLATE_KIND:
-				return createTemplateKindFromString(eDataType, initialValue);
-			case FCMPackage.ACTUAL_CHOICE:
-				return createActualChoiceFromString(eDataType, initialValue);
 			case FCMPackage.CONTAINER_RULE_KIND:
 				return createContainerRuleKindFromString(eDataType, initialValue);
 			case FCMPackage.INTERCEPTION_KIND:
@@ -137,10 +133,6 @@ public class FCMFactoryImpl extends EFactoryImpl implements FCMFactory {
 	@Override
 	public String convertToString(EDataType eDataType, Object instanceValue) {
 		switch (eDataType.getClassifierID()) {
-			case FCMPackage.TEMPLATE_KIND:
-				return convertTemplateKindToString(eDataType, instanceValue);
-			case FCMPackage.ACTUAL_CHOICE:
-				return convertActualChoiceToString(eDataType, instanceValue);
 			case FCMPackage.CONTAINER_RULE_KIND:
 				return convertContainerRuleKindToString(eDataType, instanceValue);
 			case FCMPackage.INTERCEPTION_KIND:
@@ -165,6 +157,16 @@ public class FCMFactoryImpl extends EFactoryImpl implements FCMFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public BindingHelper createBindingHelper() {
+		BindingHelperImpl bindingHelper = new BindingHelperImpl();
+		return bindingHelper;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public ConfigurationProperty createConfigurationProperty() {
 		ConfigurationPropertyImpl configurationProperty = new ConfigurationPropertyImpl();
 		return configurationProperty;
@@ -505,56 +507,6 @@ public class FCMFactoryImpl extends EFactoryImpl implements FCMFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public ExtendedSignature createExtendedSignature() {
-		ExtendedSignatureImpl extendedSignature = new ExtendedSignatureImpl();
-		return extendedSignature;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TemplateKind createTemplateKindFromString(EDataType eDataType, String initialValue) {
-		TemplateKind result = TemplateKind.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertTemplateKindToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ActualChoice createActualChoiceFromString(EDataType eDataType, String initialValue) {
-		ActualChoice result = ActualChoice.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertActualChoiceToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public ContainerRuleKind createContainerRuleKindFromString(EDataType eDataType, String initialValue) {
 		ContainerRuleKind result = ContainerRuleKind.get(initialValue);
 		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/FCMPackageImpl.java b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/FCMPackageImpl.java
index ca730c62460..ef9f923f83f 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/FCMPackageImpl.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/FCMPackageImpl.java
@@ -17,13 +17,11 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EEnum;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
-
 import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.papyrus.FCM.ActualChoice;
 import org.eclipse.papyrus.FCM.Assembly;
 import org.eclipse.papyrus.FCM.AutoIndex;
 import org.eclipse.papyrus.FCM.AutoIndexPerNode;
+import org.eclipse.papyrus.FCM.BindingHelper;
 import org.eclipse.papyrus.FCM.CodeGenOptions;
 import org.eclipse.papyrus.FCM.CompImplTemplate;
 import org.eclipse.papyrus.FCM.CompToOOmapping;
@@ -39,7 +37,6 @@ import org.eclipse.papyrus.FCM.ContainerRuleKind;
 import org.eclipse.papyrus.FCM.CopyAttributeValue;
 import org.eclipse.papyrus.FCM.DeploymentPlan;
 import org.eclipse.papyrus.FCM.DerivedElement;
-import org.eclipse.papyrus.FCM.ExtendedSignature;
 import org.eclipse.papyrus.FCM.FCMFactory;
 import org.eclipse.papyrus.FCM.FCMPackage;
 import org.eclipse.papyrus.FCM.Flatten;
@@ -60,12 +57,9 @@ import org.eclipse.papyrus.FCM.Singleton;
 import org.eclipse.papyrus.FCM.Target;
 import org.eclipse.papyrus.FCM.TargetArchitecture;
 import org.eclipse.papyrus.FCM.Template;
-import org.eclipse.papyrus.FCM.TemplateKind;
 import org.eclipse.papyrus.FCM.TemplatePort;
 import org.eclipse.papyrus.FCM.UseInstanceConfigurator;
-
 import org.eclipse.uml2.types.TypesPackage;
-
 import org.eclipse.uml2.uml.UMLPackage;
 
 /**
@@ -87,6 +81,13 @@ public class FCMPackageImpl extends EPackageImpl implements FCMPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	private EClass bindingHelperEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	private EClass configurationPropertyEClass = null;
 
 	/**
@@ -332,27 +333,6 @@ public class FCMPackageImpl extends EPackageImpl implements FCMPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	private EClass extendedSignatureEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum templateKindEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum actualChoiceEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	private EEnum containerRuleKindEEnum = null;
 
 	/**
@@ -440,7 +420,7 @@ public class FCMPackageImpl extends EPackageImpl implements FCMPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getTemplate_TemplateParams() {
+	public EReference getTemplate_Base_Element() {
 		return (EReference)templateEClass.getEStructuralFeatures().get(0);
 	}
 
@@ -449,7 +429,7 @@ public class FCMPackageImpl extends EPackageImpl implements FCMPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getTemplate_Base_Element() {
+	public EReference getTemplate_Helper() {
 		return (EReference)templateEClass.getEStructuralFeatures().get(1);
 	}
 
@@ -458,8 +438,8 @@ public class FCMPackageImpl extends EPackageImpl implements FCMPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getTemplate_Kind() {
-		return (EAttribute)templateEClass.getEStructuralFeatures().get(2);
+	public EClass getBindingHelper() {
+		return bindingHelperEClass;
 	}
 
 	/**
@@ -467,8 +447,8 @@ public class FCMPackageImpl extends EPackageImpl implements FCMPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getTemplate_ActualChoice() {
-		return (EAttribute)templateEClass.getEStructuralFeatures().get(3);
+	public EReference getBindingHelper_Base_Class() {
+		return (EReference)bindingHelperEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -773,6 +753,15 @@ public class FCMPackageImpl extends EPackageImpl implements FCMPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EAttribute getInstanceConfigurator_OnNodeModel() {
+		return (EAttribute)instanceConfiguratorEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EClass getRuleApplication() {
 		return ruleApplicationEClass;
 	}
@@ -1457,51 +1446,6 @@ public class FCMPackageImpl extends EPackageImpl implements FCMPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EClass getExtendedSignature() {
-		return extendedSignatureEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getExtendedSignature_Base_TemplateSignature() {
-		return (EReference)extendedSignatureEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getExtendedSignature_BaseSignature() {
-		return (EReference)extendedSignatureEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getTemplateKind() {
-		return templateKindEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getActualChoice() {
-		return actualChoiceEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public EEnum getContainerRuleKind() {
 		return containerRuleKindEEnum;
 	}
@@ -1544,10 +1488,11 @@ public class FCMPackageImpl extends EPackageImpl implements FCMPackage {
 
 		// Create classes and their features
 		templateEClass = createEClass(TEMPLATE);
-		createEReference(templateEClass, TEMPLATE__TEMPLATE_PARAMS);
 		createEReference(templateEClass, TEMPLATE__BASE_ELEMENT);
-		createEAttribute(templateEClass, TEMPLATE__KIND);
-		createEAttribute(templateEClass, TEMPLATE__ACTUAL_CHOICE);
+		createEReference(templateEClass, TEMPLATE__HELPER);
+
+		bindingHelperEClass = createEClass(BINDING_HELPER);
+		createEReference(bindingHelperEClass, BINDING_HELPER__BASE_CLASS);
 
 		configurationPropertyEClass = createEClass(CONFIGURATION_PROPERTY);
 		createEReference(configurationPropertyEClass, CONFIGURATION_PROPERTY__BASE_PROPERTY);
@@ -1594,6 +1539,7 @@ public class FCMPackageImpl extends EPackageImpl implements FCMPackage {
 
 		instanceConfiguratorEClass = createEClass(INSTANCE_CONFIGURATOR);
 		createEReference(instanceConfiguratorEClass, INSTANCE_CONFIGURATOR__BASE_CLASS);
+		createEAttribute(instanceConfiguratorEClass, INSTANCE_CONFIGURATOR__ON_NODE_MODEL);
 
 		ruleApplicationEClass = createEClass(RULE_APPLICATION);
 		createEReference(ruleApplicationEClass, RULE_APPLICATION__BASE_CLASS);
@@ -1693,13 +1639,7 @@ public class FCMPackageImpl extends EPackageImpl implements FCMPackage {
 		createEReference(connectorConfigurationEClass, CONNECTOR_CONFIGURATION__BASE_SLOT);
 		createEReference(connectorConfigurationEClass, CONNECTOR_CONFIGURATION__CONNECTOR);
 
-		extendedSignatureEClass = createEClass(EXTENDED_SIGNATURE);
-		createEReference(extendedSignatureEClass, EXTENDED_SIGNATURE__BASE_TEMPLATE_SIGNATURE);
-		createEReference(extendedSignatureEClass, EXTENDED_SIGNATURE__BASE_SIGNATURE);
-
 		// Create enums
-		templateKindEEnum = createEEnum(TEMPLATE_KIND);
-		actualChoiceEEnum = createEEnum(ACTUAL_CHOICE);
 		containerRuleKindEEnum = createEEnum(CONTAINER_RULE_KIND);
 		interceptionKindEEnum = createEEnum(INTERCEPTION_KIND);
 	}
@@ -1743,10 +1683,11 @@ public class FCMPackageImpl extends EPackageImpl implements FCMPackage {
 
 		// Initialize classes and features; add operations and parameters
 		initEClass(templateEClass, Template.class, "Template", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getTemplate_TemplateParams(), theUMLPackage.getClassifier(), null, "templateParams", null, 0, -1, Template.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 		initEReference(getTemplate_Base_Element(), theUMLPackage.getElement(), null, "base_Element", null, 1, 1, Template.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getTemplate_Kind(), this.getTemplateKind(), "kind", null, 1, 1, Template.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(getTemplate_ActualChoice(), this.getActualChoice(), "actualChoice", null, 0, 1, Template.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEReference(getTemplate_Helper(), this.getBindingHelper(), null, "helper", null, 0, 1, Template.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+
+		initEClass(bindingHelperEClass, BindingHelper.class, "BindingHelper", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(getBindingHelper_Base_Class(), theUMLPackage.getClass_(), null, "base_Class", null, 1, 1, BindingHelper.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
 		initEClass(configurationPropertyEClass, ConfigurationProperty.class, "ConfigurationProperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 		initEReference(getConfigurationProperty_Base_Property(), theUMLPackage.getProperty(), null, "base_Property", null, 1, 1, ConfigurationProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
@@ -1793,6 +1734,7 @@ public class FCMPackageImpl extends EPackageImpl implements FCMPackage {
 
 		initEClass(instanceConfiguratorEClass, InstanceConfigurator.class, "InstanceConfigurator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 		initEReference(getInstanceConfigurator_Base_Class(), theUMLPackage.getClass_(), null, "base_Class", null, 1, 1, InstanceConfigurator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getInstanceConfigurator_OnNodeModel(), theTypesPackage.getBoolean(), "onNodeModel", null, 0, 1, InstanceConfigurator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
 		initEClass(ruleApplicationEClass, RuleApplication.class, "RuleApplication", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 		initEReference(getRuleApplication_Base_Class(), theUMLPackage.getClass_(), null, "base_Class", null, 0, 1, RuleApplication.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
@@ -1892,26 +1834,7 @@ public class FCMPackageImpl extends EPackageImpl implements FCMPackage {
 		initEReference(getConnectorConfiguration_Base_Slot(), theUMLPackage.getSlot(), null, "base_Slot", null, 1, 1, ConnectorConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 		initEReference(getConnectorConfiguration_Connector(), this.getConnector(), null, "connector", null, 1, 1, ConnectorConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
-		initEClass(extendedSignatureEClass, ExtendedSignature.class, "ExtendedSignature", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getExtendedSignature_Base_TemplateSignature(), theUMLPackage.getTemplateSignature(), null, "base_TemplateSignature", null, 1, 1, ExtendedSignature.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-		initEReference(getExtendedSignature_BaseSignature(), theUMLPackage.getTemplateSignature(), null, "baseSignature", null, 1, 1, ExtendedSignature.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
-
 		// Initialize enums and add enum literals
-		initEEnum(templateKindEEnum, TemplateKind.class, "TemplateKind"); //$NON-NLS-1$
-		addEEnumLiteral(templateKindEEnum, TemplateKind.PASS_FORMAL);
-		addEEnumLiteral(templateKindEEnum, TemplateKind.LOOP_OPERATIONS);
-		addEEnumLiteral(templateKindEEnum, TemplateKind.LOOP_PROPERTY);
-		addEEnumLiteral(templateKindEEnum, TemplateKind.ACCUMULATE);
-		addEEnumLiteral(templateKindEEnum, TemplateKind.LOOP_LITERALS);
-		addEEnumLiteral(templateKindEEnum, TemplateKind.LATE_EVALUATION);
-		addEEnumLiteral(templateKindEEnum, TemplateKind.LOOP_PORTS);
-		addEEnumLiteral(templateKindEEnum, TemplateKind.PASS_CLASSIFIER);
-
-		initEEnum(actualChoiceEEnum, ActualChoice.class, "ActualChoice"); //$NON-NLS-1$
-		addEEnumLiteral(actualChoiceEEnum, ActualChoice.PASS_ACTUAL);
-		addEEnumLiteral(actualChoiceEEnum, ActualChoice.INTERFACE_OF_PPORT);
-		addEEnumLiteral(actualChoiceEEnum, ActualChoice.INTERFACE_OF_RPORT);
-
 		initEEnum(containerRuleKindEEnum, ContainerRuleKind.class, "ContainerRuleKind"); //$NON-NLS-1$
 		addEEnumLiteral(containerRuleKindEEnum, ContainerRuleKind.COMPONENT_RULE);
 		addEEnumLiteral(containerRuleKindEEnum, ContainerRuleKind.LIGHT_WEIGHT_OO_RULE);
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/InstanceConfiguratorImpl.java b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/InstanceConfiguratorImpl.java
index b2386a6ea97..9f000fcf936 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/InstanceConfiguratorImpl.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/InstanceConfiguratorImpl.java
@@ -31,6 +31,7 @@ import org.eclipse.papyrus.FCM.InstanceConfigurator;
  * The following features are implemented:
  * <ul>
  *   <li>{@link org.eclipse.papyrus.FCM.impl.InstanceConfiguratorImpl#getBase_Class <em>Base Class</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.FCM.impl.InstanceConfiguratorImpl#isOnNodeModel <em>On Node Model</em>}</li>
  * </ul>
  * </p>
  *
@@ -48,6 +49,25 @@ public class InstanceConfiguratorImpl extends EObjectImpl implements InstanceCon
 	protected org.eclipse.uml2.uml.Class base_Class;
 
 	/**
+	 * The default value of the '{@link #isOnNodeModel() <em>On Node Model</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isOnNodeModel()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean ON_NODE_MODEL_EDEFAULT = false;
+	/**
+	 * The cached value of the '{@link #isOnNodeModel() <em>On Node Model</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isOnNodeModel()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean onNodeModel = ON_NODE_MODEL_EDEFAULT;
+
+	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -109,12 +129,35 @@ public class InstanceConfiguratorImpl extends EObjectImpl implements InstanceCon
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public boolean isOnNodeModel() {
+		return onNodeModel;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setOnNodeModel(boolean newOnNodeModel) {
+		boolean oldOnNodeModel = onNodeModel;
+		onNodeModel = newOnNodeModel;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, FCMPackage.INSTANCE_CONFIGURATOR__ON_NODE_MODEL, oldOnNodeModel, onNodeModel));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
 			case FCMPackage.INSTANCE_CONFIGURATOR__BASE_CLASS:
 				if (resolve) return getBase_Class();
 				return basicGetBase_Class();
+			case FCMPackage.INSTANCE_CONFIGURATOR__ON_NODE_MODEL:
+				return isOnNodeModel();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -130,6 +173,9 @@ public class InstanceConfiguratorImpl extends EObjectImpl implements InstanceCon
 			case FCMPackage.INSTANCE_CONFIGURATOR__BASE_CLASS:
 				setBase_Class((org.eclipse.uml2.uml.Class)newValue);
 				return;
+			case FCMPackage.INSTANCE_CONFIGURATOR__ON_NODE_MODEL:
+				setOnNodeModel((Boolean)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -145,6 +191,9 @@ public class InstanceConfiguratorImpl extends EObjectImpl implements InstanceCon
 			case FCMPackage.INSTANCE_CONFIGURATOR__BASE_CLASS:
 				setBase_Class((org.eclipse.uml2.uml.Class)null);
 				return;
+			case FCMPackage.INSTANCE_CONFIGURATOR__ON_NODE_MODEL:
+				setOnNodeModel(ON_NODE_MODEL_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -159,8 +208,26 @@ public class InstanceConfiguratorImpl extends EObjectImpl implements InstanceCon
 		switch (featureID) {
 			case FCMPackage.INSTANCE_CONFIGURATOR__BASE_CLASS:
 				return base_Class != null;
+			case FCMPackage.INSTANCE_CONFIGURATOR__ON_NODE_MODEL:
+				return onNodeModel != ON_NODE_MODEL_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
 
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (onNodeModel: "); //$NON-NLS-1$
+		result.append(onNodeModel);
+		result.append(')');
+		return result.toString();
+	}
+
 } //InstanceConfiguratorImpl
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/TemplateImpl.java b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/TemplateImpl.java
index c85e906720b..9bb51bf3a1d 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/TemplateImpl.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/TemplateImpl.java
@@ -12,26 +12,14 @@
  */
 package org.eclipse.papyrus.FCM.impl;
 
-import java.util.Collection;
-
 import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
-import org.eclipse.papyrus.FCM.ActualChoice;
+import org.eclipse.papyrus.FCM.BindingHelper;
 import org.eclipse.papyrus.FCM.FCMPackage;
 import org.eclipse.papyrus.FCM.Template;
-import org.eclipse.papyrus.FCM.TemplateKind;
-
-import org.eclipse.uml2.uml.Classifier;
 import org.eclipse.uml2.uml.Element;
 
 /**
@@ -41,10 +29,8 @@ import org.eclipse.uml2.uml.Element;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.FCM.impl.TemplateImpl#getTemplateParams <em>Template Params</em>}</li>
  *   <li>{@link org.eclipse.papyrus.FCM.impl.TemplateImpl#getBase_Element <em>Base Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.FCM.impl.TemplateImpl#getKind <em>Kind</em>}</li>
- *   <li>{@link org.eclipse.papyrus.FCM.impl.TemplateImpl#getActualChoice <em>Actual Choice</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.FCM.impl.TemplateImpl#getHelper <em>Helper</em>}</li>
  * </ul>
  * </p>
  *
@@ -52,16 +38,6 @@ import org.eclipse.uml2.uml.Element;
  */
 public class TemplateImpl extends EObjectImpl implements Template {
 	/**
-	 * The cached value of the '{@link #getTemplateParams() <em>Template Params</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTemplateParams()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<Classifier> templateParams;
-
-	/**
 	 * The cached value of the '{@link #getBase_Element() <em>Base Element</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -72,44 +48,14 @@ public class TemplateImpl extends EObjectImpl implements Template {
 	protected Element base_Element;
 
 	/**
-	 * The default value of the '{@link #getKind() <em>Kind</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getKind()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final TemplateKind KIND_EDEFAULT = TemplateKind.PASS_FORMAL;
-
-	/**
-	 * The cached value of the '{@link #getKind() <em>Kind</em>}' attribute.
+	 * The cached value of the '{@link #getHelper() <em>Helper</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getKind()
+	 * @see #getHelper()
 	 * @generated
 	 * @ordered
 	 */
-	protected TemplateKind kind = KIND_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getActualChoice() <em>Actual Choice</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualChoice()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final ActualChoice ACTUAL_CHOICE_EDEFAULT = ActualChoice.PASS_ACTUAL;
-
-	/**
-	 * The cached value of the '{@link #getActualChoice() <em>Actual Choice</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualChoice()
-	 * @generated
-	 * @ordered
-	 */
-	protected ActualChoice actualChoice = ACTUAL_CHOICE_EDEFAULT;
+	protected BindingHelper helper;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -135,18 +81,6 @@ public class TemplateImpl extends EObjectImpl implements Template {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<Classifier> getTemplateParams() {
-		if (templateParams == null) {
-			templateParams = new EObjectResolvingEList<Classifier>(Classifier.class, this, FCMPackage.TEMPLATE__TEMPLATE_PARAMS);
-		}
-		return templateParams;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public Element getBase_Element() {
 		if (base_Element != null && base_Element.eIsProxy()) {
 			InternalEObject oldBase_Element = (InternalEObject)base_Element;
@@ -185,20 +119,16 @@ public class TemplateImpl extends EObjectImpl implements Template {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public TemplateKind getKind() {
-		return kind;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setKind(TemplateKind newKind) {
-		TemplateKind oldKind = kind;
-		kind = newKind == null ? KIND_EDEFAULT : newKind;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, FCMPackage.TEMPLATE__KIND, oldKind, kind));
+	public BindingHelper getHelper() {
+		if (helper != null && helper.eIsProxy()) {
+			InternalEObject oldHelper = (InternalEObject)helper;
+			helper = (BindingHelper)eResolveProxy(oldHelper);
+			if (helper != oldHelper) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, FCMPackage.TEMPLATE__HELPER, oldHelper, helper));
+			}
+		}
+		return helper;
 	}
 
 	/**
@@ -206,8 +136,8 @@ public class TemplateImpl extends EObjectImpl implements Template {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public ActualChoice getActualChoice() {
-		return actualChoice;
+	public BindingHelper basicGetHelper() {
+		return helper;
 	}
 
 	/**
@@ -215,11 +145,11 @@ public class TemplateImpl extends EObjectImpl implements Template {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setActualChoice(ActualChoice newActualChoice) {
-		ActualChoice oldActualChoice = actualChoice;
-		actualChoice = newActualChoice == null ? ACTUAL_CHOICE_EDEFAULT : newActualChoice;
+	public void setHelper(BindingHelper newHelper) {
+		BindingHelper oldHelper = helper;
+		helper = newHelper;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, FCMPackage.TEMPLATE__ACTUAL_CHOICE, oldActualChoice, actualChoice));
+			eNotify(new ENotificationImpl(this, Notification.SET, FCMPackage.TEMPLATE__HELPER, oldHelper, helper));
 	}
 
 	/**
@@ -230,15 +160,12 @@ public class TemplateImpl extends EObjectImpl implements Template {
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case FCMPackage.TEMPLATE__TEMPLATE_PARAMS:
-				return getTemplateParams();
 			case FCMPackage.TEMPLATE__BASE_ELEMENT:
 				if (resolve) return getBase_Element();
 				return basicGetBase_Element();
-			case FCMPackage.TEMPLATE__KIND:
-				return getKind();
-			case FCMPackage.TEMPLATE__ACTUAL_CHOICE:
-				return getActualChoice();
+			case FCMPackage.TEMPLATE__HELPER:
+				if (resolve) return getHelper();
+				return basicGetHelper();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -248,22 +175,14 @@ public class TemplateImpl extends EObjectImpl implements Template {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case FCMPackage.TEMPLATE__TEMPLATE_PARAMS:
-				getTemplateParams().clear();
-				getTemplateParams().addAll((Collection<? extends Classifier>)newValue);
-				return;
 			case FCMPackage.TEMPLATE__BASE_ELEMENT:
 				setBase_Element((Element)newValue);
 				return;
-			case FCMPackage.TEMPLATE__KIND:
-				setKind((TemplateKind)newValue);
-				return;
-			case FCMPackage.TEMPLATE__ACTUAL_CHOICE:
-				setActualChoice((ActualChoice)newValue);
+			case FCMPackage.TEMPLATE__HELPER:
+				setHelper((BindingHelper)newValue);
 				return;
 		}
 		super.eSet(featureID, newValue);
@@ -277,17 +196,11 @@ public class TemplateImpl extends EObjectImpl implements Template {
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case FCMPackage.TEMPLATE__TEMPLATE_PARAMS:
-				getTemplateParams().clear();
-				return;
 			case FCMPackage.TEMPLATE__BASE_ELEMENT:
 				setBase_Element((Element)null);
 				return;
-			case FCMPackage.TEMPLATE__KIND:
-				setKind(KIND_EDEFAULT);
-				return;
-			case FCMPackage.TEMPLATE__ACTUAL_CHOICE:
-				setActualChoice(ACTUAL_CHOICE_EDEFAULT);
+			case FCMPackage.TEMPLATE__HELPER:
+				setHelper((BindingHelper)null);
 				return;
 		}
 		super.eUnset(featureID);
@@ -301,34 +214,12 @@ public class TemplateImpl extends EObjectImpl implements Template {
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case FCMPackage.TEMPLATE__TEMPLATE_PARAMS:
-				return templateParams != null && !templateParams.isEmpty();
 			case FCMPackage.TEMPLATE__BASE_ELEMENT:
 				return base_Element != null;
-			case FCMPackage.TEMPLATE__KIND:
-				return kind != KIND_EDEFAULT;
-			case FCMPackage.TEMPLATE__ACTUAL_CHOICE:
-				return actualChoice != ACTUAL_CHOICE_EDEFAULT;
+			case FCMPackage.TEMPLATE__HELPER:
+				return helper != null;
 		}
 		return super.eIsSet(featureID);
 	}
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (kind: "); //$NON-NLS-1$
-		result.append(kind);
-		result.append(", actualChoice: "); //$NON-NLS-1$
-		result.append(actualChoice);
-		result.append(')');
-		return result.toString();
-	}
-
 } //TemplateImpl
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/ConnectorTypeUtil.java b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/ConnectorTypeUtil.java
index f4369372663..eea354d76bf 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/ConnectorTypeUtil.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/ConnectorTypeUtil.java
@@ -1,3 +1,16 @@
+/**

+ * 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:

+ *    Ansgar Radermacher - Initial API and implementation

+ * 

+ */

+

 package org.eclipse.papyrus.FCM.util;

 

 import java.util.ArrayList;

diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/FCMAdapterFactory.java b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/FCMAdapterFactory.java
index 2c53d11ae2d..eace199e321 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/FCMAdapterFactory.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/FCMAdapterFactory.java
@@ -82,6 +82,10 @@ public class FCMAdapterFactory extends AdapterFactoryImpl {
 				return createTemplateAdapter();
 			}
 			@Override
+			public Adapter caseBindingHelper(BindingHelper object) {
+				return createBindingHelperAdapter();
+			}
+			@Override
 			public Adapter caseConfigurationProperty(ConfigurationProperty object) {
 				return createConfigurationPropertyAdapter();
 			}
@@ -222,10 +226,6 @@ public class FCMAdapterFactory extends AdapterFactoryImpl {
 				return createConnectorConfigurationAdapter();
 			}
 			@Override
-			public Adapter caseExtendedSignature(ExtendedSignature object) {
-				return createExtendedSignatureAdapter();
-			}
-			@Override
 			public Adapter defaultCase(EObject object) {
 				return createEObjectAdapter();
 			}
@@ -260,6 +260,20 @@ public class FCMAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.FCM.BindingHelper <em>Binding Helper</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.FCM.BindingHelper
+	 * @generated
+	 */
+	public Adapter createBindingHelperAdapter() {
+		return null;
+	}
+
+	/**
 	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.FCM.ConfigurationProperty <em>Configuration Property</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
@@ -750,20 +764,6 @@ public class FCMAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.FCM.ExtendedSignature <em>Extended Signature</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.FCM.ExtendedSignature
-	 * @generated
-	 */
-	public Adapter createExtendedSignatureAdapter() {
-		return null;
-	}
-
-	/**
 	 * Creates a new adapter for the default case.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null.
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/FCMSwitch.java b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/FCMSwitch.java
index 3044c045f47..827d6ee5303 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/FCMSwitch.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/FCMSwitch.java
@@ -82,6 +82,12 @@ public class FCMSwitch<T> extends Switch<T> {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
+			case FCMPackage.BINDING_HELPER: {
+				BindingHelper bindingHelper = (BindingHelper)theEObject;
+				T result = caseBindingHelper(bindingHelper);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
 			case FCMPackage.CONFIGURATION_PROPERTY: {
 				ConfigurationProperty configurationProperty = (ConfigurationProperty)theEObject;
 				T result = caseConfigurationProperty(configurationProperty);
@@ -297,12 +303,6 @@ public class FCMSwitch<T> extends Switch<T> {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
-			case FCMPackage.EXTENDED_SIGNATURE: {
-				ExtendedSignature extendedSignature = (ExtendedSignature)theEObject;
-				T result = caseExtendedSignature(extendedSignature);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
 			default: return defaultCase(theEObject);
 		}
 	}
@@ -323,6 +323,21 @@ public class FCMSwitch<T> extends Switch<T> {
 	}
 
 	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Binding Helper</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Binding Helper</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseBindingHelper(BindingHelper object) {
+		return null;
+	}
+
+	/**
 	 * Returns the result of interpreting the object as an instance of '<em>Configuration Property</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
@@ -848,21 +863,6 @@ public class FCMSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Extended Signature</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Extended Signature</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseExtendedSignature(ExtendedSignature object) {
-		return null;
-	}
-
-	/**
 	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/IBindingHelper.java b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/IBindingHelper.java
new file mode 100644
index 00000000000..3b824d9fa20
--- /dev/null
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/IBindingHelper.java
@@ -0,0 +1,26 @@
+/**
+ * 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:
+ *    Ansgar Radermacher - Initial API and implementation
+ * 
+ */
+
+package org.eclipse.papyrus.FCM.util;
+
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.TemplateBinding;
+
+/**
+ * BindingHelper interface. The interface is intentionally left empty. Implementations
+ * (such as Qompass designer) might check for subclasses.
+ *
+ */
+public interface IBindingHelper {
+	public void handleElement(TemplateBinding binding, Element object);
+}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/IEmbeddingRule.java b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/IEmbeddingRule.java
index 9bf3ff544ba..a68f92e0db6 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/IEmbeddingRule.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/IEmbeddingRule.java
@@ -1,3 +1,16 @@
+/**
+ * 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:
+ *    Ansgar Radermacher - Initial API and implementation
+ * 
+ */
+
 package org.eclipse.papyrus.FCM.util;
 
 import org.eclipse.papyrus.FCM.Connector;
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/IMappingRule.java b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/IMappingRule.java
index 1fe7d559e56..58fd27c89e3 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/IMappingRule.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/IMappingRule.java
@@ -1,3 +1,16 @@
+/**
+ * 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:
+ *    Ansgar Radermacher - Initial API and implementation
+ * 
+ */
+
 package org.eclipse.papyrus.FCM.util;
 
 import org.eclipse.papyrus.FCM.Port;
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/ITemplateMappingRule.java b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/ITemplateMappingRule.java
index 7556d0a0587..58c70d8c821 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/ITemplateMappingRule.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/ITemplateMappingRule.java
@@ -1,3 +1,16 @@
+/**
+ * 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:
+ *    Ansgar Radermacher - Initial API and implementation
+ * 
+ */
+
 package org.eclipse.papyrus.FCM.util;
 
 import org.eclipse.papyrus.FCM.Port;
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/MapUtil.java b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/MapUtil.java
index 682f092bd42..0ee35052352 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/MapUtil.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/util/MapUtil.java
@@ -1,3 +1,16 @@
+/**
+ * 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:
+ *    Ansgar Radermacher - Initial API and implementation
+ * 
+ */
+
 package org.eclipse.papyrus.FCM.util;
 
 import org.eclipse.core.runtime.CoreException;
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/.classpath b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/.classpath
index 64c5e31b7a2..ad32c83a788 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/.classpath
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/META-INF/MANIFEST.MF b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/META-INF/MANIFEST.MF
index 024e58a76fb..4c6a771e256 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/META-INF/MANIFEST.MF
@@ -19,7 +19,6 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.papyrus.infra.widgets;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.emf;bundle-version="1.0.0",

  org.eclipse.papyrus.acceleo;bundle-version="1.0.0",

- org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.3.0",

  org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0",

  org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.0.0",

@@ -46,5 +45,5 @@ Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.qompass.designer.core.Activator

 Bundle-SymbolicName: org.eclipse.papyrus.qompass.designer.core;singlet

  on:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

 

diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/build.acceleo b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/build.acceleo
index 3bf89823b72..b4a22fdacc3 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/build.acceleo
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/build.acceleo
@@ -18,7 +18,7 @@
         <acceleoCompiler 
             sourceFolder="${target.folder}"
             outputFolder="${target.folder}"
-            dependencies="${target.folder}/../../org.eclipse.papyrus.fcm.profile;${target.folder}/../../org.eclipse.papyrus.infra.core.sasheditor;${target.folder}/../../org.eclipse.papyrus.infra.core.sasheditor.di;${target.folder}/../../org.eclipse.papyrus.qompass.designer.vsl;${target.folder}/../../org.eclipse.papyrus.cpp.profile;${target.folder}/../../org.eclipse.papyrus.acceleo;${target.folder}/../../org.eclipse.papyrus.uml.tools.utils;${target.folder}/../../org.eclipse.papyrus.infra.widgets.toolbox;"
+            dependencies="${target.folder}/../../org.eclipse.papyrus.fcm.profile;${target.folder}/../../org.eclipse.papyrus.infra.core.sasheditor;${target.folder}/../../org.eclipse.papyrus.infra.core.sasheditor.di;${target.folder}/../../org.eclipse.papyrus.qompass.designer.vsl;${target.folder}/../../org.eclipse.papyrus.cpp.profile;${target.folder}/../../org.eclipse.papyrus.acceleo;${target.folder}/../../org.eclipse.papyrus.infra.widgets.toolbox;"
             binaryResource="false"
             packagesToRegister="">
         </acceleoCompiler>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/build.properties b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/build.properties
index ac38eb76e73..ad54fffc889 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/build.properties
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/build.properties
@@ -3,7 +3,6 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               icons/,\
                build.properties,\
                about.properties,\
                build.acceleo,\
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Activator.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Activator.java
index 8ed2fef34f5..d8481ed8474 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Activator.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Activator.java
@@ -10,7 +10,7 @@ import org.osgi.framework.BundleContext;
 public class Activator extends AbstractUIPlugin {
 
 	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.papyrus.qompass.designer.core";
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.qompass.designer.core"; //$NON-NLS-1$
 
 	// The shared instance
 	private static Activator plugin;
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/CommandSupport.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/CommandSupport.java
index 7b610a4a82d..261e56f3a43 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/CommandSupport.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/CommandSupport.java
@@ -50,7 +50,7 @@ public class CommandSupport {
 		try {
 			exec(serviceUtils.getTransactionalEditingDomain(event), label, command);
 		} catch (ServiceException e) {
-			Log.log(Status.ERROR, Log.UTILS, "Can not get editing domain", e);
+			Log.log(Status.ERROR, Log.UTILS, Messages.CommandSupport_NoEditingDomain, e);
 		}
 	}
 
@@ -73,9 +73,9 @@ public class CommandSupport {
 				}
 			}, null, null);
 		} catch (ExecutionException e) {
-			Log.log(Status.ERROR, Log.UTILS, "error during command execution", e);
+			Log.log(Status.ERROR, Log.UTILS, Messages.CommandSupport_ErrorDuringCmdExec, e);
 		} catch (ServiceException e) {
-			Log.log(Status.ERROR, Log.UTILS, "Can not get editing domain", e);
+			Log.log(Status.ERROR, Log.UTILS, Messages.CommandSupport_NoEditingDomain, e);
 		}
 	}
 
@@ -100,18 +100,17 @@ public class CommandSupport {
 					}
 				}, null, null);
 			} catch (ExecutionException e) {
-				e.printStackTrace();
+				Activator.log.error(e);
 			}
 		}
 	}
 
-	public static void exec(TransactionalEditingDomain domain, IUndoableOperation command) {
+	public static void exec(IUndoableOperation command) {
 		IOperationHistory history = OperationHistoryFactory.getOperationHistory();
 		try {
 			history.execute(command, new NullProgressMonitor(), null);
 		} catch (ExecutionException e) {
-			e.printStackTrace();
+			Activator.log.error(e);
 		}
-
 	}
 }
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/ConfigUtils.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/ConfigUtils.java
index bbef9bc2a0a..73e520e8794 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/ConfigUtils.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/ConfigUtils.java
@@ -73,7 +73,7 @@ public class ConfigUtils {
 		EList<Property> list = new BasicEList<Property>();
 		Class composite = rule.getBase_Class(); // a rule should always have a base class, unless malformed
 		if(composite == null) {
-			throw new TransformationException("A container rule has no base class (broken model library?)");
+			throw new TransformationException(Messages.ConfigUtils_RuleWithoutBaseClass);
 		}
 		for(Property part : composite.getAttributes()) {
 			if(part instanceof Port) {
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/CreationUtils.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/CreationUtils.java
index ea0ed11eb6a..305dd5319c9 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/CreationUtils.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/CreationUtils.java
@@ -49,7 +49,7 @@ public class CreationUtils {
 		int offset = (skipTop ? 2 : 1);
 		for(int i = list.size() - offset; i >= 0; i--) {
 			Namespace ns = list.get(i);
-			Log.log(Status.INFO, Log.UTILS, "getAndCreate:" + ns.getName());
+			Log.log(Status.INFO, Log.UTILS, "getAndCreate:" + ns.getName()); //$NON-NLS-1$
 
 			NamedElement pkg = root.getOwnedMember(ns.getName());
 			if(pkg == null) {
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Description.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Description.java
index 8c248df27c4..07d03a008c7 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Description.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Description.java
@@ -73,6 +73,6 @@ public class Description {
 			}
 
 		}
-		return "not available";
+		return Messages.Description_NoAvail;
 	}
 }
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/ElementFilter.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/ElementFilter.java
new file mode 100644
index 00000000000..297433c35a6
--- /dev/null
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/ElementFilter.java
@@ -0,0 +1,7 @@
+package org.eclipse.papyrus.qompass.designer.core;
+
+import org.eclipse.uml2.uml.Element;
+
+public interface ElementFilter {
+	public boolean acceptElement(Element element);
+}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Log.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Log.java
index f093907318d..bc0ec656679 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Log.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Log.java
@@ -54,19 +54,19 @@ public class Log {
 	static String getModuleInfo(int moduleKind) {
 		if(moduleMap == null) {
 			moduleMap = new HashMap<Integer, String>();
-			moduleMap.put(TRAFO_CONNECTOR, "Trafo connector");
-			moduleMap.put(TRAFO_CONTAINER, "Trafo container");
-			moduleMap.put(TRAFO_COPY, "Trafo copy");
-			moduleMap.put(TRAFO_SYNC, "Synchronization");
-			moduleMap.put(TEMPLATE_BINDING, "Template binding");
-			moduleMap.put(TEMPLATE_INSTANTIATION, "Template instantiation");
-			moduleMap.put(DEPLOYMENT, "Template binding");
-			moduleMap.put(DIALOGS, "Qompass dialogs");
-			moduleMap.put(UTILS, "Utils");
-			moduleMap.put(CODEGEN, "Code generation");
-			moduleMap.put(CALC_PORTKIND, "Calculate portkind");
+			moduleMap.put(TRAFO_CONNECTOR, "Trafo connector"); //$NON-NLS-1$
+			moduleMap.put(TRAFO_CONTAINER, "Trafo container"); //$NON-NLS-1$
+			moduleMap.put(TRAFO_COPY, "Trafo copy"); //$NON-NLS-1$
+			moduleMap.put(TRAFO_SYNC, "Synchronization"); //$NON-NLS-1$
+			moduleMap.put(TEMPLATE_BINDING, "Template binding"); //$NON-NLS-1$
+			moduleMap.put(TEMPLATE_INSTANTIATION, "Template instantiation"); //$NON-NLS-1$
+			moduleMap.put(DEPLOYMENT, "Template binding"); //$NON-NLS-1$
+			moduleMap.put(DIALOGS, "Qompass dialogs"); //$NON-NLS-1$
+			moduleMap.put(UTILS, "Utils"); //$NON-NLS-1$
+			moduleMap.put(CODEGEN, "Code generation"); //$NON-NLS-1$
+			moduleMap.put(CALC_PORTKIND, "Calculate portkind"); //$NON-NLS-1$
 		}
-		return "Module " + moduleMap.get(moduleKind) + ": ";
+		return "Module " + moduleMap.get(moduleKind) + ": "; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	public static void log(int msgKind, int moduleKind, String message) {
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Messages.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Messages.java
new file mode 100644
index 00000000000..8f0a90b7f06
--- /dev/null
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Messages.java
@@ -0,0 +1,119 @@
+package org.eclipse.papyrus.qompass.designer.core;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.qompass.designer.core.messages"; //$NON-NLS-1$
+	
+	public static String BootLoaderGen_AtLeastOneBlockingCall;
+
+	public static String BootLoaderGen_CannotRetrieveTemplate;
+
+	public static String CommandSupport_NoEditingDomain;
+	public static String CommandSupport_ErrorDuringCmdExec;
+	public static String ConfigUtils_RuleWithoutBaseClass;
+	public static String DepCreation_CannotFindImplementation;
+
+	public static String DepCreation_CircularReference;
+
+	public static String DepCreation_DefiningFeatureNull;
+
+	public static String DepCreation_FCMconnectorWithoutBaseClass;
+
+	public static String DepCreation_InfoCreateDepPlan;
+
+	public static String DepCreation_TypeInAttributeUndefined;
+
+	public static String Deploy_0;
+
+	public static String Description_NoAvail;
+	
+	public static String LWContainerTrafo_CannotApplyRule;
+	
+	public static String ConnectorBinding_CannotFindBinding;
+	public static String ConnectorBinding_CannotFindBindingForPort;
+	public static String ConnectorBinding_CannotFindConsistentBinding;
+	public static String ConnectorBinding_ConnectorsPort;
+	public static String ConnectorBinding_FormalAlreadyBound;
+	public static String ConnectorBinding_InfoActualReturnIntfIs;
+	public static String ConnectorBinding_InfoConnPortConnectedVia;
+	public static String ConnectorBinding_InfoConnectsPort;
+	public static String ConnectorBinding_InfoCreateBoundPackage;
+
+	public static String ConnectorBinding_InfoMatchOtherEnd;
+
+	public static String ConnectorBinding_InfoProvidedPortTypeMatches;
+	public static String ConnectorBinding_NoTemplateSignature;
+
+	public static String ConnectorReification_CannotFindMatchingPort;
+	public static String ConnectorReification_CouldNotBind;
+	public static String ConnectorReification_CouldNotConnectPort;
+	public static String ConnectorReification_CouldNotConnectPortOfType;
+	public static String ConnectorReification_InfoAddConnectorPart;
+	public static String ConnectorReification_InfoPortTypes;
+	public static String ConnectorReification_RequiresUseOfPorts;
+	public static String ConnectorReification_TemplateTypeNotClass;
+
+	public static String GenerateCode_CouldNotDeleteOldCode;
+	public static String GenerateCode_GeneratingCodeForNode;
+	public static String GenerateCode_GeneratingCode;
+
+	public static String LanguageSupport_LanguageNotSupported;
+
+	public static String TemplateUtils_InfoCreateBoundPackage;
+	public static String TemplateUtils_InfoGetActualFrom;
+	public static String TemplateUtils_NoTemplateSignature;
+	
+	public static String TemplateInstantiation_TemplateIsNull;
+	public static String TemplateInstantiationListener_TrafoException;
+
+	public static String CompImplTrafos_CannotFindType;
+	public static String CompImplTrafos_IntfNotImplemented;
+	public static String CompTypeTrafos_CannotFindType;
+
+	public static String ContainerTrafo_CannotApplyRule;
+	public static String ContainerTrafo_CannotFindDelegationConn;
+	public static String ContainerTrafo_InterceptionRuleButNoInterceptor;
+	
+	public static String InstantiateDepPlan_AcceleoErrors;
+	public static String InstantiateDepPlan_AcceleoErrorsCheckLog;
+	public static String InstantiateDepPlan_CannotGenModel;
+	public static String InstantiateDepPlan_CheckInputImportPkg;
+	public static String InstantiateDepPlan_CheckInputImportPkgNoRes;
+	public static String InstantiateDepPlan_CheckInputModelProfile3;
+	public static String InstantiateDepPlan_CheckInputModelProfileNoRes;
+	public static String InstantiateDepPlan_CheckInputModelProfileNoResNoName;
+	public static String InstantiateDepPlan_ConsultConsole;
+	public static String InstantiateDepPlan_DepPlanStereotypeNotInitialized;
+	public static String InstantiateDepPlan_ErrorsDuringTransformation;
+	public static String InstantiateDepPlan_IllegalArgumentDuringCopy;
+	public static String InstantiateDepPlan_InfoApplyProfile;
+	public static String InstantiateDepPlan_InfoDeployingForNode;
+	public static String InstantiateDepPlan_InfoExpandingConnectors;
+	public static String InstantiateDepPlan_InfoGeneratingModel;
+	public static String InstantiateDepPlan_InfoImportPackage;
+	public static String InstantiateDepPlan_InfoNoneAllocated;
+	public static String InstantiateDepPlan_TransformationException;
+	public static String LWContainerTrafo_0;
+	public static String LWContainerTrafo_1;
+	public static String MainModelTrafo_ChangePartType;
+	public static String MainModelTrafo_NoDefiningFeature;
+	public static String MainModelTrafo_NoInstanceAssociated;
+
+	public static String CompImplSync_InfoSyncIntf;
+	public static String CompImplSync_InfoSyncViaImpl;
+	public static String CompImplSync_InfoSyncViaType;
+
+	public static String DepPlanUtils_CannotFindAttribute;
+	public static String DepPlanUtils_ConfigOfPropertyFailed;
+
+	public static String UpdateUtils_CannotApplyFCMstereo;
+	
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/ModelManagement.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/ModelManagement.java
index 276974da193..36c6182b57b 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/ModelManagement.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/ModelManagement.java
@@ -48,7 +48,7 @@ public class ModelManagement {
 	public ModelManagement() {
 		getResourceSet();
 		model = UMLFactory.eINSTANCE.createModel();
-		resource = resourceSet.createResource(URI.createURI("temp.uml"));
+		resource = resourceSet.createResource(URI.createURI("temp.uml")); //$NON-NLS-1$
 		resource.getContents().add(model);
 	}
 
@@ -124,7 +124,7 @@ public class ModelManagement {
 	public String getPath(IProject project, String subFolder, String filename) {
 		IFile file;
 		if(filename == null) {
-			filename = model.getName() + ".uml";
+			filename = model.getName() + ".uml"; //$NON-NLS-1$
 		}
 		if(subFolder != null) {
 			IFolder ifolder = project.getFolder(subFolder);
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/PortUtils.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/PortUtils.java
index 219732a0e7f..8679e1f830b 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/PortUtils.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/PortUtils.java
@@ -14,7 +14,6 @@
 
 package org.eclipse.papyrus.qompass.designer.core;
 
-import org.eclipse.core.runtime.Status;
 import org.eclipse.emf.common.util.BasicEList;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.papyrus.FCM.PortKind;
@@ -231,22 +230,7 @@ public class PortUtils {
 	public static boolean sameKinds(Port portA, Port portB) {
 		PortKind kindA = getKind(portA);
 		PortKind kindB = getKind(portB);
-		if((kindA == null) && (kindB == null)) {
-			return true;
-		} else if((kindA == null) || (kindB == null)) {
-			return false;
-		} else {
-			// 	better use eClass?
-			boolean tst = kindA == kindB;
-			boolean tst2 =
-				kindA.getBase_Class().getQualifiedName().equals(
-					kindB.getBase_Class().getQualifiedName());
-			if(tst != tst2) {
-				Log.log(Status.ERROR, Log.UTILS, "different instances of same kind??" + kindA.getBase_Class());
-			}
-			return kindA.getBase_Class().getQualifiedName().equals(
-				kindB.getBase_Class().getQualifiedName());
-		}
+		return kindA == kindB;
 	}
 
 	/**
@@ -285,7 +269,6 @@ public class PortUtils {
 		}
 		// no match found, try weaker condition: find 1st match for provided ...
 		// TODO: check not only for identical interfaces but allow a superclass on the required interface
-		// TODO: should be used by template binding checker
 		if(isAssembly) {
 			return (PortUtils.getProvided(portA) == PortUtils.getRequired(portB)) &&
 				(PortUtils.getProvided(portB) == PortUtils.getRequired(portA));
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/StUtils.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/StUtils.java
index 32ce32ad91e..c484f764b1b 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/StUtils.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/StUtils.java
@@ -18,11 +18,11 @@ import org.eclipse.emf.common.util.BasicEList;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.FCM.DerivedElement;
 import org.eclipse.papyrus.qompass.designer.core.transformations.Copy;
 import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil;
 import org.eclipse.uml2.uml.Connector;
 import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Extension;
 import org.eclipse.uml2.uml.Property;
 import org.eclipse.uml2.uml.Stereotype;
 import org.eclipse.uml2.uml.util.UMLUtil;
@@ -44,17 +44,8 @@ public class StUtils {
 	 * @return
 	 */
 	public static void copyStereotypes(Copy copy, Element source, Element destination) {
-		final String derivedElement = DerivedElement.class.getName().replace(".", "::");
 		for(Stereotype stereotype : source.getAppliedStereotypes()) {
-			String stereoName = stereotype.getQualifiedName();
-			// if(!stereoName.equals(derivedElement)) {
-				// Hack: do not copy derived element stereotype. Problem: when templates are instantiated,
-				//   some operations are derived from interface operations which in turn are derived from the
-				//   formal template parameter (e.g. FIFO). Since interface derived from ports are put into a
-				//   top-level directory "derived elements", they may be outside the package template and do not
-				//   get replaced.
-				copyAttributes(copy, stereotype.getQualifiedName(), source, destination);
-			// }
+			copyAttributes(copy, stereotype.getQualifiedName(), source, destination);
 		}
 	}
 
@@ -94,7 +85,7 @@ public class StUtils {
 
 			if(attrName.length() >= 5) {
 				// do not copy base_ stereotypes (base_class, base_package and base_PackageImport)
-				if(attrName.startsWith("base_")) {
+				if(attrName.startsWith(Extension.METACLASS_ROLE_PREFIX)) {
 					continue;
 				}
 			}
@@ -131,7 +122,7 @@ public class StUtils {
 				}
 				// TODO: remove hack: the template port references directly an element of a package template
 				//   the package template should not be copied, but instantiated as done in class TemplatePort
-				else if (!stereotypeName.endsWith("TemplatePort")) { // (copy.withinTemplate((EObject) value)) {
+				else if (!stereotypeName.endsWith("TemplatePort")) { //$NON-NLS-1$
 					// value is likely a stereotype application. If copy does a package-template instantiation, it would
 					// check whether the passed element is within the package template. This would fail if we pass
 					// a stereotype application. (could also do check within copy??)
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Stereotypes.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Stereotypes.java
index edf1c978ed8..aa9c9a4b1b3 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Stereotypes.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Stereotypes.java
@@ -21,7 +21,7 @@ package org.eclipse.papyrus.qompass.designer.core;
 public class Stereotypes {
 
 	// FT stereotypes
-	public final static String activeWithVoting = "FTRedundancy::FTActiveWithVotingReplicationStyle";
+	public final static String activeWithVoting = "FTRedundancy::FTActiveWithVotingReplicationStyle"; //$NON-NLS-1$
 
-	public final static String replicationInfo = "DP::Replication";
+	public final static String replicationInfo = "DP::Replication"; //$NON-NLS-1$
 }
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Utils.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Utils.java
index 7987650079c..2fac99cac7b 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Utils.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/Utils.java
@@ -19,6 +19,7 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Iterator;
 
+import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.emf.common.util.BasicEList;
 import org.eclipse.emf.common.util.EList;
@@ -31,7 +32,7 @@ import org.eclipse.papyrus.FCM.ContainerRule;
 import org.eclipse.papyrus.FCM.RuleApplication;
 import org.eclipse.papyrus.FCM.Singleton;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.core.utils.ServiceUtilsForActionHandlers;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForHandlers;
 import org.eclipse.papyrus.qompass.designer.core.preferences.QompassPreferenceConstants;
 import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil;
 import org.eclipse.uml2.uml.AggregationKind;
@@ -41,6 +42,7 @@ import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.InstanceSpecification;
 import org.eclipse.uml2.uml.Interface;
 import org.eclipse.uml2.uml.NamedElement;
+import org.eclipse.uml2.uml.Namespace;
 import org.eclipse.uml2.uml.Operation;
 import org.eclipse.uml2.uml.Package;
 import org.eclipse.uml2.uml.Port;
@@ -50,6 +52,8 @@ import org.eclipse.uml2.uml.util.UMLUtil;
 
 public class Utils {
 
+	public static final String QUOTE = "\""; //$NON-NLS-1$
+
 	/**
 	 * Retrieve an element from a list of named elements via its name
 	 * 
@@ -275,7 +279,7 @@ public class Utils {
 		if(root == null) {
 			return null;
 		}
-		if(!remainingPath.contains("::")) {
+		if(!remainingPath.contains(Namespace.SEPARATOR)) {
 			for(NamedElement candidate : root.getMembers()) {
 				String name = candidate.getName();
 				if((name != null) && name.equals(remainingPath)) {
@@ -285,7 +289,7 @@ public class Utils {
 				}
 			}
 		} else {
-			String segment = remainingPath.split("::")[0];
+			String segment = remainingPath.split(Namespace.SEPARATOR)[0];
 			String remainder = remainingPath.substring(segment.length() + 2);
 			for(Element element : root.getMembers()) {
 				if(element instanceof Package) {
@@ -366,11 +370,11 @@ public class Utils {
 	 * 
 	 * @return the top level package of the model currently loaded into an editor.
 	 */
-	public static Package getUserModel() {
-		ServiceUtilsForActionHandlers serviceUtils = ServiceUtilsForActionHandlers.getInstance();
+	public static Package getUserModel(ExecutionEvent event) {
+		ServiceUtilsForHandlers serviceUtils = ServiceUtilsForHandlers.getInstance();
 		try {
 			// IPath fn = serviceUtils.getModelSet().getFilenameWithoutExtension();
-			EList<Resource> resources = serviceUtils.getModelSet().getResources();
+			EList<Resource> resources = serviceUtils.getModelSet(event).getResources();
 			if(resources.size() >= 3) {
 				// check first three resources (di, notation, uml)
 				for(int i = 0; i < 3; i++) {
@@ -494,4 +498,19 @@ public class Utils {
 			}
 		}
 	}
+
+	/**
+	 * Put quotes around a string, unless string already starts with a quote.
+	 * 
+	 * @param str
+	 * @return
+	 */
+	public static String quoteString(String str) {
+		if (str.startsWith(QUOTE)) {
+			return str;
+		}
+		else {
+			return QUOTE + str + QUOTE;
+		}
+	}
 }
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/acceleo/EnumService.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/acceleo/EnumService.java
index 2f2e71582d2..2870684a147 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/acceleo/EnumService.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/acceleo/EnumService.java
@@ -17,6 +17,7 @@ package org.eclipse.papyrus.qompass.designer.core.acceleo;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.eclipse.papyrus.qompass.designer.core.Utils;
 import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationContext;
 import org.eclipse.uml2.uml.Class;
 import org.eclipse.uml2.uml.Classifier;
@@ -33,6 +34,8 @@ import org.eclipse.uml2.uml.UMLPackage;
  */
 public class EnumService {
 
+	private static final String GLOBALENUMS = "globalenums"; //$NON-NLS-1$
+
 	public static void init() {
 		enumHash.clear();
 	}
@@ -48,24 +51,25 @@ public class EnumService {
 	}
 
 	public static String literalKey(Element dummy, String enumName, String literalKey) {
-		String literal = "";
-		if(literalKey.equals("Port")) {
-			literal = "ID_" + TransformationContext.port.getName();
+		String prefix = "ID_"; //$NON-NLS-1$
+		String literal = ""; //$NON-NLS-1$
+		if(literalKey.equals("Port")) { //$NON-NLS-1$
+			literal = prefix + TransformationContext.port.getName();
 		}
-		else if(literalKey.equals("Formal")) {
-			literal = "ID_" + TransformationContext.formalParameter.getName();
+		else if(literalKey.equals("Formal")) { //$NON-NLS-1$
+			literal = prefix + TransformationContext.formalParameter.getName();
 		}
-		else if(literalKey.equals("Instance")) {
-			literal = "ID_" + TransformationContext.instance.getName();
+		else if(literalKey.equals("Instance")) { //$NON-NLS-1$
+			literal = prefix + TransformationContext.instance.getName();
 		}
-		else if(literalKey.equals("Interface")) {
-			literal = "ID_" + TransformationContext.classifier.getName();
+		else if(literalKey.equals("Interface")) { //$NON-NLS-1$
+			literal = prefix + TransformationContext.classifier.getName();
 		}
 		return literal(enumName, literal);
 	}
 
 	public static String quoteLiteral(Element dummy, String enumName, String literal) {
-		return "\"" + literal(enumName, literal) + "\"";
+		return Utils.quoteString(literal(enumName, literal));
 	}
 
 	/**
@@ -101,7 +105,7 @@ public class EnumService {
 			return literal;
 		}
 		if(enumeration == null) {
-			if(enumName.startsWith("L")) {
+			if(enumName.startsWith("L")) { //$NON-NLS-1$
 				// magic prefix for class local
 				enumeration = (Enumeration)
 					((Class)TransformationContext.classifier).createNestedClassifier(enumName, UMLPackage.eINSTANCE.getEnumeration());
@@ -133,7 +137,7 @@ public class EnumService {
 	}
 
 	public static void createEnumPackage(Package root) {
-		enumPkg = root.createNestedPackage("globalenums");
+		enumPkg = root.createNestedPackage(GLOBALENUMS);
 	}
 
 	public static Package enumPkg;
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/acceleo/UMLTool.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/acceleo/UMLTool.java
index ba5d57fcf0a..d63fd1b3655 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/acceleo/UMLTool.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/acceleo/UMLTool.java
@@ -55,6 +55,8 @@ import org.eclipse.uml2.uml.util.UMLUtil;
 
 public class UMLTool {
 
+	private static final String UNDERSCORE = "_"; //$NON-NLS-1$
+
 	/**
 	 * @param operation
 	 * @return all in and inout parameters of an operation
@@ -115,8 +117,8 @@ public class UMLTool {
 	 * Unlike varName2, replace scoping signs as well
 	 */
 	public static String varName(String umlName) {
-		umlName = umlName.replace(".", "_");
-		umlName = umlName.replace("::", "_");
+		umlName = umlName.replace(".", UNDERSCORE);  //$NON-NLS-1$
+		umlName = umlName.replace(Namespace.SEPARATOR, UNDERSCORE);
 		return varName2(umlName);
 	}
 
@@ -137,10 +139,10 @@ public class UMLTool {
 	 * @return
 	 */
 	public static String varName2(String umlName) {
-		umlName = umlName.replace(" ", "_");
-		umlName = umlName.replace("-", "_");
-		umlName = umlName.replace("+", "_");
-		umlName = umlName.replace("?", "_");
+		umlName = umlName.replace(" ", UNDERSCORE); //$NON-NLS-1$
+		umlName = umlName.replace("-", UNDERSCORE); //$NON-NLS-1$
+		umlName = umlName.replace("+", UNDERSCORE); //$NON-NLS-1$
+		umlName = umlName.replace("?", UNDERSCORE); //$NON-NLS-1$
 		return umlName;
 	}
 
@@ -320,7 +322,7 @@ public class UMLTool {
 
 		if(resource instanceof XMLResource) {
 			XMLResource xmlResource = (XMLResource)resource;
-			return "\"" + xmlResource.getURIFragment(element) + "\"";
+			return "\"" + xmlResource.getURIFragment(element) + "\"";  //$NON-NLS-1$//$NON-NLS-2$
 		}
 		return null;
 	}
@@ -376,7 +378,7 @@ public class UMLTool {
 	public static String encodeID(String uri) {
 		// _ becomes escape character. original _ is __, '-' becomes _M
 		return uri.
-				replace("_", "__"). //$NON-NLS-1$ //$NON-NLS-2$
+				replace(UNDERSCORE, UNDERSCORE + UNDERSCORE).
 				replace("-", "_M"); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/AllocUtils.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/AllocUtils.java
index 85bfff48f9c..ef288caaf17 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/AllocUtils.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/AllocUtils.java
@@ -24,8 +24,8 @@ import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SwSchedula
 import org.eclipse.papyrus.MARTE.MARTE_Foundations.Alloc.Allocate;
 import org.eclipse.papyrus.qompass.designer.core.ConnectorUtils;
 import org.eclipse.papyrus.qompass.designer.core.Log;
-import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil;
 import org.eclipse.papyrus.qompass.designer.core.Utils;
+import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil;
 import org.eclipse.uml2.uml.Abstraction;
 import org.eclipse.uml2.uml.Class;
 import org.eclipse.uml2.uml.Classifier;
@@ -128,15 +128,15 @@ public class AllocUtils {
 	}
 
 	/**
-	 * This method returns a list of nodes when given an instance.
+	 * This method returns a list of nodes (or threads) to which the passed instance is allocated.
 	 * It is based on MARTE Allocation (a stereotyped abstraction) which is a generic
 	 * mechanism to deploy UML elements to nodes.
 	 * 
 	 * @param instanceOrThread
-	 *        The instance that should be deployed
+	 *        The instance for which we like to know the allocation information
 	 * @return
 	 */
-	public static EList<InstanceSpecification> getNodesOrThreads(NamedElement instanceOrThread) {
+	public static EList<InstanceSpecification> getNodesOrThreads(InstanceSpecification instanceOrThread) {
 		EList<InstanceSpecification> nodeList = new UniqueEList<InstanceSpecification>();
 
 		for(DirectedRelationship relationship : instanceOrThread.getSourceDirectedRelationships(UMLPackage.eINSTANCE.getAbstraction())) {
@@ -153,22 +153,22 @@ public class AllocUtils {
 	}
 
 	/**
-	 * This method returns a list of nodes when given an instance.
-	 * It is based on MARTE Allocation (a stereotyped abstraction) which is a generic
-	 * mechanism to deploy UML elements to nodes.
-	 * 
+	 * This method returns a list of nodes to which the passed instance is allocated. If
+	 * the instance is allocated directly to a node, this node is returned. If the instance
+	 * is allocated to a thread, the allocation of the thread to a node is returned.
+	 *
 	 * @param instanceOrThread
 	 *        The instance that should be deployed
 	 * @return
 	 */
-	public static EList<InstanceSpecification> getNodes(NamedElement instanceOrThread) {
+	public static EList<InstanceSpecification> getNodes(InstanceSpecification instanceOrThread) {
 		EList<InstanceSpecification> nodeList = new UniqueEList<InstanceSpecification>();
 		EList<InstanceSpecification> nodeOrThreads = getNodesOrThreads(instanceOrThread);
 		for(InstanceSpecification nodeOrThread : nodeOrThreads)
 		{
 			Classifier nodeOrThreadC = DepUtils.getClassifier(nodeOrThread);
 			if(StereotypeUtil.isApplied(nodeOrThreadC, SwSchedulableResource.class)) {
-				// tread case that instance is allocated to a thread
+				// treat case that instance is allocated to a thread
 				// follow allocation of Thread
 				nodeList.add(getNode(nodeOrThread));
 			}
@@ -255,10 +255,11 @@ public class AllocUtils {
 	public static boolean allocate(InstanceSpecification instance, InstanceSpecification node) {
 		Package cdp = (Package)instance.getOwner();
 		Abstraction allocation = (Abstraction)
-			cdp.createPackagedElement("allocate " + instance.getName() +
-				" to " + node.getName(), UMLPackage.eINSTANCE.getAbstraction());
+			cdp.createPackagedElement("allocate " + instance.getName() + //$NON-NLS-1$
+				" to " + node.getName(), UMLPackage.eINSTANCE.getAbstraction()); //$NON-NLS-1$
 		if(StereotypeUtil.apply(allocation, Allocate.class) == null) {
 			// stereotype application failed
+			allocation.destroy();
 			return false;
 		}
 		allocation.getClients().add(instance);
@@ -310,9 +311,9 @@ public class AllocUtils {
 				}
 				for(Connector connection : compositeCL.getOwnedConnectors()) {
 					if(ConnectorUtils.connectsPort(connection, port)) {
-						Log.log(Status.INFO, Log.TRAFO_CONNECTOR, "connector: " + connection.getName());
-						Log.log(Status.INFO, Log.TRAFO_CONNECTOR, "end1: " + connection.getEnds().get(0).getPartWithPort());
-						Log.log(Status.INFO, Log.TRAFO_CONNECTOR, "end2: " + connection.getEnds().get(1).getPartWithPort());
+						Log.log(Status.INFO, Log.TRAFO_CONNECTOR, "connector: " + connection.getName()); //$NON-NLS-1$
+						Log.log(Status.INFO, Log.TRAFO_CONNECTOR, "end1: " + connection.getEnds().get(0).getPartWithPort()); //$NON-NLS-1$
+						Log.log(Status.INFO, Log.TRAFO_CONNECTOR, "end2: " + connection.getEnds().get(1).getPartWithPort()); //$NON-NLS-1$
 						ConnectorEnd end = ConnectorUtils.connEndForPart(connection, containedProperty);
 						// other connector end targeted at containedProperty?
 						if(end != null) {
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/BootLoaderGen.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/BootLoaderGen.java
index 19c6e0c313a..dd8ad1f56a6 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/BootLoaderGen.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/BootLoaderGen.java
@@ -26,6 +26,7 @@ import org.eclipse.papyrus.C_Cpp.Include;
 import org.eclipse.papyrus.FCM.InitPrecedence;
 import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SwSchedulableResource;
 import org.eclipse.papyrus.qompass.designer.core.ConnectorUtils;
+import org.eclipse.papyrus.qompass.designer.core.Messages;
 import org.eclipse.papyrus.qompass.designer.core.StUtils;
 import org.eclipse.papyrus.qompass.designer.core.Utils;
 import org.eclipse.papyrus.qompass.designer.core.acceleo.UMLTool;
@@ -59,13 +60,15 @@ import org.eclipse.uml2.uml.util.UMLUtil;
  */
 public class BootLoaderGen {
 
-	final public static String initOpName = "init"; //$NON-NLS-1$
+	final public static String NODE_INFO = "NodeInfo"; //$NON-NLS-1$
+
+	final public static String INIT_OP_NAME = "init"; //$NON-NLS-1$
 	
 	final public static String NL = "\n"; //$NON-NLS-1$
 	
 	final public static String EOL = ";\n"; //$NON-NLS-1$
 	
-	final public static String bootloaderName = "BootLoader"; //$NON-NLS-1$
+	final public static String BOOTLOADER_NAME = "BootLoader"; //$NON-NLS-1$
 	
 	/**
 	 * Create a new boot-loader in a specific package
@@ -80,12 +83,23 @@ public class BootLoaderGen {
 		// place in root (getModel()) to avoid the problem that the declaration of the bootLoader
 		// instance is within a namespace (a static attribute on the model level would not solve the
 		// problem as it must be accessed by function main).
-		m_bootLoader = copy.target.createOwnedClass(bootloaderName, false);
+		
+		Class nodeInfo = copy.target.createOwnedClass(NODE_INFO, false);
+		String headerStr =
+				"const int nodeIndex = " + nodeIndex + ";" + NL +  //$NON-NLS-1$//$NON-NLS-2$
+				"const int numberOfNodes = " + numberOfNodes + ";" + NL; //$NON-NLS-1$ //$NON-NLS-2$
+		Include cppIncludeNodeInfo = StereotypeUtil.applyApp(nodeInfo, Include.class);
+		cppIncludeNodeInfo.setHeader(headerStr);
+		
+		// bootLoader.createOwnedAttribute (mainInstance.getName (), composite);
+
+		m_bootLoader = copy.target.createOwnedClass(BOOTLOADER_NAME, false);
 		outputSizeof = false;
 		m_copy = copy;
 		Class template = (Class)Utils.getQualifiedElement(copy.source, bootloaderQNAME);
 		if(template == null) {
-			throw new TransformationException("Cannot retrieve bootLoader template (should be in " + bootloaderQNAME + ")");
+			throw new TransformationException(String.format(
+					Messages.BootLoaderGen_CannotRetrieveTemplate, bootloaderQNAME));
 		}
 		// TODO: currently, only stereotypes are copied from template
 		StUtils.copyStereotypes(template, m_bootLoader);
@@ -108,25 +122,20 @@ public class BootLoaderGen {
 		 * }
 		 */
 		Include cppInclude = StereotypeUtil.applyApp(m_bootLoader, Include.class);
-		Object existingBody = cppInclude.getBody();
-		String existingBodyStr = ""; //$NON-NLS-1$
-		if(existingBody instanceof String) {
-			existingBodyStr = (String)existingBody + NL;
+		if (cppInclude == null) {
+			throw new TransformationException("Cannot apply cppInclude stereotype. Make sure that C/C++ profile is applied to your model");
 		}
+		String existingBody = cppInclude.getBody();
 		String bodyStr =
-			"#include <unistd.h> // for sleep\n" + //$NON-NLS-1$
-			"\n" + //$NON-NLS-1$
-			"int nodeIndex = " + nodeIndex + ";" + NL +  //$NON-NLS-1$//$NON-NLS-2$
-			"int numberOfNodes = " + numberOfNodes + ";" + NL; //$NON-NLS-1$ //$NON-NLS-2$
+			"#include <unistd.h> // for sleep\n"; //$NON-NLS-1$
 		
 		if(outputSizeof) {
 			bodyStr +=
 				"#include <iostream>" + NL + //$NON-NLS-1$
 				"using namespace std;" + NL; //$NON-NLS-1$
 		}
-
-		cppInclude.setBody(existingBodyStr + bodyStr);
-
+		cppInclude.setBody(existingBody + bodyStr);
+		
 		// bootLoader.createOwnedAttribute (mainInstance.getName (), composite);
 
 		m_initCode = ""; //$NON-NLS-1$
@@ -138,6 +147,7 @@ public class BootLoaderGen {
 		if(outputSizeof) {
 			m_initCode += "cout << \"sizeof bootloader: \" << sizeof (bootloader) << endl;" + EOL; //$NON-NLS-1$
 		}
+		// indexMap = new HashMap<String, Integer>();
 	}
 
 	/**
@@ -182,13 +192,16 @@ public class BootLoaderGen {
 			return instance.getName(); // instance has no path via slots, it is a top level instance
 		}
 	}
-
+	
 	public Property addInstance(Stack<Slot> slotPath, InstanceSpecification instance, Class implementation, InstanceSpecification node)
 		throws TransformationException
 	{
+		// TODO: comments not clear. seems unnecessary complex. Problem in general is that access to
+		// shared instances needs to be configured.
+		// It should always be possible to configure this instance via a path w/o sharing.
 		String accessName = getPath(slotPath, instance, true);
 		String varName = getPath(slotPath, instance, false);
-
+		
 		Property implemPart = null;
 
 		// containing instance not null (=> neither main instance nor singleton)
@@ -246,8 +259,9 @@ public class BootLoaderGen {
 				// TODO: Need path that uses the right dereference operator ("->" or ".")
 				m_initCodeRun = varName + "." + get_start + "()->run()" + EOL;  //$NON-NLS-1$ //$NON-NLS-2$
 			} else {
-				throw new TransformationException("There must be at most one blocking \"run\" operation per node. " +
-					"refuse to add \"run\" call for component instance \"" + varName + "\". Existing invocations: " + m_initCodeRun);
+				throw new TransformationException(String.format(
+						Messages.BootLoaderGen_AtLeastOneBlockingCall,
+								varName, m_initCodeRun));
 			}
 		}
 		if(hasUnconnectedLifeCycle(m_copy, implementation, containerSlot)) {
@@ -353,13 +367,14 @@ public class BootLoaderGen {
 
 	public void instanceConfig(Stack<Slot> slotPath, InstanceSpecification instance) throws TransformationException {
 		Slot slot = slotPath.peek();
-		String varName = getPath(slotPath, instance, false);
+		// String varName = getPath(slotPath, instance, false);
 		StructuralFeature sf = slot.getDefiningFeature();
 		if(sf == null) {
-			throw new TransformationException("A slot for instance " + varName + //$NON-NLS-1$
-				" has no defining feature"); //$NON-NLS-1$
+			throw new TransformationException(String.format(
+					"A slot for instance %s has no defining feature", instance.getName())); //$NON-NLS-1$
 		}
 
+		String varName = instance.getName() + "." + sf.getName(); //$NON-NLS-1$
 		for(ValueSpecification value : slot.getValues()) {
 
 			// only set value, if not null
@@ -377,9 +392,9 @@ public class BootLoaderGen {
 
 	public void addInit() {
 		// TODO: use template
-		Operation init = m_bootLoader.createOwnedOperation(initOpName, null, null);
+		Operation init = m_bootLoader.createOwnedOperation(INIT_OP_NAME, null, null);
 		OpaqueBehavior initBehavior = (OpaqueBehavior)
-			m_bootLoader.createOwnedBehavior(initOpName, UMLPackage.eINSTANCE.getOpaqueBehavior());
+			m_bootLoader.createOwnedBehavior(INIT_OP_NAME, UMLPackage.eINSTANCE.getOpaqueBehavior());
 		init.getMethods().add(initBehavior);
 
 
@@ -448,8 +463,8 @@ public class BootLoaderGen {
 			code += "// initial user start\n" + m_initCodeRun; //$NON-NLS-1$
 		} else {
 			// this change broke client-server example!
-			code += "// sleep forever\n";
-			code += "for (;;) { sleep(100); }\n";
+			code += "// sleep forever\n"; //$NON-NLS-1$
+			code += "for (;;) { sleep(100); }\n"; //$NON-NLS-1$
 			// throw new TransformationRTException("no component implements the initial start. Assure that one component inherits from the CStart component");
 		}
 		if(activationKeys.length > 0) {
@@ -509,4 +524,9 @@ public class BootLoaderGen {
 	 * copy variable (instances still point to non-copied classes)
 	 */
 	private Copy m_copy;
+	
+	/**
+	 * Store a map with index values to manage configuration of arrays
+	 */
+	// protected Map<String, Integer> indexMap;
 }
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DepCreation.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DepCreation.java
index 0714a05d50d..5291a7a4118 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DepCreation.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DepCreation.java
@@ -16,6 +16,7 @@ import org.eclipse.papyrus.FCM.RuleApplication;
 import org.eclipse.papyrus.qompass.designer.core.CORBAtypeNames;
 import org.eclipse.papyrus.qompass.designer.core.ConfigUtils;
 import org.eclipse.papyrus.qompass.designer.core.Log;
+import org.eclipse.papyrus.qompass.designer.core.Messages;
 import org.eclipse.papyrus.qompass.designer.core.Utils;
 import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationException;
 import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationRTException;
@@ -107,13 +108,13 @@ public class DepCreation {
 				|| qname.equals(CORBAtypeNames.UnsignedLong)
 				|| qname.equals(CORBAtypeNames.Short)
 				|| qname.equals(CORBAtypeNames.UnsignedShort)) {
-				slot.createValue(valueFor + attribute.getName(), type, //$NON-NLS-1$
+				slot.createValue(valueFor + attribute.getName(), type,
 					UMLPackage.eINSTANCE.getLiteralInteger());
-			} else if(name.equals("Boolean")) {
-				slot.createValue(valueFor + attribute.getName(), type, //$NON-NLS-1$
+			} else if(name.equals("Boolean")) { //$NON-NLS-1$
+				slot.createValue(valueFor + attribute.getName(), type,
 					UMLPackage.eINSTANCE.getLiteralBoolean());
 			} else {
-				slot.createValue(valueFor + attribute.getName(), type, //$NON-NLS-1$
+				slot.createValue(valueFor + attribute.getName(), type,
 					UMLPackage.eINSTANCE.getLiteralString());
 			}
 		}
@@ -177,17 +178,16 @@ public class DepCreation {
 				path += cl.getName();
 			}
 			path += ", " + typeOrImplem.getName(); //$NON-NLS-1$
-			throw new TransformationException("Class \"" + typeOrImplem.getQualifiedName() +
-				"\" is referenced in a circle! Thus, an infinite number of instance specifications would be required.\n\n" +
-				"recursion path: " + path);
+			throw new TransformationException(String.format(
+				Messages.DepCreation_CircularReference,
+				typeOrImplem.getQualifiedName(), path));
 		}
 		visitedClassifiers.push(typeOrImplem);
 
 		InstanceSpecification is = (InstanceSpecification)
 			cdp.createPackagedElement(name, UMLPackage.eINSTANCE.getInstanceSpecification());
 
-		// TODO: hack, could be named differently.
-		if(name.equals("mainInstance")) { //$NON-NLS-1$
+		if(name.equals(DeployConstants.MAIN_INSTANCE)) {
 			DepUtils.setMainInstance(cdp, is);
 		}
 
@@ -209,9 +209,9 @@ public class DepCreation {
 		}
 
 		if(!(implementation instanceof Class)) {
-			throw new TransformationException(
-				"cannot find suitable implementation for instance <" + name //$NON-NLS-1$
-					+ "> (given type <" + typeOrImplem.getName() + ">)"); //$NON-NLS-1$
+			throw new TransformationException(String.format(
+				Messages.DepCreation_CannotFindImplementation,
+				name, typeOrImplem.getName()));
 		}
 		// else implementation is instance of Class (and not null)
 
@@ -227,12 +227,12 @@ public class DepCreation {
 		for(Connector connector : implementation.getOwnedConnectors()) {
 			org.eclipse.papyrus.FCM.Connector fcmConn = UMLUtil.getStereotypeApplication(connector, org.eclipse.papyrus.FCM.Connector.class);
 			if(fcmConn != null) {
-				String partName = name + "." + connector.getName();
+				String partName = name + "." + connector.getName(); //$NON-NLS-1$
 				InteractionComponent connectorComp = fcmConn.getIc();
 				if(connectorComp != null) {
 					Class cl = fcmConn.getIc().getBase_Class();
 					if(cl == null) {
-						throw new TransformationException("An FCM connector has no base class. Check for broken model library");
+						throw new TransformationException(Messages.DepCreation_FCMconnectorWithoutBaseClass);
 					}
 					// create sub-instance for connector. It is not possible to
 					// create a slot in the owning instance specification,
@@ -270,24 +270,26 @@ public class DepCreation {
 
 						createSlot(is, partIS, attribute);
 					}
-				} else if(StereotypeUtil.isApplied(attribute,
-					ConfigurationProperty.class)
+				}
+				else if(StereotypeUtil.isApplied(attribute, ConfigurationProperty.class)
 					&& createSlotsForConfigValues) {
 					// is a configuration property, create slot
 					// TODO: implicit assumption that configuration attributes
 					// are not components
 					createSlotForConfigProp(is, attribute);
 				}
-			} else if(type instanceof Class) {
+			}
+			else if(type instanceof Class) {
 				// no composition - only create slot, if a singleton
 				// (otherwise, it's not clear with which instance the slot
 				// should be associated)
-				Log.log(Status.INFO, Log.DEPLOYMENT,
-					"DepCreation.createDepPlan: " + type.getQualifiedName());
+				Log.log(Status.INFO, Log.DEPLOYMENT, String.format(
+					Messages.DepCreation_InfoCreateDepPlan, type.getQualifiedName()));
 				if(Utils.isSingleton((Class)type)) {
 					// is a singleton - exactly one instance exists
 					// use a common instance prefix for singletons
-					String partName = "singleton_" + attribute.getName();
+					InstanceSpecification mainInstance = DepUtils.getMainInstance(cdp);
+					String partName = mainInstance.getName() + DeployConstants.SEP_CHAR + DeployConstants.singletonPrefix + attribute.getName();
 					PackageableElement pe = cdp.getPackagedElement(partName);
 
 					if(pe instanceof InstanceSpecification) {
@@ -301,16 +303,22 @@ public class DepCreation {
 						// [case that a non-instance specification with the name
 						// <partName> exists already
 						// is not handled]
-						InstanceSpecification partIS = createDepPlan(cdp,
+						
+						Classifier system = DepUtils.getClassifier(mainInstance);
+						Property singletonAttr = null;
+						if (system instanceof Class) {
+							singletonAttr = ((Class) system).createOwnedAttribute(DeployConstants.singletonPrefix + attribute.getName(), type);
+						}
+						
+						InstanceSpecification singletonIS = createDepPlan(cdp,
 							(Class)type, partName, createSlotsForConfigValues, visitedClassifiers);
-						Slot slot = createSlot(is, partIS, attribute);
-						slot.setDefiningFeature(attribute);
+						createSlot(is, singletonIS, attribute);
+						createSlot(mainInstance, singletonIS, singletonAttr);
 					}
 				}
 			} else if(type == null) {
-				throw new TransformationException("type of attribute \""
-					+ attribute.getName() + "\" within class \""
-					+ implementation.getName() + "\" is not defined");
+				throw new TransformationException(String.format(Messages.DepCreation_TypeInAttributeUndefined,
+						attribute.getName(), implementation.getName()));
 			}
 		}
 		visitedClassifiers.pop();
@@ -347,7 +355,7 @@ public class DepCreation {
 				//   vs. interceptor specific configuration?
 				// - two different interceptors may not share the same type with
 				//   a configuration attribute
-				Slot slot = createSlotForConfigProp(is, attribute);
+				createSlotForConfigProp(is, attribute);
 			}
 		}
 	}
@@ -375,13 +383,10 @@ public class DepCreation {
 		throws TransformationException {
 		// create an instance specification for the composite
 		InstanceSpecification is = null;
-		if(name != null) {
-			// donn't create instance specification for root element (detectable via the empty name)
-			is = (InstanceSpecification)platform.createPackagedElement(name,
-				UMLPackage.eINSTANCE.getInstanceSpecification());
-			is.getClassifiers().add(implementation);
-		}
-
+		is = (InstanceSpecification)platform.createPackagedElement(name,
+			UMLPackage.eINSTANCE.getInstanceSpecification());
+		is.getClassifiers().add(implementation);
+		
 		// add connector and container implementations
 
 		for(Property attribute : implementation.getAllAttributes()) {
@@ -397,17 +402,15 @@ public class DepCreation {
 				if(type instanceof Class) { // should be a node, but do not require it
 					Class cl = (Class)type;
 
-					// hack: ad-hoc replication support. Better solution via
-					// Design patterns
 					int upper = attribute.getUpper();
-					String infix = "";
+					String infix = ""; //$NON-NLS-1$
 					// TODO: check validation constraints
 					for(int i = 0; i < upper; i++) {
 						// prefix with name, unless null
-						String partName = (name != null) ? name + "." : "";
+						String partName = (name != null) ? name + DeployConstants.SEP_CHAR : ""; //$NON-NLS-1$
 						partName += attribute.getName();
 						if(upper > 1) {
-							partName += "_" + infix + i;
+							partName += "_" + infix + i; //$NON-NLS-1$
 						}
 						InstanceSpecification partIS = createPlatformInstances(
 							platform, cl, partName);
@@ -452,7 +455,8 @@ public class DepCreation {
 		for(Slot slot : is.getSlots()) {
 			StructuralFeature sf = slot.getDefiningFeature();
 			if (sf == null) {
-				throw new RuntimeException ("The defining feature of a slot of instance " + slot.getOwningInstance().getName() + " is null");
+				throw new RuntimeException (String.format(Messages.DepCreation_DefiningFeatureNull,
+						slot.getOwningInstance().getName()));
 			}
 			if(StereotypeUtil.isApplied(sf, AutoIndex.class)) {
 				Integer value = null;
@@ -473,7 +477,7 @@ public class DepCreation {
 				// create slot and value specification (literal-integer) for the
 				// auto index
 				LiteralInteger li = (LiteralInteger)slot.createValue(
-					sf.getName() + "_auto", sf.getType(),
+					sf.getName() + DeployConstants.AUTO_POSTFIX, sf.getType(),
 					UMLPackage.eINSTANCE.getLiteralInteger());
 				li.setValue(value);
 
@@ -543,7 +547,6 @@ public class DepCreation {
 	 *        specification
 	 * @return The value specifications for the passed source property or null
 	 */
-
 	public static ValueSpecification getNearestValue(
 		Stack<InstanceSpecification> isStack, Property source) {
 		Stack<InstanceSpecification> copy = new Stack<InstanceSpecification>();
@@ -561,7 +564,7 @@ public class DepCreation {
 	/**
 	 * Helper for getNearestValue: search for an instance specification that has
 	 * source as defining feature. Start at the passed instance specification,
-	 * but do not recursed into elements that are contained in the stack.
+	 * but do not recurse into elements that are contained in the stack.
 	 * 
 	 * @param isStack
 	 *        A stack of instance specifications corresponding to a path
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DepPlanUtils.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DepPlanUtils.java
index 97365fdb5ea..3c9a5297c0d 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DepPlanUtils.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DepPlanUtils.java
@@ -21,8 +21,9 @@ import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.common.util.Enumerator;
 import org.eclipse.emf.ecore.ENamedElement;
 import org.eclipse.papyrus.FCM.DeploymentPlan;
-import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil;
+import org.eclipse.papyrus.qompass.designer.core.Messages;
 import org.eclipse.papyrus.qompass.designer.core.Utils;
+import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil;
 import org.eclipse.uml2.uml.Class;
 import org.eclipse.uml2.uml.Classifier;
 import org.eclipse.uml2.uml.Element;
@@ -36,13 +37,12 @@ import org.eclipse.uml2.uml.Package;
 import org.eclipse.uml2.uml.Port;
 import org.eclipse.uml2.uml.Property;
 import org.eclipse.uml2.uml.Slot;
+import org.eclipse.uml2.uml.StructuralFeature;
 import org.eclipse.uml2.uml.UMLPackage;
 import org.eclipse.uml2.uml.ValueSpecification;
 
 public class DepPlanUtils {
 
-	public static final String depPlanFolder = "deployment";
-
 	/**
 	 * Return the package in which deployment plans are stored. Caveat: needs to be executed within a
 	 * transition, since the deployment plan package will be created, if it does not exist yet.
@@ -53,7 +53,7 @@ public class DepPlanUtils {
 	 * @return package in which deployment plans are stored
 	 */
 	public static Package getDepPlanRoot(Element element) {
-		return Utils.getRoot(element, depPlanFolder);
+		return Utils.getRoot(element, DeployConstants.depPlanFolder);
 	}
 
 	/**
@@ -66,7 +66,7 @@ public class DepPlanUtils {
 	 */
 	public static EList<Package> getAllDepPlans(Element element) {
 		Package root = Utils.getTop(element);
-		Package depPlanRoot = root.getNestedPackage(depPlanFolder);
+		Package depPlanRoot = root.getNestedPackage(DeployConstants.depPlanFolder);
 		EList<Package> depPlanList = new BasicEList<Package>();
 		if(depPlanRoot != null) {
 			for(Package pkg : depPlanRoot.getNestedPackages()) {
@@ -159,7 +159,7 @@ public class DepPlanUtils {
 		// choose implementation automatically: get the first one that implements the passed type
 		// (problem: further tree expansion might depend on chosen implementation)
 		// get reference to component model, then search all classes contained in it.
-		Package compModel = Utils.getRoot(componentType, "ComponentModel");
+		Package compModel = Utils.getRoot(componentType, DeployConstants.COMPONENT_MODEL);
 		Iterator<Element> elements = compModel.allOwnedElements().iterator();
 		while(elements.hasNext()) {
 			Element element = elements.next();
@@ -185,7 +185,7 @@ public class DepPlanUtils {
 		InstanceSpecification is = (InstanceSpecification)
 			cdp.createPackagedElement(name, UMLPackage.eINSTANCE.getInstanceSpecification());
 
-		if(name == "mainInstance") {
+		if(name == DeployConstants.MAIN_INSTANCE) {
 			setMainInstance(cdp, is);
 		}
 
@@ -219,25 +219,49 @@ public class DepPlanUtils {
 				continue;
 			}
 			InstanceSpecification partIS =
-				createDepPlan(cdp, (Classifier)part.getType(), name + "." + part.getName());
+				createDepPlan(cdp, (Classifier)part.getType(), name + DeployConstants.SEP_CHAR + part.getName());
 
 			createSlot(cdp, is, partIS, part);
 		}
 		return is;
 	}
 
+	/**
+	 * Configure an attribute of an instance specification
+	 * @param instance the instance specification
+	 * @param property An ENamedElement denoting the name of an attribute of a classifier that
+	 * 		is in the classifier list of the instance specification
+	 * @param value the string value. An enumeration can be configured via the name of the literal
+	 */
 	public static void configureProperty(InstanceSpecification instance, ENamedElement property, String value) {
 		configureProperty(instance, property.getName(), value);
 	}
 
+	/**
+	 * Configure an attribute of an instance specification
+	 * @param instance the instance specification
+	 * @param propertyName the name of an attribute of a classifier that is in the classifier list
+	 * 		of the instance specification
+	 * @param value the string value. An enumeration can be configured via the name of the literal
+	 */
 	public static void configureProperty(InstanceSpecification instance, String propertyName, String value) {
 		Classifier extension = DepUtils.getClassifier(instance);
 		Property attribute = (Property)Utils.getNamedElementFromList(extension.getAllAttributes(), propertyName);
 		if(attribute == null) {
-			throw new RuntimeException("cannot find attribute " + propertyName + " in classifier " + extension.getName());
+			throw new RuntimeException(String.format(Messages.DepPlanUtils_CannotFindAttribute, propertyName, extension.getName()));
 		}
+		configureProperty(instance, attribute, value);
+	}
+	
+	/**
+	 * Configure an attribute of an instance specification
+	 * @param instance the instance specification
+	 * @param attribute an attribute of a classifier that is in the classifier list of the instance specification
+	 * @param value the string value. An enumeration can be configured via the name of the literal
+	 */
+	public static void configureProperty(InstanceSpecification instance, Property attribute, String value) {
 		if(attribute.getType() instanceof Enumeration) {
-			configureEnumProperty(instance, propertyName, value);
+			configureEnumProperty(instance, attribute, value);
 		}
 		else {
 			// create a slot for a string value
@@ -247,46 +271,69 @@ public class DepPlanUtils {
 			}
 			else {
 				// indicates that operation has been called although types do not match
-				throw new RuntimeException("configuration of property " + propertyName + " failed: type is not a string");
+				throw new RuntimeException(String.format(Messages.DepPlanUtils_ConfigOfPropertyFailed, attribute.getName()));
 			}
 		}
-
 	}
 
+	/**
+	 * Configure an attribute of an instance specification
+	 * @param instance the instance specification
+	 * @param property An ENamedElement denoting the name of an attribute of a classifier that
+	 * 		is in the classifier list of the instance specification
+	 * @param value the integer value.
+	 */
 	public static void configureProperty(InstanceSpecification instance, ENamedElement property, int value) {
 		configureProperty(instance, property.getName(), value);
 	}
 
+	/**
+	 * Configure an attribute of an instance specification
+	 * @param instance the instance specification
+	 * @param propertyName the name of an attribute of a classifier that is in the classifier list
+	 * 		of the instance specification
+	 * @param value the integer value.
+	 */
 	public static void configureProperty(InstanceSpecification instance, String propertyName, int value) {
 		Classifier extension = DepUtils.getClassifier(instance);
 		Property attribute = (Property)Utils.getNamedElementFromList(extension.getAllAttributes(), propertyName);
 		if(attribute == null) {
-			throw new RuntimeException("cannot find attribute " + propertyName + " in classifier " + extension.getName());
+			throw new RuntimeException(String.format(Messages.DepPlanUtils_CannotFindAttribute, propertyName, extension.getName()));
 		}
+		configureProperty(instance, attribute, value);
+	}
+	
+	/**
+	 * Configure an attribute of an instance specification
+	 * @param instance the instance specification
+	 * @param attribute an attribute of a classifier that is in the classifier list of the instance specification
+	 * @param value the integer value.
+	 */
+	public static void configureProperty(InstanceSpecification instance, Property attribute, int value) {
 		Slot slotIntVal = instance.createSlot();
 		slotIntVal.setDefiningFeature(attribute);
 		LiteralInteger intValue = (LiteralInteger)
-			slotIntVal.createValue("value for " + attribute.getName(), attribute.getType(), UMLPackage.eINSTANCE.getLiteralInteger());
+			slotIntVal.createValue("value for " + attribute.getName(), attribute.getType(), UMLPackage.eINSTANCE.getLiteralInteger()); //$NON-NLS-1$
 		intValue.setValue(value);
-
 	}
 
 	/**
-	 * Convenience function: allow that an ecore named element is passed instead of a property name. This is useful if the
-	 * parameter that should be configured stems from a static profile [TODO: should not be in the general class support, but
-	 * in the instance configurators for RT-Describe)
+	 * Convenience function: allow that an ECore named element is passed instead of a property name. This is useful if the
+	 * parameter that should be configured stems from a static profile
 	 * 
 	 * @param instance
-	 * @param extension
+	 *        The instance of which an attribute should be configured.
 	 * @param property
+	 *        The name of the property (denoted by an ENamedElement) that should be configured
 	 * @param value
+	 *        its value in form of an element of an ECore enumerator value
 	 */
 	public static void configureProperty(InstanceSpecification instance, ENamedElement property, Enumerator value) {
 		configureProperty(instance, property.getName(), value);
 	}
 
 	/**
-	 * configure a property for an enumeration. Enumerations are a bit difficult to handle, since the enumeration literal itself
+	 * Configure a property for an enumeration. Enumerations are a bit difficult to handle, since the enumeration literal itself
 	 * must be created first in form of an instance specification
 	 * 
 	 * @param instance
@@ -294,19 +341,34 @@ public class DepPlanUtils {
 	 * @param propertyName
 	 *        The name of the property that should be configured
 	 * @param value
-	 *        its value in form of an element of a static profile [TODO: not general enough?]
+	 *        its value in form of an element of an ECore enumerator value
 	 */
 	public static void configureProperty(InstanceSpecification instance, String propertyName, Enumerator value) {
 		configureProperty(instance, propertyName, value.getName());
 	}
 
+	/**
+	 * Configure a property for an enumeration. Enumerations are a bit difficult to handle, since the enumeration literal itself
+	 * must be created first in form of an instance specification.
+	 *
+	 * @param instance
+	 *        The instance of which an attribute should be configured.
+	 * @param propertyName
+	 *        The name of the property that should be configured
+	 * @param value
+	 *        its value in form of an String. The function does nothing, if no literal corresponds to the passed
+	 *        String
+	 */
 	public static void configureEnumProperty(InstanceSpecification instance, String propertyName, String literalName) {
 		Classifier extension = DepUtils.getClassifier(instance);
 		Property attribute = (Property)Utils.getNamedElementFromList(extension.getAllAttributes(), propertyName);
 		if(attribute == null) {
-			throw new RuntimeException("cannot find attribute " + propertyName + " in classifier " + extension.getName());
+			throw new RuntimeException(String.format(Messages.DepPlanUtils_CannotFindAttribute, propertyName, extension.getName()));
 		}
-
+		configureEnumProperty(instance, attribute, literalName);
+	}
+		
+	public static void configureEnumProperty(InstanceSpecification instance, Property attribute, String literalName) {	
 		if(attribute.getType() instanceof Enumeration) {
 			Enumeration enumeration = (Enumeration)attribute.getType();
 			for(EnumerationLiteral enumLiteral : enumeration.getOwnedLiterals()) {
@@ -314,11 +376,29 @@ public class DepPlanUtils {
 					Slot slotEnumVal = instance.createSlot();
 					slotEnumVal.setDefiningFeature(attribute);
 					InstanceValue enumLitValue = (InstanceValue)
-						slotEnumVal.createValue("value for " + attribute.getName(), attribute.getType(), UMLPackage.eINSTANCE.getInstanceValue());
+						slotEnumVal.createValue("value for " + attribute.getName(), attribute.getType(), UMLPackage.eINSTANCE.getInstanceValue()); //$NON-NLS-1$
 					enumLitValue.setInstance(enumLiteral);
 					break;
 				}
 			}
 		}
 	}
+	
+	/**
+	 * Update the names of instances within a deployment plan to correspond to changes
+	 * in the hierarchy. In particular, flattening of interaction components requires this update.
+	 * 
+	 * @param composite
+	 *        System composite
+	 */
+	public static void updateInstanceNames(InstanceSpecification instance, String name) {
+		instance.setName(name);
+		for (Slot slot : instance.getSlots()) {
+			InstanceSpecification subInstance = DepUtils.getInstance(slot);
+			StructuralFeature sf = slot.getDefiningFeature();
+			if((subInstance != null) && !DepUtils.isShared(slot)) {
+				updateInstanceNames(subInstance, name + DeployConstants.SEP_CHAR + sf.getName());
+			}
+		}
+	}
 }
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DepUtils.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DepUtils.java
index 5f7d8989ea3..246945ce50f 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DepUtils.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DepUtils.java
@@ -14,6 +14,7 @@ import org.eclipse.papyrus.FCM.ImplementationGroup;
 import org.eclipse.papyrus.FCM.ImplementationProperties;
 import org.eclipse.papyrus.FCM.InteractionComponent;
 import org.eclipse.papyrus.FCM.Target;
+import org.eclipse.papyrus.qompass.designer.core.ElementFilter;
 import org.eclipse.papyrus.qompass.designer.core.Utils;
 import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil;
 import org.eclipse.uml2.common.util.UML2Util;
@@ -108,7 +109,7 @@ public class DepUtils {
 	 */
 	public static InstanceSpecification getNamedSubInstance(InstanceSpecification owningInstance, String name) {
 		Element cdp = owningInstance.getOwner();
-		String candidateName = owningInstance.getName() + "." + name;
+		String candidateName = owningInstance.getName() + "." + name; //$NON-NLS-1$
 		if(cdp instanceof Package) {
 			for(PackageableElement instance : ((Package)cdp).getPackagedElements()) {
 				if(instance instanceof InstanceSpecification) {
@@ -306,9 +307,7 @@ public class DepUtils {
 	 * @return the associated slot or null, if it does not exist
 	 */
 	public static Slot getSlot(InstanceSpecification is, Property property) {
-		Iterator<Slot> slots = is.getSlots().iterator();
-		while(slots.hasNext()) {
-			Slot slot = slots.next();
+		for (Slot slot : is.getSlots()) {
 			if(slot.getDefiningFeature() == property) {
 				return slot;
 			}
@@ -370,8 +369,8 @@ public class DepUtils {
 	}
 
 	/**
-	 * Return an instance specification that refers to the composite in which the
-	 * passed instance is contained
+	 * Return a slot for a given instance specification. The slot is the first one in a list of slots
+	 * whose value points to the passed instance.
 	 * 
 	 * @param is
 	 *        an instance that is contained within an composite (i.e. that
@@ -380,7 +379,6 @@ public class DepUtils {
 	 */
 	public static Slot getParentSlot(InstanceSpecification is) {
 		for(Slot slot : getReferencingSlots(is)) {
-			// no trigger is referencing the event any more, delete call event
 			if(slot.getDefiningFeature() instanceof Property) {
 				if(((Property)slot.getDefiningFeature()).getAggregation() == AggregationKind.COMPOSITE_LITERAL) {
 					return slot;
@@ -445,19 +443,51 @@ public class DepUtils {
 	 * Determine which programming language should be generated for a classifier. The
 	 * stereotype CodeGenOptions (which could be on any owning package) is evaluated.
 	 *
-	 * @param cl a classifier
+	 * @param pkg a classifier
 	 * @return the programming language
 	 */
-	public static String getLanguageFromClassifier(Classifier cl) {
-		CodeGenOptions codeGenOpt = UMLUtil.getStereotypeApplication(cl, CodeGenOptions.class);
+	public static String getLanguageFromPackage(Package pkg) {
+		CodeGenOptions codeGenOpt = UMLUtil.getStereotypeApplication(pkg, CodeGenOptions.class);
 		if ((codeGenOpt != null) && (codeGenOpt.getProgLanguage() != null)) {
 			return codeGenOpt.getProgLanguage().getBase_Class().getName();
 		}
-		else if (cl.getOwner() instanceof Classifier) {
-			return getLanguageFromClassifier((Classifier) cl.getOwner());
+		else if (pkg.getOwner() instanceof Package) {
+			return getLanguageFromPackage((Package) pkg.getOwner());
 		}
 		else {
 			return null;
 		}
 	}
+	
+	/**
+	 * Get all instances within a package that comply with a filter criterion. Recurse into sub-packages.
+	 * @param pkg Starting package for search
+	 * @param instanceList list of instances
+	 * @param filter filter criterion.
+	 */
+	public static void getAllInstances(Package pkg, EList<InstanceSpecification> instanceList, ElementFilter filter) {
+		for(PackageableElement el : pkg.getPackagedElements()) {
+			if(el instanceof Package) {
+				getAllInstances((Package)el, instanceList, filter);
+			}
+			else if(el instanceof InstanceSpecification) {
+				InstanceSpecification instance = (InstanceSpecification)el;
+				if (filter.acceptElement(instance)) { 
+					instanceList.add(instance);
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Return the first value for a slot.
+	 * @param slot the slot for which the first value should be returned.
+	 * @return
+	 */
+	public static ValueSpecification firstValue(Slot slot) {
+		if (slot.getValues().size() > 0) {
+			return slot.getValues().get(0);
+		}
+		return null;
+	}
 }
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/Deploy.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/Deploy.java
index 269f7d57e21..c5cd6f75a70 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/Deploy.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/Deploy.java
@@ -16,15 +16,17 @@ package org.eclipse.papyrus.qompass.designer.core.deployment;
 
 import java.util.Stack;
 
+import org.eclipse.papyrus.qompass.designer.core.Messages;
 import org.eclipse.papyrus.qompass.designer.core.extensions.ILangSupport;
+import org.eclipse.papyrus.qompass.designer.core.extensions.InstanceConfigurator;
 import org.eclipse.papyrus.qompass.designer.core.transformations.Copy;
 import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationException;
 import org.eclipse.uml2.uml.Class;
 import org.eclipse.uml2.uml.Classifier;
 import org.eclipse.uml2.uml.InstanceSpecification;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.PackageableElement;
+import org.eclipse.uml2.uml.Property;
 import org.eclipse.uml2.uml.Slot;
+import org.eclipse.uml2.uml.StructuralFeature;
 
 /*
  * This file is part of Qompass GenTools
@@ -35,8 +37,6 @@ import org.eclipse.uml2.uml.Slot;
 
 public class Deploy {
 
-	public static final String singletonPrefix = "singleton_";
-
 	/**
 	 * distribute an instance, its contained sub-instances and the referenced
 	 * classifiers to a certain node
@@ -67,24 +67,7 @@ public class Deploy {
 		// TODO: not nice at all (make non-static?)
 		Stack<Slot> slotPath = new Stack<Slot>();
 		deploy.distributeToNode(false, slotPath, instance);
-/*
-		for (Slot topLevelSlot : instance.getSlots()) {
-			InstanceSpecification topLevelInstance = DepUtils.getInstance(topLevelSlot);
-			if ((topLevelInstance != null) && AllocUtils.getAllNodes(topLevelInstance).contains(node)) {
-				slotPath.push(topLevelSlot);
-				deploy.distributeToNode(false, slotPath, topLevelInstance);
-				slotPath.pop();
-			}
-		}
-*/
-		Package cdp = instance.getNearestPackage();
-		// deploy singletons (difficult to embed singletons into main instance,
-		// since there is no attribute for these)
-		for(PackageableElement pe : cdp.getPackagedElements()) {
-			if((pe instanceof InstanceSpecification) && (pe.getName().startsWith(singletonPrefix) && (!pe.getName().contains(".")))) {
-				deploy.distributeToNode(false, slotPath, (InstanceSpecification)pe);
-			}
-		}
+
 		deploy.bootLoaderGen.addCreateConnections();
 		deploy.bootLoaderGen.addInit();
 		return deploy;
@@ -97,7 +80,7 @@ public class Deploy {
 	 * @param instance
 	 * @throws TransformationException
 	 */
-	public void distributeToNode(boolean allocAll, Stack<Slot> slotPath, InstanceSpecification instance)
+	public InstanceSpecification distributeToNode(boolean allocAll, Stack<Slot> slotPath, InstanceSpecification instance)
 		throws TransformationException {
 
 		// once an instance is explicitly allocated on a partition (use of getNodes instead of getAllNodes)
@@ -106,26 +89,42 @@ public class Deploy {
 		if(AllocUtils.getNodesOrThreads(instance).contains(node)) {
 			allocAll = true;
 		}
-
+		
 		// obtain implementation within source model
 		Classifier smImplementation = DepUtils.getClassifier(instance);
 		if(smImplementation == null) {
-			throw new TransformationException(
-				"Cannot find implementation for instance " + instance.getName());
+			throw new TransformationException(String.format(
+				Messages.Deploy_0, instance.getName()));
 		}
 
 		// copy implementation into node specific model
-		Classifier tmImplementation = depInstance.deployInstance(instance, slotPath);
+		InstanceSpecification tmInstance = depInstance.deployInstance(instance, slotPath);
+		Classifier tmImplementation = DepUtils.getClassifier(tmInstance);
 		// Classifier tmImplementation = copy.getCopy(smImplementation);
 
 		for(Slot slot : instance.getSlots()) {
 			InstanceSpecification containedInstance = DepUtils.getInstance(slot);
 
 			if(containedInstance != null) {
-				if(allocAll || AllocUtils.getAllNodes(containedInstance).contains(node)) {
+				StructuralFeature sf = slot.getDefiningFeature();
+				boolean viaAllocAll = allocAll;
+				if (allocAll && (sf instanceof Property)) {
+					// only take allocation of parent instance into account, if composition
+					// However, problematic, since code gets copied anyway.
+					// viaAllocAll = (((Property) sf).getAggregation() == AggregationKind.COMPOSITE_LITERAL);
+				}
+				if(viaAllocAll || AllocUtils.getAllNodes(containedInstance).contains(node)) {
 					// if(!containedInstance.getName().startsWith(singletonPrefix)) {
 					slotPath.push(slot);
-					distributeToNode(allocAll, slotPath, containedInstance);
+					if (sf instanceof Property) {
+						// place configurator before recursive call. Otherwise
+						// values put here would be ignored.
+						// TODO: instances are not copied to node model. Thus, the instances here are the same as in the
+						// configuration on the intermediate model.
+						// TODO: MIX of bootloaderGeneration and splitting.
+						InstanceConfigurator.configureInstance(containedInstance, (Property) sf, tmInstance);
+					}
+					InstanceSpecification tmSubInstance = distributeToNode(allocAll, slotPath, containedInstance);
 					slotPath.pop();
 				}
 			} else {
@@ -145,9 +144,9 @@ public class Deploy {
 		if(tmImplementation instanceof Class) {
 			bootLoaderGen.addInstance(slotPath, instance, (Class)tmImplementation, node);
 		}
+		return tmInstance;
 	}
 
-
 	public Class getBootloader() {
 		return bootLoaderGen.getUML();
 	}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DeployConstants.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DeployConstants.java
new file mode 100644
index 00000000000..70c94ba5a99
--- /dev/null
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/DeployConstants.java
@@ -0,0 +1,14 @@
+package org.eclipse.papyrus.qompass.designer.core.deployment;
+
+public class DeployConstants {
+
+	public static final String singletonPrefix = "singleton_"; //$NON-NLS-1$
+	public static final String COMPONENT_MODEL = "ComponentModel"; //$NON-NLS-1$
+	public static final String depPlanFolder = "deployment"; //$NON-NLS-1$
+	public static final String depPlanFolderHw = "platform"; //$NON-NLS-1$
+	public static final String DepPlanPostfix = "DepPlan"; //$NON-NLS-1$
+	public static final String DepPlanPostfixHw = "Platform"; //$NON-NLS-1$
+	public static final String MAIN_INSTANCE = "mainInstance"; //$NON-NLS-1$
+	public static final String SEP_CHAR = ".";	//$NON-NLS-1$
+	public static final String AUTO_POSTFIX = "_auto"; //$NON-NLS-1$
+}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/InstanceDeployer.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/InstanceDeployer.java
index a663e9d0c20..c3ccc2ea8fb 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/InstanceDeployer.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/InstanceDeployer.java
@@ -18,7 +18,6 @@ import java.util.Stack;
 
 import org.eclipse.papyrus.qompass.designer.core.transformations.Copy;
 import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationException;
-import org.eclipse.uml2.uml.Classifier;
 import org.eclipse.uml2.uml.InstanceSpecification;
 import org.eclipse.uml2.uml.Slot;
 
@@ -60,5 +59,5 @@ public interface InstanceDeployer {
 	 * @return the classifier modified for deployment
 	 * @throws TransformationException
 	 */
-	public Classifier deployInstance(InstanceSpecification is, Stack<Slot> slotPath) throws TransformationException;
+	public InstanceSpecification deployInstance(InstanceSpecification is, Stack<Slot> slotPath) throws TransformationException;
 }
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/PartialCopy.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/PartialCopy.java
index dda939f3cf8..cd509bd37f4 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/PartialCopy.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/deployment/PartialCopy.java
@@ -55,15 +55,15 @@ public class PartialCopy implements InstanceDeployer {
 		// does nothing for the moment
 	}
 
-	public Classifier deployInstance(InstanceSpecification is, Stack<Slot> slotPath) throws TransformationException {
+	public InstanceSpecification deployInstance(InstanceSpecification is, Stack<Slot> slotPath) throws TransformationException {
 		Classifier classifier = DepUtils.getClassifier(is);
 
 		// only make a partial copy of the system class (slotPath size 0) for the moment.
 		if(!(classifier instanceof Class) || slotPath.size() > 0) {
-			return copy.getCopy(classifier);
+			return copy.getCopy(is);
 		}
 		if (AllocUtils.getNodes(is).contains(node)) {
-			return copy.getCopy(classifier);
+			return copy.getCopy(is);
 		}
 		
 		Class smCl = (Class)classifier;
@@ -75,7 +75,8 @@ public class PartialCopy implements InstanceDeployer {
 		// since we copied some of its attributes, the copy class created a shallow copy of the class itself
 		Class tmCl = (Class) copy.get(smCl);
 		
-		return tmCl;
+		InstanceSpecification tmIS = (InstanceSpecification) copy.get(is);
+		return tmIS;
 	}
 
 	/**
@@ -95,10 +96,11 @@ public class PartialCopy implements InstanceDeployer {
 		// Log.log(Status.INFO, Log.DEPLOYMENT, "smCl:" + smCl.getQualifiedName ());
 		// Log.log(Status.INFO, Log.DEPLOYMENT, "tmCl:" + tmCl.getQualifiedName ());
 		
-		String partName = smPart.getName();
+		// String partName = smPart.getName();
 		InstanceSpecification instanceOrThread = DepUtils.getInstance(slot);
-		if (AllocUtils.getNodes(instanceOrThread).contains(node)) {
-			copy.copy(smPart);
+		// instance may be null, if slot refers to a basic type, e.g. a string
+		if ((instanceOrThread == null) || AllocUtils.getNodes(instanceOrThread).contains(node)) {
+			copy.copy(slot);
 			
 			// add connectors when possible, i.e. connectors that target the newly added part
 			for(Connector smConnector : smCl.getOwnedConnectors()) {
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/BindingHelperExt.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/BindingHelperExt.java
new file mode 100644
index 00000000000..bbde28a4b23
--- /dev/null
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/BindingHelperExt.java
@@ -0,0 +1,78 @@
+/*******************************************************************************
+ * Copyright (c) 2011 CEA LIST.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     CEA LIST - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.papyrus.qompass.designer.core.extensions;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtensionRegistry;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.FCM.BindingHelper;
+import org.eclipse.papyrus.FCM.util.IBindingHelper;
+import org.eclipse.papyrus.qompass.designer.core.listeners.CopyListener;
+import org.eclipse.papyrus.qompass.designer.core.transformations.Copy;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.TemplateBinding;
+
+
+/**
+ * Support for binding helper
+ */
+public class BindingHelperExt {
+
+	public static final String IBINDING_HELPER_ID = org.eclipse.papyrus.FCM.Activator.PLUGIN_ID + ".fcmBindingHelper"; //$NON-NLS-1$
+
+	/**
+	 * 
+	 * @param iConfiguratorName
+	 * @param component
+	 *        containing composite (container)
+	 * @param instance
+	 */
+	public static EObject applyHelper(BindingHelper helper, Copy copy, TemplateBinding binding, EObject sourceEObj) {
+		IBindingHelper ihelper = getBindingHelper(helper.getBase_Class().getName());
+		if (sourceEObj instanceof Element) {
+			ihelper.handleElement(binding, (Element) sourceEObj);
+		}
+		if(ihelper instanceof CopyListener) {
+			return ((CopyListener) ihelper).copyEObject(copy, sourceEObj);
+		}
+		return sourceEObj;
+	}
+
+	public static IBindingHelper getBindingHelper(BindingHelper helper) {
+		if (helper != null) {
+			return getBindingHelper(helper.getBase_Class().getName());
+		}
+		return null;
+	}
+
+	public static IBindingHelper getBindingHelper(String helperName) {
+		IExtensionRegistry reg = Platform.getExtensionRegistry();
+		IConfigurationElement[] configElements = reg.getConfigurationElementsFor(IBINDING_HELPER_ID);
+		for(IConfigurationElement configElement : configElements) {
+			try {
+				final String configHelperName = configElement.getAttribute("bindingHelperName"); //$NON-NLS-1$
+				if(configHelperName.equals(helperName)) {
+					// TODO: cache returned instance (avoid creating a new instance each time => more efficient, no need for static attributes)
+					final Object obj = configElement.createExecutableExtension("class"); //$NON-NLS-1$
+					if(obj instanceof IBindingHelper) {
+						return (IBindingHelper)obj;
+					}
+				}
+			} catch (CoreException exception) {
+				exception.printStackTrace();
+			}
+		}
+		return null;
+	}
+}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/EmbeddingRule.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/EmbeddingRule.java
index 597b6b99e48..ae8d03c3a06 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/EmbeddingRule.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/EmbeddingRule.java
@@ -15,20 +15,19 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtensionRegistry;
 import org.eclipse.core.runtime.Platform;
+import org.eclipse.papyrus.qompass.designer.core.Activator;
 import org.eclipse.uml2.uml.InstanceSpecification;
 import org.eclipse.uml2.uml.Port;
 
-import org.eclipse.papyrus.qompass.designer.core.Activator;
-
 
 /**
  * Support for embedding rules.
- * Currently not used, unclear if kept
+ * CAVEAT: Currently not used, unclear if kept
  */
 @Deprecated
 public class EmbeddingRule {
 
-	public static final String IEMBEDDING_RULE_ID = Activator.PLUGIN_ID + ".embeddingRule";
+	public static final String IEMBEDDING_RULE_ID = Activator.PLUGIN_ID + ".embeddingRule"; //$NON-NLS-1$
 
 	/**
 	 * 
@@ -49,10 +48,10 @@ public class EmbeddingRule {
 		IConfigurationElement[] configElements = reg.getConfigurationElementsFor(IEMBEDDING_RULE_ID);
 		for(IConfigurationElement configElement : configElements) {
 			try {
-				final String iConfiguratorIDext = configElement.getAttribute("configuratorID");
+				final String iConfiguratorIDext = configElement.getAttribute("configuratorID"); //$NON-NLS-1$
 				if(iConfiguratorIDext.equals(embeddingRuleID)) {
 					// TODO: cache returned instance (avoid creating a new instance each time => more efficient, no need for static attributes)
-					final Object obj = configElement.createExecutableExtension("class");
+					final Object obj = configElement.createExecutableExtension("class"); //$NON-NLS-1$
 					if(obj instanceof IEmbeddingRule) {
 						return (IEmbeddingRule)obj;
 					}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/ExternalGenerator.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/ExternalGenerator.java
index 6409d4b9edf..7c386fec3dc 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/ExternalGenerator.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/ExternalGenerator.java
@@ -16,9 +16,8 @@ import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtensionRegistry;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.emf.common.util.EList;
-import org.eclipse.uml2.uml.Classifier;
-
 import org.eclipse.papyrus.qompass.designer.core.Activator;
+import org.eclipse.uml2.uml.Classifier;
 
 
 /**
@@ -26,7 +25,7 @@ import org.eclipse.papyrus.qompass.designer.core.Activator;
  */
 public class ExternalGenerator {
 
-	public static final String IEXTERNAL_GENERATOR_ID = Activator.PLUGIN_ID + ".externalGenerator";
+	public static final String IEXTERNAL_GENERATOR_ID = Activator.PLUGIN_ID + ".externalGenerator"; //$NON-NLS-1$
 
 	/**
 	 * 
@@ -48,10 +47,10 @@ public class ExternalGenerator {
 		IConfigurationElement[] configElements = reg.getConfigurationElementsFor(IEXTERNAL_GENERATOR_ID);
 		for(IConfigurationElement configElement : configElements) {
 			try {
-				final String iConfiguratorIDext = configElement.getAttribute("extGeneratorID");
+				final String iConfiguratorIDext = configElement.getAttribute("extGeneratorID"); //$NON-NLS-1$
 				if(iConfiguratorIDext.equals(iGeneratorID)) {
 					// TODO: cache returned instance (avoid creating a new instance each time => more efficient, no need for static attributes)
-					final Object obj = configElement.createExecutableExtension("class");
+					final Object obj = configElement.createExecutableExtension("class"); //$NON-NLS-1$
 					if(obj instanceof IExternalGenerator) {
 						return (IExternalGenerator)obj;
 					}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/IEmbeddingRule.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/IEmbeddingRule.java
index 2e3f5dd966d..266fe4559b1 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/IEmbeddingRule.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/IEmbeddingRule.java
@@ -15,12 +15,13 @@ import org.eclipse.uml2.uml.InstanceSpecification;
 import org.eclipse.uml2.uml.Port;
 
 /**
- * Interface used by Qompass extensions that supports specific instance configurators,
- * used for containers.
+ * Interface used by Qompass extensions that supports specific embedding rules.
+ * CAVEAT: Currently not used, unclear if kept
  */
+@Deprecated
 public interface IEmbeddingRule {
 
-	// TODO: ordre? appliqué
+	// TODO: application order?
 	/**
 	 * configure an instance (within a container)
 	 * @param executorIS the instance specification of the component that is used as basis for configuring the instance
@@ -28,5 +29,5 @@ public interface IEmbeddingRule {
 	 * @param port the port within a container transformation for which the instance is used as an interceptor.
 	 *    Is null for "normal" connectors or container extensions is configured.
 	 */
-	public void embeddExtension (InstanceSpecification executorIS, InstanceSpecification instance, Port port);
+	public void embeddExtension(InstanceSpecification executorIS, InstanceSpecification instance, Port port);
 }
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/IInstanceConfigurator.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/IInstanceConfigurator.java
index 18480c3de37..94df33a7003 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/IInstanceConfigurator.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/IInstanceConfigurator.java
@@ -14,8 +14,6 @@ package org.eclipse.papyrus.qompass.designer.core.extensions;
 import org.eclipse.uml2.uml.InstanceSpecification;
 import org.eclipse.uml2.uml.Property;
 
-import org.eclipse.papyrus.qompass.designer.core.transformations.ContainerContext;
-
 /**
  * Interface used by Qompass extensions that supports specific instance configurators,
  * used for containers.
@@ -27,12 +25,12 @@ public interface IInstanceConfigurator {
 	 * 
 	 * @param instance
 	 *        the instance of an element which should be configured.
-	 * @param componentPort
+	 * @param componentPart
 	 *        the property that represents the component within the enclosing composite. May be null, if the instance
 	 *        that should be configured is the main instance.
-	 * @param containerContext
+	 * @param parentInstance
 	 *        additional information, if the element that should be configured is part of a container, e.g. an interceptor
 	 *        or an extension within the container.
 	 */
-	public void configureInstance(InstanceSpecification instance, Property componentPart, ContainerContext containerContext);
+	public void configureInstance(InstanceSpecification instance, Property componentPart, InstanceSpecification parentInstnace);
 }
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/InstanceConfigurator.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/InstanceConfigurator.java
index 2f111e1617f..acb0084e888 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/InstanceConfigurator.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/InstanceConfigurator.java
@@ -19,7 +19,6 @@ import org.eclipse.papyrus.FCM.ContainerRule;
 import org.eclipse.papyrus.FCM.UseInstanceConfigurator;
 import org.eclipse.papyrus.qompass.designer.core.Activator;
 import org.eclipse.papyrus.qompass.designer.core.deployment.DepUtils;
-import org.eclipse.papyrus.qompass.designer.core.transformations.ContainerContext;
 import org.eclipse.uml2.uml.Classifier;
 import org.eclipse.uml2.uml.InstanceSpecification;
 import org.eclipse.uml2.uml.Property;
@@ -31,54 +30,65 @@ import org.eclipse.uml2.uml.util.UMLUtil;
  */
 public class InstanceConfigurator {
 
-	public static final String IINSTANCE_CONFIG_ID = Activator.PLUGIN_ID + ".instanceConfig";
+	public static final String IINSTANCE_CONFIG_ID = Activator.PLUGIN_ID + ".instanceConfig"; //$NON-NLS-1$
 
+	public static boolean onNodeModel = false;
+	
 	/**
-	 * Configure an instance
+	 * Configure an instance. The configurator is selected by means of a stereotype on the classifier of
+	 * the passed instance. 
 	 * 
 	 * @see org.eclipse.papyrus.qompass.designer.core.extensions.IInstanceConfigurator
 	 * @param instance
 	 *        the specification of instance that should be configured
-	 * @param executorIS
-	 *        the instance specification of the executor (within a container)
 	 * @param componentPart
 	 *        the part representing the instance (before container expansion)
 	 * @param port
 	 *        a port within the context of container
 	 */
-	public static void configureInstance(InstanceSpecification instance, Property componentPart, ContainerContext containerContext) {
+	public static void configureInstance(InstanceSpecification instance, Property componentPart, InstanceSpecification parentInstance) {
 		Classifier component = DepUtils.getClassifier(instance);
 		UseInstanceConfigurator useInstanceConfigurator = UMLUtil.getStereotypeApplication(component, UseInstanceConfigurator.class);
-		configureInstance(useInstanceConfigurator, instance, componentPart, containerContext);
+		configureInstance(useInstanceConfigurator, instance, componentPart, parentInstance);
 	}
 
 	/**
-	 * Configure an instance
+	 * Configure an instance. The configurator is selected by means of a stereotype on the passed container rule.
 	 * 
 	 * @see org.eclipse.papyrus.qompass.designer.core.extensions.IInstanceConfigurator
+	 * @param rule
+	 * 		  the applied container rule
 	 * @param instance
 	 *        the specification of instance that should be configured
-	 * @param executorIS
-	 *        the instance specification of the executor (within a container)
 	 * @param componentPart
 	 *        the part representing the instance (before container expansion)
 	 * @param port
 	 *        a port within the context of container
 	 */
-	public static void configureInstance(ContainerRule rule, InstanceSpecification instance, Property componentPart, ContainerContext containerContext) {
+	public static void configureInstance(ContainerRule rule, InstanceSpecification instance, Property componentPart, InstanceSpecification parentInstance) {
 		UseInstanceConfigurator useInstanceConfigurator = UMLUtil.getStereotypeApplication(rule.getBase_Class(), UseInstanceConfigurator.class);
-		configureInstance(useInstanceConfigurator, instance, componentPart, containerContext);
+		configureInstance(useInstanceConfigurator, instance, componentPart, parentInstance);
 	}
 
-	public static void configureInstance(UseInstanceConfigurator useInstanceConfigurator, InstanceSpecification instance, Property componentPart, ContainerContext containerContext) {
+	/**
+	 * Configure an instance with a given configurator
+	 * 
+	 * @param useInstanceConfigurator
+	 * @param instance
+	 * @param componentPart
+	 * @param containerContext
+	 */
+	public static void configureInstance(UseInstanceConfigurator useInstanceConfigurator, InstanceSpecification instance, Property componentPart, InstanceSpecification parentInstance) {
 		if(useInstanceConfigurator != null) {
 			org.eclipse.papyrus.FCM.InstanceConfigurator instanceConfigurator = useInstanceConfigurator.getConfigurator();
-			if(instanceConfigurator != null) {
-				String id = instanceConfigurator.getBase_Class().getName();
-				IInstanceConfigurator iConfigurator = getInstanceConfigurator(id);
-				if(iConfigurator != null) {
-					iConfigurator.configureInstance(instance, componentPart, containerContext);
+			if (instanceConfigurator.isOnNodeModel() == onNodeModel) {
+				if(instanceConfigurator != null) {
+					String id = instanceConfigurator.getBase_Class().getName();
+					IInstanceConfigurator iConfigurator = getInstanceConfigurator(id);
+					if(iConfigurator != null) {
+						iConfigurator.configureInstance(instance, componentPart, parentInstance);
 
+					}
 				}
 			}
 		}
@@ -89,10 +99,10 @@ public class InstanceConfigurator {
 		IConfigurationElement[] configElements = reg.getConfigurationElementsFor(IINSTANCE_CONFIG_ID);
 		for(IConfigurationElement configElement : configElements) {
 			try {
-				final String iConfiguratorIDext = configElement.getAttribute("configuratorID");
+				final String iConfiguratorIDext = configElement.getAttribute("configuratorID"); //$NON-NLS-1$
 				if(iConfiguratorIDext.equals(iConfiguratorID)) {
 					// TODO: cache returned instance (avoid creating a new instance each time => more efficient, no need for static attributes)
-					final Object obj = configElement.createExecutableExtension("class");
+					final Object obj = configElement.createExecutableExtension("class"); //$NON-NLS-1$
 					if(obj instanceof IInstanceConfigurator) {
 						return (IInstanceConfigurator)obj;
 					}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/LanguageSupport.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/LanguageSupport.java
index 237f3403cee..812e516240d 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/LanguageSupport.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/extensions/LanguageSupport.java
@@ -15,8 +15,8 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtensionRegistry;
 import org.eclipse.core.runtime.Platform;
-
 import org.eclipse.papyrus.qompass.designer.core.Activator;
+import org.eclipse.papyrus.qompass.designer.core.Messages;
 import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationException;
 
 
@@ -25,7 +25,7 @@ import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationE
  */
 public class LanguageSupport {
 
-	public static final String ILANG_SUPPORT_ID = Activator.PLUGIN_ID + ".language";
+	public static final String ILANG_SUPPORT_ID = Activator.PLUGIN_ID + ".language"; //$NON-NLS-1$
 
 	public static ILangSupport getLangSupport(String language) throws TransformationException
 	{
@@ -33,10 +33,10 @@ public class LanguageSupport {
 		IConfigurationElement[] configElements = reg.getConfigurationElementsFor(ILANG_SUPPORT_ID);
 		for(IConfigurationElement configElement : configElements) {
 			try {
-				final String extLanguage = configElement.getAttribute("language");
+				final String extLanguage = configElement.getAttribute("language"); //$NON-NLS-1$
 				if(extLanguage.equals(language)) {
 					// TODO: cache returned instance (avoid creating a new instance each time => more efficient, no need for static attributes)
-					final Object obj = configElement.createExecutableExtension("class");
+					final Object obj = configElement.createExecutableExtension("class"); //$NON-NLS-1$
 					if(obj instanceof ILangSupport) {
 						return (ILangSupport)obj;
 					}
@@ -45,6 +45,6 @@ public class LanguageSupport {
 				exception.printStackTrace();
 			}
 		}
-		throw new TransformationException("Support for language " + language + "not configured for Qompass");
+		throw new TransformationException(String.format(Messages.LanguageSupport_LanguageNotSupported, language));
 	}
 }
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/generate/GenerateCode.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/generate/GenerateCode.java
index 6412e7dc2b1..eacb35cd9c7 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/generate/GenerateCode.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/generate/GenerateCode.java
@@ -19,6 +19,7 @@ import org.eclipse.emf.compare.match.service.MatchService;
 import org.eclipse.emf.compare.util.ModelUtils;
 */
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.qompass.designer.core.Messages;
 import org.eclipse.papyrus.qompass.designer.core.ModelManagement;
 import org.eclipse.papyrus.qompass.designer.core.extensions.ILangSupport;
 import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationException;
@@ -40,7 +41,7 @@ public class GenerateCode {
 	public void generate(InstanceSpecification node, String targetLanguage, boolean differential)
 		throws TransformationException, InterruptedException
 	{
-		String path = genMM.getPath(genProject, "model", null);
+		String path = genMM.getPath(genProject, "model", null); //$NON-NLS-1$
 		Package genModel = genMM.getModel();
 		EObject oldGenModel = null;
 		if(differential) {
@@ -109,12 +110,17 @@ public class GenerateCode {
 			*/
 		}
 		else {
-			monitor.setTaskName("generating " + targetLanguage + " code for node " + node.getName());
+			if (node == null) {
+				monitor.setTaskName(String.format(Messages.GenerateCode_GeneratingCode, targetLanguage));
+			}
+			else {
+				monitor.setTaskName(String.format(Messages.GenerateCode_GeneratingCodeForNode, targetLanguage, node.getName()));
+			}
 			IFolder folder = genProject.getFolder(genModel.getName());
 			try {
 				folder.delete(true, null);
 			} catch (CoreException e) {
-				throw new TransformationException("Could not delete old code: " + e.getMessage());
+				throw new TransformationException(String.format(Messages.GenerateCode_CouldNotDeleteOldCode, e.getMessage()));
 			}
 			langSupport.generateCode(monitor, genModel);
 		}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/InterfaceListener.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/InterfaceListener.java
index 1320251e6a7..f0d5b1a4f8c 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/InterfaceListener.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/InterfaceListener.java
@@ -22,7 +22,6 @@ import org.eclipse.papyrus.qompass.designer.core.sync.CompImplSync;
 import org.eclipse.uml2.uml.BehavioralFeature;
 import org.eclipse.uml2.uml.Class;
 import org.eclipse.uml2.uml.Interface;
-import org.eclipse.uml2.uml.NamedElement;
 
 public class InterfaceListener implements IPapyrusListener {
 
@@ -36,54 +35,29 @@ public class InterfaceListener implements IPapyrusListener {
 	private static InterfaceListener instance = null;
 
 	public void notifyChanged(Notification notification) {
-		Log.log(Status.INFO, Log.TRAFO_SYNC, "Interface adapter");
+		Log.log(Status.INFO, Log.TRAFO_SYNC, "Interface adapter"); //$NON-NLS-1$
 		int evtType = notification.getEventType();
 		Object notifier = notification.getNotifier();
-		String name = "";
-		if(notifier instanceof NamedElement) {
-			name = ((NamedElement)notifier).getName();
-		}
 		if(evtType == Notification.SET) {
-			Log.log(Status.INFO, Log.TRAFO_SYNC, "Interface.adapter, set " + name);
 			if(notifier instanceof Class) {
 				// UMLExecutor.addCCM_intf ((Class) notifier);
 			}
 		} else if(evtType == Notification.ADD) {
-			Log.log(Status.INFO, Log.TRAFO_SYNC, "Interface.adapter, add " + name);
 
 			if(notifier instanceof Interface) {
 				// Interface intf = (Interface) notifier;
 
-				// never executed? (since name is always unset when
-				// an operation is newly added)
-				/*
-				 * Object obj = notification.getNewValue ();
-				 * if (obj instanceof Operation) {
-				 * Operation operation = (Operation) obj;
-				 * 
-				 * if (operation.getName () == null) {
-				 * // no name yet, don't try to create behavior for it.
-				 * }
-				 * else {
-				 * CompTypeSync.delegateImplSync (intf, null);
-				 * }
-				 * }
-				 */
-				// registerOperations (intf);
+				// never executed since name is always unset when
+				// an operation is newly added
 			}
 		} else if(evtType == Notification.REMOVE) {
 			Object oldValue = notification.getOldValue();
 			if(oldValue instanceof BehavioralFeature) {
 				BehavioralFeature toBeRemoved = (BehavioralFeature)oldValue;
 
-				Log.log(Status.INFO, Log.TRAFO_SYNC, "Interface.adapter, remove " + toBeRemoved.getName() + " from " + name);
-
 				Interface intf = (Interface)notifier;
-				// TODO: share code? with UMLExecutor
 				CompImplSync.syncViaInterface(intf, toBeRemoved);
 			}
-		} else {
-			Log.log(Status.INFO, Log.TRAFO_SYNC, "Interface.adapter, code: " + notification.getEventType() + ", name: " + name);
 		}
 	}
 }
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/ModelListener.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/ModelListener.java
index 317572503ea..77477c02ef2 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/ModelListener.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/ModelListener.java
@@ -35,7 +35,7 @@ import org.eclipse.uml2.uml.Port;
 public class ModelListener implements IPapyrusListener {
 
 	public void notifyChanged(Notification notification) {
-		Log.log(Status.INFO, Log.TRAFO_SYNC, "ModelListener.notifyChanged: " + notification.getFeature());
+		Log.log(Status.INFO, Log.TRAFO_SYNC, String.format("ModelListener.notifyChanged: %s", notification.getFeature()));
 		Object notifier = notification.getNotifier();
 		if(notifier instanceof NamedElement) {
 			String name = ((NamedElement)notifier).getName();
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/OperationListener.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/OperationListener.java
index 7d9fc6a317f..eac4f307173 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/OperationListener.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/OperationListener.java
@@ -47,7 +47,7 @@ public class OperationListener implements IPapyrusListener {
 	public void notifyChanged(Notification notification) {
 		int evtType = notification.getEventType();
 		Object notifier = notification.getNotifier();
-		String name = "";
+		String name = ""; //$NON-NLS-1$
 		if(notifier instanceof NamedElement) {
 			name = ((NamedElement)notifier).getName();
 		}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/ParameterListener.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/ParameterListener.java
index a7f72a0875b..3b7dd67b671 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/ParameterListener.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/listeners/ParameterListener.java
@@ -39,7 +39,7 @@ public class ParameterListener implements IPapyrusListener {
 	public void notifyChanged(Notification notification) {
 		int evtType = notification.getEventType();
 		Object notifier = notification.getNotifier();
-		String name = "";
+		String name = ""; //$NON-NLS-1$
 		if(notifier instanceof NamedElement) {
 			name = ((NamedElement)notifier).getName();
 		}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/make/GenerateMakefile.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/make/GenerateMakefile.java
index 69b0e4264dc..d1b49d1c970 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/make/GenerateMakefile.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/make/GenerateMakefile.java
@@ -14,12 +14,12 @@
 
 package org.eclipse.papyrus.qompass.designer.core.make;
 
+import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 
-import org.eclipse.core.runtime.Status;
-import org.eclipse.papyrus.qompass.designer.core.Log;
+import org.eclipse.papyrus.qompass.designer.core.Activator;
 
 /*
  * TODO:
@@ -58,13 +58,13 @@ public class GenerateMakefile {
 		ArrayList<String> nodeList = new ArrayList<String>();
 		ArrayList<String> nodeSources = new ArrayList<String>();
 
-		ShowFiles showFiles = new ShowFiles("/local/home/ansgar/workspace-v3.3/TestCppProject/AluSocketGen");
+		ShowFiles showFiles = new ShowFiles("/local/home/ansgar/workspace-v3.3/TestCppProject/AluSocketGen"); //$NON-NLS-1$
 
 		showFiles.getFilesRec(fileList, folderList);
 		nodeList = showFiles.findNodesDir(folderList);
 		for(String node : nodeList) {
 			nodeSources = showFiles.getNodeSources(fileList, node);
-			String nodePath = showFiles.getRootPath() + "/" + node + "/Makefile";
+			String nodePath = showFiles.getRootPath() + File.pathSeparator + node + File.pathSeparator + "Makefile"; //$NON-NLS-1$
 			createFileList(nodePath, nodeSources, node);
 		}
 	}
@@ -87,32 +87,32 @@ public class GenerateMakefile {
 
 			FileOutputStream writer = new java.io.FileOutputStream(makefile);
 
-			writer.write("include $(ACCORD_ROOT)/Makefile.defs\n\n".getBytes());
-			writer.write(("NAME=" + NodeName + "\n\n").getBytes());
+			writer.write("include $(ACCORD_ROOT)/Makefile.defs\n\n".getBytes()); //$NON-NLS-1$
+			writer.write(("NAME=" + NodeName + "\n\n").getBytes()); //$NON-NLS-1$ //$NON-NLS-2$
 
 			// Calculate list of sources
-			writer.write("SRCS=\\\n".getBytes());
+			writer.write("SRCS=\\\n".getBytes()); //$NON-NLS-1$
 
 			if(cppFileList != null && cppFileList.size() != 0) {
 
 				// Calculate list of .cpp files
 				for(int i = 0; i < cppFileList.size(); i++) {
-					writer.write(("\t" + cppFileList.get(i)).getBytes());
+					writer.write(("\t" + cppFileList.get(i)).getBytes()); //$NON-NLS-1$
 					if(i < cppFileList.size() - 1) {
 						// add \ to all but last item
-						writer.write("\\".getBytes());
+						writer.write("\\".getBytes()); //$NON-NLS-1$
 					}
-					writer.write("\n".getBytes());
+					writer.write("\n".getBytes()); //$NON-NLS-1$
 				}
 			}
-			writer.write("\n".getBytes());
+			writer.write("\n".getBytes()); //$NON-NLS-1$
 
-			writer.write("include $(ACCORD_ROOT)/Makefile.rules".getBytes());
+			writer.write("include $(ACCORD_ROOT)/Makefile.rules".getBytes()); //$NON-NLS-1$
 
 			writer.flush();
 			writer.close();
 		} catch (IOException e) {
-			Log.log(Status.ERROR, Log.UTILS, "error during writing of makefile: " + e.getMessage());
+			Activator.log.error(e);
 		}
 	}
 }
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/make/ShowFiles.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/make/ShowFiles.java
index 85a79f0fac5..c453cab0b4c 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/make/ShowFiles.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/make/ShowFiles.java
@@ -56,7 +56,7 @@ public class ShowFiles {
 				getFilesRec(fileList, folderList, file.toString());
 				folderList.add(file.toString());
 			} else {
-				if(file.toString().endsWith(".cpp")) {
+				if(file.toString().endsWith(".cpp")) { //$NON-NLS-1$
 					// found a C++ file
 					fileList.add(file.toString());
 				}
@@ -71,10 +71,10 @@ public class ShowFiles {
 	public ArrayList<String> findNodesDir(ArrayList<String> folderList) {
 		ArrayList<String> allNodes = new ArrayList<String>();
 		for(String dir : folderList) {
-			String tmp = dir.replaceFirst(m_rootPath, "");
+			String tmp = dir.replaceFirst(m_rootPath, ""); //$NON-NLS-1$
 			// all the nodes are at the level (ACCORD_ROOT + 1)
-			tmp = tmp.trim().replaceFirst("/", "");
-			if(!tmp.contains("/")) {
+			tmp = tmp.trim().replaceFirst(File.pathSeparator, ""); //$NON-NLS-1$
+			if(!tmp.contains(File.pathSeparator)) {
 				allNodes.add(tmp.trim());
 			}
 		}
@@ -94,7 +94,7 @@ public class ShowFiles {
 				// path is related to given node 
 				int index = filePath.indexOf(nodeName);
 				String tmp = filePath.substring(index);
-				index = tmp.indexOf("/");
+				index = tmp.indexOf(File.pathSeparator);
 				tmp = tmp.substring(index + 1);
 				sourceFilesPath.add(tmp.trim());
 			}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/messages.properties b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/messages.properties
new file mode 100644
index 00000000000..c237acc8ada
--- /dev/null
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/messages.properties
@@ -0,0 +1,86 @@
+BootLoaderGen_AtLeastOneBlockingCall=There must be at most one blocking "run" operation per node. Not adding "run" call for component instance %s. Existing invocations: %s
+BootLoaderGen_CannotRetrieveTemplate=Cannot retrieve bootLoader template (should be in %s)
+CommandSupport_NoEditingDomain=Can not get editing domain
+CommandSupport_ErrorDuringCmdExec=Error during command execution
+ConfigUtils_RuleWithoutBaseClass=A container rule has no base class (broken model library?)
+DepCreation_CannotFindImplementation=cannot find suitable implementation for instance <%s> (given type <%s>)
+DepCreation_CircularReference=Class %s is referenced in a circle\! Thus, an infinite number of instance specifications would be required.\nrecursion path: 
+DepCreation_DefiningFeatureNull=The defining feature of a slot of instance %s is null
+DepCreation_FCMconnectorWithoutBaseClass=An FCM connector has no base class. Check for broken model library
+DepCreation_InfoCreateDepPlan=DepCreation.createDepPlan: %s
+DepCreation_TypeInAttributeUndefined=type of attribute %s within class %s is not defined
+Deploy_0=Cannot find implementation for instance %s
+Description_NoAvail=not available
+
+LWContainerTrafo_CannotApplyRule=Cannot apply container rule <%s>, since the type of one of its parts is undefined. Check for unresolved proxies in imports
+
+TemplateUtils_InfoCreateBoundPackage=create bound package (fixed binding): %s within %s
+TemplateUtils_InfoGetActualFrom=TemplateInstantiation.getActualFromBinding: substitution formal = %s
+TemplateUtils_NoTemplateSignature=no template signature found for %s
+
+ConnectorBinding_InfoConnPortConnectedVia=connector port <%s> is connected via <%s>
+ConnectorBinding_CannotFindBinding=error: can not find a binding for formal parameter %s in the context of composite %s, connector %s and (connector) template %s.
+ConnectorBinding_CannotFindBindingForPort=Cannot find a binding for port %s of connector %s.
+ConnectorBinding_CannotFindConsistentBinding=cannot find a consistent binding for port %s of connector %s (in %s). Formal already bound to type %s
+ConnectorBinding_ConnectorsPort=connects port, otherInterface = %s
+ConnectorBinding_FormalAlreadyBound=Formal already bound to type %s
+ConnectorBinding_InfoActualReturnIntfIs=actual return interface: %s
+ConnectorBinding_InfoConnectsPort=connects port, otherInterface = %s
+ConnectorBinding_InfoCreateBoundPackage=create bound package %s within %s
+ConnectorBinding_InfoMatchOtherEnd=matchOtherEnd: port %s
+ConnectorBinding_InfoProvidedPortTypeMatches=getActual: provided port type matches, port %s.
+ConnectorBinding_NoTemplateSignature=ConnectorBinding: no template signature found for %s
+ConnectorReification_CannotFindMatchingPort=Connector reification: cannot find a matching port on reified connector %s for port %s. This should not happen and indicates an internal tool chain error.
+ConnectorReification_CouldNotBind=could not bind connector implementation template <%s>
+ConnectorReification_CouldNotConnectPort=Error: could not connect connector port <%s>.
+ConnectorReification_CouldNotConnectPortOfType=Error: could not connect connector port <%s> of type <%s>.
+ConnectorReification_InfoAddConnectorPart=ConnectorReification, add part with connector implementation template <%s> and implementation <%s>
+ConnectorReification_InfoPortTypes=ConnectorReification: otherPort type: <%s> - port <%s>.
+ConnectorReification_RequiresUseOfPorts=Connector reification requires the use of ports (otherwise, the ports of the reified connector can not be assigned unambiguously
+ConnectorReification_TemplateTypeNotClass=template type is not a class
+GenerateCode_CouldNotDeleteOldCode=Could not delete old code: %s
+GenerateCode_GeneratingCode=generating %s code
+GenerateCode_GeneratingCodeForNode=generating %s code for node %s
+
+LanguageSupport_LanguageNotSupported=Support for language %s not configured for Qompass
+TemplateInstantiation_TemplateIsNull=Passed template element is null
+
+TemplateInstantiationListener_TrafoException=TransformationException: %s
+
+CompImplTrafos_CannotFindType=Can not find type %s. Thus, unable to create suitable connect operation in component to OO transformation.
+CompImplTrafos_IntfNotImplemented=Interface <%s> provided by port <%s> of class <%s> is not implemented by the component itself nor does the port delegate to a part
+CompTypeTrafos_CannotFindType=Can not find type <%s>. Thus, unable to create suitable connect operation in component to OO transformation
+
+ContainerTrafo_CannotApplyRule=Cannot apply container rule <%s>, since the type of one of its parts is undefined. Check for unresolved proxies in imports
+ContainerTrafo_CannotFindDelegationConn=(during interceptor transformation for container): cannot find existing delegation connector
+ContainerTrafo_InterceptionRuleButNoInterceptor=The part %s in rule %s has an interceptionRule, but is not typed with an interaction component
+InstantiateDepPlan_AcceleoErrors=Acceleo errors occured
+InstantiateDepPlan_AcceleoErrorsCheckLog=Acceleo errors occured during code generation. Please check the error log
+InstantiateDepPlan_CannotGenModel=Cannot generate model
+InstantiateDepPlan_CheckInputImportPkg=An imported package is null. Verify the imported packages
+InstantiateDepPlan_CheckInputImportPkgNoRes=An imported package has no eResource. Verify imported packages
+InstantiateDepPlan_CheckInputModelProfile3=Check input model: profile <%s> is not contained in a resource
+InstantiateDepPlan_CheckInputModelProfileNoRes=Check input model: the applied profile with URI <%s> has no name and is not contained in a resource
+InstantiateDepPlan_CheckInputModelProfileNoResNoName=Check input model: one of the applied profiles has no name and is not contained in a resource
+InstantiateDepPlan_ConsultConsole=Consult error log or console for details
+InstantiateDepPlan_DepPlanStereotypeNotInitialized=The stereotype attribute <deploymentPlan> of configuration <%s> is not initialized.
+InstantiateDepPlan_ErrorsDuringTransformation=An error occurred during transformation
+InstantiateDepPlan_IllegalArgumentDuringCopy=An Illegal argument exception occured during the copy of profile applications. This may indicate that the original model contains an invalid profile application\n\n
+InstantiateDepPlan_InfoApplyProfile=apply profile 
+InstantiateDepPlan_InfoDeployingForNode=deploying for node %s
+InstantiateDepPlan_InfoExpandingConnectors=expanding connectors and containers
+InstantiateDepPlan_InfoGeneratingModel=Generating deployment model ...
+InstantiateDepPlan_InfoImportPackage=import package %s
+InstantiateDepPlan_InfoNoneAllocated=None of the instances in the deployment plan is allocated to a node. Verify the node allocation.
+InstantiateDepPlan_TransformationException=A transformation exception occurred
+MainModelTrafo_ChangePartType=change type of part <%s> due to container trafo
+MainModelTrafo_NoDefiningFeature=Error: no defining feature associated with <%s>.
+MainModelTrafo_NoInstanceAssociated=Error: no instance is associated with slot for feature <%s>.
+
+CompImplSync_InfoSyncIntf=interface rel-ship %s
+CompImplSync_InfoSyncViaImpl=Sync. type and implementation
+CompImplSync_InfoSyncViaType=syncViaType => implementation %s
+
+DepPlanUtils_CannotFindAttribute=cannot find attribute %s in classifier %s
+DepPlanUtils_ConfigOfPropertyFailed=configuration of property %s failed: type is not a string
+UpdateUtils_CannotApplyFCMstereo=cannot apply FCM stereotype. Check whether profile is applied
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/preferences/QompassPreferenceConstants.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/preferences/QompassPreferenceConstants.java
index 1bb7805538e..c7a4169ea37 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/preferences/QompassPreferenceConstants.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/preferences/QompassPreferenceConstants.java
@@ -22,12 +22,12 @@ public class QompassPreferenceConstants {
 	 * For attributes, the default "aggregation kind" value is "none". When this option is set
 	 * it will be treated as composite
 	 */
-	public static final String P_TREAT_NONE_AS_COMPOSITE = "treatNoneAsComposite";
+	public static final String P_TREAT_NONE_AS_COMPOSITE = "treatNoneAsComposite"; //$NON-NLS-1$
 
-	public static final String P_ALL_ATTRIBUTES_ARE_CONFIG_ATTRIBUTES = "allAttributesAreConfigAttributes";
+	public static final String P_ALL_ATTRIBUTES_ARE_CONFIG_ATTRIBUTES = "allAttributesAreConfigAttributes"; //$NON-NLS-1$
 
-	public static final String P_SHOW_PROV_REQ_AS_PORT_ICONS = "showProvReqAsPortIcons";
+	public static final String P_SHOW_PROV_REQ_AS_PORT_ICONS = "showProvReqAsPortIcons"; //$NON-NLS-1$
 
-	public static final String P_CODE_GEN_PREFIX = "codeGenPrefix";
+	public static final String P_CODE_GEN_PREFIX = "codeGenPrefix"; //$NON-NLS-1$
 
 }
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/sync/CompImplSync.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/sync/CompImplSync.java
index 29e574fcd4c..7ca8f25f993 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/sync/CompImplSync.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/sync/CompImplSync.java
@@ -24,6 +24,7 @@ import org.eclipse.papyrus.FCM.DerivedElement;
 import org.eclipse.papyrus.qompass.designer.core.CommandSupport;
 import org.eclipse.papyrus.qompass.designer.core.ConnectorUtils;
 import org.eclipse.papyrus.qompass.designer.core.Log;
+import org.eclipse.papyrus.qompass.designer.core.Messages;
 import org.eclipse.papyrus.qompass.designer.core.OperationUtils;
 import org.eclipse.papyrus.qompass.designer.core.PortInfo;
 import org.eclipse.papyrus.qompass.designer.core.PortUtils;
@@ -86,7 +87,7 @@ public class CompImplSync {
 			InterfaceRealization ir = (InterfaceRealization)relationship;
 			Classifier cl = ir.getImplementingClassifier();
 			if(cl instanceof Class) {
-				Log.log(Status.INFO, Log.TRAFO_SYNC, "interface rel-ship:" + cl.getName());
+				Log.log(Status.INFO, Log.TRAFO_SYNC, String.format(Messages.CompImplSync_InfoSyncIntf, cl.getName()));
 				Class implementation = (Class)cl;
 				// syncRealizations (implementation);
 				CompImplSync.interfaceModifications(implementation, toBeRemoved);
@@ -113,7 +114,7 @@ public class CompImplSync {
 				foundGeneralization = true;
 				Classifier cl = ((Generalization)relationship).getSpecific();
 				if(cl instanceof Class) {
-					Log.log(Status.INFO, Log.TRAFO_SYNC, "syncViaType => implementation: " + cl.getName());
+					Log.log(Status.INFO, Log.TRAFO_SYNC, String.format(Messages.CompImplSync_InfoSyncViaType, cl.getName()));
 					Class implementation = (Class)cl;
 					updatePorts(implementation);
 					if(Utils.isCompImpl(cl)) {
@@ -192,9 +193,9 @@ public class CompImplSync {
 	protected static String calcRealizationName(Interface providedIntf) {
 		String name = providedIntf.getName();
 		if(name == null) {
-			name = "undefined";
+			name = "undefined"; //$NON-NLS-1$
 		}
-		return "derived realization of " + name;
+		return "derived realization of " + name; //$NON-NLS-1$
 	}
 
 	/**
@@ -287,7 +288,7 @@ public class CompImplSync {
 			String name = ir.getName();
 			// automatically added interface realization is identified via its name (simpler
 			// compared to use of stereotype)
-			if((name != null) && name.startsWith("derived")) {
+			if((name != null) && name.startsWith("derived")) { //$NON-NLS-1$
 				Interface inheritedIntf = ir.getContract();
 				if(!providedIntfs.contains(inheritedIntf)) {
 					toBeRemoved.add(ir);
@@ -296,7 +297,7 @@ public class CompImplSync {
 		}
 		if(toBeRemoved.size() > 0) {
 			// remove InterfaceRealization, since not part of provided interfaces
-			CommandSupport.exec(TransactionUtil.getEditingDomain(implementation), "Sync. type and implementation", new Runnable() {
+			CommandSupport.exec(TransactionUtil.getEditingDomain(implementation), Messages.CompImplSync_InfoSyncViaImpl, new Runnable() {
 
 				public void run() {
 					// implCopy = implementation;
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/sync/DepPlanSync.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/sync/DepPlanSync.java
index 694b393579d..7a488449b4e 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/sync/DepPlanSync.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/sync/DepPlanSync.java
@@ -92,7 +92,7 @@ public class DepPlanSync {
 		for(Slot slot : instance.getSlots()) {
 			InstanceSpecification subInstance = DepUtils.getInstance(slot);
 			if(subInstance != null) {
-				addCDP(depPlan, subInstance, canonicalName + "." + slot.getDefiningFeature().getName());
+				addCDP(depPlan, subInstance, canonicalName + "." + slot.getDefiningFeature().getName()); //$NON-NLS-1$
 			}
 		}
 		for(Property attribute : Utils.getParts(implementation)) {
@@ -101,7 +101,7 @@ public class DepPlanSync {
 				if(!hasSlot(instance, attribute)) {
 					try {
 						InstanceSpecification partIS =
-							DepCreation.createDepPlan(depPlan, (Class)type, instance.getName() + "." + attribute.getName(), true);
+							DepCreation.createDepPlan(depPlan, (Class)type, instance.getName() + "." + attribute.getName(), true); //$NON-NLS-1$
 						DepPlanUtils.createSlot(depPlan, instance, partIS, attribute);
 					} catch (TransformationException e) {
 						Log.log(Status.ERROR, Log.DEPLOYMENT, e.getMessage());
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/BindingUtils.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/BindingUtils.java
new file mode 100644
index 00000000000..67aedf7fa24
--- /dev/null
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/BindingUtils.java
@@ -0,0 +1,134 @@
+/*****************************************************************************
+ * 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:
+ *  Ansgar Radermacher  ansgar.radermacher@cea.fr  
+ *
+ */
+
+ package org.eclipse.papyrus.qompass.designer.core.templates;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.papyrus.C_Cpp.ConstInit;
+import org.eclipse.papyrus.qompass.designer.core.Messages;
+import org.eclipse.papyrus.qompass.designer.core.PortUtils;
+import org.eclipse.papyrus.qompass.designer.core.acceleo.AcceleoDriverWrapper;
+import org.eclipse.papyrus.qompass.designer.core.transformations.Copy;
+import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationContext;
+import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationException;
+import org.eclipse.uml2.uml.Class;
+import org.eclipse.uml2.uml.Classifier;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Interface;
+import org.eclipse.uml2.uml.NamedElement;
+import org.eclipse.uml2.uml.OpaqueBehavior;
+import org.eclipse.uml2.uml.Operation;
+import org.eclipse.uml2.uml.Parameter;
+import org.eclipse.uml2.uml.Port;
+import org.eclipse.uml2.uml.Type;
+import org.eclipse.uml2.uml.util.UMLUtil;
+
+public class BindingUtils {
+	
+	public static Operation instantiateOperation(Copy copy, Element actual, Operation operation, Class boundClass) {
+		try {
+			Operation newOperation = copy.getCopy(operation);
+			if(actual instanceof Operation) {
+				for(Parameter parameter : ((Operation)actual).getOwnedParameters()) {
+					Parameter newParam = EcoreUtil.copy(parameter); // copy parameter via EcoreUtil
+					newParam.setType(copy.getCopy(parameter.getType()));
+					newOperation.getOwnedParameters().add(newParam);
+				}
+			}
+			TransformationContext.classifier = newOperation.getClass_();
+			if(actual instanceof Classifier) {
+				bindOperation(newOperation, (Classifier)actual);
+			}
+			String newName = AcceleoDriverWrapper.evaluate(operation.getName(), actual, null);
+			newOperation.setName(newName);
+
+			return newOperation;
+		} catch (TransformationException e) {
+			// throw runtime exception
+			throw new RuntimeException(String.format(Messages.TemplateInstantiationListener_TrafoException, e.getMessage()));
+		}
+	}
+
+	/**
+	 * Instantiate a behavior
+	 * @param copy copier
+	 * @param actual actual in template instantiation
+	 * @param opaqueBehavior behavior with body in form of an Acceleo template.
+	 * @return instantiated (bound) behavior.
+	 * @throws TransformationException
+	 */
+	public static OpaqueBehavior instantiateBehavior(Copy copy, Element actual, OpaqueBehavior opaqueBehavior) throws TransformationException {
+		OpaqueBehavior newBehavior = copy.getCopy(opaqueBehavior);
+		if(actual instanceof NamedElement) {
+			String newName = AcceleoDriverWrapper.evaluate(opaqueBehavior.getName(), actual, null);
+			newBehavior.setName(newName);
+		}
+		EList<String> bodyList = newBehavior.getBodies();
+		for(int i = 0; i < bodyList.size(); i++) {
+			String body = bodyList.get(i);
+			TransformationContext.classifier = (Classifier)newBehavior.getOwner();
+			// pass qualified operation name as template name. Used to identify script in case of an error
+			String newBody = AcceleoDriverWrapper.evaluate(body, newBehavior.getQualifiedName(), actual, null);
+			bodyList.set(i, newBody);
+		}
+		return newBehavior;
+	}
+
+
+
+	/**
+	 * Bind C++ const initializer
+	 * 
+	 * @param operation
+	 * @param actual
+	 * @throws TransformationException
+	 */
+	public static void bindOperation(Operation operation, Classifier actual) throws TransformationException {
+		// perform binding in case of C++ initializer
+		ConstInit cppConstInit = UMLUtil.getStereotypeApplication(operation, ConstInit.class);
+		if(cppConstInit != null) {
+			// TODO: specific to C++
+			String init = cppConstInit.getInitialisation();
+			String newInit = AcceleoDriverWrapper.bind(init, actual);
+			cppConstInit.setInitialisation(newInit);
+		}
+	}
+
+	/**
+	 * @param actual
+	 *        the actual template parameter
+	 * @param boundClass
+	 *        the bound class
+	 * @param provides
+	 *        true, if the provided interface should be returned
+	 * @return the provided or required interface of a port (of the passed
+	 *         boundClass) that is typed with the the actual.
+	 */
+	public static Interface getInterfaceFromPortTypedWithActual(Type actual, Class boundClass, boolean provided) {
+		for(Port port : PortUtils.getAllPorts(boundClass)) {
+			Interface provOrReqIntf;
+			if(provided) {
+				provOrReqIntf = PortUtils.getProvided(port);
+			} else {
+				provOrReqIntf = PortUtils.getRequired(port);
+			}
+
+			if((port.getType() == actual) && (provOrReqIntf != null)) {
+				return provOrReqIntf;
+			}
+		}
+		return null;
+	}
+}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/ConnectorBinding.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/ConnectorBinding.java
index 61a47493b7d..888cb0d89da 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/ConnectorBinding.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/ConnectorBinding.java
@@ -22,6 +22,7 @@ import org.eclipse.emf.common.util.EList;
 import org.eclipse.papyrus.qompass.designer.core.ConnectorUtils;
 import org.eclipse.papyrus.qompass.designer.core.CreationUtils;
 import org.eclipse.papyrus.qompass.designer.core.Log;
+import org.eclipse.papyrus.qompass.designer.core.Messages;
 import org.eclipse.papyrus.qompass.designer.core.PortUtils;
 import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationContext;
 import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationException;
@@ -83,8 +84,8 @@ public class ConnectorBinding {
 		// the template provides the formal parameter at one of its ports. Now examine
 		// with whom this port is connected, i.e. examine all connectorEnds
 		// The type of the connected port determines the binding.
-		Log.log(Status.INFO, Log.TEMPLATE_BINDING, "  getActual: " + (isProvided ? "provided" : "required") +
-			" port type matches, port = " + port.getName());
+		Log.log(Status.INFO, Log.TEMPLATE_BINDING, String.format(
+				"", port.getName())); //$NON-NLS-1$
 
 		for(ConnectorEnd connEnd : connector.getEnds()) {
 			// the connector end targets a port of a part or the composite (in case of delegation)
@@ -102,14 +103,16 @@ public class ConnectorBinding {
 				} else {
 					otherInterface = PortUtils.getProvided(otherPort);
 				}
-				Log.log(Status.INFO, Log.TEMPLATE_BINDING, "connects port, otherInterface = " + otherInterface);
+				Log.log(Status.INFO, Log.TEMPLATE_BINDING, String.format(Messages.ConnectorBinding_ConnectorsPort, otherInterface));
 				if(otherInterface != null) {
 					if(actual == null) {
 						actual = otherInterface;
-						Log.log(Status.INFO, Log.TEMPLATE_BINDING, "actual return interface: " + actual.getQualifiedName());
+						Log.log(Status.INFO, Log.TEMPLATE_BINDING, String.format(
+							Messages.ConnectorBinding_InfoActualReturnIntfIs, actual.getQualifiedName()));
 					} else if(actual != otherInterface) {
-						throw new TransformationException("cannot find a consistent binding for port " + port.getName() +
-							" of connector " + connector.getName() + ". Formal already bound to type \"" + actual.getName() + "\"");
+						throw new TransformationException(String.format(
+							Messages.ConnectorBinding_CannotFindConsistentBinding,
+							port.getName(), connector.getName(), connector.getNamespace().getName(), actual.getName()));
 					}
 				}
 			}
@@ -122,8 +125,8 @@ public class ConnectorBinding {
 		// the template provides the formal parameter at one of its ports. Now examine
 		// with whom this port is connected, i.e. examine all connectors of the
 		// composite. The type of the connected port determines the binding.
-		Log.log(Status.INFO, Log.TEMPLATE_BINDING, "  getActual: " + (isProvided ? "provided" : "required") +
-			" port type matches, port = " + port.getName());
+		Log.log(Status.INFO, Log.TEMPLATE_BINDING, String.format(
+				Messages.ConnectorBinding_InfoMatchOtherEnd, port.getName()));
 
 		for(Connector connector : partConnector.getClass_().getOwnedConnectors()) {
 			if(ConnectorUtils.connectsPart(connector, partConnector)) {
@@ -143,14 +146,16 @@ public class ConnectorBinding {
 					} else {
 						otherInterface = PortUtils.getProvided(otherPort);
 					}
-					Log.log(Status.INFO, Log.TEMPLATE_BINDING, "connects port, otherInterface = " + otherInterface);
+					Log.log(Status.INFO, Log.TEMPLATE_BINDING, String.format(Messages.ConnectorBinding_InfoConnectsPort, otherInterface));
 					if(otherInterface != null) {
 						if(actual == null) {
 							actual = otherInterface;
-							Log.log(Status.INFO, Log.TEMPLATE_BINDING, "actual return interface: " + actual.getQualifiedName());
+							Log.log(Status.INFO, Log.TEMPLATE_BINDING, String.format(
+								Messages.ConnectorBinding_InfoActualReturnIntfIs, actual.getQualifiedName()));
 						} else if(actual != otherInterface) {
-							throw new TransformationException("cannot find a consistent binding for port " + port.getName() +
-								" of connector " + connector.getName() + ". Formal already bound to type \"" + actual.getName() + "\"");
+							throw new TransformationException(String.format(
+									Messages.ConnectorBinding_CannotFindConsistentBinding,
+								port.getName(), connector.getName(), connector.getNamespace().getName(), actual.getName()));
 						}
 					}
 				}
@@ -216,7 +221,8 @@ public class ConnectorBinding {
 				// the template provides the formal parameter at one of its ports. Now examine
 				// with whom this port is connected, i.e. examine all ends of the
 				// connector. The type of the connected port determines the binding.
-				Log.log(Status.INFO, Log.TEMPLATE_BINDING, "  getActual: provided port type matches, port = " + port.getName());
+				Log.log(Status.INFO, Log.TEMPLATE_BINDING, String.format(
+						Messages.ConnectorBinding_InfoProvidedPortTypeMatches, port.getName()));
 				boolean found = false;
 
 				if(partOrConnector instanceof Property) {
@@ -253,18 +259,20 @@ public class ConnectorBinding {
 	}
 
 	protected static String createErrorMsg(Port port, Feature partOrConnector) {
-		String errorMsg = "Cannot find a binding for port " + port.getName() + " of connector '" + partOrConnector.getName() + "'";
+		String errorMsg = String.format(
+				Messages.ConnectorBinding_CannotFindBindingForPort,
+				port.getName(), partOrConnector.getName()); 
 		for(Classifier cl : partOrConnector.getFeaturingClassifiers()) {
-			errorMsg += " of class '" + cl.getName() + "'";
+			errorMsg += " of class '" + cl.getName() + "'"; //$NON-NLS-1$ //$NON-NLS-2$
 		}
-		errorMsg += ". ";
+		errorMsg += ". "; //$NON-NLS-1$
 		return errorMsg;
 	}
 
 	private static Type matchViaEnd(ConnectorEnd connEnd, Port port, Feature partOrConnector, Type actual) throws
 		TransformationException {
 		String errorMsg = createErrorMsg(port, partOrConnector);
-		Log.log(Status.INFO, Log.TEMPLATE_BINDING, "port: " + port);
+		Log.log(Status.INFO, Log.TEMPLATE_BINDING, "port: " + port); //$NON-NLS-1$
 		// Log.log(Status.INFO, Log.TEMPLATE_BINDING, "role1: " + connector.getEnds().get(0).getRole());
 		// Log.log(Status.INFO, Log.TEMPLATE_BINDING, "role2: " + connector.getEnds().get(1).getRole());
 
@@ -272,8 +280,9 @@ public class ConnectorBinding {
 		if(connElem instanceof Port) {
 			Port otherPort = (Port)connElem;
 
-			Log.log(Status.INFO, Log.TEMPLATE_BINDING, "  getActual, connector port <" + port.getName() + "> is connected via <" +
-				partOrConnector.getName() + ">");
+			Log.log(Status.INFO, Log.TEMPLATE_BINDING, String.format(
+					Messages.ConnectorBinding_InfoConnPortConnectedVia,
+					port.getName(), partOrConnector.getName()));
 			Type otherType = otherPort.getType();
 
 
@@ -296,11 +305,13 @@ public class ConnectorBinding {
 			if(otherType != null) {
 				if(actual == null) {
 					actual = otherType;
-					Log.log(Status.INFO, Log.TEMPLATE_BINDING, "actual return interface: " + actual.getQualifiedName());
+					Log.log(Status.INFO, Log.TEMPLATE_BINDING, String.format(
+							Messages.ConnectorBinding_InfoActualReturnIntfIs, actual.getQualifiedName()));
 				} else if(actual != otherType) {
-					throw new TransformationException(errorMsg + ". Formal already bound to type " + actual.getName() + ".");
-				}
-			}
+					throw new TransformationException(errorMsg + " " + String.format( //$NON-NLS-1$
+							Messages.ConnectorBinding_FormalAlreadyBound, actual.getName()));
+					}
+			}		
 		}
 		return actual;
 	}
@@ -331,7 +342,8 @@ public class ConnectorBinding {
 		if(signature == null) {
 			// not a template. This is not an exception, caller need to handle "null" a return
 			// value indicating that no template instantiation needs to be done.
-			Log.log(Status.INFO, Log.TEMPLATE_BINDING, "ConnectorBinding: no template signature found for " + template.getName()); //$NON-NLS-1$
+			Log.log(Status.INFO, Log.TEMPLATE_BINDING, String.format(
+					Messages.ConnectorBinding_NoTemplateSignature, template.getName()));
 			return null;
 		}
 
@@ -372,10 +384,10 @@ public class ConnectorBinding {
 				// binding within the Qompass context.
 				if(formal instanceof NamedElement) {
 					NamedElement formalNE = (NamedElement)formal;
-					if((formal instanceof Class) && (formalNE.getName().equals("T"))) {
+					if((formal instanceof Class) && (formalNE.getName().equals("T"))) { //$NON-NLS-1$
 						actual = composite;
 					}
-					if((formal instanceof Port) && (formalNE.getName().equals("P"))) {
+					if((formal instanceof Port) && (formalNE.getName().equals("P"))) { //$NON-NLS-1$
 						// port (but not available?)
 						actual = TransformationContext.port;
 					}
@@ -383,13 +395,11 @@ public class ConnectorBinding {
 			}
 			if(actual instanceof NamedElement) {
 				actuals.add(actual);
-				name = name + "_" + ((NamedElement)actual).getName();
+				name = name + "_" + ((NamedElement)actual).getName(); //$NON-NLS-1$
 			} else {
-				String reason = "error: can not find a binding for formal parameter " +
-					((NamedElement)formal).getName() + " in the context of ";
-				reason += "composite " + composite.getName() +
-					", connector " + connector.getName() +
-					" and (connector) template " + template.getName();
+				String reason = String.format(
+					Messages.ConnectorBinding_CannotFindBinding,
+					((NamedElement)formal).getName(), composite.getName(), connector.getName(), template.getName());
 				throw new TransformationException(reason);
 			}
 		}
@@ -408,8 +418,8 @@ public class ConnectorBinding {
 			// class does not exist yet, needs to be created.
 			boundPackage = ((Package)owner).createNestedPackage(name);
 
-			Log.log(Status.INFO, Log.TEMPLATE_BINDING, "create bound package: " + name +
-				" within " + owner.getName());
+			Log.log(Status.INFO, Log.TEMPLATE_BINDING, String.format(
+				Messages.ConnectorBinding_InfoCreateBoundPackage, name, owner.getName()));
 		}
 
 		TemplateBinding binding = boundPackage.getTemplateBinding(signature);
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/InstantiateCppInclude.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/InstantiateCppInclude.java
index 9c276782ae7..4fcbc12df1f 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/InstantiateCppInclude.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/InstantiateCppInclude.java
@@ -41,7 +41,6 @@ public class InstantiateCppInclude implements CopyListener {
 
 	public void init(TemplateBinding binding, Object[] args) {
 		this.binding = binding;
-		this.args = args;
 	}
 
 	public EObject copyEObject(Copy copy, EObject targetEObj) {
@@ -50,9 +49,9 @@ public class InstantiateCppInclude implements CopyListener {
 			// TODO: C++ specific code!
 			Classifier targetCl = (Classifier)targetEObj;
 			try {
-				Classifier actual = TemplateInstantiationListener.getFirstActualFromBinding(binding, targetCl);
-				if(actual != null) {
-					Include cppInclude = UMLUtil.getStereotypeApplication(targetCl, Include.class);
+				Classifier actual = TemplateUtils.getFirstActualFromBinding(binding);
+				Include cppInclude = UMLUtil.getStereotypeApplication(targetCl, Include.class);
+				if((actual != null) && (cppInclude != null)) {
 					TransformationContext.classifier = targetCl;
 					String newBody = AcceleoDriverWrapper.evaluate(cppInclude.getBody(), actual, null);
 					String newPreBody = AcceleoDriverWrapper.evaluate(cppInclude.getPreBody(), actual, null);
@@ -74,6 +73,4 @@ public class InstantiateCppInclude implements CopyListener {
 	private TemplateBinding binding;
 
 	// private Copy copy;
-
-	private Object[] args;
 }
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/InstantiateCppIncludeWOB.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/InstantiateCppIncludeWOB.java
index 9841e7d8555..85f5766d599 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/InstantiateCppIncludeWOB.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/InstantiateCppIncludeWOB.java
@@ -17,7 +17,6 @@ package org.eclipse.papyrus.qompass.designer.core.templates;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.papyrus.C_Cpp.Include;
 import org.eclipse.papyrus.FCM.Template;
-import org.eclipse.papyrus.FCM.TemplateKind;
 import org.eclipse.papyrus.qompass.designer.core.acceleo.AcceleoDriverWrapper;
 import org.eclipse.papyrus.qompass.designer.core.listeners.CopyListener;
 import org.eclipse.papyrus.qompass.designer.core.transformations.Copy;
@@ -50,7 +49,7 @@ public class InstantiateCppIncludeWOB implements CopyListener {
 			Classifier targetCl = (Classifier)targetEObj;
 			Template template = UMLUtil.getStereotypeApplication(targetCl, Template.class);
 			// apply, in case of pass-classifier
-			if((template != null) && (template.getKind() == TemplateKind.PASS_CLASSIFIER)) {
+			if((template != null) && (template.getHelper() == null)) {
 				try {
 					Include cppInclude = UMLUtil.getStereotypeApplication(targetCl, Include.class);
 					TransformationContext.classifier = targetCl;
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TemplateInstantiation.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TemplateInstantiation.java
index c5cb74af6c1..dd7ec368b62 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TemplateInstantiation.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TemplateInstantiation.java
@@ -15,8 +15,9 @@
 package org.eclipse.papyrus.qompass.designer.core.templates;
 
 import org.eclipse.emf.common.util.EList;
+import org.eclipse.papyrus.FCM.BindingHelper;
 import org.eclipse.papyrus.FCM.Template;
-import org.eclipse.papyrus.FCM.TemplateKind;
+import org.eclipse.papyrus.qompass.designer.core.Messages;
 import org.eclipse.papyrus.qompass.designer.core.transformations.Copy;
 import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationContext;
 import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationException;
@@ -53,6 +54,13 @@ public class TemplateInstantiation {
 		this(copy, binding, null);
 	}
 
+	/**
+	 * 
+	 * @param copy_ copier
+	 * @param binding UML template binding
+	 * @param args currently unused
+	 * @throws TransformationException
+	 */
 	public TemplateInstantiation(final Copy copy_, final TemplateBinding binding, Object args[]) throws TransformationException {
 		if(binding == null) {
 			// user should never see this exception
@@ -105,7 +113,7 @@ public class TemplateInstantiation {
 		for(TemplateParameterSubstitution substitution : binding.getParameterSubstitutions()) {
 			ParameterableElement formal = substitution.getFormal().getParameteredElement();
 			ParameterableElement actual = substitution.getActual();
-			copy.put(formal, actual);
+			copy.putPair(formal, actual);
 		}
 
 		// add copy listeners ---
@@ -123,6 +131,7 @@ public class TemplateInstantiation {
 		if(!copy.postCopyListeners.contains(FixTemplateSync.getInstance())) {
 			copy.postCopyListeners.add(FixTemplateSync.getInstance());
 		}
+		
 		// TODO: programming language specific code!!
 		InstantiateCppInclude.getInstance().init(binding, args);
 		if(!copy.postCopyListeners.contains(InstantiateCppInclude.getInstance())) {
@@ -136,7 +145,6 @@ public class TemplateInstantiation {
 	 * TODO: A more efficient way would be to cache the copy function and only re-sync, if a new model has been loaded.
 	 *   On the other hand, the bound package is normally not very large
 	 *   
-	 * @param copy A copy map
 	 * @param sourcePkg The package template (source)
 	 * @param targetPkg The bound package (target)
 	 */
@@ -189,16 +197,16 @@ public class TemplateInstantiation {
 	public <T extends NamedElement> T bindNamedElement(T namedElement) throws TransformationException {
 		if(namedElement == null) {
 			// user should never see this exception
-			throw new TransformationException("Passed template element is null");
+			throw new TransformationException(Messages.TemplateInstantiation_TemplateIsNull);
 		}
 
 		Package boundPackage = (Package)binding.getBoundElement();
 		EList<Namespace> path = TemplateUtils.relativePathWithMerge(namedElement, packageTemplate);
 		Template template = UMLUtil.getStereotypeApplication(namedElement, Template.class);
-		TemplateKind templateKind = (template != null) ?
-			templateKind = template.getKind() :
-			TemplateKind.PASS_FORMAL;
-
+		BindingHelper helper = (template != null) ?
+			template.getHelper() : null;
+	
+		/*
 		if((templateKind == TemplateKind.ACCUMULATE) || (templateKind == TemplateKind.LATE_EVALUATION)) {
 			// TODO: not very clean yet
 			path = TemplateUtils.relativePathWithMerge(namedElement, copy.source);
@@ -209,6 +217,7 @@ public class TemplateInstantiation {
 			boundPackage = copy.target; // CreationUtils.getAndCreate
 										// (sat.target, "accumulate");
 		}
+		*/
 
 		if(path != null) {
 			// register owning package template (template can be defined in
@@ -247,19 +256,19 @@ public class TemplateInstantiation {
 		// bound package.
 
 		NamedElement existingMember = (NamedElement)copy.get(namedElement);
+		/*
 		if((existingMember != null) && (templateKind != TemplateKind.ACCUMULATE)) {
 			// element is already existing (and thus bound), nothing to do
 			// additional check, whether the ACCUMULATE information is unset)
 			// however: if the element is a package, existence is not sufficient
 			// since it might have been created via getAndCreate above
-			/*
-			 * if(namedElement instanceof Package) {
-			 * bindPackage((Package)namedElement);
-			 * }
-			 */
+			
+			//if(namedElement instanceof Package) {
+			//	bindPackage((Package)namedElement);
+			//}
 			return (T)existingMember;
 		}
-
+		*/
 		if(existingMember == null) {
 			FilterTemplate.getInstance().setActive(false);
 			T copiedElement = copy.getCopy(namedElement);
@@ -267,6 +276,7 @@ public class TemplateInstantiation {
 			copy.setPackageTemplate(null, null);
 			return copiedElement;
 		}
+
 		return (T)existingMember;
 	}
 
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TemplateInstantiationListener.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TemplateInstantiationListener.java
index 1f8e4acdf7f..2023871a381 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TemplateInstantiationListener.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TemplateInstantiationListener.java
@@ -14,35 +14,16 @@
 
 package org.eclipse.papyrus.qompass.designer.core.templates;
 
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.papyrus.C_Cpp.ConstInit;
-import org.eclipse.papyrus.FCM.ActualChoice;
+import org.eclipse.papyrus.FCM.BindingHelper;
 import org.eclipse.papyrus.FCM.Template;
-import org.eclipse.papyrus.FCM.TemplateKind;
-import org.eclipse.papyrus.qompass.designer.core.PortUtils;
-import org.eclipse.papyrus.qompass.designer.core.acceleo.AcceleoDriverWrapper;
+import org.eclipse.papyrus.qompass.designer.core.extensions.BindingHelperExt;
 import org.eclipse.papyrus.qompass.designer.core.listeners.CopyListener;
 import org.eclipse.papyrus.qompass.designer.core.transformations.Copy;
-import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationContext;
-import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationException;
-import org.eclipse.uml2.uml.Behavior;
 import org.eclipse.uml2.uml.BehavioralFeature;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.Classifier;
 import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.EnumerationLiteral;
-import org.eclipse.uml2.uml.Interface;
-import org.eclipse.uml2.uml.NamedElement;
 import org.eclipse.uml2.uml.OpaqueBehavior;
-import org.eclipse.uml2.uml.Operation;
-import org.eclipse.uml2.uml.Parameter;
-import org.eclipse.uml2.uml.Port;
 import org.eclipse.uml2.uml.TemplateBinding;
-import org.eclipse.uml2.uml.TemplateParameterSubstitution;
-import org.eclipse.uml2.uml.Type;
 import org.eclipse.uml2.uml.util.UMLUtil;
 
 /**
@@ -89,244 +70,120 @@ public class TemplateInstantiationListener implements CopyListener {
 	}
 
 	protected EObject checkEObject(Copy copy, EObject sourceEObj) {
-		try {
-			if(sourceEObj instanceof Element) {
-				if(sourceEObj instanceof OpaqueBehavior) {
-					OpaqueBehavior behavior = (OpaqueBehavior)sourceEObj;
-					// in case of a behavior, examine stereotype on associated operation
-					BehavioralFeature bf = behavior.getSpecification();
-					if(bf != null) {
-						Template template = UMLUtil.getStereotypeApplication(bf, Template.class);
-						if(template != null) {
-							return null;
-						}
+		// try {
+		if(sourceEObj instanceof Element) {
+			if(sourceEObj instanceof OpaqueBehavior) {
+				OpaqueBehavior behavior = (OpaqueBehavior)sourceEObj;
+				// in case of a behavior, examine stereotype on associated operation
+				BehavioralFeature bf = behavior.getSpecification();
+				if(bf != null) {
+					Template template = UMLUtil.getStereotypeApplication(bf, Template.class);
+					if(template != null) {
+						return null;
 					}
 				}
-				else {
-					Template template = UMLUtil.getStereotypeApplication((Element)sourceEObj, Template.class);
-					if((template != null)) { // && (!treatTemplateElement.containsKey(sourceEObj))) {
-						// treatTemplateElement.put(sourceEObj, true);
-						if(sourceEObj instanceof Operation) {
-							Operation operation = (Operation)sourceEObj;
-
-							Classifier actual = getFirstActualFromBinding(binding, operation);
-							Class boundClass = copy.getCopy(operation.getClass_());
-							if(template.getKind() == TemplateKind.LOOP_OPERATIONS) {
-								// in case of loop operations, the template parameter is iteratively an
-								// operation of the actual (which should be an interface) in this case.
-								// 
-								// The template operation typically inherits all parameters. This is expressed by
-								// a single parameter with the LOOP_PARAMETERS options (<%name%> as name, what as type?)
-								// cleaner (more general: if user writes loop with Acceleo as well?]
-								//   // owns template operation parameter??
-								Type passedActual = getPassedActual(template, actual, boundClass);
-								if(!(passedActual instanceof Interface)) {
-									return sourceEObj;
-								}
-								Interface passedActualIntf = (Interface)passedActual;
-								Operation last = null;
-								EList<Element> removalList = new BasicEList<Element>();
-								for(Operation intfOperation : passedActualIntf.getAllOperations()) {
-									for(Element removalElement : removalList) {
-										copy.removeForCopy(removalElement); // enable subsequent instantiations
-									}
-									removalList.clear();
-									last = instantiateOperation(intfOperation, template, operation, boundClass);
-									removalList.add(operation);
-									for(Behavior method : operation.getMethods()) {
-										if(method instanceof OpaqueBehavior) {
-											Behavior newBehavior =
-												instantiateBehavior(intfOperation, template, (OpaqueBehavior)method);
-											newBehavior.setSpecification(last);
-											// removalList.add(method);
-											copy.removeForCopy(method); // enable subsequent instantiations
-										}
-									}
-								}
-								// from a logical viewpoint, we need to copy parameters & name, but not the
-								// operation identity.
-								copy.put(operation, last);
-								return last;
+			}
+			else {
+				Template template = UMLUtil.getStereotypeApplication((Element)sourceEObj, Template.class);
+				if((template != null)) { // && (!treatTemplateElement.containsKey(sourceEObj))) {
+					// treatTemplateElement.put(sourceEObj, true);
+					BindingHelper helper = template.getHelper();
+					if (helper != null) {
+						return BindingHelperExt.applyHelper(helper, copy, binding, sourceEObj);
+					}
+					return sourceEObj;
+					
+					/*
+					if(sourceEObj instanceof Operation) {
+						Operation operation = (Operation)sourceEObj;
+
+						Classifier actual = getFirstActualFromBinding(binding, operation);
+						Class boundClass = copy.getCopy(operation.getClass_());
+						if(template.getKind() == TemplateKind.LOOP_OPERATIONS) {
+							// in case of loop operations, the template parameter is iteratively an
+							// operation of the actual (which should be an interface) in this case.
+							// 
+							// The template operation typically inherits all parameters. This is expressed by
+							// a single parameter with the LOOP_PARAMETERS options (<%name%> as name, what as type?)
+							// cleaner (more general: if user writes loop with Acceleo as well?]
+							//   // owns template operation parameter??
+							Type passedActual = getPassedActual(template, actual, boundClass);
+							if(!(passedActual instanceof Interface)) {
+								return sourceEObj;
 							}
-							else {
-								Operation newOperation = instantiateOperation(actual, template, operation, boundClass);
+							Interface passedActualIntf = (Interface)passedActual;
+							Operation last = null;
+							EList<Element> removalList = new BasicEList<Element>();
+							for(Operation intfOperation : passedActualIntf.getAllOperations()) {
+								for(Element removalElement : removalList) {
+									copy.removeForCopy(removalElement); // enable subsequent instantiations
+								}
+								removalList.clear();
+								last = instantiateOperation(intfOperation, template, operation, boundClass);
+								removalList.add(operation);
 								for(Behavior method : operation.getMethods()) {
 									if(method instanceof OpaqueBehavior) {
 										Behavior newBehavior =
-											instantiateBehavior(actual, template, (OpaqueBehavior)method);
-										newBehavior.setSpecification(newOperation);
+											instantiateBehavior(intfOperation, template, (OpaqueBehavior)method);
+										newBehavior.setSpecification(last);
+										// removalList.add(method);
+										copy.removeForCopy(method); // enable subsequent instantiations
 									}
 								}
-								return newOperation;
 							}
+							// from a logical viewpoint, we need to copy parameters & name, but not the
+							// operation identity.
+							copy.put(operation, last);
+							return last;
 						}
-						else if(sourceEObj instanceof EnumerationLiteral) {
-							if(template.getKind() == TemplateKind.LOOP_OPERATIONS) {
-								EnumerationLiteral literal = (EnumerationLiteral)sourceEObj;
-								Classifier actual = getFirstActualFromBinding(binding, literal);
-								// Type passedActual = getPassedActual(template, actual, boundClass);
-								Type passedActual = actual;
-								if(!(passedActual instanceof Interface)) {
-									return sourceEObj;
+						else {
+							Operation newOperation = instantiateOperation(actual, template, operation, boundClass);
+							for(Behavior method : operation.getMethods()) {
+								if(method instanceof OpaqueBehavior) {
+									Behavior newBehavior =
+										instantiateBehavior(actual, template, (OpaqueBehavior)method);
+									newBehavior.setSpecification(newOperation);
 								}
-								Interface passedActualIntf = (Interface)passedActual;
-								EnumerationLiteral newLiteral = null;
-								for(Operation intfOperation : passedActualIntf.getAllOperations()) {
-									copy.removeForCopy(literal);
-									newLiteral = copy.getCopy(literal);
-									String newName = AcceleoDriverWrapper.evaluate(literal.getName(), intfOperation, args);
-									newLiteral.setName(newName);
-								}
-								return newLiteral;
 							}
+							return newOperation;
 						}
 					}
-				}
-			}
-			return sourceEObj;
-
-		} catch (TransformationException e) {
-			// throw runtime exception
-			throw new RuntimeException("TransformationException: " + e.getMessage());
-		}
-	}
-
-	public Operation instantiateOperation(Element actual, Template template, Operation operation, Class boundClass) {
-		try {
-			Operation newOperation = copy.getCopy(operation);
-			if(actual instanceof Operation) {
-				for(Parameter parameter : ((Operation)actual).getOwnedParameters()) {
-					Parameter newParam = EcoreUtil.copy(parameter); // copy parameter via EcoreUtil
-					newParam.setType(copy.getCopy(parameter.getType()));
-					newOperation.getOwnedParameters().add(newParam);
-				}
-			}
-			TransformationContext.classifier = newOperation.getClass_();
-			if(actual instanceof Classifier) {
-				bindOperation(newOperation, (Classifier)actual);
-			}
-			String newName = AcceleoDriverWrapper.evaluate(operation.getName(), actual, args);
-			newOperation.setName(newName);
-
-			return newOperation;
-		} catch (TransformationException e) {
-			// throw runtime exception
-			throw new RuntimeException("TransformationException: " + e.getMessage());
-		}
-	}
-
-	public OpaqueBehavior instantiateBehavior(Element actual, Template template, OpaqueBehavior opaqueBehavior) throws TransformationException {
-		OpaqueBehavior newBehavior = copy.getCopy(opaqueBehavior);
-		if(actual instanceof NamedElement) {
-			String newName = AcceleoDriverWrapper.evaluate(opaqueBehavior.getName(), actual, args);
-			newBehavior.setName(newName);
-		}
-		EList<String> bodyList = newBehavior.getBodies();
-		for(int i = 0; i < bodyList.size(); i++) {
-			String body = bodyList.get(i);
-			TransformationContext.classifier = (Classifier)newBehavior.getOwner();
-			// pass qualified operation name as template name. Used to identify script in case of an error
-			String newBody = AcceleoDriverWrapper.evaluate(body, newBehavior.getQualifiedName(), actual, args);
-			bodyList.set(i, newBody);
-		}
-		return newBehavior;
-	}
-
-
-	/**
-	 * TODO: move into separate class
-	 * 
-	 * @param element
-	 *        an element that is stereotyped with FCM::Template. The
-	 *        template parameter identified there is taken into account. If
-	 *        set to null, all actuals from the binding are returned. This
-	 *        is practical, since it implies that it is not necessary to
-	 *        specify the template parameter for the common case of a
-	 *        signature containing a single parameter.
-	 * @return a list of actuals which, either for all parameters or the binding
-	 *         or a selection specified by the stereotype attribute
-	 *         templateParams (on element).
-	 * @throws TransformationException
-	 */
-	public static EList<Classifier> getActuals(TemplateBinding binding, Element element) throws TransformationException {
-		Template template = UMLUtil.getStereotypeApplication(element, Template.class);
-		if(template != null) {
-			EList<Classifier> templateParams = template.getTemplateParams();
-			EList<Classifier> actuals = new BasicEList<Classifier>();
-			if(templateParams.size() == 0) {
-				for(TemplateParameterSubstitution substitution : binding.getParameterSubstitutions()) {
-					if(substitution.getActual() instanceof Classifier) {
-						actuals.add((Classifier)substitution.getActual());
+					else if(sourceEObj instanceof EnumerationLiteral) {
+						if(template.getKind() == TemplateKind.LOOP_OPERATIONS) {
+							EnumerationLiteral literal = (EnumerationLiteral)sourceEObj;
+							Classifier actual = getFirstActualFromBinding(binding, literal);
+							// Type passedActual = getPassedActual(template, actual, boundClass);
+							Type passedActual = actual;
+							if(!(passedActual instanceof Interface)) {
+								return sourceEObj;
+							}
+							Interface passedActualIntf = (Interface)passedActual;
+							EnumerationLiteral newLiteral = null;
+							for(Operation intfOperation : passedActualIntf.getAllOperations()) {
+								copy.removeForCopy(literal);
+								newLiteral = copy.getCopy(literal);
+								String newName = AcceleoDriverWrapper.evaluate(literal.getName(), intfOperation, args);
+								newLiteral.setName(newName);
+							}
+							return newLiteral;
+						}
 					}
+					*/
 				}
 			}
-			return actuals;
 		}
-		return null;
-	}
+		return sourceEObj;
 
-	/**
-	 * Useful (instead of first matching a certain type??)
-	 * TODO: move into separate class
-	 * 
-	 * @param element
-	 * @param binding
-	 * @return
-	 * @throws TransformationException
-	 */
-	public static Classifier getFirstActualFromBinding(TemplateBinding binding, Element element) throws TransformationException {
-		EList<Classifier> actuals = getActuals(binding, element);
-		if((actuals != null) && (actuals.size() > 0) && (actuals.get(0) instanceof Classifier)) {
-			return (Classifier)actuals.get(0);
-		}
-		return null;
+	/*
+	} catch (TransformationException e) {
+		// throw runtime exception
+		throw new RuntimeException(String.format(Messages.TemplateInstantiationListener_TrafoException, e.getMessage()));
 	}
-
-
-	/**
-	 * Bind C++ const initializer
-	 * 
-	 * @param operation
-	 * @param actual
-	 * @throws TransformationException
-	 */
-	public void bindOperation(Operation operation, Classifier actual) throws TransformationException {
-		// perform binding in case of C++ initializer
-		ConstInit cppConstInit = UMLUtil.getStereotypeApplication(operation, ConstInit.class);
-		if(cppConstInit != null) {
-			// TODO: specific to C++
-			String init = cppConstInit.getInitialisation();
-			String newInit = AcceleoDriverWrapper.bind(init, actual);
-			cppConstInit.setInitialisation(newInit);
-		}
+	*/
 	}
 
-	/**
-	 * @param actual
-	 *        the actual template parameter
-	 * @param boundClass
-	 *        the bound class
-	 * @param provides
-	 *        true, if the provided interface should be returned
-	 * @return the provided or required interface of a port (of the passed
-	 *         boundClass) that is typed with the the actual.
-	 */
-	private static Interface getInterfaceFromPortTypedWithActual(Type actual, Class boundClass, boolean provided) {
-		for(Port port : PortUtils.getAllPorts(boundClass)) {
-			Interface provOrReqIntf;
-			if(provided) {
-				provOrReqIntf = PortUtils.getProvided(port);
-			} else {
-				provOrReqIntf = PortUtils.getRequired(port);
-			}
-
-			if((port.getType() == actual) && (provOrReqIntf != null)) {
-				return provOrReqIntf;
-			}
-		}
-		return null;
-	}
 
+	/*
 	private Type getPassedActual(Template template, Type actual, Class boundClass) {
 		if(template.getActualChoice() == ActualChoice.INTERFACE_OF_PPORT) {
 			return getInterfaceFromPortTypedWithActual(actual, boundClass, true);
@@ -346,4 +203,5 @@ public class TemplateInstantiationListener implements CopyListener {
 			}
 		}
 	}
+	*/
 }
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TemplateUtils.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TemplateUtils.java
index 9656d86df3f..46e9e609071 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TemplateUtils.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/TemplateUtils.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.common.util.BasicEList;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.papyrus.qompass.designer.core.CreationUtils;
 import org.eclipse.papyrus.qompass.designer.core.Log;
+import org.eclipse.papyrus.qompass.designer.core.Messages;
 import org.eclipse.papyrus.qompass.designer.core.transformations.Copy;
 import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationException;
 import org.eclipse.uml2.uml.Classifier;
@@ -123,10 +124,9 @@ public class TemplateUtils {
 		TemplateSignature signature = getSignature(template);
 		if(signature == null) {
 			// not a template, retain original name
-			Log.log(Status.INFO, Log.TEMPLATE_BINDING,
-				"no template signature found" + (template instanceof NamedElement ?
-					" for " + ((NamedElement)template).getName() :
-					""));
+			Log.log(Status.INFO, Log.TEMPLATE_BINDING, String.format(
+				Messages.TemplateUtils_NoTemplateSignature, (template instanceof NamedElement ?
+					((NamedElement)template).getName() : "undef"))); //$NON-NLS-1$
 			return null;
 		}
 
@@ -157,9 +157,8 @@ public class TemplateUtils {
 			// class does not exist yet, needs to be created.
 			boundPackage = ((Package)owner).createNestedPackage(name);
 
-			Log.log(Status.INFO, Log.TEMPLATE_BINDING,
-				"create bound package (fixed binding): " + name
-					+ " within " + owner.getName());
+			Log.log(Status.INFO, Log.TEMPLATE_BINDING, String.format(
+				Messages.TemplateUtils_InfoCreateBoundPackage, name, owner.getName()));
 		}
 
 		TemplateBinding binding = boundPackage.getTemplateBinding(signature);
@@ -239,25 +238,23 @@ public class TemplateUtils {
 	 *         parameter, or null if the 2nd parameter does not correspond to a
 	 *         formal parameter of the binding.
 	 */
-	public static Classifier getActualFromBinding(
-		TemplateBinding binding, Type formal) {
+	public static Classifier getActualFromBinding(TemplateBinding binding, Type formal) {
 		for(TemplateParameterSubstitution substitution : binding.getParameterSubstitutions()) {
 			ParameterableElement pe = substitution.getFormal().getParameteredElement();
 			if(pe == formal) {
-				Log.log(Status.INFO, Log.TEMPLATE_INSTANTIATION,
-					"TemplateInstantiation.getActualFromBinding: substitution formal = " + pe);
+				Log.log(Status.INFO, Log.TEMPLATE_INSTANTIATION, String.format(
+					Messages.TemplateUtils_InfoGetActualFrom, pe));
 				return (Classifier)substitution.getActual();
 			}
 		}
 		return null;
 	}
 
-	public static Classifier getActualFromBinding(
-		TemplateBinding binding, String formalName) {
+	public static Classifier getActualFromBinding(TemplateBinding binding, String formalName) {
 		for(TemplateParameterSubstitution substitution : binding.getParameterSubstitutions()) {
 			ParameterableElement pe = substitution.getFormal().getParameteredElement();
-			Log.log(Status.INFO, Log.TEMPLATE_INSTANTIATION,
-				"TemplateInstantiation.getActualFromBinding: substitution formal = " + pe);
+			Log.log(Status.INFO, Log.TEMPLATE_INSTANTIATION, String.format(
+					Messages.TemplateUtils_InfoGetActualFrom, pe));
 			if((pe instanceof NamedElement)
 				&& ((NamedElement)pe).getName().equals(formalName)) {
 				return (Classifier)substitution.getActual();
@@ -267,6 +264,22 @@ public class TemplateUtils {
 	}
 
 	/**
+	 * Get the first actual from the binding.
+	 * 
+	 * @param binding the template binding
+	 * @return the first actual.
+	 */
+	public static Classifier getFirstActualFromBinding(TemplateBinding binding) {
+		for(TemplateParameterSubstitution substitution : binding.getParameterSubstitutions()) {
+			ParameterableElement pe = substitution.getFormal().getParameteredElement();
+			Log.log(Status.INFO, Log.TEMPLATE_INSTANTIATION, String.format(
+					Messages.TemplateUtils_InfoGetActualFrom, pe));
+			return (Classifier)substitution.getActual();
+		}
+		return null;
+	}
+	
+	/**
 	 * Return a sequence of namespaces for a given element, starting from the "bottom"
 	 * one, i.e. the one in which the element is contained. It will end before the
 	 * searchNS namespace is reached. Returns null, if the element is not contained
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/AbstractContainerTrafo.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/AbstractContainerTrafo.java
index 38fdf26d0f9..12ca2ec6579 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/AbstractContainerTrafo.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/AbstractContainerTrafo.java
@@ -46,19 +46,21 @@ public abstract class AbstractContainerTrafo {
 	 */
 	protected static Map<Class, AbstractContainerTrafo> containers;
 
-	/**
-	 * Only configure the instances, i.e. avoid re-creating elements of the container, but create
-	 * the UML instance specifications
-	 */
-	public void configureOnly() {
-		configureOnly = true;
-	}
-
-	protected boolean configureOnly;
-
 	public abstract void createContainer(Class smComponent, Class tmComponent) throws TransformationException;
 
-	public abstract void createContainerInstance(Class tmComponent, InstanceSpecification tmIS, ContainerContext context);
+	/**
+	 * Create an instance of the container (UML instance specification)
+	 * 
+	 * @param tmComponent
+	 *        the component within the target model for which we want to create an instance
+	 * 
+	 * @param tmIS
+	 *        the existing instance specification for the component before container expansion.
+	 * @param context
+	 *        Additional information about the container that is used by instance configurators
+	 */
+	public abstract InstanceSpecification createContainerInstance(Class tmComponent, InstanceSpecification tmIS)
+		throws TransformationException;
 
 	/**
 	 * apply a container rule, i.e. add either a container extension or an
@@ -70,42 +72,30 @@ public abstract class AbstractContainerTrafo {
 	 *        the application component in the source model
 	 * @param tmComponent
 	 *        the application component in the target model
-	 * @param tmIS
-	 *        the instance specification for the application component in the target model
 	 * @throws TransformationException
 	 */
-	public abstract void applyRule(ContainerRule smContainerRule, Class smComponent, Class tmComponent, InstanceSpecification tmIS)
+	public abstract void applyRule(ContainerRule smContainerRule, Class smComponent, Class tmComponent)
 		throws TransformationException;
 
 	/**
-	 * Move a slot from the executor instance specification to an instance
-	 * specification of an extension/interceptor This is required, since the
-	 * users cannot configure containers directly. The modification is done in
-	 * the target model, i.e. the user model is not affected.
-	 * 
-	 * Default implementation is empty
-	 */
-	public void moveSlots() {
-	}
-
-	/**
 	 * The instance specification of the created container
 	 */
-	protected InstanceSpecification containerIS;
+	// protected InstanceSpecification containerIS;
 
 	/**
-	 * Store source and target model
+	 * Copy class from source to target model
 	 */
 	protected Copy copy;
 
 
 	/**
-	 * @return the instance specification of the created container
+	 * Is called after a set of rule applications.
+	 * Does nothing by default
 	 */
-	public InstanceSpecification getContainerIS() {
-		return containerIS;
+	public void finalize() {
 	}
 
+	
 	/**
 	 * The created container implementation (prefixed with sm, since part of
 	 * source model)
@@ -119,12 +109,12 @@ public abstract class AbstractContainerTrafo {
 	protected Class tmClass;
 
 	/**
-	 * deployment plan within target model
+	 * deployment plan within source model
 	 */
-	protected Package tmCDP;
-
+	protected Package smCDP;
+	
 	/**
-	 * Additional information about the container that is used by instance configurators
+	 * deployment plan within target model
 	 */
-	protected ContainerContext context;
+	protected Package tmCDP;
 }
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ApplyInstanceConfigurators.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ApplyInstanceConfigurators.java
new file mode 100644
index 00000000000..35839a25539
--- /dev/null
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ApplyInstanceConfigurators.java
@@ -0,0 +1,40 @@
+/*****************************************************************************
+ * 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:
+ *  Ansgar Radermacher  ansgar.radermacher@cea.fr  
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.qompass.designer.core.transformations;
+
+import org.eclipse.papyrus.qompass.designer.core.deployment.DepUtils;
+import org.eclipse.papyrus.qompass.designer.core.extensions.InstanceConfigurator;
+import org.eclipse.uml2.uml.InstanceSpecification;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.Slot;
+
+
+/**
+ * Apply instance configurators
+ *
+ */
+public class ApplyInstanceConfigurators {
+	public static void applyInstanceConfigurators(InstanceSpecification instance) {
+		for (Slot slot : instance.getSlots()) {
+			InstanceSpecification subInstance = DepUtils.getInstance(slot);
+			if (!DepUtils.isShared(slot) && (subInstance != null)) {
+				if (slot.getDefiningFeature() instanceof Property) {
+					InstanceConfigurator.configureInstance(subInstance, (Property) slot.getDefiningFeature(), instance);
+				}
+				applyInstanceConfigurators(subInstance);
+			}
+		}
+	}
+}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/CompImplTrafos.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/CompImplTrafos.java
index b2ba32a60ca..f87ce91d5a5 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/CompImplTrafos.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/CompImplTrafos.java
@@ -23,10 +23,11 @@ import org.eclipse.emf.common.util.EList;
 import org.eclipse.papyrus.C_Cpp.Ptr;
 import org.eclipse.papyrus.FCM.PortKind;
 import org.eclipse.papyrus.qompass.designer.core.ConnectorUtils;
+import org.eclipse.papyrus.qompass.designer.core.Messages;
 import org.eclipse.papyrus.qompass.designer.core.PortInfo;
 import org.eclipse.papyrus.qompass.designer.core.PortUtils;
-import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil;
 import org.eclipse.papyrus.qompass.designer.core.Utils;
+import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil;
 import org.eclipse.uml2.uml.AggregationKind;
 import org.eclipse.uml2.uml.Association;
 import org.eclipse.uml2.uml.Class;
@@ -160,10 +161,11 @@ public class CompImplTrafos {
 					}
 					if (implementsIntf || true) {
 						body = "return this;";	 //$NON-NLS-1$
-					} else {
-						throw new RuntimeException("Interface <" + providedIntf.getName() + "> provided by port <" + //$NON-NLS-1$ //$NON-NLS-2$
-							portInfo.getPort().getName() + "> of class <" + implementation.getName() +  //$NON-NLS-1$
-							"> is not implemented by the component itself nor does the port delegate to a part");  //$NON-NLS-1$
+					}
+					else {
+						throw new RuntimeException(String.format(
+							Messages.CompImplTrafos_IntfNotImplemented,
+							providedIntf.getName(), portInfo.getPort().getName(), implementation.getName()));
 					}
 				}
 				// todo: defined by template
@@ -228,8 +230,9 @@ public class CompImplTrafos {
 						op.createOwnedParameter("index", (Type)eLong); //$NON-NLS-1$
 					}
 					else {
-						throw new RuntimeException("Can not find type " + CompTypeTrafos.INDEX_TYPE_FOR_MULTI_RECEPTACLE +
-								". Thus, unable to create suitable connect operation in component to OO transformation");
+						throw new RuntimeException(String.format(
+							Messages.CompImplTrafos_CannotFindType,
+							CompTypeTrafos.INDEX_TYPE_FOR_MULTI_RECEPTACLE));
 					}
 				}
 				Parameter refParam = op.createOwnedParameter("ref", requiredIntf); //$NON-NLS-1$
@@ -299,7 +302,7 @@ public class CompImplTrafos {
 					// no delegation
 					String name = PrefixConstants.attributePrefix + portInfo.getName();
 					body = "return " + name + ";"; //$NON-NLS-1$ //$NON-NLS-2$
-					behavior.getLanguages().add(progLang); //$NON-NLS-1$
+					behavior.getLanguages().add(progLang);
 					behavior.getBodies().add(body);
 				}
 			}
@@ -332,7 +335,7 @@ public class CompImplTrafos {
 					Port port = (Port) end1.getRole();
 					EList<PortInfo> subPorts = PortUtils.flattenExtendedPort(port);
 					for (PortInfo subPort : subPorts) {
-						cmd += "  // realization of connection for sub-port " + subPort.getPort().getName() + "\n";
+						cmd += "  // realization of connection for sub-port " + subPort.getPort().getName() + "\n";  //$NON-NLS-1$//$NON-NLS-2$
 						cmd += connectPorts(indexMap, connector, end1, end2, subPort.getPort());
 						cmd += connectPorts(indexMap, connector, end2, end1, subPort.getPort());
 					}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/CompTypeTrafos.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/CompTypeTrafos.java
index f848f607395..2936e266041 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/CompTypeTrafos.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/CompTypeTrafos.java
@@ -17,9 +17,10 @@ package org.eclipse.papyrus.qompass.designer.core.transformations;
 import org.eclipse.emf.common.util.BasicEList;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.papyrus.C_Cpp.Ptr;
+import org.eclipse.papyrus.qompass.designer.core.Messages;
 import org.eclipse.papyrus.qompass.designer.core.PortUtils;
-import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil;
 import org.eclipse.papyrus.qompass.designer.core.Utils;
+import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil;
 import org.eclipse.uml2.uml.Class;
 import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.Interface;
@@ -46,7 +47,7 @@ import org.eclipse.uml2.uml.Type;
  */
 public class CompTypeTrafos {
 
-	public static final String INDEX_TYPE_FOR_MULTI_RECEPTACLE = "corba::Long";
+	public static final String INDEX_TYPE_FOR_MULTI_RECEPTACLE = "corba::Long"; //$NON-NLS-1$
 	
 	/**
 	 * Complete access operations recursively, i.e. traverse all packageable
@@ -87,7 +88,7 @@ public class CompTypeTrafos {
 				if(component.getOwnedOperation(getName, null, null) == null) {
 					Operation op = component.createOwnedOperation(getName, null, null);
 					op.setIsAbstract(true);
-					Parameter retParam = op.createOwnedParameter("ret", providedIntf);
+					Parameter retParam = op.createOwnedParameter("ret", providedIntf); //$NON-NLS-1$
 					retParam.setDirection(ParameterDirectionKind.RETURN_LITERAL);
 					StereotypeUtil.apply(retParam, Ptr.class);
 					// StereotypeUtil.apply(op, CppVirtual.class);
@@ -107,14 +108,13 @@ public class CompTypeTrafos {
 						// add index parameter
 						Element eLong = Utils.getQualifiedElement(Utils.getTop(component), INDEX_TYPE_FOR_MULTI_RECEPTACLE);
 						if(eLong instanceof Type) {
-							op.createOwnedParameter("index", (Type)eLong);
+							op.createOwnedParameter("index", (Type)eLong); //$NON-NLS-1$
 						}
 						else {
-							throw new RuntimeException("Can not find type " + INDEX_TYPE_FOR_MULTI_RECEPTACLE +
-									". Thus, unable to create suitable connect operation in component to OO transformation");
+							throw new RuntimeException(String.format(Messages.CompTypeTrafos_CannotFindType, INDEX_TYPE_FOR_MULTI_RECEPTACLE));
 						}
 					}
-					Parameter refParam = op.createOwnedParameter("ref", requiredIntf);
+					Parameter refParam = op.createOwnedParameter("ref", requiredIntf); //$NON-NLS-1$
 					refParam.setDirection(ParameterDirectionKind.IN_LITERAL);
 					StereotypeUtil.apply(refParam, Ptr.class);
 					// StereotypeUtil.apply(op, CppVirtual.class);
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ConnectorReification.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ConnectorReification.java
index 4a37d6ca84d..8c385174d53 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ConnectorReification.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ConnectorReification.java
@@ -26,8 +26,10 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.emf.common.util.BasicEList;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.papyrus.FCM.InteractionComponent;
+import org.eclipse.papyrus.infra.core.Activator;
 import org.eclipse.papyrus.qompass.designer.core.ConnectorUtils;
 import org.eclipse.papyrus.qompass.designer.core.Log;
+import org.eclipse.papyrus.qompass.designer.core.Messages;
 import org.eclipse.papyrus.qompass.designer.core.PortUtils;
 import org.eclipse.papyrus.qompass.designer.core.Utils;
 import org.eclipse.papyrus.qompass.designer.core.deployment.AllocUtils;
@@ -103,8 +105,8 @@ public class ConnectorReification {
 				return port;
 			}
 		}
-		throw new RuntimeException("Connector reification: cannot find a matching port on reified connector " + connectorType.getName() +
-			" for port " + otherPort.getQualifiedName() + ". This should not happen and indicates an internal tool chain error.");
+		throw new RuntimeException(String.format(Messages.ConnectorReification_CannotFindMatchingPort,
+				connectorType.getName(), otherPort.getQualifiedName()));
 	}
 
 	/**
@@ -130,7 +132,7 @@ public class ConnectorReification {
 		if(!(smConnectorPart.getType() instanceof Class)) {
 			// can not happen since caller checks whether type is stereotyped as ConnectorComp
 			// which extends class
-			Log.log(Status.ERROR, Log.TRAFO_CONNECTOR, "template type is not a class");
+			Log.log(Status.ERROR, Log.TRAFO_CONNECTOR, Messages.ConnectorReification_TemplateTypeNotClass);
 			return null;
 		}
 		// choose an implementation
@@ -182,7 +184,8 @@ public class ConnectorReification {
 	 *        connector element within the source model
 	 * @param tmIS
 	 *        target model instance specification of the composite in which the reified connector
-	 *        (the part typed with the instantiated interaction component) should be created
+	 *        (the part typed with the instantiated interaction component) should be created.
+	 *        The instance is only used to find a suitable implementation.
 	 * @param args
 	 *        addtion args for the Acceleo transformation
 	 * @return the created part within tmComponent
@@ -223,26 +226,24 @@ public class ConnectorReification {
 
 		if(connectorImplem == null) {
 			throw new TransformationException(
-				"could not bind the connector implementation template \""
-					+ connectorImplemTemplate.getName() + "\"");
+				String.format(Messages.ConnectorReification_CouldNotBind, connectorImplemTemplate.getName()));
 		}
 
 		Property tmConnectorPart = tmComponent.createOwnedAttribute(name,
 			connectorImplemTemplate);
 		// copy id, but prefix it with "p" (for part)
-		Copy.copyID(smConnector, tmConnectorPart, "p");
+		Copy.copyID(smConnector, tmConnectorPart, "p"); //$NON-NLS-1$
 		tmConnectorPart.setIsComposite(true);
 
-		Log.log(Status.INFO, Log.TRAFO_CONNECTOR, "ConnectorReification," +
-			"add part with connector implementation template <"
-			+ connectorImplemTemplate.getName() + "> and implementation <"
-			+ connectorImplem.getName() + ">");
+		Log.log(Status.INFO, Log.TRAFO_CONNECTOR,
+			String.format(Messages.ConnectorReification_InfoAddConnectorPart,
+				connectorImplemTemplate.getName(), connectorImplem.getName()));
 
 		// now create (simple) connections towards the new part
 		int i = 0;
 		for(ConnectorEnd smEnd : smConnector.getEnds()) {
-			Connector tmConnector = tmComponent.createOwnedConnector("c "
-				+ name + " " + String.valueOf(i));
+			Connector tmConnector = tmComponent.createOwnedConnector("c " //$NON-NLS-1$
+				+ name + " " + String.valueOf(i)); //$NON-NLS-1$
 			Copy.copyID(smConnector, tmConnector);
 			i++;
 			// the new connector connects the existing end with an end of the
@@ -268,7 +269,7 @@ public class ConnectorReification {
 			}
 			else {
 				throw new TransformationException(
-					"Connector reification requires the use of ports (otherwise, the ports of the reified connector can not be assigned unambiguously");
+					Messages.ConnectorReification_RequiresUseOfPorts);
 			}
 		}
 
@@ -387,15 +388,13 @@ public class ConnectorReification {
 					if(!(otherPart.getType() instanceof EncapsulatedClassifier))
 						continue;
 
-					for(Port otherPort : PortUtils
-						.getAllPorts((EncapsulatedClassifier)otherPart
-							.getType())) {
-						Log.log(Status.INFO, Log.TRAFO_CONNECTOR, "ConnectorReification: otherPort type: " +
-							otherPort.getType().getQualifiedName());
-						Log.log(Status.INFO, Log.TRAFO_CONNECTOR, "ConnectorReification:      port type: " +
-							port.getType().getQualifiedName());
+					for(Port otherPort : PortUtils.getAllPorts((EncapsulatedClassifier)otherPart.getType())) {
+						Log.log(Status.INFO, Log.TRAFO_CONNECTOR, String.format(
+							Messages.ConnectorReification_InfoPortTypes,
+							otherPort.getType().getQualifiedName(),
+							port.getType().getQualifiedName()));
 						if(otherPort.getType() == port.getType()) {
-							Connector newConnector = composite.createOwnedConnector("connector - container of "
+							Connector newConnector = composite.createOwnedConnector("connector - container of " //$NON-NLS-1$
 								+ otherPart.getName());
 							ConnectorEnd end1 = newConnector.createEnd();
 							ConnectorEnd end2 = newConnector.createEnd();
@@ -412,16 +411,11 @@ public class ConnectorReification {
 				}
 				if(!connected) {
 					if(port.getType() == null) {
-						System.err
-							.println("Error: connector port \""
-								+ port.getName()
-								+ "\" does not have a type. It is (therefore) not connected");
+						Activator.log.debug(
+							String.format(Messages.ConnectorReification_CouldNotConnectPort, port.getName()));
 					} else {
-						System.err
-							.println("Error: could not connect connector port: "
-								+ port.getName()
-								+ " of type "
-								+ port.getType().getName());
+						Activator.log.debug(
+							String.format(Messages.ConnectorReification_CouldNotConnectPortOfType, port.getName(), port.getType().getName()));
 					}
 				}
 			}
@@ -470,13 +464,12 @@ public class ConnectorReification {
 			// find instance that is associated with other part.
 			for(Slot slot : compositeIS.getSlots()) {
 				if(slot.getDefiningFeature() == otherPart) {
-					InstanceSpecification containedInstance = DepUtils
-						.getInstance(slot);
+					InstanceSpecification containedInstance = DepUtils.getInstance(slot);
 					// TODO: too complicated, if the non-connector is a composite as well, it must be clearly allocated
 					EList<InstanceSpecification> nodes = AllocUtils.getAllNodesForPort(
 						containedInstance, otherPort);
-					AllocUtils.propagateNodesViaPort(DepUtils
-						.getInstance(partSlot), myPort, nodes);
+					AllocUtils.propagateNodesViaPort(
+							DepUtils.getInstance(partSlot), myPort, nodes);
 					break;
 				}
 			}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ContainerContext.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ContainerContext.java
deleted file mode 100644
index 216e74ee31f..00000000000
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ContainerContext.java
+++ /dev/null
@@ -1,72 +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
- *
- * Contributors:
- *  Ansgar Radermacher  ansgar.radermacher@cea.fr  
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.qompass.designer.core.transformations;
-
-import org.eclipse.uml2.uml.InstanceSpecification;
-import org.eclipse.uml2.uml.Port;
-import org.eclipse.uml2.uml.StructuralFeature;
-
-
-/**
- * Holder for context information during the configuration of an element within a container
- * 
- * @author ansgar
- * 
- */
-public class ContainerContext {
-
-	/**
-	 * Convenience constructor. Used to initialize elements known outside the container transformation
-	 * itself
-	 * Constructor.
-	 * 
-	 * @param executorPart
-	 * @param nodeExecutorPart
-	 */
-	public ContainerContext(StructuralFeature executorPart, StructuralFeature nodeExecutorPart) {
-		this.smPartDF = executorPart;
-		this.smNodePartDF = nodeExecutorPart;
-	}
-
-	/**
-	 * The instance specification of the executor. It is a part of container that has been created, thus
-	 * an element of the target model.
-	 */
-	public InstanceSpecification executorIS;
-
-	/**
-	 * The part within a composite that represents a component applying a container rule. It is
-	 * part of the source model. The main motivation for this information is that some instance configurators
-	 * evaluate stereotype attributes that are applied to this part (we call it part, since it is typically a
-	 * property with composite aggregation. It is stored as a structural feature, since the information is derived
-	 * from the slot pointing to the current instance that is evaluated).
-	 */
-	public StructuralFeature smPartDF;
-
-	/**
-	 * The part within a composite that represents a hardware component applying a container rule. It is
-	 * part of the source model. The main motivation for this information is that some instance configurators
-	 * evaluate stereotype attributes that are applied to this part
-	 * 
-	 * @see ContainerContext.smPartDF
-	 */
-	public StructuralFeature smNodePartDF;
-
-	/**
-	 * The port that is intercepted in case of an interceptor configuration.
-	 */
-	public Port port;
-
-}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ContainerTrafo.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ContainerTrafo.java
index cd91d62442d..40d7e55ae02 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ContainerTrafo.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/ContainerTrafo.java
@@ -18,7 +18,6 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-import org.eclipse.core.runtime.Status;
 import org.eclipse.emf.common.util.BasicEList;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.util.EcoreUtil;
@@ -27,14 +26,14 @@ import org.eclipse.papyrus.FCM.InteractionComponent;
 import org.eclipse.papyrus.FCM.InterceptionKind;
 import org.eclipse.papyrus.FCM.InterceptionRule;
 import org.eclipse.papyrus.qompass.designer.core.ConnectorUtils;
-import org.eclipse.papyrus.qompass.designer.core.Log;
+import org.eclipse.papyrus.qompass.designer.core.Messages;
 import org.eclipse.papyrus.qompass.designer.core.PortUtils;
 import org.eclipse.papyrus.qompass.designer.core.StUtils;
 import org.eclipse.papyrus.qompass.designer.core.Utils;
 import org.eclipse.papyrus.qompass.designer.core.acceleo.UMLTool;
 import org.eclipse.papyrus.qompass.designer.core.deployment.DepCreation;
 import org.eclipse.papyrus.qompass.designer.core.deployment.DepUtils;
-import org.eclipse.papyrus.qompass.designer.core.extensions.InstanceConfigurator;
+import org.eclipse.papyrus.qompass.designer.core.deployment.DeployConstants;
 import org.eclipse.papyrus.qompass.designer.core.templates.TemplateInstantiation;
 import org.eclipse.papyrus.qompass.designer.core.templates.TemplateUtils;
 import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil;
@@ -43,9 +42,11 @@ import org.eclipse.uml2.uml.Class;
 import org.eclipse.uml2.uml.Classifier;
 import org.eclipse.uml2.uml.Connector;
 import org.eclipse.uml2.uml.ConnectorEnd;
+import org.eclipse.uml2.uml.EncapsulatedClassifier;
 import org.eclipse.uml2.uml.Feature;
 import org.eclipse.uml2.uml.InstanceSpecification;
 import org.eclipse.uml2.uml.Package;
+import org.eclipse.uml2.uml.PackageableElement;
 import org.eclipse.uml2.uml.Port;
 import org.eclipse.uml2.uml.Property;
 import org.eclipse.uml2.uml.Slot;
@@ -53,6 +54,8 @@ import org.eclipse.uml2.uml.TemplateBinding;
 import org.eclipse.uml2.uml.TemplateSignature;
 import org.eclipse.uml2.uml.Type;
 import org.eclipse.uml2.uml.UMLPackage;
+import org.eclipse.uml2.uml.ValueSpecification;
+import org.eclipse.uml2.uml.VisibilityKind;
 import org.eclipse.uml2.uml.util.UMLUtil;
 
 /**
@@ -77,10 +80,11 @@ public class ContainerTrafo extends AbstractContainerTrafo {
 	 * @param tmCDP
 	 *        deployment plan within target model
 	 */
-	public ContainerTrafo(Copy copy, Package tmCDP) {
+	public ContainerTrafo(Copy copy, Package tmCDP, InstanceSpecification executorIS) {
 		this.copy = copy;
 		this.tmCDP = tmCDP;
-		configureOnly = false;
+		this.executorIS = executorIS;
+		portInfo = new HashMap<Property, Port>();
 	}
 
 	/**
@@ -92,8 +96,9 @@ public class ContainerTrafo extends AbstractContainerTrafo {
 	 * 
 	 * @throws TransformationException
 	 */
+	@Override
 	public void createContainer(Class smComponent, Class tmComponent) throws TransformationException {
-		Package tmPkgOwner = (Package)tmComponent.getOwner();
+		Package tmPkgOwner = tmComponent.getNearestPackage();
 		// create a container with the suitable postfix
 		tmContainerImpl = tmPkgOwner.createOwnedClass(tmComponent.getName() + containerPostfix, false);
 		Copy.copyID(tmComponent, tmContainerImpl, containerPostfix);
@@ -112,18 +117,20 @@ public class ContainerTrafo extends AbstractContainerTrafo {
 		//   model. Yet code generation works, as port names are identical
 		for(Port port : PortUtils.getAllPorts(tmComponent)) {
 			// copy port
-			Port newPort = EcoreUtil.copy(port); // don't use E3CM copy, since this is not a copy from source to target model
-			tmContainerImpl.getOwnedAttributes().add(newPort);
-			StUtils.copyStereotypes(port, newPort);
-
-			// create delegation for application port
-			Connector containerDelegation = tmContainerImpl.createOwnedConnector("delegation " + port.getName()); //$NON-NLS-1$
-			Copy.copyID(tmContainerImpl, containerDelegation);
-			ConnectorEnd end1 = containerDelegation.createEnd();
-			end1.setRole(newPort);
-			ConnectorEnd end2 = containerDelegation.createEnd();
-			end2.setPartWithPort(executorPart);
-			end2.setRole(port);
+			if (port.getVisibility() == VisibilityKind.PUBLIC_LITERAL) { 
+				Port newPort = EcoreUtil.copy(port); // don't use E3CM copy, since this is not a copy from source to target model
+				tmContainerImpl.getOwnedAttributes().add(newPort);
+				StUtils.copyStereotypes(port, newPort);
+
+				// create delegation for application port
+				Connector containerDelegation = tmContainerImpl.createOwnedConnector("delegation " + port.getName()); //$NON-NLS-1$
+				Copy.copyID(tmContainerImpl, containerDelegation);
+				ConnectorEnd end1 = containerDelegation.createEnd();
+				end1.setRole(newPort);
+				ConnectorEnd end2 = containerDelegation.createEnd();
+				end2.setPartWithPort(executorPart);
+				end2.setRole(port);
+			}
 		}
 
 		// Inheritance issues:
@@ -168,33 +175,60 @@ public class ContainerTrafo extends AbstractContainerTrafo {
 	 * @param context
 	 *        Additional information about the container that is used by instance configurators
 	 */
-	public void createContainerInstance(Class tmComponent, InstanceSpecification tmIS, ContainerContext context) {
+	@Override
+	public InstanceSpecification createContainerInstance(Class tmComponent, InstanceSpecification tmIS) throws TransformationException {
 		// create an instance specification for the container
-		containerIS = (InstanceSpecification)tmCDP.createPackagedElement(tmIS.getName(), UMLPackage.eINSTANCE.getInstanceSpecification());
+		InstanceSpecification containerIS =
+				(InstanceSpecification)tmCDP.createPackagedElement(tmIS.getName(), UMLPackage.eINSTANCE.getInstanceSpecification());
 		// assign new name to original instance specification which reflects
 		// role within containment hierarchy
 		tmIS.setName(tmIS.getName() + "." + executorPartName); //$NON-NLS-1$
 		containerIS.getClassifiers().add(tmContainerImpl);
 		// existing instance specification (tmIS) is the executor instance specification
 		DepCreation.createSlot(containerIS, tmIS, executorPart);
-		executorIS = tmIS;
 		counter = 0;
 		// containers.put(tmComponent, this);
-		this.context = context;
-		context.executorIS = executorIS;
-		/*
-		 * // now create instances for the contained elements
-		 * for(Property extensionPart : tmContainerImpl.getAttributes()) {
-		 * Type tmContainerExtImpl = extensionPart.getType();
-		 * if(tmContainerExtImpl instanceof Class) {
-		 * InstanceSpecification containerExtIS = DepCreation.createDepPlan(tmCDP, (Class)tmContainerExtImpl, containerIS.getName() + "." +
-		 * extensionPart.getName(), false);
-		 * // configure extension
-		 * InstanceConfigurator.configureInstance(executorIS, smPart, containerExtIS, null);
-		 * DepCreation.createSlot(containerIS, containerExtIS, extensionPart);
-		 * }
-		 * }
-		 */
+		EList<Slot> connectorSlots = new BasicEList<Slot>();
+		
+		// now create instances for the contained elements
+		for(Property extensionPart : tmContainerImpl.getAttributes()) {
+			Type tmContainerExtImpl = extensionPart.getType();
+			if(tmContainerExtImpl instanceof Class) {
+				if (DepUtils.getSlot(executorIS, extensionPart) == null) {
+					// no slot for part exists => assume that the part has been added by the container and create an instance specification for it.
+					String isName;
+					InstanceSpecification containerExtIS = null;
+					if(Utils.isSingleton((Class)tmContainerExtImpl)) {
+						// is a singleton - exactly one instance exists
+						// use a common instance prefix for singletons
+						isName = DeployConstants.singletonPrefix + extensionPart.getName();
+						PackageableElement pe = tmCDP.getPackagedElement(isName);
+						if (pe instanceof InstanceSpecification) {
+							containerExtIS = (InstanceSpecification) pe;
+						}
+					}
+					else {
+						isName = containerIS.getName() + "." + extensionPart.getName(); //$NON-NLS-1$
+					}
+					// create sub-instance and slot for extensions
+					if (containerExtIS == null) {
+						containerExtIS = DepCreation.createDepPlan(tmCDP, (Class)tmContainerExtImpl, isName, false);
+					}
+					Slot partSlot = DepCreation.createSlot(containerIS, containerExtIS, extensionPart);
+					if (StereotypeUtil.isApplied(tmContainerExtImpl, InteractionComponent.class)) {
+						connectorSlots.add(partSlot);
+					}
+				}
+			}
+		}
+	
+		// handle propagation of node allocation for connectors. Do that in 2nd loop, since the allocation
+		// of parts might be incomplete before.
+		for(Slot connectorSlot : connectorSlots) {
+			ConnectorReification.propagateNodeAllocation(tmContainerImpl, containerIS, connectorSlot);
+		}
+		moveSlots(executorIS);
+		return containerIS;
 	}
 
 	/**
@@ -203,17 +237,26 @@ public class ContainerTrafo extends AbstractContainerTrafo {
 	 * @param tmComponent
 	 * @param tmIS
 	 */
-	public void createHwContainerInstance(Class tmComponent, InstanceSpecification tmNode, ContainerContext context) {
+	public InstanceSpecification createHwContainerInstance(Class tmComponent, InstanceSpecification tmNode) {
 		// create an instance specification for the container
-		containerIS = (InstanceSpecification)tmCDP.createPackagedElement(tmNode.getName() + hwContainerPostfix, UMLPackage.eINSTANCE.getInstanceSpecification());
+		InstanceSpecification containerIS =
+				(InstanceSpecification)tmCDP.createPackagedElement(tmNode.getName() + hwContainerPostfix, UMLPackage.eINSTANCE.getInstanceSpecification());
 		// assign new name to original instance specification which reflects
 		// role within containment hierarchy
 		containerIS.getClassifiers().add(tmContainerImpl);
 		// containers.put(tmComponent, this);
 		counter = 0;
 		executorIS = tmNode;
-		this.context = context;
-		context.executorIS = executorIS;
+		// copy slots from HW instance specification
+		for (Slot slot : tmNode.getSlots()) {
+			Slot slotCopy = containerIS.createSlot();
+			slotCopy.setDefiningFeature(slot.getDefiningFeature());
+			// copy values (use CopyTo.copyTo(slot, containerIS) instead?)
+			for (ValueSpecification value : slot.getValues()) {
+				Copy.copyValue(value, slotCopy);
+			}
+		}
+		return containerIS;
 	}
 
 	/**
@@ -239,7 +282,8 @@ public class ContainerTrafo extends AbstractContainerTrafo {
 	 *        the instance specification for the application component in the target model
 	 * @throws TransformationException
 	 */
-	public void applyRule(ContainerRule smContainerRule, Class smComponent, Class tmComponent, InstanceSpecification tmIS)
+	@Override
+	public void applyRule(ContainerRule smContainerRule, Class smComponent, Class tmComponent)
 		throws TransformationException
 	{
 		Map<Property, EList<Property>> interceptorPartsMap = new HashMap<Property, EList<Property>>();
@@ -248,7 +292,8 @@ public class ContainerTrafo extends AbstractContainerTrafo {
 			Type type = part.getType();
 			if(type == null) {
 				String ruleName = (smContainerRule.getBase_Class() != null) ? smContainerRule.getBase_Class().getName() : "undefined"; //$NON-NLS-1$
-				throw new TransformationException("Cannot apply container rule <" + ruleName + ">, since the type of one of its parts is undefined. Check for unresolved proxies in imports");
+				throw new TransformationException(String.format(
+					Messages.ContainerTrafo_CannotApplyRule, ruleName));
 			}
 			if(part instanceof Port) {
 				Port newPort = tmContainerImpl.createOwnedPort(part.getName(), part.getType());
@@ -273,15 +318,16 @@ public class ContainerTrafo extends AbstractContainerTrafo {
 					interceptorPartsMap.put(part, interceptorParts);
 				}
 				else if(StereotypeUtil.isApplied(part, InterceptionRule.class)) {
-					throw new TransformationException("The part " + part.getName() + " in rule " + smContainerRule.getBase_Class().getName() + "" +
-						" has an interceptionRule, but is not typed with an interaction component");
+					throw new TransformationException(String.format(
+						Messages.ContainerTrafo_InterceptionRuleButNoInterceptor,
+						part.getName(), smContainerRule.getBase_Class().getName()));
 				}
 				else {
 					Property extensionPart =
-						expandAggregationExtension(part.getName(), extOrInterceptor, tmComponent);
+						expandAggregationExtension(part, extOrInterceptor, tmComponent);
 					// register relation to facilitate connector copy
 					copy.setPackageTemplate(smContainerRule.getBase_Class(), tmContainerImpl);
-					copy.put(part, extensionPart);
+					copy.putPair(part, extensionPart);
 					copy.setPackageTemplate(null, null);
 				}
 			}
@@ -310,7 +356,7 @@ public class ContainerTrafo extends AbstractContainerTrafo {
 				for(Property interceptorPart : interceptorPartsMap.get(ruleInterceptorPart)) {
 					// map an interceptor part within rule successively to to an interceptor part
 					// within the container
-					copy.put(ruleInterceptorPart, interceptorPart);
+					copy.putPair(ruleInterceptorPart, interceptorPart);
 					copy.removeForCopy(connector);
 					copy.getCopy(connector);
 				}
@@ -319,13 +365,8 @@ public class ContainerTrafo extends AbstractContainerTrafo {
 				// check whether FCM connector
 				org.eclipse.papyrus.FCM.Connector fcmConn = StUtils.getConnector(connector);
 				if(fcmConn != null) {
-					Property connectorPart = ConnectorReification.reifyConnector(copy, tmContainerImpl,
-						UMLTool.varName(connector), connector, containerIS, null);
-					// don't create specific configuration slots (don't know how to specific in source model)
-					// InstanceSpecification tmReifiedConnectorIS =
-					DepCreation.createDepPlan(
-						tmCDP, (Class)connectorPart.getType(),
-						tmIS.getName() + "." + connector.getName(), false); //$NON-NLS-1$
+					ConnectorReification.reifyConnector(copy, tmContainerImpl,
+						UMLTool.varName(connector), connector, executorIS, null);
 				}
 				else {
 					copy.remove(connector);
@@ -342,42 +383,31 @@ public class ContainerTrafo extends AbstractContainerTrafo {
 	 * application component also inherits from the type of the container
 	 * extension in order to avoid copying ports.
 	 */
-	Property expandAggregationExtension(String name, Class smContainerExtImpl, Class tmComponent) throws TransformationException {
+	Property expandAggregationExtension(Property smExtensionPart, Class smContainerExtImpl, Class tmComponent) throws TransformationException {
 		Property extensionPart;
+		String name = smExtensionPart.getName();
 		Class tmContainerExtImpl = null;
-		if(configureOnly) {
-			extensionPart = tmContainerImpl.getAttribute(name, null);
-			if((extensionPart != null) && extensionPart.getType() instanceof Class) {
-				tmContainerExtImpl = (Class)extensionPart.getType();
-			}
+		
+		TemplateSignature signature = TemplateUtils.getSignature(smContainerExtImpl);
+		if(signature == null) {
+			// no template signature, just copy the container extension into the target model
+			tmContainerExtImpl = copy.getCopy(smContainerExtImpl);
+		} else {
+			// template signature found, instantiate container extension via the
+			// template binding mechanism
+			TemplateBinding binding = TemplateUtils.fixedBinding(copy.target, smContainerExtImpl, tmComponent);
+			Object[] args = new Object[]{};
+			TemplateInstantiation ti = new TemplateInstantiation(copy, binding, args);
+			tmContainerExtImpl = (Class)ti.bindNamedElement(smContainerExtImpl);
 		}
-		else {
-			TemplateSignature signature = TemplateUtils.getSignature(smContainerExtImpl);
-			if(signature == null) {
-				// no template signature, just copy the container extension into the target model
-				tmContainerExtImpl = copy.getCopy(smContainerExtImpl);
-			} else {
-				// template signature found, instantiate container extension via the
-				// template binding mechanism
-				TemplateBinding binding = TemplateUtils.fixedBinding(copy.target, smContainerExtImpl, tmComponent);
-				Object[] args = new Object[]{};
-				TemplateInstantiation ti = new TemplateInstantiation(copy, binding, args);
-				tmContainerExtImpl = (Class)ti.bindNamedElement(smContainerExtImpl);
-			}
 
-			// add part associated with the extension to the container
-			extensionPart = tmContainerImpl.createOwnedAttribute(name, tmContainerExtImpl);
-		}
-		// problem: would not be unique in case of multiple extensions
-		// Copy.copyID(tmComponent, extensionPart, "a");
-		extensionPart.setIsComposite(true);
-		// TODO separation of container creation and instance creation
-		InstanceSpecification containerExtIS = DepCreation.createDepPlan(tmCDP, tmContainerExtImpl, containerIS.getName() + "." + extensionPart.getName(), false); //$NON-NLS-1$
-		// configure extension
-		context.port = null;
-		InstanceConfigurator.configureInstance(containerExtIS, extensionPart, context);
-		DepCreation.createSlot(containerIS, containerExtIS, extensionPart);
+		// add part associated with the extension to the container
+		extensionPart = tmContainerImpl.createOwnedAttribute(name, tmContainerExtImpl);
 
+		// Copy.copyID(tmComponent, extensionPart, "a");
+		extensionPart.setAggregation(smExtensionPart.getAggregation());
+		Copy.copyMultElemModifiers(smExtensionPart, extensionPart);
+		Copy.copyFeatureModifiers(smExtensionPart, extensionPart);
 		return extensionPart;
 	}
 
@@ -421,53 +451,37 @@ public class ContainerTrafo extends AbstractContainerTrafo {
 
 			Property connectorPart;
 			String interceptionName = interceptorName + port.getName() + counter;
-			if(configureOnly) {
-				// counter is reset before instance configuration
-				connectorPart = tmContainerImpl.getAttribute(interceptionName, null);
-			}
-			else {
-				Connector interceptionConnector = null;
-				// get delegation connector
-				for(Connector connector : tmContainerImpl.getOwnedConnectors()) {
-					if(ConnectorUtils.connectsPort(connector, port)) {
-						interceptionConnector = connector;
-						break;
-					}
-				}
-				// interceptionConnector = tmContainerImpl.getOwnedConnector
-				// ("delegation " + port.getName ());
-				if(interceptionConnector == null) {
-					throw new TransformationException("(during interceptor transformation for container): cannot find existing delegation connector");
+			Connector interceptionConnector = null;
+			// get delegation connector
+			for(Connector connector : tmContainerImpl.getOwnedConnectors()) {
+				if(ConnectorUtils.connectsPort(connector, port)) {
+					interceptionConnector = connector;
+					break;
 				}
-
-				interceptionConnector.setName(interceptorName + port.getName() + counter);
-				org.eclipse.papyrus.FCM.Connector fcmConn = StereotypeUtil.applyApp(interceptionConnector, org.eclipse.papyrus.FCM.Connector.class);
-				InteractionComponent fcmConnType = UMLUtil.getStereotypeApplication(smContainerConnImpl, InteractionComponent.class);
-				fcmConn.setIc(fcmConnType);
-
-				// pass target component and port to interceptor (not clean, define
-				// suitable template signature as for instance in methodCall_comp
-				Object[] args = new Object[]{ executorIS, port };
-				TransformationContext.instance = executorIS;
-				TransformationContext.port = port;
-				connectorPart = ConnectorReification.reifyConnector(copy, tmContainerImpl, UMLTool.varName(interceptionConnector), interceptionConnector, executorIS, args);
-				connectorParts.add(connectorPart);
-				TransformationContext.port = null;
-				// delete intermediate connector (has been replaced by two
-				// connections to the reified connector)
-				interceptionConnector.destroy();
 			}
-			// Now create an instance specification for the reified connector
-			InstanceSpecification reifiedConnectorIS = DepCreation.createDepPlan(tmCDP, (Class)connectorPart.getType(),
-				containerIS.getName() + "." + interceptionName, false); //$NON-NLS-1$
-			// configure connector
-			context.port = port;
-			InstanceConfigurator.configureInstance(reifiedConnectorIS, connectorPart, context);
-
-			Slot partSlot = DepCreation.createSlot(containerIS, reifiedConnectorIS, connectorPart);
-
+			// interceptionConnector = tmContainerImpl.getOwnedConnector
+			// ("delegation " + port.getName ());
+			if(interceptionConnector == null) {
+				throw new TransformationException(Messages.ContainerTrafo_CannotFindDelegationConn);
+			}
 
-			ConnectorReification.propagateNodeAllocation(tmComponent, executorIS, partSlot);
+			interceptionConnector.setName(interceptorName + port.getName() + counter);
+			org.eclipse.papyrus.FCM.Connector fcmConn = StereotypeUtil.applyApp(interceptionConnector, org.eclipse.papyrus.FCM.Connector.class);
+			InteractionComponent fcmConnType = UMLUtil.getStereotypeApplication(smContainerConnImpl, InteractionComponent.class);
+			fcmConn.setIc(fcmConnType);
+
+			// pass target component and port to interceptor (not clean, define
+			// suitable template signature as for instance in methodCall_comp
+			Object[] args = new Object[]{ executorIS, port };
+			TransformationContext.instance = executorIS;
+			TransformationContext.port = port;
+			connectorPart = ConnectorReification.reifyConnector(copy, tmContainerImpl, UMLTool.varName(interceptionConnector), interceptionConnector, executorIS, args);
+			connectorParts.add(connectorPart);
+			TransformationContext.port = null;
+			portInfo.put(connectorPart, port);
+			// delete intermediate connector (has been replaced by two
+			// connections to the reified connector)
+			interceptionConnector.destroy();
 		}
 		counter++;
 		return connectorParts;
@@ -475,12 +489,21 @@ public class ContainerTrafo extends AbstractContainerTrafo {
 
 	/**
 	 * Move a slot from the executor instance specification to an instance
-	 * specification of an extension/interceptor This is required, since the
+	 * specification of an extension/interceptor. This is required, since
 	 * users cannot configure containers directly. The modification is done in
 	 * the target model, i.e. the user model is not affected.
+	 * 
+	 * Configuration is based on the idea that we can have multiple classifiers for an
+	 * instance specification and that we add additional slots for attributes of the 2nd
+	 * classifier which becomes "visible" after container transformation.
+	 * Main use: configure priority of thread within container.
+	 * 
+	 * TODO: Not clear, whether we should keep this operation, since configuration of elements that are not
+	 * (directly) part of the user model is confusing. Application was: configuration
+	 * of thread priorities within container.
 	 */
-	public void moveSlots() {
-		Log.log(Status.INFO, Log.TRAFO_CONTAINER, "Move slots for instance: " + executorIS.getQualifiedName());
+	public void moveSlots(InstanceSpecification containerIS) {
+		// Log.log(Status.INFO, Log.TRAFO_CONTAINER, String.format(Messages.ContainerTrafo_InfoMoveSlots, executorIS.getQualifiedName()));
 		Classifier mainCl = DepUtils.getClassifier(executorIS);
 		Iterator<Slot> slotIt = executorIS.getSlots().iterator();
 		while(slotIt.hasNext()) {
@@ -546,27 +569,103 @@ public class ContainerTrafo extends AbstractContainerTrafo {
 		}
 	}
 
+	@Override
+	public void finalize() {
+		discoverServices();
+	}
+	
+	/**
+	 * Connector ports of executor with compatible ports offered by container extensions
+	 * (runtime system)
+	 */
+	public void discoverServices() {
+		Type executorType = executorPart.getType();
+		if (!(executorType instanceof EncapsulatedClassifier)) {
+			return;
+		}
+		EncapsulatedClassifier ec = (EncapsulatedClassifier) executorType;
+		for (Port executorPort : ec.getOwnedPorts()) {
+			for (Property svcPart : tmContainerImpl.getOwnedAttributes()) {
+				if (svcPart == executorPart) {
+					continue;
+				}
+				Type containerSvcType = svcPart.getType();
+				if (containerSvcType instanceof EncapsulatedClassifier) {
+					EncapsulatedClassifier containerSvc = (EncapsulatedClassifier) containerSvcType;
+					for (Port svcPort : containerSvc.getOwnedPorts()) {
+						if (PortUtils.matches(executorPort, svcPort, true)) {
+							// create connector
+							Connector c = tmContainerImpl.createOwnedConnector("auto"); //$NON-NLS-1$
+							ConnectorEnd ce1 = c.createEnd();
+							ConnectorEnd ce2 = c.createEnd();
+							ce1.setPartWithPort(executorPart);
+							ce1.setRole(executorPort);
+							ce2.setPartWithPort(svcPart);
+							ce2.setRole(svcPort);
+						}
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Return the containerTrafo associated with a container. This operation is useful for instance
+	 * configurators that need more information about the container context, in particular to associate
+	 * a part with a port that is intercepted.
+	 *  
+	 * @param containerInstance the container instance (the parent instance of an instance of a container extension)ight be a container instance)
+	 * @return the containerTrafo info, if found.
+	 */
+	public static ContainerTrafo getContainerTrafo(InstanceSpecification containerInstance) {
+		Classifier containerCandidate = DepUtils.getClassifier(containerInstance);
+		Property executorPart = containerCandidate.getAttribute(executorPartName, null);
+		if ((executorPart != null) && executorPart.getType() instanceof Class) {
+			AbstractContainerTrafo containerTrafo = ContainerTrafo.get((Class) executorPart.getType());
+			if (containerTrafo instanceof ContainerTrafo) {
+				return (ContainerTrafo) containerTrafo;
+			}
+		}
+		return null;
+	}
+	
+	/**
+	 * Return the port that is intercepted when given a part
+	 * @param containerPart a part that participates in a port interception
+	 * @return intercepted port
+	 */
+	public Port getInterceptedPort(Property containerPart) {
+		return portInfo.get(containerPart);
+	}
+	
 	/**
 	 * The attribute within the container that holds the executor, i.e. the
 	 * original component
 	 */
-	private Property executorPart;
+	protected Property executorPart;
 
 	/**
 	 * An instance specification of the executor in the target model (todo: should be source model instead?), i.e.
 	 * of the component before container expansion
 	 */
-	private InstanceSpecification executorIS;
+	protected InstanceSpecification executorIS;
 
 	/**
 	 * The created container implementation (prefixed with tm, since part of
 	 * target model)
 	 */
-	private Class tmContainerImpl;
+	protected Class tmContainerImpl;
 
 	/**
 	 * A counter which is used to manage unique names for interceptors (if
 	 * multiple interceptors are applied)
 	 */
-	private int counter;
+	protected int counter;
+	
+	/**
+	 * Store information about intercepted port. The map contains a mapping from the part representing
+	 * a reified connector to the port that was intercepted. It is stored, since it might be used by instance
+	 * configurators that configure the container instance.
+	 */
+	protected Map<Property, Port> portInfo;
 }
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/Copy.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/Copy.java
index cabd3e7de20..790048a6f5d 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/Copy.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/Copy.java
@@ -121,9 +121,11 @@ public class Copy extends Copier {
 			// original source package becomes a sub-package in the target model
 			Package newSourceRoot = target.createNestedPackage(source.getName());
 			put(source, newSourceRoot);
+			setStatus(newSourceRoot, CopyStatus.SHALLOW);
 		}
 		else {
 			put(source, target);
+			setStatus(target, CopyStatus.SHALLOW);
 		}
 	};
 
@@ -210,6 +212,19 @@ public class Copy extends Copier {
 		return null;
 	}
 
+	/**
+	 * Put a pair into the copy map. Unlike the standard put operation,
+	 * the target object is marked as full copy.
+	 * Just using the put operation lead to bug 422899 - [QDesigner] Regression in
+	 * template instantiation
+	 * @return
+	 */
+	public EObject putPair(EObject sourceEObj, EObject targetEObj) {
+		EObject target = put(sourceEObj, targetEObj);
+		setStatus(targetEObj, CopyStatus.FULL);
+		return target;
+	}
+	
 	@Override
 	public boolean containsKey(Object sourceEObj) {
 		if(sourceEObj instanceof EObject) {
@@ -228,6 +243,11 @@ public class Copy extends Copier {
 		return null;
 	}
 
+	/**
+	 * Set the status of a copy object
+	 * @param targetEObj
+	 * @param status
+	 */
 	public void setStatus(EObject targetEObj, CopyStatus status) {
 		statusMap.put(targetEObj, status);
 	}
@@ -239,11 +259,6 @@ public class Copy extends Copier {
 	 * @return
 	 */
 	public CopyStatus getStatus(EObject targetEObj) {
-		/*
-		if (targetEObj instanceof Package) {
-			return true;
-		}
-		*/
 		if (targetEObj != null) {
 			CopyStatus status = statusMap.get(targetEObj);
 			if(status != null) {
@@ -253,10 +268,6 @@ public class Copy extends Copier {
 		return CopyStatus.UNKNOWN;
 	}
 
-	// public Namespace getPackageTemplate() {
-	// return null;
-	// }
-
 	/**
 	 * Set the reference of a bound package template. It must be a member of the target model.
 	 * Setting the package template is required to assure that elements that are part of a different
@@ -472,7 +483,8 @@ public class Copy extends Copier {
 					// e.g. if an operation is referenced, we need to copy the whole interface
 					// Currently: only the standard owning reference is not copied recursively.
 				
-					else if (!eReference.getName().equals("owner")) { //$NON-NLS-1$
+					else if (!eReference.getName().equals("owner") &&  //$NON-NLS-1$
+							(!eReference.getName().equals("owningInstance"))) { //$NON-NLS-1$
 						Object feature = sourceEObj.eGet(eStructuralFeature);
 						if(feature instanceof Element) {
 							copy((Element)feature);
@@ -931,7 +943,7 @@ public class Copy extends Copier {
 	 *        corresponding target model element
 	 */
 	public static void copyID(EObject source, EObject target) {
-		copyID(source, target, "");
+		copyID(source, target, ""); //$NON-NLS-1$
 	}
 
 	/**
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/CopyTo.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/CopyTo.java
index 3961ba137c9..d96b5a62a6f 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/CopyTo.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/CopyTo.java
@@ -7,7 +7,7 @@ import org.eclipse.uml2.uml.Element;
 /**
  * This class enables the copy from a source to a given target element.
  * It assumes that a copy has already been created, but will just not copy it...
- * Unlike the @see Copy class, the element might be copied to a different placed
+ * Unlike the @see Copy class, the element might be copied to a different place
  */
 public class CopyTo {
 	/**
@@ -17,6 +17,7 @@ public class CopyTo {
 	 * @param targetContainer The container into which it the source should be copied
 	 * @return the copied object
 	 */
+	@SuppressWarnings("unchecked")
 	public static <T extends Element> T copyTo(T source, Element targetContainer) {
 		Copier copier = new Copier();
 		EObject sourceContainer = source.eContainer();
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/FlattenInteractionComponents.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/FlattenInteractionComponents.java
index 536eefd7bd1..20d0a82461a 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/FlattenInteractionComponents.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/FlattenInteractionComponents.java
@@ -21,11 +21,13 @@ import org.eclipse.emf.common.util.BasicEList;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.papyrus.FCM.InteractionComponent;
 import org.eclipse.papyrus.qompass.designer.core.ConnectorUtils;
+import org.eclipse.papyrus.qompass.designer.core.deployment.DepPlanUtils;
 import org.eclipse.papyrus.qompass.designer.core.deployment.DepUtils;
 import org.eclipse.uml2.uml.Class;
 import org.eclipse.uml2.uml.Classifier;
 import org.eclipse.uml2.uml.Connector;
 import org.eclipse.uml2.uml.ConnectorEnd;
+import org.eclipse.uml2.uml.DirectedRelationship;
 import org.eclipse.uml2.uml.InstanceSpecification;
 import org.eclipse.uml2.uml.Port;
 import org.eclipse.uml2.uml.Property;
@@ -62,6 +64,8 @@ import org.eclipse.uml2.uml.util.UMLUtil;
  */
 public class FlattenInteractionComponents {
 
+	private static final String FLATTEN_SEP = "_"; //$NON-NLS-1$
+
 	public static FlattenInteractionComponents getInstance() {
 		return instance;
 	}
@@ -89,7 +93,9 @@ public class FlattenInteractionComponents {
 				flattenAssembly((Class) cl, instance, containingInstance, containingSlot);
 			}
 		}
-		// create a copy, since flatten might modify the number of slots
+		// loop over sub-instances and apply flatten recursively.
+		// create a copy of the slots, since the recursive flatten call might modify
+		// the number of slots
 		EList<Slot> slots =  new BasicEList<Slot>(instance.getSlots());
 		for (Slot subISslot : slots) {
 			InstanceSpecification subIS = DepUtils.getInstance(subISslot);
@@ -100,6 +106,7 @@ public class FlattenInteractionComponents {
 	}
 	
 	/**
+	 * 
 	 * Flatten a composite interaction component, i.e. replace it by the containing fragments. This includes the following actions
 	 * 1. Parts typed with the interaction component must be replaced with a set of parts typed with the fragment.
 	 * 2. Connectors must be redirected.
@@ -125,7 +132,7 @@ public class FlattenInteractionComponents {
 			
 			for (Property fragmentPart : composite.getAllAttributes()) {
 				if (fragmentPart instanceof Port) continue;
-				String partName = partForIA.getName() + "_" + fragmentPart.getName(); //$NON-NLS-1$
+				String partName = partForIA.getName() + FLATTEN_SEP + fragmentPart.getName();
 				// create a new part in the containing composite
 				Property newPartForFragment = containingComposite.createOwnedAttribute(partName, fragmentPart.getType());
 				replaceParts.put(fragmentPart, newPartForFragment);
@@ -159,11 +166,20 @@ public class FlattenInteractionComponents {
 				StructuralFeature sf = slot.getDefiningFeature();
 				if (replaceParts.containsKey(sf)) {
 					slot.setDefiningFeature(replaceParts.get(sf));
+					// assure naming convention for instances: here, we update the name of the instance
+					// and its sub-instances with the name of the containingInstance
+					InstanceSpecification subInstance = DepUtils.getInstance(slot);
+					if ((subInstance != null) && !DepUtils.isShared(slot)) {
+						DepPlanUtils.updateInstanceNames(subInstance, instance.getName() + FLATTEN_SEP + sf.getName());
+					}
 				}
 			}
-			// TODO: assure naming convention for instances
-			
+		
 			containingSlot.destroy();
+			// destroy relationships of flattened instance, in particular allocation
+			for (DirectedRelationship dr : instance.getSourceDirectedRelationships()) {
+				dr.destroy();
+			}
 			instance.destroy();
 			partForIA.destroy();
 			
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/InstantiateDepPlan.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/InstantiateDepPlan.java
index 1f2f17f21f3..ff8779bb0f0 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/InstantiateDepPlan.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/InstantiateDepPlan.java
@@ -31,6 +31,7 @@ import org.eclipse.papyrus.FCM.DeploymentPlan;
 import org.eclipse.papyrus.FCM.util.MapUtil;
 import org.eclipse.papyrus.acceleo.AcceleoDriver;
 import org.eclipse.papyrus.qompass.designer.core.Log;
+import org.eclipse.papyrus.qompass.designer.core.Messages;
 import org.eclipse.papyrus.qompass.designer.core.ModelManagement;
 import org.eclipse.papyrus.qompass.designer.core.ProjectManagement;
 import org.eclipse.papyrus.qompass.designer.core.StUtils;
@@ -40,7 +41,9 @@ import org.eclipse.papyrus.qompass.designer.core.deployment.AllocUtils;
 import org.eclipse.papyrus.qompass.designer.core.deployment.DepCreation;
 import org.eclipse.papyrus.qompass.designer.core.deployment.DepUtils;
 import org.eclipse.papyrus.qompass.designer.core.deployment.Deploy;
+import org.eclipse.papyrus.qompass.designer.core.deployment.DeployConstants;
 import org.eclipse.papyrus.qompass.designer.core.extensions.ILangSupport;
+import org.eclipse.papyrus.qompass.designer.core.extensions.InstanceConfigurator;
 import org.eclipse.papyrus.qompass.designer.core.extensions.LanguageSupport;
 import org.eclipse.papyrus.qompass.designer.core.generate.GenerateCode;
 import org.eclipse.papyrus.qompass.designer.core.generate.GenerationOptions;
@@ -58,6 +61,7 @@ import org.eclipse.uml2.uml.InstanceSpecification;
 import org.eclipse.uml2.uml.Model;
 import org.eclipse.uml2.uml.NamedElement;
 import org.eclipse.uml2.uml.Package;
+import org.eclipse.uml2.uml.PackageableElement;
 import org.eclipse.uml2.uml.Profile;
 import org.eclipse.uml2.uml.util.UMLUtil;
 
@@ -110,12 +114,13 @@ public class InstantiateDepPlan {
 		boolean generateCACOnly = (genOptions & GenerationOptions.CAC_ONLY) != 0;
 
 		AcceleoDriver.clearErrors();
-		Package cdp;
+		Package smCDP;
 		Configuration configuration = null;
 		if(cdpOrConfig instanceof Package) {
-			cdp = (Package)cdpOrConfig;
-			MainModelTrafo.setConfiguration(null);
-		} else if(StereotypeUtil.isApplied(cdpOrConfig, Configuration.class)) {
+			smCDP = (Package)cdpOrConfig;
+			RuleManagement.setConfiguration(null);
+		}
+		else if(StereotypeUtil.isApplied(cdpOrConfig, Configuration.class)) {
 			configuration = UMLUtil.getStereotypeApplication(cdpOrConfig, Configuration.class);
 			DeploymentPlan fcmCDP = configuration.getDeploymentPlan();
 			if(fcmCDP == null) {
@@ -124,20 +129,21 @@ public class InstantiateDepPlan {
 
 					public void run() {
 						Shell shell = new Shell();
-						MessageDialog.openError(shell, "Cannot generate model", "The stereotype attribute <deploymentPlan> of configuration <" + config.getName() + "> is not initialized");
+						MessageDialog.openError(shell, Messages.InstantiateDepPlan_CannotGenModel,
+								String.format(Messages.InstantiateDepPlan_DepPlanStereotypeNotInitialized, config.getName()));
 					}
 				});
 				return;
 			}
-			cdp = fcmCDP.getBase_Package();
-			MainModelTrafo.setConfiguration(configuration);
+			smCDP = fcmCDP.getBase_Package();
+			RuleManagement.setConfiguration(configuration);
 		} else {
 			return;
 		}
 
 		try {
 			EnumService.init();
-			InstanceSpecification rootIS = DepUtils.getMainInstance(cdp);
+			InstanceSpecification rootIS = DepUtils.getMainInstance(smCDP);
 			// Package copyCDP = dt.getCopyCDT (selectedCDP);
 
 			EList<InstanceSpecification> nodes = AllocUtils.getAllNodes(rootIS);
@@ -151,13 +157,13 @@ public class InstantiateDepPlan {
 			if(generateCode) {
 				steps += nodes.size();
 			}
-			monitor.beginTask("Generating deployment model ...", steps);
+			monitor.beginTask(Messages.InstantiateDepPlan_InfoGeneratingModel, steps);
 			if(monitor.isCanceled()) {
 				return;
 			}
 
 			// 1a: create a new model (and applies same profiles / imports)
-			Model existingModel = cdp.getModel();
+			Model existingModel = smCDP.getModel();
 			TransformationContext.sourceRoot = existingModel;
 			tmpMM = createTargetModel(existingModel, monitor, existingModel.getName(), true);
 			tmpModel = tmpMM.getModel();
@@ -182,21 +188,27 @@ public class InstantiateDepPlan {
 			Copy.copyID(existingModel, tmpModel);
 
 			// 1b: reify the connectors "into" the new model
-			monitor.subTask("expanding connectors and containers");
+			monitor.subTask(Messages.InstantiateDepPlan_InfoExpandingConnectors);
 
 			// obtain reference to CDP in target model
 			// 
 			tmpCopy.createShallowContainer(rootIS);
-			Package tmCDP = (Package)tmpCopy.get(cdp);
+			Package tmCDP = (Package)tmpCopy.get(smCDP);
 
 			ContainerTrafo.init();
-			InstanceSpecification newRootIS = MainModelTrafo.mainModelTrafo(tmpCopy, tmCDP, rootIS, null);
+			InstanceConfigurator.onNodeModel = false;
+			MainModelTrafo mainModelTrafo = new MainModelTrafo(tmpCopy, tmCDP);
+			InstanceSpecification newRootIS = mainModelTrafo.transformInstance(rootIS, null);
+			DeploymentPlan newCDP = StereotypeUtil.applyApp(tmCDP, DeploymentPlan.class);
+			newCDP.setMainInstance(newRootIS);
 			monitor.worked(1);
 
 			// 1c: late bindings
 			// LateEval.bindLateOperations();
 			// 3: distribute to nodes
 
+			ApplyInstanceConfigurators.applyInstanceConfigurators(newRootIS);
+
 			FlattenInteractionComponents.getInstance().flattenAssembly(newRootIS, null);
 			
 			String tmpPath = tmpMM.getPath(project, TEMP_MODEL_FOLDER, tmpModel.getName() + TEMP_MODEL_POSTFIX);
@@ -213,21 +225,22 @@ public class InstantiateDepPlan {
 
 				nodes = AllocUtils.getAllNodes(newRootIS);
 				if(nodes.size() == 0) {
-					throw new TransformationException("None of the instances in the deployment plan is allocated to a node. Verify the node allocation.");
+					throw new TransformationException(Messages.InstantiateDepPlan_InfoNoneAllocated);
 				}
 				int nodeIndex = 0;
 				Classifier cl = DepUtils.getClassifier(rootIS);
-				String targetLanguage = DepUtils.getLanguageFromClassifier(cl);
+				String targetLanguage = DepUtils.getLanguageFromPackage(cl.getNearestPackage());
 				if (targetLanguage == null) {
-					targetLanguage = "C++";
+					targetLanguage = "C++"; //$NON-NLS-1$
 				}
-				
+	
+				InstanceConfigurator.onNodeModel = true;
 				for(InstanceSpecification node : nodes) {
-					String modelName = existingModel.getName() + "_" + node.getName();
+					String modelName = existingModel.getName() + "_" + node.getName(); //$NON-NLS-1$
 					if(configuration != null) {
-						modelName += "_" + configuration.getBase_Class().getName();
+						modelName += "_" + configuration.getBase_Class().getName(); //$NON-NLS-1$
 					} else {
-						modelName += "_" + cdp.getName();
+						modelName += "_" + smCDP.getName(); //$NON-NLS-1$
 					}
 					ModelManagement genMM = createTargetModel(existingModel, monitor, MapUtil.rootModelName, false);
 					Model genModel = genMM.getModel();
@@ -246,7 +259,7 @@ public class InstantiateDepPlan {
 					targetCopy.preCopyListeners.add(FilterRuleApplication.getInstance());
 					targetCopy.postCopyListeners.add(InstantiateCppIncludeWOB.getInstance());
 
-					monitor.setTaskName("deploying for node " + node.getName());
+					monitor.setTaskName(String.format(Messages.InstantiateDepPlan_InfoDeployingForNode, node.getName()));
 					ILangSupport langSupport = LanguageSupport.getLangSupport(targetLanguage);
 					langSupport.resetConfigurationData();
 
@@ -262,7 +275,7 @@ public class InstantiateDepPlan {
 					//     Due to the copying of imports, the top-level package has changed which implies that new
 					//     derived interfaces are put into a different package and the derivedInterfaces package in
 					//     the original root becomes obsolete. Delete this obsolete package, if existing.
-					NamedElement derivedInterfaces = Utils.getQualifiedElement(genModel, "root::derivedInterfaces");
+					NamedElement derivedInterfaces = Utils.getQualifiedElement(genModel, "root::derivedInterfaces"); //$NON-NLS-1$
 					if(derivedInterfaces instanceof Package) {
 						derivedInterfaces.destroy();
 					}
@@ -290,6 +303,10 @@ public class InstantiateDepPlan {
 					}
 					monitor.worked(1);
 
+					PackageableElement depPlanFolder = genModel.getPackagedElement(DeployConstants.depPlanFolderHw);
+					if (depPlanFolder != null) {
+						depPlanFolder.destroy();
+					}
 					IProject genProject = ProjectManagement.getNamedProject(modelName);
 					if((genProject == null) || !genProject.exists()) {
 						genProject = langSupport.createProject(modelName, node);
@@ -301,6 +318,7 @@ public class InstantiateDepPlan {
 						}
 					}
 
+					
 					if(generateCode) {
 						GenerateCode codeGen = new GenerateCode(genProject, langSupport, genMM, monitor);
 						codeGen.generate(node, targetLanguage, (genOptions & GenerationOptions.ONLY_CHANGED) != 0);
@@ -317,7 +335,7 @@ public class InstantiateDepPlan {
 
 				public void run() {
 					Shell shell = new Shell();
-					MessageDialog.openError(shell, "A transformation exception occurred", teFinal.getMessage());   //$NON-NLS-1$
+					MessageDialog.openError(shell, Messages.InstantiateDepPlan_TransformationException, teFinal.getMessage());
 				}
 			});
 			Log.log(Status.ERROR, Log.DEPLOYMENT, "", teFinal);   //$NON-NLS-1$
@@ -329,8 +347,8 @@ public class InstantiateDepPlan {
 				public void run() {
 					Shell shell = new Shell();
 					String msg = eFinal.toString() + "\n\n" +   //$NON-NLS-1$
-						"Consult error log or console for details";   //$NON-NLS-1$
-					MessageDialog.openError(shell, "An error occurred during transformation", msg);  //$NON-NLS-1$
+						Messages.InstantiateDepPlan_ConsultConsole; 
+					MessageDialog.openError(shell, Messages.InstantiateDepPlan_ErrorsDuringTransformation, msg);
 				}
 			});
 			Log.log(Status.ERROR, Log.DEPLOYMENT, "", e);  //$NON-NLS-1$
@@ -342,8 +360,8 @@ public class InstantiateDepPlan {
 			Display.getDefault().syncExec(new Runnable() {
 				public void run() {
 					Shell shell = new Shell();
-					MessageDialog.openInformation(shell, "Acceleo errors occured", //$NON-NLS-1$
-						"Acceleo errors occured during code generation. Please check the error log");  //$NON-NLS-1$
+					MessageDialog.openInformation(shell, Messages.InstantiateDepPlan_AcceleoErrors,
+						Messages.InstantiateDepPlan_AcceleoErrorsCheckLog);
 				}
 			});
 		}
@@ -367,7 +385,7 @@ public class InstantiateDepPlan {
 			// copy profile application
 			for(Profile profile : existingModel.getAppliedProfiles()) {
 				// reload profile in resource of new model
-				monitor.subTask("apply profile " + profile.getQualifiedName());
+				monitor.subTask(Messages.InstantiateDepPlan_InfoApplyProfile + profile.getQualifiedName());
 
 				if(profile.eResource() == null) {
 					String profileName = profile.getQualifiedName();
@@ -375,12 +393,12 @@ public class InstantiateDepPlan {
 						if(profile instanceof MinimalEObjectImpl.Container) {
 							URI uri = ((MinimalEObjectImpl.Container)profile).eProxyURI();
 							if(uri != null) {
-								throw new TransformationException("Check input model: the applied profile with URI \"" + uri + "\" has no name and is not contained in a resource");
+								throw new TransformationException(String.format(Messages.InstantiateDepPlan_CheckInputModelProfileNoRes, uri));
 							}
 						}
-						throw new TransformationException("Check input model: one of the applied profiles has no name and is not contained in a resource");
+						throw new TransformationException(Messages.InstantiateDepPlan_CheckInputModelProfileNoResNoName);
 					}
-					throw new TransformationException("Check input model: profile \"" + profileName + "\" is not contained in a resource");
+					throw new TransformationException(String.format(Messages.InstantiateDepPlan_CheckInputModelProfile3, profileName));
 				}
 
 				Resource profileResource = null;
@@ -410,7 +428,7 @@ public class InstantiateDepPlan {
 				newModel.applyProfile(newProfile);
 			}
 		} catch (IllegalArgumentException e) {
-			throw new TransformationException("An Illegal argument exception occured during the copy of profile applications. This may indicate that the original model contains an invalid profile application\n\n" + e.toString());
+			throw new TransformationException(Messages.InstantiateDepPlan_IllegalArgumentDuringCopy + e.toString());
 		}
 
 		// copy imports (and load resources associated - TODO: might not be necessary)
@@ -421,24 +439,24 @@ public class InstantiateDepPlan {
 		if(copyImports) {
 			for(Package importedPackage : existingModel.getImportedPackages()) {
 				if(importedPackage == null) {
-					throw new TransformationException("An imported package is null. Verify the imported packages");
+					throw new TransformationException(Messages.InstantiateDepPlan_CheckInputImportPkg);
 				}
 				if(importedPackage.eResource() == null) {
-					String errorMsg = "An imported package has no eResource. Verify imported packages";
+					String errorMsg = Messages.InstantiateDepPlan_CheckInputImportPkgNoRes;
 					if(importedPackage instanceof MinimalEObjectImpl.Container) {
 						URI uri = ((MinimalEObjectImpl.Container)importedPackage).eProxyURI();
 						if(uri != null) {
-							errorMsg += " - URI: " + uri.devicePath();
+							errorMsg += " - URI: " + uri.devicePath(); //$NON-NLS-1$
 						}
 					}
 					throw new TransformationException(errorMsg);
 				}
 				newModel.createPackageImport(importedPackage);
-				monitor.subTask("import package " + importedPackage.getName());
+				monitor.subTask(String.format(Messages.InstantiateDepPlan_InfoImportPackage, importedPackage.getName()));
 
 				try {
 					importedPackage.eResource().load(null);
-					newModel.getMember("dummy"); // force loading of model
+					newModel.getMember("dummy"); // force loading of model //$NON-NLS-1$
 				} catch (IOException e) {
 					throw new TransformationException(e.getMessage());
 				}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/LWContainerTrafo.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/LWContainerTrafo.java
index 880e70d9b7c..d47ec6d4196 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/LWContainerTrafo.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/LWContainerTrafo.java
@@ -23,8 +23,11 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.papyrus.FCM.ContainerRule;
 import org.eclipse.papyrus.FCM.InterceptionRule;
 import org.eclipse.papyrus.FCM.Template;
+import org.eclipse.papyrus.qompass.designer.core.Messages;
 import org.eclipse.papyrus.qompass.designer.core.StUtils;
 import org.eclipse.papyrus.qompass.designer.core.acceleo.AcceleoDriverWrapper;
+import org.eclipse.papyrus.qompass.designer.core.deployment.DepCreation;
+import org.eclipse.papyrus.qompass.designer.core.deployment.DepUtils;
 import org.eclipse.papyrus.qompass.designer.core.extensions.InstanceConfigurator;
 import org.eclipse.papyrus.qompass.designer.core.templates.TemplateInstantiation;
 import org.eclipse.papyrus.qompass.designer.core.templates.TemplateUtils;
@@ -56,12 +59,12 @@ import org.eclipse.uml2.uml.UMLPackage;
 public class LWContainerTrafo extends AbstractContainerTrafo {
 
 	public final String interceptor =
-		"[import org::eclipse::papyrus::qompass::designer::core::acceleo::utils_cpp/]\n" +
-			"[template public dummy(operation : Operation)]\n" +
-			"[returnCppCall()/];\n" +
-			"[/template]\n";
+		"[import org::eclipse::papyrus::qompass::designer::core::acceleo::utils_cpp/]\n" + //$NON-NLS-1$
+			"[template public dummy(operation : Operation)]\n" + //$NON-NLS-1$
+			"[returnCppCall()/];\n" + //$NON-NLS-1$
+			"[/template]\n"; //$NON-NLS-1$
 
-	public final String origOpPrefix = "orig_";
+	public final String origOpPrefix = "orig_"; //$NON-NLS-1$
 
 	/**
 	 * Constructor
@@ -74,7 +77,6 @@ public class LWContainerTrafo extends AbstractContainerTrafo {
 	public LWContainerTrafo(Copy copy, Package tmCDP) {
 		this.copy = copy;
 		this.tmCDP = tmCDP;
-		configureOnly = false;
 		interceptionOpMap = new HashMap<Operation, Operation>();
 	}
 
@@ -113,19 +115,11 @@ public class LWContainerTrafo extends AbstractContainerTrafo {
 		operations = new BasicEList<Operation>(smClass.getAllOperations());
 	}
 
-	/**
-	 * Only configure the instances, i.e. avoid re-creating elements of the container, but create
-	 * the UML instance specifications
-	 */
-	public void configureOnly() {
-		configureOnly = true;
-	}
-
 	public void createInstance() {
 	}
 
 	/**
-	 * original operation => operation gets interception prefix"
+	 * original operation => operation gets interception prefix
 	 * 
 	 * Objectives: existing call operations call interception operation. Existing operations include CallOperationActions as well as calls within
 	 * opaque behavior
@@ -148,7 +142,7 @@ public class LWContainerTrafo extends AbstractContainerTrafo {
 		OpaqueBehavior b = (OpaqueBehavior)tmClass.createOwnedBehavior(operation.getName(), UMLPackage.eINSTANCE.getOpaqueBehavior());
 		String body = AcceleoDriverWrapper.bind(interceptor, copiedOperation);
 		// TODO: solution is specific to C++
-		b.getLanguages().add("C/C++");
+		b.getLanguages().add("C/C++"); //$NON-NLS-1$
 		b.getBodies().add(body);
 		// copy existing methods into new operation, copy method list,
 		// since adding the method to copied operation will remove these from original operation)
@@ -172,7 +166,7 @@ public class LWContainerTrafo extends AbstractContainerTrafo {
 
 	/**
 	 * apply a container rule, i.e. add either a container extension or an
-	 * interceptor to the container
+	 * interceptor to the container.
 	 * 
 	 * @param smContainerRule
 	 *        An container rule
@@ -184,11 +178,9 @@ public class LWContainerTrafo extends AbstractContainerTrafo {
 	 *        the instance specification for the application component in the target model
 	 * @throws TransformationException
 	 */
-	public void applyRule(ContainerRule smContainerRule, Class smComponent, Class tmComponent, InstanceSpecification tmIS)
+	public void applyRule(ContainerRule smContainerRule, Class smComponent, Class tmComponent)
 		throws TransformationException
 	{
-		Map<Property, EList<Property>> interceptorPartsMap = new HashMap<Property, EList<Property>>();
-
 		// dependencies of the rule become dependencies of he class. These dependencies must be instantiated
 		for(Dependency dependency : smContainerRule.getBase_Class().getClientDependencies()) {
 			//
@@ -213,8 +205,8 @@ public class LWContainerTrafo extends AbstractContainerTrafo {
 		for(Property part : smContainerRule.getBase_Class().getAllAttributes()) {
 			Type type = part.getType();
 			if(type == null) {
-				String ruleName = (smContainerRule.getBase_Class() != null) ? smContainerRule.getBase_Class().getName() : "undefined";
-				throw new TransformationException("Cannot apply container rule <" + ruleName + ">, since the type of one of its parts is undefined. Check for unresolved proxies in imports");
+				String ruleName = (smContainerRule.getBase_Class() != null) ? smContainerRule.getBase_Class().getName() : "undefined"; //$NON-NLS-1$
+				throw new TransformationException(String.format(Messages.LWContainerTrafo_0, ruleName));
 			}
 			if(part instanceof Port) {
 				Port newPort = tmClass.createOwnedPort(part.getName(), part.getType());
@@ -243,8 +235,7 @@ public class LWContainerTrafo extends AbstractContainerTrafo {
 				tmClass.getOwnedAttributes().add(newAttribute);
 			}
 		}
-		InstanceConfigurator.configureInstance(smContainerRule, containerIS, null, context);
-
+	
 		// tell copy that tmcontainerImpl is associated with the smContainerRule
 		// register a package template (although it is not a template) to assure that the connectors
 		// get copied, although they are in a different resource (only the connectors are copied, not
@@ -263,26 +254,14 @@ public class LWContainerTrafo extends AbstractContainerTrafo {
 	 * extension in order to avoid copying ports.
 	 */
 	Property expandAggregationExtension(String name, Class smContainerExtImpl, Class tmComponent) throws TransformationException {
-		Property extensionPart;
-		Class tmContainerExtImpl = null;
-		if(configureOnly) {
-			extensionPart = tmClass.getAttribute(name, null);
-			if((extensionPart != null) && extensionPart.getType() instanceof Class) {
-				tmContainerExtImpl = (Class)extensionPart.getType();
-			}
-		}
-		else {
-			tmContainerExtImpl = expandAggregationDep(smContainerExtImpl, tmComponent);
+		Class tmContainerExtImpl = expandAggregationDep(smContainerExtImpl, tmComponent);
+
+		// add part associated with the extension to the container
+		Property extensionPart = tmClass.createOwnedAttribute(name, tmContainerExtImpl);
 
-			// add part associated with the extension to the container
-			extensionPart = tmClass.createOwnedAttribute(name, tmContainerExtImpl);
-		}
 		// problem: would not be unique in case of multiple extensions
 		// Copy.copyID(tmComponent, extensionPart, "a");
 		extensionPart.setIsComposite(true);
-		// TODO separation of container creation and instance creation
-		// configure extension
-		InstanceConfigurator.configureInstance(containerIS, extensionPart, context);
 
 		return extensionPart;
 	}
@@ -316,7 +295,7 @@ public class LWContainerTrafo extends AbstractContainerTrafo {
 	{
 		for(Operation smOperation : operations) {
 			Operation tmOperation = copy.getCopy(smOperation);
-			String interceptionBody = "";
+			String interceptionBody = ""; //$NON-NLS-1$
 			for(Behavior behavior : interceptionOperationInRule.getMethods()) {
 				if(behavior instanceof OpaqueBehavior) {
 					EList<String> bodies = ((OpaqueBehavior)behavior).getBodies();
@@ -333,7 +312,7 @@ public class LWContainerTrafo extends AbstractContainerTrafo {
 			}
 			if(interceptionBody.length() > 0) {
 				// only add interception operation, if the interception is not empty
-				interceptionBody = "// --- interception code from rule <" + smContainerRule.getBase_Class().getName() + "> ---\n" +
+				interceptionBody = "// --- interception code from rule <" + smContainerRule.getBase_Class().getName() + "> ---\n" + //$NON-NLS-1$ //$NON-NLS-2$
 					interceptionBody;
 				Operation interceptionOpInClass = interceptionOpMap.get(tmOperation);
 				if(interceptionOpInClass == null) {
@@ -347,7 +326,8 @@ public class LWContainerTrafo extends AbstractContainerTrafo {
 						EList<String> bodies = ((OpaqueBehavior)behavior).getBodies();
 						if(bodies.size() > 0) {
 							// always take first
-							String newBody = interceptionBody + "\n" + bodies.get(0);
+							String newBody = interceptionBody + "\n" +  //$NON-NLS-1$
+									bodies.get(0);
 							((OpaqueBehavior)behavior).getBodies().set(0, newBody);
 						}
 					}
@@ -363,10 +343,30 @@ public class LWContainerTrafo extends AbstractContainerTrafo {
 
 	protected Map<Operation, Operation> interceptionOpMap;
 
+	/**
+	 * @see AbstractContainerTrafo.createContainerInstance
+	 */
 	@Override
-	public void createContainerInstance(Class tmComponent, InstanceSpecification tmIS, ContainerContext context) {
-		containerIS = tmIS;
-		this.context = context;
-		this.context.executorIS = tmIS;
+	public InstanceSpecification createContainerInstance(Class tmComponent, InstanceSpecification executorIS) throws TransformationException {
+		InstanceSpecification containerIS = executorIS;
+		// TODO ... incomplete!
+		// InstanceConfigurator.configureInstance(smContainerRule, containerIS, null, context);
+	
+		// now create instances for the contained elements
+		for(Property extensionPart : tmComponent.getAttributes()) {
+			Type tmContainerExtImpl = extensionPart.getType();
+			if(tmContainerExtImpl instanceof Class) {
+				if (DepUtils.getSlot(executorIS, extensionPart) == null) {
+					// no slot for part exists => assume that the part has been added by the container and create an instance specification for it.
+		
+					InstanceSpecification containerExtIS = DepCreation.createDepPlan(tmCDP, (Class)tmContainerExtImpl, containerIS.getName() + "." + //$NON-NLS-1$
+						extensionPart.getName(), false);
+					// configure extension
+					InstanceConfigurator.configureInstance(containerExtIS, extensionPart, null);
+					DepCreation.createSlot(containerIS, containerExtIS, extensionPart);
+				}
+			}
+		}
+		return containerIS;
 	}
 }
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/MainModelTrafo.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/MainModelTrafo.java
index 67b1d61af18..8bfea62d6af 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/MainModelTrafo.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/MainModelTrafo.java
@@ -28,14 +28,13 @@ import java.util.Map;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.papyrus.FCM.ConfigOption;
-import org.eclipse.papyrus.FCM.Configuration;
 import org.eclipse.papyrus.FCM.ContainerRule;
 import org.eclipse.papyrus.FCM.ContainerRuleKind;
 import org.eclipse.papyrus.FCM.DeploymentPlan;
 import org.eclipse.papyrus.FCM.InteractionComponent;
 import org.eclipse.papyrus.FCM.util.FCMUtil;
 import org.eclipse.papyrus.qompass.designer.core.Log;
+import org.eclipse.papyrus.qompass.designer.core.Messages;
 import org.eclipse.papyrus.qompass.designer.core.PortUtils;
 import org.eclipse.papyrus.qompass.designer.core.StUtils;
 import org.eclipse.papyrus.qompass.designer.core.acceleo.UMLTool;
@@ -43,7 +42,6 @@ import org.eclipse.papyrus.qompass.designer.core.deployment.AllocUtils;
 import org.eclipse.papyrus.qompass.designer.core.deployment.DepCreation;
 import org.eclipse.papyrus.qompass.designer.core.deployment.DepPlanUtils;
 import org.eclipse.papyrus.qompass.designer.core.deployment.DepUtils;
-import org.eclipse.papyrus.qompass.designer.core.extensions.InstanceConfigurator;
 import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil;
 import org.eclipse.uml2.uml.Class;
 import org.eclipse.uml2.uml.Classifier;
@@ -69,13 +67,23 @@ import org.eclipse.uml2.uml.util.UMLUtil;
  */
 public class MainModelTrafo {
 
-	private static Configuration m_config;
 
-	public static void setConfiguration(Configuration config) {
-		m_config = config;
+	public static final String HW_COMP_PREFIX = "Hwc"; //$NON-NLS-1$
+	
+	/**
+	 * Create a new instance of main-model-transformation
+	 * 
+	 * @param copy
+	 *        Copier
+	 * @param tmCDP
+	 *        deployment plan in target model
+	 */
+	public MainModelTrafo(Copy copy, Package tmCDP) {
 		nodeHandled = new HashMap<InstanceSpecification, Boolean>();
+		this.copy = copy;
+		this.tmCDP = tmCDP;
 	}
-
+	
 	/**
 	 * Return an instance specification that corresponds to a part. This
 	 * function is useful in the connector context, since it allows to retrieve
@@ -140,24 +148,6 @@ public class MainModelTrafo {
 		return null;
 	}
 
-	/**
-	 * check whether a rule is active in a given configuration
-	 * 
-	 * @param aRule
-	 * @return
-	 */
-	private static boolean isRuleActive(ContainerRule rule) {
-		if(m_config != null) {
-			for(ConfigOption option : m_config.getConfigOptions()) {
-				if(rule.getForConfig().contains(option)) {
-					return true;
-				}
-			}
-		}
-		// not already true via specific configuration.
-		// => Also turn on rules by default that are not for a specific configuration option
-		return (rule.getForConfig().size() == 0);
-	}
 
 	/**
 	 * This method performs a model transformation that replaces an Qompass
@@ -170,10 +160,6 @@ public class MainModelTrafo {
 	 * convention to prefix elements of the source model (wrt. to the
 	 * transformation) with sm and elements of the target model with tm.
 	 * 
-	 * @param copy
-	 *        Copier
-	 * @param tmCDP
-	 *        deployment plan in target model
 	 * @param smIS
 	 *        source model instance specification
 	 * @param smDF
@@ -184,7 +170,7 @@ public class MainModelTrafo {
 	 * 
 	 * @throws TransformationException
 	 */
-	public static InstanceSpecification mainModelTrafo(Copy copy, Package tmCDP,
+	public InstanceSpecification transformInstance(
 		InstanceSpecification smIS, StructuralFeature smDF) throws TransformationException {
 		Class smComponent = null;
 		Classifier smCl = DepUtils.getClassifier(smIS);
@@ -216,42 +202,47 @@ public class MainModelTrafo {
 		// the method createContainerInstance must be called for each instance of the application component
 		// (caveat: don't mix-up with instance of Java classes of the development tool)
 		// TODO: since we support multiple container kinds, we need to keep their container map separate!
-		if(containerTrafo != null) {
-			// create instance, if container exists already (if a container exists, all instances are
-			// instances of the container
-			containerTrafo.configureOnly();
-			containerTrafo.createContainerInstance(tmComponent, tmIS, new ContainerContext(smDF, null));
-		}
-		else {
-			// process container rules
+		InstanceSpecification containerIS = null;
+		if(containerTrafo == null) {
+			// no container exists, check rules and create eventually
 			for(ContainerRule rule : rules) {
-				if(isRuleActive(rule)) {
+				if(RuleManagement.isRuleActive(rule)) {
 					// at least one active rule => create container (or get previously instantiated))
 					if(containerTrafo == null) {
 						if(rule.getKind() == ContainerRuleKind.LIGHT_WEIGHT_OO_RULE) {
 							containerTrafo = new LWContainerTrafo(copy, tmCDP);
 						}
 						else {
-							containerTrafo = new ContainerTrafo(copy, tmCDP);
+							containerTrafo = new ContainerTrafo(copy, tmCDP, tmIS);
 						}
-						// create container instance once for all rules (that use same container kind)
 						containerTrafo.createContainer(smComponent, tmComponent);
-						containerTrafo.createContainerInstance(tmComponent, tmIS, new ContainerContext(smDF, null));
 					}
 					else {
 						// configure only??
 					}
-					containerTrafo.applyRule(rule, smComponent, tmComponent, tmIS);
+					containerTrafo.applyRule(rule, smComponent, tmComponent);
 				}
-				// TODO(?) check if rule has already been applied (don't mix-up instances/classes)
+			}
+			if (containerTrafo != null) {
+				containerTrafo.finalize();
 			}
 		}
+		if (containerTrafo != null) {
+			// create instance of container. This is done after rule application, since
+			// elements that are added by the rules need to be instantiated as well.
+			// TODO: Cannot mix both rules.
+			containerIS = containerTrafo.createContainerInstance(tmComponent, tmIS);
+		}
+		// ------------------- end of container handling of SW nodes
+
 		// copy node allocation
 		for(InstanceSpecification smNode : AllocUtils.getNodes(smIS)) {
 			InstanceSpecification tmNode = copy.getCopy(smNode);
 			AllocUtils.allocate(tmIS, tmNode);
 
 			if(!nodeHandled.containsKey(tmNode)) {
+				// check if node (on an instance level) has already been treated. This is required, since many
+				// instances might be allocated to the same node.
 				nodeHandled.put(tmNode, true);
 
 				// check, whether a container rule is applied on the tmNode
@@ -262,65 +253,57 @@ public class MainModelTrafo {
 
 					if(hwRules.size() > 0) {
 
-						AbstractContainerTrafo abstractNodeContainerTrafo = ContainerTrafo.get((Class)tmCS);
-						if(abstractNodeContainerTrafo instanceof ContainerTrafo) {
-
-							ContainerTrafo nodeContainerTrafo = (ContainerTrafo)abstractNodeContainerTrafo;
-							// make copy of inheritedRule list (avoid that added elements remain in single rule list passed to all)
-
-							// issues
-							//   - unlike SW component container, don't update references pointing towards the HW node 
-							//   - create additional part in system (top-level) component for the node container
-							//   - container (_cc class) appears in platform component (same package as HW node)
-							//	 - port copying and creation of delegation connectors does not make much sense, creation of
-							//	   executor itself does not make much sense, additional operation "createHwContainer"
-
-							// obtain property related to node instance
-							Slot smNodeSlot = DepUtils.getParentSlot(smNode);
-							ContainerContext context = new ContainerContext(smDF, smNodeSlot != null ? smNodeSlot.getDefiningFeature() : null);
-
-							if(nodeContainerTrafo != null) {
-								// only create instance, if container exists already
-								nodeContainerTrafo.configureOnly();
-								nodeContainerTrafo.createHwContainerInstance(tmComponent, tmNode, context);
-							}
-
-							Package smCDP = smIS.getNearestPackage();
-							DeploymentPlan smFCM_CDP = UMLUtil.getStereotypeApplication(smCDP, DeploymentPlan.class);
-
+						ContainerTrafo nodeContainerTrafo = (ContainerTrafo) ContainerTrafo.get((Class)tmCS);
+						
+						// issues
+						//   - unlike SW component container, don't update references pointing towards the HW node 
+						//   - create additional part in system (top-level) component for the node container
+						//   - container (_cc class) appears in platform component (same package as HW node)
+						//	 - port copying and creation of delegation connectors does not make much sense, creation of
+						//	   executor itself does not make much sense, additional operation "createHwContainer"
+
+						// obtain property related to node instance
+						Slot smNodeSlot = DepUtils.getParentSlot(smNode);
+						Package smCDP = smIS.getNearestPackage();
+						DeploymentPlan smFCM_CDP = UMLUtil.getStereotypeApplication(smCDP, DeploymentPlan.class);
+
+						if(nodeContainerTrafo == null) {
+							// container does not exist, check rules and create eventually
 							for(ContainerRule rule : hwRules) {
-								if(isRuleActive(rule)) {
+								if(RuleManagement.isRuleActive(rule)) {
 									if(nodeContainerTrafo == null) {
 										// at least one active rule => create container (or get previously instantiated))
-										nodeContainerTrafo = new ContainerTrafo(copy, tmCDP);
+										nodeContainerTrafo = new ContainerTrafo(copy, tmCDP, tmIS);
 										nodeContainerTrafo.createHwContainer((Class)tmCS);
-										nodeContainerTrafo.createHwContainerInstance(tmComponent, tmNode, context);
+										nodeContainerTrafo.applyRule(rule, smComponent, tmComponent);
 									}
-									nodeContainerTrafo.applyRule(rule, smComponent, tmComponent, tmIS);
-
-									// now add attribute in system (obtain via classifier of main instance in smCDP)
-									if(smFCM_CDP != null) {
-										InstanceSpecification smMI = smFCM_CDP.getMainInstance();
-										Classifier smSystem = DepUtils.getClassifier(smMI);
-										Classifier tmSystem = copy.getCopy(smSystem);
-										InstanceSpecification tmMI = DepUtils.getInstanceForClassifier(tmCDP, tmSystem);
-										if(tmSystem instanceof Class) {
-											Property hwcPart =
-												((Class)tmSystem).createOwnedAttribute(smNode.getName() + "Hwc", nodeContainerTrafo.getContainer());
-											// and now create a slot for the created instance.
-											DepPlanUtils.createSlot(tmCDP, tmMI, nodeContainerTrafo.getContainerIS(), hwcPart);
-										}
-									}
-
-									// now allocate instance
-									AllocUtils.allocate(nodeContainerTrafo.getContainerIS(), tmNode);
 								}
 							}
 						}
+						if (nodeContainerTrafo != null) {
+							InstanceSpecification hwContainerIS =
+								nodeContainerTrafo.createHwContainerInstance(tmComponent, tmNode);
+							// now add attribute in system (obtain via classifier of main instance in smCDP)
+							if(smFCM_CDP != null) {
+								InstanceSpecification smMI = smFCM_CDP.getMainInstance();
+								Classifier smSystem = DepUtils.getClassifier(smMI);
+								Classifier tmSystem = copy.getCopy(smSystem);
+								InstanceSpecification tmMI = DepUtils.getInstanceForClassifier(tmCDP, tmSystem);
+								if(tmSystem instanceof Class) {
+									Property hwcPart =
+										((Class)tmSystem).createOwnedAttribute(smNode.getName() + HW_COMP_PREFIX, nodeContainerTrafo.getContainer());
+									// and now create a slot for the created instance.
+									DepPlanUtils.createSlot(tmCDP, tmMI, hwContainerIS, hwcPart);
+								}
+
+								// now allocate instance
+								AllocUtils.allocate(hwContainerIS, tmNode);
+							}
+						}
 					}
 				}
 			}
-		} // ------------------- handling of HW nodes
+		} // ------------------- end of container handling of HW nodes
 
 
 		// reread instName (may have been changed by container transformation).
@@ -332,8 +315,7 @@ public class MainModelTrafo {
 		for(Slot slot : smIS.getSlots()) {
 			if(slot.getDefiningFeature() == null) {
 				throw new TransformationException(
-					"Error: no defining feature associated with \""
-						+ smIS.getName() + "\"");
+					String.format(Messages.MainModelTrafo_NoDefiningFeature, smIS.getName()));
 			}
 			StructuralFeature smPartDF = slot.getDefiningFeature();
 			if(StereotypeUtil.isApplied(smPartDF.getType(), InteractionComponent.class)) {
@@ -356,14 +338,13 @@ public class MainModelTrafo {
 				InstanceSpecification smPartIS = DepUtils.getInstance(slot);
 				if(smPartIS == null) {
 					throw new TransformationException(
-						"Error: no instance is associated with slot for feature \""
-							+ smPartDF.getName() + "\"");
+						String.format(Messages.MainModelTrafo_NoInstanceAssociated, smPartDF.getName()));
 				}
 
 				// recursive reification
 				// returned instance specification in target model is an instance specification for the part
 				// or for a container for that part.
-				InstanceSpecification tmPartIS = mainModelTrafo(copy, tmCDP, smPartIS, smPartDF);
+				InstanceSpecification tmPartIS = transformInstance(smPartIS, smPartDF);
 				// AllocUtils.propagateNodesViaPort (tmPartIS, null, AllocUtils.getNodes(containedInstance));
 
 				// retrieve part in the target model (it has been created during
@@ -375,8 +356,7 @@ public class MainModelTrafo {
 				// (due to a container transformation)
 				// modification would not be required, if 
 				if((tmPartIS != null) && (DepUtils.getClassifier(tmPartIS) != tmPart.getType())) {
-					Log.log(Status.INFO, Log.TRAFO_CONNECTOR, "change type of part " + tmPart.getName() +
-						" due to container trafo");
+					Log.log(Status.INFO, Log.TRAFO_CONNECTOR, String.format(Messages.MainModelTrafo_ChangePartType, tmPart.getName()));
 					tmPart.setType(DepUtils.getClassifier(tmPartIS));
 				}
 				DepCreation.createSlot(tmIS, tmPartIS, tmPart);
@@ -391,8 +371,12 @@ public class MainModelTrafo {
 
 		}
 
+		// NamedElement socket = Utils.getQualifiedElement(smComponent.getModel(), "SocketRuntime::Socket");
+		// NamedElement socketCopy = copy.getCopy(socket);
+		
 		// loop on connectors
 		// TODO: check, if true (no instance specification exists for these - unlike a connector which is explicitly specified via a part)
+		// TODO: quite inefficient (and likely wrong), if same composite is instantiated several times (re-reification of connectors)
 		for(Connector smConnector : smComponent.getOwnedConnectors()) {
 			if(StUtils.isConnector(smConnector)) {
 				org.eclipse.papyrus.FCM.Connector fcmConn = StUtils.getConnector(smConnector);
@@ -414,7 +398,7 @@ public class MainModelTrafo {
 					// Now create an instance specification for the reified connector
 					InstanceSpecification tmReifiedConnectorIS = DepCreation.createDepPlan(
 						tmCDP, (Class)connectorPart.getType(),
-						instName + "." + smConnector.getName(), false);
+						instName + "." + smConnector.getName(), false); //$NON-NLS-1$
 
 					// copy slots from the source deployment plan that are related to connector configuration
 					InstanceSpecification smConnectorIS = DepUtils.getNamedSubInstance(smIS, smConnector.getName());
@@ -423,20 +407,8 @@ public class MainModelTrafo {
 						for(Slot smSlot : smConnectorIS.getSlots()) {
 							copy.getCopy(smSlot);
 						}
-						/*
-						 * InstanceSpecification tmConnectorIS = copy.getCopy(smConnectorIS);
-						 * Iterator<Slot> tmSlotIter = tmConnectorIS.getSlots().iterator();
-						 * while(tmSlotIter.hasNext()) {
-						 * Slot tmSlot = tmSlotIter.next();
-						 * tmReifiedConnectorIS.getSlots().add(hhtmSlot);
-						 * }
-						 * tmConnectorIS.getSlots().clear();
-						 */
 					}
 
-					// configure connector
-					InstanceConfigurator.configureInstance(tmReifiedConnectorIS, connectorPart, null);
-
 					Slot partSlot =
 						DepCreation.createSlot(tmIS, tmReifiedConnectorIS, connectorPart);
 
@@ -460,14 +432,23 @@ public class MainModelTrafo {
 		AllocTransfo at = new AllocTransfo();
 		at.transformAllocs(copy, tmComponent);
 		
-		if(containerTrafo != null) {
+		if(containerIS != null) {
 			// return containerIS
-			containerTrafo.moveSlots();
-			return containerTrafo.getContainerIS();
+			return containerIS;
 		} else {
 			return tmIS;
 		}
 	}
 
-	protected static Map<InstanceSpecification, Boolean> nodeHandled;
+	protected Map<InstanceSpecification, Boolean> nodeHandled;
+	
+	/**
+	 * Copier from source to target model
+	 */
+	protected Copy copy;	
+	
+	/**
+	 * deployment plan within target model
+	 */
+	protected Package tmCDP;
 }
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/PrefixConstants.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/PrefixConstants.java
index ae9b18003bb..d6e645561d7 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/PrefixConstants.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/PrefixConstants.java
@@ -27,9 +27,6 @@ public class PrefixConstants {
 
 	public static String connectQ_Prefix = "connect_"; //$NON-NLS-1$
 
-	@Deprecated
-	public static String equivIntfPrefix = "CCM_"; //$NON-NLS-1$
-
 	public static String attributePrefix = ""; //$NON-NLS-1$
 
 	enum CIFvariant {
@@ -39,23 +36,20 @@ public class PrefixConstants {
 	/**
 	 * Initialize a specific CIF variant
 	 * 
-	 * TODO might be currently unused
-	 * @param cif
+	 * TODO currently unused
+	 * @param cif Which CIF variant should used?
 	 */
 	void init(CIFvariant cif) {
 		if(cif == CIFvariant.UML) {
-			getP_Prefix = "get_";
-			// empty indicates that no getConnQ operation should be generated
-			getConnQ_Prefix = "";
-			connectQ_Prefix = "connect_";
-			// equivIntfPrefix = "CCM_";
-			attributePrefix = "";
+			getP_Prefix = "get_"; //$NON-NLS-1$
+			getConnQ_Prefix = ""; //$NON-NLS-1$
+			connectQ_Prefix = "connect_"; //$NON-NLS-1$
+			attributePrefix = ""; //$NON-NLS-1$
 		} else if(cif == CIFvariant.CCM) {
-			getP_Prefix = "get_";
-			getConnQ_Prefix = "getconnection_";
-			connectQ_Prefix = "connect_";
-			// equivIntfPrefix = "CCM_";
-			attributePrefix = "m_";
+			getP_Prefix = "get_"; //$NON-NLS-1$
+			getConnQ_Prefix = "getconnection_"; //$NON-NLS-1$
+			connectQ_Prefix = "connect_"; //$NON-NLS-1$
+			attributePrefix = "m_"; //$NON-NLS-1$
 		}
 	}
 };
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/RuleManagement.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/RuleManagement.java
new file mode 100644
index 00000000000..2afa92530b3
--- /dev/null
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/RuleManagement.java
@@ -0,0 +1,32 @@
+package org.eclipse.papyrus.qompass.designer.core.transformations;
+
+import org.eclipse.papyrus.FCM.ConfigOption;
+import org.eclipse.papyrus.FCM.Configuration;
+import org.eclipse.papyrus.FCM.ContainerRule;
+
+public class RuleManagement {
+	private static Configuration m_config;
+
+	public static void setConfiguration(Configuration config) {
+		m_config = config;
+	}
+
+	/**
+	 * check whether a rule is active in a given configuration
+	 * 
+	 * @param aRule
+	 * @return
+	 */
+	public static boolean isRuleActive(ContainerRule rule) {
+		if(m_config != null) {
+			for(ConfigOption option : m_config.getConfigOptions()) {
+				if(rule.getForConfig().contains(option)) {
+					return true;
+				}
+			}
+		}
+		// not already true via specific configuration.
+		// => Also turn on rules by default that are not for a specific configuration option
+		return (rule.getForConfig().size() == 0);
+	}
+}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/TrafoAndCodegenPackage.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/TrafoAndCodegenPackage.java
new file mode 100644
index 00000000000..13592311d51
--- /dev/null
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/TrafoAndCodegenPackage.java
@@ -0,0 +1,361 @@
+/*****************************************************************************
+ * 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:
+ *  Ansgar Radermacher  ansgar.radermacher@cea.fr  
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.qompass.designer.core.transformations;
+
+import java.io.IOException;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.common.util.BasicEList;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.common.util.WrappedException;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.papyrus.FCM.ContainerRule;
+import org.eclipse.papyrus.FCM.ContainerRuleKind;
+import org.eclipse.papyrus.FCM.util.FCMUtil;
+import org.eclipse.papyrus.acceleo.AcceleoDriver;
+import org.eclipse.papyrus.qompass.designer.core.Log;
+import org.eclipse.papyrus.qompass.designer.core.Messages;
+import org.eclipse.papyrus.qompass.designer.core.ModelManagement;
+import org.eclipse.papyrus.qompass.designer.core.StUtils;
+import org.eclipse.papyrus.qompass.designer.core.Utils;
+import org.eclipse.papyrus.qompass.designer.core.acceleo.EnumService;
+import org.eclipse.papyrus.qompass.designer.core.deployment.DepUtils;
+import org.eclipse.papyrus.qompass.designer.core.extensions.ILangSupport;
+import org.eclipse.papyrus.qompass.designer.core.extensions.LanguageSupport;
+import org.eclipse.papyrus.qompass.designer.core.generate.GenerateCode;
+import org.eclipse.papyrus.qompass.designer.core.templates.InstantiateCppIncludeWOB;
+import org.eclipse.papyrus.qompass.designer.core.transformations.filters.FilterComments;
+import org.eclipse.papyrus.qompass.designer.core.transformations.filters.FilterTemplate;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.uml2.uml.Class;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.Model;
+import org.eclipse.uml2.uml.Package;
+import org.eclipse.uml2.uml.PackageableElement;
+import org.eclipse.uml2.uml.Profile;
+
+/**
+ * This class executes all transformations during the instantiation of a
+ * deployment plan, i.e.
+ * 1. The reification of connectors (including template instantiation). This transformation targets a new model
+ * 2. Adding get_p/connect_q operations to a class (transformation within same model)
+ * 3. Remove all component types
+ * 4. distribute to nodes
+ * 
+ * @author ansgar
+ * 
+ */
+public class TrafoAndCodegenPackage {
+
+	/**
+	 * Iterate over source model and apply transformation
+	 * @param copy
+	 * @param pkg
+	 * @throws TransformationException
+	 */
+	public static void applyTrafo(Copy copy, Package pkg) throws TransformationException {
+		EList<PackageableElement> peList = new BasicEList<PackageableElement>();
+		peList.addAll(pkg.getPackagedElements());
+		for(PackageableElement element : peList) {
+			if(element instanceof Package) {
+				applyTrafo(copy, (Package)element);
+			}
+			else if(element instanceof Class) {
+			
+				Class smImplementation = (Class)element;
+				Class tmImplementation = copy.getCopy(smImplementation);
+				
+				// get container trafo instance, if already existing
+				AbstractContainerTrafo containerTrafo = ContainerTrafo.get(tmImplementation);
+
+				// we may not apply the transformation to the boot-loader itself, in particular it would transform
+				// singletons into pointers.
+				EList<ContainerRule> rules = FCMUtil.getAllContainerRules(smImplementation);
+				for(ContainerRule rule : rules) {
+					// if(RuleManagement.isRuleActive(rule)) {
+						// at least one active rule => create container (or get previously instantiated))
+						if(rule.getKind() == ContainerRuleKind.LIGHT_WEIGHT_OO_RULE) {
+							if (containerTrafo == null) {
+								// container does not exist yet, create
+								containerTrafo = new LWContainerTrafo(copy, null);
+								containerTrafo.createContainer(smImplementation, tmImplementation);
+							}
+							containerTrafo.applyRule(rule, smImplementation, tmImplementation);
+						}
+					}
+				// }
+			}
+		}
+	}
+	
+	/**
+	 * Instantiate a deployment plan, i.e. generate an intermediate model via a sequence of transformations
+	 * 
+	 * @param cdpOrConfig a deployment plan (UML package) or a configuration (UML class)
+	 * @param monitor  a progress monitor.
+	
+	 * @param project the current project. This information is used to store the intermediate model in
+	 * 	a subfolder (tmpModel) of the current project
+	 * @param genOptions select whether to produce an intermediate model only, also code, ... @see GenerationOptions
+	 */
+	public static void instantiate(Element cdpOrConfig, IProgressMonitor monitor, IProject project) {
+		if(project == null) {
+			String projectName = cdpOrConfig.eResource().getURI().toString();
+			project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
+		}
+		Model tmpModel = null;
+		ModelManagement tmpMM = null;
+
+		AcceleoDriver.clearErrors();
+		Package selectedPkg;
+		if(cdpOrConfig instanceof Package) {
+			selectedPkg = (Package)cdpOrConfig;
+			RuleManagement.setConfiguration(null);
+		}
+		else {
+			return;
+		}
+
+		try {
+			EnumService.init();
+			// Package copyCDP = dt.getCopyCDT (selectedCDP);
+
+			// -- calc # of steps for progress monitor
+			// 1 (tmpModel creation) + 1 (reification) + 1 (tmpModel save)
+			// 5x on each deployed node (see below)
+			// problem? Connector reification is a single, relatively long step
+			int steps = 3;
+
+			monitor.beginTask(Messages.InstantiateDepPlan_InfoGeneratingModel, steps);
+			if(monitor.isCanceled()) {
+				return;
+			}
+
+			// 1a: create a new model (and applies same profiles / imports)
+			Model existingModel = selectedPkg.getModel();
+			TransformationContext.sourceRoot = existingModel;
+			tmpMM = createTargetModel(existingModel, monitor, existingModel.getName(), true);
+			tmpModel = tmpMM.getModel();
+			// Declare that the new model is a derivedElement (kind of hack, since the source
+			// element (attribute of derive element) remains undefined). This is used to
+			// de-activate automatic transformations that should not be applied to the generated
+			// model.
+			monitor.worked(1);
+			if(monitor.isCanceled()) {
+				return;
+			}
+
+			// LateEval.clear();
+
+			EnumService.createEnumPackage(tmpModel);
+
+			Copy tmpCopy = new Copy(existingModel, tmpModel, false);
+			tmpCopy.preCopyListeners.add(FilterTemplate.getInstance());
+			tmpCopy.preCopyListeners.add(FilterComments.getInstance());
+			tmpCopy.postCopyListeners.add(InstantiateCppIncludeWOB.getInstance());
+
+			Copy.copyID(existingModel, tmpModel);
+
+			// 1b: reify the connectors "into" the new model
+			monitor.subTask(Messages.InstantiateDepPlan_InfoExpandingConnectors);
+
+			// obtain reference to CDP in target model
+			
+			ContainerTrafo.init();
+			monitor.worked(1);
+
+			// create recursive copy of selectedPackage
+			tmpCopy.getCopy(selectedPkg);
+			
+			// apply container transformation
+			applyTrafo(tmpCopy, selectedPkg);
+			
+			// 1c: late bindings
+			// LateEval.bindLateOperations();
+			// 3: distribute to nodes
+
+			String tmpPath = tmpMM.getPath(project, InstantiateDepPlan.TEMP_MODEL_FOLDER, tmpModel.getName() + InstantiateDepPlan.TEMP_MODEL_POSTFIX);
+			tmpMM.saveModel(tmpPath);
+
+			String targetLanguage = DepUtils.getLanguageFromPackage(selectedPkg);
+			if (targetLanguage == null) {
+				targetLanguage = "C++"; //$NON-NLS-1$
+			}
+			// genProject = project
+			ModelManagement genMM = tmpMM;
+			IProject genProject = project;
+			ILangSupport langSupport = LanguageSupport.getLangSupport(targetLanguage);
+			langSupport.resetConfigurationData();
+			
+			langSupport.setProject(genProject);
+	
+			GenerateCode codeGen = new GenerateCode(genProject, langSupport, genMM, monitor);
+			codeGen.generate(null, targetLanguage, false);
+
+			genMM.dispose();
+
+			if(monitor.isCanceled()) {
+				return;
+			}
+			monitor.worked(1);
+
+		} catch (TransformationException te) {
+			// Get UI thread to show dialog
+			final TransformationException teFinal = te;
+			Display.getDefault().syncExec(new Runnable() {
+
+				public void run() {
+					Shell shell = new Shell();
+					MessageDialog.openError(shell, Messages.InstantiateDepPlan_TransformationException, teFinal.getMessage());
+				}
+			});
+			Log.log(Status.ERROR, Log.DEPLOYMENT, "", teFinal);   //$NON-NLS-1$
+		} catch (Exception e) {
+			final Exception eFinal = e;
+			e.printStackTrace();
+			Display.getDefault().syncExec(new Runnable() {
+
+				public void run() {
+					Shell shell = new Shell();
+					String msg = eFinal.toString() + "\n\n" +   //$NON-NLS-1$
+						Messages.InstantiateDepPlan_ConsultConsole; 
+					MessageDialog.openError(shell, Messages.InstantiateDepPlan_ErrorsDuringTransformation, msg);
+				}
+			});
+			Log.log(Status.ERROR, Log.DEPLOYMENT, "", e);  //$NON-NLS-1$
+		}
+		if(tmpMM != null) {
+			tmpMM.dispose();
+		}
+		if (AcceleoDriver.hasErrors()) {
+			Display.getDefault().syncExec(new Runnable() {
+				public void run() {
+					Shell shell = new Shell();
+					MessageDialog.openInformation(shell, Messages.InstantiateDepPlan_AcceleoErrors,
+						Messages.InstantiateDepPlan_AcceleoErrorsCheckLog);
+				}
+			});
+		}
+
+	}
+
+
+	/**
+	 * Create a new empty model from an existing model that applies the same
+	 * profiles and has the same imports
+	 * 
+	 * @param existingModel
+	 * @return
+	 */
+	public static ModelManagement createTargetModel(Model existingModel, IProgressMonitor monitor, String name, boolean copyImports) throws TransformationException {
+		ModelManagement mm = new ModelManagement();
+		Model newModel = mm.getModel();
+		newModel.setName(name);
+
+		try {
+			// copy profile application
+			for(Profile profile : existingModel.getAppliedProfiles()) {
+				// reload profile in resource of new model
+				monitor.subTask(Messages.InstantiateDepPlan_InfoApplyProfile + profile.getQualifiedName());
+
+				if(profile.eResource() == null) {
+					String profileName = profile.getQualifiedName();
+					if(profileName == null) {
+						if(profile instanceof MinimalEObjectImpl.Container) {
+							URI uri = ((MinimalEObjectImpl.Container)profile).eProxyURI();
+							if(uri != null) {
+								throw new TransformationException(String.format(Messages.InstantiateDepPlan_CheckInputModelProfileNoRes, uri));
+							}
+						}
+						throw new TransformationException(Messages.InstantiateDepPlan_CheckInputModelProfileNoResNoName);
+					}
+					throw new TransformationException(String.format(Messages.InstantiateDepPlan_CheckInputModelProfile3, profileName));
+				}
+
+				Resource profileResource = null;
+				try {
+					profileResource = ModelManagement.getResourceSet().getResource(profile.eResource().getURI(), true);
+				} catch (WrappedException e) {
+					// read 2nd time (some diagnostic errors are raised only once)
+					Log.log(Status.WARNING, Log.DEPLOYMENT, "Warning: exception in profile.eResource() " + e.getMessage()); //$NON-NLS-1$
+					profileResource = ModelManagement.getResourceSet().getResource(profile.eResource().getURI(), true);
+				}
+				Profile newProfileTop = (Profile)profileResource.getContents().get(0);
+				Profile newProfile;
+				String qname = profile.getQualifiedName();
+				if((qname != null) && qname.contains("::")) { //$NON-NLS-1$
+					// profile is a sub-profile within same resource
+					// TODO: should Copy class copy profile applications?
+					// Should be handled in shallowContainer class.
+					// if we put profile/newProfile pair into copy map, copy would find (and copy profile
+					// applications in sub-folders
+					qname = qname.substring(qname.indexOf("::") + 2); //$NON-NLS-1$
+					newProfile = (Profile)Utils.getQualifiedElement(newProfileTop, qname);
+				}
+				else {
+					newProfile = newProfileTop;
+				}
+				newProfile.getMember("dummy"); // force profile loading //$NON-NLS-1$
+				newModel.applyProfile(newProfile);
+			}
+		} catch (IllegalArgumentException e) {
+			throw new TransformationException(Messages.InstantiateDepPlan_IllegalArgumentDuringCopy + e.toString());
+		}
+
+		// copy imports (and load resources associated - TODO: might not be necessary)
+		// While this is useful in general, it implies that code for imported models
+		// has been generated and compiled (for the right target) into a library. This may be
+		// quite tedious, unless automatically managed.
+		// Therefore we do not activate this option in a first pass of the model transformations.
+		if(copyImports) {
+			for(Package importedPackage : existingModel.getImportedPackages()) {
+				if(importedPackage == null) {
+					throw new TransformationException(Messages.InstantiateDepPlan_CheckInputImportPkg);
+				}
+				if(importedPackage.eResource() == null) {
+					String errorMsg = Messages.InstantiateDepPlan_CheckInputImportPkgNoRes;
+					if(importedPackage instanceof MinimalEObjectImpl.Container) {
+						URI uri = ((MinimalEObjectImpl.Container)importedPackage).eProxyURI();
+						if(uri != null) {
+							errorMsg += " - URI: " + uri.devicePath(); //$NON-NLS-1$
+						}
+					}
+					throw new TransformationException(errorMsg);
+				}
+				newModel.createPackageImport(importedPackage);
+				monitor.subTask(String.format(Messages.InstantiateDepPlan_InfoImportPackage, importedPackage.getName()));
+
+				try {
+					importedPackage.eResource().load(null);
+					newModel.getMember("dummy"); // force loading of model //$NON-NLS-1$
+				} catch (IOException e) {
+					throw new TransformationException(e.getMessage());
+				}
+
+			}
+		}
+
+		StUtils.copyStereotypes(existingModel, newModel);
+
+		return mm;
+	}
+}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/TransformationContext.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/TransformationContext.java
index c128c9986c4..257cb02f99f 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/TransformationContext.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/TransformationContext.java
@@ -90,7 +90,7 @@ public class TransformationContext {
 			return actual.getQualifiedName();
 		}
 		else {
-			return "";
+			return ""; //$NON-NLS-1$
 		}
 	}
 
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/UpdateUtils.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/UpdateUtils.java
index 259bb029206..241d4711342 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/UpdateUtils.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/UpdateUtils.java
@@ -19,6 +19,7 @@ import java.util.Iterator;
 import org.eclipse.emf.common.util.BasicEList;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.papyrus.FCM.DerivedElement;
+import org.eclipse.papyrus.qompass.designer.core.Messages;
 import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil;
 import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.NamedElement;
@@ -63,7 +64,12 @@ public class UpdateUtils {
 
 	public static void setSource(Element derivedElement, Element source) {
 		DerivedElement de = StereotypeUtil.applyApp(derivedElement, DerivedElement.class);
-		de.setSource(source);
+		if (de != null) {
+			de.setSource(source);
+		}
+		else {
+			throw new TransformationRTException(Messages.UpdateUtils_CannotApplyFCMstereo);
+		}
 	}
 
 	public static Element getSource(Element element) {
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FilterStateMachines.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FilterStateMachines.java
index e12ff347c39..caa2cd88daa 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FilterStateMachines.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FilterStateMachines.java
@@ -47,7 +47,8 @@ public class FilterStateMachines implements CopyListener {
 					Behavior effect = transition.getEffect();
 					if(effect != null) {
 						if(tmClass != null) {
-							String newName = sm.getName() + "_" + transition.getName() + "_" + effect.getName();
+							String newName = sm.getName() + "_" + transition.getName()	//$NON-NLS-1$
+									+ "_" + effect.getName(); //$NON-NLS-1$
 							moveBehavior(newName, tmClass, effect);
 						}
 					}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FixTemplateSync.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FixTemplateSync.java
index d1b0fbbb8bd..02a492bb162 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FixTemplateSync.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/transformations/filters/FixTemplateSync.java
@@ -26,6 +26,7 @@ import org.eclipse.uml2.uml.Class;
  * Synchronize derived realizations (after copying). If re-synchronization is not done, the
  * relationship would point to wrong interface, if it is derived and depending on a formal parameter. 
  * (e.g. derived push interface with formal parameter T would be at wrong location).
+ * TODO: need better explanation. Solution is quite a hack.
  */
 public class FixTemplateSync implements CopyListener {
 
@@ -43,7 +44,9 @@ public class FixTemplateSync implements CopyListener {
 				Class implementation = (Class)targetEObj;
 				CompImplSync.updatePorts(implementation);
 				CompImplSync.syncRealizations(implementation);
-				CompImplSync.syncDerivedOperations(implementation);
+				// commented out, since it causes dangling references
+				// TODO: why needed originally? (
+				// CompImplSync.syncDerivedOperations(implementation);
 			}
 		}
 		return targetEObj;
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/.classpath b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/.classpath
index 64c5e31b7a2..ad32c83a788 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/.classpath
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/META-INF/MANIFEST.MF b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/META-INF/MANIFEST.MF
index 9b4c9eecf09..e4397cb34b1 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.cpp/META-INF/MANIFEST.MF
@@ -23,5 +23,5 @@ Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.qompass.designer.cpp.Activator

 Bundle-SymbolicName: org.eclipse.papyrus.qompass.designer.cpp;singleto

  n:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

 

diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/.classpath b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/.classpath
index 64c5e31b7a2..ad32c83a788 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/.classpath
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/META-INF/MANIFEST.MF b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/META-INF/MANIFEST.MF
index 079a08f41c0..aad5e06116c 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc/META-INF/MANIFEST.MF
@@ -12,5 +12,5 @@ Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.qompass.designer.doc.Activator

 Bundle-SymbolicName: org.eclipse.papyrus.qompass.designer.doc;singleto

  n:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

 

diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/META-INF/MANIFEST.MF b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/META-INF/MANIFEST.MF
index 884482a3f2a..935f9860a62 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/META-INF/MANIFEST.MF
@@ -1,3 +1,4 @@
+Manifest-Version: 1.0

 Bundle-ManifestVersion: 2

 Bundle-Name: %pluginName

 Bundle-SymbolicName: org.eclipse.papyrus.qompass.designer.ui;singleton:=true

@@ -40,4 +41,6 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.qompass.designer.core;bundle-version="1.0.0"

 Bundle-ActivationPolicy: lazy

 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

-Bundle-Vendor: %pluginProvider

+Bundle-Vendor: %providerName

+Bundle-Localization: plugin

+Export-Package: org.eclipse.papyrus.qompass.designer.ui.handlers

diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/build.properties b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/build.properties
index 033a565bb9d..f1e29af020a 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/build.properties
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/build.properties
@@ -6,3 +6,4 @@ bin.includes = META-INF/,\
                about.html,\
                icons/,\
                plugin.xml
+src.includes = about.html
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/plugin.xml b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/plugin.xml
index 21846effdaf..8df44b89c05 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/plugin.xml
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/plugin.xml
@@ -73,6 +73,13 @@
             id="org.eclipse.papyrus.qompass.designer.ui.menuActions.AllocateCmd"
             name="dummy">
       </command>
+      <command
+            categoryId="org.eclipse.papyrus.editor.category"
+            defaultHandler="org.eclipse.papyrus.qompass.designer.ui.handlers.TrafoAndCodegenHandler"
+            description="dummy"
+            id="org.eclipse.papyrus.qompass.designer.ui.menuActions.TrafoAndCodegenCmd"
+            name="dummy">
+      </command>
    </extension>
    <extension
          point="org.eclipse.ui.menus">
@@ -184,7 +191,6 @@
                icon="icons/selContainer.gif"
                id="org.eclipse.papyrus.qompass.designer.ui.menuActions.ConfigurePortsMenu"
                label="Qompass: Configure ports"
-               mode="FORCE_TEXT"
                style="push">
             <visibleWhen
                   checkEnabled="true">
@@ -196,7 +202,6 @@
                id="org.eclipse.papyrus.qompass.designer.ui.menuActions.AddProfileAndModelLibsMenu"
                label="Qompass: Add profiles and model libraries"
                mnemonic="P"
-               mode="FORCE_TEXT"
                style="push">
             <visibleWhen
                   checkEnabled="true">
@@ -208,7 +213,16 @@
                id="org.eclipse.papyrus.qompass.designer.ui.menuActions.AllocateMenu"
                label="Qompass: Allocate to node"
                mnemonic="A"
-               mode="FORCE_TEXT"
+               style="push">
+            <visibleWhen
+                  checkEnabled="true">
+            </visibleWhen>
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.qompass.designer.ui.menuActions.TrafoAndCodegenCmd"
+               icon="icons/deploy.gif"
+               id="org.eclipse.papyrus.qompass.designer.ui.menuActions.TrafoAndCodegenCmd"
+               label="Qompass: Execute transformation and generate code (w/o deployment)"
                style="push">
             <visibleWhen
                   checkEnabled="true">
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/Messages.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/Messages.java
new file mode 100644
index 00000000000..53794a9743b
--- /dev/null
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/Messages.java
@@ -0,0 +1,43 @@
+package org.eclipse.papyrus.qompass.designer.ui;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.qompass.designer.ui.messages"; //$NON-NLS-1$
+
+	public static String ConfigurePortHandler_ConfigurePorts;
+	public static String ConfigurePortHandler_ConfigurePortsOfComponent;
+	public static String ConfigurePortHandler_ConfigureInstance;
+
+	public static String ConfigurePortDialog_AvailPorts;
+	public static String ConfigurePortDialog_PortConfig;
+	public static String ConfigurePortDialog_NotAvail;
+	public static String ConfigurePortDialog_Kind;
+	public static String ConfigurePortDialog_None;
+	public static String ConfigurePortDialog_Type;
+	public static String ConfigurePortDialog_ChangeType;
+	public static String ConfigurePortDialog_IntfDerived;
+	public static String ConfigurePortDialog_Provided;
+	public static String ConfigurePortDialog_Required;
+	public static String ConfigurePortDialog_Undef;
+
+	public static String CreateDepPlanHandler_CreateDPs;
+	public static String CreateDepPlanHandler_Sync;
+	public static String CreateDepPlanHandler_CreateNew;
+	public static String CreateDepPlanHandler_WhatShouldIDo;
+	public static String CreateDepPlanHandler_DPwithNameExistsAlready;
+	public static String CreateDepPlanHandler_DPwithNameExistsNoPackage;
+	public static String CreateDepPlanHandler_CannotSync;
+	public static String CreateDepPlanHandler_Cancel;
+	public static String CreateDepPlanHandler_CreateDP;
+	public static String CreateDepPlanHandler_CannotCreateDP;
+	public static String CreateDepPlanHandler_StereoApplicationFailed;
+
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/AllocationDialog.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/AllocationDialog.java
index 2a16c75c59a..debfcb26bab 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/AllocationDialog.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/AllocationDialog.java
@@ -17,12 +17,14 @@ package org.eclipse.papyrus.qompass.designer.ui.dialogs;
 import org.eclipse.draw2d.Label;
 import org.eclipse.emf.common.util.BasicEList;
 import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.transaction.util.TransactionUtil;
 import org.eclipse.emf.workspace.AbstractEMFOperation;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.papyrus.FCM.DeploymentPlan;
 import org.eclipse.papyrus.MARTE.MARTE_DesignModel.SRM.SW_Concurrency.SwSchedulableResource;
 import org.eclipse.papyrus.infra.widgets.toolbox.utils.DialogUtils;
 import org.eclipse.papyrus.qompass.designer.core.CommandSupport;
+import org.eclipse.papyrus.qompass.designer.core.ElementFilter;
 import org.eclipse.papyrus.qompass.designer.core.Utils;
 import org.eclipse.papyrus.qompass.designer.core.commands.AddMarteAndFcmProfile;
 import org.eclipse.papyrus.qompass.designer.core.deployment.AllocUtils;
@@ -49,27 +51,13 @@ import org.eclipse.uml2.uml.Package;
 import org.eclipse.uml2.uml.util.UMLUtil;
 
 /**
- * Select a connector type and implementation (group)
- * TODO: show information about the used connector [usage, implem properties, ...]
- * similar help for ports?
+ * Allocate elements in a deployment plan to a node or thread
  * 
- * @author ansgar
- * 
- */
-
-/*
- * ListSelectionDialog lsd = new ListSelectionDialog(window.getShell(), list, new ArrayContentProvider(), new LabelProvider(),
- * "ListSelectionDialog Message");
- * lsd.setInitialSelections(list.toArray());
- * lsd.setTitle("Select # of Nobel Prize Nominations :");
- * lsd.open();
  */
 public class AllocationDialog extends SelectionStatusDialog {
 
 	private DeploymentPlan m_cdp;
 
-	// protected EList<Package> visitedPackages;
-	// protected FilteredList fRules;
 	private Tree fTree;
 
 	private Label fLabel;
@@ -84,10 +72,34 @@ public class AllocationDialog extends SelectionStatusDialog {
 		super(parent);
 		// m_cdp = cdp;
 		m_cdp = UMLUtil.getStereotypeApplication(cdp, DeploymentPlan.class);
-		visitedPackages = new BasicEList<Package>();
 		nodeOrThreadList = new BasicEList<InstanceSpecification>();
 		nodeOrThreadList.add(null); // dummy entry for no allocation
-		getAllNodesOrThreads(cdp.getModel(), nodeOrThreadList);
+		DepUtils.getAllInstances(cdp.getModel(), nodeOrThreadList, new ElementFilter() {
+			
+			public boolean acceptElement(Element element) {
+				if (element instanceof InstanceSpecification) {
+					InstanceSpecification instance = (InstanceSpecification) element;
+					if (instance.getName() == null) {
+						// donn't allocate to root element (detectable via the empty name)
+						return false;
+					}
+					Classifier cl = DepUtils.getClassifier(instance);
+					if(cl instanceof Class) {
+						if(StereotypeUtil.isApplied(cl, SwSchedulableResource.class)) {
+							// threads are valid allocation targets. Therefore, threads are always added to
+							// list, even if within a deployment plan.
+							return true;
+						}
+						if (StereotypeUtil.isApplied(instance.getNearestPackage(), DeploymentPlan.class)) {
+							// instance is part of a deployment plan => don't add to list.
+							return false;
+						}
+						return true;
+					}
+				}
+				return false;
+			}
+		});
 	}
 
 	/**
@@ -173,7 +185,7 @@ public class AllocationDialog extends SelectionStatusDialog {
 			InstanceSpecification is = (InstanceSpecification)data;
 
 			String name = is.getName();
-			int index = name.lastIndexOf(".");
+			int index = name.lastIndexOf("."); //$NON-NLS-1$
 			if(index != -1) {
 				name = name.substring(index + 1);
 			}
@@ -181,26 +193,26 @@ public class AllocationDialog extends SelectionStatusDialog {
 			Classifier cl = DepUtils.getClassifier(is);
 			String nodeName;
 			if(explicitNodeOrThread == null) {
-				nodeName = "-";
+				nodeName = "-"; //$NON-NLS-1$
 			} else {
 				nodeName = getAllocName(explicitNodeOrThread);
 			}
 			if(cl instanceof Class) {
 				if(BootLoaderGen.hasUnconnectedStartRoutine(null, (Class)cl, null)) {
-					nodeName += " (main)";
+					nodeName += " (main)"; //$NON-NLS-1$
 				}
 			}
 			EList<InstanceSpecification> implicitNodes = AllocUtils.getAllNodesOrThreadsParent(is);
 			implicitNodes.addAll(AllocUtils.getAllNodesOrThreadsParent(is));
-			String list = "";
+			String list = ""; //$NON-NLS-1$
 			for(InstanceSpecification node : implicitNodes) {
-				if(list.equals("")) {
+				if(list.equals("")) { //$NON-NLS-1$
 					list = getAllocName(node);
 				} else {
-					list += ", " + getAllocName(node);
+					list += ", " + getAllocName(node); //$NON-NLS-1$
 				}
 			}
-			ti.setText(new String[]{ name, nodeName, "[" + list + "]" });
+			ti.setText(new String[]{ name, nodeName, "[" + list + "]" });  //$NON-NLS-1$//$NON-NLS-2$
 		}
 	}
 
@@ -284,8 +296,8 @@ public class AllocationDialog extends SelectionStatusDialog {
 				Shell shell = new Shell();
 				if(MessageDialog.openQuestion(shell, "Error",
 					"Stereotype application failed. The profile MARTE::Allocation is probably not applied. Try to apply it?")) {
-					AbstractEMFOperation applyProfile = new AddMarteAndFcmProfile(Utils.getTop(is), AddMarteAndFcmProfile.APPLY_ALLOC, null);
-					CommandSupport.exec(null, applyProfile);
+					AbstractEMFOperation applyProfile = new AddMarteAndFcmProfile(Utils.getTop(is), AddMarteAndFcmProfile.APPLY_ALLOC, TransactionUtil.getEditingDomain(is));
+					CommandSupport.exec(applyProfile);
 					AllocUtils.allocate(is, newNode);
 				}
 			}
@@ -293,28 +305,4 @@ public class AllocationDialog extends SelectionStatusDialog {
 			AllocUtils.updateAllocation(is, oldNode, newNode);
 		}
 	}
-
-	void getAllNodesOrThreads(Package pkg, EList<InstanceSpecification> nodeList) {
-		for(Element el : pkg.getMembers()) {
-			if(el instanceof Package) {
-				if(!visitedPackages.contains(el)) {
-					visitedPackages.add((Package)el);
-					getAllNodesOrThreads((Package)el, nodeList);
-				}
-			} else if(el instanceof InstanceSpecification) {
-				Classifier cl = DepUtils.getClassifier((InstanceSpecification)el);
-				if(cl != null) {
-					if((cl instanceof Class) || (StereotypeUtil.isApplied(cl, SwSchedulableResource.class))) {
-						// check that instances are not part of a deployment plan
-						//  [TODO:] check that owner of instance is a platform definition
-						if(!StereotypeUtil.isApplied(el.getOwner(), DeploymentPlan.class)) {
-							nodeList.add((InstanceSpecification)el);
-						}
-					}
-				}
-			}
-		}
-	}
-
-	private EList<Package> visitedPackages;
 }
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/ConfigureInstanceDialog.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/ConfigureInstanceDialog.java
index cbd7dc09f24..cb7d43f6274 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/ConfigureInstanceDialog.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/ConfigureInstanceDialog.java
@@ -14,6 +14,7 @@
 
 package org.eclipse.papyrus.qompass.designer.ui.dialogs;
 
+import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.emf.common.util.BasicEList;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.jface.dialogs.MessageDialog;
@@ -30,6 +31,7 @@ import org.eclipse.papyrus.FCM.ContainerRule;
 import org.eclipse.papyrus.infra.widgets.toolbox.utils.DialogUtils;
 import org.eclipse.papyrus.qompass.designer.core.ConfigUtils;
 import org.eclipse.papyrus.qompass.designer.core.Description;
+import org.eclipse.papyrus.qompass.designer.core.ElementFilter;
 import org.eclipse.papyrus.qompass.designer.core.Utils;
 import org.eclipse.papyrus.qompass.designer.core.deployment.DepCreation;
 import org.eclipse.papyrus.qompass.designer.core.deployment.DepPlanUtils;
@@ -60,7 +62,6 @@ import org.eclipse.uml2.uml.LiteralBoolean;
 import org.eclipse.uml2.uml.LiteralInteger;
 import org.eclipse.uml2.uml.LiteralString;
 import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.PackageableElement;
 import org.eclipse.uml2.uml.Property;
 import org.eclipse.uml2.uml.Slot;
 import org.eclipse.uml2.uml.Type;
@@ -73,8 +74,6 @@ import org.eclipse.uml2.uml.util.UMLUtil;
  * 
  * TODO: extend rule application to instances (problematic, since rules
  * transformation is done on type level)
- * 
- * @author ansgar
  */
 public class ConfigureInstanceDialog extends SelectionStatusDialog {
 
@@ -90,7 +89,7 @@ public class ConfigureInstanceDialog extends SelectionStatusDialog {
 
 	protected Property m_currentAttribute;
 
-	protected final String valueLabelPrefix = "Value:";
+	protected final String valueLabelPrefix = "Value:"; //$NON-NLS-1$
 
 	protected Label fValueLabel;
 
@@ -112,33 +111,33 @@ public class ConfigureInstanceDialog extends SelectionStatusDialog {
 		super(parent);
 	}
 
-	public boolean init(Class component) {
+	public boolean init(Class component, ExecutionEvent from) {
 		// visitedPackages = new BasicEList<Package> ();
 		DepPlanSync.syncAllDepPlans(component);
 		m_component = component;
 		m_instance = null;
 		m_feature = null;
-		m_model = Utils.getUserModel();
+		m_model = Utils.getUserModel(from);
 		if(m_model == null) {
 			return false;
 		}
 		return checkAndGetInstances();
 	}
 
-	public boolean init(InstanceSpecification instance) {
+	public boolean init(InstanceSpecification instance, ExecutionEvent from) {
 		// visitedPackages = new BasicEList<Package> ();
 		DepPlanSync.syncDepPlan(instance.getNearestPackage());
 		m_component = DepUtils.getImplementation(instance);
 		m_instance = instance;
 		m_feature = null;
-		m_model = Utils.getUserModel();
+		m_model = Utils.getUserModel(from);
 		return checkAndGetInstances();
 	}
 
-	public boolean init(Feature feature) {
+	public boolean init(Feature feature, ExecutionEvent from) {
 		// visitedPackages = new BasicEList<Package> ();
 		m_feature = feature;
-		m_model = Utils.getUserModel();
+		m_model = Utils.getUserModel(from);
 		m_instance = null;
 		if(feature instanceof Connector) {
 			org.eclipse.papyrus.FCM.Connector fcmConn = UMLUtil.getStereotypeApplication(feature,
@@ -157,9 +156,51 @@ public class ConfigureInstanceDialog extends SelectionStatusDialog {
 		return false;
 	}
 
-
 	/**
-	 * retrieve the instance list. Returns false, if no deploymentplan could be found.
+	 * A filter class that selects instances associated with the selected feature or component
+	 */
+	class InstanceFilter implements ElementFilter {
+				
+		private String featureCandidateName;
+		
+		public boolean acceptElement(Element element) {
+			if(element instanceof InstanceSpecification) {
+				InstanceSpecification instance = (InstanceSpecification)element;
+				if(m_feature instanceof Property) {
+					EList<Slot> slots = DepUtils.getReferencingSlots(instance);
+					for (Slot slot : slots) {
+						if(slot.getDefiningFeature() == m_feature) {
+							return true;
+						}
+					}
+				}
+				else if(m_feature instanceof Connector) {
+					// Connector instances cannot be found via a slot. Since a connector is not a structural feature,
+					// it cannot be referenced via the "definingFeature" property of a slot. Therefore, the deployment
+					// plan creation (@see DepCreation.createDepPlan) simply omits slots, but still creates instances
+					// for the interaction components referenced by an FCM connector.
+					// TODO: the following code relies on specific order of instances and might not always work.
+					Element owner = m_feature.getOwner();
+					if(DepUtils.getImplementation(instance) == owner) {
+						// instance is for owner of feature: examine name
+						featureCandidateName = instance.getName() + "." + m_feature.getName(); //$NON-NLS-1$
+					}
+					else if(featureCandidateName != null) {
+						if(featureCandidateName.equals(instance.getName())) {
+							return true;
+						}
+					}
+				} else if(DepUtils.getImplementation(instance) == m_component) {
+					return true;
+				}
+			}
+			return false;
+		}
+	}
+	
+	
+	/**
+	 * retrieve the instance list. Returns false, if no deployment plan could be found.
 	 * 
 	 * @return
 	 */
@@ -167,7 +208,9 @@ public class ConfigureInstanceDialog extends SelectionStatusDialog {
 		visitedPackages = new BasicEList<Package>();
 		m_instanceList = new BasicEList<InstanceSpecification>();
 
-		getInstances(m_instanceList);
+		ElementFilter filter = new InstanceFilter();
+		DepUtils.getAllInstances(m_model, m_instanceList, filter);		
+		
 		if(m_instanceList.size() == 0) {
 			Shell shell = new Shell();
 			if(DepPlanUtils.getAllDepPlans(m_model).size() == 0) {
@@ -179,13 +222,11 @@ public class ConfigureInstanceDialog extends SelectionStatusDialog {
 				"The list of available instances is empty. Synchronize deployment plans?")) {
 				DepPlanSync.syncAllDepPlans(m_model);
 				visitedPackages = new BasicEList<Package>();
-				getInstances(m_instanceList);
+				DepUtils.getAllInstances(m_model, m_instanceList, filter);
+				
 				if(m_instanceList.size() == 0) {
 					MessageDialog.openInformation(shell, "Instance configuration",
-						"There are still no instances available\n" +
-							"Check whether you created already a deployment plan for your system." +
-							"Check as well, if the parts in your a composite use \"composite\" as aggregation kind\n." +
-							"(Results of deployment plan synchronizations will be unrolled)");
+						"There are still no instances available\n. Check whether you created already a deployment plan for your system. Check as well, if the parts in your a composite use \"composite\" as aggregation kind. (Results of deployment plan synchronizations will be unrolled)");
 					return false;
 				}
 			}
@@ -231,7 +272,7 @@ public class ConfigureInstanceDialog extends SelectionStatusDialog {
 		// --------------- instance selection -------------------
 		//
 		Group instanceSelGroup = new Group(instanceSelection, SWT.BORDER);
-		instanceSelGroup.setText(" associated instance specifications ");
+		instanceSelGroup.setText(addSpaces("associated instance specifications"));
 		// ruleGroup.setLayout(new RowLayout (SWT.VERTICAL));
 		instanceSelGroup.setLayout(new GridLayout(1, false));
 		instanceSelGroup.setLayoutData(groupGridData);
@@ -304,7 +345,7 @@ public class ConfigureInstanceDialog extends SelectionStatusDialog {
 		GridData groupGridData = DialogUtils.createFillGridData();
 
 		Group instanceConfigurationGroup = new Group(parent, SWT.BORDER);
-		instanceConfigurationGroup.setText(" Configuration ");
+		instanceConfigurationGroup.setText(addSpaces("Configuration"));
 		instanceConfigurationGroup.setLayout(new RowLayout(SWT.VERTICAL));
 		instanceConfigurationGroup.setLayout(new GridLayout(1, false));
 		instanceConfigurationGroup.setLayoutData(groupGridData);
@@ -438,7 +479,7 @@ public class ConfigureInstanceDialog extends SelectionStatusDialog {
 				}
 			}
 		}
-		fValue.setText("");
+		fValue.setText(""); //$NON-NLS-1$
 	}
 
 	private void setEnabled(boolean enabled) {
@@ -447,8 +488,8 @@ public class ConfigureInstanceDialog extends SelectionStatusDialog {
 		fValueLabel.setEnabled(enabled);
 		fValue.setEnabled(enabled);
 		if(!enabled) {
-			fValue.setText("");
-			fDescription.setText("");
+			fValue.setText(""); //$NON-NLS-1$
+			fDescription.setText(""); //$NON-NLS-1$
 			fValueLabel.setText(valueLabelPrefix);
 		}
 	}
@@ -456,54 +497,11 @@ public class ConfigureInstanceDialog extends SelectionStatusDialog {
 	private String getValueLabel(Property attribute) {
 		String label = valueLabelPrefix;
 		if(attribute.getDefault() != null) {
-			return label + " (Default = " + attribute.getDefault() + ")";
+			return label + " " + String.format("(default = %s)", attribute.getDefault()); //$NON-NLS-1$ //$NON-NLS-2$
 		}
 		return label;
 	}
 
-	// TODO(?): need a generic utility function for getting all elements obeying a
-	// certain criteria from a model
-	void getInstances(EList<InstanceSpecification> instanceList) {
-		Package deploymentPlans = Utils.getRoot(m_model, DepPlanUtils.depPlanFolder);
-		String featureCandidateName = null;
-		if(deploymentPlans == null) {
-			return;
-		}
-		for(PackageableElement deploymentPlan : deploymentPlans
-			.getPackagedElements()) {
-			if(deploymentPlan instanceof Package) {
-				for(PackageableElement instance : ((Package)deploymentPlan).getPackagedElements()) {
-					if(instance instanceof InstanceSpecification) {
-						InstanceSpecification candidate = (InstanceSpecification)instance;
-						if(m_feature instanceof Property) {
-							for(Slot slot : candidate.getSlots()) {
-								if(slot.getDefiningFeature() == m_feature) {
-									instanceList
-										.add(DepUtils.getInstance(slot));
-								}
-							}
-						} else if(m_feature instanceof Connector) {
-							// Connector cannot be found directly, since there is no slot in containing composite (defining
-							// feature is a structural-feature, not a feature): find via name.
-							Element owner = m_feature.getOwner();
-							if(DepUtils.getImplementation(candidate) == owner) {
-								// instance is for owner of feature: examine name
-								featureCandidateName = candidate.getName() + "." + m_feature.getName();
-							}
-							else if(featureCandidateName != null) {
-								if(featureCandidateName.equals(candidate.getName())) {
-									instanceList.add(candidate);
-								}
-							}
-						} else if(DepUtils.getImplementation(candidate) == m_component) {
-							instanceList.add(candidate);
-						}
-					}
-				}
-			}
-		}
-	}
-
 	private EList<Property> getConfigAttributes(Classifier component) {
 		EList<Property> list = new BasicEList<Property>();
 		// add properties of component
@@ -526,4 +524,13 @@ public class ConfigureInstanceDialog extends SelectionStatusDialog {
 		return list;
 	}
 
+	/**
+	 * Add a space before and after
+	 * 
+	 * @param text
+	 * @return
+	 */
+	public static String addSpaces(String text) {
+		return " " + text + " "; //$NON-NLS-1$ //$NON-NLS-2$	
+	}
 }
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/ConfigurePortDialog.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/ConfigurePortDialog.java
index 39f77865f31..6c9e7753ff3 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/ConfigurePortDialog.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/dialogs/ConfigurePortDialog.java
@@ -22,6 +22,7 @@ import org.eclipse.emf.common.util.UniqueEList;
 import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -34,6 +35,7 @@ import org.eclipse.papyrus.infra.widgets.toolbox.utils.DialogUtils;
 import org.eclipse.papyrus.qompass.designer.core.Description;
 import org.eclipse.papyrus.qompass.designer.core.PortUtils;
 import org.eclipse.papyrus.qompass.designer.core.Utils;
+import org.eclipse.papyrus.qompass.designer.ui.Messages;
 import org.eclipse.papyrus.uml.tools.providers.ServiceEditFilteredContentProvider;
 import org.eclipse.papyrus.uml.tools.providers.UMLLabelProvider;
 import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil;
@@ -95,6 +97,8 @@ public class ConfigurePortDialog extends SelectionStatusDialog {
 
 	protected EList<Port> m_ports;
 
+	public static final String COLON = ":"; //$NON-NLS-1$
+	
 	public ConfigurePortDialog(Shell parent) {
 		super(parent);
 	}
@@ -162,7 +166,7 @@ public class ConfigurePortDialog extends SelectionStatusDialog {
 		portSelection.setLayout(new GridLayout(1, false));
 		// configL.setLayout(new RowLayout());
 
-		portSelection.setText(" Available Ports ");
+		portSelection.setText(" " + Messages.ConfigurePortDialog_AvailPorts + " "); //$NON-NLS-1$ //$NON-NLS-2$
 		portSelection.setLayoutData(gridDataH60);
 
 		fPortList = new TableViewer(portSelection, SWT.BORDER);
@@ -187,17 +191,20 @@ public class ConfigurePortDialog extends SelectionStatusDialog {
 		portSelection.pack();
 
 		Group instanceConfigurationGroup = new Group(parent, SWT.BORDER);
-		instanceConfigurationGroup.setText(" Port configuration ");
+		instanceConfigurationGroup.setText(" " + Messages.ConfigurePortDialog_AvailPorts + " ");  //$NON-NLS-1$ //$NON-NLS-2$
 		instanceConfigurationGroup.setLayout(new GridLayout(2, false));
 		instanceConfigurationGroup.setLayoutData(groupGridData);
 
 		Label kindText = new Label(instanceConfigurationGroup, SWT.NONE);
-		kindText.setText("Kind:");
+		kindText.setText(Messages.ConfigurePortDialog_Kind + COLON);
 
 		fKindCombo = new Combo(instanceConfigurationGroup, SWT.NONE);
 		portKindList = getAvailableKinds(m_model);
+		if (portKindList.size() == 0) {
+			MessageDialog.openInformation(new Shell(), "No port kinds founds", "No port kinds are available. Please import a Qompass model library");
+		}
 		String[] portKindStrList = new String[portKindList.size() + 1];
-		portKindStrList[0] = "none";
+		portKindStrList[0] = Messages.ConfigurePortDialog_None;
 		for(int i = 0; i < portKindList.size(); i++) {
 			portKindStrList[i + 1] = portKindList.get(i).getBase_Class().getName();
 		}
@@ -227,14 +234,14 @@ public class ConfigurePortDialog extends SelectionStatusDialog {
 		});
 
 		Label fTypeLabel = new Label(instanceConfigurationGroup, SWT.NONE);
-		fTypeLabel.setText("Type:");
+		fTypeLabel.setText(Messages.ConfigurePortDialog_Type + COLON);
 		fTypeLabel.setLayoutData(gridData);
 
 		fType = new Label(instanceConfigurationGroup, SWT.NONE);
 		fType.setLayoutData(gridData);
 
 		fTypeButton = new Button(instanceConfigurationGroup, SWT.NONE);
-		fTypeButton.setText("change type");
+		fTypeButton.setText(Messages.ConfigurePortDialog_ChangeType);
 		fTypeButton.setLayoutData(gridDataH25Span2);
 		fTypeButton.addSelectionListener(new SelectionListener() {
 
@@ -280,17 +287,17 @@ public class ConfigurePortDialog extends SelectionStatusDialog {
 
 		// Label dil = new Label(derivedInterfaces, SWT.NONE);
 		// dil.setText("Interfaces derived from port kind");
-		derivedInterfaces.setText("Interfaces derived from kind and type");
+		derivedInterfaces.setText(Messages.ConfigurePortDialog_IntfDerived);
 		// dil.setLayoutData(gridDataSpan2);
 		derivedInterfaces.setLayoutData(gridDataSpan2);
 
 		Label fProvidedLabel = new Label(derivedInterfaces, SWT.NONE);
-		fProvidedLabel.setText("Provided:");
+		fProvidedLabel.setText(Messages.ConfigurePortDialog_Provided + COLON);
 		fProvided = new Label(derivedInterfaces, SWT.NONE);
 		fProvided.setLayoutData(gridData);
 
 		Label fRequiredLabel = new Label(derivedInterfaces, SWT.NONE);
-		fRequiredLabel.setText("Required:");
+		fRequiredLabel.setText(Messages.ConfigurePortDialog_Required + COLON);
 		fRequired = new Label(derivedInterfaces, SWT.NONE);
 		fRequired.setLayoutData(gridData);
 		derivedInterfaces.pack();
@@ -320,7 +327,7 @@ public class ConfigurePortDialog extends SelectionStatusDialog {
 			fType.setText(port.getType().getQualifiedName());
 		}
 		else {
-			fType.setText("undefined");
+			fType.setText(Messages.ConfigurePortDialog_Undef);
 		}
 		if((fcmPort != null) && (fcmPort.getKind() != null)) {
 			PortKind kind = fcmPort.getKind();
@@ -328,24 +335,24 @@ public class ConfigurePortDialog extends SelectionStatusDialog {
 				int index = portKindList.indexOf(kind) + 1;
 				fKindCombo.select(index);
 			}
-			fDescription.setText(Description.getDescription(kind.getBase_Class(), "not available"));
+			fDescription.setText(Description.getDescription(kind.getBase_Class(), Messages.ConfigurePortDialog_NotAvail));
 			Interface providedI = PortUtils.getProvided(port);
 			Interface requiredI = PortUtils.getRequired(port);
-			fProvided.setText(providedI != null ? providedI.getQualifiedName() : "none");
-			fRequired.setText(requiredI != null ? requiredI.getQualifiedName() : "none");
+			fProvided.setText(providedI != null ? providedI.getQualifiedName() : Messages.ConfigurePortDialog_None);
+			fRequired.setText(requiredI != null ? requiredI.getQualifiedName() : Messages.ConfigurePortDialog_None);
 		}
 		else {
-			fProvided.setText(port.getProvideds().size() > 0 ? port.getProvideds().get(0).getQualifiedName() : "none");
-			fRequired.setText(port.getRequireds().size() > 0 ? port.getRequireds().get(0).getQualifiedName() : "none");
+			fProvided.setText(port.getProvideds().size() > 0 ? port.getProvideds().get(0).getQualifiedName() : Messages.ConfigurePortDialog_None);
+			fRequired.setText(port.getRequireds().size() > 0 ? port.getRequireds().get(0).getQualifiedName() : Messages.ConfigurePortDialog_None);
 			fKindCombo.select(0);
-			fDescription.setText("");
+			fDescription.setText(""); //$NON-NLS-1$
 		}
 	}
 
 	private void setEnabled(boolean enabled) {
 		fDescription.setEnabled(enabled);
 		if(!enabled) {
-			fDescription.setText("");
+			fDescription.setText(""); //$NON-NLS-1$
 		}
 	}
 
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/AddProfileAndModelLibsHandler.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/AddProfileAndModelLibsHandler.java
index 5e712ee7d82..38184a3c695 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/AddProfileAndModelLibsHandler.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/AddProfileAndModelLibsHandler.java
@@ -78,8 +78,8 @@ public class AddProfileAndModelLibsHandler extends CmdHandler {
 		int result = dialog.open();

 		if(result == IDialogConstants.OK_ID) {

 			addModelLibs.setImportList(dialog.getResult());

-			CommandSupport.exec(domain, addModelLibs);

-			CommandSupport.exec(domain, addProfiles);

+			CommandSupport.exec(addModelLibs);

+			CommandSupport.exec(addProfiles);

 			// open dialog?

 			// MessageDialog.openWarning(new Shell(),

 			//	"Warning", "The MARTE profile is not available."); //$NON-NLS-1$ //$NON-NLS-2$

diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/ConfigureInstanceHandler.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/ConfigureInstanceHandler.java
index cbed6ed411a..a5b54dc2d71 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/ConfigureInstanceHandler.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/ConfigureInstanceHandler.java
@@ -56,7 +56,8 @@ public class ConfigureInstanceHandler extends CmdHandler {
 
 		final NamedElement element = (NamedElement)selectedEObject;
 		final Shell shell = new Shell();
-
+		final ExecutionEvent from = event;
+		
 		// 1. select possible connectors according to port types
 		// (only show compatible connectors check-box?)
 		// 2. select implementation group according to connector type
@@ -69,7 +70,7 @@ public class ConfigureInstanceHandler extends CmdHandler {
 				public CommandResult run() {
 					ConfigureInstanceDialog configureInstanceDialog =
 						new ConfigureInstanceDialog(shell);
-					if (configureInstanceDialog.init((Class)element)) {
+					if (configureInstanceDialog.init((Class)element, from)) {
 						configureInstanceDialog.setTitle("Configure instance"); //$NON-NLS-1$
 						configureInstanceDialog.setMessage("Configure instance for component " + element.getName()); //$NON-NLS-1$
 						configureInstanceDialog.open();
@@ -86,7 +87,7 @@ public class ConfigureInstanceHandler extends CmdHandler {
 				public CommandResult run() {
 					ConfigureInstanceDialog configureInstanceDialog =
 						new ConfigureInstanceDialog(shell);
-					if (configureInstanceDialog.init((Feature)element)) {
+					if (configureInstanceDialog.init((Feature)element, from)) {
 						configureInstanceDialog.setTitle("Configure instance"); //$NON-NLS-1$
 						configureInstanceDialog.setMessage("Configure instance for property/connector " + element.getName()); //$NON-NLS-1$
 						configureInstanceDialog.open();
@@ -106,7 +107,7 @@ public class ConfigureInstanceHandler extends CmdHandler {
 				public CommandResult run() {
 					ConfigureInstanceDialog configureInstanceDialog =
 						new ConfigureInstanceDialog(shell);
-					if (configureInstanceDialog.init((InstanceSpecification)element)) {
+					if (configureInstanceDialog.init((InstanceSpecification)element, from)) {
 						configureInstanceDialog.setMessage("Configure instance " + element.getName()); //$NON-NLS-1$
 						configureInstanceDialog.open();
 						if(configureInstanceDialog.getReturnCode() == IDialogConstants.OK_ID) {
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/ConfigurePortHandler.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/ConfigurePortHandler.java
index 92ebd50aef9..4852bc43a68 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/ConfigurePortHandler.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/ConfigurePortHandler.java
@@ -15,11 +15,10 @@ import org.eclipse.gmf.runtime.common.core.command.CommandResult;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.papyrus.qompass.designer.core.CommandSupport;
 import org.eclipse.papyrus.qompass.designer.core.RunnableWithResult;
-import org.eclipse.papyrus.qompass.designer.ui.dialogs.ConfigureInstanceDialog;
+import org.eclipse.papyrus.qompass.designer.ui.Messages;
 import org.eclipse.papyrus.qompass.designer.ui.dialogs.ConfigurePortDialog;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.InstanceSpecification;
 import org.eclipse.uml2.uml.NamedElement;
 import org.eclipse.uml2.uml.Port;
 
@@ -59,16 +58,16 @@ public class ConfigurePortHandler extends CmdHandler {
 		// 2. select implementation group according to connector type
 
 		if(element instanceof Class) {
-			CommandSupport.exec("Configure ports", event, new RunnableWithResult() {
+			CommandSupport.exec(Messages.ConfigurePortHandler_ConfigurePorts, event, new RunnableWithResult() {
 
 				public CommandResult run() {
-					ConfigurePortDialog configureInstanceDialog =
+					ConfigurePortDialog configurePortDialog =
 						new ConfigurePortDialog(shell);
-					if (configureInstanceDialog.init((Class)element)) {
-						configureInstanceDialog.setTitle("Configure ports");
-						configureInstanceDialog.setMessage("Configure ports of component " + element.getName());
-						configureInstanceDialog.open();
-						if(configureInstanceDialog.getReturnCode() == IDialogConstants.OK_ID) {
+					if (configurePortDialog.init((Class)element)) {
+						configurePortDialog.setTitle(Messages.ConfigurePortHandler_ConfigurePorts);
+						configurePortDialog.setMessage(Messages.ConfigurePortHandler_ConfigurePortsOfComponent + " " + element.getName()); //$NON-NLS-1$
+						configurePortDialog.open();
+						if(configurePortDialog.getReturnCode() == IDialogConstants.OK_ID) {
 							return CommandResult.newOKCommandResult();
 						}
 					}
@@ -76,14 +75,14 @@ public class ConfigurePortHandler extends CmdHandler {
 				}
 			});
 		} else if(element instanceof Port) {
-			CommandSupport.exec("Configure ports", event, new RunnableWithResult() {
+			CommandSupport.exec(Messages.ConfigurePortHandler_ConfigurePorts, event, new RunnableWithResult() {
 
 				public CommandResult run() {
 					ConfigurePortDialog configurePortDialog =
 						new ConfigurePortDialog(shell);
 					if (configurePortDialog.init((Port)element)) {
-						configurePortDialog.setTitle("Configure ports");
-						configurePortDialog.setMessage("Configure port " + element.getName());
+						configurePortDialog.setTitle(Messages.ConfigurePortHandler_ConfigurePorts);
+						configurePortDialog.setMessage(Messages.ConfigurePortHandler_ConfigurePorts + " " + element.getName()); //$NON-NLS-1$
 						configurePortDialog.open();
 						if(configurePortDialog.getReturnCode() == IDialogConstants.OK_ID) {
 							return CommandResult.newOKCommandResult();
@@ -92,25 +91,6 @@ public class ConfigurePortHandler extends CmdHandler {
 					return CommandResult.newCancelledCommandResult();
 				}
 			});
-
-			
-		} else if(element instanceof InstanceSpecification) {
-
-			CommandSupport.exec("Configure instance", event, new RunnableWithResult() {
-
-				public CommandResult run() {
-					ConfigureInstanceDialog configureInstanceDialog =
-						new ConfigureInstanceDialog(shell);
-					if (configureInstanceDialog.init((InstanceSpecification)element)) {
-						configureInstanceDialog.setMessage("Configure instance " + element.getName());
-						configureInstanceDialog.open();
-						if(configureInstanceDialog.getReturnCode() == IDialogConstants.OK_ID) {
-							return CommandResult.newOKCommandResult();
-						}
-					}
-					return CommandResult.newCancelledCommandResult();
-				}
-			});
 		}
 		return null;
 	}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/CreateDepPlanHandler.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/CreateDepPlanHandler.java
index e74c4c43ed8..56837f8b291 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/CreateDepPlanHandler.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/CreateDepPlanHandler.java
@@ -23,8 +23,10 @@ import org.eclipse.papyrus.qompass.designer.core.RunnableWithResult;
 import org.eclipse.papyrus.qompass.designer.core.Utils;
 import org.eclipse.papyrus.qompass.designer.core.deployment.DepCreation;
 import org.eclipse.papyrus.qompass.designer.core.deployment.DepPlanUtils;
+import org.eclipse.papyrus.qompass.designer.core.deployment.DeployConstants;
 import org.eclipse.papyrus.qompass.designer.core.sync.DepPlanSync;
 import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationException;
+import org.eclipse.papyrus.qompass.designer.ui.Messages;
 import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.uml2.uml.Class;
@@ -35,8 +37,6 @@ import org.eclipse.uml2.uml.Stereotype;
 
 public class CreateDepPlanHandler extends CmdHandler {
 
-	private final String DepPlanPostfix = "DepPlan";
-
 	private Package depPlans;
 
 	/**
@@ -60,7 +60,7 @@ public class CreateDepPlanHandler extends CmdHandler {
 		}
 		final Class selectedComposite = (Class)selectedEObject;
 
-		CommandSupport.exec("Create deployment plans", event, new Runnable() {
+		CommandSupport.exec(Messages.CreateDepPlanHandler_CreateDPs, event, new Runnable() {
 
 			public void run() {
 				// execute with transaction support
@@ -69,17 +69,16 @@ public class CreateDepPlanHandler extends CmdHandler {
 		});
 
 		try {
-			String name = selectedComposite.getName() + DepPlanPostfix;
+			String name = selectedComposite.getName() + DeployConstants.DepPlanPostfix;
 			if(depPlans.getMember(name) != null) {
 				Shell shell = new Shell();
 				String dialogButtonLabels[] = new String[]{
-					"Cancel",
-					"Synchronize",
-					"create new (auto number name)"
+					Messages.CreateDepPlanHandler_Cancel,
+					Messages.CreateDepPlanHandler_Sync,
+					Messages.CreateDepPlanHandler_CreateNew
 				};
-				MessageDialog dialog = new MessageDialog(shell, "What should I do?", null,
-					"Deployment plan with name \"" + name + "\" exists already. You can always synchronize an " +
-						"existing deployment plan via the context menu \"Synchronize derived elements\"",
+				MessageDialog dialog = new MessageDialog(shell, Messages.CreateDepPlanHandler_WhatShouldIDo, null,
+					String.format(Messages.CreateDepPlanHandler_DPwithNameExistsAlready, name),
 					MessageDialog.QUESTION, dialogButtonLabels, 0);
 				int result = dialog.open();
 				if(result == 0) {
@@ -91,12 +90,13 @@ public class CreateDepPlanHandler extends CmdHandler {
 						DepPlanSync.syncDepPlan((Package)existing);
 					}
 					else {
-						MessageDialog.openError(shell, "Cannot synchronize", "Element with name \"" + name + "\" exists, but is not a package");
+						MessageDialog.openError(shell, Messages.CreateDepPlanHandler_CannotSync,
+							String.format(Messages.CreateDepPlanHandler_DPwithNameExistsNoPackage, name));
 					}
 				}
 				else {
 					for(int i = 2;; i++) {
-						name = selectedComposite.getName() + DepPlanPostfix + i;
+						name = selectedComposite.getName() + DeployConstants.DepPlanPostfix + i;
 						if(depPlans.getMember(name) == null)
 							break;
 					}
@@ -105,24 +105,24 @@ public class CreateDepPlanHandler extends CmdHandler {
 			}
 			final String depPlanName = name;
 
-			CommandSupport.exec("Create deployment plan", event, new RunnableWithResult() {
+			CommandSupport.exec(Messages.CreateDepPlanHandler_CreateDP, event, new RunnableWithResult() {
 
 				public CommandResult run() {
 					Package cdp = depPlans.createNestedPackage(depPlanName);
 					Stereotype st = StereotypeUtil.apply(cdp, org.eclipse.papyrus.FCM.DeploymentPlan.class);
 					if(st == null) {
-						MessageDialog.openInformation(new Shell(), "Cannot create deployment plan",
-							"Application of stereotype \"FCM::DeploymentPlan\" failed. Check, if FCM profile is applied");
-						return CommandResult.newErrorCommandResult("cannot create deployment plan");
+						MessageDialog.openInformation(new Shell(), Messages.CreateDepPlanHandler_CannotCreateDP,
+							Messages.CreateDepPlanHandler_StereoApplicationFailed);
+						return CommandResult.newErrorCommandResult(Messages.CreateDepPlanHandler_CannotCreateDP);
 					}
 					try {
 						InstanceSpecification newRootIS =
-							DepCreation.createDepPlan(cdp, selectedComposite, "mainInstance", true);
+							DepCreation.createDepPlan(cdp, selectedComposite, DeployConstants.MAIN_INSTANCE, true);
 						DepCreation.initAutoValues(newRootIS);
 						return CommandResult.newOKCommandResult();
 					}
 					catch (TransformationException e) {
-						MessageDialog.openInformation(new Shell(), "Error during deployment plan creation",
+						MessageDialog.openInformation(new Shell(), Messages.CreateDepPlanHandler_CannotCreateDP,
 							e.getMessage());
 						return CommandResult.newErrorCommandResult(e.getMessage());
 					}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/CreatePlatformHandler.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/CreatePlatformHandler.java
index 5cf8b6d2739..6eb386d22b2 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/CreatePlatformHandler.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/CreatePlatformHandler.java
@@ -20,6 +20,7 @@ import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.papyrus.qompass.designer.core.CommandSupport;
 import org.eclipse.papyrus.qompass.designer.core.Utils;
 import org.eclipse.papyrus.qompass.designer.core.deployment.DepCreation;
+import org.eclipse.papyrus.qompass.designer.core.deployment.DeployConstants;
 import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationException;
 import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationRTException;
 import org.eclipse.swt.widgets.Shell;
@@ -55,12 +56,12 @@ public class CreatePlatformHandler extends CmdHandler {
 
 			public void run() {
 				// execute with transaction support
-				platform = Utils.getRoot(selectedComposite, "PlatformModel");//$NON-NLS-1$
+				platform = Utils.getRoot(selectedComposite, DeployConstants.depPlanFolderHw);
 			}
 		});
 
-		final String newPlatform = selectedComposite.getName() + "Platform"; //$NON-NLS-1$
-
+		final String newPlatform = selectedComposite.getName() + DeployConstants.DepPlanPostfixHw;
+		
 		try {
 			if(platform.getMember(newPlatform) != null) {
 				Shell shell = new Shell();
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/TrafoAndCodegenHandler.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/TrafoAndCodegenHandler.java
new file mode 100644
index 00000000000..cb3c63e3557
--- /dev/null
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/handlers/TrafoAndCodegenHandler.java
@@ -0,0 +1,56 @@
+package org.eclipse.papyrus.qompass.designer.ui.handlers;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.papyrus.qompass.designer.core.ProjectManagement;
+import org.eclipse.papyrus.qompass.designer.core.transformations.TrafoAndCodegenPackage;
+import org.eclipse.uml2.uml.Package;
+
+public class TrafoAndCodegenHandler extends CmdHandler {
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean isEnabled() {
+		updateSelectedEObject();
+		return (selectedEObject instanceof Package);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		// only one model is selected
+		selectedPkg = null;
+		if(selectedEObject instanceof Package) {
+			selectedPkg = (Package)selectedEObject;
+		} else {
+			return null;
+		}
+		project = ProjectManagement.getCurrentProject();
+
+		Job job = new Job("Execute transformations and generate code") {
+
+			@Override
+			protected IStatus run(IProgressMonitor monitor) {
+				// execute the task ...
+				TrafoAndCodegenPackage.instantiate(selectedPkg, monitor, project);
+				monitor.done();
+				return Status.OK_STATUS;
+			}
+		};
+		job.setUser(true);
+		job.schedule();
+	
+		return null;
+	}
+
+	protected Package selectedPkg;
+	
+	protected IProject project;
+}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/messages.properties b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/messages.properties
new file mode 100644
index 00000000000..40a457cfc83
--- /dev/null
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui/src/org/eclipse/papyrus/qompass/designer/ui/messages.properties
@@ -0,0 +1,27 @@
+ConfigurePortHandler_ConfigurePorts=Configure ports
+ConfigurePortHandler_ConfigurePortsOfComponent=Configure ports of component 
+ConfigurePortHandler_ConfigureInstance=Configure instance
+
+ConfigurePortDialog_AvailPorts=Available Ports 
+ConfigurePortDialog_PortConfig=Port configuration 
+ConfigurePortDialog_NotAvail=not available
+ConfigurePortDialog_Kind=Kind
+ConfigurePortDialog_None=none
+ConfigurePortDialog_Type=Type
+ConfigurePortDialog_ChangeType=change type
+ConfigurePortDialog_IntfDerived=Interfaces derived from kind and type
+ConfigurePortDialog_Provided=Provided
+ConfigurePortDialog_Required=Required
+ConfigurePortDialog_Undef=undefined
+
+CreateDepPlanHandler_CreateDPs=Create deployment plans
+CreateDepPlanHandler_Sync=Synchronize
+CreateDepPlanHandler_CreateNew=create new (auto number name)
+CreateDepPlanHandler_WhatShouldIDo=What should I do?
+CreateDepPlanHandler_DPwithNameExistsAlready=Deployment plan with name %s exists already. You can always synchronize an existing deployment plan via the context menu "Synchronize derived elements"
+CreateDepPlanHandler_DPwithNameExistsNoPackage=Element with name %s exists, but is not a package
+CreateDepPlanHandler_CannotSync=Cannot synchronize
+CreateDepPlanHandler_Cancel=Cancel
+CreateDepPlanHandler_CreateDP=Create deployment plan
+CreateDepPlanHandler_CannotCreateDP=Cannot create deployment plan
+CreateDepPlanHandler_StereoApplicationFailed=Application of stereotype "FCM::DeploymentPlan" failed. Check, if FCM profile is applied
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/.classpath b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/.classpath
index 64c5e31b7a2..ad32c83a788 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/.classpath
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/META-INF/MANIFEST.MF b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/META-INF/MANIFEST.MF
index d969b8df6b7..b3c021724de 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation/META-INF/MANIFEST.MF
@@ -16,5 +16,5 @@ Bundle-Activator: org.eclipse.papyrus.qompass.designer.validation.Acti
  vator

 Bundle-SymbolicName: org.eclipse.papyrus.qompass.designer.validation;s

  ingleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

 

diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/.classpath b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/.classpath
index 64c5e31b7a2..ad32c83a788 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/.classpath
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/META-INF/MANIFEST.MF b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/META-INF/MANIFEST.MF
index 3aeb365e205..b6c0bca3f6b 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/META-INF/MANIFEST.MF
@@ -13,5 +13,5 @@ Bundle-Localization: plugin
 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.qompass.designer.vsl.Activator

 Bundle-SymbolicName: org.eclipse.papyrus.qompass.designer.vsl

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

 

diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/src/org/eclipse/papyrus/qompass/designer/vsl/Messages.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/src/org/eclipse/papyrus/qompass/designer/vsl/Messages.java
new file mode 100644
index 00000000000..548e47b0be1
--- /dev/null
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/src/org/eclipse/papyrus/qompass/designer/vsl/Messages.java
@@ -0,0 +1,17 @@
+package org.eclipse.papyrus.qompass.designer.vsl;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.qompass.designer.vsl.messages"; //$NON-NLS-1$
+	public static String ParseVSL_ErrorInExp_SIZE;
+	public static String ParseVSL_ErrorInExp_TIME;
+	public static String ParseVSL_ErrotInExp_FREQ;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/src/org/eclipse/papyrus/qompass/designer/vsl/ParseVSL.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/src/org/eclipse/papyrus/qompass/designer/vsl/ParseVSL.java
index e3b26d9ff05..14bd6a9545d 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/src/org/eclipse/papyrus/qompass/designer/vsl/ParseVSL.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/src/org/eclipse/papyrus/qompass/designer/vsl/ParseVSL.java
@@ -18,9 +18,13 @@ import com.google.inject.Injector;
 
 public class ParseVSL {
 
+	private static final String UNIT = "unit"; //$NON-NLS-1$
+
+	private static final String VALUE = "value"; //$NON-NLS-1$
+
 	private Injector injector;
 
-	private static final String SYNTHETIC_SCHEME = "synthetic";
+	private static final String SYNTHETIC_SCHEME = "synthetic"; //$NON-NLS-1$
 
 
 	/**
@@ -41,7 +45,7 @@ public class ParseVSL {
 		IGrammarAccess grammarAccess = injector.getInstance(IGrammarAccess.class);
 
 		XtextResource xtextResource = (XtextResource)resourceFactory.createResource(
-			URI.createURI(SYNTHETIC_SCHEME + ":/" + grammarAccess.getGrammar().getName() + ".vsl"));
+			URI.createURI(SYNTHETIC_SCHEME + ":/" + grammarAccess.getGrammar().getName() + ".vsl")); //$NON-NLS-1$ //$NON-NLS-2$
 
 		try {
 			xtextResource.load(new StringInputStream(expression, xtextResource.getEncoding()), Collections.emptyMap());
@@ -74,8 +78,8 @@ public class ParseVSL {
 	
 	public static int getSizeFromVSL(String nfpDatasize) {
 		if(nfpDatasize != null) {
-			String unit = MarteUtils.getValueFromTuple(nfpDatasize, "unit");
-			String value = MarteUtils.getValueFromTuple(nfpDatasize, "value");
+			String unit = MarteUtils.getValueFromTuple(nfpDatasize, UNIT);
+			String value = MarteUtils.getValueFromTuple(nfpDatasize, VALUE);
 			return Float.valueOf(value).intValue() * getMultiplicatorFromSizeUnit(unit);
 		}
 		return 0;
@@ -92,8 +96,8 @@ public class ParseVSL {
 	 */
 	public static long getDurationFromVSL(String nfpDuration) {
 		if(nfpDuration != null) {
-			String unit = MarteUtils.getValueFromTuple(nfpDuration, "unit");
-			String value = MarteUtils.getValueFromTuple(nfpDuration, "value");
+			String unit = MarteUtils.getValueFromTuple(nfpDuration, UNIT);
+			String value = MarteUtils.getValueFromTuple(nfpDuration, VALUE);
 			return Float.valueOf(value).intValue() * getMultiplicatorFromTimeUnit(unit);
 		}
 		return 0;
@@ -107,8 +111,8 @@ public class ParseVSL {
 	 */
 	public static long getFrequencyFromVSL(String nfpFrequency) {
 		if(nfpFrequency != null) {
-			String unit = MarteUtils.getValueFromTuple(nfpFrequency, "unit");
-			String value = MarteUtils.getValueFromTuple(nfpFrequency, "value");
+			String unit = MarteUtils.getValueFromTuple(nfpFrequency, UNIT);
+			String value = MarteUtils.getValueFromTuple(nfpFrequency, VALUE);
 			return (int)(Float.valueOf(value) * getMultiplicatorFromFrequencyUnit(unit));
 		}
 		return 0;
@@ -116,7 +120,7 @@ public class ParseVSL {
 
 	public static long getPeriodFromArrivalPattern(String arrivalPattern) {
 		if(arrivalPattern != null) {
-			String period = MarteUtils.getValueFromTuple(arrivalPattern, "period");
+			String period = MarteUtils.getValueFromTuple(arrivalPattern, "period"); //$NON-NLS-1$
 			return getDurationFromVSL(period);
 		}
 		return 0;
@@ -134,7 +138,7 @@ public class ParseVSL {
 			return 1024 * 1024 * 1024;
 		} else {
 			// do not support bits here.
-			throw new RuntimeException("Error parsing VSL expression, unexpected size unit (expecting byte, kb, mb, or gb): '" + unit + "'");
+			throw new RuntimeException(String.format(Messages.ParseVSL_ErrorInExp_SIZE, unit));
 		}
 	}
 
@@ -156,7 +160,7 @@ public class ParseVSL {
 		} else if(tuk == TimeUnitKind.MIN) {
 			return 60 * 1000 * 1000;
 		} else {
-			throw new RuntimeException("Error parsing VSL expression, unexpected duration unit (expecting us, ms, s or min): '" + unit + "'");
+			throw new RuntimeException(String.format(Messages.ParseVSL_ErrorInExp_TIME, unit));
 		}
 	}
 
@@ -174,7 +178,7 @@ public class ParseVSL {
 			return 1 / 60;
 		} else {
 			// do not support bits here.
-			throw new RuntimeException("Error parsing VSL expression, unexpected frequency unit (expecting Hz, KHz, MHz, GHz or rpm: '" + unit + "'");
+			throw new RuntimeException(String.format(Messages.ParseVSL_ErrotInExp_FREQ, unit));
 		}
 	}
 }
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/src/org/eclipse/papyrus/qompass/designer/vsl/messages.properties b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/src/org/eclipse/papyrus/qompass/designer/vsl/messages.properties
new file mode 100644
index 00000000000..115d3394041
--- /dev/null
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl/src/org/eclipse/papyrus/qompass/designer/vsl/messages.properties
@@ -0,0 +1,3 @@
+ParseVSL_ErrorInExp_SIZE=Error parsing VSL expression, unexpected size unit (expecting byte, kb, mb, or gb): '%s'
+ParseVSL_ErrorInExp_TIME=Error parsing VSL expression, unexpected duration unit (expecting us, ms, s or min): '%s'
+ParseVSL_ErrotInExp_FREQ=Error parsing VSL expression, unexpected frequency unit (expecting Hz, KHz, MHz, GHz or rpm: '%s'
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/.classpath b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/.classpath
index 64c5e31b7a2..ad32c83a788 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/.classpath
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/META-INF/MANIFEST.MF b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/META-INF/MANIFEST.MF
index 63e6af6fc5e..24da025656b 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/META-INF/MANIFEST.MF
@@ -6,7 +6,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.qompass.designer.core;bundle-version="1.0.0",

  org.eclipse.papyrus.qompass.designer.vsl;bundle-version="1.0.0",

  org.eclipse.uml2.uml;bundle-version="4.0.0",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.0"

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0"

 Export-Package: org.eclipse.papyrus.qompass.modellibs.core

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

@@ -17,5 +18,5 @@ Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.qompass.modellibs.core.Activator

 Bundle-SymbolicName: org.eclipse.papyrus.qompass.modellibs.core;single

  ton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

 

diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/build.acceleo b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/build.acceleo
index 9f96a52a9ef..b9a612c8c60 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/build.acceleo
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/build.acceleo
@@ -18,7 +18,7 @@
         <acceleoCompiler 
             sourceFolder="${target.folder}"
             outputFolder="${target.folder}"
-            dependencies="${target.folder}/../../org.eclipse.papyrus.fcm.profile;${target.folder}/../../org.eclipse.papyrus.infra.core.sasheditor;${target.folder}/../../org.eclipse.papyrus.infra.core.sasheditor.di;${target.folder}/../../org.eclipse.papyrus.qompass.designer.core;${target.folder}/../../org.eclipse.papyrus.qompass.designer.vsl;${target.folder}/../../org.eclipse.papyrus.cpp.profile;${target.folder}/../../org.eclipse.papyrus.acceleo;${target.folder}/../../org.eclipse.papyrus.uml.tools.utils;${target.folder}/../../org.eclipse.papyrus.infra.widgets.toolbox;"
+            dependencies="${target.folder}/../../org.eclipse.papyrus.fcm.profile;${target.folder}/../../org.eclipse.papyrus.infra.core.sasheditor;${target.folder}/../../org.eclipse.papyrus.infra.core.sasheditor.di;${target.folder}/../../org.eclipse.papyrus.qompass.designer.core;${target.folder}/../../org.eclipse.papyrus.qompass.designer.vsl;${target.folder}/../../org.eclipse.papyrus.cpp.profile;${target.folder}/../../org.eclipse.papyrus.acceleo;${target.folder}/../../org.eclipse.papyrus.infra.widgets.toolbox;"
             binaryResource="false"
             packagesToRegister="">
         </acceleoCompiler>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ClientServerTimer.notation b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ClientServerTimer.notation
index 491d471cf38..10fdf737beb 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ClientServerTimer.notation
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ClientServerTimer.notation
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:C_Cpp="http://www.eclipse.org/papyrus/C_Cpp/1" xmlns:FCM="http://www.eclipse.org/papyrus/FCM/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">
   <notation:Diagram xmi:id="_XSHWMF36Ed-UvNEDwY5GNg" type="PapyrusUMLClassDiagram" name="Interfaces" measurementUnit="Pixel">
     <children xmi:type="notation:Shape" xmi:id="_iubEsDbcEeGdqp2YT1LwWw" type="2004" fontName="Sans Serif" lineColor="0">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iucS0DbcEeGdqp2YT1LwWw" source="ShadowFigure">
@@ -44,6 +44,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_iudg_TbcEeGdqp2YT1LwWw"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iudg_jbcEeGdqp2YT1LwWw"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_TJ_EAFy9EeORBN8YBc21fg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_TJ_EAVy9EeORBN8YBc21fg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TJ_EAly9EeORBN8YBc21fg"/>
+      </children>
       <element xmi:type="uml:Interface" href="ClientServerTimer.uml#_cn-H0DLbEd2qeKRLMdIx_A"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iubEsTbcEeGdqp2YT1LwWw" x="132" y="101" width="328" height="80"/>
     </children>
@@ -153,6 +157,15 @@
         <element xmi:type="uml:Port" href="ClientServerTimer.uml#_DtWn4DLcEd2qeKRLMdIx_A"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZmeH8TrdEeGgAdAmWw4pyQ" x="153" y="81"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_TZhU0Fy9EeORBN8YBc21fg" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_TZhU0Vy9EeORBN8YBc21fg" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="ClientServerTimer.uml#_7SAnAP76Ed6Zw96O-tCw7A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TZhU0ly9EeORBN8YBc21fg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_TZh74Fy9EeORBN8YBc21fg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_TZh74Vy9EeORBN8YBc21fg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TZh74ly9EeORBN8YBc21fg"/>
+      </children>
       <element xmi:type="uml:Class" href="ClientServerTimer.uml#_IfjoETLbEd2qeKRLMdIx_A"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xxFIUV36Ed-UvNEDwY5GNg" x="126" y="153" width="163" height="133"/>
     </children>
@@ -199,6 +212,10 @@
         <element xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#_OfiosJsrEd61Eo3nmu3JhQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qjxzITenEeGPyrZ5I3hMlA" x="-10" y="27"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_TZ8yoFy9EeORBN8YBc21fg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_TZ9ZsFy9EeORBN8YBc21fg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TZ9ZsVy9EeORBN8YBc21fg"/>
+      </children>
       <element xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_N6fa4JsrEd61Eo3nmu3JhQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lvTlsQOUEeCBk5-airPjFw" x="126" y="36" width="163" height="55"/>
     </children>
@@ -279,6 +296,20 @@
         <element xmi:type="uml:Port" href="ClientServerTimer.uml#_4KiE8DLbEd2qeKRLMdIx_A"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FzA74WfbEd-T-rJ3Ep9Y5Q" x="-10" y="106"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Tb56cFy9EeORBN8YBc21fg" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Tb56cVy9EeORBN8YBc21fg" showTitle="true"/>
+        <element xmi:type="FCM:RuleApplication" href="ClientServerTimer.uml#_DWIYoP6yEd6Ie_kieu_3CQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Tb56cly9EeORBN8YBc21fg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_TcB2QFy9EeORBN8YBc21fg" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_TcB2QVy9EeORBN8YBc21fg" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="ClientServerTimer.uml#_Sa4nEP77Ed6Zw96O-tCw7A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TcB2Qly9EeORBN8YBc21fg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_TcCdUFy9EeORBN8YBc21fg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_TcDEYFy9EeORBN8YBc21fg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TcDEYVy9EeORBN8YBc21fg"/>
+      </children>
       <element xmi:type="uml:Class" href="ClientServerTimer.uml#_oqZNUDLaEd2qeKRLMdIx_A"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c2tKsV37Ed-UvNEDwY5GNg" x="134" y="74" width="217" height="137"/>
     </children>
@@ -401,6 +432,10 @@
             <element xmi:type="uml:Port" href="ClientServerTimer.uml#_DtWn4DLcEd2qeKRLMdIx_A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1ltaATrdEeGgAdAmWw4pyQ" x="166" y="52"/>
           </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_Tg4hEFy9EeORBN8YBc21fg" visible="false" type="compartment_shape_display">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_Tg4hEVy9EeORBN8YBc21fg"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Tg4hEly9EeORBN8YBc21fg"/>
+          </children>
           <element xmi:type="uml:Property" href="ClientServerTimer.uml#_i-I7gDLiEd2RVeNawwNNzg"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uegu4V37Ed-UvNEDwY5GNg" x="43" y="17" width="176" height="116"/>
         </children>
@@ -445,6 +480,10 @@
             <element xmi:type="uml:Port" href="ClientServerTimer.uml#_4KiE8DLbEd2qeKRLMdIx_A"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3RXDgTrdEeGgAdAmWw4pyQ" x="-10" y="50"/>
           </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_ThBD8Fy9EeORBN8YBc21fg" visible="false" type="compartment_shape_display">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_ThBD8Vy9EeORBN8YBc21fg"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ThBD8ly9EeORBN8YBc21fg"/>
+          </children>
           <element xmi:type="uml:Property" href="ClientServerTimer.uml#_gV1cgDLiEd2RVeNawwNNzg"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vHCHcV37Ed-UvNEDwY5GNg" x="369" y="19" width="188" height="112"/>
         </children>
@@ -483,6 +522,10 @@
                 <styles xmi:type="notation:TitleStyle" xmi:id="_1Lpe0SkDEeGDDbdzqSb4UA"/>
                 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1Lpe0ikDEeGDDbdzqSb4UA"/>
               </children>
+              <children xmi:type="notation:BasicCompartment" xmi:id="_ThIYsFy9EeORBN8YBc21fg" visible="false" type="compartment_shape_display">
+                <styles xmi:type="notation:TitleStyle" xmi:id="_ThIYsVy9EeORBN8YBc21fg"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ThIYsly9EeORBN8YBc21fg"/>
+              </children>
               <element xmi:type="uml:Property" href="pathmap://QML_CORE/core.uml#_ARs_UCjaEeGFbebITJYb9g"/>
               <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1LoQsSkDEeGDDbdzqSb4UA" x="22" y="10" width="172"/>
             </children>
@@ -505,6 +548,10 @@
                 <styles xmi:type="notation:TitleStyle" xmi:id="_1Lqs-CkDEeGDDbdzqSb4UA"/>
                 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1Lqs-SkDEeGDDbdzqSb4UA"/>
               </children>
+              <children xmi:type="notation:BasicCompartment" xmi:id="_ThK08Fy9EeORBN8YBc21fg" visible="false" type="compartment_shape_display">
+                <styles xmi:type="notation:TitleStyle" xmi:id="_ThLcAFy9EeORBN8YBc21fg"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ThLcAVy9EeORBN8YBc21fg"/>
+              </children>
               <element xmi:type="uml:Property" href="pathmap://QML_CORE/core.uml#_RMqEkCjaEeGFbebITJYb9g"/>
               <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1LqF4SkDEeGDDbdzqSb4UA" x="22" y="65" width="172"/>
             </children>
@@ -540,6 +587,10 @@
             <element xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#_3NSGwCkAEeGDDbdzqSb4UA"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OEcZ0CkDEeGDDbdzqSb4UA" x="-10" y="36"/>
           </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_ThFVYFy9EeORBN8YBc21fg" visible="false" type="compartment_shape_display">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_ThFVYVy9EeORBN8YBc21fg"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ThFVYly9EeORBN8YBc21fg"/>
+          </children>
           <element xmi:type="uml:Property" href="ClientServerTimer.uml#_lKtZUCjYEeGFbebITJYb9g"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lMUi4SjYEeGFbebITJYb9g" x="143" y="168" width="217" height="145"/>
         </children>
@@ -573,6 +624,10 @@
         </children>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sGa2Il37Ed-UvNEDwY5GNg"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Tg1dwFy9EeORBN8YBc21fg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Tg1dwVy9EeORBN8YBc21fg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Tg1dwly9EeORBN8YBc21fg"/>
+      </children>
       <element xmi:type="uml:Class" href="ClientServerTimer.uml#_bYJagDLiEd2RVeNawwNNzg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sGaPEV37Ed-UvNEDwY5GNg" x="68" y="32" width="635" height="356"/>
     </children>
@@ -657,6 +712,15 @@
       <children xmi:type="notation:DecorationNode" xmi:id="_7FvsNGONEd-seu3qyZgHfg" type="7016">
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7FvsNWONEd-seu3qyZgHfg"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_TjxdAFy9EeORBN8YBc21fg" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_TjxdAVy9EeORBN8YBc21fg" showTitle="true"/>
+        <element xmi:type="FCM:DeploymentPlan" href="ClientServerTimer.uml#_6dGQgP6zEd6Ie_kieu_3CQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TjxdAly9EeORBN8YBc21fg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_TjyEEFy9EeORBN8YBc21fg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_TjyEEVy9EeORBN8YBc21fg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TjyEEly9EeORBN8YBc21fg"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_7FtP8GONEd-seu3qyZgHfg"/>
       <element xmi:type="uml:Package" href="ClientServerTimer.uml#_5Z7MEDLiEd2RVeNawwNNzg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7FtP8WONEd-seu3qyZgHfg" x="77" y="68"/>
@@ -682,6 +746,15 @@
       <children xmi:type="notation:DecorationNode" xmi:id="_7zKL12ONEd-seu3qyZgHfg" type="7016">
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7zKL2GONEd-seu3qyZgHfg"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Tj0gUFy9EeORBN8YBc21fg" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Tj0gUVy9EeORBN8YBc21fg" showTitle="true"/>
+        <element xmi:type="FCM:DeploymentPlan" href="ClientServerTimer.uml#_bBdJUP_BEd6628OhKk_dpg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Tj0gUly9EeORBN8YBc21fg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Tj1HYFy9EeORBN8YBc21fg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Tj1HYVy9EeORBN8YBc21fg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Tj1HYly9EeORBN8YBc21fg"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_7zJkwWONEd-seu3qyZgHfg"/>
       <element xmi:type="uml:Package" href="ClientServerTimer.uml#_bBSxQP_BEd6628OhKk_dpg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7zJkwmONEd-seu3qyZgHfg" x="77" y="191"/>
@@ -719,6 +792,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_QU449qDjEd-rLNbSWf1QuA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QU4496DjEd-rLNbSWf1QuA"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Tj4KsFy9EeORBN8YBc21fg" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Tj4KsVy9EeORBN8YBc21fg" showTitle="true"/>
+        <element xmi:type="FCM:Configuration" href="ClientServerTimer.uml#_Y10_QKDjEd-rLNbSWf1QuA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Tj4Ksly9EeORBN8YBc21fg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Tj5Y0Fy9EeORBN8YBc21fg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Tj5Y0Vy9EeORBN8YBc21fg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Tj5Y0ly9EeORBN8YBc21fg"/>
+      </children>
       <element xmi:type="uml:Class" href="ClientServerTimer.uml#_QT6okKDjEd-rLNbSWf1QuA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QU0ngaDjEd-rLNbSWf1QuA" x="366" y="87" width="184" height="65"/>
     </children>
@@ -849,11 +931,19 @@
           <children xmi:type="notation:BasicCompartment" xmi:id="_Qgb5JcniEeCMCo5Ox2CNmg" type="7077">
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qgb5JsniEeCMCo5Ox2CNmg"/>
           </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_TmahUFy9EeORBN8YBc21fg" visible="false" type="compartment_shape_display">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_TmahUVy9EeORBN8YBc21fg"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TmahUly9EeORBN8YBc21fg"/>
+          </children>
           <element xmi:type="uml:Property" href="ClientServerTimer.uml#_QgKzYMniEeCMCo5Ox2CNmg"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QgbSEcniEeCMCo5Ox2CNmg" x="83" y="28" width="165" height="55"/>
         </children>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_M10BiMniEeCMCo5Ox2CNmg"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_TmYFEFy9EeORBN8YBc21fg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_TmYFEVy9EeORBN8YBc21fg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TmYFEly9EeORBN8YBc21fg"/>
+      </children>
       <element xmi:type="uml:Class" href="ClientServerTimer.uml#_M1a_8MniEeCMCo5Ox2CNmg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_M1wXIcniEeCMCo5Ox2CNmg" x="72" y="54" width="361" height="145"/>
     </children>
@@ -891,12 +981,20 @@
             <styles xmi:type="notation:TitleStyle" xmi:id="_eBxvODa3EeGBl4WmUxMhOA"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eBxvOTa3EeGBl4WmUxMhOA"/>
           </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_TmgA4Fy9EeORBN8YBc21fg" visible="false" type="compartment_shape_display">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_TmgA4Vy9EeORBN8YBc21fg"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TmgA4ly9EeORBN8YBc21fg"/>
+          </children>
           <element xmi:type="uml:Property" href="ClientServerTimer.uml#_eBgCYDa3EeGBl4WmUxMhOA"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eBxIITa3EeGBl4WmUxMhOA" x="85" y="26" width="163"/>
         </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_Xm1sFDa3EeGBl4WmUxMhOA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xm1sFTa3EeGBl4WmUxMhOA"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_TmdkoFy9EeORBN8YBc21fg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_TmdkoVy9EeORBN8YBc21fg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Tmdkoly9EeORBN8YBc21fg"/>
+      </children>
       <element xmi:type="uml:Class" href="ClientServerTimer.uml#_XkN14Da3EeGBl4WmUxMhOA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xmz24Ta3EeGBl4WmUxMhOA" x="72" y="240" width="361" height="130"/>
     </children>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ClientServerTimer.uml b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ClientServerTimer.uml
index 614741a5ac9..65055bdb134 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ClientServerTimer.uml
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/examples/ClientServerTimer.uml
@@ -16,11 +16,41 @@
           <ownedAttribute xmi:type="uml:Port" xmi:id="_4KiE8DLbEd2qeKRLMdIx_A" name="p" type="_cn-H0DLbEd2qeKRLMdIx_A" aggregation="composite"/>
           <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_YQqH0JYlEd6G9q9hwr11bw" name="derived realization of ICompute" client="_oqZNUDLaEd2qeKRLMdIx_A" supplier="_cn-H0DLbEd2qeKRLMdIx_A" contract="_cn-H0DLbEd2qeKRLMdIx_A"/>
           <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_ML-4AKI5Ed6FqJCjEUrkqQ" name="add" specification="_TbIjUJYlEd6G9q9hwr11bw">
+            <ownedParameter xmi:type="uml:Parameter" xmi:id="_p8CfgFy9EeORBN8YBc21fg" name="a">
+              <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
+              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_p8DGkFy9EeORBN8YBc21fg" value="1"/>
+              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_p8DtoFy9EeORBN8YBc21fg" value="1"/>
+            </ownedParameter>
+            <ownedParameter xmi:type="uml:Parameter" xmi:id="_p8EUsFy9EeORBN8YBc21fg" name="b">
+              <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
+              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_p8Fi0Fy9EeORBN8YBc21fg" value="1"/>
+              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_p8Fi0Vy9EeORBN8YBc21fg" value="1"/>
+            </ownedParameter>
+            <ownedParameter xmi:type="uml:Parameter" xmi:id="_p8GJ4Fy9EeORBN8YBc21fg" name="res" direction="return">
+              <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
+              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_p8GJ4Vy9EeORBN8YBc21fg" value="1"/>
+              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_p8Gw8Fy9EeORBN8YBc21fg" value="1"/>
+            </ownedParameter>
             <language>C/C++</language>
             <body>cout &lt;&lt; &quot;server: got add request for a=&quot; &lt;&lt; a &lt;&lt; &quot; and b=&quot; &lt;&lt; b &lt;&lt; endl;
 return a+b;</body>
           </ownedBehavior>
           <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_I1R3YAcDEeGnrLqQ0OQeAg" name="mult" specification="_4ZEZwHecEd6r18stFZxmFQ">
+            <ownedParameter xmi:type="uml:Parameter" xmi:id="_p8HYAFy9EeORBN8YBc21fg" name="a">
+              <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
+              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_p8HYAVy9EeORBN8YBc21fg" value="1"/>
+              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_p8H_EFy9EeORBN8YBc21fg" value="1"/>
+            </ownedParameter>
+            <ownedParameter xmi:type="uml:Parameter" xmi:id="_p8H_EVy9EeORBN8YBc21fg" name="b">
+              <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
+              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_p8H_Ely9EeORBN8YBc21fg" value="1"/>
+              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_p8ImIFy9EeORBN8YBc21fg" value="1"/>
+            </ownedParameter>
+            <ownedParameter xmi:type="uml:Parameter" xmi:id="_p8ImIVy9EeORBN8YBc21fg" name="res" direction="return">
+              <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
+              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_p8JNMFy9EeORBN8YBc21fg" value="1"/>
+              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_p8JNMVy9EeORBN8YBc21fg" value="1"/>
+            </ownedParameter>
             <language>C/C++</language>
             <body>cout &lt;&lt; &quot;server: got mult request for a=&quot; &lt;&lt; a &lt;&lt; &quot; and b=&quot; &lt;&lt; b &lt;&lt; endl;
 return a*b;</body>
@@ -56,25 +86,16 @@ return a*b;</body>
               <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DGs6wzLgEd28fJKJJnUaeQ" value="1"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DGs6wjLgEd28fJKJJnUaeQ" value="1"/>
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_DGs6xDLgEd28fJKJJnUaeQ">
-                <value xsi:nil="true"/>
-              </defaultValue>
             </ownedParameter>
             <ownedParameter xmi:type="uml:Parameter" xmi:id="_DGs6xTLgEd28fJKJJnUaeQ" name="b">
               <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DGs6xzLgEd28fJKJJnUaeQ" value="1"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DGs6xjLgEd28fJKJJnUaeQ" value="1"/>
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_DGs6yDLgEd28fJKJJnUaeQ">
-                <value xsi:nil="true"/>
-              </defaultValue>
             </ownedParameter>
             <ownedParameter xmi:type="uml:Parameter" xmi:id="_DGs6yTLgEd28fJKJJnUaeQ" name="res" direction="return">
               <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DGs6yzLgEd28fJKJJnUaeQ" value="1"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DGs6yjLgEd28fJKJJnUaeQ" value="1"/>
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_DGs6zDLgEd28fJKJJnUaeQ">
-                <value xsi:nil="true"/>
-              </defaultValue>
             </ownedParameter>
           </ownedOperation>
           <ownedOperation xmi:type="uml:Operation" xmi:id="_L8EY8DLgEd28fJKJJnUaeQ" name="mult" isAbstract="true">
@@ -82,25 +103,16 @@ return a*b;</body>
               <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_L8EY8zLgEd28fJKJJnUaeQ" value="1"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L8EY8jLgEd28fJKJJnUaeQ" value="1"/>
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_L8EY9DLgEd28fJKJJnUaeQ">
-                <value xsi:nil="true"/>
-              </defaultValue>
             </ownedParameter>
             <ownedParameter xmi:type="uml:Parameter" xmi:id="_L8EY9TLgEd28fJKJJnUaeQ" name="b">
               <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_L8EY9zLgEd28fJKJJnUaeQ" value="1"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L8EY9jLgEd28fJKJJnUaeQ" value="1"/>
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_L8EY-DLgEd28fJKJJnUaeQ">
-                <value xsi:nil="true"/>
-              </defaultValue>
             </ownedParameter>
             <ownedParameter xmi:type="uml:Parameter" xmi:id="_L8EY-TLgEd28fJKJJnUaeQ" name="res" direction="return">
               <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_L8EY-zLgEd28fJKJJnUaeQ" value="1"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L8EY-jLgEd28fJKJJnUaeQ" value="1"/>
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_L8EY_DLgEd28fJKJJnUaeQ">
-                <value xsi:nil="true"/>
-              </defaultValue>
             </ownedParameter>
           </ownedOperation>
         </packagedElement>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.di b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.di
index 2cc833a9acf..477408e4c6d 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.di
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.di
@@ -41,6 +41,9 @@
       <availablePage>
         <emfPageIdentifier href="core.notation#_DfG8kF7qEeGEmrrwB1vhPg"/>
       </availablePage>
+      <availablePage>
+        <emfPageIdentifier href="core.notation#_zCsUsHI3EeOCrdvV8oxOKA"/>
+      </availablePage>
     </pageList>
     <sashModel xmi:id="_pKTSk9YFEd-CgJIavLpOxQ" currentSelection="_pKTSldYFEd-CgJIavLpOxQ">
       <windows xmi:id="_pKTSlNYFEd-CgJIavLpOxQ">
@@ -84,6 +87,9 @@
           <children>
             <emfPageIdentifier href="core.notation#_A6ULINYGEd-CgJIavLpOxQ"/>
           </children>
+          <children>
+            <emfPageIdentifier href="core.notation#_zCsUsHI3EeOCrdvV8oxOKA"/>
+          </children>
         </children>
       </windows>
     </sashModel>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.notation b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.notation
index b8a16ddf749..17f6b6cd0f8 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.notation
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.notation
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:C_Cpp="http://www.eclipse.org/papyrus/C_Cpp/1" xmlns:FCM="http://www.eclipse.org/papyrus/FCM/1" xmlns:SW_Concurrency="http://www.eclipse.org/papyrus/SW_Concurrency/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/SW_Concurrency/1 http://www.eclipse.org/papyrus/MARTE/1#//SRM/SW_Concurrency">
   <notation:Diagram xmi:id="_FYAkIG4sEd-0rs2VEGIwsA" type="CompositeStructure" name="Composite Async &amp; sync call hierarchy" measurementUnit="Pixel">
     <children xmi:type="notation:Shape" xmi:id="_FYAkIW4sEd-0rs2VEGIwsA" type="2073" fontName="Sans Serif" fontHeight="10" lineColor="0">
       <children xmi:type="notation:DecorationNode" xmi:id="_FYAkIm4sEd-0rs2VEGIwsA" type="5156"/>
@@ -26,6 +26,10 @@
         <element xmi:type="uml:Port" href="core.uml#_Qk0jYNtuEd2eM5kqcby5ZA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FYBLMm4sEd-0rs2VEGIwsA" x="110" y="45"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_klFeYFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_klFeYVy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klFeYly8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Class" href="core.uml#_mIpj8Ns8Ed2eM5kqcby5ZA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FYBLM24sEd-0rs2VEGIwsA" x="225" y="90" width="120" height="84"/>
     </children>
@@ -54,6 +58,10 @@
         <element xmi:type="uml:Port" href="core.uml#_P4xVsNtuEd2eM5kqcby5ZA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FYBLPW4sEd-0rs2VEGIwsA" x="-10" y="44"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_klGsgFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_klGsgVy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klGsgly8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Class" href="core.uml#_j29X4NttEd2eM5kqcby5ZA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FYBLPm4sEd-0rs2VEGIwsA" x="420" y="90" width="121" height="79"/>
     </children>
@@ -129,6 +137,15 @@
         <element xmi:type="uml:Port" href="core.uml#_Qk0jYNtuEd2eM5kqcby5ZA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cnSuQTrVEeGMCcwsbpLuFA" x="106" y="36"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_klIhsFy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_klIhsVy8EeOwKfaVRwV11Q" showTitle="true"/>
+        <element xmi:type="FCM:InteractionComponent" href="core.uml#_s8OWIFR1Ed6GqrP6fkWBoQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klIhsly8EeOwKfaVRwV11Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_klIhs1y8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_klIhtFy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klIhtVy8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Class" href="core.uml#_KxQBELuXEd2TTr3gJIvazw"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cTmN8G5fEd-5CZIeuHpHAg" x="225" y="270" width="116" height="76"/>
     </children>
@@ -204,6 +221,15 @@
         <element xmi:type="uml:Port" href="core.uml#_Qk0jYNtuEd2eM5kqcby5ZA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hZSdojrVEeGMCcwsbpLuFA" x="111" y="33"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_klK98Fy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_klK98Vy8EeOwKfaVRwV11Q" showTitle="true"/>
+        <element xmi:type="FCM:InteractionComponent" href="core.uml#_efp4QClzEd-eoo60eNyGlg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klK98ly8EeOwKfaVRwV11Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_klK981y8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_klK99Fy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klK99Vy8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Class" href="core.uml#_Whe8EClYEd-eoo60eNyGlg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nkmBEW5fEd-5CZIeuHpHAg" x="225" y="390" width="121" height="73"/>
     </children>
@@ -279,6 +305,15 @@
         <element xmi:type="uml:Port" href="core.uml#_Qk0jYNtuEd2eM5kqcby5ZA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iOYSkTrVEeGMCcwsbpLuFA" x="111" y="36"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_klMzIFy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_klMzIVy8EeOwKfaVRwV11Q" showTitle="true"/>
+        <element xmi:type="FCM:InteractionComponent" href="core.uml#_vEYVcFR1Ed6GqrP6fkWBoQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klMzIly8EeOwKfaVRwV11Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_klNaMFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_klNaMVy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klNaMly8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Class" href="core.uml#_Zx2ZUA1jEd6tvthBDl600Q"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HJAqEW5gEd-5CZIeuHpHAg" x="420" y="270" width="121" height="76"/>
     </children>
@@ -354,6 +389,15 @@
         <element xmi:type="uml:Port" href="core.uml#_Qk0jYNtuEd2eM5kqcby5ZA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kf5CMTrVEeGMCcwsbpLuFA" x="111" y="33"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_klPPYFy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_klPPYVy8EeOwKfaVRwV11Q" showTitle="true"/>
+        <element xmi:type="FCM:InteractionComponent" href="core.uml#_wT-8IFR1Ed6GqrP6fkWBoQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klPPYly8EeOwKfaVRwV11Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_klP2cFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_klP2cVy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klP2cly8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Class" href="core.uml#_jOU60A1jEd6tvthBDl600Q"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H_CTIW5gEd-5CZIeuHpHAg" x="420" y="390" width="121" height="70"/>
     </children>
@@ -415,6 +459,10 @@
         <element xmi:type="uml:Port" href="core.uml#_0KY1UF7pEeGEmrrwB1vhPg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5wCPMV7pEeGEmrrwB1vhPg" x="108" y="45"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_klRroFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_klRroVy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klRroly8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Class" href="core.uml#_0KYOQF7pEeGEmrrwB1vhPg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2oWskV7pEeGEmrrwB1vhPg" x="36" y="90" width="118" height="82"/>
     </children>
@@ -491,6 +539,15 @@
         <element xmi:type="uml:Port" href="core.uml#_P4xVsNtuEd2eM5kqcby5ZA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ewm-4V7qEeGEmrrwB1vhPg" x="-10" y="36"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_klS5wFy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_klS5wVy8EeOwKfaVRwV11Q" showTitle="true"/>
+        <element xmi:type="FCM:InteractionComponent" href="core.uml#_Z3Zs4F7tEeGEmrrwB1vhPg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klS5wly8EeOwKfaVRwV11Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_klTg0Fy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_klTg0Vy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klTg0ly8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Class" href="core.uml#_TLShkF7qEeGEmrrwB1vhPg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TLmDkV7qEeGEmrrwB1vhPg" x="38" y="270" width="116" height="73"/>
     </children>
@@ -647,6 +704,20 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_ByUxPNYGEd-CgJIavLpOxQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ByUxPdYGEd-CgJIavLpOxQ"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kym9AFy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kym9AVy8EeOwKfaVRwV11Q" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="core.uml#_Q7TVYBJcEd-QgZm_R1AKbA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kym9Aly8EeOwKfaVRwV11Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kym9A1y8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kym9BFy8EeOwKfaVRwV11Q" showTitle="true"/>
+        <element xmi:type="SW_Concurrency:SwSchedulableResource" href="core.uml#_42YPYBn3EeONpa5JgejICQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kym9BVy8EeOwKfaVRwV11Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kynkEFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kynkEVy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kynkEly8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Class" href="core.uml#_SiY_AP-EEd6628OhKk_dpg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ByS8AdYGEd-CgJIavLpOxQ" x="99" y="108" width="190" height="145"/>
     </children>
@@ -683,6 +754,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_D0xxMdYGEd-CgJIavLpOxQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D0xxMtYGEd-CgJIavLpOxQ"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kyqnYFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kyqnYVy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kyqnYly8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Class" href="core.uml#_-WNegNtxEd6nqsBVkgJEEA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D0xKEdYGEd-CgJIavLpOxQ" x="99" y="9" width="193" height="55"/>
     </children>
@@ -736,6 +811,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_eloUI_QREeCovO8AYZymZQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eloUJPQREeCovO8AYZymZQ"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kyr1gFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kyr1gVy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kyr1gly8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Interface" href="core.uml#_elkpwPQREeCovO8AYZymZQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_elme8fQREeCovO8AYZymZQ" x="459" y="201" width="208" height="82"/>
     </children>
@@ -786,6 +865,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_S9L4GPQWEeCovO8AYZymZQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_S9L4GfQWEeCovO8AYZymZQ"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kytDoFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kytDoVy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kytDoly8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Interface" href="core.uml#_omxU4PNAEeCovO8AYZymZQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_S9Kp8fQWEeCovO8AYZymZQ" x="459" y="324" width="451" height="91"/>
     </children>
@@ -825,6 +908,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_DZU28iUREeGXBt65HZzY7g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DZU28yUREeGXBt65HZzY7g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kyuRwFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kyuRwVy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kyuRwly8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Interface" href="core.uml#_DY2VwCUREeGXBt65HZzY7g"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DZUP0CUREeGXBt65HZzY7g" x="702" y="201" width="208" height="79"/>
     </children>
@@ -857,6 +944,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_5MCgSCXQEeGX6PuSE-DJlQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5MCgSSXQEeGX6PuSE-DJlQ"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kyvf4Fy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kyvf4Vy8EeOwKfaVRwV11Q" showTitle="true"/>
+        <element xmi:type="FCM:InteractionComponent" href="core.uml#_OXit8CfwEeG6iME5Q8XPKw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kyvf4ly8EeOwKfaVRwV11Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kywG8Fy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kywG8Vy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kywG8ly8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Class" href="core.uml#_5J9coCXQEeGX6PuSE-DJlQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5MArESXQEeGX6PuSE-DJlQ" x="99" y="297" width="190" height="55"/>
     </children>
@@ -904,6 +1000,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_OYRe3FaNEeKxltxu9uR4dg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OYRe3VaNEeKxltxu9uR4dg"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kyxVEFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kyxVEVy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kyxVEly8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:DataType" href="core.uml#_OU5asFaNEeKxltxu9uR4dg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OX-j4VaNEeKxltxu9uR4dg" x="702" y="9" width="208" height="64"/>
     </children>
@@ -951,6 +1051,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_Y-AHblaNEeKxltxu9uR4dg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y-AHb1aNEeKxltxu9uR4dg"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kyyjMFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kyyjMVy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kyyjMly8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:DataType" href="core.uml#_Y8dPQFaNEeKxltxu9uR4dg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y9_gUVaNEeKxltxu9uR4dg" x="702" y="90" width="208" height="91"/>
     </children>
@@ -1046,6 +1150,10 @@
         <element xmi:type="uml:TemplateSignature" href="core.uml#_ewC6kOxIEd-2rr_yAeKkjQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jkrRMa8qEeCXIcykFPsB8Q" x="30" y="8"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kAPE4Fy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kAPE4Vy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kAPE4ly8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Package" href="core.uml#_RPCMoOxIEd-2rr_yAeKkjQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iLyysa8qEeCXIcykFPsB8Q" x="90" y="243"/>
     </children>
@@ -1122,11 +1230,24 @@
                 <styles xmi:type="notation:FilteringStyle" xmi:id="_V95nmq8sEeCXIcykFPsB8Q"/>
                 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V95nm68sEeCXIcykFPsB8Q"/>
               </children>
+              <children xmi:type="notation:BasicCompartment" xmi:id="_kCfHoFy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement">
+                <styles xmi:type="notation:TitleStyle" xmi:id="_kCfHoVy8EeOwKfaVRwV11Q" showTitle="true"/>
+                <element xmi:type="FCM:InteractionComponent" href="core.uml#_s8OWIFR1Ed6GqrP6fkWBoQ"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kCfHoly8EeOwKfaVRwV11Q"/>
+              </children>
+              <children xmi:type="notation:BasicCompartment" xmi:id="_kCfusFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+                <styles xmi:type="notation:TitleStyle" xmi:id="_kCfusVy8EeOwKfaVRwV11Q"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kCfusly8EeOwKfaVRwV11Q"/>
+              </children>
               <element xmi:type="uml:Class" href="core.uml#_KxQBELuXEd2TTr3gJIvazw"/>
               <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V94ZcK8sEeCXIcykFPsB8Q" x="16" y="10" height="43"/>
             </children>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TmLiRa8sEeCXIcykFPsB8Q"/>
           </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_kCegkFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_kCegkVy8EeOwKfaVRwV11Q"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kCegkly8EeOwKfaVRwV11Q"/>
+          </children>
           <element xmi:type="uml:Package" href="core.uml#_ZISNcIQzEd2_fLv04swWfw"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TmKUIa8sEeCXIcykFPsB8Q" x="13" y="28" width="190"/>
         </children>
@@ -1168,11 +1289,24 @@
                 <styles xmi:type="notation:FilteringStyle" xmi:id="_bgkl_a8sEeCXIcykFPsB8Q"/>
                 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bgkl_q8sEeCXIcykFPsB8Q"/>
               </children>
+              <children xmi:type="notation:BasicCompartment" xmi:id="_kChj4Fy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement">
+                <styles xmi:type="notation:TitleStyle" xmi:id="_kChj4Vy8EeOwKfaVRwV11Q" showTitle="true"/>
+                <element xmi:type="FCM:InteractionComponent" href="core.uml#_vEYVcFR1Ed6GqrP6fkWBoQ"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kChj4ly8EeOwKfaVRwV11Q"/>
+              </children>
+              <children xmi:type="notation:BasicCompartment" xmi:id="_kCiK8Fy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+                <styles xmi:type="notation:TitleStyle" xmi:id="_kCiK8Vy8EeOwKfaVRwV11Q"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kCiK8ly8EeOwKfaVRwV11Q"/>
+              </children>
               <element xmi:type="uml:Class" href="core.uml#_Zx2ZUA1jEd6tvthBDl600Q"/>
               <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bgjX0a8sEeCXIcykFPsB8Q" x="15" y="7" height="51"/>
             </children>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UgOvuK8sEeCXIcykFPsB8Q" x="48" y="4" width="200" height="80"/>
           </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_kCg80Fy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_kCg80Vy8EeOwKfaVRwV11Q"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kCg80ly8EeOwKfaVRwV11Q"/>
+          </children>
           <element xmi:type="uml:Package" href="core.uml#_RjvvcA1jEd6tvthBDl600Q"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UgOIoa8sEeCXIcykFPsB8Q" x="229" y="28" width="190"/>
         </children>
@@ -1200,6 +1334,10 @@
         <element xmi:type="uml:TemplateSignature" href="core.uml#_V0b2APfBEd2TbIfwytOyPA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_q9rCka8rEeCXIcykFPsB8Q" x="40" y="10"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kCdScFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kCdScVy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kCdScly8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Package" href="core.uml#_mMCK8PiPEd2UhpY2Y3WUyg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NLTmAa8rEeCXIcykFPsB8Q" x="90" y="108" width="451" height="181"/>
     </children>
@@ -1267,6 +1405,10 @@
         <element xmi:type="uml:Port" href="core.uml#_OfiosJsrEd61Eo3nmu3JhQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UfT48babEeCj_-LEBuGpmA" x="-10" y="36"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kEpq0Fy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kEpq0Vy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kEpq0ly8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Class" href="core.uml#_N6fa4JsrEd61Eo3nmu3JhQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PlQZwbabEeCj_-LEBuGpmA" x="144" y="72" width="163" height="73"/>
     </children>
@@ -1310,6 +1452,10 @@
         <element xmi:type="uml:Port" href="core.uml#__SLXgNtxEd6nqsBVkgJEEA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_atcPIbabEeCj_-LEBuGpmA" x="-10" y="36"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kErgAFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kErgAVy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kErgAly8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Class" href="core.uml#_-WNegNtxEd6nqsBVkgJEEA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QHPsgbabEeCj_-LEBuGpmA" x="144" y="180" width="163" height="73"/>
     </children>
@@ -1369,6 +1515,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_09wnmbnYEeCxXoyQxQ47PQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_09wnmrnYEeCxXoyQxQ47PQ"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kIOjQFy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kIOjQVy8EeOwKfaVRwV11Q" showTitle="true"/>
+        <element xmi:type="FCM:PortKind" href="core.uml#_wySlkFRxEd6GqrP6fkWBoQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kIOjQly8EeOwKfaVRwV11Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kIPKUFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kIPKUVy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kIPKUly8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Stereotype" href="core.uml#_Wtq4sFDlEd6cwecVIgl9nw"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_09vZcbnYEeCxXoyQxQ47PQ" x="54" y="28" width="127" height="37"/>
     </children>
@@ -1405,6 +1560,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_0-FXsrnYEeCxXoyQxQ47PQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0-FXs7nYEeCxXoyQxQ47PQ"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kIQ_gFy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kIQ_gVy8EeOwKfaVRwV11Q" showTitle="true"/>
+        <element xmi:type="FCM:PortKind" href="core.uml#_x5mL4FRxEd6GqrP6fkWBoQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kIQ_gly8EeOwKfaVRwV11Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kIQ_g1y8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kIQ_hFy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kIQ_hVy8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Stereotype" href="core.uml#_Wtq4sVDlEd6cwecVIgl9nw"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0-EJkbnYEeCxXoyQxQ47PQ" x="54" y="351" width="127" height="37"/>
     </children>
@@ -1441,6 +1605,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_0-YSrrnYEeCxXoyQxQ47PQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0-YSr7nYEeCxXoyQxQ47PQ"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kIS0sFy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kIS0sVy8EeOwKfaVRwV11Q" showTitle="true"/>
+        <element xmi:type="FCM:PortKind" href="core.uml#_pE6GUFR1Ed6GqrP6fkWBoQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kIS0sly8EeOwKfaVRwV11Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kITbwFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kITbwVy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kITbwly8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Stereotype" href="core.uml#_Wtq4slDlEd6cwecVIgl9nw"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0-XrkbnYEeCxXoyQxQ47PQ" x="54" y="297" width="127" height="37"/>
     </children>
@@ -1477,6 +1650,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_0-sbv7nYEeCxXoyQxQ47PQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0-sbwLnYEeCxXoyQxQ47PQ"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kIVQ8Fy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kIVQ8Vy8EeOwKfaVRwV11Q" showTitle="true"/>
+        <element xmi:type="FCM:PortKind" href="core.uml#_qOK0cFR1Ed6GqrP6fkWBoQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kIVQ8ly8EeOwKfaVRwV11Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kIV4AFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kIV4AVy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kIV4Aly8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Stereotype" href="core.uml#_WtrfwlDlEd6cwecVIgl9nw"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0-rNkbnYEeCxXoyQxQ47PQ" x="54" y="243" width="127" height="37"/>
     </children>
@@ -1513,6 +1695,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_0--Ij7nYEeCxXoyQxQ47PQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0--IkLnYEeCxXoyQxQ47PQ"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kIXGIFy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kIXGIVy8EeOwKfaVRwV11Q" showTitle="true"/>
+        <element xmi:type="FCM:PortKind" href="core.uml#_9Fif4FRxEd6GqrP6fkWBoQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kIXGIly8EeOwKfaVRwV11Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kIXtMFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kIXtMVy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kIXtMly8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Stereotype" href="core.uml#_Wtrfw1DlEd6cwecVIgl9nw"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0-9hcbnYEeCxXoyQxQ47PQ" x="54" y="81" width="127" height="37"/>
     </children>
@@ -1549,6 +1740,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_0_P1VrnYEeCxXoyQxQ47PQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0_P1V7nYEeCxXoyQxQ47PQ"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kIZiYFy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kIZiYVy8EeOwKfaVRwV11Q" showTitle="true"/>
+        <element xmi:type="FCM:PortKind" href="core.uml#_KtgR0LqOEd-SedGzMDDkww"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kIZiYly8EeOwKfaVRwV11Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kIaJcFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kIaJcVy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kIaJcly8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Stereotype" href="core.uml#__nMrwLqNEd-SedGzMDDkww"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0_OnMbnYEeCxXoyQxQ47PQ" x="54" y="135" width="127" height="37"/>
     </children>
@@ -1585,6 +1785,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_0_lzlrnYEeCxXoyQxQ47PQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0_lzl7nYEeCxXoyQxQ47PQ"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kIb-oFy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kIb-oVy8EeOwKfaVRwV11Q" showTitle="true"/>
+        <element xmi:type="FCM:PortKind" href="core.uml#_H5-aQLqOEd-SedGzMDDkww"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kIb-oly8EeOwKfaVRwV11Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kIb-o1y8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kIb-pFy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kIb-pVy8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Stereotype" href="core.uml#_AQZZwLqOEd-SedGzMDDkww"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0_j-YbnYEeCxXoyQxQ47PQ" x="54" y="189" width="127" height="37"/>
     </children>
@@ -1736,6 +1945,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_GkOCbS8qEeKx7OxAiA06uw"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GkOCbi8qEeKx7OxAiA06uw"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kIfpAFy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kIfpAVy8EeOwKfaVRwV11Q" showTitle="true"/>
+        <element xmi:type="FCM:PortKind" href="core.uml#_SrCqQC8qEeKx7OxAiA06uw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kIfpAly8EeOwKfaVRwV11Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kIfpA1y8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kIfpBFy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kIfpBVy8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Stereotype" href="core.uml#_GjnlcC8qEeKx7OxAiA06uw"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GkK_EC8qEeKx7OxAiA06uw" x="54" y="405" width="127" height="37"/>
     </children>
@@ -1913,12 +2131,30 @@
             <element xmi:type="uml:Port" href="core.uml#__SLXgNtxEd6nqsBVkgJEEA"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_y3o_QPTWEeCn1-FCrfecFg" x="-10" y="7"/>
           </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_kKoXAFy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_kKoXAVy8EeOwKfaVRwV11Q" showTitle="true"/>
+            <element xmi:type="FCM:InterceptionRule" href="core.uml#_qlcF8AJzEeG0Lb1KYG16fA"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kKoXAly8EeOwKfaVRwV11Q"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_kKoXA1y8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_kKoXBFy8EeOwKfaVRwV11Q"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kKoXBVy8EeOwKfaVRwV11Q"/>
+          </children>
           <element xmi:type="uml:Property" href="core.uml#_mvN04PTWEeCn1-FCrfecFg"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mxqE4fTWEeCn1-FCrfecFg" x="31" y="31" width="199" height="37"/>
         </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_V4BOxPEnEeCIafpoJVk7CQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V4BOxfEnEeCIafpoJVk7CQ"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kKmh0Fy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kKmh0Vy8EeOwKfaVRwV11Q" showTitle="true"/>
+        <element xmi:type="FCM:ContainerRule" href="core.uml#_3Jq5MARLEd-OidZzGKCpzg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kKmh0ly8EeOwKfaVRwV11Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kKnI4Fy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kKnI4Vy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kKnI4ly8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Class" href="core.uml#_14WtMARJEd--t-uhRn9OBA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V3-LcfEnEeCIafpoJVk7CQ" x="72" y="36" width="262" height="145"/>
     </children>
@@ -1974,12 +2210,25 @@
             <styles xmi:type="notation:TitleStyle" xmi:id="_JWCtqCjaEeGFbebITJYb9g"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JWCtqSjaEeGFbebITJYb9g"/>
           </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_kKsocFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_kKsocVy8EeOwKfaVRwV11Q"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kKsocly8EeOwKfaVRwV11Q"/>
+          </children>
           <element xmi:type="uml:Property" href="core.uml#_6yVMkCjZEeGFbebITJYb9g"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JWCGkSjaEeGFbebITJYb9g" x="10" y="10" width="156"/>
         </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_HDA7GCjaEeGFbebITJYb9g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HDA7GSjaEeGFbebITJYb9g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kKqzQFy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kKqzQVy8EeOwKfaVRwV11Q" showTitle="true"/>
+        <element xmi:type="FCM:ContainerRule" href="core.uml#_MS45QCjaEeGFbebITJYb9g"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kKqzQly8EeOwKfaVRwV11Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kKraUFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kKraUVy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kKraUly8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Class" href="core.uml#_1sCBICjZEeGFbebITJYb9g"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HDAUASjaEeGFbebITJYb9g" x="72" y="252" width="261" height="101"/>
     </children>
@@ -2046,6 +2295,10 @@
             <styles xmi:type="notation:TitleStyle" xmi:id="_k-Rs8fN8EeCovO8AYZymZQ" showTitle="true"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_k-Rs8vN8EeCovO8AYZymZQ"/>
           </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_kn7-EFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_kn7-EVy8EeOwKfaVRwV11Q"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kn7-Ely8EeOwKfaVRwV11Q"/>
+          </children>
           <element xmi:type="uml:Property" href="core.uml#_k-OpoPN8EeCovO8AYZymZQ"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_k-Qe0fN8EeCovO8AYZymZQ" x="24" y="41" width="165" height="23"/>
         </children>
@@ -2068,6 +2321,10 @@
             <styles xmi:type="notation:TitleStyle" xmi:id="__a4EJ_QXEeCovO8AYZymZQ" showTitle="true"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="__a4EKPQXEeCovO8AYZymZQ"/>
           </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_kn8lIFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_kn8lIVy8EeOwKfaVRwV11Q"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kn8lIly8EeOwKfaVRwV11Q"/>
+          </children>
           <element xmi:type="uml:Property" href="core.uml#__a1A0PQXEeCovO8AYZymZQ"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="__a22AfQXEeCovO8AYZymZQ" x="24" y="5" width="165" height="23"/>
         </children>
@@ -2090,6 +2347,10 @@
             <styles xmi:type="notation:TitleStyle" xmi:id="_KnUudvQYEeCovO8AYZymZQ"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KnUud_QYEeCovO8AYZymZQ"/>
           </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_kn9zQFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_kn9zQVy8EeOwKfaVRwV11Q"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kn9zQly8EeOwKfaVRwV11Q"/>
+          </children>
           <element xmi:type="uml:Property" href="core.uml#_KnS5QPQYEeCovO8AYZymZQ"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KnUHYfQYEeCovO8AYZymZQ" x="24" y="83" width="165" height="23"/>
         </children>
@@ -2125,6 +2386,15 @@
         <element xmi:type="uml:Port" href="core.uml#_MzO8gPNAEeCovO8AYZymZQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_M0b2YfNAEeCovO8AYZymZQ" x="-10" y="60" width="20" height="20"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kn6I4Fy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kn6I4Vy8EeOwKfaVRwV11Q" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="core.uml#_Yx49gCaeEeG4fZdVXNtoOQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kn6I4ly8EeOwKfaVRwV11Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kn6I41y8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kn6I5Fy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kn6I5Vy8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Class" href="core.uml#_JRmo0PNAEeCovO8AYZymZQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JRsvcfNAEeCovO8AYZymZQ" x="171" y="32" width="212" height="159"/>
     </children>
@@ -2208,6 +2478,10 @@
         <element xmi:type="uml:Port" href="core.uml#__SLXgNtxEd6nqsBVkgJEEA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f8HYESjZEeGFbebITJYb9g" x="-10" y="45"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kn_BYFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kn_BYVy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kn_BYly8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Class" href="core.uml#_9V8OQCjYEeGFbebITJYb9g"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9dH0USjYEeGFbebITJYb9g" x="171" y="302" width="217" height="92"/>
     </children>
@@ -2226,6 +2500,10 @@
         <styles xmi:type="notation:TitleStyle" xmi:id="_WoROKCjZEeGFbebITJYb9g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WoROKSjZEeGFbebITJYb9g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_koA2kFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_koA2kVy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_koA2kly8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Class" href="core.uml#_-WNegNtxEd6nqsBVkgJEEA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WoQnESjZEeGFbebITJYb9g" x="171" y="250" width="217" height="26"/>
     </children>
@@ -2333,6 +2611,10 @@
             <element xmi:type="uml:Port" href="core.uml#_ATRiECjZEeGFbebITJYb9g"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4ksloSkAEeGDDbdzqSb4UA" x="153" y="16"/>
           </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_koCrwFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_koCrwVy8EeOwKfaVRwV11Q"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_koCrwly8EeOwKfaVRwV11Q"/>
+          </children>
           <element xmi:type="uml:Property" href="core.uml#_ARs_UCjaEeGFbebITJYb9g"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qz8yvikAEeGDDbdzqSb4UA" x="22" y="103" width="163" height="51"/>
         </children>
@@ -2384,6 +2666,10 @@
             <element xmi:type="uml:Port" href="core.uml#_ZjdOAP-EEd6628OhKk_dpg"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qz8y1ykAEeGDDbdzqSb4UA" x="63" y="42"/>
           </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_koEg8Fy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_koEg8Vy8EeOwKfaVRwV11Q"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_koEg8ly8EeOwKfaVRwV11Q"/>
+          </children>
           <element xmi:type="uml:Property" href="core.uml#_RMqEkCjaEeGFbebITJYb9g"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qz8y2CkAEeGDDbdzqSb4UA" x="22" y="7" width="163" height="52"/>
         </children>
@@ -2419,6 +2705,10 @@
         <element xmi:type="uml:Port" href="core.uml#_3NSGwCkAEeGDDbdzqSb4UA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3PyBISkAEeGDDbdzqSb4UA" x="288" y="144" width="20" height="20"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_koCEsFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_koCEsVy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_koCEsly8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Class" href="core.uml#_-X6zMCjZEeGFbebITJYb9g"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qz8y2ykAEeGDDbdzqSb4UA" x="455" y="39" width="298" height="199"/>
     </children>
@@ -2543,6 +2833,10 @@
         <element xmi:type="uml:Port" href="core.uml#_MhH6cENxEeGoAtSeIK7WLg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iVa2wUN9EeGfhclnRyNzoA" x="-10" y="36"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kfWp0Fy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kfWp0Vy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kfWp0ly8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Class" href="core.uml#_b_yh4AzyEd6it_RkGhz_AA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iVJ-IfNGEeCovO8AYZymZQ" x="90" y="279" width="127" height="73"/>
     </children>
@@ -2590,6 +2884,10 @@
         <element xmi:type="uml:Port" href="core.uml#_P4xVsNtuEd2eM5kqcby5ZA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qJrqYfNGEeCovO8AYZymZQ" x="-10" y="36"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kfYfAFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kfYfAVy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kfYfAly8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Class" href="core.uml#_j29X4NttEd2eM5kqcby5ZA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kENg8fNGEeCovO8AYZymZQ" x="90" y="36" width="316" height="73"/>
     </children>
@@ -2666,6 +2964,10 @@
         <element xmi:type="uml:Port" href="core.uml#_Zd558ENxEeGoAtSeIK7WLg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cQDbAUN9EeGfhclnRyNzoA" x="117" y="36"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kfZtIFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kfZtIVy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kfZtIly8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Class" href="core.uml#_fmF6MAzyEd6it_RkGhz_AA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mqiqAfNGEeCovO8AYZymZQ" x="396" y="279" width="127" height="73"/>
     </children>
@@ -2713,6 +3015,10 @@
         <element xmi:type="uml:Port" href="core.uml#_Qk0jYNtuEd2eM5kqcby5ZA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qpQiUfNGEeCovO8AYZymZQ" x="117" y="36"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kfbiUFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kfbiUVy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kfbiUly8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Class" href="core.uml#_mIpj8Ns8Ed2eM5kqcby5ZA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_o1VGkfNGEeCovO8AYZymZQ" x="468" y="36" width="127" height="73"/>
     </children>
@@ -2789,6 +3095,15 @@
         <element xmi:type="uml:Port" href="core.uml#_MhH6cENxEeGoAtSeIK7WLg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vzOfsUN9EeGfhclnRyNzoA" x="-10" y="36"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kfcwcFy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kfcwcVy8EeOwKfaVRwV11Q" showTitle="true"/>
+        <element xmi:type="FCM:ImplementationProperties" href="core.uml#_WIe68PQMEeCovO8AYZymZQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kfcwcly8EeOwKfaVRwV11Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kfcwc1y8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kfcwdFy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kfcwdVy8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Class" href="core.uml#__uJRYPNGEeCovO8AYZymZQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="__uLGkfNGEeCovO8AYZymZQ" x="90" y="405" width="127" height="73"/>
     </children>
@@ -2862,6 +3177,10 @@
         <element xmi:type="uml:Port" href="core.uml#_-nk_cENqEeGoAtSeIK7WLg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-nzo8UNqEeGoAtSeIK7WLg" x="117" y="36" width="20" height="20"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kffzwFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kffzwVy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kffzwly8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Class" href="core.uml#_u7MmIENqEeGoAtSeIK7WLg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_u_QmwUNqEeGoAtSeIK7WLg" x="90" y="144" width="127" height="73"/>
     </children>
@@ -2938,6 +3257,10 @@
         <element xmi:type="uml:Port" href="core.uml#_Qk0jYNtuEd2eM5kqcby5ZA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zePOUUN8EeGfhclnRyNzoA" x="117" y="36"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kfho8Fy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kfho8Vy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kfho8ly8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Class" href="core.uml#_1xGG8ENqEeGoAtSeIK7WLg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1xcsQUNqEeGoAtSeIK7WLg" x="468" y="144" width="127" height="73"/>
     </children>
@@ -3011,6 +3334,10 @@
         <element xmi:type="uml:Port" href="core.uml#_i5SOQEN8EeGfhclnRyNzoA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i75dYEN8EeGfhclnRyNzoA" x="117" y="36" width="20" height="20"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kfi3EFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kfi3EVy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kfi3Ely8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Class" href="core.uml#_H7IOcENrEeGoAtSeIK7WLg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_H7kTUUNrEeGoAtSeIK7WLg" x="279" y="144" width="127" height="73"/>
     </children>
@@ -3100,6 +3427,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_jQmKVPNUEeCovO8AYZymZQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jQmKVfNUEeCovO8AYZymZQ"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kcbRoFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kcbRoVy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kcbRoly8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Enumeration" href="core.uml#_jQjHAPNUEeCovO8AYZymZQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jQk8MfNUEeCovO8AYZymZQ" x="387" y="83"/>
     </children>
@@ -3160,6 +3491,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_SPSrLVjnEeKaM_PspnG53g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SPSrLljnEeKaM_PspnG53g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kccfwFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kccfwVy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kccfwly8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Class" href="core.uml#_WkkjoPNUEeCovO8AYZymZQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SPPn0VjnEeKaM_PspnG53g" x="130" y="78"/>
     </children>
@@ -3198,6 +3533,15 @@
             <styles xmi:type="notation:TitleStyle" xmi:id="_j5_skSnOEeGxrprK9wB9iA" showTitle="true"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j5_skinOEeGxrprK9wB9iA"/>
           </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_kNDY4Fy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_kNDY4Vy8EeOwKfaVRwV11Q" showTitle="true"/>
+            <element xmi:type="FCM:ConfigurationProperty" href="core.uml#_s0fGMMGJEd-Mveea1W_olA"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kNDY4ly8EeOwKfaVRwV11Q"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_kNDY41y8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_kNDY5Fy8EeOwKfaVRwV11Q"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kNDY5Vy8EeOwKfaVRwV11Q"/>
+          </children>
           <element xmi:type="uml:Property" href="core.uml#_rVfYoMGJEd-Mveea1W_olA"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_j5-ecSnOEeGxrprK9wB9iA" x="10" y="10" width="131"/>
         </children>
@@ -3218,6 +3562,20 @@
         <styles xmi:type="notation:TitleStyle" xmi:id="_hvuNYSnOEeGxrprK9wB9iA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hvuNYinOEeGxrprK9wB9iA"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kNBjsFy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kNBjsVy8EeOwKfaVRwV11Q" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="core.uml#_Q7TVYBJcEd-QgZm_R1AKbA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kNBjsly8EeOwKfaVRwV11Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kNBjs1y8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kNBjtFy8EeOwKfaVRwV11Q" showTitle="true"/>
+        <element xmi:type="SW_Concurrency:SwSchedulableResource" href="core.uml#_42YPYBn3EeONpa5JgejICQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kNBjtVy8EeOwKfaVRwV11Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kNBjtly8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kNBjt1y8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kNBjuFy8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Class" href="core.uml#_SiY_AP-EEd6628OhKk_dpg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hvsYMSnOEeGxrprK9wB9iA" x="62" y="64" width="524" height="135"/>
     </children>
@@ -3252,6 +3610,15 @@
             <styles xmi:type="notation:TitleStyle" xmi:id="_vBNRlSnOEeGxrprK9wB9iA" showTitle="true"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vBNRlinOEeGxrprK9wB9iA"/>
           </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_kNF1IFy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_kNF1IVy8EeOwKfaVRwV11Q" showTitle="true"/>
+            <element xmi:type="FCM:ConfigurationProperty" href="core.uml#_zVumMCjbEeGFbebITJYb9g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kNF1Ily8EeOwKfaVRwV11Q"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_kNF1I1y8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_kNF1JFy8EeOwKfaVRwV11Q"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kNF1JVy8EeOwKfaVRwV11Q"/>
+          </children>
           <element xmi:type="uml:Property" href="core.uml#_tmNeoCjbEeGFbebITJYb9g"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vBLcYSnOEeGxrprK9wB9iA" x="10" y="10" width="173"/>
         </children>
@@ -3272,6 +3639,10 @@
         <styles xmi:type="notation:TitleStyle" xmi:id="_t6xN9CnOEeGxrprK9wB9iA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t6xN9SnOEeGxrprK9wB9iA"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kNEnAFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kNEnAVy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kNEnAly8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Class" href="core.uml#_9V8OQCjYEeGFbebITJYb9g"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t6v_0SnOEeGxrprK9wB9iA" x="65" y="245" width="521" height="161"/>
     </children>
@@ -3290,6 +3661,15 @@
         <styles xmi:type="notation:TitleStyle" xmi:id="_RAN52Co0EeGxrprK9wB9iA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RAN52So0EeGxrprK9wB9iA"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kNHqUFy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kNHqUVy8EeOwKfaVRwV11Q" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="pathmap://QML_CORE/osal.uml#_tNGmwDkUEdyuzNpSiGPe4w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kNHqUly8EeOwKfaVRwV11Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kNHqU1y8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kNHqVFy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kNHqVVy8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Class" href="pathmap://QML_CORE/osal.uml#_ETakYDj8Edy0Rd6V_tf1-Q"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RANSwSo0EeGxrprK9wB9iA" x="652" y="261" width="60" height="55"/>
     </children>
@@ -3396,6 +3776,10 @@
         <element xmi:type="uml:Port" href="core.uml#_Qk0jYNtuEd2eM5kqcby5ZA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dcSwxD8AEeGJ6KSvhYhYuQ" x="360" y="23"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kaQHYFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kaQHYVy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kaQHYly8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Class" href="core.uml#_e6Y_EChYEd-eoo60eNyGlg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SgFh4T8AEeGJ6KSvhYhYuQ" x="117" y="99" width="370"/>
     </children>
@@ -3501,6 +3885,10 @@
         <element xmi:type="uml:Port" href="core.uml#_Qk0jYNtuEd2eM5kqcby5ZA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1JWfIz8EEeGJ6KSvhYhYuQ" x="-10" y="27"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kaTKsFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kaTKsVy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kaTKsly8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Class" href="core.uml#_qgzokChYEd-eoo60eNyGlg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_S-NoUT8AEeGJ6KSvhYhYuQ" x="117" y="189" width="109" height="73"/>
     </children>
@@ -3519,6 +3907,10 @@
         <styles xmi:type="notation:TitleStyle" xmi:id="_TeXIBz8AEeGJ6KSvhYhYuQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TeXICD8AEeGJ6KSvhYhYuQ"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kaVm8Fy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kaVm8Vy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kaVm8ly8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Class" href="core.uml#_2wMyEChiEd-eoo60eNyGlg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TeWg8T8AEeGJ6KSvhYhYuQ" x="252" y="189"/>
     </children>
@@ -3537,6 +3929,10 @@
         <styles xmi:type="notation:TitleStyle" xmi:id="_T7aQaD8AEeGJ6KSvhYhYuQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T7aQaT8AEeGJ6KSvhYhYuQ"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kaW1EFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kaW1EVy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kaW1Ely8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Class" href="core.uml#_6rmQoChiEd-eoo60eNyGlg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T7ZpUT8AEeGJ6KSvhYhYuQ" x="387" y="189" width="95"/>
     </children>
@@ -3555,6 +3951,15 @@
         <styles xmi:type="notation:TitleStyle" xmi:id="_gXBcgT8AEeGJ6KSvhYhYuQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gXBcgj8AEeGJ6KSvhYhYuQ"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kaXcIFy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kaXcIVy8EeOwKfaVRwV11Q" showTitle="true"/>
+        <element xmi:type="FCM:InteractionComponent" href="core.uml#_s8OWIFR1Ed6GqrP6fkWBoQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kaXcIly8EeOwKfaVRwV11Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kaYDMFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kaYDMVy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kaYDMly8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Class" href="core.uml#_KxQBELuXEd2TTr3gJIvazw"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gXAOYT8AEeGJ6KSvhYhYuQ" x="117" y="18" width="370"/>
     </children>
@@ -3601,6 +4006,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_jQ_oaD8CEeGJ6KSvhYhYuQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jQ_oaT8CEeGJ6KSvhYhYuQ"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_kaZRUFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_kaZRUVy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kaZRUly8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Enumeration" href="core.uml#_hcwDkD8CEeGJ6KSvhYhYuQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jQ_BUT8CEeGJ6KSvhYhYuQ" x="441" y="261" width="164"/>
     </children>
@@ -3664,6 +4073,15 @@
         <styles xmi:type="notation:TitleStyle" xmi:id="_EYwhaF7qEeGEmrrwB1vhPg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EYwhaV7qEeGEmrrwB1vhPg"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_khqW8Fy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_khqW8Vy8EeOwKfaVRwV11Q" showTitle="true"/>
+        <element xmi:type="FCM:InteractionComponent" href="core.uml#_s8OWIFR1Ed6GqrP6fkWBoQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_khqW8ly8EeOwKfaVRwV11Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_khqW81y8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_khqW9Fy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_khqW9Vy8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Class" href="core.uml#_KxQBELuXEd2TTr3gJIvazw"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EYv6UV7qEeGEmrrwB1vhPg" x="135" y="72" width="154" height="64"/>
     </children>
@@ -3747,6 +4165,15 @@
         <element xmi:type="uml:Port" href="core.uml#_Qk0jYNtuEd2eM5kqcby5ZA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_udLTgV7sEeGEmrrwB1vhPg" x="144" y="36"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_khrlEFy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_khrlEVy8EeOwKfaVRwV11Q" showTitle="true"/>
+        <element xmi:type="FCM:InteractionComponent" href="core.uml#_efp4QClzEd-eoo60eNyGlg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_khrlEly8EeOwKfaVRwV11Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_khrlE1y8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_khrlFFy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_khrlFVy8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Class" href="core.uml#_Whe8EClYEd-eoo60eNyGlg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FWtXYV7qEeGEmrrwB1vhPg" x="135" y="198" width="154" height="64"/>
     </children>
@@ -3779,6 +4206,15 @@
         <styles xmi:type="notation:TitleStyle" xmi:id="_b3pi2F7sEeGEmrrwB1vhPg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b3pi2V7sEeGEmrrwB1vhPg"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_khtaQFy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_khtaQVy8EeOwKfaVRwV11Q" showTitle="true"/>
+        <element xmi:type="FCM:InteractionComponent" href="core.uml#_Z3Zs4F7tEeGEmrrwB1vhPg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_khtaQly8EeOwKfaVRwV11Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_khuBUFy8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_khuBUVy8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_khuBUly8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Class" href="core.uml#_TLShkF7qEeGEmrrwB1vhPg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b3o7wV7sEeGEmrrwB1vhPg" x="423" y="71" width="154" height="65"/>
     </children>
@@ -3870,6 +4306,15 @@
         <element xmi:type="uml:Port" href="core.uml#_P4xVsNtuEd2eM5kqcby5ZA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qroUh17sEeGEmrrwB1vhPg" x="-10" y="38"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_khuoYFy8EeOwKfaVRwV11Q" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_khvPcFy8EeOwKfaVRwV11Q" showTitle="true"/>
+        <element xmi:type="FCM:InteractionComponent" href="core.uml#_UBcmIF7tEeGEmrrwB1vhPg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_khvPcVy8EeOwKfaVRwV11Q"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_khvPcly8EeOwKfaVRwV11Q" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_khvPc1y8EeOwKfaVRwV11Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_khvPdFy8EeOwKfaVRwV11Q"/>
+      </children>
       <element xmi:type="uml:Class" href="core.uml#_Mo2kwF7pEeGEmrrwB1vhPg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ck0K0V7sEeGEmrrwB1vhPg" x="420" y="196" width="157" height="66"/>
     </children>
@@ -3893,4 +4338,51 @@
       <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eKfIIF7sEeGEmrrwB1vhPg" id="(0.504424778761062,0.1694915254237288)"/>
     </edges>
   </notation:Diagram>
+  <notation:Diagram xmi:id="_zCsUsHI3EeOCrdvV8oxOKA" type="PapyrusUMLClassDiagram" name="Binding helpers" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_z30l4HI3EeOCrdvV8oxOKA" type="2008" fontName="" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_z33CIHI3EeOCrdvV8oxOKA" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_z33CIXI3EeOCrdvV8oxOKA" key="ShadowFigure_Value" value="true"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_z33CInI3EeOCrdvV8oxOKA" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_z33CI3I3EeOCrdvV8oxOKA" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_z33CJHI3EeOCrdvV8oxOKA" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_z33pMHI3EeOCrdvV8oxOKA" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_nLx6oHJDEeOMF7YEvnQt5g" source="Stereotype_Annotation">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nLx6oXJDEeOMF7YEvnQt5g" key="StereotypeWithQualifiedNameList" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nLx6onJDEeOMF7YEvnQt5g" key="StereotypeList" value="FCM::BindingHelper"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nLyhsHJDEeOMF7YEvnQt5g" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nLyhsXJDEeOMF7YEvnQt5g" key="PropStereoDisplay" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_nLyhsnJDEeOMF7YEvnQt5g" key="StereotypePropertyLocation" value="Compartment"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_z33pMXI3EeOCrdvV8oxOKA" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_z33pMnI3EeOCrdvV8oxOKA" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_z33pM3I3EeOCrdvV8oxOKA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_z33pNHI3EeOCrdvV8oxOKA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_z33pNXI3EeOCrdvV8oxOKA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z33pNnI3EeOCrdvV8oxOKA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_z33pN3I3EeOCrdvV8oxOKA" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_z33pOHI3EeOCrdvV8oxOKA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_z33pOXI3EeOCrdvV8oxOKA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_z33pOnI3EeOCrdvV8oxOKA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z33pO3I3EeOCrdvV8oxOKA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_z33pPHI3EeOCrdvV8oxOKA" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_z33pPXI3EeOCrdvV8oxOKA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_z33pPnI3EeOCrdvV8oxOKA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_z33pP3I3EeOCrdvV8oxOKA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z33pQHI3EeOCrdvV8oxOKA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_z4FroHI3EeOCrdvV8oxOKA" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_z4FroXI3EeOCrdvV8oxOKA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z4FronI3EeOCrdvV8oxOKA"/>
+      </children>
+      <element xmi:type="uml:Class" href="core.uml#_z2tyoHI3EeOCrdvV8oxOKA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z30l4XI3EeOCrdvV8oxOKA" x="64" y="17" width="135"/>
+    </children>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_zCs7wHI3EeOCrdvV8oxOKA"/>
+    <element xmi:type="uml:Package" href="core.uml#_tkiC4HI3EeOCrdvV8oxOKA"/>
+  </notation:Diagram>
 </xmi:XMI>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.uml b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.uml
index a154e34bd5b..b05f017b9bd 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.uml
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/core.uml
@@ -1127,6 +1127,7 @@ for (;;) {
         </ownedBehavior>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_F-cDMCjbEeGFbebITJYb9g" name="activate" method="_RMkvkCjbEeGFbebITJYb9g"/>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_F-iJ0CjbEeGFbebITJYb9g" name="deactivate"/>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_rljQcFy8EeOwKfaVRwV11Q" name="configuration_complete"/>
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_1sCBICjZEeGFbebITJYb9g" name="PeriodicTimerRule">
         <ownedAttribute xmi:type="uml:Property" xmi:id="_6yVMkCjZEeGFbebITJYb9g" name="timer" visibility="public" type="_9V8OQCjYEeGFbebITJYb9g">
@@ -1317,6 +1318,9 @@ Be aware that the number of instantiated template packages will be considerably
       <packagedElement xmi:type="uml:Class" xmi:id="_w2nVkNzEEeKPWMO32vUmzw" name="C"/>
       <packagedElement xmi:type="uml:Class" xmi:id="_0rU9UNzEEeKPWMO32vUmzw" name="Java"/>
     </packagedElement>
+    <packagedElement xmi:type="uml:Package" xmi:id="_tkiC4HI3EeOCrdvV8oxOKA" name="bindingHelpers">
+      <packagedElement xmi:type="uml:Class" xmi:id="_z2tyoHI3EeOCrdvV8oxOKA" name="LoopOperations"/>
+    </packagedElement>
     <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_O6TiIjLUEd26WNosUASSSw">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_O6TiIzLUEd26WNosUASSSw" source="http://www.eclipse.org/uml2/2.0.0/UML">
         <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2#/"/>
@@ -1406,8 +1410,8 @@ Be aware that the number of instantiated template packages will be considerably
   <FCM:DerivedElement xmi:id="_fYvj8DNZEd-0bO2vHbUkEA">
     <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_C9IK4JsqEd61Eo3nmu3JhQ"/>
   </FCM:DerivedElement>
-  <FCM:Template xmi:id="_iOmWwDNZEd-0bO2vHbUkEA" base_Element="_KOvHsPiREd2UhpY2Y3WUyg" kind="LoopOperations" templateParam="_ZzlzMPfBEd2TbIfwytOyPA"/>
-  <FCM:Template xmi:id="_qcrLcDNZEd-0bO2vHbUkEA" base_Element="__y0hwJ08Ed6l5bTPBsl00Q" kind="LoopOperations" formalParam="_ZzlzMPfBEd2TbIfwytOyPA" templateParam="_ZzlzMPfBEd2TbIfwytOyPA"/>
+  <FCM:Template xmi:id="_iOmWwDNZEd-0bO2vHbUkEA" base_Element="_KOvHsPiREd2UhpY2Y3WUyg" kind="LoopOperations" helper="_nLe_sHJDEeOMF7YEvnQt5g" templateParam="_ZzlzMPfBEd2TbIfwytOyPA"/>
+  <FCM:Template xmi:id="_qcrLcDNZEd-0bO2vHbUkEA" base_Element="__y0hwJ08Ed6l5bTPBsl00Q" kind="LoopOperations" helper="_nLe_sHJDEeOMF7YEvnQt5g" formalParam="_ZzlzMPfBEd2TbIfwytOyPA" templateParam="_ZzlzMPfBEd2TbIfwytOyPA"/>
   <FCM:DerivedElement xmi:id="_K9PRoDNwEd-1k-POY2IaLg">
     <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_C9IK4JsqEd61Eo3nmu3JhQ"/>
   </FCM:DerivedElement>
@@ -1470,8 +1474,8 @@ Be aware that the number of instantiated template packages will be considerably
   <FCM:ConfigOption xmi:id="_tA2KcH7eEd-FNNgSS03RxQ" base_Class="_3myD0H7dEd-FNNgSS03RxQ"/>
   <FCM:ConfigOption xmi:id="_t2ziEH7eEd-FNNgSS03RxQ" base_Class="_29YhgH7dEd-FNNgSS03RxQ"/>
   <FCM:ConfigOption xmi:id="_u6LqoH7eEd-FNNgSS03RxQ" base_Class="_7JeHcH7dEd-FNNgSS03RxQ"/>
-  <FCM:Template xmi:id="_3IqLUKE1Ed-r8p-5QgO3cg" base_Element="_pXzxjkJ1Ed-Ps4Bfh0j9LQ" kind="LoopOperations"/>
-  <FCM:Template xmi:id="_9u11IKE1Ed-r8p-5QgO3cg" base_Element="_2bwsEClzEd-eoo60eNyGlg" kind="LoopOperations"/>
+  <FCM:Template xmi:id="_3IqLUKE1Ed-r8p-5QgO3cg" base_Element="_pXzxjkJ1Ed-Ps4Bfh0j9LQ" kind="LoopOperations" helper="_nLe_sHJDEeOMF7YEvnQt5g"/>
+  <FCM:Template xmi:id="_9u11IKE1Ed-r8p-5QgO3cg" base_Element="_2bwsEClzEd-eoo60eNyGlg" kind="LoopOperations" helper="_nLe_sHJDEeOMF7YEvnQt5g"/>
   <FCM:PortKind xmi:id="_H5-aQLqOEd-SedGzMDDkww" base_Class="_AQZZwLqOEd-SedGzMDDkww"/>
   <FCM:PortKind xmi:id="_KtgR0LqOEd-SedGzMDDkww" base_Class="__nMrwLqNEd-SedGzMDDkww"/>
   <FCM:ConfigurationProperty xmi:id="_s0fGMMGJEd-Mveea1W_olA" base_Property="_rVfYoMGJEd-Mveea1W_olA"/>
@@ -1480,7 +1484,7 @@ Be aware that the number of instantiated template packages will be considerably
   </C_Cpp:ExternLibrary>
   <C_Cpp:External xmi:id="_p8NbMNYGEd-CgJIavLpOxQ" name="pthread.h" base_class="_ea234NYGEd-CgJIavLpOxQ"/>
   <FCM:InteractionComponent xmi:id="_8BUh8NdwEd-ZnqCk2P2ZKg" base_Class="_3itBkNdwEd-ZnqCk2P2ZKg"/>
-  <FCM:Template xmi:id="_CTIeQNdxEd-ZnqCk2P2ZKg" base_Element="_3itBoddwEd-ZnqCk2P2ZKg" kind="LoopOperations"/>
+  <FCM:Template xmi:id="_CTIeQNdxEd-ZnqCk2P2ZKg" base_Element="_3itBoddwEd-ZnqCk2P2ZKg" kind="LoopOperations" helper="_nLe_sHJDEeOMF7YEvnQt5g"/>
   <C_Cpp:Typedef xmi:id="_68Aa4No9Ed-wvpj-p-V_QQ" definition="union {&#xA;&lt;%for (ownedOperations) {%>&#xA;struct Op_&lt;%name%> {&#xA;&lt;%for (ownedParameters) {%>&#xA;&lt;%cppType%> &lt;%name%>;&#xA;&lt;%}%>&#xA;} op_&lt;%name%>;&#xA;&lt;%}%>&#xA;};" base_primitivetype="_xOqL0No9Ed-wvpj-p-V_QQ"/>
   <FCM:InteractionComponent xmi:id="_xaHRQDJKEeCAhMtIsY9HwA" base_Class="_pXzKcEJ1Ed-Ps4Bfh0j9LQ"/>
   <FCM:Port xmi:id="_wz4-ULaaEeCj_-LEBuGpmA" base_Port="__SLXgNtxEd6nqsBVkgJEEA"/>
@@ -1515,7 +1519,7 @@ Be aware that the number of instantiated template packages will be considerably
   <FCM:Port xmi:id="_Zd6hAENxEeGoAtSeIK7WLg" base_Port="_Zd558ENxEeGoAtSeIK7WLg" kind="_qOK0cFR1Ed6GqrP6fkWBoQ"/>
   <FCM:Port xmi:id="_i6QeoEN8EeGfhclnRyNzoA" base_Port="_i5SOQEN8EeGfhclnRyNzoA" kind="_qOK0cFR1Ed6GqrP6fkWBoQ"/>
   <FCM:Port xmi:id="_0KaqgF7pEeGEmrrwB1vhPg" base_Port="_0KY1UF7pEeGEmrrwB1vhPg" kind="_wySlkFRxEd6GqrP6fkWBoQ"/>
-  <FCM:Template xmi:id="_GNBM8F7tEeGEmrrwB1vhPg" base_Element="_ChD4kF7tEeGEmrrwB1vhPg" kind="LoopOperations"/>
+  <FCM:Template xmi:id="_GNBM8F7tEeGEmrrwB1vhPg" base_Element="_ChD4kF7tEeGEmrrwB1vhPg" kind="LoopOperations" helper="_nLe_sHJDEeOMF7YEvnQt5g"/>
   <FCM:InteractionComponent xmi:id="_UBcmIF7tEeGEmrrwB1vhPg" base_Class="_Mo2kwF7pEeGEmrrwB1vhPg"/>
   <FCM:InteractionComponent xmi:id="_Z3Zs4F7tEeGEmrrwB1vhPg" base_Class="_TLShkF7qEeGEmrrwB1vhPg"/>
   <FCM:PortKind xmi:id="_SrCqQC8qEeKx7OxAiA06uw" base_Class="_GjnlcC8qEeKx7OxAiA06uw"/>
@@ -1534,4 +1538,8 @@ Be aware that the number of instantiated template packages will be considerably
   </FCM:DerivedElement>
   <C_Cpp:Ptr xmi:id="_TKlisCxyEeOMQpc6Y-MAJw" base_parameter="_TJjA4CxyEeOMQpc6Y-MAJw"/>
   <C_Cpp:Ptr xmi:id="_TTpYECxyEeOMQpc6Y-MAJw" base_parameter="_TKyXACxyEeOMQpc6Y-MAJw"/>
+  <FCM:DerivedElement xmi:id="_rlowAFy8EeOwKfaVRwV11Q" base_Element="_rljQcFy8EeOwKfaVRwV11Q">
+    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_ns4qsClUEeO4bs_nkcnKOg"/>
+  </FCM:DerivedElement>
+  <FCM:BindingHelper xmi:id="_nLe_sHJDEeOMF7YEvnQt5g" base_Class="_z2tyoHI3EeOCrdvV8oxOKA"/>
 </xmi:XMI>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/osal.notation b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/osal.notation
index 32c5e96df85..8686e2eff0d 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/osal.notation
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/osal.notation
@@ -16,6 +16,10 @@
         <styles xmi:type="notation:TitleStyle" xmi:id="_b2y1GFjgEeKWlJhcyT0hJA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b2y1GVjgEeKWlJhcyT0hJA"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mP-BYFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mP-BYVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mP-BYldiEeOGK9gz6QqCTQ"/>
+      </children>
       <element xmi:type="uml:Package" href="osal.uml#_mU3acC-OEdySSa8YESkO2w"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b2yOAVjgEeKWlJhcyT0hJA" x="52" y="39"/>
     </children>
@@ -34,6 +38,10 @@
         <styles xmi:type="notation:TitleStyle" xmi:id="_clZng1jgEeKWlJhcyT0hJA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_clZnhFjgEeKWlJhcyT0hJA"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mP_PgFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mP_PgVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mP_PgldiEeOGK9gz6QqCTQ"/>
+      </children>
       <element xmi:type="uml:Package" href="osal.uml#_oT0acC-OEdySSa8YESkO2w"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_clYZYVjgEeKWlJhcyT0hJA" x="306" y="39"/>
     </children>
@@ -52,6 +60,10 @@
         <styles xmi:type="notation:TitleStyle" xmi:id="_dqm8EVjgEeKWlJhcyT0hJA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dqm8EljgEeKWlJhcyT0hJA"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mP_2kFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mP_2kVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mP_2kldiEeOGK9gz6QqCTQ"/>
+      </children>
       <element xmi:type="uml:Package" href="osal.uml#_q6QRMC-OEdySSa8YESkO2w"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dqlG4VjgEeKWlJhcyT0hJA" x="52" y="169"/>
     </children>
@@ -70,6 +82,10 @@
         <styles xmi:type="notation:TitleStyle" xmi:id="_ec57sljgEeKWlJhcyT0hJA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ec57s1jgEeKWlJhcyT0hJA"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mQBEsFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mQBEsVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mQBEsldiEeOGK9gz6QqCTQ"/>
+      </children>
       <element xmi:type="uml:Package" href="osal.uml#_soXY0C-OEdySSa8YESkO2w"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ec4GgVjgEeKWlJhcyT0hJA" x="306" y="169"/>
     </children>
@@ -88,6 +104,10 @@
         <styles xmi:type="notation:TitleStyle" xmi:id="_fz7ZCFjgEeKWlJhcyT0hJA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fz7ZCVjgEeKWlJhcyT0hJA"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mQC54FdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mQC54VdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mQC54ldiEeOGK9gz6QqCTQ"/>
+      </children>
       <element xmi:type="uml:Package" href="osal.uml#_vlmmAC-OEdySSa8YESkO2w"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fz6x8VjgEeKWlJhcyT0hJA" x="52" y="299"/>
     </children>
@@ -106,6 +126,10 @@
         <styles xmi:type="notation:TitleStyle" xmi:id="_rReL1FkLEeKyM9oNj0qhEg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rReL1VkLEeKyM9oNj0qhEg"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mQDg8FdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mQDg8VdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mQDg8ldiEeOGK9gz6QqCTQ"/>
+      </children>
       <element xmi:type="uml:Package" href="osal.uml#_0AZ9YC-OEdySSa8YESkO2w"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rRYsQFkLEeKyM9oNj0qhEg" x="306" y="297"/>
     </children>
@@ -162,6 +186,10 @@
         <element xmi:type="uml:RedefinableTemplateSignature" href="osal.uml#_gkCKsDO0EdyG-pUz-bb-Lg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0MTeMVkeEeKFQZ_XV_Kn6g" x="410" y="-11" width="145" height="29"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lRHMcFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lRHzgFdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lRHzgVdiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3Lurdx6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_W-ZGIDO0EdyG-pUz-bb-Lg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3LureB6SEeCkz5PP4vZT5g" x="111" y="144" width="498" height="39"/>
@@ -192,6 +220,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3LvShB6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3LvShR6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lRKPwFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lRKPwVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lRKPwldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3LvShh6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_sQ1JADO0EdyG-pUz-bb-Lg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3LvShx6SEeCkz5PP4vZT5g" x="112" y="257" width="100" height="34"/>
@@ -222,6 +254,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3LvSmh6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3LvSmx6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lRLd4FdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lRLd4VdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lRLd4ldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3LvSnB6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_0AwCEDO0EdyG-pUz-bb-Lg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3LvSnR6SEeCkz5PP4vZT5g" x="238" y="257" width="100" height="34"/>
@@ -252,6 +288,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3LvSsB6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3LvSsR6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lRNTEFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lRNTEVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lRNTEldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3LvSsh6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_1vnXoDO0EdyG-pUz-bb-Lg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3LvSsx6SEeCkz5PP4vZT5g" x="368" y="257" width="100" height="34"/>
@@ -282,6 +322,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3Lv5jx6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3Lv5kB6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lROhMFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lROhMVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lRPIQFdiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3Lv5kR6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_3W43cDO0EdyG-pUz-bb-Lg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3Lv5kh6SEeCkz5PP4vZT5g" x="509" y="255" width="100" height="34"/>
@@ -312,6 +356,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3Lv5pR6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3Lv5ph6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lRUn0FdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lRUn0VdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_Vh1d8DR3EdypGbuyt3_DaA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lRUn0ldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lRVO4FdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lRVO4VdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lRVO4ldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3Lv5px6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_WXH_4DO2EdyG-pUz-bb-Lg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3Lv5qB6SEeCkz5PP4vZT5g" x="108" y="72" width="505" height="37"/>
@@ -342,6 +395,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3Lv5ux6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3Ly80B6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lRXEEFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lRXEEVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_DXEWYDUWEdyDReAOQiyvOg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lRXEEldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lRXrIFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lRXrIVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lRXrIldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3Ly80R6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_Fqa9QDUPEdy0feurbW0fyQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3Ly80h6SEeCkz5PP4vZT5g" x="114" y="351" width="494" height="37"/>
@@ -794,6 +856,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3L6RtB6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3L6RtR6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lVQsoFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lVQsoVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_Vh1d8DR3EdypGbuyt3_DaA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lVQsoldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lVRTsFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lVRTsVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lVRTsldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3L6Rth6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_WXH_4DO2EdyG-pUz-bb-Lg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3L6Rtx6SEeCkz5PP4vZT5g" x="34" y="29" width="305" height="1009"/>
@@ -848,6 +919,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3L64uR6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3L64uh6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lVcS0FdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lVcS0VdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lVcS0ldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3L64ux6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_W-ZGIDO0EdyG-pUz-bb-Lg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3L64vB6SEeCkz5PP4vZT5g" x="407" y="67" width="316" height="184"/>
@@ -942,6 +1017,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3L7fvR6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3L7fvh6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lVf9MFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lVf9MVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_DXEWYDUWEdyDReAOQiyvOg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lVf9MldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lVgkQFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lVgkQVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lVgkQldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3L7fvx6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_Fqa9QDUPEdy0feurbW0fyQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3L7fwB6SEeCkz5PP4vZT5g" x="409" y="301" width="318" height="383"/>
@@ -1150,6 +1234,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3L8t8B6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3L8t8R6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lZGDwFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lZGDwVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lZGDwldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3L8t8h6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_xxCKcDUuEdyDReAOQiyvOg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3L8t8x6SEeCkz5PP4vZT5g" x="179" y="30" width="100" height="274"/>
@@ -1180,6 +1268,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3L8uBh6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3L8uBx6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lZJuIFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lZJuIVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_xGQLUDbfEdy0Rd6V_tf1-Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lZJuIldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lZJuI1diEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lZJuJFdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lZJuJVdiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3L8uCB6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_y68Y0DUuEdyDReAOQiyvOg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3L9U4B6SEeCkz5PP4vZT5g" x="177" y="679" width="174" height="100"/>
@@ -1210,6 +1307,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3L9U8x6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3L9U9B6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lZLjUFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lZLjUVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_gutqEDa8Edy_E4ZljVbr-g"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lZLjUldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lZMKYFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lZMKYVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lZMKYldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3L9U9R6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_2bXLkDUuEdyDReAOQiyvOg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3L9U9h6SEeCkz5PP4vZT5g" x="714" y="680" width="100" height="100"/>
@@ -1262,6 +1368,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3L9VFx6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3L9VGB6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lZPNsFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lZPNsVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lZPNsldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3L9VGR6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_zOJVcDaeEdyC6dXxO2UOEQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3L9VGh6SEeCkz5PP4vZT5g" x="536" y="37" width="169" height="270"/>
@@ -1702,6 +1812,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3L_xUB6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3L_xUR6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_ldsP4FdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_ldsP4VdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ldsP4ldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3L_xUh6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_xxCKcDUuEdyDReAOQiyvOg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3L_xUx6SEeCkz5PP4vZT5g" x="27" y="36" width="370" height="442"/>
@@ -1775,6 +1889,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MAYRh6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MAYRx6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_ldy9kFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_ldy9kVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ldy9kldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MAYSB6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_zOJVcDaeEdyC6dXxO2UOEQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MAYSR6SEeCkz5PP4vZT5g" x="452" y="35" width="287" height="178"/>
@@ -1899,6 +2017,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MA_VB6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MA_VR6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_ld2n8FdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_ld2n8VdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_gutqEDa8Edy_E4ZljVbr-g"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ld2n8ldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_ld2n81diEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_ld2n9FdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ld2n9VdiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MA_Vh6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_2bXLkDUuEdyDReAOQiyvOg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MA_Vx6SEeCkz5PP4vZT5g" x="452" y="269" width="368" height="254"/>
@@ -1967,6 +2094,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MA_eh6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MA_ex6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_ld6SUFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_ld65YFdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_xGQLUDbfEdy0Rd6V_tf1-Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ld65YVdiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_ld65YldiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_ld65Y1diEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ld65ZFdiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MA_fB6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_y68Y0DUuEdyDReAOQiyvOg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MBmUB6SEeCkz5PP4vZT5g" x="27" y="495" width="370" height="154"/>
@@ -2018,6 +2154,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MBmdB6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MBmdR6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lgwyAFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lgwyAVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_Vh1d8DR3EdypGbuyt3_DaA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lgwyAldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lgxZEFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lgxZEVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lgxZEldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MBmdh6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_WXH_4DO2EdyG-pUz-bb-Lg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MBmdx6SEeCkz5PP4vZT5g" x="468" y="189" width="307" height="37"/>
@@ -2048,6 +2193,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MCNhR6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MCNhh6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lgzOQFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lgzOQVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lgzOQldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MCNhx6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_W-ZGIDO0EdyG-pUz-bb-Lg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MCNiB6SEeCkz5PP4vZT5g" x="468" y="90" width="307" height="37"/>
@@ -2078,6 +2227,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MCNmx6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MCNnB6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lg1DcFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lg1DcVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_DXEWYDUWEdyDReAOQiyvOg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lg1DcldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lg1qgFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lg1qgVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lg1qgldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MCNnR6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_Fqa9QDUPEdy0feurbW0fyQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MCNnh6SEeCkz5PP4vZT5g" x="18" y="117" width="379" height="46"/>
@@ -2108,6 +2266,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MC0ch6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MC0cx6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lg24oFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lg24oVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lg24oldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MC0dB6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_sQ1JADO0EdyG-pUz-bb-Lg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MC0dR6SEeCkz5PP4vZT5g" x="18" y="252" width="82" height="54"/>
@@ -2138,6 +2300,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MC0iB6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MC0iR6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lg4GwFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lg4GwVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lg4GwldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MC0ih6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_1vnXoDO0EdyG-pUz-bb-Lg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MC0ix6SEeCkz5PP4vZT5g" x="216" y="252" width="82" height="54"/>
@@ -2168,6 +2334,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MC0nh6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MC0nx6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lg5U4FdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lg5U4VdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lg5U4ldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MC0oB6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_3W43cDO0EdyG-pUz-bb-Lg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MC0oR6SEeCkz5PP4vZT5g" x="315" y="252" width="82" height="54"/>
@@ -2198,6 +2368,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MC0tB6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MC0tR6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lg6jAFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lg6jAVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lg6jAldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MC0th6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_0AwCEDO0EdyG-pUz-bb-Lg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MC0tx6SEeCkz5PP4vZT5g" x="117" y="252" width="82" height="54"/>
@@ -2228,6 +2402,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MDbiR6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MDbih6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lg7xIFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lg7xIVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_b0TcwFIfEdy7g9CjxdN7jw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lg7xIldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lg8YMFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lg8YMVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lg8YMldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MDbix6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_1DM54DxBEdyfAeav5abbAw"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MDbjB6SEeCkz5PP4vZT5g" x="468" y="279" width="91" height="37"/>
@@ -2258,6 +2441,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MDbnx6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MDboB6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lg-NYFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lg-NYVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_UXASAE_gEdy2tpS719xBwQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lg-NYldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lg-NY1diEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lg-NZFdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lg-NZVdiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MDboR6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_-HeCsDj_Edy0Rd6V_tf1-Q"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MDboh6SEeCkz5PP4vZT5g" x="576" y="279" width="91" height="37"/>
@@ -2288,6 +2480,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MDbtR6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MDbth6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lhACkFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lhACkVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_ceH5QDkaEdyuzNpSiGPe4w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lhACkldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lhApoFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lhApoVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lhApoldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MDbtx6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_FuKEEDj8Edy0Rd6V_tf1-Q"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MDbuB6SEeCkz5PP4vZT5g" x="684" y="279" width="91" height="37"/>
@@ -2446,6 +2647,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MEp1R6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MEp1h6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_li6uIFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_li6uIVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_li6uIldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MEp1x6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_xxCKcDUuEdyDReAOQiyvOg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MEp2B6SEeCkz5PP4vZT5g" x="78" y="78" width="100" height="100"/>
@@ -2476,6 +2681,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MFQzh6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MFQzx6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_li78QFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_li78QVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_gutqEDa8Edy_E4ZljVbr-g"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_li78QldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_li8jUFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_li8jUVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_li8jUldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MFQ0B6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_2bXLkDUuEdyDReAOQiyvOg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MFQ0R6SEeCkz5PP4vZT5g" x="261" y="77" width="100" height="100"/>
@@ -2506,6 +2720,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MFQ5B6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MFQ5R6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_li9xcFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_li9xcVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_xGQLUDbfEdy0Rd6V_tf1-Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_li9xcldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_li-YgFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_li-YgVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_li-YgldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MFQ5h6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_y68Y0DUuEdyDReAOQiyvOg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MFQ5x6SEeCkz5PP4vZT5g" x="419" y="76" width="100" height="100"/>
@@ -2544,6 +2767,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MF3wh6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MF3wx6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mKY90FdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mKY90VdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_UXASAE_gEdy2tpS719xBwQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mKY90ldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mKY901diEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mKY91FdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mKY91VdiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MF3xB6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_-HeCsDj_Edy0Rd6V_tf1-Q"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MF3xR6SEeCkz5PP4vZT5g" x="324" y="45" width="125" height="84"/>
@@ -2574,6 +2806,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MF32B6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MF32R6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mKbaEFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mKbaEVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_Q72YwE_rEdy2tpS719xBwQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mKbaEldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mKcBIFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mKcBIVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mKcBIldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MF32h6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_Saw1YDkDEdyuzNpSiGPe4w"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MF32x6SEeCkz5PP4vZT5g" x="27" y="45" width="145" height="88"/>
@@ -2604,6 +2845,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MF37h6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MF37x6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mKd2UFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mKd2UVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_57kQoE_BEdy2tpS719xBwQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mKd2UldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mKedYFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mKedYVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mKedYldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MF38B6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_oSgIME_BEdy2tpS719xBwQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MF38R6SEeCkz5PP4vZT5g" x="182" y="195" width="297" height="58"/>
@@ -2634,6 +2884,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MF4BB6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MF4BR6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mKgSkFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mKgSkVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_bphYAE_NEdy2tpS719xBwQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mKgSkldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mKg5oFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mKg5oVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mKg5oldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MF4Bh6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_TVGDsE_NEdy2tpS719xBwQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MF4Bx6SEeCkz5PP4vZT5g" x="26" y="195" width="100" height="100"/>
@@ -2664,6 +2923,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MGe0h6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MGe0x6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mKiHwFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mKiHwVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_TSTq8FF5EdyxP5ejovTmBw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mKiHwldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mKiu0FdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mKiu0VdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mKiu0ldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MGe1B6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_D8njME_gEdy2tpS719xBwQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MGe1R6SEeCkz5PP4vZT5g" x="603" y="45" width="100" height="87"/>
@@ -2722,6 +2990,10 @@
         <element xmi:type="uml:RedefinableTemplateSignature" href="osal.uml#_Z03EAE_vEdy2tpS719xBwQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Jd8V0VjdEeKWlJhcyT0hJA" x="121" y="-27" width="61" height="79"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mKj88FdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mKj88VdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mKj88ldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MGe6h6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_9-OUUE_uEdy2tpS719xBwQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MGe6x6SEeCkz5PP4vZT5g" x="558" y="207" width="117" height="87"/>
@@ -2752,6 +3024,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MGfDB6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MGfDR6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mKlyIFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mKlyIVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mKlyIldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MGfDh6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_0AwCEDO0EdyG-pUz-bb-Lg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MGfDx6SEeCkz5PP4vZT5g" x="182" y="304" width="100" height="48"/>
@@ -2782,6 +3058,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MHF6R6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MHF6h6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mKnnUFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mKnnUVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mKnnUldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MHF6x6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_1vnXoDO0EdyG-pUz-bb-Lg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MHF7B6SEeCkz5PP4vZT5g" x="377" y="304" width="100" height="48"/>
@@ -2911,6 +3191,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MHtHB6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MHtHR6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_llVI8FdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_llVI8VdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_b4VAMDj8Edy0Rd6V_tf1-Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_llVI8ldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_llVwAFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_llVwAVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_llVwAldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MHtHh6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_BN92YDj8Edy0Rd6V_tf1-Q"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MHtHx6SEeCkz5PP4vZT5g" x="52" y="162" width="154" height="383"/>
@@ -2941,6 +3230,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MHtMh6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MHtMx6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_llYMQFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_llYMQVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_tNGmwDkUEdyuzNpSiGPe4w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_llYMQldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_llYzUFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_llYzUVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_llYzUldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MHtNB6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_ETakYDj8Edy0Rd6V_tf1-Q"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MHtNR6SEeCkz5PP4vZT5g" x="396" y="300" width="100" height="100"/>
@@ -2971,6 +3269,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MIUBh6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MIUBx6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_llaogFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_llaogVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_ceH5QDkaEdyuzNpSiGPe4w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_llaogldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_llaog1diEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_llaohFdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_llaohVdiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MIUCB6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_FuKEEDj8Edy0Rd6V_tf1-Q"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MIUCR6SEeCkz5PP4vZT5g" x="396" y="162" width="100" height="100"/>
@@ -3001,6 +3308,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MIUHB6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MIUHR6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_llcdsFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_llcdsVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_UXASAE_gEdy2tpS719xBwQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_llcdsldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lldEwFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lldEwVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lldEwldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MIUHh6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_-HeCsDj_Edy0Rd6V_tf1-Q"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MIUHx6SEeCkz5PP4vZT5g" x="396" y="448" width="100" height="100"/>
@@ -3132,6 +3448,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MI7Sh6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MI7Sx6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lofxsFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lofxsVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_b4VAMDj8Edy0Rd6V_tf1-Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lofxsldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lofxs1diEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lofxtFdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lofxtVdiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MI7TB6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_BN92YDj8Edy0Rd6V_tf1-Q"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MI7TR6SEeCkz5PP4vZT5g" x="23" y="51" width="342" height="80"/>
@@ -3220,6 +3545,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MJiPB6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MJiPR6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_loiN8FdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_loiN8VdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_tNGmwDkUEdyuzNpSiGPe4w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_loiN8ldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_loi1AFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_loi1AVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_loi1AldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MJiPh6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_ETakYDj8Edy0Rd6V_tf1-Q"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MJiPx6SEeCkz5PP4vZT5g" x="465" y="51" width="394" height="197"/>
@@ -3433,6 +3767,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MPBzB6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MPBzR6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lomfYFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lomfYVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_ceH5QDkaEdyuzNpSiGPe4w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lomfYldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lonGcFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lonGcVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lonGcldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MPBzh6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_FuKEEDj8Edy0Rd6V_tf1-Q"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MPBzx6SEeCkz5PP4vZT5g" x="26" y="156" width="339" height="508"/>
@@ -3473,6 +3816,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MPowh6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MPowx6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lsPCMFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lsPCMVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_UXASAE_gEdy2tpS719xBwQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lsPCMldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lsPpQFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lsPpQVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lsPpQldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MPoxB6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_-HeCsDj_Edy0Rd6V_tf1-Q"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MPoxR6SEeCkz5PP4vZT5g" x="788" y="561" width="100" height="100"/>
@@ -3503,6 +3855,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MPo2B6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MPo2R6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lsRecFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lsRecVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_ceH5QDkaEdyuzNpSiGPe4w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lsRecldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lsSFgFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lsSFgVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lsSFgldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MPo2h6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_FuKEEDj8Edy0Rd6V_tf1-Q"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MPo2x6SEeCkz5PP4vZT5g" x="181" y="400" width="100" height="120"/>
@@ -3533,6 +3894,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MPo7h6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MPo7x6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lsUhwFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lsUhwVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_Vh1d8DR3EdypGbuyt3_DaA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lsUhwldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lsUhw1diEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lsUhxFdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lsUhxVdiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MPo8B6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_WXH_4DO2EdyG-pUz-bb-Lg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MPo8R6SEeCkz5PP4vZT5g" x="27" y="567" width="100" height="100"/>
@@ -3563,6 +3933,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MPpBB6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MPpBR6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lsWW8FdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lsWW8VdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_tNGmwDkUEdyuzNpSiGPe4w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lsWW8ldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lsW-AFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lsW-AVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lsW-AldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MPpBh6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_ETakYDj8Edy0Rd6V_tf1-Q"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MPpBx6SEeCkz5PP4vZT5g" x="167" y="568" width="100" height="100"/>
@@ -3593,6 +3972,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MQP1x6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MQP2B6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lsYzMFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lsYzMVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lsYzMldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MQP2R6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_1vnXoDO0EdyG-pUz-bb-Lg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MQP2h6SEeCkz5PP4vZT5g" x="409" y="187" width="100" height="100"/>
@@ -3623,6 +4006,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MQP7R6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MQP7h6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lsaoYFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lsaoYVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lsaoYldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MQP7x6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_sQ1JADO0EdyG-pUz-bb-Lg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MQP8B6SEeCkz5PP4vZT5g" x="107" y="179" width="100" height="100"/>
@@ -3653,6 +4040,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MQQAx6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MQQBB6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lscdkFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lscdkVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_iOOrAFClEdyTutVzffQTmQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lscdkldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lsdEoFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lsdEoVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lsdEoldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MQQBR6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_LbxUEDRPEdy1p4IpsoZYqA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MQQBh6SEeCkz5PP4vZT5g" x="248" y="182" width="100" height="100"/>
@@ -3683,6 +4079,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MQQGR6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MQQGh6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lse50FdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lse50VdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lse50ldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MQQGx6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_3W43cDO0EdyG-pUz-bb-Lg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MQQHB6SEeCkz5PP4vZT5g" x="572" y="181" width="100" height="100"/>
@@ -3713,6 +4113,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MQ24B6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MQ24R6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lsgH8FdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lsgH8VdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_b0TcwFIfEdy7g9CjxdN7jw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lsgH8ldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lsgvAFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lsgvAVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lsgvAldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MQ24h6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_1DM54DxBEdyfAeav5abbAw"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MQ24x6SEeCkz5PP4vZT5g" x="707" y="180" width="100" height="100"/>
@@ -3743,6 +4152,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MQ29h6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MQ29x6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lsikMFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lsikMVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_57kQoE_BEdy2tpS719xBwQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lsikMldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lsjLQFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lsjLQVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lsjLQldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MQ2-B6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_oSgIME_BEdy2tpS719xBwQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MQ2-R6SEeCkz5PP4vZT5g" x="586" y="329" width="100" height="100"/>
@@ -3773,6 +4191,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MQ3DB6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MQ3DR6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lslAcFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lslAcVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_DXEWYDUWEdyDReAOQiyvOg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lslAcldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lslngFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lslngVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lslngldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MQ3Dh6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_Fqa9QDUPEdy0feurbW0fyQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MQ3Dx6SEeCkz5PP4vZT5g" x="512" y="472" width="100" height="100"/>
@@ -3884,6 +4311,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MReKR6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MReKh6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lvB3gFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lvB3gVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_b0TcwFIfEdy7g9CjxdN7jw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lvB3gldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lvCekFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lvCekVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lvCekldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MReKx6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_1DM54DxBEdyfAeav5abbAw"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MReLB6SEeCkz5PP4vZT5g" x="239" y="212" width="100" height="100"/>
@@ -3914,6 +4350,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MSFAR6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MSFAh6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lvFh4FdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lvFh4VdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_Gyo1gFGKEdy7g9CjxdN7jw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lvFh4ldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lvGI8FdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lvGI8VdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lvGI8ldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MSFAx6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_5InEkFGAEdyxP5ejovTmBw"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MSFBB6SEeCkz5PP4vZT5g" x="240" y="347" width="100" height="100"/>
@@ -3944,6 +4389,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MSFFx6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MSFGB6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lvJzUFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lvJzUVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_DXEWYDUWEdyDReAOQiyvOg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lvJzUldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lvKaYFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lvKaYVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lvKaYldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MSFGR6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_Fqa9QDUPEdy0feurbW0fyQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MSFGh6SEeCkz5PP4vZT5g" x="451" y="214" width="100" height="100"/>
@@ -4215,6 +4669,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MW9kh6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MW9kx6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mGmqAFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mGmqAVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_57kQoE_BEdy2tpS719xBwQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mGmqAldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mGnREFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mGnREVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mGnREldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MW9lB6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_oSgIME_BEdy2tpS719xBwQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MW9lR6SEeCkz5PP4vZT5g" x="513" y="9" width="406" height="595"/>
@@ -4342,6 +4805,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MXkvB6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MXkvR6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mGt-wFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mGt-wVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_bphYAE_NEdy2tpS719xBwQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mGt-wldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mGul0FdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mGul0VdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mGul0ldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MXkvh6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_TVGDsE_NEdy2tpS719xBwQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MXkvx6SEeCkz5PP4vZT5g" x="56" y="27" width="368" height="343"/>
@@ -4539,6 +5011,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MYyvB6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MYyvR6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mGzeUFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mGzeUVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_UXASAE_gEdy2tpS719xBwQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mGzeUldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mGzeU1diEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mGzeVFdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mGzeVVdiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MYyvh6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_-HeCsDj_Edy0Rd6V_tf1-Q"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MYyvx6SEeCkz5PP4vZT5g" x="54" y="477" width="370" height="541"/>
@@ -4618,6 +5099,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MYy5h6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MYy5x6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mG6MAFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mG6MAVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_Q72YwE_rEdy2tpS719xBwQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mG6MAldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mG6zEFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mG6zEVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mG6zEldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MYy6B6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_Saw1YDkDEdyuzNpSiGPe4w"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MYy6R6SEeCkz5PP4vZT5g" x="513" y="621" width="406" height="184"/>
@@ -4698,6 +5188,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MZZ3h6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MZZ3x6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mG92YFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mG92YVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_PSuiAE_vEdy2tpS719xBwQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mG92YldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mG-dcFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mG-dcVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mG-dcldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MZZ4B6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_9-OUUE_uEdy2tpS719xBwQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MZZ4R6SEeCkz5PP4vZT5g" x="513" y="828" width="406" height="199"/>
@@ -4731,6 +5230,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_HN8GrdqFEeKrRY-H1kHnNA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HN8GrtqFEeKrRY-H1kHnNA"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mHCH0FdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mHCH0VdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mHCH0ldiEeOGK9gz6QqCTQ"/>
+      </children>
       <element xmi:type="uml:Class" href="osal.uml#_4lsq4NqEEeKrRY-H1kHnNA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HN3OINqFEeKrRY-H1kHnNA" x="54" y="1098" width="365" height="44"/>
     </children>
@@ -4809,6 +5312,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MaBJR6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MaBJh6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mM2b8FdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mM2b8VdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_iOOrAFClEdyTutVzffQTmQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mM2b8ldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mM2b81diEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mM2b9FdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mM2b9VdiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MaBJx6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_LbxUEDRPEdy1p4IpsoZYqA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3Man4B6SEeCkz5PP4vZT5g" x="36" y="225" width="244" height="46"/>
@@ -4839,6 +5351,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3Man8x6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3Man9B6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mM4RIFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mM4RIVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mM4RIldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3Man9R6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_N361AFCsEdyqzLG48ixyqA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3Man9h6SEeCkz5PP4vZT5g" x="36" y="144" width="244" height="46"/>
@@ -4864,6 +5380,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MaoBR6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MaoBh6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mM5fQFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mM5fQVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mM5fQldiEeOGK9gz6QqCTQ"/>
+      </children>
       <element xmi:type="uml:DataType" href="osal.uml#_ZiVqMFCrEdyTutVzffQTmQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MaoBx6SEeCkz5PP4vZT5g" x="153" y="36" width="125" height="50"/>
     </children>
@@ -4893,6 +5413,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MaoGh6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MaoGx6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mM6tYFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mM6tYVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_57kQoE_BEdy2tpS719xBwQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mM6tYldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mM7UcFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mM7UcVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mM7UcldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MaoHB6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_oSgIME_BEdy2tpS719xBwQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MaoHR6SEeCkz5PP4vZT5g" x="36" y="36" width="98" height="50"/>
@@ -4923,6 +5452,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MbPAR6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MbPAh6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mM8ikFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mM8ikVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_LAexAFCwEdyqzLG48ixyqA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mM8ikldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mM9JoFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mM9JoVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mM9JoldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MbPAx6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_sq-yMFCvEdyqzLG48ixyqA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MbPBB6SEeCkz5PP4vZT5g" x="369" y="162" width="163" height="46"/>
@@ -4953,6 +5491,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MbPFx6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MbPGB6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mM-XwFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mM-XwVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mM-XwldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MbPGR6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_sQ1JADO0EdyG-pUz-bb-Lg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MbPGh6SEeCkz5PP4vZT5g" x="369" y="36" width="163" height="41"/>
@@ -5107,6 +5649,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3McdHh6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3McdHx6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lyTN8FdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lyTN8VdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_iOOrAFClEdyTutVzffQTmQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lyTN8ldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lyTN81diEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lyTN9FdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lyTN9VdiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3McdIB6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_LbxUEDRPEdy1p4IpsoZYqA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3McdIR6SEeCkz5PP4vZT5g" x="45" y="27" width="388" height="262"/>
@@ -5131,6 +5682,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3McdLh6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3McdLx6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lyXfYFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lyXfYVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lyXfYldiEeOGK9gz6QqCTQ"/>
+      </children>
       <element xmi:type="uml:Enumeration" href="osal.uml#_Nz2RgFClEdyTutVzffQTmQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3McdMB6SEeCkz5PP4vZT5g" x="513" y="27" width="181" height="55"/>
     </children>
@@ -5185,6 +5740,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3McdUB6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3McdUR6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lyYtgFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lyYtgVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lyYtgldiEeOGK9gz6QqCTQ"/>
+      </children>
       <element xmi:type="uml:DataType" href="osal.uml#_ZiVqMFCrEdyTutVzffQTmQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3McdUh6SEeCkz5PP4vZT5g" x="513" y="108" width="181" height="106"/>
     </children>
@@ -5251,6 +5810,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MdEPh6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MdEPx6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lyaisFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lyaisVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lyaisldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MdEQB6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_N361AFCsEdyqzLG48ixyqA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MdEQR6SEeCkz5PP4vZT5g" x="45" y="351" width="388" height="154"/>
@@ -5392,6 +5955,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MdrUR6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MdrUh6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lyeNEFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lyeNEVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_LAexAFCwEdyqzLG48ixyqA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lyeNEldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_lyeNE1diEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_lyeNFFdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lyeNFVdiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MdrUx6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_sq-yMFCvEdyqzLG48ixyqA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MdrVB6SEeCkz5PP4vZT5g" x="513" y="261" width="402" height="386"/>
@@ -5445,6 +6017,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MeSTR6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MeSTh6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l05O8FdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l05O8VdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_TSTq8FF5EdyxP5ejovTmBw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l05O8ldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l052AFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l052AVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l052AldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MeSTx6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_D8njME_gEdy2tpS719xBwQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MeSUB6SEeCkz5PP4vZT5g" x="90" y="225" width="100" height="47"/>
@@ -5475,6 +6056,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MeSYx6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MeSZB6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l07EIFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l07EIVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_3d4acFC3EdyqzLG48ixyqA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l07EIldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l07rMFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l07rMVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l07rMldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MeSZR6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_jXTGsFC3EdyqzLG48ixyqA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MeSZh6SEeCkz5PP4vZT5g" x="266" y="225" width="100" height="47"/>
@@ -5505,6 +6095,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MeSeR6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MeSeh6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l085UFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l085UVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_xoZ-IFFiEdyjobZYtXo9NQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l085UldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l09gYFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l09gYVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l09gYldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MeSex6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_qIyBkFC3EdyqzLG48ixyqA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MeSfB6SEeCkz5PP4vZT5g" x="765" y="225" width="100" height="47"/>
@@ -5535,6 +6134,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MeSjx6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MeSkB6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l0-ugFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l0-ugVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l0-ugldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MeSkR6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_rsw80FC3EdyqzLG48ixyqA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MeSkh6SEeCkz5PP4vZT5g" x="423" y="225" width="154" height="47"/>
@@ -5565,6 +6168,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3Me5XR6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3Me5Xh6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l0_8oFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l0_8oVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_X2-iQFF0EdyjobZYtXo9NQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l0_8oldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l1AjsFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l1AjsVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l1AjsldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3Me5Xx6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_Jj9usFC7EdyqzLG48ixyqA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3Me5YB6SEeCkz5PP4vZT5g" x="351" y="108" width="100" height="53"/>
@@ -5595,6 +6207,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3Me5cx6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3Me5dB6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l1Bx0FdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l1Bx0VdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_SQ2h4FFhEdyjobZYtXo9NQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l1Bx0ldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l1Bx01diEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l1Bx1FdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l1Bx1VdiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3Me5dR6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_5HEaAFFgEdyjobZYtXo9NQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3Me5dh6SEeCkz5PP4vZT5g" x="90" y="108" width="100" height="54"/>
@@ -5625,6 +6246,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3Me5iR6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3Me5ih6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l1DnAFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l1DnAVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_1Rt3EFF2EdyxP5ejovTmBw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l1DnAldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l1EOEFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l1EOEVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l1EOEldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3Me5ix6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_dhMBIFF2EdyxP5ejovTmBw"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3Me5jB6SEeCkz5PP4vZT5g" x="628" y="225" width="100" height="47"/>
@@ -5695,6 +6325,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3Mfgfx6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MfggB6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l4iY0FdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l4iY0VdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_3d4acFC3EdyqzLG48ixyqA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l4iY0ldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l4i_4FdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l4i_4VdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l4i_4ldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MfggR6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_jXTGsFC3EdyqzLG48ixyqA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3Mfggh6SEeCkz5PP4vZT5g" x="-143" y="202" width="100" height="59"/>
@@ -5725,6 +6364,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MfglR6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3Mfglh6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l4k1EFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l4k1EVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l4k1EldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3Mfglx6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_rsw80FC3EdyqzLG48ixyqA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MfgmB6SEeCkz5PP4vZT5g" x="-144" y="54" width="690" height="59"/>
@@ -5755,6 +6398,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3Mfgqx6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MfgrB6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l4mDMFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l4mDMVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_xoZ-IFFiEdyjobZYtXo9NQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l4mDMldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l4mqQFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l4mqQVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l4mqQldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MfgrR6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_qIyBkFC3EdyqzLG48ixyqA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3Mfgrh6SEeCkz5PP4vZT5g" x="-13" y="364" width="100" height="59"/>
@@ -5785,6 +6437,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MgHgB6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MgHgR6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l4n4YFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l4n4YVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l4n4YldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MgHgh6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_0AwCEDO0EdyG-pUz-bb-Lg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MgHgx6SEeCkz5PP4vZT5g" x="-146" y="364" width="100" height="59"/>
@@ -5815,6 +6471,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MgHlh6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MgHlx6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l4pGgFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l4pGgVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_X2-iQFF0EdyjobZYtXo9NQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l4pGgldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l4ptkFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l4ptkVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l4ptkldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MgHmB6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_Jj9usFC7EdyqzLG48ixyqA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MgHmR6SEeCkz5PP4vZT5g" x="446" y="202" width="100" height="226"/>
@@ -5845,6 +6510,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MgHwh6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MgHwx6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l4riwFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l4riwVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_SQ2h4FFhEdyjobZYtXo9NQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l4riwldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l4sJ0FdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l4sJ0VdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l4sJ0ldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MgHxB6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_5HEaAFFgEdyjobZYtXo9NQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MgHxR6SEeCkz5PP4vZT5g" x="284" y="202" width="100" height="59"/>
@@ -5875,6 +6549,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3Mguih6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3Mguix6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l4t_AFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l4t_AVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_LAexAFCwEdyqzLG48ixyqA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l4t_AldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l4umEFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l4umEVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l4umEldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MgujB6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_sq-yMFCvEdyqzLG48ixyqA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MgujR6SEeCkz5PP4vZT5g" x="293" y="365" width="100" height="59"/>
@@ -5905,6 +6588,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MguoB6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MguoR6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l4v0MFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l4v0MVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_xoZ-IFFiEdyjobZYtXo9NQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l4v0MldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l4wbQFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l4wbQVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l4wbQldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3Mguoh6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_qIyBkFC3EdyqzLG48ixyqA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3Mguox6SEeCkz5PP4vZT5g" x="-14" y="202" width="100" height="59"/>
@@ -5935,6 +6627,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MguzB6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MguzR6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l4yQcFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l4yQcVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_1Rt3EFF2EdyxP5ejovTmBw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l4yQcldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l4y3gFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l4y3gVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l4y3gldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3Mguzh6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_dhMBIFF2EdyxP5ejovTmBw"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3Mguzx6SEeCkz5PP4vZT5g" x="116" y="202" width="100" height="59"/>
@@ -5965,6 +6666,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MhVnB6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MhVnR6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l40FoFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l40FoVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_TSTq8FF5EdyxP5ejovTmBw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l40FoldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l40ssFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l40ssVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l40ssldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MhVnh6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_D8njME_gEdy2tpS719xBwQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MhVnx6SEeCkz5PP4vZT5g" x="122" y="364" width="100" height="59"/>
@@ -6149,6 +6859,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MijwR6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3Mijwh6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l73ZoFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l73ZoVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_3d4acFC3EdyqzLG48ixyqA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l73ZoldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l74AsFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l74AsVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l74AsldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3Mijwx6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_jXTGsFC3EdyqzLG48ixyqA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MijxB6SEeCkz5PP4vZT5g" x="39" y="30" width="313" height="114"/>
@@ -6219,6 +6938,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3Mij6h6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3Mij6x6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l77rEFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l77rEVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_SQ2h4FFhEdyjobZYtXo9NQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l77rEldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l78SIFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l78SIVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l78SIldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3Mij7B6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_5HEaAFFgEdyjobZYtXo9NQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3Mij7R6SEeCkz5PP4vZT5g" x="39" y="182" width="313" height="127"/>
@@ -6294,6 +7022,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MjK2h6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MjK2x6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l8AjkFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l8AjkVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_xoZ-IFFiEdyjobZYtXo9NQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l8AjkldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l8BKoFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l8BKoVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l8BKoldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MjK3B6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_qIyBkFC3EdyqzLG48ixyqA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MjK3R6SEeCkz5PP4vZT5g" x="416" y="130" width="313" height="183"/>
@@ -6369,6 +7106,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3Mjx0B6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3Mjx0R6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l8E1AFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l8E1AVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_X2-iQFF0EdyjobZYtXo9NQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l8E1AldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l8FcEFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l8FcEVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l8FcEldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3Mjx0h6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_Jj9usFC7EdyqzLG48ixyqA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3Mjx0x6SEeCkz5PP4vZT5g" x="39" y="338" width="313" height="170"/>
@@ -6442,6 +7188,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3Mjx-h6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3Mjx-x6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l8IfYFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l8IfYVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_1Rt3EFF2EdyxP5ejovTmBw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l8IfYldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l8JGcFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l8JGcVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l8JGcldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3Mjx_B6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_dhMBIFF2EdyxP5ejovTmBw"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3Mjx_R6SEeCkz5PP4vZT5g" x="416" y="338" width="313" height="183"/>
@@ -6495,6 +7250,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MkY7h6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MkY7x6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l-77wFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l-77wVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_Gyo1gFGKEdy7g9CjxdN7jw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l-77wldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l-77w1diEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l-77xFdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l-77xVdiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MkY8B6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_5InEkFGAEdyxP5ejovTmBw"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MkY8R6SEeCkz5PP4vZT5g" x="39" y="195" width="100" height="63"/>
@@ -6525,6 +7289,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MkZBB6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MkZBR6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l--YAFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l--YAVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_Vh1d8DR3EdypGbuyt3_DaA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l--YAldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l--YA1diEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l--YBFdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l--YBVdiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MkZBh6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_WXH_4DO2EdyG-pUz-bb-Lg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MkZBx6SEeCkz5PP4vZT5g" x="39" y="78" width="100" height="63"/>
@@ -6555,6 +7328,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MkZGh6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MkZGx6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l_ANMFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l_ANMVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_b0TcwFIfEdy7g9CjxdN7jw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l_ANMldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l_ANM1diEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l_ANNFdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l_ANNVdiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MkZHB6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_1DM54DxBEdyfAeav5abbAw"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MkZHR6SEeCkz5PP4vZT5g" x="39" y="312" width="482" height="67"/>
@@ -6585,6 +7367,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MlAAB6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MlAAR6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l_CCYFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l_CCYVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_6BpjUDUOEdy0feurbW0fyQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l_CCYldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l_CpcFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l_CpcVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l_CpcldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MlAAh6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_0TXx4DUOEdy0feurbW0fyQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MlAAx6SEeCkz5PP4vZT5g" x="429" y="78" width="92" height="63"/>
@@ -6615,6 +7406,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MlAFh6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MlAFx6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l_D3kFdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l_D3kVdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l_D3kldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MlAGB6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_sQ1JADO0EdyG-pUz-bb-Lg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MlAGR6SEeCkz5PP4vZT5g" x="299" y="78" width="100" height="63"/>
@@ -6645,6 +7440,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MlALB6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MlALR6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l_GT0FdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l_GT0VdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_DXEWYDUWEdyDReAOQiyvOg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l_GT0ldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_l_Hh8FdiEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_l_Hh8VdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l_Hh8ldiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MlALh6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_Fqa9QDUPEdy0feurbW0fyQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MlALx6SEeCkz5PP4vZT5g" x="169" y="78" width="100" height="63"/>
@@ -6791,6 +7595,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MmOHB6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MmOHR6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mBs74FdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mBs74VdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_Gyo1gFGKEdy7g9CjxdN7jw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mBs74ldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mBs741diEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mBs75FdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mBs75VdiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MmOHh6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_5InEkFGAEdyxP5ejovTmBw"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MmOHx6SEeCkz5PP4vZT5g" x="94" y="52" width="395" height="154"/>
@@ -6866,6 +7679,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_3MmORB6SEeCkz5PP4vZT5g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MmORR6SEeCkz5PP4vZT5g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mBv_MFdiEeOGK9gz6QqCTQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mBv_MVdiEeOGK9gz6QqCTQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="osal.uml#_b0TcwFIfEdy7g9CjxdN7jw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mBv_MldiEeOGK9gz6QqCTQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mBv_M1diEeOGK9gz6QqCTQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mBv_NFdiEeOGK9gz6QqCTQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mBv_NVdiEeOGK9gz6QqCTQ"/>
+      </children>
       <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_3MmORh6SEeCkz5PP4vZT5g"/>
       <element xmi:type="uml:Class" href="osal.uml#_1DM54DxBEdyfAeav5abbAw"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3MmORx6SEeCkz5PP4vZT5g" x="79" y="254" width="400" height="285"/>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/osal.uml b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/osal.uml
index 6d37baa1cdf..8bea09e7ff7 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/osal.uml
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/osal.uml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:C_Cpp="http://www.eclipse.org/papyrus/C_Cpp/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:l2="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">
+<xmi:XMI xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:C_Cpp="http://www.eclipse.org/papyrus/C_Cpp/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:l2="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">
   <uml:Model xmi:id="_ROTQYC-OEdySSa8YESkO2w" name="OS_AL">
     <packageImport xmi:type="uml:PackageImport" xmi:id="_ROTQYS-OEdySSa8YESkO2w">
       <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
@@ -27,25 +27,16 @@ added to (read from) the buffer by means of overloaded &lt;&lt; (>>) operators.<
           <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_YYWiwByeEduyofBvg4RL2w"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_iSBT8FCnEdyTutVzffQTmQ" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_iSBT8VCnEdyTutVzffQTmQ" value="1"/>
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_pP3P0FCnEdyTutVzffQTmQ">
-            <value xsi:nil="true"/>
-          </defaultValue>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_iVcbYFCnEdyTutVzffQTmQ" name="m_writer_ptr" visibility="protected" isUnique="false">
           <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_YYWiwByeEduyofBvg4RL2w"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_iV5HUFCnEdyTutVzffQTmQ" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_iV5HUVCnEdyTutVzffQTmQ" value="1"/>
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_sXPQcFCnEdyTutVzffQTmQ">
-            <value xsi:nil="true"/>
-          </defaultValue>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_iY4J4FCnEdyTutVzffQTmQ" name="m_data_start" visibility="protected" isUnique="false">
           <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_YYWiwByeEduyofBvg4RL2w"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_iZUOwFCnEdyTutVzffQTmQ" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_iZd_wFCnEdyTutVzffQTmQ" value="1"/>
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_viMJgFCnEdyTutVzffQTmQ">
-            <value xsi:nil="true"/>
-          </defaultValue>
         </ownedAttribute>
         <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_98a-cFCnEdyTutVzffQTmQ" name="MessageBuffer" specification="_9ececFCmEdyTutVzffQTmQ">
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_eg8bUCBbEeOMKsPXBVC0DA" name="dummy" type="_Nz2RgFClEdyTutVzffQTmQ">
@@ -197,9 +188,6 @@ return msg;&#xD;
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_qqshAFClEdyTutVzffQTmQ" name="msgBuf" type="_LbxUEDRPEdy1p4IpsoZYqA">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_qq_b8FClEdyTutVzffQTmQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qrJM8FClEdyTutVzffQTmQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_t9si0FClEdyTutVzffQTmQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_3v1yUFClEdyTutVzffQTmQ" name="MessageBuffer" method="_miDeYFCqEdyTutVzffQTmQ"/>
@@ -223,9 +211,6 @@ return msg;&#xD;
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZMiyoFCmEdyTutVzffQTmQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZM1tkFCmEdyTutVzffQTmQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_aRY60FCmEdyTutVzffQTmQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_UVQTkFCmEdyTutVzffQTmQ" name="sizeWriter" method="_LTXfgFCqEdyTutVzffQTmQ">
@@ -233,9 +218,6 @@ return msg;&#xD;
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_akT20FCmEdyTutVzffQTmQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_akmxwFCmEdyTutVzffQTmQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_b0yAMFCmEdyTutVzffQTmQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_g-GDYFCmEdyTutVzffQTmQ" name="addToBuffer" method="_E6W5kFCrEdyTutVzffQTmQ">
@@ -247,17 +229,11 @@ return msg;&#xD;
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_8I6RgBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_lZNj0FCmEdyTutVzffQTmQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lZXU0FCmEdyTutVzffQTmQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_mumpcFCmEdyTutVzffQTmQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_ljDcUFCmEdyTutVzffQTmQ" name="size">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ljWXQFCmEdyTutVzffQTmQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ljgIQFCmEdyTutVzffQTmQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_oYszwFCmEdyTutVzffQTmQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_viKJwFCmEdyTutVzffQTmQ" name="getFromBuffer" method="_Gkwl4FCrEdyTutVzffQTmQ">
@@ -269,17 +245,11 @@ return msg;&#xD;
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_8I6RgBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_04mC8FCmEdyTutVzffQTmQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_04vM4FCmEdyTutVzffQTmQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_2gmikFCmEdyTutVzffQTmQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_1B-ocFCmEdyTutVzffQTmQ" name="size">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1CRjYFCmEdyTutVzffQTmQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1CkeUFCmEdyTutVzffQTmQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_4bh-MFCmEdyTutVzffQTmQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_9ececFCmEdyTutVzffQTmQ" name="MessageBuffer" visibility="protected" method="_98a-cFCnEdyTutVzffQTmQ">
@@ -292,9 +262,6 @@ return msg;&#xD;
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_USmywFCnEdyTutVzffQTmQ" name="dummy" type="_Nz2RgFClEdyTutVzffQTmQ">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_US5tsFCnEdyTutVzffQTmQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_UTDesFCnEdyTutVzffQTmQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_VtgDcFCnEdyTutVzffQTmQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_lKriQDRPEdy1p4IpsoZYqA" name="operator&lt;&lt;" method="_p3s1wDR1EdypGbuyt3_DaA">
@@ -307,23 +274,14 @@ return msg;&#xD;
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_t_JBgDRPEdy1p4IpsoZYqA" name="param_0" type="_LbxUEDRPEdy1p4IpsoZYqA" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wr2fYDRPEdy1p4IpsoZYqA" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wr2fYTRPEdy1p4IpsoZYqA" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_wsAQYDRPEdy1p4IpsoZYqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_1yC9IDRPEdy1p4IpsoZYqA" name="msg" type="_LbxUEDRPEdy1p4IpsoZYqA">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4NBKwDRPEdy1p4IpsoZYqA" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4NBKwTRPEdy1p4IpsoZYqA" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_4NK7wDRPEdy1p4IpsoZYqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_132qMDRPEdy1p4IpsoZYqA" name="bstr" type="_WXH_4DO2EdyG-pUz-bb-Lg">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9YIkwDRPEdy1p4IpsoZYqA" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9YRusDRPEdy1p4IpsoZYqA" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_9YRusTRPEdy1p4IpsoZYqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_m8rEUDRPEdy1p4IpsoZYqA" name="operator>>" method="_s5RwYDR1EdypGbuyt3_DaA">
@@ -344,33 +302,21 @@ return msg;&#xD;
           <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yqI1EFCrEdyqzLG48ixyqA" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yqI1EVCrEdyqzLG48ixyqA" value="1"/>
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_1iuy0FCrEdyqzLG48ixyqA">
-            <value xsi:nil="true"/>
-          </defaultValue>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_yuw2YFCrEdyqzLG48ixyqA" name="sender" visibility="public" isUnique="false">
           <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yu6nYFCrEdyqzLG48ixyqA" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yu6nYVCrEdyqzLG48ixyqA" value="1"/>
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_4NnEsFCrEdyqzLG48ixyqA">
-            <value xsi:nil="true"/>
-          </defaultValue>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_yzPGsFCrEdyqzLG48ixyqA" name="msgNumber" visibility="public" isUnique="false">
           <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yzryoFCrEdyqzLG48ixyqA" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yzryoVCrEdyqzLG48ixyqA" value="1"/>
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_6u8ZAFCrEdyqzLG48ixyqA">
-            <value xsi:nil="true"/>
-          </defaultValue>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_y2EYQFCrEdyqzLG48ixyqA" name="length" visibility="public" isUnique="false">
           <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_y2X6QFCrEdyqzLG48ixyqA" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_y2X6QVCrEdyqzLG48ixyqA" value="1"/>
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_8-O7EFCrEdyqzLG48ixyqA">
-            <value xsi:nil="true"/>
-          </defaultValue>
         </ownedAttribute>
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_N361AFCsEdyqzLG48ixyqA" clientDependency="_YWeekFCsEdyqzLG48ixyqA _bWmnsFCsEdyqzLG48ixyqA" name="MessageWithHeader">
@@ -441,9 +387,6 @@ into the buffer (works only for homogeneous architectures).</body>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_sZUh0FCsEdyqzLG48ixyqA" name="msg" type="_N361AFCsEdyqzLG48ixyqA">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_sZ6XsFCsEdyqzLG48ixyqA" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_saEIsFCsEdyqzLG48ixyqA" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_vLIiIFCsEdyqzLG48ixyqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_44le4FCsEdyqzLG48ixyqA" name="initZoneNumber" method="_A-TzYFCuEdyqzLG48ixyqA">
@@ -465,18 +408,12 @@ into the buffer (works only for homogeneous architectures).</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_FXEY0FCtEdyqzLG48ixyqA" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FXNiwFCtEdyqzLG48ixyqA" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_Gbd1EFCtEdyqzLG48ixyqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_JEUGoFCtEdyqzLG48ixyqA" name="getHeader" method="_l2PZ4FCtEdyqzLG48ixyqA">
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_KUMaIFCtEdyqzLG48ixyqA" name="param_0" type="_ZiVqMFCrEdyTutVzffQTmQ" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_KUyQAFCtEdyqzLG48ixyqA" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KU8BAFCtEdyqzLG48ixyqA" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_L76l4FCtEdyqzLG48ixyqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_V5vg8FCtEdyqzLG48ixyqA" name="isFromLocalZone" method="_o1lf4FCtEdyqzLG48ixyqA">
@@ -484,18 +421,12 @@ into the buffer (works only for homogeneous architectures).</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZQCHUFCtEdyqzLG48ixyqA" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZQVpUFCtEdyqzLG48ixyqA" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_ameV0FCtEdyqzLG48ixyqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_cxNvEFCtEdyqzLG48ixyqA" name="MessageWithHeader" visibility="protected" method="_9REFkVCtEdyqzLG48ixyqA">
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_eTRXsFCtEdyqzLG48ixyqA" name="dummy" type="_Nz2RgFClEdyTutVzffQTmQ">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_eTuDoFCtEdyqzLG48ixyqA" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_eUA-kFCtEdyqzLG48ixyqA" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_fziQkFCtEdyqzLG48ixyqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
       </packagedElement>
@@ -507,9 +438,6 @@ into the buffer (works only for homogeneous architectures).</body>
           <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_UC_WgFC0EdyqzLG48ixyqA" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_UDIgcFC0EdyqzLG48ixyqA" value="1"/>
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_VVZZkFC0EdyqzLG48ixyqA">
-            <value xsi:nil="true"/>
-          </defaultValue>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_qM2woFC0EdyqzLG48ixyqA" name="m_name" visibility="private" type="_sQ1JADO0EdyG-pUz-bb-Lg" isUnique="false">
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_w0M4EFC0EdyqzLG48ixyqA" value="1"/>
@@ -518,25 +446,16 @@ into the buffer (works only for homogeneous architectures).</body>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_qTs_gFC0EdyqzLG48ixyqA" name="m_mutex" visibility="private" isUnique="false">
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0DeQcFC0EdyqzLG48ixyqA" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0DoBcFC0EdyqzLG48ixyqA" value="1"/>
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_ymy3EFC0EdyqzLG48ixyqA">
-            <value xsi:nil="true"/>
-          </defaultValue>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_VBgXwFC1EdyqzLG48ixyqA" name="m_key" visibility="private" isUnique="false">
           <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VBzSsFC1EdyqzLG48ixyqA" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VB9DsFC1EdyqzLG48ixyqA" value="1"/>
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_YQCwUFC1EdyqzLG48ixyqA">
-            <value xsi:nil="true"/>
-          </defaultValue>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_VL8GIFC1EdyqzLG48ixyqA" name="m_id" visibility="private" isUnique="false">
           <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VMYyEFC1EdyqzLG48ixyqA" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VMYyEVC1EdyqzLG48ixyqA" value="1"/>
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_Z8rRQFC1EdyqzLG48ixyqA">
-            <value xsi:nil="true"/>
-          </defaultValue>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_VPz5gFC1EdyqzLG48ixyqA" name="classKey" visibility="private" isStatic="true" isUnique="false">
           <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
@@ -551,9 +470,6 @@ into the buffer (works only for homogeneous architectures).</body>
           <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gOkGEFC1EdyqzLG48ixyqA" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gOtQAFC1EdyqzLG48ixyqA" value="1"/>
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_mIKWsFC1EdyqzLG48ixyqA">
-            <value xsi:nil="true"/>
-          </defaultValue>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_gR1cgFC1EdyqzLG48ixyqA" name="m_address0" visibility="private" isUnique="false">
           <ownedComment xmi:type="uml:Comment" xmi:id="_xgYzMFC1EdyqzLG48ixyqA" annotatedElement="_gR1cgFC1EdyqzLG48ixyqA">
@@ -562,9 +478,6 @@ into the buffer (works only for homogeneous architectures).</body>
           <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gSI-gFC1EdyqzLG48ixyqA" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gSI-gVC1EdyqzLG48ixyqA" value="1"/>
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_nEzlIFC1EdyqzLG48ixyqA">
-            <value xsi:nil="true"/>
-          </defaultValue>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_gVRLAFC1EdyqzLG48ixyqA" name="m_address" visibility="private" isUnique="false">
           <ownedComment xmi:type="uml:Comment" xmi:id="_zeKHcFC1EdyqzLG48ixyqA" annotatedElement="_gVRLAFC1EdyqzLG48ixyqA">
@@ -573,9 +486,6 @@ into the buffer (works only for homogeneous architectures).</body>
           <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gVkF8FC1EdyqzLG48ixyqA" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gVt28FC1EdyqzLG48ixyqA" value="1"/>
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_oNhgsFC1EdyqzLG48ixyqA">
-            <value xsi:nil="true"/>
-          </defaultValue>
         </ownedAttribute>
         <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_46GywFC1EdyqzLG48ixyqA" name="getAddress0" specification="_WZFykFCxEdyqzLG48ixyqA">
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_cth88CBbEeOMKsPXBVC0DA" name="param_0" direction="return">
@@ -1160,25 +1070,16 @@ into the buffer (works only for homogeneous architectures).</body>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_bUnt4FCwEdyqzLG48ixyqA" name="name" type="_WXH_4DO2EdyG-pUz-bb-Lg">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bU6o0FCwEdyqzLG48ixyqA" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bVEZ0FCwEdyqzLG48ixyqA" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_c7SwwFCwEdyqzLG48ixyqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_bX5rYFCwEdyqzLG48ixyqA" name="char1">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bYVwQFCwEdyqzLG48ixyqA" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bYfhQFCwEdyqzLG48ixyqA" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_ekyeIFCwEdyqzLG48ixyqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_bbLB0FCwEdyqzLG48ixyqA" name="size">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bbej0FCwEdyqzLG48ixyqA" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bbxewFCwEdyqzLG48ixyqA" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_glFh8FCwEdyqzLG48ixyqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_bev6QFCwEdyqzLG48ixyqA" name="synchro">
             <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
@@ -1205,48 +1106,30 @@ into the buffer (works only for homogeneous architectures).</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_83m8YFCwEdyqzLG48ixyqA" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8353UFCwEdyqzLG48ixyqA" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_-asfwFCwEdyqzLG48ixyqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_87L00FCwEdyqzLG48ixyqA" name="name" type="_WXH_4DO2EdyG-pUz-bb-Lg">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_87evwFCwEdyqzLG48ixyqA" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_87xqsFCwEdyqzLG48ixyqA" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="__9M0UFCwEdyqzLG48ixyqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_8-dLQFCwEdyqzLG48ixyqA" name="char1">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8-53MFCwEdyqzLG48ixyqA" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8_NZMFCwEdyqzLG48ixyqA" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_Bi-fUFCxEdyqzLG48ixyqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_9CL0sFCwEdyqzLG48ixyqA" name="oflag">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9CogoFCwEdyqzLG48ixyqA" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9CyRoFCwEdyqzLG48ixyqA" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_DOHLcFCxEdyqzLG48ixyqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_9F6eIFCwEdyqzLG48ixyqA" name="mode">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9GXKEFCwEdyqzLG48ixyqA" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9GqFAFCwEdyqzLG48ixyqA" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_E1-hIFCxEdyqzLG48ixyqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_9JCqoFCwEdyqzLG48ixyqA" name="size">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9JL0kFCwEdyqzLG48ixyqA" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9JVlkFCwEdyqzLG48ixyqA" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_GqDt4FCxEdyqzLG48ixyqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_9MK3IFCwEdyqzLG48ixyqA" name="synchro">
             <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
@@ -1265,18 +1148,12 @@ into the buffer (works only for homogeneous architectures).</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_8I6RgBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bN_sAFCxEdyqzLG48ixyqA" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bOJdAFCxEdyqzLG48ixyqA" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_cWHxsFCxEdyqzLG48ixyqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_gRW4MFCxEdyqzLG48ixyqA" name="getName" method="_7UyFcFC1EdyqzLG48ixyqA">
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_iRXBEFCxEdyqzLG48ixyqA" name="param_0" type="_sQ1JADO0EdyG-pUz-bb-Lg" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_iRgLAFCxEdyqzLG48ixyqA" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_iRp8AFCxEdyqzLG48ixyqA" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_jBfdgFCxEdyqzLG48ixyqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_qK9akFCxEdyqzLG48ixyqA" name="allocate" method="_g6wBMFC2EdyqzLG48ixyqA">
@@ -1291,17 +1168,11 @@ into the buffer (works only for homogeneous architectures).</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_8I6RgBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_vh_JoFCxEdyqzLG48ixyqA" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_viI6oFCxEdyqzLG48ixyqA" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_wt14wFCxEdyqzLG48ixyqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_vkrRQFCxEdyqzLG48ixyqA" name="itemSize">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_vlH9MFCxEdyqzLG48ixyqA" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vlRHIFCxEdyqzLG48ixyqA" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_ysDR4FCxEdyqzLG48ixyqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_2nJOcFCxEdyqzLG48ixyqA" name="unlink" method="_pde3QFC2EdyqzLG48ixyqA">
@@ -1309,18 +1180,12 @@ into the buffer (works only for homogeneous architectures).</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_3aGVYFCxEdyqzLG48ixyqA" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3aZ3YFCxEdyqzLG48ixyqA" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_4i-B8FCxEdyqzLG48ixyqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_7F2OYFCxEdyqzLG48ixyqA" name="getMutex" method="_80JmcFC1EdyqzLG48ixyqA">
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_-rLWUFCxEdyqzLG48ixyqA" name="param_0" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-roCQFCxEdyqzLG48ixyqA" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-rxMMFCxEdyqzLG48ixyqA" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="__vbBkFCxEdyqzLG48ixyqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_KxUW0FC0EdyqzLG48ixyqA" name="_key" method="__3W4wFC1EdyqzLG48ixyqA">
@@ -1328,9 +1193,6 @@ into the buffer (works only for homogeneous architectures).</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_fY--YFC0EdyqzLG48ixyqA" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fZR5UFC0EdyqzLG48ixyqA" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_g-ducFC0EdyqzLG48ixyqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_K3bl4FC0EdyqzLG48ixyqA" name="_id" method="_BFvXcFC2EdyqzLG48ixyqA">
@@ -1338,9 +1200,6 @@ into the buffer (works only for homogeneous architectures).</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_iMF_MFC0EdyqzLG48ixyqA" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_iMY6IFC0EdyqzLG48ixyqA" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_jW5lcFC0EdyqzLG48ixyqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_K8DAIFC0EdyqzLG48ixyqA" name="_shmSize" method="_CahZEFC2EdyqzLG48ixyqA">
@@ -1348,9 +1207,6 @@ into the buffer (works only for homogeneous architectures).</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_jphmgFC0EdyqzLG48ixyqA" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jp0hcFC0EdyqzLG48ixyqA" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_ktoH0FC0EdyqzLG48ixyqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_LAqaYFC0EdyqzLG48ixyqA" name="set_shmSize" method="_DsohMFC2EdyqzLG48ixyqA">
@@ -1358,9 +1214,6 @@ into the buffer (works only for homogeneous architectures).</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_mXIcQFC0EdyqzLG48ixyqA" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_mXRmMFC0EdyqzLG48ixyqA" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_nWUBUFC0EdyqzLG48ixyqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_35gG0FC0EdyqzLG48ixyqA" name="init1" visibility="private" method="_vp258FC2EdyqzLG48ixyqA">
@@ -1368,25 +1221,16 @@ into the buffer (works only for homogeneous architectures).</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_82TYAFC0EdyqzLG48ixyqA" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_82ch8FC0EdyqzLG48ixyqA" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_-kuBoFC0EdyqzLG48ixyqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_84r9oFC0EdyqzLG48ixyqA" name="synchro">
             <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_84-4kFC0EdyqzLG48ixyqA" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_85IpkFC0EdyqzLG48ixyqA" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_A3y3gFC1EdyqzLG48ixyqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_87XeMFC0EdyqzLG48ixyqA" name="size">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_87qZIFC0EdyqzLG48ixyqA" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8797IFC0EdyqzLG48ixyqA" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_CwgFkFC1EdyqzLG48ixyqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_4JcAQFC0EdyqzLG48ixyqA" name="openIntern" visibility="private" method="_3a0U0FC2EdyqzLG48ixyqA">
@@ -1394,49 +1238,31 @@ into the buffer (works only for homogeneous architectures).</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Oi8_8FC1EdyqzLG48ixyqA" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OjZr4FC1EdyqzLG48ixyqA" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_S9obgFC1EdyqzLG48ixyqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_FrNjMFC1EdyqzLG48ixyqA" name="char1">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_FrgeIFC1EdyqzLG48ixyqA" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FrzZEFC1EdyqzLG48ixyqA" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HT0fwFC1EdyqzLG48ixyqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_FuC0wFC1EdyqzLG48ixyqA" name="oflag">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_FuVvsFC1EdyqzLG48ixyqA" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FuoqoFC1EdyqzLG48ixyqA" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_JAdAsFC1EdyqzLG48ixyqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_FxBQQFC1EdyqzLG48ixyqA" name="mode">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_FxUyQFC1EdyqzLG48ixyqA" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FxntMFC1EdyqzLG48ixyqA" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_Kj2GEFC1EdyqzLG48ixyqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_FztX4FC1EdyqzLG48ixyqA" name="size">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_F0JcwFC1EdyqzLG48ixyqA" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_F0TNwFC1EdyqzLG48ixyqA" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_MLs0sFC1EdyqzLG48ixyqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_F2Y4cFC1EdyqzLG48ixyqA" name="synchro">
             <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_F2rzYFC1EdyqzLG48ixyqA" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_F2-uUFC1EdyqzLG48ixyqA" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_NxLkwFC1EdyqzLG48ixyqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
       </packagedElement>
@@ -1503,9 +1329,6 @@ Linux/Solaris, respectively.</body>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_UO0swE_oEdy2tpS719xBwQ" name="m_startRoutine" visibility="private" type="_kor6MFdhEd-9TNLvplUFDQ" isUnique="false">
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_UPbJsE_oEdy2tpS719xBwQ" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_UPbJsU_oEdy2tpS719xBwQ" value="1"/>
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_WUyTsE_oEdy2tpS719xBwQ">
-            <value xsi:nil="true"/>
-          </defaultValue>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_Z47I0E_oEdy2tpS719xBwQ" name="m_startArg" visibility="private" isUnique="false">
           <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_8I6RgBydEduyofBvg4RL2w"/>
@@ -2316,24 +2139,15 @@ used by class Timer</body>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_suk50E_gEdy2tpS719xBwQ" name="attrPtr" type="_Saw1YDkDEdyuzNpSiGPe4w">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_su30wE_gEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_svBlwE_gEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_zHKzkE_gEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_sx2QQE_gEdy2tpS719xBwQ" name="startRoutine" type="_kor6MFdhEd-9TNLvplUFDQ">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_syJyQE_gEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_syS8ME_gEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_0qaH8E_gEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_s1R-wE_gEdy2tpS719xBwQ" name="arg">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_8I6RgBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s1k5sE_gEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s1uqsE_gEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_2tPiYE_gEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_s423ME_gEdy2tpS719xBwQ" name="exPrio">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
@@ -2379,26 +2193,17 @@ be called during the application startup.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_8I6RgBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_EPvs4FnmEd-9TNLvplUFDQ" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EPywMFnmEd-9TNLvplUFDQ" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_GP0C8E_iEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_FeNrIFnmEd-9TNLvplUFDQ" name="arg">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_8I6RgBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_FeNrIlnmEd-9TNLvplUFDQ" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FeNrIVnmEd-9TNLvplUFDQ" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_FeNrI1nmEd-9TNLvplUFDQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_S8E6ME_iEdy2tpS719xBwQ" name="getId" isStatic="true" method="_FyBaEE_qEdy2tpS719xBwQ">
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_UzcEcE_iEdy2tpS719xBwQ" name="param_0" type="_l2xogFdiEd-9TNLvplUFDQ" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Uzu_YE_iEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Uz4wYE_iEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_WR6NkE_iEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_dG0P4E_iEdy2tpS719xBwQ" name="getName" isStatic="true" method="_IEyt8E_qEdy2tpS719xBwQ">
@@ -2418,9 +2223,6 @@ be called during the application startup.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_O4Zz8E_jEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_O4jk8E_jEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_QhdccE_jEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_Gzx2ME_jEdy2tpS719xBwQ" name="setPriority" isStatic="true" method="_ONl4ME_qEdy2tpS719xBwQ">
@@ -2428,9 +2230,6 @@ be called during the application startup.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_RupoUE_jEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_RuyyQE_jEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_S8R5EE_jEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_G6VKIE_jEdy2tpS719xBwQ" name="getPrioMax" isStatic="true" method="_Q3UTgE_qEdy2tpS719xBwQ">
@@ -2438,9 +2237,6 @@ be called during the application startup.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_T89S8E_jEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_T9Gc4E_jEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_VljocE_jEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_bvjFgE_jEdy2tpS719xBwQ" name="getThreadAttributes" method="_0g4e4E_oEdy2tpS719xBwQ">
@@ -2460,9 +2256,6 @@ be called during the application startup.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ngXBIE_jEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nggyIE_jEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_pRm8UE_jEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_yp_A8E_jEdy2tpS719xBwQ" name="changeSigMask" isStatic="true" method="_T9W3YE_qEdy2tpS719xBwQ">
@@ -2486,23 +2279,14 @@ between all threads.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__RyO8E_jEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__R7Y4E_jEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_Ci_hAE_kEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="__Um5cE_jEdy2tpS719xBwQ" name="newSet" type="_5J3-8FdkEd-9TNLvplUFDQ">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__UwqcE_jEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__VDlYE_jEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_EF76cE_kEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="__YLx4E_jEdy2tpS719xBwQ" name="oldSet" type="_5J3-8FdkEd-9TNLvplUFDQ" direction="inout">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__YfT4E_jEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__Yod0E_jEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_AK2k8E_kEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_MYHzEE_kEdy2tpS719xBwQ" name="modifySigMask" isStatic="true" method="_Wid4cE_qEdy2tpS719xBwQ">
@@ -2516,17 +2300,11 @@ add the signal to it.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_M87wUE_kEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_M9OrQE_kEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_O-k38E_kEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_NA9UsE_kEdy2tpS719xBwQ" name="signalID">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_NBGeoE_kEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NBQPoE_kEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_R6U3YE_kEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_X5b6IE_kEdy2tpS719xBwQ" name="printSigMask" method="_ZVR-UE_qEdy2tpS719xBwQ"/>
@@ -2535,9 +2313,6 @@ add the signal to it.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_8I6RgBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_dhwNgE_kEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dh5XcE_kEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_etTaoE_kEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_NaGikE_mEdy2tpS719xBwQ" name="exec" method="_hzh9AE_qEdy2tpS719xBwQ">
@@ -2556,17 +2331,11 @@ periodic tasks.</body>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_WnJg8E_mEdy2tpS719xBwQ" name="startRoutine" type="_kor6MFdhEd-9TNLvplUFDQ">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Wncb4E_mEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WnmM4E_mEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_Ys0M8E_mEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_WqIjgE_mEdy2tpS719xBwQ" name="arg">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_8I6RgBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WqbecE_mEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WqlPcE_mEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_aqR_ME_mEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_WuKH4E_mEdy2tpS719xBwQ" name="execPrio">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
@@ -2578,9 +2347,6 @@ periodic tasks.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_BGPmUFnbEd-9TNLvplUFDQ" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_BGQ0cFnbEd-9TNLvplUFDQ" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_BGSpoFnbEd-9TNLvplUFDQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_nQJTgE_mEdy2tpS719xBwQ" name="entryRoutine" method="_k-CxME_qEdy2tpS719xBwQ"/>
@@ -2593,9 +2359,6 @@ the one for which this operation is called</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t6UsgE_mEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t6d2cE_mEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_vSrmkE_mEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_xR8IkE_mEdy2tpS719xBwQ" name="equal" method="_p2-PAE_qEdy2tpS719xBwQ">
@@ -2603,16 +2366,10 @@ the one for which this operation is called</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9d358E_mEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9eBD4E_mEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="__pgEAE_mEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_9hJ3cE_mEdy2tpS719xBwQ" name="otherThread" type="_-HeCsDj_Edy0Rd6V_tf1-Q">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9hl8UE_mEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9hvtUE_mEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_C4UwcE_nEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_xldhgE_mEdy2tpS719xBwQ" name="resume" method="_vvrHwE_qEdy2tpS719xBwQ">
@@ -2620,9 +2377,6 @@ the one for which this operation is called</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_PsfmgE_nEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PsyhcE_nEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_Q4VukE_nEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_xsdhYE_mEdy2tpS719xBwQ" name="suspend" method="_y4ZMME_qEdy2tpS719xBwQ">
@@ -2630,9 +2384,6 @@ the one for which this operation is called</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_R_tmUE_nEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_R_3XUE_nEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_TQU5oE_nEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_x0gqIE_mEdy2tpS719xBwQ" name="runBackground" method="_1UZ7oE_qEdy2tpS719xBwQ"/>
@@ -2649,9 +2400,6 @@ the one for which this operation is called</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_hXWesE_nEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hXfooE_nEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_ij8NoE_nEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
       </packagedElement>
@@ -2774,17 +2522,11 @@ can be/has to be explicitly joined by the thread initiator).&#xD;
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_jHfCwE_rEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jHozwE_rEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_kbYTkE_rEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_jLD7ME_rEdy2tpS719xBwQ" name="stackSize">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_LTZesByeEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_jLW2IE_rEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jLgnIE_rEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_mpZDQE_rEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_f_9RIE_rEdy2tpS719xBwQ" name="getStackSize" method="_GyeNoE_uEdy2tpS719xBwQ">
@@ -2792,9 +2534,6 @@ can be/has to be explicitly joined by the thread initiator).&#xD;
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_LTZesByeEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_pNc7cE_rEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_pNmscE_rEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_qbrpIE_rEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_vxhFYE_rEdy2tpS719xBwQ" name="setStackAddr" method="_IITYIE_uEdy2tpS719xBwQ">
@@ -2802,9 +2541,6 @@ can be/has to be explicitly joined by the thread initiator).&#xD;
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_8I6RgBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_zt8esE_rEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zuGPsE_rEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_1FQ28E_rEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_v5HiME_rEdy2tpS719xBwQ" name="getStackAddr" method="_J3nZoE_uEdy2tpS719xBwQ">
@@ -2812,9 +2548,6 @@ can be/has to be explicitly joined by the thread initiator).&#xD;
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_8I6RgBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2eq54E_rEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2e0q4E_rEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_3ty_cE_rEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_oN8UUE_tEdy2tpS719xBwQ" name="setDetached" method="_LQR1sE_uEdy2tpS719xBwQ">
@@ -2822,9 +2555,6 @@ can be/has to be explicitly joined by the thread initiator).&#xD;
             <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_sDNVsE_tEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sDg3sE_tEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_teHNcE_tEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_ofORkE_tEdy2tpS719xBwQ" name="getDetached" method="_MoV00E_uEdy2tpS719xBwQ">
@@ -2832,9 +2562,6 @@ can be/has to be explicitly joined by the thread initiator).&#xD;
             <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_w9L8YE_tEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_w9e3UE_tEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_ymrpwE_tEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
       </packagedElement>
@@ -3520,17 +3247,11 @@ exit (1);&#xD;
             <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_w1lHEE_CEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_w14CAE_CEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yvU28E_CEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_w5c6cE_CEdy2tpS719xBwQ" name="name">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_w5wccE_CEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_w55mYE_CEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_1G39IE_CEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_WtXBAE_CEdy2tpS719xBwQ" name="getEnv" isStatic="true" method="_K8r5ME_LEdy2tpS719xBwQ">
@@ -3538,17 +3259,11 @@ exit (1);&#xD;
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5wcwUE_CEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5wvrQE_CEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_8e8W4E_CEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_5y1V8E_CEdy2tpS719xBwQ" name="name">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5zIQ4E_CEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5zSB4E_CEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_AQyQ0E_DEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_Wx1RUE_CEdy2tpS719xBwQ" name="getEnvInt" isStatic="true" method="_NumnME_LEdy2tpS719xBwQ">
@@ -3556,17 +3271,11 @@ exit (1);&#xD;
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_blAP8E_DEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_blKA8E_DEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_dA8pgE_DEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_bmpOsE_DEdy2tpS719xBwQ" name="name">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bnF6oE_DEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bnProE_DEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_hr3ggE_DEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_bolIYE_DEdy2tpS719xBwQ" name="base">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
@@ -3580,17 +3289,11 @@ exit (1);&#xD;
             <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_rifAUE_DEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rioxUE_DEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_tLio0E_DEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_rj1EIE_DEdy2tpS719xBwQ" name="name">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_rkH_EE_DEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rkRwEE_DEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_vwDM8E_DEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_W8HOsE_CEdy2tpS719xBwQ" name="getCommProcNb" isStatic="true" method="_TRQXcE_LEdy2tpS719xBwQ">
@@ -3598,9 +3301,6 @@ exit (1);&#xD;
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1F4pME_DEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1GCaME_DEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_2aXv4E_DEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_XA4Z8E_CEdy2tpS719xBwQ" name="saveArg" isStatic="true" method="_VJXIkE_LEdy2tpS719xBwQ">
@@ -3608,17 +3308,11 @@ exit (1);&#xD;
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5aTrwE_DEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5ac1sE_DEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_7aT0oE_DEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_5by5gE_DEdy2tpS719xBwQ" name="argv">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5cF0cE_DEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5cPlcE_DEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_-yFBsE_DEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_EmmlEE_EEdy2tpS719xBwQ" name="setZoneNumber" isStatic="true" method="_XD2fUE_LEdy2tpS719xBwQ">
@@ -3626,9 +3320,6 @@ exit (1);&#xD;
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ip40UE_EEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IqClUE_EEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_KWEpUE_EEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_FQU3gE_EEdy2tpS719xBwQ" name="getZoneNumber" isStatic="true" method="_Zj4zIE_LEdy2tpS719xBwQ">
@@ -3636,9 +3327,6 @@ exit (1);&#xD;
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_MZf5oE_EEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MZpqoE_EEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_Nm_AcE_EEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_Qd0qsE_EEdy2tpS719xBwQ" name="getZoneName" isStatic="true" method="_IMMkAE_KEdy2tpS719xBwQ">
@@ -3651,9 +3339,6 @@ exit (1);&#xD;
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_clSLwE_EEdy2tpS719xBwQ" name="zoneName" type="_WXH_4DO2EdyG-pUz-bb-Lg">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_clltwE_EEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_clu3sE_EEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_ebTSME_EEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_m11OgE_EEdy2tpS719xBwQ" name="getPid" isStatic="true" method="_J41E8E_KEdy2tpS719xBwQ">
@@ -3661,9 +3346,6 @@ exit (1);&#xD;
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_uZracE_EEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uZ1LcE_EEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_vxwAoE_EEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_m8ZJgE_EEdy2tpS719xBwQ" name="getParentPid" isStatic="true" method="_LgsaoE_KEdy2tpS719xBwQ">
@@ -3671,9 +3353,6 @@ exit (1);&#xD;
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wJJM8E_EEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wJSW4E_EEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_xf3vUE_EEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_nCDsoE_EEdy2tpS719xBwQ" name="getPrioMax" isStatic="true" method="_dMM9oE_LEdy2tpS719xBwQ">
@@ -3681,9 +3360,6 @@ exit (1);&#xD;
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_y5ueME_EEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_y53oIE_EEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_14A0QE_EEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_nGrG4E_EEdy2tpS719xBwQ" name="getPrioMin" isStatic="true" method="_fW7v0E_LEdy2tpS719xBwQ">
@@ -3691,9 +3367,6 @@ exit (1);&#xD;
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2u_fkE_EEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2vJQkE_EEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_39-bME_EEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_nL4-EE_EEdy2tpS719xBwQ" name="setMyPriority" isStatic="true" method="_i-fsYE_LEdy2tpS719xBwQ">
@@ -3701,9 +3374,6 @@ exit (1);&#xD;
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__bQsIE_EEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__badIE_EEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_Atz5IE_FEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_nPwxcE_EEdy2tpS719xBwQ" name="decrMyPriority" isStatic="true" method="_l17zkE_LEdy2tpS719xBwQ">
@@ -3711,9 +3381,6 @@ exit (1);&#xD;
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_CMuuME_FEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_CNCQME_FEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_DWM3sE_FEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_nUPBwE_EEdy2tpS719xBwQ" name="getMyPriority" isStatic="true" method="_qwMuIE_LEdy2tpS719xBwQ">
@@ -3721,9 +3388,6 @@ exit (1);&#xD;
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ER8uQE_FEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ESQQQE_FEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_Fh-LsE_FEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_cjQWAE_FEdy2tpS719xBwQ" name="exitErr" isStatic="true" method="_0PIGsE_LEdy2tpS719xBwQ">
@@ -3731,25 +3395,16 @@ exit (1);&#xD;
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wY2AYE_FEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wZI7UE_FEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_ynJrAE_FEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_wb-M4E_FEdy2tpS719xBwQ" name="file">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wcRu4E_FEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wca40E_FEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_0wsKYE_FEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_wfQKYE_FEdy2tpS719xBwQ" name="str">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wfs2UE_FEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wf2nUE_FEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_3KLKQE_FEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_cpEqIE_FEdy2tpS719xBwQ" name="exitErr" isStatic="true" method="_2eoEIE_LEdy2tpS719xBwQ">
@@ -3757,24 +3412,15 @@ exit (1);&#xD;
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Be5iYE_GEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_BfCsUE_GEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_C86_kE_GEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_BiBu4E_GEdy2tpS719xBwQ" name="file">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_BiK40E_GEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_BiUp0E_GEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_FYMIIE_GEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_BlTsYE_GEdy2tpS719xBwQ" name="str" type="_WXH_4DO2EdyG-pUz-bb-Lg">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Blc2UE_GEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_BlvxQE_GEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_GzPJ0E_GEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_fBQXkE_HEdy2tpS719xBwQ" name="getArgc" isStatic="true" method="_wzzhQE_JEdy2tpS719xBwQ">
@@ -3782,9 +3428,6 @@ exit (1);&#xD;
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_6NyaUE_HEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6N8LUE_HEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_7zRKYE_HEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_fMk2wE_HEdy2tpS719xBwQ" name="getArgv" isStatic="true" method="_0-1-UE_JEdy2tpS719xBwQ">
@@ -3792,17 +3435,11 @@ exit (1);&#xD;
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9MOhYE_HEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9MYSYE_HEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_-mYLME_HEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_9OdWAE_HEdy2tpS719xBwQ" name="pos">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9OnHAE_HEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9Ow4AE_HEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_BGk3EE_IEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_fRpkAE_HEdy2tpS719xBwQ" name="getArgv" isStatic="true" method="_zW-ooE_JEdy2tpS719xBwQ">
@@ -3810,9 +3447,6 @@ exit (1);&#xD;
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_G6qVkE_IEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_G60GkE_IEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_IR-t0E_IEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_fWj5ME_HEdy2tpS719xBwQ" name="getPauseOnErr" isStatic="true" method="_NcEiME_KEdy2tpS719xBwQ">
@@ -3820,9 +3454,6 @@ exit (1);&#xD;
             <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_NFGekE_IEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NFQPkE_IEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_Oca20E_IEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_fbomcE_HEdy2tpS719xBwQ" name="getClassId" isStatic="true" method="_Q5DmcE_KEdy2tpS719xBwQ">
@@ -3830,9 +3461,6 @@ exit (1);&#xD;
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_RwxjgE_IEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_RxEecE_IEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_UxSuME_IEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_ffqK0E_HEdy2tpS719xBwQ" name="getNumerOfProcesses" isStatic="true" method="_SYbHcE_KEdy2tpS719xBwQ">
@@ -3840,9 +3468,6 @@ exit (1);&#xD;
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WD_sME_IEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WEJdME_IEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_XKokIE_IEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_fkkgAE_HEdy2tpS719xBwQ" name="getPolicy" isStatic="true" method="_UKkagE_KEdy2tpS719xBwQ">
@@ -3850,18 +3475,12 @@ exit (1);&#xD;
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_YBUUgE_IEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YBeFgE_IEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_ZLrO0E_IEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_Lv9bIE_JEdy2tpS719xBwQ" name="exitErrP" visibility="private" isStatic="true" method="_5RSZAE_LEdy2tpS719xBwQ">
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_NHIpcE_JEdy2tpS719xBwQ" name="str" type="_WXH_4DO2EdyG-pUz-bb-Lg">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_NHRzYE_JEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NHlVYE_JEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_PWe14E_JEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
       </packagedElement>
@@ -4131,9 +3750,6 @@ Only partially used.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_q7CaQE_NEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_q7MLQE_NEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_swKv4E_NEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_v9NToE_NEdy2tpS719xBwQ" name="setCpuNb" isStatic="true" method="_9vvmsE_eEdy2tpS719xBwQ">
@@ -4141,9 +3757,6 @@ Only partially used.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ypeFkE_NEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ypxAgE_NEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_0lS5EE_NEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_361RgE_NEdy2tpS719xBwQ" name="getMqMax" isStatic="true" method="__E1KUE_eEdy2tpS719xBwQ">
@@ -4154,9 +3767,6 @@ Only partially used.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_48PrME_NEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_48ZcME_NEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_6KoJ4E_NEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_7k7ksE_NEdy2tpS719xBwQ" name="setMqMax" isStatic="true" method="_AneBwE_fEdy2tpS719xBwQ">
@@ -4164,9 +3774,6 @@ Only partially used.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9jvawE_NEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9kCVsE_NEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_-0DzIE_NEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_EQ5PQE_OEdy2tpS719xBwQ" name="getSemsMax" isStatic="true" method="_Cm4UwE_fEdy2tpS719xBwQ">
@@ -4177,9 +3784,6 @@ Only partially used.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_HPfHUE_OEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HPoRQE_OEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_IxiI4E_OEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_EW2tUE_OEdy2tpS719xBwQ" name="setSemsMax" isStatic="true" method="_D09RcE_fEdy2tpS719xBwQ">
@@ -4187,9 +3791,6 @@ Only partially used.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Jzi_gE_OEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JzsJcE_OEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_MavEME_OEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_R3kgUE_OEdy2tpS719xBwQ" name="getHostId" isStatic="true" method="_FDMmME_fEdy2tpS719xBwQ">
@@ -4197,9 +3798,6 @@ Only partially used.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_8heigBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VLxcAE_OEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VL6l8E_OEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_WgGxsE_OEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_R8VrkE_OEdy2tpS719xBwQ" name="getHostName" isStatic="true" method="_GbaWUE_fEdy2tpS719xBwQ">
@@ -4207,9 +3805,6 @@ Only partially used.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_YIazUE_OEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YItuQE_OEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_Z6RLcE_OEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_SCJ_sE_OEdy2tpS719xBwQ" name="getMachine" isStatic="true" method="_I9Yj0E_fEdy2tpS719xBwQ">
@@ -4217,9 +3812,6 @@ Only partially used.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1uVKcE_dEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1ue7cE_dEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_3uo1UE_dEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_SHhA0E_OEdy2tpS719xBwQ" name="getRelease" isStatic="true" method="_KHltIE_fEdy2tpS719xBwQ">
@@ -4227,9 +3819,6 @@ Only partially used.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__y0HIE_dEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__y94IE_dEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_A-0AME_eEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_SMSMEE_OEdy2tpS719xBwQ" name="getSysName" isStatic="true" method="_LMvXUE_fEdy2tpS719xBwQ">
@@ -4237,9 +3826,6 @@ Only partially used.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Bj6RUE_eEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_BkECUE_eEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_DK4PIE_eEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_SQdhcE_OEdy2tpS719xBwQ" name="getVersion" isStatic="true" method="_MUtE8E_fEdy2tpS719xBwQ">
@@ -4247,9 +3833,6 @@ Only partially used.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Dik9cE_eEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DiuHYE_eEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_E2BiUE_eEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
       </packagedElement>
@@ -4458,18 +4041,12 @@ getPtr part is commented out => reconsider whether this class is needed)</body>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_vzzVoE_xEdy2tpS719xBwQ" name="param_0" type="_eGJTAE_vEdy2tpS719xBwQ" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_v0GQkE_xEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_v0QBkE_xEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_xTdxkE_xEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_aJrykE_xEdy2tpS719xBwQ" name="operator->" method="_M_R74E_zEdy2tpS719xBwQ">
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_1w0tsE_xEdy2tpS719xBwQ" name="param_0" type="_eGJTAE_vEdy2tpS719xBwQ" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1xRZoE_xEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1xbKoE_xEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_2pTN0E_xEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_D9gO0E_yEdy2tpS719xBwQ" name="_key" method="_69LoYE_yEdy2tpS719xBwQ">
@@ -4477,9 +4054,6 @@ getPtr part is commented out => reconsider whether this class is needed)</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bl-8AE_yEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bmIF8E_yEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_cuGaoE_yEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_ECHpEE_yEdy2tpS719xBwQ" name="set_key" method="_8Tde0E_yEdy2tpS719xBwQ">
@@ -4487,27 +4061,18 @@ getPtr part is commented out => reconsider whether this class is needed)</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_e12xUE_yEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_e2JsQE_yEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_gBs5YE_yEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_EJIQAE_yEdy2tpS719xBwQ" name="_dataPtr" method="_9ceVUE_yEdy2tpS719xBwQ">
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_iqPB4E_yEdy2tpS719xBwQ" name="param_0" type="_eGJTAE_vEdy2tpS719xBwQ" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_iqh80E_yEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_iqrt0E_yEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_mc1JwE_yEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_ETtIUE_yEdy2tpS719xBwQ" name="set_dataPtr" method="_BTiGcE_zEdy2tpS719xBwQ">
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_tK4WIE_yEdy2tpS719xBwQ" name="cr_operand" type="_eGJTAE_vEdy2tpS719xBwQ">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_tLLREE_yEdy2tpS719xBwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tLeMAE_yEdy2tpS719xBwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_uQnPIE_yEdy2tpS719xBwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
       </packagedElement>
@@ -5192,18 +4757,12 @@ size must itself be of a limited size that has to be known at creation.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_oykd0DUyEdyDReAOQiyvOg" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_oyuO0DUyEdyDReAOQiyvOg" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_oy3_0DUyEdyDReAOQiyvOg">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_9DJbEDUyEdyDReAOQiyvOg" name="insert" method="_vrKtMDa6Edyv9PRkTrTu0A">
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_iGkDYDUzEdyDReAOQiyvOg" name="param_0" type="_XE1_MDUvEdyDReAOQiyvOg" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_jROfsDUzEdyDReAOQiyvOg" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jRXpoDUzEdyDReAOQiyvOg" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_jRhaoDUzEdyDReAOQiyvOg">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_m35EYDUzEdyDReAOQiyvOg" name="element" type="_XE1_MDUvEdyDReAOQiyvOg"/>
         </ownedOperation>
@@ -5217,18 +4776,12 @@ size must itself be of a limited size that has to be known at creation.</body>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_XB94EDU0EdylmKH0Uq8VaA" name="param_0" type="_XE1_MDUvEdyDReAOQiyvOg" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_YWTNwDU0EdylmKH0Uq8VaA" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YWc-wDU0EdylmKH0Uq8VaA" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_YWc-wTU0EdylmKH0Uq8VaA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_CTesQDUzEdyDReAOQiyvOg" name="last" method="_7z1IIDa6Edyv9PRkTrTu0A">
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_F0HPgDU1EdylmKH0Uq8VaA" name="param_0" type="_XE1_MDUvEdyDReAOQiyvOg" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_HFeJsDU1EdylmKH0Uq8VaA" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HFn6sDU1EdylmKH0Uq8VaA" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HFn6sTU1EdylmKH0Uq8VaA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_DrscYDUzEdyDReAOQiyvOg" name="goFirst" method="_-_iPIDa6Edyv9PRkTrTu0A">
@@ -5263,9 +4816,6 @@ size must itself be of a limited size that has to be known at creation.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_u30q4DadEdyC6dXxO2UOEQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_u3-b4DadEdyC6dXxO2UOEQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_xBz2MDadEdyC6dXxO2UOEQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_MPd0QDUzEdyDReAOQiyvOg" name="BOL" method="_ToGOkDa7Edyv9PRkTrTu0A"/>
@@ -5303,99 +4853,66 @@ size must itself be of a limited size that has to be known at creation.</body>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_gR0CwDaoEdyMZ7r5-upW2A" name="param_0" type="_zOJVcDaeEdyC6dXxO2UOEQ" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gR9zwDaoEdyMZ7r5-upW2A" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gR9zwTaoEdyMZ7r5-upW2A" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_hVK9MDaoEdyMZ7r5-upW2A">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_Kzm0wDaoEdyMZ7r5-upW2A" name="set_beginning" method="_LiAGoDa6Edyv9PRkTrTu0A">
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_4jvVkDaoEdyv9PRkTrTu0A" name="cr_operand" type="_zOJVcDaeEdyC6dXxO2UOEQ">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4kCQgDaoEdyv9PRkTrTu0A" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4kVygDaoEdyv9PRkTrTu0A" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_6lrYIDaoEdyv9PRkTrTu0A">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_Mh4UcDaoEdyMZ7r5-upW2A" name="_endElement" method="_OGEl4Da6Edyv9PRkTrTu0A">
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_iP2AQDapEdyv9PRkTrTu0A" name="param_0" type="_zOJVcDaeEdyC6dXxO2UOEQ" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_iP_xQDapEdyv9PRkTrTu0A" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_iQI7MDapEdyv9PRkTrTu0A" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_jgKYoDapEdyv9PRkTrTu0A">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_NLvw0DaoEdyMZ7r5-upW2A" name="set_endElement" method="_RVM0UDa6Edyv9PRkTrTu0A">
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_F389oDapEdyv9PRkTrTu0A" name="cr_operand" type="_zOJVcDaeEdyC6dXxO2UOEQ">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_F4P4kDapEdyv9PRkTrTu0A" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_F4ZpkDapEdyv9PRkTrTu0A" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_MBWk0DapEdyv9PRkTrTu0A">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_ORpB4DaoEdyMZ7r5-upW2A" name="_current" method="__2PqIDa5Edyv9PRkTrTu0A">
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_wDf9YDapEdyv9PRkTrTu0A" name="param_0" type="_zOJVcDaeEdyC6dXxO2UOEQ" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wDy4UDapEdyv9PRkTrTu0A" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wD8pUDapEdyv9PRkTrTu0A" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_w_Zk8DapEdyv9PRkTrTu0A">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_QxrVsDaoEdyMZ7r5-upW2A" name="set_current" method="_EpXa4Da6Edyv9PRkTrTu0A">
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_5TPDYDapEdyv9PRkTrTu0A" name="cr_operand" type="_zOJVcDaeEdyC6dXxO2UOEQ">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5Th-UDapEdyv9PRkTrTu0A" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5TrvUDapEdyv9PRkTrTu0A" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_6TwsQDapEdyv9PRkTrTu0A">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_SaIhQDaoEdyMZ7r5-upW2A" name="_firstFreeCellule" method="_b9AggDa6Edyv9PRkTrTu0A">
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_DsSh4DaqEdyv9PRkTrTu0A" name="param_0" type="_zOJVcDaeEdyC6dXxO2UOEQ" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Dslc0DaqEdyv9PRkTrTu0A" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DsvN0DaqEdyv9PRkTrTu0A" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_Eh7wcDaqEdyv9PRkTrTu0A">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_ToX2ADaoEdyMZ7r5-upW2A" name="set_firstFreeCellule" method="_dh4zoDa6Edyv9PRkTrTu0A">
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_LADDYDaqEdyv9PRkTrTu0A" name="cr_operand" type="_zOJVcDaeEdyC6dXxO2UOEQ">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_LAfvUDaqEdyv9PRkTrTu0A" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LAo5QDaqEdyv9PRkTrTu0A" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_OElycDaqEdyv9PRkTrTu0A">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_WklIcDaoEdyMZ7r5-upW2A" name="_freeMemory" method="_UDZf8Da6Edyv9PRkTrTu0A">
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_XldrwDaqEdyv9PRkTrTu0A" name="param_0" type="_zOJVcDaeEdyC6dXxO2UOEQ" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XlxNwDaqEdyv9PRkTrTu0A" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Xl6XsDaqEdyv9PRkTrTu0A" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_YbQrUDaqEdyv9PRkTrTu0A">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_YZZ8EDaoEdyMZ7r5-upW2A" name="set_freeMemory" method="_Vc9T4Da6Edyv9PRkTrTu0A">
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_iOT5wDaqEdyv9PRkTrTu0A" name="cr_operand" type="_zOJVcDaeEdyC6dXxO2UOEQ">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_iOdqwDaqEdyv9PRkTrTu0A" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_iOnbwDaqEdyv9PRkTrTu0A" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_jwEncDaqEdyv9PRkTrTu0A">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_aO0lkDaoEdyMZ7r5-upW2A" name="_endOfMemory" method="_X405YDa6Edyv9PRkTrTu0A">
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_iIN30Da1Edyv9PRkTrTu0A" name="param_0" type="_zOJVcDaeEdyC6dXxO2UOEQ" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_iIhZ0Da1Edyv9PRkTrTu0A" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_iIqjwDa1Edyv9PRkTrTu0A" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_jGp2ADa1Edyv9PRkTrTu0A">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_ddN0MDaoEdyMZ7r5-upW2A" name="set_endOfMemory" method="_ZNniEDa6Edyv9PRkTrTu0A">
@@ -5504,9 +5021,6 @@ size must itself be of a limited size that has to be known at creation.</body>
             <ownedParameter xmi:type="uml:Parameter" xmi:id="_GHp8oDagEdyC6dXxO2UOEQ" name="currentList" type="_xxCKcDUuEdyDReAOQiyvOg" direction="out">
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_GH83kDagEdyC6dXxO2UOEQ" name="" value="1"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GIPygDagEdyC6dXxO2UOEQ" name="" value="1"/>
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_KQmvADagEdyC6dXxO2UOEQ">
-                <value xsi:nil="true"/>
-              </defaultValue>
             </ownedParameter>
           </ownedOperation>
           <ownedOperation xmi:type="uml:Operation" xmi:id="_Z_TnEDahEdyC6dXxO2UOEQ" name="getNext"/>
@@ -5657,9 +5171,6 @@ ElType. The type and the number of elements are template parameters.</body>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_NLvhQDbeEdy0Rd6V_tf1-Q" name="el" type="_sd8OUDbdEdy0Rd6V_tf1-Q">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_NMDDQDbeEdy0Rd6V_tf1-Q" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NMMNMDbeEdy0Rd6V_tf1-Q" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_OnPO4DbeEdy0Rd6V_tf1-Q">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_XikLIDbeEdy0Rd6V_tf1-Q" name="getElement" method="_6MJ_4DbfEdy0Rd6V_tf1-Q">
@@ -5676,17 +5187,11 @@ under this index.</body>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_Zd8SsDbeEdy0Rd6V_tf1-Q" name="param_0" type="_sd8OUDbdEdy0Rd6V_tf1-Q" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZeP0sDbeEdy0Rd6V_tf1-Q" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZeY-oDbeEdy0Rd6V_tf1-Q" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_bTXjQDbeEdy0Rd6V_tf1-Q">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_Zh93EDbeEdy0Rd6V_tf1-Q" name="relativeIndex">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_LTZesByeEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZiRZEDbeEdy0Rd6V_tf1-Q" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZiajADbeEdy0Rd6V_tf1-Q" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_d_VaQDbeEdy0Rd6V_tf1-Q">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_p1ESIDbeEdy0Rd6V_tf1-Q" name="number" method="_fDZC0DbfEdy0Rd6V_tf1-Q">
@@ -5697,9 +5202,6 @@ under this index.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_who30DbeEdy0Rd6V_tf1-Q" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_whyBwDbeEdy0Rd6V_tf1-Q" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_xUAI4DbeEdy0Rd6V_tf1-Q">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_795fwDbeEdy0Rd6V_tf1-Q" name="size" method="_grGngDbfEdy0Rd6V_tf1-Q">
@@ -5710,9 +5212,6 @@ under this index.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AWMVsDbfEdy0Rd6V_tf1-Q" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_AWVfoDbfEdy0Rd6V_tf1-Q" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_BMIfMDbfEdy0Rd6V_tf1-Q">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
       </packagedElement>
@@ -5962,9 +5461,6 @@ if (remaining_elements > 0)&#xD;
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_TBzGwDa_Edy_E4ZljVbr-g" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_TB8QsDa_Edy_E4ZljVbr-g" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_T63cwDa_Edy_E4ZljVbr-g">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_sUiWUDa_Edy0gLsbEakL5w" name="get" method="_AT-gQDbAEdy0gLsbEakL5w">
@@ -5974,9 +5470,6 @@ if (remaining_elements > 0)&#xD;
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_uAIVcDa_Edy0gLsbEakL5w" name="param_0" type="_O4b6IDa-Edy_E4ZljVbr-g" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_uAuLUDa_Edy0gLsbEakL5w" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uA38UDa_Edy0gLsbEakL5w" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_u58SUDa_Edy0gLsbEakL5w">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_uEc0wDa_Edy0gLsbEakL5w" name="index">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
@@ -5993,16 +5486,10 @@ matches is returned. If the element cannot be found, -1 is returned.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_I1X5kDbAEdy0gLsbEakL5w" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_I1hDgDbAEdy0gLsbEakL5w" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_LR_F8DbAEdy0gLsbEakL5w">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_Eq75cDbAEdy0gLsbEakL5w" name="entry" type="_O4b6IDa-Edy_E4ZljVbr-g">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ErO0YDbAEdy0gLsbEakL5w" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ErYlYDbAEdy0gLsbEakL5w" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_G0Ld4DbAEdy0gLsbEakL5w">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_b589wDbAEdy0gLsbEakL5w" name="insert" method="_QvTi4DbDEdy0gLsbEakL5w">
@@ -6026,9 +5513,6 @@ matches is returned. If the element cannot be found, -1 is returned.</body>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_0ywqYDbAEdy0gLsbEakL5w" name="entry" type="_O4b6IDa-Edy_E4ZljVbr-g">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0zNWUDbAEdy0gLsbEakL5w" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0zXHUDbAEdy0gLsbEakL5w" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_2vVr0DbAEdy0gLsbEakL5w">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_Ch8-QDbBEdy0gLsbEakL5w" name="eraseValue" method="_S9KhkDbDEdy0gLsbEakL5w">
@@ -6042,9 +5526,6 @@ be found.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_JXmncDbBEdy0gLsbEakL5w" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JXwYcDbBEdy0gLsbEakL5w" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_KgUjADbBEdy0gLsbEakL5w">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_JbLf4DbBEdy0gLsbEakL5w" name="entry" type="_O4b6IDa-Edy_E4ZljVbr-g">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Jbea0DbBEdy0gLsbEakL5w" name="" value="1"/>
@@ -6074,9 +5555,6 @@ Please note that subsequent entries change their position.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_uceL0DbCEdy0gLsbEakL5w" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ucn80DbCEdy0gLsbEakL5w" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_wKAEoDbCEdy0gLsbEakL5w">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_ugyrIDbCEdy0gLsbEakL5w" name="desired_size">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
@@ -6304,9 +5782,6 @@ Incomplete attribute and operation definitions</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_m83KAFF5EdyxP5ejovTmBw" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_m9KE8FF5EdyxP5ejovTmBw" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_oBtSMFF5EdyxP5ejovTmBw">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_skbPcFF5EdyxP5ejovTmBw" name="tryWait" method="_VmxygFF6EdyxP5ejovTmBw">
@@ -6324,9 +5799,6 @@ Incomplete attribute and operation definitions</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_waJj0FF5EdyxP5ejovTmBw" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wadF0FF5EdyxP5ejovTmBw" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_x6kNsFF5EdyxP5ejovTmBw">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_0TcwoFF5EdyxP5ejovTmBw" name="wait" method="_Ty2WwFF6EdyxP5ejovTmBw">
@@ -6345,9 +5817,6 @@ Incomplete attribute and operation definitions</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1Zo8oFF5EdyxP5ejovTmBw" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1Z73kFF5EdyxP5ejovTmBw" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_2jjLAFF5EdyxP5ejovTmBw">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_76k6EFF5EdyxP5ejovTmBw" name="getValue" method="_W5L1kFF6EdyxP5ejovTmBw">
@@ -6358,9 +5827,6 @@ Incomplete attribute and operation definitions</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__TO38FF5EdyxP5ejovTmBw" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__TYo8FF5EdyxP5ejovTmBw" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_BDvMQFF6EdyxP5ejovTmBw">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
       </packagedElement>
@@ -6388,17 +5854,11 @@ directly the pthread barrier.</body>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_IsliIFC4EdyqzLG48ixyqA" name="name" type="_WXH_4DO2EdyG-pUz-bb-Lg">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ItCOEFC4EdyqzLG48ixyqA" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ItLYAFC4EdyqzLG48ixyqA" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_J31NQFC4EdyqzLG48ixyqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_IxM8YFC4EdyqzLG48ixyqA" name="nb">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IxpoUFC4EdyqzLG48ixyqA" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IxzZUFC4EdyqzLG48ixyqA" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_MBXsoFC4EdyqzLG48ixyqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_FQyJoFC4EdyqzLG48ixyqA" name="Barrier"/>
@@ -6406,9 +5866,6 @@ directly the pthread barrier.</body>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_XPBQ0FC4EdyqzLG48ixyqA" name="param_0" type="_WXH_4DO2EdyG-pUz-bb-Lg" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XPUy0FC4EdyqzLG48ixyqA" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XPd8wFC4EdyqzLG48ixyqA" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_X-aGYFC4EdyqzLG48ixyqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_hZUhoFC4EdyqzLG48ixyqA" name="wait">
@@ -6568,9 +6025,6 @@ variant of the barrier (if Posix functions are not available)</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_N-EyMFFuEdyjobZYtXo9NQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_N-N8IFFuEdyjobZYtXo9NQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_P9VUMFFuEdyjobZYtXo9NQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_OATm0FFuEdyjobZYtXo9NQ" name="exclusive">
             <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
@@ -6589,9 +6043,6 @@ variant of the barrier (if Posix functions are not available)</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_d84_UFFuEdyjobZYtXo9NQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_d9MhUFFuEdyjobZYtXo9NQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_fgb1sFFuEdyjobZYtXo9NQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_GNaSQFFuEdyjobZYtXo9NQ" name="take" method="_RgCAkFFvEdyjobZYtXo9NQ">
@@ -6608,9 +6059,6 @@ variant of the barrier (if Posix functions are not available)</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_n7kO8FFuEdyjobZYtXo9NQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_n73J4FFuEdyjobZYtXo9NQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_pFK7UFFuEdyjobZYtXo9NQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_GZx6UFFuEdyjobZYtXo9NQ" name="release" method="_V21owFFvEdyjobZYtXo9NQ">
@@ -6623,16 +6071,10 @@ variant of the barrier (if Posix functions are not available)</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wsvwsFFuEdyjobZYtXo9NQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ws46oFFuEdyjobZYtXo9NQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yIYoQFFuEdyjobZYtXo9NQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_wwdzEFFuEdyjobZYtXo9NQ" name="infoP" direction="inout">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wwxVEFFuEdyjobZYtXo9NQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wxEQAFFuEdyjobZYtXo9NQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_0kjIsFFuEdyjobZYtXo9NQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
       </packagedElement>
@@ -6919,9 +6361,6 @@ PR (&quot;, dump of m_mutexS at 0x&quot; &lt;&lt; pc1 &lt;&lt; &quot;: &quot; &l
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_KoNXsFFwEdyjobZYtXo9NQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KoWhoFFwEdyjobZYtXo9NQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_L9vAMFFwEdyjobZYtXo9NQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_OEl_AFFwEdyjobZYtXo9NQ" name="Mutex" visibility="protected" method="_oFvP4FF0EdyjobZYtXo9NQ">
@@ -6929,18 +6368,12 @@ PR (&quot;, dump of m_mutexS at 0x&quot; &lt;&lt; pc1 &lt;&lt; &quot;: &quot; &l
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_OrME8FFwEdyjobZYtXo9NQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ore_4FFwEdyjobZYtXo9NQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_QKQrAFFwEdyjobZYtXo9NQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_W33LcFFwEdyjobZYtXo9NQ" name="creatEff" visibility="private" method="_s_tPgFF0EdyjobZYtXo9NQ">
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_ZYNBQFFwEdyjobZYtXo9NQ" name="scope" type="_0H3-IBEcEeG3cfLoiI6G7g">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZYf8MFFwEdyjobZYtXo9NQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZYpGIFFwEdyjobZYtXo9NQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_aJ0rcFFwEdyjobZYtXo9NQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_CFHYcFF0EdyjobZYtXo9NQ" name="print" visibility="private" method="_v4CukFF0EdyjobZYtXo9NQ">
@@ -6948,9 +6381,6 @@ PR (&quot;, dump of m_mutexS at 0x&quot; &lt;&lt; pc1 &lt;&lt; &quot;: &quot; &l
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DeXqYFF0EdyjobZYtXo9NQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DehbYFF0EdyjobZYtXo9NQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_FDspcFF0EdyjobZYtXo9NQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
       </packagedElement>
@@ -7026,9 +6456,6 @@ SR_Liste::append()&#xD;
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_lihm4FFhEdyjobZYtXo9NQ" name="mutexPtr" type="_Jj9usFC7EdyqzLG48ixyqA">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_li0h0FFhEdyjobZYtXo9NQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ljHcwFFhEdyjobZYtXo9NQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_m_D2UFFhEdyjobZYtXo9NQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_dnb_oFFhEdyjobZYtXo9NQ" name="CriticalSection" method="_WjY4oFFiEdyjobZYtXo9NQ">
@@ -7038,9 +6465,6 @@ SR_Liste::append()&#xD;
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_u2uWIFFhEdyjobZYtXo9NQ" name="shmPtr" type="_sq-yMFCvEdyqzLG48ixyqA">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_u3LCEFFhEdyjobZYtXo9NQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_u3d9AFFhEdyjobZYtXo9NQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_vr64wFFhEdyjobZYtXo9NQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_du4rcFFhEdyjobZYtXo9NQ" name="CriticalSection" method="_X3u1YFFiEdyjobZYtXo9NQ">
@@ -7395,9 +6819,6 @@ Access can be shared by multiple reades, but there can only be one writer.</body
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_28T7MFF3EdyxP5ejovTmBw" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_28dsMFF3EdyxP5ejovTmBw" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_4eqewFF3EdyxP5ejovTmBw">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_uVHb4FF3EdyxP5ejovTmBw" name="tryWrLock" method="_v3OSYFF4EdyxP5ejovTmBw">
@@ -7405,27 +6826,18 @@ Access can be shared by multiple reades, but there can only be one writer.</body
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5rHDwFF3EdyxP5ejovTmBw" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5rZ-sFF3EdyxP5ejovTmBw" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_69gfwFF3EdyxP5ejovTmBw">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_-EmMgFF3EdyxP5ejovTmBw" name="_rwl" method="_Pus2wFF4EdyxP5ejovTmBw">
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_K9Or0FF4EdyxP5ejovTmBw" name="param_0" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_K9rXwFF4EdyxP5ejovTmBw" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_K9-SsFF4EdyxP5ejovTmBw" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_LtXIQFF4EdyxP5ejovTmBw">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_-N-yAFF3EdyxP5ejovTmBw" name="set_rwl" method="_RLryIFF4EdyxP5ejovTmBw">
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_M0l2EFF4EdyxP5ejovTmBw" name="cr_operand">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_M1B68FF4EdyxP5ejovTmBw" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_M1Vc8FF4EdyxP5ejovTmBw" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_Nlw0UFF4EdyxP5ejovTmBw">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
       </packagedElement>
@@ -7662,9 +7074,6 @@ return result;&#xD;
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_QWlVmfRTEeCUGrV0Hl4JwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_QWlVmPRTEeCUGrV0Hl4JwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_QWlVmvRTEeCUGrV0Hl4JwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_QWlVm_RTEeCUGrV0Hl4JwQ" name="waitUpto" method="_QWlVjvRTEeCUGrV0Hl4JwQ">
@@ -7679,16 +7088,10 @@ return result;&#xD;
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_QWlVn_RTEeCUGrV0Hl4JwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_QWlVnvRTEeCUGrV0Hl4JwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_QWlVoPRTEeCUGrV0Hl4JwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_QWlVofRTEeCUGrV0Hl4JwQ" name="date" type="_FuKEEDj8Edy0Rd6V_tf1-Q">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_QWlVo_RTEeCUGrV0Hl4JwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_QWlVovRTEeCUGrV0Hl4JwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_QWlVpPRTEeCUGrV0Hl4JwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_QWlVpfRTEeCUGrV0Hl4JwQ" name="signal" method="_QWlVj_RTEeCUGrV0Hl4JwQ">
@@ -7701,9 +7104,6 @@ return result;&#xD;
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_QWlVqfRTEeCUGrV0Hl4JwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_QWlVqPRTEeCUGrV0Hl4JwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_QWlVqvRTEeCUGrV0Hl4JwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_QWlVq_RTEeCUGrV0Hl4JwQ" name="broadcast" method="_QWlVkPRTEeCUGrV0Hl4JwQ">
@@ -7715,9 +7115,6 @@ return result;&#xD;
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_QWlVr_RTEeCUGrV0Hl4JwQ" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_QWlVrvRTEeCUGrV0Hl4JwQ" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_QWlVsPRTEeCUGrV0Hl4JwQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
       </packagedElement>
@@ -7800,17 +7197,11 @@ return result;&#xD;
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_8I6RgBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_RCzrUDkAEdy0Rd6V_tf1-Q" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_RC9cUDkAEdy0Rd6V_tf1-Q" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_SEhnADkAEdy0Rd6V_tf1-Q">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_RLwL8DkAEdy0Rd6V_tf1-Q" name="arg">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_8I6RgBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_RMDG4DkAEdy0Rd6V_tf1-Q" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_RMM34DkAEdy0Rd6V_tf1-Q" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_bZUzMDkAEdy0Rd6V_tf1-Q">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
       </packagedElement>
@@ -8220,9 +7611,6 @@ time value for is passed as initial delay.&#xD;
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_BwAqIDkVEdyuzNpSiGPe4w" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_BwJ0EDkVEdyuzNpSiGPe4w" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_EvyN8DkVEdyuzNpSiGPe4w">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_B0oEYDkVEdyuzNpSiGPe4w" name="flags">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
@@ -8259,9 +7647,6 @@ to detect an overload</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_7Z5nMDkVEdyuzNpSiGPe4w" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7aDYMDkVEdyuzNpSiGPe4w" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_8dtNkDkVEdyuzNpSiGPe4w">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_Fh0SYDkWEdyuzNpSiGPe4w" name="sleep" isStatic="true" method="_uuNa4DkZEdyuzNpSiGPe4w">
@@ -8277,9 +7662,6 @@ OS sleep function until the specified time has passed.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_S0Y7sDkWEdyuzNpSiGPe4w" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_S0issDkWEdyuzNpSiGPe4w" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_TngasDkWEdyuzNpSiGPe4w">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_S390IDkWEdyuzNpSiGPe4w" name="duration">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_8heigBydEduyofBvg4RL2w"/>
@@ -8296,16 +7678,10 @@ function shares other properties with the sleep function.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bimpADkWEdyuzNpSiGPe4w" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bivy8DkWEdyuzNpSiGPe4w" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_cVjv8DkWEdyuzNpSiGPe4w">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_blSJkDkWEdyuzNpSiGPe4w" name="date" type="_FuKEEDj8Edy0Rd6V_tf1-Q">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bllEgDkWEdyuzNpSiGPe4w" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_blu1gDkWEdyuzNpSiGPe4w" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_nY790DkWEdyuzNpSiGPe4w">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_Fs12oDkWEdyuzNpSiGPe4w" name="waitPeriodicForZero" isStatic="true" method="_iA4zsDkZEdyuzNpSiGPe4w">
@@ -8321,9 +7697,6 @@ Should be considered as deprecated? (not used)</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1wD0YDkWEdyuzNpSiGPe4w" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1wM-UDkWEdyuzNpSiGPe4w" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_25Eq4DkWEdyuzNpSiGPe4w">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_10YTsDkWEdyuzNpSiGPe4w" name="txt" type="_WXH_4DO2EdyG-pUz-bb-Lg">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_10rOoDkWEdyuzNpSiGPe4w" name="" value="1"/>
@@ -8344,9 +7717,6 @@ Should be considered as deprecated? (not used)</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ec1JADkXEdyuzNpSiGPe4w" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ec-S8DkXEdyuzNpSiGPe4w" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_f0dDQDkXEdyuzNpSiGPe4w">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_efgpkDkXEdyuzNpSiGPe4w" name="finalDate" type="_FuKEEDj8Edy0Rd6V_tf1-Q">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_efzkgDkXEdyuzNpSiGPe4w" name="" value="1"/>
@@ -8355,9 +7725,6 @@ Should be considered as deprecated? (not used)</body>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_eio2EDkXEdyuzNpSiGPe4w" name="remainder" type="_FuKEEDj8Edy0Rd6V_tf1-Q" direction="out">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ei8YEDkXEdyuzNpSiGPe4w" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ejFiADkXEdyuzNpSiGPe4w" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_knbDADkXEdyuzNpSiGPe4w">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
       </packagedElement>
@@ -8777,9 +8144,6 @@ m_sysStartTime += delta;&#xD;
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_DgL_kDkbEdyuzNpSiGPe4w" name="t2" type="_FuKEEDj8Edy0Rd6V_tf1-Q">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DgoEcDkbEdyuzNpSiGPe4w" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Dgx1cDkbEdyuzNpSiGPe4w" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_F4mocDkbEdyuzNpSiGPe4w">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_uKtPwDkaEdyuzNpSiGPe4w" name="TimeVal" method="_8PrJ0DnfEdyuzNpSiGPe4w">
@@ -8790,9 +8154,6 @@ m_sysStartTime += delta;&#xD;
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_LTZesByeEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ly6DsDkbEdyuzNpSiGPe4w" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LzD0sDkbEdyuzNpSiGPe4w" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_NWbr8DkbEdyuzNpSiGPe4w">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_af9uADkbEdyuzNpSiGPe4w" name="setScale" isStatic="true" method="_w4kusDnfEdyuzNpSiGPe4w">
@@ -8800,9 +8161,6 @@ m_sysStartTime += delta;&#xD;
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gFQikDkbEdyuzNpSiGPe4w" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gFaTkDkbEdyuzNpSiGPe4w" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_g5HBYDkbEdyuzNpSiGPe4w">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_5GJNIDkbEdyuzNpSiGPe4w" name="update" method="_DYbVMDngEdyuzNpSiGPe4w">
@@ -8818,9 +8176,6 @@ start of system and can be frozen (useful for debugging)</body>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_EDOlwDkcEdyuzNpSiGPe4w" name="param_0" type="_FuKEEDj8Edy0Rd6V_tf1-Q" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_EDhgsDkcEdyuzNpSiGPe4w" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ED0boDkcEdyuzNpSiGPe4w" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_Fr07QDkcEdyuzNpSiGPe4w">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_JDcXUDkcEdyuzNpSiGPe4w" name="systemTime" isStatic="true" method="_KjRyUDngEdyuzNpSiGPe4w">
@@ -8830,25 +8185,16 @@ start of system and can be frozen (useful for debugging)</body>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_JpcAUDkcEdyuzNpSiGPe4w" name="param_0" type="_FuKEEDj8Edy0Rd6V_tf1-Q" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_JplxUDkcEdyuzNpSiGPe4w" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_JpviUDkcEdyuzNpSiGPe4w" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_LCGcYDkcEdyuzNpSiGPe4w">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_ToY8wDkcEdyuzNpSiGPe4w" name="operator=" method="_N3CpIDngEdyuzNpSiGPe4w">
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_ndW8EDkcEdyuzNpSiGPe4w" name="param_0" type="_FuKEEDj8Edy0Rd6V_tf1-Q" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ndqeEDkcEdyuzNpSiGPe4w" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ndzoADkcEdyuzNpSiGPe4w" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_o-Xb0DkcEdyuzNpSiGPe4w">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_nhPWgDkcEdyuzNpSiGPe4w" name="tv2" type="_FuKEEDj8Edy0Rd6V_tf1-Q">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nhiRcDkcEdyuzNpSiGPe4w" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nhsCcDkcEdyuzNpSiGPe4w" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_tEx3kDkcEdyuzNpSiGPe4w">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_TuMp0DkcEdyuzNpSiGPe4w" name="operator+=" method="_QJOuMDngEdyuzNpSiGPe4w">
@@ -8858,32 +8204,20 @@ start of system and can be frozen (useful for debugging)</body>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_1jVYQDkcEdyuzNpSiGPe4w" name="param_0" type="_FuKEEDj8Edy0Rd6V_tf1-Q" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1joTMDkcEdyuzNpSiGPe4w" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1jxdIDkcEdyuzNpSiGPe4w" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_3mdtoDkcEdyuzNpSiGPe4w">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_1lt94DkcEdyuzNpSiGPe4w" name="incr" type="_FuKEEDj8Edy0Rd6V_tf1-Q">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1mA40DkcEdyuzNpSiGPe4w" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1mKCwDkcEdyuzNpSiGPe4w" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_6v7Y8DkcEdyuzNpSiGPe4w">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_T05uwDkcEdyuzNpSiGPe4w" name="operator-=" method="_S_fJoDngEdyuzNpSiGPe4w">
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_8FwjcDkcEdyuzNpSiGPe4w" name="param_0" type="_FuKEEDj8Edy0Rd6V_tf1-Q" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8GDeYDkcEdyuzNpSiGPe4w" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8GMoUDkcEdyuzNpSiGPe4w" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_90xC8DkcEdyuzNpSiGPe4w">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_8JVb4DkcEdyuzNpSiGPe4w" name="incr" type="_FuKEEDj8Edy0Rd6V_tf1-Q">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8JoW0DkcEdyuzNpSiGPe4w" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8JxgwDkcEdyuzNpSiGPe4w" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="__aY88DkcEdyuzNpSiGPe4w">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_T6uC4DkcEdyuzNpSiGPe4w" name="operator+" method="_WfnogDngEdyuzNpSiGPe4w">
@@ -8893,32 +8227,20 @@ start of system and can be frozen (useful for debugging)</body>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_EgukoDkdEdyuzNpSiGPe4w" name="param_0" type="_FuKEEDj8Edy0Rd6V_tf1-Q" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_EhBfkDkdEdyuzNpSiGPe4w" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EhLQkDkdEdyuzNpSiGPe4w" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_Gt18cDkdEdyuzNpSiGPe4w">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_EkwJADkdEdyuzNpSiGPe4w" name="tv2" type="_FuKEEDj8Edy0Rd6V_tf1-Q">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ElDD8DkdEdyuzNpSiGPe4w" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ElM08DkdEdyuzNpSiGPe4w" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_L8Yd4DkdEdyuzNpSiGPe4w">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_T_yJEDkcEdyuzNpSiGPe4w" name="operator-" method="_Y0WEMDngEdyuzNpSiGPe4w">
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_ZgFTcDkdEdyuzNpSiGPe4w" name="param_0" type="_FuKEEDj8Edy0Rd6V_tf1-Q" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZgY1cDkdEdyuzNpSiGPe4w" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Zgh_YDkdEdyuzNpSiGPe4w" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_bFt0gDkdEdyuzNpSiGPe4w">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_ZsKAkDkdEdyuzNpSiGPe4w" name="tv2" type="_FuKEEDj8Edy0Rd6V_tf1-Q">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Zsc7gDkdEdyuzNpSiGPe4w" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZsmsgDkdEdyuzNpSiGPe4w" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_b3fPsDkdEdyuzNpSiGPe4w">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_UDgLcDkcEdyuzNpSiGPe4w" name="operator&lt;" method="_bE5KgDngEdyuzNpSiGPe4w">
@@ -8929,16 +8251,10 @@ start of system and can be frozen (useful for debugging)</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_lnjbkDkdEdyuzNpSiGPe4w" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lnslgDkdEdyuzNpSiGPe4w" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_nDMTIDkdEdyuzNpSiGPe4w">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_lppGQDkdEdyuzNpSiGPe4w" name="tv2" type="_FuKEEDj8Edy0Rd6V_tf1-Q">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_lpyQMDkdEdyuzNpSiGPe4w" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lp8BMDkdEdyuzNpSiGPe4w" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_oqKQ8DkdEdyuzNpSiGPe4w">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_UKNQYDkcEdyuzNpSiGPe4w" name="operator&lt;=" method="_ds2EMDngEdyuzNpSiGPe4w">
@@ -8946,16 +8262,10 @@ start of system and can be frozen (useful for debugging)</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_pDWNADkdEdyuzNpSiGPe4w" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_pDf-ADkdEdyuzNpSiGPe4w" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_qcnGADkdEdyuzNpSiGPe4w">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_pFuyoDkdEdyuzNpSiGPe4w" name="tv2" type="_FuKEEDj8Edy0Rd6V_tf1-Q">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_pF4joDkdEdyuzNpSiGPe4w" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_pGLekDkdEdyuzNpSiGPe4w" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_sjddwDkdEdyuzNpSiGPe4w">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_UPk4kDkcEdyuzNpSiGPe4w" name="operator==" method="_gKXPgDngEdyuzNpSiGPe4w">
@@ -8963,16 +8273,10 @@ start of system and can be frozen (useful for debugging)</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_tBtgADkdEdyuzNpSiGPe4w" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tB3RADkdEdyuzNpSiGPe4w" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_vJ6ioDkdEdyuzNpSiGPe4w">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_tPIQ8DkdEdyuzNpSiGPe4w" name="tv2" type="_FuKEEDj8Edy0Rd6V_tf1-Q">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_tPbL4DkdEdyuzNpSiGPe4w" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tPkV0DkdEdyuzNpSiGPe4w" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_v3gocDkdEdyuzNpSiGPe4w">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_UVFqsDkcEdyuzNpSiGPe4w" name="operator!=" method="_hsa4IDngEdyuzNpSiGPe4w">
@@ -8980,16 +8284,10 @@ start of system and can be frozen (useful for debugging)</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wSoeMDkdEdyuzNpSiGPe4w" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wSxoIDkdEdyuzNpSiGPe4w" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_xrl1MDkdEdyuzNpSiGPe4w">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_wVT-wDkdEdyuzNpSiGPe4w" name="tv2" type="_FuKEEDj8Edy0Rd6V_tf1-Q">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wVm5sDkdEdyuzNpSiGPe4w" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wV6bsDkdEdyuzNpSiGPe4w" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_yXstQDkdEdyuzNpSiGPe4w">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_UcFqkDkcEdyuzNpSiGPe4w" name="operator>=" method="_kAi24DngEdyuzNpSiGPe4w">
@@ -8997,16 +8295,10 @@ start of system and can be frozen (useful for debugging)</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yqLkYDkdEdyuzNpSiGPe4w" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yqefUDkdEdyuzNpSiGPe4w" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_0I8ocDkdEdyuzNpSiGPe4w">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_y4CaMDkdEdyuzNpSiGPe4w" name="tv2" type="_FuKEEDj8Edy0Rd6V_tf1-Q">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_y4VVIDkdEdyuzNpSiGPe4w" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_y4fGIDkdEdyuzNpSiGPe4w" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_006WkDkdEdyuzNpSiGPe4w">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_Us7i8DkcEdyuzNpSiGPe4w" name="operator>" method="_l4NjIDngEdyuzNpSiGPe4w">
@@ -9014,16 +8306,10 @@ start of system and can be frozen (useful for debugging)</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1KEuQDkdEdyuzNpSiGPe4w" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1KN4MDkdEdyuzNpSiGPe4w" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_2bItgDkdEdyuzNpSiGPe4w">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_1MAn8DkdEdyuzNpSiGPe4w" name="tv2" type="_FuKEEDj8Edy0Rd6V_tf1-Q">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1MTi4DkdEdyuzNpSiGPe4w" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1MdT4DkdEdyuzNpSiGPe4w" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_3BSHgDkdEdyuzNpSiGPe4w">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_9jMDYDkfEdyuzNpSiGPe4w" name="ticks" method="_6wgAoDngEdyuzNpSiGPe4w">
@@ -9034,9 +8320,6 @@ start of system and can be frozen (useful for debugging)</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_8heigBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_J1F54DkgEdyuzNpSiGPe4w" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_J1PD0DkgEdyuzNpSiGPe4w" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_K-aSYDkgEdyuzNpSiGPe4w">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_9xV0IDkfEdyuzNpSiGPe4w" name="hasPassed" method="_p94_EDngEdyuzNpSiGPe4w">
@@ -9050,9 +8333,6 @@ represents this deadline.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_b_2aIDkgEdyuzNpSiGPe4w" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_cAALIDkgEdyuzNpSiGPe4w" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_dXUjYDkgEdyuzNpSiGPe4w">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_hArPsDkgEdyuzNpSiGPe4w" name="getSec" method="_Ogz2kDkqEdyuzNpSiGPe4w">
@@ -9060,9 +8340,6 @@ represents this deadline.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_8heigBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_rwrOkDkgEdyuzNpSiGPe4w" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rw0_kDkgEdyuzNpSiGPe4w" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_sdiUkDkgEdyuzNpSiGPe4w">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_hIbdgDkgEdyuzNpSiGPe4w" name="getUsec" method="_PxIO8DkqEdyuzNpSiGPe4w">
@@ -9070,9 +8347,6 @@ represents this deadline.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_8heigBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_sw58gDkgEdyuzNpSiGPe4w" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sxM3cDkgEdyuzNpSiGPe4w" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_thVT4DkgEdyuzNpSiGPe4w">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_hPbdYDkgEdyuzNpSiGPe4w" name="getNsec" method="_R1moIDkqEdyuzNpSiGPe4w">
@@ -9080,9 +8354,6 @@ represents this deadline.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_8heigBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_t_SbMDkgEdyuzNpSiGPe4w" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_t_blIDkgEdyuzNpSiGPe4w" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_uu0asDkgEdyuzNpSiGPe4w">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_hWSTUDkgEdyuzNpSiGPe4w" name="setSec" method="_TkLCwDkqEdyuzNpSiGPe4w">
@@ -9116,9 +8387,6 @@ represents this deadline.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0L4RkDkmEdyuzNpSiGPe4w" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0MBbgDkmEdyuzNpSiGPe4w" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_07aREDkmEdyuzNpSiGPe4w">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_rCsfgDkmEdyuzNpSiGPe4w" name="sysStartTime" isStatic="true" method="_YQSzoDkqEdyuzNpSiGPe4w">
@@ -9135,9 +8403,6 @@ represents this deadline.</body>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_XTwaQDknEdyuzNpSiGPe4w" name="delta" type="_FuKEEDj8Edy0Rd6V_tf1-Q">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XUD8QDknEdyuzNpSiGPe4w" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XUNGMDknEdyuzNpSiGPe4w" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_ZMT3UDknEdyuzNpSiGPe4w">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <nestedClassifier xmi:type="uml:Class" xmi:id="_vZD1EFKWEd-OfYmxqPWG5g" name="timespec"/>
@@ -9207,9 +8472,6 @@ Example:&#xD;
           <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__z-6sFIgEdy7g9CjxdN7jw" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__0IrsFIgEdy7g9CjxdN7jw" value="1"/>
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_CJmHMFIhEdy7g9CjxdN7jw">
-            <value xsi:nil="true"/>
-          </defaultValue>
         </ownedAttribute>
         <ownedAttribute xmi:type="uml:Property" xmi:id="_JByHAFIhEdy7g9CjxdN7jw" name="m_prt" visibility="protected" type="_Fqa9QDUPEdy0feurbW0fyQ" isUnique="false" association="_JBoWAFIhEdy7g9CjxdN7jw">
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Lf4hIFIhEdy7g9CjxdN7jw"/>
@@ -9253,9 +8515,6 @@ Example:&#xD;
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_tDcpUFIfEdy7g9CjxdN7jw" name="f" type="_5InEkFGAEdyxP5ejovTmBw">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_tD5VQFIfEdy7g9CjxdN7jw" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tEMQMFIfEdy7g9CjxdN7jw" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_uUD8oFIfEdy7g9CjxdN7jw">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_oFTUUFIfEdy7g9CjxdN7jw" name="Trace"/>
@@ -9274,9 +8533,6 @@ Example:&#xD;
             <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WE7CoFIgEdy7g9CjxdN7jw" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WFN9kFIgEdy7g9CjxdN7jw" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_XzL7QFIgEdy7g9CjxdN7jw">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_dlyMAFIgEdy7g9CjxdN7jw" name="setStatus">
@@ -9288,18 +8544,12 @@ Example:&#xD;
             <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nFm8cFIgEdy7g9CjxdN7jw" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nF6ecFIgEdy7g9CjxdN7jw" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_oZp-QFIgEdy7g9CjxdN7jw">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_qIrE0FIgEdy7g9CjxdN7jw" name="setTraceMark" isStatic="true" method="_g2fSUFIhEdy7g9CjxdN7jw">
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_vzhHwFIgEdy7g9CjxdN7jw" name="traceMark" type="_WXH_4DO2EdyG-pUz-bb-Lg">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_vz9zsFIgEdy7g9CjxdN7jw" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_v0HksFIgEdy7g9CjxdN7jw" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_w0yXgFIgEdy7g9CjxdN7jw">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_7hM24FIgEdy7g9CjxdN7jw" name="Trace" visibility="protected"/>
@@ -9492,9 +8742,6 @@ It is possible to add, substract or setup flags.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_tmuOYFGDEdy2j6DfRsavvw" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tm3YUFGDEdy2j6DfRsavvw" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_wUeOEFGDEdy2j6DfRsavvw">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_tpG0AFGDEdy2j6DfRsavvw" name="f" type="_QhlWIFGBEdyxP5ejovTmBw">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_tpjf8FGDEdy2j6DfRsavvw" name="" value="1"/>
@@ -9506,64 +8753,40 @@ It is possible to add, substract or setup flags.</body>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_1NGJ4FGDEdy2j6DfRsavvw" name="ret" type="_QhlWIFGBEdyxP5ejovTmBw" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1Ni10FGDEdy2j6DfRsavvw" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1N1wwFGDEdy2j6DfRsavvw" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_4rbR8FGDEdy2j6DfRsavvw">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_1PxqcFGDEdy2j6DfRsavvw" name="f" type="_QhlWIFGBEdyxP5ejovTmBw">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1QOWYFGDEdy2j6DfRsavvw" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1QhRUFGDEdy2j6DfRsavvw" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="__VTI8FGDEdy2j6DfRsavvw">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_IcxgQFGDEdyxP5ejovTmBw" name="sub" isStatic="true" method="_6bhu4FGJEdy7g9CjxdN7jw">
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_2X5wIFGDEdy2j6DfRsavvw" name="ret" type="_QhlWIFGBEdyxP5ejovTmBw" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2YMrEFGDEdy2j6DfRsavvw" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2YfmAFGDEdy2j6DfRsavvw" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_5qwA8FGDEdy2j6DfRsavvw">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_2ZY94FGDEdy2j6DfRsavvw" name="f" type="_QhlWIFGBEdyxP5ejovTmBw">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Z1p0FGDEdy2j6DfRsavvw" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2aIkwFGDEdy2j6DfRsavvw" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_Ao5e0FGEEdy2j6DfRsavvw">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_IiSSYFGDEdyxP5ejovTmBw" name="setUp" isStatic="true" method="_70o24FGJEdy7g9CjxdN7jw">
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_2y304FGDEdy2j6DfRsavvw" name="ret" type="_QhlWIFGBEdyxP5ejovTmBw" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2zKv0FGDEdy2j6DfRsavvw" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2znbwFGDEdy2j6DfRsavvw" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_7BB3YFGDEdy2j6DfRsavvw">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_20N4sFGDEdy2j6DfRsavvw" name="f" type="_QhlWIFGBEdyxP5ejovTmBw">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_20p9kFGDEdy2j6DfRsavvw" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_209fkFGDEdy2j6DfRsavvw" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_B1o-wFGEEdy2j6DfRsavvw">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_IoGmgFGDEdyxP5ejovTmBw" name="setUpStr" isStatic="true" method="_89D3gFGJEdy7g9CjxdN7jw">
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_3JhaUFGDEdy2j6DfRsavvw" name="ret" type="_QhlWIFGBEdyxP5ejovTmBw" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_3J-GQFGDEdy2j6DfRsavvw" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3KHQMFGDEdy2j6DfRsavvw" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_8QwZ4FGDEdy2j6DfRsavvw">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_3K3eIFGDEdy2j6DfRsavvw" name="fStr" type="_WXH_4DO2EdyG-pUz-bb-Lg">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_3LTjAFGDEdy2j6DfRsavvw" name="" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3LnFAFGDEdy2j6DfRsavvw" name="" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_ENoJ0FGEEdy2j6DfRsavvw">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
       </packagedElement>
@@ -9677,18 +8900,6 @@ storage - who cannot be defined in the superclass - are defined here.</body>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_dbR1AF3HEd-12d_h0i1xhQ" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dbbmAF3HEd-12d_h0i1xhQ" value="1"/>
         </ownedAttribute>
-        <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_LHPSoDUMEdy0feurbW0fyQ" name="operator&lt;&lt;">
-          <language>C/C++</language>
-          <body>msg &lt;&lt; (const BString &amp;) bstr;&#xD;
-return msg;&#xD;
-</body>
-        </ownedBehavior>
-        <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_UTZgMDUMEdy0feurbW0fyQ" name="operator>>">
-          <language>C/C++</language>
-          <body>msg >> (BString &amp;) bstr;&#xD;
-return msg;&#xD;
-</body>
-        </ownedBehavior>
         <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_4qQkgDUMEdy0feurbW0fyQ" name="BStringT " specification="_m2Mk4DR7EdypGbuyt3_DaA">
           <language>C/C++</language>
           <body>charTable = m_charStorage;&#xD;
@@ -9794,9 +9005,6 @@ inserts a default copy constructor.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WzOJIDR-Edy0feurbW0fyQ" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WzX6IDR-Edy0feurbW0fyQ" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_WzX6ITR-Edy0feurbW0fyQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
       </packagedElement>
@@ -10635,9 +9843,6 @@ its own copy constructor.</body>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_o4Q9YDRGEdyG-pUz-bb-Lg" name="dummy" type="_WXH_4DO2EdyG-pUz-bb-Lg">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_x3dF8DRGEdyG-pUz-bb-Lg" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_x3m28DRGEdyG-pUz-bb-Lg" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_x3wn8DRGEdyG-pUz-bb-Lg">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_E8CKIDRHEdyG-pUz-bb-Lg" name="BString" method="_6eG5QDRzEdypGbuyt3_DaA">
@@ -10652,9 +9857,6 @@ parameter.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_cjyekDRHEdyG-pUz-bb-Lg" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_cjyekTRHEdyG-pUz-bb-Lg" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_cj7ogDRHEdyG-pUz-bb-Lg">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_sBF6EDRHEdyG-pUz-bb-Lg" name="operator=" method="_Av_uEDR0EdypGbuyt3_DaA">
@@ -10662,18 +9864,12 @@ parameter.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xoXroDRHEdyG-pUz-bb-Lg" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xog1kDRHEdyG-pUz-bb-Lg" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_xog1kTRHEdyG-pUz-bb-Lg">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_0h42cDRHEdyG-pUz-bb-Lg" name="operator=" method="_DpE0ADR0EdypGbuyt3_DaA">
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_2Do9EDRHEdyG-pUz-bb-Lg" name="bString" type="_WXH_4DO2EdyG-pUz-bb-Lg">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_45cFgDRHEdyG-pUz-bb-Lg" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_45l2gDRHEdyG-pUz-bb-Lg" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_45l2gTRHEdyG-pUz-bb-Lg">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_ABbb4DRIEdyG-pUz-bb-Lg" name="operator+=" method="_G7e_8DR0EdypGbuyt3_DaA">
@@ -10681,9 +9877,6 @@ parameter.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_8I6RgBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_E_IE8DRIEdyG-pUz-bb-Lg" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_E_RO4DRIEdyG-pUz-bb-Lg" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_E_RO4TRIEdyG-pUz-bb-Lg">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_La2yQDRIEdyG-pUz-bb-Lg" name="operator+=" method="_KFPmMDR0EdypGbuyt3_DaA">
@@ -10691,9 +9884,6 @@ parameter.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Yg6CgDRIEdyG-pUz-bb-Lg" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Yg6CgTRIEdyG-pUz-bb-Lg" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_YhDzgDRIEdyG-pUz-bb-Lg">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_dH9GIDRIEdyG-pUz-bb-Lg" name="operator+=" method="_QmynoDR0EdypGbuyt3_DaA">
@@ -10701,18 +9891,12 @@ parameter.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_h0hi8DRIEdyG-pUz-bb-Lg" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_h0qs4DRIEdyG-pUz-bb-Lg" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_h0qs4TRIEdyG-pUz-bb-Lg">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_lWbjcDRIEdyG-pUz-bb-Lg" name="operator+=" method="_UA8aUDR0EdypGbuyt3_DaA">
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_nIuAcDRIEdyG-pUz-bb-Lg" name="bStr2" type="_WXH_4DO2EdyG-pUz-bb-Lg">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_rM5nkDRIEdyG-pUz-bb-Lg" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rNDYkDRIEdyG-pUz-bb-Lg" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_rNDYkTRIEdyG-pUz-bb-Lg">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_yR57YDRIEdyG-pUz-bb-Lg" name="operator+=" method="_XuBwEDR0EdypGbuyt3_DaA">
@@ -10720,9 +9904,6 @@ parameter.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2_8-4DRIEdyG-pUz-bb-Lg" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3AGv4DRIEdyG-pUz-bb-Lg" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_3FUnEDRIEdyG-pUz-bb-Lg">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_-YxmkDRIEdyG-pUz-bb-Lg" name="operator+=" method="_abCI4DR0EdypGbuyt3_DaA">
@@ -10730,9 +9911,6 @@ parameter.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_8heigBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_CnPLEDRJEdyG-pUz-bb-Lg" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Csv9MDRJEdyG-pUz-bb-Lg" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_Csv9MTRJEdyG-pUz-bb-Lg">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_F4T6QDRJEdyG-pUz-bb-Lg" name="operator+=" method="_dWfNYDR0EdypGbuyt3_DaA">
@@ -10740,9 +9918,6 @@ parameter.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_6j0jABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IFkcADRJEdyG-pUz-bb-Lg" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IFuNADRJEdyG-pUz-bb-Lg" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_IF3-ADRJEdyG-pUz-bb-Lg">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_IS_M8DRJEdyG-pUz-bb-Lg" name="operator+=" method="_fnVOoDR0EdypGbuyt3_DaA">
@@ -10750,9 +9925,6 @@ parameter.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7W3wkBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_L9rWADRJEdyG-pUz-bb-Lg" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L91HADRJEdyG-pUz-bb-Lg" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_L91HATRJEdyG-pUz-bb-Lg">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_RAcsUDRJEdyG-pUz-bb-Lg" name="operator+=" method="_ho1MUDR0EdypGbuyt3_DaA">
@@ -10760,9 +9932,6 @@ parameter.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_LTZesByeEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Tl2oUDRJEdyG-pUz-bb-Lg" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_TmAZUDRJEdyG-pUz-bb-Lg" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_TmAZUTRJEdyG-pUz-bb-Lg">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_V-mBUDRJEdyG-pUz-bb-Lg" name="operator+=" method="_lFhVoDR0EdypGbuyt3_DaA">
@@ -10770,9 +9939,6 @@ parameter.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_a1wZUByeEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZDShYDRJEdyG-pUz-bb-Lg" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZIqJkDRJEdyG-pUz-bb-Lg" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_ZIzTgDRJEdyG-pUz-bb-Lg">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_nyaBMDRJEdyG-pUz-bb-Lg" name="operator&lt;&lt;" method="_20RkgFIJEd-OfYmxqPWG5g">
@@ -10780,16 +9946,10 @@ parameter.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_8I6RgBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_rkZsIDRJEdyG-pUz-bb-Lg" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rkjdIDRJEdyG-pUz-bb-Lg" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_rktOIDRJEdyG-pUz-bb-Lg">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_xw1XMDRfEdyDwaY3iUxzzA" name="ret" type="_WXH_4DO2EdyG-pUz-bb-Lg" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_zW59IDRfEdyDwaY3iUxzzA" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zXDuIDRfEdyDwaY3iUxzzA" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_zXM4EDRfEdyDwaY3iUxzzA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_uTyqkDRJEdyG-pUz-bb-Lg" name="operator&lt;&lt;" method="_7piDQFIJEd-OfYmxqPWG5g">
@@ -10797,16 +9957,10 @@ parameter.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_74GkIDRJEdyG-pUz-bb-Lg" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_74GkITRJEdyG-pUz-bb-Lg" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_74GkIjRJEdyG-pUz-bb-Lg">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_XVuW4DRKEdyG-pUz-bb-Lg" name="ret" type="_WXH_4DO2EdyG-pUz-bb-Lg" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZWetsDRKEdyG-pUz-bb-Lg" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZWn3oDRKEdyG-pUz-bb-Lg" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_ZWxooDRKEdyG-pUz-bb-Lg">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_xfysgDRJEdyG-pUz-bb-Lg" name="operator&lt;&lt;" method="_ABuLgFIKEd-OfYmxqPWG5g">
@@ -10814,16 +9968,10 @@ parameter.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9cPQYDRJEdyG-pUz-bb-Lg" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9cZBYDRJEdyG-pUz-bb-Lg" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_9ciLUDRJEdyG-pUz-bb-Lg">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_aL0aQDRKEdyG-pUz-bb-Lg" name="ret" type="_WXH_4DO2EdyG-pUz-bb-Lg" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bxc7UDRKEdyG-pUz-bb-Lg" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bxmsUDRKEdyG-pUz-bb-Lg" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_bxv2QDRKEdyG-pUz-bb-Lg">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_xsnAgDRJEdyG-pUz-bb-Lg" name="operator&lt;&lt;" method="_CInmkFIKEd-OfYmxqPWG5g">
@@ -10831,16 +9979,10 @@ parameter.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-5htwDRJEdyG-pUz-bb-Lg" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-5q3sDRJEdyG-pUz-bb-Lg" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_-50osDRJEdyG-pUz-bb-Lg">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_ctWi4DRKEdyG-pUz-bb-Lg" name="ret" type="_WXH_4DO2EdyG-pUz-bb-Lg" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_esnE4DRKEdyG-pUz-bb-Lg" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_esnE4TRKEdyG-pUz-bb-Lg" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_esw14DRKEdyG-pUz-bb-Lg">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_x1P_IDRJEdyG-pUz-bb-Lg" name="operator&lt;&lt;" method="_DEVn8FIKEd-OfYmxqPWG5g">
@@ -10848,16 +9990,10 @@ parameter.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_8heigBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AiR0QDRKEdyG-pUz-bb-Lg" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_AiblQDRKEdyG-pUz-bb-Lg" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_AiblQTRKEdyG-pUz-bb-Lg">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_fMgF4DRKEdyG-pUz-bb-Lg" name="ret" type="_WXH_4DO2EdyG-pUz-bb-Lg" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gboLcDRKEdyG-pUz-bb-Lg" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ghI9kDRKEdyG-pUz-bb-Lg" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_ghI9kTRKEdyG-pUz-bb-Lg">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_x8tSADRJEdyG-pUz-bb-Lg" name="operator&lt;&lt;" method="_GQ_KIFIKEd-OfYmxqPWG5g">
@@ -10865,16 +10001,10 @@ parameter.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_LTZesByeEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DlV8oDRKEdyG-pUz-bb-Lg" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DlfGkDRKEdyG-pUz-bb-Lg" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_Dlo3kDRKEdyG-pUz-bb-Lg">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_g3MtIDRKEdyG-pUz-bb-Lg" name="ret" type="_WXH_4DO2EdyG-pUz-bb-Lg" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_iEiC8DRKEdyG-pUz-bb-Lg" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_iErz8DRKEdyG-pUz-bb-Lg" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_iErz8TRKEdyG-pUz-bb-Lg">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_yJ0g8DRJEdyG-pUz-bb-Lg" name="operator&lt;&lt;" method="_HzZYEFIKEd-OfYmxqPWG5g">
@@ -10882,16 +10012,10 @@ parameter.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_a1wZUByeEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_E3mOsDRKEdyG-pUz-bb-Lg" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_E3vYoDRKEdyG-pUz-bb-Lg" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_E3vYoTRKEdyG-pUz-bb-Lg">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_ienW4DRKEdyG-pUz-bb-Lg" name="ret" type="_WXH_4DO2EdyG-pUz-bb-Lg" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_jwkuADRKEdyG-pUz-bb-Lg" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jwkuATRKEdyG-pUz-bb-Lg" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_jwt38DRKEdyG-pUz-bb-Lg">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_yQhl4DRJEdyG-pUz-bb-Lg" name="operator&lt;&lt;" method="_f_XoEDRcEdyDwaY3iUxzzA">
@@ -10899,16 +10023,10 @@ parameter.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_6j0jABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_GRmukDRKEdyG-pUz-bb-Lg" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GRv4gDRKEdyG-pUz-bb-Lg" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_GRv4gTRKEdyG-pUz-bb-Lg">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_kFSZwDRKEdyG-pUz-bb-Lg" name="ret" type="_WXH_4DO2EdyG-pUz-bb-Lg" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_lv1QADRKEdyG-pUz-bb-Lg" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lv-Z8DRKEdyG-pUz-bb-Lg" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_lwIK8DRKEdyG-pUz-bb-Lg">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_yXOq0DRJEdyG-pUz-bb-Lg" name="operator&lt;&lt;" method="_KuP_oFIKEd-OfYmxqPWG5g">
@@ -10916,32 +10034,20 @@ parameter.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7W3wkBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_HV2Z0DRKEdyG-pUz-bb-Lg" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HWAK0DRKEdyG-pUz-bb-Lg" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_HWJUwDRKEdyG-pUz-bb-Lg">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_mGLTcDRKEdyG-pUz-bb-Lg" name="ret" type="_WXH_4DO2EdyG-pUz-bb-Lg" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nVKPEDRKEdyG-pUz-bb-Lg" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nVUAEDRKEdyG-pUz-bb-Lg" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_nVUAETRKEdyG-pUz-bb-Lg">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_yjTX8DRJEdyG-pUz-bb-Lg" name="operator&lt;&lt;" method="_MhuvcFIKEd-OfYmxqPWG5g">
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_5al_4DRJEdyG-pUz-bb-Lg" name="bStr" type="_WXH_4DO2EdyG-pUz-bb-Lg">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Kw5kYDRKEdyG-pUz-bb-Lg" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KxDVYDRKEdyG-pUz-bb-Lg" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_KxDVYTRKEdyG-pUz-bb-Lg">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_nv1Y4DRKEdyG-pUz-bb-Lg" name="ret" type="_WXH_4DO2EdyG-pUz-bb-Lg" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_pIf08DRKEdyG-pUz-bb-Lg" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_pIo-4DRKEdyG-pUz-bb-Lg" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_pIo-4TRKEdyG-pUz-bb-Lg">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_8OaV4DRKEdyG-pUz-bb-Lg" name="concat" method="_voCAMDR2EdypGbuyt3_DaA">
@@ -10949,17 +10055,11 @@ parameter.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A8eAcDRLEdyG-pUz-bb-Lg" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A8eAcTRLEdyG-pUz-bb-Lg" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_A8nKYDRLEdyG-pUz-bb-Lg">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="__nOr0DRKEdyG-pUz-bb-Lg" name="size">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_LTZesByeEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ChWTkDRLEdyG-pUz-bb-Lg" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ChWTkTRLEdyG-pUz-bb-Lg" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_ChWTkjRLEdyG-pUz-bb-Lg">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_Z9YpwDRXEdy1p4IpsoZYqA" name="operator>>" method="_MNjhEDR1EdypGbuyt3_DaA">
@@ -10973,119 +10073,77 @@ position (see get/setPosition)</body>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_giLzgDRXEdy1p4IpsoZYqA" name="param_0" type="_WXH_4DO2EdyG-pUz-bb-Lg" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_j4dy0DRXEdy1p4IpsoZYqA" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_j4dy0TRXEdy1p4IpsoZYqA" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_j4nj0DRXEdy1p4IpsoZYqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_zmS9oDRXEdy1p4IpsoZYqA" name="c" direction="inout">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_3lQtkDRXEdy1p4IpsoZYqA" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3lZ3gDRXEdy1p4IpsoZYqA" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_3ljogDRXEdy1p4IpsoZYqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_aIaOADRXEdy1p4IpsoZYqA" name="operator>>" method="_P0Yd0DR1EdypGbuyt3_DaA">
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_kTb3kDRXEdy1p4IpsoZYqA" name="param_0" type="_WXH_4DO2EdyG-pUz-bb-Lg" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_l2-G4DRXEdy1p4IpsoZYqA" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_l3H34DRXEdy1p4IpsoZYqA" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_l3Ro4DRXEdy1p4IpsoZYqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_z-lh0DRXEdy1p4IpsoZYqA" name="d" direction="inout">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_6j0jABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5dzjkDRXEdy1p4IpsoZYqA" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5d9UkDRXEdy1p4IpsoZYqA" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_5eHFkDRXEdy1p4IpsoZYqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_aOg2ADRXEdy1p4IpsoZYqA" name="operator>>" method="_WQ2yADR1EdypGbuyt3_DaA">
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_m0EoUDRXEdy1p4IpsoZYqA" name="param_0" type="_WXH_4DO2EdyG-pUz-bb-Lg" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_oXm3oDRXEdy1p4IpsoZYqA" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_oXwooDRXEdy1p4IpsoZYqA" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_oXwooTRXEdy1p4IpsoZYqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_0RNi4DRXEdy1p4IpsoZYqA" name="f" direction="inout">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7W3wkBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_6lMCYDRXEdy1p4IpsoZYqA" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_6lVMUDRXEdy1p4IpsoZYqA" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_6louUDRXEdy1p4IpsoZYqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_aU7AADRXEdy1p4IpsoZYqA" name="operator>>" method="_ZbW_IDR1EdypGbuyt3_DaA">
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_orbLgDRXEdy1p4IpsoZYqA" name="param_0" type="_WXH_4DO2EdyG-pUz-bb-Lg" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_p0cpEDRXEdy1p4IpsoZYqA" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_p0lzADRXEdy1p4IpsoZYqA" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_p0lzATRXEdy1p4IpsoZYqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_0ku70DRXEdy1p4IpsoZYqA" name="i" direction="inout">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8WlHgDRXEdy1p4IpsoZYqA" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8Wu4gDRXEdy1p4IpsoZYqA" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_8W4pgDRXEdy1p4IpsoZYqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_aavUIDRXEdy1p4IpsoZYqA" name="operator>>" method="_ct68EDR1EdypGbuyt3_DaA">
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_qoJW4DRXEdy1p4IpsoZYqA" name="param_0" type="_WXH_4DO2EdyG-pUz-bb-Lg" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s9docDRXEdy1p4IpsoZYqA" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s9myYDRXEdy1p4IpsoZYqA" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_s9myYTRXEdy1p4IpsoZYqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_02A5EDRXEdy1p4IpsoZYqA" name="l" direction="inout">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_8heigBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9rXwMDRXEdy1p4IpsoZYqA" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9rhhMDRXEdy1p4IpsoZYqA" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_9rqrIDRXEdy1p4IpsoZYqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_ag_tIDRXEdy1p4IpsoZYqA" name="operator>>" method="_fS4MIDR1EdypGbuyt3_DaA">
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_tL6UIDRXEdy1p4IpsoZYqA" name="param_0" type="_WXH_4DO2EdyG-pUz-bb-Lg" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_uzCC8DRXEdy1p4IpsoZYqA" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uzLz8DRXEdy1p4IpsoZYqA" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_uzU94DRXEdy1p4IpsoZYqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_AArasDRYEdy1p4IpsoZYqA" name="ui" direction="inout">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_LTZesByeEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Bv2SQDRYEdy1p4IpsoZYqA" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Bv_cMDRYEdy1p4IpsoZYqA" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_Bv_cMTRYEdy1p4IpsoZYqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_amWuQDRXEdy1p4IpsoZYqA" name="operator>>" method="_h7kFoDR1EdypGbuyt3_DaA">
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_vCh3gDRXEdy1p4IpsoZYqA" name="param_0" type="_WXH_4DO2EdyG-pUz-bb-Lg" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wWuDQDRXEdy1p4IpsoZYqA" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wW30QDRXEdy1p4IpsoZYqA" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_wW30QTRXEdy1p4IpsoZYqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_AR0OADRYEdy1p4IpsoZYqA" name="ul" direction="inout">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_a1wZUByeEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_C-X64DRYEdy1p4IpsoZYqA" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_C-X64TRYEdy1p4IpsoZYqA" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_C-hr4DRYEdy1p4IpsoZYqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_ZkKxIDRaEdy1p4IpsoZYqA" name="operator[]" method="_1R2jsDRbEdyDwaY3iUxzzA">
@@ -11096,17 +10154,11 @@ position (see get/setPosition)</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_eF2zoDRaEdy1p4IpsoZYqA" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_eF2zoTRaEdy1p4IpsoZYqA" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_eF_9kDRaEdy1p4IpsoZYqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_eSrHoDRaEdy1p4IpsoZYqA" name="index">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_7wRIABydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_f2XH8DRaEdy1p4IpsoZYqA" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_f2gR4DRaEdy1p4IpsoZYqA" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_f2qC4DRaEdy1p4IpsoZYqA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_O59-oDRiEdyDwaY3iUxzzA" name="scanOk" method="_yq6mkDRvEdypGbuyt3_DaA">
@@ -11117,9 +10169,6 @@ position (see get/setPosition)</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_vAIV4I7PEdySGvm5GN66HA"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kcWiADRiEdyDwaY3iUxzzA" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kcfr8DRiEdyDwaY3iUxzzA" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_kcfr8TRiEdyDwaY3iUxzzA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_tMpS8DRiEdyDwaY3iUxzzA" name="setBase" method="_pc0fUDRvEdypGbuyt3_DaA">
@@ -11131,17 +10180,11 @@ position (see get/setPosition)</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_LTZesByeEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xX-q8DRiEdyDwaY3iUxzzA" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xYH04DRiEdyDwaY3iUxzzA" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_xYH04TRiEdyDwaY3iUxzzA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_1-uzoDRiEdyDwaY3iUxzzA" name="param_0" direction="return">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_LTZesByeEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_3AcIQDRiEdyDwaY3iUxzzA" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3AcIQTRiEdyDwaY3iUxzzA" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_3AvqQDRiEdyDwaY3iUxzzA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_FX25wDRjEdyDwaY3iUxzzA" name="getPosition" method="_udWZ8DRvEdypGbuyt3_DaA">
@@ -11153,9 +10196,6 @@ position (see get/setPosition)</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_LTZesByeEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Kj3roDRjEdyDwaY3iUxzzA" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Kj3roTRjEdyDwaY3iUxzzA" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_KkA1kDRjEdyDwaY3iUxzzA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_UA3KgDRjEdyDwaY3iUxzzA" name="setPosition" method="_-lTQwDR2EdypGbuyt3_DaA">
@@ -11175,9 +10215,6 @@ position (see get/setPosition)</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_vAIV4I7PEdySGvm5GN66HA"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_3Y1ksDRjEdypGbuyt3_DaA" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3ZJGsDRjEdypGbuyt3_DaA" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_3ZJGsTRjEdypGbuyt3_DaA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_oiusEDRjEdyDwaY3iUxzzA" name="constCharP">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/>
@@ -11212,9 +10249,6 @@ since it allows a caller to corrupt the string contents.</body>
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_knjlEDRlEdypGbuyt3_DaA" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kntWEDRlEdypGbuyt3_DaA" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_kn2gADRlEdypGbuyt3_DaA">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_w9e_8DRlEdypGbuyt3_DaA" name="getSeparator" method="_18IfsDRvEdypGbuyt3_DaA">
@@ -11555,9 +10589,6 @@ return *this;
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_WjSs8DUREdy0feurbW0fyQ" name="param_0" type="_sQ1JADO0EdyG-pUz-bb-Lg" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XkHQwDUREdy0feurbW0fyQ" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XkRBwDUREdy0feurbW0fyQ" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_XkaywDUREdy0feurbW0fyQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_OQgXYDUREdy0feurbW0fyQ" name="printErr" isStatic="true" method="_mhtNQDUYEdyDReAOQiyvOg">
@@ -11580,43 +10611,28 @@ return *this;
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_e2yXsDUSEdy0feurbW0fyQ" name="param_0" type="_3W43cDO0EdyG-pUz-bb-Lg" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_f6TDIDUSEdy0feurbW0fyQ" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_f6TDITUSEdy0feurbW0fyQ" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_f6cNEDUSEdy0feurbW0fyQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_WR0tADUSEdy0feurbW0fyQ" name="getMiddleRef" method="_fS_EIDUVEdyDReAOQiyvOg">
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_gUN_ADUSEdy0feurbW0fyQ" name="param_0" type="_3W43cDO0EdyG-pUz-bb-Lg" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_haQaADUSEdy0feurbW0fyQ" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_haaLADUSEdy0feurbW0fyQ" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_haj8ADUSEdy0feurbW0fyQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_X5-9oDUSEdy0feurbW0fyQ" name="operator=" method="_ma0pgDUVEdyDReAOQiyvOg">
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_iOHf4DUSEdy0feurbW0fyQ" name="param_0" type="_Fqa9QDUPEdy0feurbW0fyQ" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kCMsoDUSEdy0feurbW0fyQ" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kCWdoDUSEdy0feurbW0fyQ" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_kCfnkDUSEdy0feurbW0fyQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_iUE98DUSEdy0feurbW0fyQ" name="str" type="_WXH_4DO2EdyG-pUz-bb-Lg">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VCzfsDUTEdyDReAOQiyvOg" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VDGaoDUTEdyDReAOQiyvOg" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_VDGaoTUTEdyDReAOQiyvOg">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_Y7GcYDUSEdy0feurbW0fyQ" name="operator=" method="_pFvXoDUVEdyDReAOQiyvOg">
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_ylPfUDUSEdyDReAOQiyvOg" name="param_0" type="_Fqa9QDUPEdy0feurbW0fyQ" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_zk3wUDUSEdyDReAOQiyvOg" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zlBhUDUSEdyDReAOQiyvOg" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_zlKrQDUSEdyDReAOQiyvOg">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_ypj-oDUSEdyDReAOQiyvOg" name="ccp">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/>
@@ -11626,9 +10642,6 @@ return *this;
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_z9dPcDUSEdyDReAOQiyvOg" name="ret" type="_Fqa9QDUPEdy0feurbW0fyQ" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1J50cDUSEdyDReAOQiyvOg" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1KDlcDUSEdyDReAOQiyvOg" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_1KMvYDUSEdyDReAOQiyvOg">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_0BVC0DUSEdyDReAOQiyvOg" name="str" type="_WXH_4DO2EdyG-pUz-bb-Lg"/>
         </ownedOperation>
@@ -11636,9 +10649,6 @@ return *this;
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_1f888DUSEdyDReAOQiyvOg" name="ret" type="_Fqa9QDUPEdy0feurbW0fyQ" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5XBVIDUSEdyDReAOQiyvOg" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5XLGIDUSEdyDReAOQiyvOg" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_5XUQEDUSEdyDReAOQiyvOg">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_3iCwgDUSEdyDReAOQiyvOg" name="ccp">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/>
@@ -11648,9 +10658,6 @@ return *this;
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_Q3b2ADUUEdyDReAOQiyvOg" name="mark" type="_WXH_4DO2EdyG-pUz-bb-Lg">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZNgJEDUUEdyDReAOQiyvOg" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZNgJETUUEdyDReAOQiyvOg" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_ZNp6EDUUEdyDReAOQiyvOg">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_OMqR0DUUEdyDReAOQiyvOg" name="print" method="_S02ysDUZEdyDReAOQiyvOg">
@@ -11663,7 +10670,7 @@ return *this;
             <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_jiiDMDUUEdyDReAOQiyvOg"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jirNIDUUEdyDReAOQiyvOg" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_ji-vIDUUEdyDReAOQiyvOg" value="FALSE"/>
+            <defaultValue xmi:type="uml:LiteralBoolean" xmi:id="_KBAQoFe3EeOtBoURfZexXw"/>
           </ownedParameter>
         </ownedOperation>
         <ownedOperation xmi:type="uml:Operation" xmi:id="_Pfz7wDUUEdyDReAOQiyvOg" name="clean" method="_blcekDUZEdyDReAOQiyvOg"/>
@@ -11671,9 +10678,6 @@ return *this;
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_GTWm0FlLEd-9TNLvplUFDQ" name="ret" type="_Fqa9QDUPEdy0feurbW0fyQ" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_GTWm0llLEd-9TNLvplUFDQ" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_GTWm0VlLEd-9TNLvplUFDQ" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_GTWm01lLEd-9TNLvplUFDQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_GTWm1FlLEd-9TNLvplUFDQ" name="ch">
             <type xmi:type="uml:PrimitiveType" href="pathmap://PapyrusC_Cpp_LIBRARIES/AnsiCLibrary.uml#_5lVhgBydEduyofBvg4RL2w"/>
@@ -11683,9 +10687,6 @@ return *this;
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_VeCBQFlLEd-9TNLvplUFDQ" name="ret" type="_Fqa9QDUPEdy0feurbW0fyQ" direction="return">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VeCBQllLEd-9TNLvplUFDQ" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VeCBQVlLEd-9TNLvplUFDQ" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_VeCBQ1lLEd-9TNLvplUFDQ">
-              <value xsi:nil="true"/>
-            </defaultValue>
           </ownedParameter>
           <ownedParameter xmi:type="uml:Parameter" xmi:id="_VeCBRFlLEd-9TNLvplUFDQ" name="dummy" type="_ITWTMFlMEd-9TNLvplUFDQ"/>
         </ownedOperation>
@@ -12018,7 +11019,7 @@ Show: output the whole line immediately and reset the output string</body>
   <C_Cpp:Const xmi:id="_3xJyUDa5Edyv9PRkTrTu0A" base_parameter="_oX2tEDa5Edyv9PRkTrTu0A"/>
   <C_Cpp:Ref xmi:id="_3xJyUTa5Edyv9PRkTrTu0A" base_parameter="_oX2tEDa5Edyv9PRkTrTu0A"/>
   <C_Cpp:ConstInit xmi:id="_qkOokDa6Edyv9PRkTrTu0A" initialisation="beginning (NULL), endElement (NULL), current (NULL), firstFreeCellule (NULL), freeMemory ((ListCell *) ((char *) this + sizeof (BOL &lt; ElType >))), endOfMemory ((ListCell *) ((char *) this + sizeof (BOL &lt; ElType >) + (nbElem - 1) * sizeof (ListCell)))" base_operation="_ky3HADUyEdyDReAOQiyvOg"/>
-  <C_Cpp:Include xmi:id="_gutqEDa8Edy_E4ZljVbr-g" body="#if defined(_POSIX_SOURCE) || defined(PC)&#xD;&#xA;&#x9;#include &lt;string.h>&#xD;&#xA;#else&#xD;&#xA;&#x9;#include &lt;string.h>&#xD;&#xA;&#x9;#ifndef SYSTEM_VxWorks&#xD;&#xA;&#x9;&#x9;#include &lt;memory.h>&#xD;&#xA;&#x9;#endif &#xD;&#xA;#endif &#xD;&#xA;" header="/**&#xD;&#xA; * ----------------------------------------------------------------------&#xD;&#xA; * [todo: it would be very good to have lock-free set/list implementations.&#xD;&#xA; * Currently, two threads that are mixing adding/removals would need lock&#xD;&#xA; * protection] => examine solutions, for instance skip lists&#xD;&#xA; * ----------------------------------------------------------------------&#xD;&#xA; */&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;/**&#xD;&#xA; * This macro is used for historical reasons: it is used by the&#xD;&#xA; * code generated by objecteering. It declares a variable of type SetOf&#xD;&#xA; * with the prefix set_of_&lt;typename>. This variable stores a set of pointers.&#xD;&#xA; */&#xD;&#xA;#define CR_SET(className)\&#xD;&#xA;&#x9;typedef SetOf&lt;className *> set_of_ ## className;&#xD;&#xA;&#xD;&#xA;/**&#xD;&#xA; * This macro is similar to the macro above. The difference is that a set&#xD;&#xA; * of values (and not pointers) is stored.&#xD;&#xA; */&#xD;&#xA;#define CR_SET_V(className)\&#xD;&#xA;&#x9;typedef SetOf&lt;className>  set_of_ ## className;&#xD;&#xA;&#xD;&#xA;/**&#xD;&#xA; * This integer default value DEFAULT_SIZE_BLOCK is used to control (partly)&#xD;&#xA; * memory size and fragmentation during growing. The ARRAY&#xD;&#xA; * is roughly doubled in size until it hits the size_block limit, after&#xD;&#xA; * which it is grown only  in size_block sized chunks, if necessary.&#xD;&#xA; * A large value limits fragmentation at the expense of using more memory.&#xD;&#xA; * DEFAULT_SIZE_BLOCK  value must always be a number greater than zero.&#xD;&#xA; */&#xD;&#xA;#ifndef DEFAULT_BLOCK_SIZE&#xD;&#xA;#define DEFAULT_BLOCK_SIZE 1024&#xD;&#xA;#endif&#xD;&#xA;" base_class="_2bXLkDUuEdyDReAOQiyvOg"/>
+  <C_Cpp:Include xmi:id="_gutqEDa8Edy_E4ZljVbr-g" body="#if defined(_POSIX_SOURCE) || defined(PC)&#xD;&#xA;&#x9;#include &lt;string.h>&#xD;&#xA;#else&#xD;&#xA;&#x9;#include &lt;string.h>&#xD;&#xA;&#x9;#ifndef SYSTEM_VxWorks&#xD;&#xA;&#x9;&#x9;#include &lt;memory.h>&#xD;&#xA;&#x9;#endif &#xD;&#xA;#endif &#xD;&#xA;" header="/**&#xD;&#xA; * ----------------------------------------------------------------------&#xD;&#xA; * [todo: it would be very good to have lock-free set/list implementations.&#xD;&#xA; * Currently, two threads that are mixing adding/removals would need lock&#xD;&#xA; * protection] => examine solutions, for instance skip lists&#xD;&#xA; * ----------------------------------------------------------------------&#xD;&#xA; */&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;/**&#xD;&#xA; * This macro is used for historical reasons: it is used by the&#xD;&#xA; * code generated by objecteering. It declares a variable of type SetOf&#xD;&#xA; * with the prefix set_of_&lt;typename>. This variable stores a set of pointers.&#xD;&#xA; */&#xD;&#xA;#define CR_SET(className)\&#xD;&#xA;&#x9;typedef ::OS_AL::Sets::SetOf&lt;className *> set_of_ ## className;&#xD;&#xA;&#xD;&#xA;/**&#xD;&#xA; * This macro is similar to the macro above. The difference is that a set&#xD;&#xA; * of values (and not pointers) is stored.&#xD;&#xA; */&#xD;&#xA;#define CR_SET_V(className)\&#xD;&#xA;&#x9;typedef ::OS_AL::Sets::SetOf&lt;className>  set_of_ ## className;&#xD;&#xA;&#xD;&#xA;/**&#xD;&#xA; * This integer default value DEFAULT_SIZE_BLOCK is used to control (partly)&#xD;&#xA; * memory size and fragmentation during growing. The ARRAY&#xD;&#xA; * is roughly doubled in size until it hits the size_block limit, after&#xD;&#xA; * which it is grown only  in size_block sized chunks, if necessary.&#xD;&#xA; * A large value limits fragmentation at the expense of using more memory.&#xD;&#xA; * DEFAULT_SIZE_BLOCK  value must always be a number greater than zero.&#xD;&#xA; */&#xD;&#xA;#ifndef DEFAULT_BLOCK_SIZE&#xD;&#xA;#define DEFAULT_BLOCK_SIZE 1024&#xD;&#xA;#endif&#xD;&#xA;" base_class="_2bXLkDUuEdyDReAOQiyvOg"/>
   <l2:Create xmi:id="_HVTDYDa_Edy_E4ZljVbr-g" base_BehavioralFeature="_rnk_IDa-Edy_E4ZljVbr-g"/>
   <l2:Destroy xmi:id="_H9iIEDa_Edy_E4ZljVbr-g" base_BehavioralFeature="_-M24MDa-Edy_E4ZljVbr-g"/>
   <C_Cpp:Const xmi:id="_LDIAADa_Edy_E4ZljVbr-g" base_parameter="_smT4QDa-Edy_E4ZljVbr-g"/>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/statemachine.di b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/statemachine.di
index ee692079cdc..e82d971c797 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/statemachine.di
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/statemachine.di
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ASCII"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi" xmi:id="_agpmUOUTEd-P08Bciq_LqQ">
   <pageList xmi:id="_agpmUeUTEd-P08Bciq_LqQ">
     <availablePage xmi:id="_deTDMOUTEd-P08Bciq_LqQ">
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/statemachine.notation b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/statemachine.notation
index b2188d93035..14fb5b3fd8d 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/statemachine.notation
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/statemachine.notation
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:C_Cpp="http://www.eclipse.org/papyrus/C_Cpp/1" xmlns:FCM="http://www.eclipse.org/papyrus/FCM/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">
   <notation:Diagram xmi:id="_deScIOUTEd-P08Bciq_LqQ" type="CompositeStructure" name="StateMachines" measurementUnit="Pixel">
     <children xmi:type="notation:Shape" xmi:id="_en03EOUTEd-P08Bciq_LqQ" type="2073" fontName="" fontHeight="10" lineColor="0">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_en1eIOUTEd-P08Bciq_LqQ" source="ShadowFigure">
@@ -117,10 +117,19 @@
         <element xmi:type="uml:Port" href="statemachine.uml#_xUE3QF8wEeGerN33d-RdRg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xVjd8V8wEeGerN33d-RdRg" x="225" y="72" width="20" height="20"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Jo3KIHJVEeOMF7YEvnQt5g" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Jo3KIXJVEeOMF7YEvnQt5g" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="statemachine.uml#_eGpZQBE1EeG3cfLoiI6G7g"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Jo3KInJVEeOMF7YEvnQt5g"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Jo5mYHJVEeOMF7YEvnQt5g" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Jo5mYXJVEeOMF7YEvnQt5g"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Jo5mYnJVEeOMF7YEvnQt5g"/>
+      </children>
       <element xmi:type="uml:Class" href="statemachine.uml#_ens7QOUTEd-P08Bciq_LqQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_en03EeUTEd-P08Bciq_LqQ" x="54" y="135" width="235" height="163"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_u-vbIOUTEd-P08Bciq_LqQ" type="2073" fontName="" fontHeight="10" lineColor="0">
+    <children xmi:type="notation:Shape" xmi:id="_u-vbIOUTEd-P08Bciq_LqQ" type="2073" fontName="" fontHeight="10" gradient="16777215, -1, 0" lineColor="0">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_u-vbIuUTEd-P08Bciq_LqQ" source="ShadowFigure">
         <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_u-vbI-UTEd-P08Bciq_LqQ" key="ShadowFigure_Value" value="false"/>
       </eAnnotations>
@@ -137,6 +146,9 @@
         <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NOU4k83zEeGrI9HID9bwtg" key="PropStereoDisplay" value=""/>
         <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NOVfoM3zEeGrI9HID9bwtg" key="StereotypePropertyLocation" value="Compartment"/>
       </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__yjQ4GGAEeO2F4QRMDSOXg" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__yj38GGAEeO2F4QRMDSOXg" key="gradient" value="true"/>
+      </eAnnotations>
       <children xmi:type="notation:DecorationNode" xmi:id="_u-wCM-UTEd-P08Bciq_LqQ" type="5156"/>
       <children xmi:type="notation:BasicCompartment" xmi:id="_u-wCNOUTEd-P08Bciq_LqQ" type="7073">
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_u-wCNeUTEd-P08Bciq_LqQ"/>
@@ -228,6 +240,20 @@
         <element xmi:type="uml:Port" href="statemachine.uml#_a4NKMOuMEeCTfOY57pgE3w"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_a7sjEeuMEeCTfOY57pgE3w" x="108" y="153" width="20" height="20"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_JpBiMHJVEeOMF7YEvnQt5g" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_JpBiMXJVEeOMF7YEvnQt5g" showTitle="true"/>
+        <element xmi:type="FCM:InteractionComponent" href="statemachine.uml#_hanSUOUUEd-P08Bciq_LqQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JpBiMnJVEeOMF7YEvnQt5g"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_JpBiM3JVEeOMF7YEvnQt5g" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_JpBiNHJVEeOMF7YEvnQt5g" showTitle="true"/>
+        <element xmi:type="FCM:UseInstanceConfigurator" href="statemachine.uml#_StgB8CNYEeGj_4swHBbKwg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JpBiNXJVEeOMF7YEvnQt5g"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_JpCJQHJVEeOMF7YEvnQt5g" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_JpCJQXJVEeOMF7YEvnQt5g"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JpCJQnJVEeOMF7YEvnQt5g"/>
+      </children>
       <element xmi:type="uml:Class" href="statemachine.uml#_u-qioOUTEd-P08Bciq_LqQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_u-vbIeUTEd-P08Bciq_LqQ" x="414" y="108" width="217" height="163"/>
     </children>
@@ -245,6 +271,15 @@
       <children xmi:type="notation:BasicCompartment" xmi:id="_OTjspDXLEeCZ5ODDEHnvRw" type="7073" collapsed="true">
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OTjspTXLEeCZ5ODDEHnvRw"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_JpFMkHJVEeOMF7YEvnQt5g" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_JpFMkXJVEeOMF7YEvnQt5g" showTitle="true"/>
+        <element xmi:type="FCM:InteractionComponent" href="pathmap://QML_CORE/core.uml#_vEYVcFR1Ed6GqrP6fkWBoQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JpFMknJVEeOMF7YEvnQt5g"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_JpFzoHJVEeOMF7YEvnQt5g" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_JpFzoXJVEeOMF7YEvnQt5g"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JpFzonJVEeOMF7YEvnQt5g"/>
+      </children>
       <element xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_Zx2ZUA1jEd6tvthBDl600Q"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OTiegTXLEeCZ5ODDEHnvRw" x="414" y="18" width="217"/>
     </children>
@@ -277,6 +312,15 @@
         <styles xmi:type="notation:TitleStyle" xmi:id="_OlNhIRE0EeG3cfLoiI6G7g" showTitle="true"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OlNhIhE0EeG3cfLoiI6G7g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_JpHo0HJVEeOMF7YEvnQt5g" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_JpHo0XJVEeOMF7YEvnQt5g" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="pathmap://QML_CORE/core.uml#_Yx49gCaeEeG4fZdVXNtoOQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JpHo0nJVEeOMF7YEvnQt5g"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_JpHo03JVEeOMF7YEvnQt5g" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_JpHo1HJVEeOMF7YEvnQt5g"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JpHo1XJVEeOMF7YEvnQt5g"/>
+      </children>
       <element xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_JRmo0PNAEeCovO8AYZymZQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OlJPsRE0EeG3cfLoiI6G7g" x="60" y="333" width="85"/>
     </children>
@@ -295,6 +339,10 @@
         <styles xmi:type="notation:TitleStyle" xmi:id="_Py7ReBE0EeG3cfLoiI6G7g" showTitle="true"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Py7ReRE0EeG3cfLoiI6G7g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_JpJeAHJVEeOMF7YEvnQt5g" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_JpJeAXJVEeOMF7YEvnQt5g"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JpJeAnJVEeOMF7YEvnQt5g"/>
+      </children>
       <element xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_WkkjoPNUEeCovO8AYZymZQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Py6qYRE0EeG3cfLoiI6G7g" x="198" y="333" width="90"/>
     </children>
@@ -321,6 +369,15 @@
         <styles xmi:type="notation:TitleStyle" xmi:id="_KSCRhCNYEeGj_4swHBbKwg" showTitle="true"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KSCRhSNYEeGj_4swHBbKwg"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_JpLTMHJVEeOMF7YEvnQt5g" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_JpLTMXJVEeOMF7YEvnQt5g" showTitle="true"/>
+        <element xmi:type="FCM:InstanceConfigurator" href="statemachine.uml#_QQYfQCNYEeGj_4swHBbKwg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JpLTMnJVEeOMF7YEvnQt5g"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_JpLTM3JVEeOMF7YEvnQt5g" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_JpLTNHJVEeOMF7YEvnQt5g"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JpLTNXJVEeOMF7YEvnQt5g"/>
+      </children>
       <element xmi:type="uml:Class" href="statemachine.uml#_KEMp0CNYEeGj_4swHBbKwg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KR_OMSNYEeGj_4swHBbKwg" x="414" y="319" width="226" height="51"/>
     </children>
@@ -339,6 +396,10 @@
         <styles xmi:type="notation:TitleStyle" xmi:id="_XAnUMSWNEeGB3KV6qwTHBw" showTitle="true"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XAnUMiWNEeGB3KV6qwTHBw"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_JpNIYHJVEeOMF7YEvnQt5g" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_JpNIYXJVEeOMF7YEvnQt5g"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JpNIYnJVEeOMF7YEvnQt5g"/>
+      </children>
       <element xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_-WNegNtxEd6nqsBVkgJEEA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XAfYYSWNEeGB3KV6qwTHBw" x="54" y="36" width="235"/>
     </children>
@@ -424,6 +485,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_62nAp-x1EeCeNZHeHxkazQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_62nAqOx1EeCeNZHeHxkazQ"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_JrEwoHJVEeOMF7YEvnQt5g" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_JrEwoXJVEeOMF7YEvnQt5g"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JrEwonJVEeOMF7YEvnQt5g"/>
+      </children>
       <element xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_6uRBMOuqEeCTfOY57pgE3w"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_62kkYOx1EeCeNZHeHxkazQ" x="82" y="313"/>
     </children>
@@ -460,6 +525,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_AByFDux2EeCeNZHeHxkazQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AByFD-x2EeCeNZHeHxkazQ"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_JtQh8HJVEeOMF7YEvnQt5g" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_JtQh8XJVEeOMF7YEvnQt5g"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JtQh8nJVEeOMF7YEvnQt5g"/>
+      </children>
       <element xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_6uRBMOuqEeCTfOY57pgE3w"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ABwP0ex2EeCeNZHeHxkazQ" x="468" y="126"/>
     </children>
@@ -492,6 +561,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_AwoID-x2EeCeNZHeHxkazQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AwovEOx2EeCeNZHeHxkazQ"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_JtSXIHJVEeOMF7YEvnQt5g" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_JtSXIXJVEeOMF7YEvnQt5g" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="statemachine.uml#_eGpZQBE1EeG3cfLoiI6G7g"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JtSXInJVEeOMF7YEvnQt5g"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_JtS-MHJVEeOMF7YEvnQt5g" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_JtS-MXJVEeOMF7YEvnQt5g"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JtS-MnJVEeOMF7YEvnQt5g"/>
+      </children>
       <element xmi:type="uml:Class" href="statemachine.uml#_ens7QOUTEd-P08Bciq_LqQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Awlrwex2EeCeNZHeHxkazQ" x="162" y="126"/>
     </children>
@@ -597,6 +675,15 @@
             <element xmi:type="uml:Port" href="statemachine.uml#_a4NKMOuMEeCTfOY57pgE3w"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tE-AkfTXEeCn1-FCrfecFg" x="72" y="39"/>
           </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_Jv6NUHJVEeOMF7YEvnQt5g" visible="false" type="AppliedStereotypeCompartement">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_Jv6NUXJVEeOMF7YEvnQt5g" showTitle="true"/>
+            <element xmi:type="FCM:InterceptionRule" href="statemachine.uml#_Z5CnUPUQEeCn1-FCrfecFg"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Jv6NUnJVEeOMF7YEvnQt5g"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_Jv6NU3JVEeOMF7YEvnQt5g" visible="false" type="compartment_shape_display">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_Jv6NVHJVEeOMF7YEvnQt5g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Jv6NVXJVEeOMF7YEvnQt5g"/>
+          </children>
           <element xmi:type="uml:Property" href="statemachine.uml#_LyxAEPTXEeCn1-FCrfecFg"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hobr6vTXEeCn1-FCrfecFg" x="31" y="4" width="235" height="49"/>
         </children>
@@ -648,6 +735,10 @@
             <element xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#_MzO8gPNAEeCovO8AYZymZQ"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vGo9YfTXEeCn1-FCrfecFg" x="-10" y="18"/>
           </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_Jv8pkHJVEeOMF7YEvnQt5g" visible="false" type="compartment_shape_display">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_Jv8pkXJVEeOMF7YEvnQt5g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Jv8pknJVEeOMF7YEvnQt5g"/>
+          </children>
           <element xmi:type="uml:Property" href="statemachine.uml#_jXX54PTXEeCn1-FCrfecFg"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jXZIAfTXEeCn1-FCrfecFg" x="157" y="103" width="155" height="47"/>
         </children>
@@ -728,6 +819,10 @@
             <element xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#__SLXgNtxEd6nqsBVkgJEEA"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4jFLASWdEeGX6PuSE-DJlQ" x="225" y="18"/>
           </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_Jv_F0HJVEeOMF7YEvnQt5g" visible="false" type="compartment_shape_display">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_Jv_F0XJVEeOMF7YEvnQt5g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Jv_F0nJVEeOMF7YEvnQt5g"/>
+          </children>
           <element xmi:type="uml:Property" href="statemachine.uml#_mv6jAPTXEeCn1-FCrfecFg"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mv8YMfTXEeCn1-FCrfecFg" x="31" y="211" width="235" height="46"/>
         </children>
@@ -808,12 +903,25 @@
             <element xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#__SLXgNtxEd6nqsBVkgJEEA"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3Qs9ISWdEeGX6PuSE-DJlQ" x="126" y="18"/>
           </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_JwBiEHJVEeOMF7YEvnQt5g" visible="false" type="compartment_shape_display">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_JwBiEXJVEeOMF7YEvnQt5g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JwBiEnJVEeOMF7YEvnQt5g"/>
+          </children>
           <element xmi:type="uml:Property" href="statemachine.uml#_vcPiUCWdEeGX6PuSE-DJlQ"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vjc9kSWdEeGX6PuSE-DJlQ" x="364" y="211" width="136" height="46"/>
         </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_hobr6_TXEeCn1-FCrfecFg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hobr7PTXEeCn1-FCrfecFg"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Jv3xEHJVEeOMF7YEvnQt5g" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Jv3xEXJVEeOMF7YEvnQt5g" showTitle="true"/>
+        <element xmi:type="FCM:ContainerRule" href="statemachine.uml#_RmD0YPTXEeCn1-FCrfecFg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Jv3xEnJVEeOMF7YEvnQt5g"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Jv4YIHJVEeOMF7YEvnQt5g" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Jv4YIXJVEeOMF7YEvnQt5g"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Jv4YInJVEeOMF7YEvnQt5g"/>
+      </children>
       <element xmi:type="uml:Class" href="statemachine.uml#_18qdsO67EeCZ9MjsZTV1zw"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hobr7fTXEeCn1-FCrfecFg" x="72" y="38" width="550" height="334"/>
     </children>
@@ -936,6 +1044,10 @@
         <element xmi:type="uml:TemplateSignature" href="pathmap://QML_CORE/core.uml#_rNm5kOUYEd-P08Bciq_LqQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_afY_4f3HEeC1YdT2qA0bjA" x="181" y="8"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_JyPvoHJVEeOMF7YEvnQt5g" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_JyPvoXJVEeOMF7YEvnQt5g"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JyPvonJVEeOMF7YEvnQt5g"/>
+      </children>
       <element xmi:type="uml:Package" href="pathmap://QML_CORE/core.uml#_m7SIwOUYEd-P08Bciq_LqQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z7x8gf3HEeC1YdT2qA0bjA" x="106" y="65"/>
     </children>
@@ -977,6 +1089,10 @@
         <element xmi:type="uml:TemplateSignature" href="pathmap://QML_CORE/core.uml#_V0b2APfBEd2TbIfwytOyPA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_daof3HEeC1YdT2qA0bjA" x="159" y="3"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_JyQ9wHJVEeOMF7YEvnQt5g" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_JyQ9wXJVEeOMF7YEvnQt5g"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JyQ9wnJVEeOMF7YEvnQt5g"/>
+      </children>
       <element xmi:type="uml:Package" href="pathmap://QML_CORE/core.uml#_mMCK8PiPEd2UhpY2Y3WUyg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dpF7wf3HEeC1YdT2qA0bjA" x="450" y="72"/>
     </children>
@@ -1021,12 +1137,25 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_xln7sP3HEeC1YdT2qA0bjA"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xln7sf3HEeC1YdT2qA0bjA"/>
           </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_JyUBEHJVEeOMF7YEvnQt5g" visible="false" type="AppliedStereotypeCompartement">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_JyUBEXJVEeOMF7YEvnQt5g" showTitle="true"/>
+            <element xmi:type="C_Cpp:Include" href="statemachine.uml#_eGpZQBE1EeG3cfLoiI6G7g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JyUBEnJVEeOMF7YEvnQt5g"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_JyUoIHJVEeOMF7YEvnQt5g" visible="false" type="compartment_shape_display">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_JyUoIXJVEeOMF7YEvnQt5g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JyUoInJVEeOMF7YEvnQt5g"/>
+          </children>
           <element xmi:type="uml:Class" href="statemachine.uml#_ens7QOUTEd-P08Bciq_LqQ"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xlmtgf3HEeC1YdT2qA0bjA" x="41" y="10" height="43"/>
         </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_jCozUv3HEeC1YdT2qA0bjA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jCozU_3HEeC1YdT2qA0bjA"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_JySy8HJVEeOMF7YEvnQt5g" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_JySy8XJVEeOMF7YEvnQt5g"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JySy8nJVEeOMF7YEvnQt5g"/>
+      </children>
       <element xmi:type="uml:Package" href="statemachine.uml#_9J39cOupEeCTfOY57pgE3w"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jCnlMP3HEeC1YdT2qA0bjA" x="108" y="234"/>
     </children>
@@ -1071,12 +1200,30 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_vWSWTf3HEeC1YdT2qA0bjA"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vWSWTv3HEeC1YdT2qA0bjA"/>
           </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_JyYSgHJVEeOMF7YEvnQt5g" visible="false" type="AppliedStereotypeCompartement">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_JyYSgXJVEeOMF7YEvnQt5g" showTitle="true"/>
+            <element xmi:type="FCM:InteractionComponent" href="statemachine.uml#_hanSUOUUEd-P08Bciq_LqQ"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JyYSgnJVEeOMF7YEvnQt5g"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_JyYSg3JVEeOMF7YEvnQt5g" visible="false" type="AppliedStereotypeCompartement">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_JyYShHJVEeOMF7YEvnQt5g" showTitle="true"/>
+            <element xmi:type="FCM:UseInstanceConfigurator" href="statemachine.uml#_StgB8CNYEeGj_4swHBbKwg"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JyYShXJVEeOMF7YEvnQt5g"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_JyY5kHJVEeOMF7YEvnQt5g" visible="false" type="compartment_shape_display">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_JyY5kXJVEeOMF7YEvnQt5g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JyY5knJVEeOMF7YEvnQt5g"/>
+          </children>
           <element xmi:type="uml:Class" href="statemachine.uml#_u-qioOUTEd-P08Bciq_LqQ"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vWQhEf3HEeC1YdT2qA0bjA" x="35" y="10" height="43"/>
         </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_rjO7YP3HEeC1YdT2qA0bjA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rjO7Yf3HEeC1YdT2qA0bjA"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_JyWdUHJVEeOMF7YEvnQt5g" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_JyWdUXJVEeOMF7YEvnQt5g"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JyWdUnJVEeOMF7YEvnQt5g"/>
+      </children>
       <element xmi:type="uml:Package" href="statemachine.uml#_i9AuoOUTEd-P08Bciq_LqQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rjNtQf3HEeC1YdT2qA0bjA" x="451" y="234"/>
     </children>
@@ -1115,11 +1262,11 @@
         <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xEctlV81EeGbQoflzrdx0g" key="QualifiedNameDepth" value="1000"/>
       </eAnnotations>
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uqphYF_1EeGbQoflzrdx0g" source="Stereotype_Annotation">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uqqIcF_1EeGbQoflzrdx0g" key="StereotypeWithQualifiedNameList" value=""/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uqqIcV_1EeGbQoflzrdx0g" key="StereotypeList" value="FCM::Singleton"/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uqqIcl_1EeGbQoflzrdx0g" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uqqIc1_1EeGbQoflzrdx0g" key="PropStereoDisplay" value=""/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uqqIdF_1EeGbQoflzrdx0g" key="StereotypePropertyLocation" value="Compartment"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-3zN4Hg_EeOejZqJpKQeww" key="StereotypeWithQualifiedNameList" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-3zN4Xg_EeOejZqJpKQeww" key="StereotypeList" value="FCM::Singleton,FCM::UseInstanceConfigurator"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-3z08Hg_EeOejZqJpKQeww" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-3z08Xg_EeOejZqJpKQeww" key="PropStereoDisplay" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-3z08ng_EeOejZqJpKQeww" key="StereotypePropertyLocation" value="Compartment"/>
       </eAnnotations>
       <children xmi:type="notation:DecorationNode" xmi:id="_xEdUoF81EeGbQoflzrdx0g" type="5156"/>
       <children xmi:type="notation:BasicCompartment" xmi:id="_xEdUoV81EeGbQoflzrdx0g" type="7073">
@@ -1152,9 +1299,99 @@
         <element xmi:type="uml:Port" href="statemachine.uml#_z94Y0F81EeGbQoflzrdx0g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z-vUcV81EeGbQoflzrdx0g" x="-10" y="64" width="20" height="20"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_J0Gw0HJVEeOMF7YEvnQt5g" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_J0Gw0XJVEeOMF7YEvnQt5g" showTitle="true"/>
+        <element xmi:type="FCM:Singleton" href="statemachine.uml#_uqa34F_1EeGbQoflzrdx0g"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J0Gw0nJVEeOMF7YEvnQt5g"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_J0Gw03JVEeOMF7YEvnQt5g" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_J0Gw1HJVEeOMF7YEvnQt5g" showTitle="true"/>
+        <element xmi:type="FCM:UseInstanceConfigurator" href="statemachine.uml#_VnhuMGGDEeO2F4QRMDSOXg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J0Gw1XJVEeOMF7YEvnQt5g"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_J0HX4HJVEeOMF7YEvnQt5g" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_J0HX4XJVEeOMF7YEvnQt5g"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J0HX4nJVEeOMF7YEvnQt5g"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_ZXfOMHg_EeOejZqJpKQeww" type="3069">
+        <children xmi:type="notation:DecorationNode" xmi:id="_ZXfOMng_EeOejZqJpKQeww" type="5125">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hw-BoHg_EeOejZqJpKQeww" source="Stereotype_Annotation">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hw-BoXg_EeOejZqJpKQeww" key="StereotypeWithQualifiedNameList" value=""/>
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hw-Bong_EeOejZqJpKQeww" key="StereotypeList" value="FCM::Port"/>
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hw-Bo3g_EeOejZqJpKQeww" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hw-BpHg_EeOejZqJpKQeww" key="PropStereoDisplay" value=""/>
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hw-BpXg_EeOejZqJpKQeww" key="StereotypePropertyLocation" value="Compartment"/>
+          </eAnnotations>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_ZXfOM3g_EeOejZqJpKQeww" x="25" y="3"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_ZXfONHg_EeOejZqJpKQeww" type="6029">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_ZXfONXg_EeOejZqJpKQeww" x="25" y="-10"/>
+        </children>
+        <element xmi:type="uml:Port" href="statemachine.uml#_ZXYggHg_EeOejZqJpKQeww"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZXfOMXg_EeOejZqJpKQeww" x="274" y="72" width="20" height="20"/>
+      </children>
       <element xmi:type="uml:Class" href="statemachine.uml#_xELAwF81EeGbQoflzrdx0g"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xEbfcV81EeGbQoflzrdx0g" x="203" y="116" width="284" height="128"/>
     </children>
+    <children xmi:type="notation:Shape" xmi:id="_B1CQgHg_EeOejZqJpKQeww" type="2073">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_JO5aAHg_EeOejZqJpKQeww" source="Stereotype_Annotation">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4HXb4Hg_EeOejZqJpKQeww" key="StereotypeWithQualifiedNameList" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4HXb4Xg_EeOejZqJpKQeww" key="StereotypeList" value="FCM::Singleton,FCM::UseInstanceConfigurator"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4HXb4ng_EeOejZqJpKQeww" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4HYC8Hg_EeOejZqJpKQeww" key="PropStereoDisplay" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4HYC8Xg_EeOejZqJpKQeww" key="StereotypePropertyLocation" value="Compartment"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_B1CQgng_EeOejZqJpKQeww" type="5156"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_B1C3kHg_EeOejZqJpKQeww" type="7073">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_K8aEsHg_EeOejZqJpKQeww" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_K8aEsXg_EeOejZqJpKQeww" key="showTitle" value="true"/>
+        </eAnnotations>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_B1C3kXg_EeOejZqJpKQeww"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_B1C3kng_EeOejZqJpKQeww"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_B1LacHg_EeOejZqJpKQeww" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_B1LacXg_EeOejZqJpKQeww"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_B1Lacng_EeOejZqJpKQeww"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_JOz6cHg_EeOejZqJpKQeww" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_JOz6cXg_EeOejZqJpKQeww" showTitle="true"/>
+        <element xmi:type="FCM:Singleton" href="statemachine.uml#_JOwQEHg_EeOejZqJpKQeww"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JOz6cng_EeOejZqJpKQeww"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_ML26YHg_EeOejZqJpKQeww" type="3069">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ncey8Hg_EeOejZqJpKQeww" source="Stereotype_Annotation">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ncey8Xg_EeOejZqJpKQeww" key="StereotypeWithQualifiedNameList" value=""/>
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ncey8ng_EeOejZqJpKQeww" key="StereotypeList" value="FCM::Port"/>
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ncey83g_EeOejZqJpKQeww" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ncey9Hg_EeOejZqJpKQeww" key="PropStereoDisplay" value=""/>
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ncey9Xg_EeOejZqJpKQeww" key="StereotypePropertyLocation" value="Compartment"/>
+        </eAnnotations>
+        <children xmi:type="notation:DecorationNode" xmi:id="_ML3hcHg_EeOejZqJpKQeww" type="5125">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_ML3hcXg_EeOejZqJpKQeww" x="25" y="3"/>
+        </children>
+        <children xmi:type="notation:DecorationNode" xmi:id="_ML3hcng_EeOejZqJpKQeww" type="6029">
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_ML3hc3g_EeOejZqJpKQeww" x="25" y="-10"/>
+        </children>
+        <element xmi:type="uml:Port" href="statemachine.uml#_MLu-kHg_EeOejZqJpKQeww"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ML26YXg_EeOejZqJpKQeww" x="-10" y="60" width="20" height="20"/>
+      </children>
+      <element xmi:type="uml:Class" href="statemachine.uml#_B0gFAHg_EeOejZqJpKQeww"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_B1CQgXg_EeOejZqJpKQeww" x="200" y="285" width="289" height="114"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_vOvOUHg_EeOejZqJpKQeww" type="2073">
+      <children xmi:type="notation:DecorationNode" xmi:id="_vOvOUng_EeOejZqJpKQeww" type="5156"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_vOvOU3g_EeOejZqJpKQeww" type="7073">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_vOvOVHg_EeOejZqJpKQeww" showTitle="true"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vOvOVXg_EeOejZqJpKQeww"/>
+      </children>
+      <element xmi:type="uml:Class" href="statemachine.uml#_QH7R8GGDEeO2F4QRMDSOXg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vOvOUXg_EeOejZqJpKQeww" x="570" y="289" width="211" height="110"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_BLsjIHhAEeOejZqJpKQeww" type="2109">
+      <children xmi:type="notation:DecorationNode" xmi:id="_BLsjInhAEeOejZqJpKQeww" type="5192"/>
+      <element xmi:type="uml:Comment" href="statemachine.uml#_BLcrgHhAEeOejZqJpKQeww"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BLsjIXhAEeOejZqJpKQeww" x="547" y="417" width="234" height="60"/>
+    </children>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_IOfaAV8wEeGerN33d-RdRg"/>
     <element xmi:type="uml:Package" href="statemachine.uml#_F5DMoF8wEeGerN33d-RdRg"/>
   </notation:Diagram>
@@ -1256,6 +1493,15 @@
             <element xmi:type="uml:Port" href="statemachine.uml#_a4NKMOuMEeCTfOY57pgE3w"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XQCUUV81EeGbQoflzrdx0g" x="35" y="35"/>
           </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_J3dm0HJVEeOMF7YEvnQt5g" visible="false" type="AppliedStereotypeCompartement">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_J3dm0XJVEeOMF7YEvnQt5g" showTitle="true"/>
+            <element xmi:type="FCM:InterceptionRule" href="statemachine.uml#_IeaTEF81EeGbQoflzrdx0g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J3dm0nJVEeOMF7YEvnQt5g"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_J3dm03JVEeOMF7YEvnQt5g" visible="false" type="compartment_shape_display">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_J3dm1HJVEeOMF7YEvnQt5g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J3dm1XJVEeOMF7YEvnQt5g"/>
+          </children>
           <element xmi:type="uml:Property" href="statemachine.uml#_IeWosV81EeGbQoflzrdx0g"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qj1iEV81EeGbQoflzrdx0g" x="10" y="10" width="225"/>
         </children>
@@ -1297,6 +1543,10 @@
             <element xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#_MzO8gPNAEeCovO8AYZymZQ"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X1IlcV81EeGbQoflzrdx0g" x="-10" y="23"/>
           </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_J3gDEHJVEeOMF7YEvnQt5g" visible="false" type="compartment_shape_display">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_J3gDEXJVEeOMF7YEvnQt5g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J3gDEnJVEeOMF7YEvnQt5g"/>
+          </children>
           <element xmi:type="uml:Property" href="statemachine.uml#_IeWotV81EeGbQoflzrdx0g"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qj5McV81EeGbQoflzrdx0g" x="99" y="85" width="181" height="55"/>
         </children>
@@ -1385,6 +1635,10 @@
             <element xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#__SLXgNtxEd6nqsBVkgJEEA"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Yl8-Y181EeGbQoflzrdx0g" x="164" y="27"/>
           </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_J3h4QHJVEeOMF7YEvnQt5g" visible="false" type="compartment_shape_display">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_J3h4QXJVEeOMF7YEvnQt5g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J3h4QnJVEeOMF7YEvnQt5g"/>
+          </children>
           <element xmi:type="uml:Property" href="statemachine.uml#_IeXPwV81EeGbQoflzrdx0g"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qj8PwV81EeGbQoflzrdx0g" x="27" y="175" width="190" height="64"/>
         </children>
@@ -1429,6 +1683,10 @@
             <element xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#_ZjdOAP-EEd6628OhKk_dpg"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Zh1X0V81EeGbQoflzrdx0g" x="-10" y="27"/>
           </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_J3k7kHJVEeOMF7YEvnQt5g" visible="false" type="compartment_shape_display">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_J3k7kXJVEeOMF7YEvnQt5g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J3k7knJVEeOMF7YEvnQt5g"/>
+          </children>
           <element xmi:type="uml:Property" href="statemachine.uml#_IeXPxV81EeGbQoflzrdx0g"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qj_6IV81EeGbQoflzrdx0g" x="378" y="175" width="145" height="64"/>
         </children>
@@ -1447,7 +1705,7 @@
               <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IQmt0Fl-EeKFQZ_XV_Kn6g" key="CustomAppearance_MaskValue" value="28"/>
             </eAnnotations>
           </children>
-          <children xmi:type="notation:BasicCompartment" xmi:id="_pTZMEF81EeGbQoflzrdx0g" type="7077">
+          <children xmi:type="notation:BasicCompartment" xmi:id="_pTZMEF81EeGbQoflzrdx0g" type="7077" collapsed="true">
             <styles xmi:type="notation:TitleStyle" xmi:id="_pTZMEV81EeGbQoflzrdx0g"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pTZMEl81EeGbQoflzrdx0g"/>
           </children>
@@ -1473,12 +1731,25 @@
             <element xmi:type="uml:Port" href="statemachine.uml#_z94Y0F81EeGbQoflzrdx0g"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CYirkV82EeGbQoflzrdx0g" x="-10" y="23"/>
           </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_J3mwwHJVEeOMF7YEvnQt5g" visible="false" type="compartment_shape_display">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_J3mwwXJVEeOMF7YEvnQt5g"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J3mwwnJVEeOMF7YEvnQt5g"/>
+          </children>
           <element xmi:type="uml:Property" href="statemachine.uml#_pTD04F81EeGbQoflzrdx0g"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pTX98V81EeGbQoflzrdx0g" x="225" y="283" width="226"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pTX98V81EeGbQoflzrdx0g" x="295" y="283" width="226" height="53"/>
         </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_PMiX8l81EeGbQoflzrdx0g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PMiX8181EeGbQoflzrdx0g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_J3bKkHJVEeOMF7YEvnQt5g" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_J3bKkXJVEeOMF7YEvnQt5g" showTitle="true"/>
+        <element xmi:type="FCM:ContainerRule" href="statemachine.uml#_IeZE8F81EeGbQoflzrdx0g"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J3bKknJVEeOMF7YEvnQt5g"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_J3bxoHJVEeOMF7YEvnQt5g" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_J3bxoXJVEeOMF7YEvnQt5g"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_J3bxonJVEeOMF7YEvnQt5g"/>
+      </children>
       <element xmi:type="uml:Class" href="statemachine.uml#_IeWosF81EeGbQoflzrdx0g"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PMf7sV81EeGbQoflzrdx0g" x="157" y="88" width="609" height="372"/>
     </children>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/statemachine.uml b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/statemachine.uml
index 23450485097..14b0ff02a5b 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/statemachine.uml
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/models/library/statemachine.uml
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xmi:XMI xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:C_Cpp="http://www.eclipse.org/papyrus/C_Cpp/1" xmlns:FCM="http://www.eclipse.org/papyrus/FCM/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">
   <uml:Model xmi:id="_ago_QOUTEd-P08Bciq_LqQ" name="statemachine">
-    <ownedComment xmi:id="_9BpKIOuLEeCTfOY57pgE3w" annotatedElement="_u-qioOUTEd-P08Bciq_LqQ">
+    <ownedComment xmi:type="uml:Comment" xmi:id="_9BpKIOuLEeCTfOY57pgE3w" annotatedElement="_u-qioOUTEd-P08Bciq_LqQ">
       <body>Call event interceptor, interacts with state-machine. It will handle in particular call events that are intercepted by the port operations</body>
     </ownedComment>
-    <ownedComment xmi:id="_LuBKcDeoEeGPyrZ5I3hMlA" annotatedElement="_18qdsO67EeCZ9MjsZTV1zw">
+    <ownedComment xmi:type="uml:Comment" xmi:id="_LuBKcDeoEeGPyrZ5I3hMlA" annotatedElement="_18qdsO67EeCZ9MjsZTV1zw">
       <body>Container rule for state machine realization. It consists of a collaboration of a call event interceptor, an event pool, the state-machine itself and a thread for this state-machine. The latter means that the state-machine will execute in its own thread and poll the pool for new events.</body>
     </ownedComment>
-    <packageImport xmi:id="_e8dN0OUUEd-P08Bciq_LqQ">
+    <packageImport xmi:type="uml:PackageImport" xmi:id="_e8dN0OUUEd-P08Bciq_LqQ">
       <importedPackage xmi:type="uml:Model" href="pathmap://QML_CORE/core.uml#_O6TiIDLUEd26WNosUASSSw"/>
     </packageImport>
-    <packageImport xmi:id="_76Rc8OuMEeCTfOY57pgE3w">
+    <packageImport xmi:type="uml:PackageImport" xmi:id="_76Rc8OuMEeCTfOY57pgE3w">
       <importedPackage xmi:type="uml:Model" href="pathmap://QML_CORE/corba.uml#_DtQEwDLdEd2_U4efLnjQIw"/>
     </packageImport>
-    <packageImport xmi:id="_guUMgOuNEeCTfOY57pgE3w">
+    <packageImport xmi:type="uml:PackageImport" xmi:id="_guUMgOuNEeCTfOY57pgE3w">
       <importedPackage xmi:type="uml:Model" href="pathmap://Papyrus_Alf_LIBRARIES/alflibrary.uml#_0bBI4Hy5EeCKy5kSqd4eVw"/>
     </packageImport>
-    <packageImport xmi:id="_Ov3NkF82EeGbQoflzrdx0g">
+    <packageImport xmi:type="uml:PackageImport" xmi:id="_Ov3NkF82EeGbQoflzrdx0g">
       <importedPackage xmi:type="uml:Model" href="pathmap://QML_DISTRIBUTION/distribution.uml#_O6TiIDLUEd26WNosUASSSw"/>
     </packageImport>
     <packagedElement xmi:type="uml:Package" xmi:id="_i9AuoOUTEd-P08Bciq_LqQ" name="SMInterceptor">
-      <packageImport xmi:id="_q2WCYOUTEd-P08Bciq_LqQ">
-        <importedPackage href="pathmap://QML_CORE/core.uml#_mMCK8PiPEd2UhpY2Y3WUyg"/>
+      <packageImport xmi:type="uml:PackageImport" xmi:id="_q2WCYOUTEd-P08Bciq_LqQ">
+        <importedPackage xmi:type="uml:Package" href="pathmap://QML_CORE/core.uml#_mMCK8PiPEd2UhpY2Y3WUyg"/>
       </packageImport>
-      <packageMerge xmi:id="_ttDuoP3HEeC1YdT2qA0bjA">
-        <mergedPackage href="pathmap://QML_CORE/core.uml#_mMCK8PiPEd2UhpY2Y3WUyg"/>
+      <packageMerge xmi:type="uml:PackageMerge" xmi:id="_ttDuoP3HEeC1YdT2qA0bjA">
+        <mergedPackage xmi:type="uml:Package" href="pathmap://QML_CORE/core.uml#_mMCK8PiPEd2UhpY2Y3WUyg"/>
       </packageMerge>
       <packagedElement xmi:type="uml:Class" xmi:id="_u-qioOUTEd-P08Bciq_LqQ" clientDependency="_qJxa0OUUEd-P08Bciq_LqQ _d3GdYOUWEd-P08Bciq_LqQ" name="CI_CallEvent">
-        <generalization xmi:id="_3LpLIOUTEd-P08Bciq_LqQ">
+        <generalization xmi:type="uml:Generalization" xmi:id="_3LpLIOUTEd-P08Bciq_LqQ">
           <general xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_Zx2ZUA1jEd6tvthBDl600Q"/>
         </generalization>
         <ownedAttribute xmi:type="uml:Port" xmi:id="_a4NKMOuMEeCTfOY57pgE3w" name="out" visibility="public" aggregation="composite">
@@ -38,14 +38,14 @@
             <value xsi:nil="true"/>
           </defaultValue>
         </ownedAttribute>
-        <ownedAttribute xmi:id="_bL0sACVvEeGaL60JjVj19Q" name="portID">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_bL0sACVvEeGaL60JjVj19Q" name="portID">
           <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_9XvcQB6REd6ITtm_FH3jRw"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bMjEwCVvEeGaL60JjVj19Q" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bMjr0CVvEeGaL60JjVj19Q" value="1"/>
         </ownedAttribute>
-        <interfaceRealization xmi:id="_qJxa0OUUEd-P08Bciq_LqQ" name="derived realization of I" client="_u-qioOUTEd-P08Bciq_LqQ">
+        <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_qJxa0OUUEd-P08Bciq_LqQ" name="derived realization of I" client="_u-qioOUTEd-P08Bciq_LqQ">
           <supplier xmi:type="uml:Interface" href="pathmap://QML_CORE/core.uml#_ZzlzMPfBEd2TbIfwytOyPA"/>
-          <contract href="pathmap://QML_CORE/core.uml#_ZzlzMPfBEd2TbIfwytOyPA"/>
+          <contract xmi:type="uml:Interface" href="pathmap://QML_CORE/core.uml#_ZzlzMPfBEd2TbIfwytOyPA"/>
         </interfaceRealization>
         <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_mlIZ8OUVEd-P08Bciq_LqQ" name="&lt;%name%>" specification="_2qJyMOUUEd-P08Bciq_LqQ">
           <language>C/C++</language>
@@ -61,21 +61,21 @@ out->writeEvent (event);
 [if not (type = null)]return [/if]rconn->[operation.cppCall()/];
 [/template]</body>
         </ownedBehavior>
-        <ownedOperation xmi:id="_2qJyMOUUEd-P08Bciq_LqQ" name="[name/]" method="_mlIZ8OUVEd-P08Bciq_LqQ"/>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_2qJyMOUUEd-P08Bciq_LqQ" name="[name/]" method="_mlIZ8OUVEd-P08Bciq_LqQ"/>
       </packagedElement>
       <packagedElement xmi:type="uml:Dependency" xmi:id="_d3GdYOUWEd-P08Bciq_LqQ" name="Dependency0" client="_u-qioOUTEd-P08Bciq_LqQ">
         <supplier xmi:type="uml:Enumeration" href="pathmap://QML_CORE/core.uml#_2oxDIPiPEd2UhpY2Y3WUyg"/>
       </packagedElement>
     </packagedElement>
     <packagedElement xmi:type="uml:Package" xmi:id="_9J39cOupEeCTfOY57pgE3w" name="StateMachine">
-      <packageMerge xmi:id="_lvUcAP3HEeC1YdT2qA0bjA">
-        <mergedPackage href="pathmap://QML_CORE/core.uml#_m7SIwOUYEd-P08Bciq_LqQ"/>
+      <packageMerge xmi:type="uml:PackageMerge" xmi:id="_lvUcAP3HEeC1YdT2qA0bjA">
+        <mergedPackage xmi:type="uml:Package" href="pathmap://QML_CORE/core.uml#_m7SIwOUYEd-P08Bciq_LqQ"/>
       </packageMerge>
       <packagedElement xmi:type="uml:Class" xmi:id="_ens7QOUTEd-P08Bciq_LqQ" clientDependency="_Q2C7UBE0EeG3cfLoiI6G7g _RqmkwBE0EeG3cfLoiI6G7g _F3inwCT7EeGXBt65HZzY7g _3GXWYCWSEeGB3KV6qwTHBw" name="StateMachine">
-        <generalization xmi:id="_ar4sECWNEeGB3KV6qwTHBw">
+        <generalization xmi:type="uml:Generalization" xmi:id="_ar4sECWNEeGB3KV6qwTHBw">
           <general xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_-WNegNtxEd6nqsBVkgJEEA"/>
         </generalization>
-        <ownedAttribute xmi:id="_dFBg4OupEeCTfOY57pgE3w" name="m_currentState" visibility="public">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_dFBg4OupEeCTfOY57pgE3w" name="m_currentState" visibility="public">
           <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_dFurgOupEeCTfOY57pgE3w" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dFurgeupEeCTfOY57pgE3w" value="1"/>
@@ -83,7 +83,7 @@ out->writeEvent (event);
             <value xsi:nil="true"/>
           </defaultValue>
         </ownedAttribute>
-        <ownedAttribute xmi:id="_S9FLsO3GEeCHv5BGhoZ8CA" name="executor" aggregation="shared" association="_S99VcO3GEeCHv5BGhoZ8CA">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_S9FLsO3GEeCHv5BGhoZ8CA" name="executor" aggregation="shared" association="_S99VcO3GEeCHv5BGhoZ8CA">
           <type xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_6uRBMOuqEeCTfOY57pgE3w"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_S9FLsu3GEeCHv5BGhoZ8CA" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_S9FLse3GEeCHv5BGhoZ8CA" value="1"/>
@@ -103,9 +103,9 @@ out->writeEvent (event);
             <value xsi:nil="true"/>
           </defaultValue>
         </ownedAttribute>
-        <interfaceRealization xmi:id="_3GXWYCWSEeGB3KV6qwTHBw" name="derived realization of ILifeCycle" client="_ens7QOUTEd-P08Bciq_LqQ">
-          <supplier xmi:type="uml:Interface" href="pathmap://QML_CORE/SystemInterfaces.uml#_T3li0Dz6Ed-v9PxuTj6Elw"/>
-          <contract href="pathmap://QML_CORE/SystemInterfaces.uml#_T3li0Dz6Ed-v9PxuTj6Elw"/>
+        <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_3GXWYCWSEeGB3KV6qwTHBw" name="derived realization of ILifeCycle" client="_ens7QOUTEd-P08Bciq_LqQ">
+          <supplier xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_T3li0Dz6Ed-v9PxuTj6Elw"/>
+          <contract xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_T3li0Dz6Ed-v9PxuTj6Elw"/>
         </interfaceRealization>
         <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_rglykOupEeCTfOY57pgE3w" name="processEvents" visibility="package" specification="_b5mYgCaiEeGRo-gX9igNzw">
           <language>C/C++</language>
@@ -122,12 +122,12 @@ out->writeEvent (event);
 	processEvents();
 }</body>
         </ownedBehavior>
-        <ownedOperation xmi:id="_3GbAwCWSEeGB3KV6qwTHBw" name="activate" method="_p_0sUCaiEeGRo-gX9igNzw"/>
-        <ownedOperation xmi:id="_3G6I8CWSEeGB3KV6qwTHBw" name="deactivate"/>
-        <ownedOperation xmi:id="_b5mYgCaiEeGRo-gX9igNzw" name="processEvents" method="_rglykOupEeCTfOY57pgE3w"/>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_3GbAwCWSEeGB3KV6qwTHBw" name="activate" method="_p_0sUCaiEeGRo-gX9igNzw"/>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_3G6I8CWSEeGB3KV6qwTHBw" name="deactivate"/>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_b5mYgCaiEeGRo-gX9igNzw" name="processEvents" method="_rglykOupEeCTfOY57pgE3w"/>
       </packagedElement>
       <packagedElement xmi:type="uml:Association" xmi:id="_S99VcO3GEeCHv5BGhoZ8CA" name="stateMachine_executor" memberEnd="_S99Vce3GEeCHv5BGhoZ8CA _S9FLsO3GEeCHv5BGhoZ8CA">
-        <ownedEnd xmi:id="_S99Vce3GEeCHv5BGhoZ8CA" name="stateMachine" type="_ens7QOUTEd-P08Bciq_LqQ" association="_S99VcO3GEeCHv5BGhoZ8CA">
+        <ownedEnd xmi:type="uml:Property" xmi:id="_S99Vce3GEeCHv5BGhoZ8CA" name="stateMachine" type="_ens7QOUTEd-P08Bciq_LqQ" association="_S99VcO3GEeCHv5BGhoZ8CA">
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_S998ge3GEeCHv5BGhoZ8CA" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_S998gO3GEeCHv5BGhoZ8CA" value="1"/>
         </ownedEnd>
@@ -145,34 +145,38 @@ out->writeEvent (event);
     <packagedElement xmi:type="uml:Class" xmi:id="_CV_x4O68EeCZ9MjsZTV1zw" name="CallEvents"/>
     <packagedElement xmi:type="uml:Class" xmi:id="_KEMp0CNYEeGj_4swHBbKwg" name="CallEventConfigurator"/>
     <packagedElement xmi:type="uml:Package" xmi:id="_F5DMoF8wEeGerN33d-RdRg" name="Animation">
-      <packagedElement xmi:type="uml:Class" xmi:id="_xELAwF81EeGbQoflzrdx0g" clientDependency="_bmInQF_4EeGbQoflzrdx0g" name="AnimationServer">
-        <ownedAttribute xmi:type="uml:Port" xmi:id="_z94Y0F81EeGbQoflzrdx0g" name="animServer" visibility="public" type="_L-I7kF8wEeGerN33d-RdRg" aggregation="composite">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_BLcrgHhAEeOejZqJpKQeww">
+        <body>Animation service configurator takes care of allocating the RemoveAnimService on the &quot;right&quot; node and to connect local and remote service configurators.</body>
+      </ownedComment>
+      <packagedElement xmi:type="uml:Class" xmi:id="_xELAwF81EeGbQoflzrdx0g" clientDependency="_bmInQF_4EeGbQoflzrdx0g" name="LocalAnimService">
+        <ownedAttribute xmi:type="uml:Port" xmi:id="_z94Y0F81EeGbQoflzrdx0g" name="animSvc" visibility="public" type="_L-I7kF8wEeGerN33d-RdRg" aggregation="composite">
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Y7e8F81EeGbQoflzrdx0g" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2ZEB0F81EeGbQoflzrdx0g" value="1"/>
           <defaultValue xmi:type="uml:LiteralString" xmi:id="_2ZSEQF81EeGbQoflzrdx0g">
             <value xsi:nil="true"/>
           </defaultValue>
         </ownedAttribute>
-        <interfaceRealization xmi:id="_bmInQF_4EeGbQoflzrdx0g" name="derived realization of IAnimation" client="_xELAwF81EeGbQoflzrdx0g" supplier="_L-I7kF8wEeGerN33d-RdRg" contract="_L-I7kF8wEeGerN33d-RdRg"/>
-        <ownedOperation xmi:id="_bmbiMF_4EeGbQoflzrdx0g" name="enterState">
-          <ownedParameter xmi:id="_OJXykGEpEeGzd_21sXyuog" name="stateEnum">
+        <ownedAttribute xmi:type="uml:Port" xmi:id="_ZXYggHg_EeOejZqJpKQeww" name="outAnimSvc" type="_L-I7kF8wEeGerN33d-RdRg" aggregation="composite"/>
+        <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_bmInQF_4EeGbQoflzrdx0g" name="derived realization of IAnimation" client="_xELAwF81EeGbQoflzrdx0g" supplier="_L-I7kF8wEeGerN33d-RdRg" contract="_L-I7kF8wEeGerN33d-RdRg"/>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_bmbiMF_4EeGbQoflzrdx0g" name="enterState">
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_OJXykGEpEeGzd_21sXyuog" name="stateEnum">
             <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_9XvcQB6REd6ITtm_FH3jRw"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_OJZAsGEpEeGzd_21sXyuog" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OJZAsWEpEeGzd_21sXyuog" value="1"/>
           </ownedParameter>
-          <ownedParameter xmi:id="_OJZnwGEpEeGzd_21sXyuog" name="eInstance">
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_OJZnwGEpEeGzd_21sXyuog" name="eInstance">
             <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_OJa14GEpEeGzd_21sXyuog" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OJbc8GEpEeGzd_21sXyuog" value="1"/>
           </ownedParameter>
         </ownedOperation>
-        <ownedOperation xmi:id="_bmo9kF_4EeGbQoflzrdx0g" name="leaveState">
-          <ownedParameter xmi:id="_OKJOoGEpEeGzd_21sXyuog" name="eState">
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_bmo9kF_4EeGbQoflzrdx0g" name="leaveState">
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_OKJOoGEpEeGzd_21sXyuog" name="eState">
             <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_9XvcQB6REd6ITtm_FH3jRw"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_OKKcwGEpEeGzd_21sXyuog" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OKLD0GEpEeGzd_21sXyuog" value="1"/>
           </ownedParameter>
-          <ownedParameter xmi:id="_OKLD0WEpEeGzd_21sXyuog" name="eInstance">
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_OKLD0WEpEeGzd_21sXyuog" name="eInstance">
             <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_OKMR8GEpEeGzd_21sXyuog" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OKM5AGEpEeGzd_21sXyuog"/>
@@ -180,48 +184,52 @@ out->writeEvent (event);
         </ownedOperation>
       </packagedElement>
       <packagedElement xmi:type="uml:Interface" xmi:id="_L-I7kF8wEeGerN33d-RdRg" name="IAnimation">
-        <ownedOperation xmi:id="_N3m-oF8wEeGerN33d-RdRg" name="enterState" visibility="public" isAbstract="true">
-          <ownedComment xmi:id="_YmEFYV8wEeGerN33d-RdRg">
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_N3m-oF8wEeGerN33d-RdRg" name="enterState" visibility="public" isAbstract="true">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_YmEFYV8wEeGerN33d-RdRg">
             <body>&lt;&lt;TextualRepresentation>>public abstract enterState (in stateEnum : StateMachine::Short, in eInstance : String) ;</body>
           </ownedComment>
-          <ownedParameter xmi:id="_NbPhQGEpEeGzd_21sXyuog" name="stateEnum">
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_NbPhQGEpEeGzd_21sXyuog" name="stateEnum">
             <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_9XvcQB6REd6ITtm_FH3jRw"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_NbYEIGEpEeGzd_21sXyuog" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NbbHcGEpEeGzd_21sXyuog" value="1"/>
           </ownedParameter>
-          <ownedParameter xmi:id="_NbdjsGEpEeGzd_21sXyuog" name="eInstance">
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_NbdjsGEpEeGzd_21sXyuog" name="eInstance">
             <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_NbupcGEpEeGzd_21sXyuog" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Nb2lQGEpEeGzd_21sXyuog" value="1"/>
           </ownedParameter>
         </ownedOperation>
-        <ownedOperation xmi:id="_ZgY_oF8wEeGerN33d-RdRg" name="leaveState" visibility="public" isAbstract="true">
-          <ownedComment xmi:id="_df_owF8wEeGerN33d-RdRg">
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_ZgY_oF8wEeGerN33d-RdRg" name="leaveState" visibility="public" isAbstract="true">
+          <ownedComment xmi:type="uml:Comment" xmi:id="_df_owF8wEeGerN33d-RdRg">
             <body>&lt;&lt;TextualRepresentation>>public abstract leaveState(in eState : StateMachine::Short, in eInstance : String) ;</body>
           </ownedComment>
-          <ownedParameter xmi:id="_OJfHUGEpEeGzd_21sXyuog" name="eState">
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_OJfHUGEpEeGzd_21sXyuog" name="eState">
             <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_9XvcQB6REd6ITtm_FH3jRw"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_OJr7oGEpEeGzd_21sXyuog" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OJwNEGEpEeGzd_21sXyuog" value="1"/>
           </ownedParameter>
-          <ownedParameter xmi:id="_OJ0egGEpEeGzd_21sXyuog" name="eInstance">
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_OJ0egGEpEeGzd_21sXyuog" name="eInstance">
             <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_OKCg8GEpEeGzd_21sXyuog" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OKHZcGEpEeGzd_21sXyuog" value="1"/>
           </ownedParameter>
         </ownedOperation>
       </packagedElement>
+      <packagedElement xmi:type="uml:Class" xmi:id="_QH7R8GGDEeO2F4QRMDSOXg" name="AnimServiceConfigurator"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_B0gFAHg_EeOejZqJpKQeww" name="RemoteAnimService">
+        <ownedAttribute xmi:type="uml:Port" xmi:id="_MLu-kHg_EeOejZqJpKQeww" name="animSvc" type="_L-I7kF8wEeGerN33d-RdRg" aggregation="composite"/>
+      </packagedElement>
     </packagedElement>
     <packagedElement xmi:type="uml:Package" xmi:id="_DEJCwF81EeGbQoflzrdx0g" name="rules">
       <packagedElement xmi:type="uml:Class" xmi:id="_18qdsO67EeCZ9MjsZTV1zw" name="StateMachineWCallEvents">
-        <ownedAttribute xmi:id="_LyxAEPTXEeCn1-FCrfecFg" name="callEventInterceptor" visibility="public" type="_u-qioOUTEd-P08Bciq_LqQ">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_LyxAEPTXEeCn1-FCrfecFg" name="callEventInterceptor" visibility="public" type="_u-qioOUTEd-P08Bciq_LqQ">
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_MGWDYPTXEeCn1-FCrfecFg" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MGfNUPTXEeCn1-FCrfecFg" value="1"/>
           <defaultValue xmi:type="uml:LiteralString" xmi:id="_MGz9cPTXEeCn1-FCrfecFg">
             <value xsi:nil="true"/>
           </defaultValue>
         </ownedAttribute>
-        <ownedAttribute xmi:id="_jXX54PTXEeCn1-FCrfecFg" name="eventPool" visibility="public">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_jXX54PTXEeCn1-FCrfecFg" name="eventPool" visibility="public">
           <type xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_JRmo0PNAEeCovO8AYZymZQ"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_l6kPYPTXEeCn1-FCrfecFg" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_l6k2cPTXEeCn1-FCrfecFg" value="1"/>
@@ -229,14 +237,14 @@ out->writeEvent (event);
             <value xsi:nil="true"/>
           </defaultValue>
         </ownedAttribute>
-        <ownedAttribute xmi:id="_mv6jAPTXEeCn1-FCrfecFg" name="stateMachine" visibility="public" type="_ens7QOUTEd-P08Bciq_LqQ">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_mv6jAPTXEeCn1-FCrfecFg" name="stateMachine" visibility="public" type="_ens7QOUTEd-P08Bciq_LqQ">
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ocG_EPTXEeCn1-FCrfecFg" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ocHmIPTXEeCn1-FCrfecFg" value="1"/>
           <defaultValue xmi:type="uml:LiteralString" xmi:id="_ocI0QPTXEeCn1-FCrfecFg">
             <value xsi:nil="true"/>
           </defaultValue>
         </ownedAttribute>
-        <ownedAttribute xmi:id="_vcPiUCWdEeGX6PuSE-DJlQ" name="thread" visibility="public">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_vcPiUCWdEeGX6PuSE-DJlQ" name="thread" visibility="public">
           <type xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_SiY_AP-EEd6628OhKk_dpg"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yS4YQCWdEeGX6PuSE-DJlQ" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yS4_UCWdEeGX6PuSE-DJlQ" value="1"/>
@@ -244,35 +252,35 @@ out->writeEvent (event);
             <value xsi:nil="true"/>
           </defaultValue>
         </ownedAttribute>
-        <ownedConnector xmi:id="_-DJY8PTXEeCn1-FCrfecFg" name="Connector-SM-Pool">
-          <end xmi:id="_-DKnEPTXEeCn1-FCrfecFg" partWithPort="_mv6jAPTXEeCn1-FCrfecFg" role="_u7pk4PRUEeCKVJwdD4MMsg">
+        <ownedConnector xmi:type="uml:Connector" xmi:id="_-DJY8PTXEeCn1-FCrfecFg" name="Connector-SM-Pool">
+          <end xmi:type="uml:ConnectorEnd" xmi:id="_-DKnEPTXEeCn1-FCrfecFg" partWithPort="_mv6jAPTXEeCn1-FCrfecFg" role="_u7pk4PRUEeCKVJwdD4MMsg">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-DKnEvTXEeCn1-FCrfecFg" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-DKnEfTXEeCn1-FCrfecFg" value="1"/>
           </end>
-          <end xmi:id="_-DL1MPTXEeCn1-FCrfecFg" partWithPort="_jXX54PTXEeCn1-FCrfecFg">
+          <end xmi:type="uml:ConnectorEnd" xmi:id="_-DL1MPTXEeCn1-FCrfecFg" partWithPort="_jXX54PTXEeCn1-FCrfecFg">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_-DL1MvTXEeCn1-FCrfecFg" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_-DL1MfTXEeCn1-FCrfecFg" value="1"/>
             <role xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#_MzO8gPNAEeCovO8AYZymZQ"/>
           </end>
         </ownedConnector>
-        <ownedConnector xmi:id="_nILRMPUHEeCn1-FCrfecFg" name="connector-CallEvent-Pool">
-          <end xmi:id="_nIL4QPUHEeCn1-FCrfecFg" partWithPort="_LyxAEPTXEeCn1-FCrfecFg" role="_a4NKMOuMEeCTfOY57pgE3w">
+        <ownedConnector xmi:type="uml:Connector" xmi:id="_nILRMPUHEeCn1-FCrfecFg" name="connector-CallEvent-Pool">
+          <end xmi:type="uml:ConnectorEnd" xmi:id="_nIL4QPUHEeCn1-FCrfecFg" partWithPort="_LyxAEPTXEeCn1-FCrfecFg" role="_a4NKMOuMEeCTfOY57pgE3w">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nIL4QvUHEeCn1-FCrfecFg" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nIL4QfUHEeCn1-FCrfecFg" value="1"/>
           </end>
-          <end xmi:id="_nIMfUPUHEeCn1-FCrfecFg" partWithPort="_jXX54PTXEeCn1-FCrfecFg">
+          <end xmi:type="uml:ConnectorEnd" xmi:id="_nIMfUPUHEeCn1-FCrfecFg" partWithPort="_jXX54PTXEeCn1-FCrfecFg">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nIMfUvUHEeCn1-FCrfecFg" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nIMfUfUHEeCn1-FCrfecFg" value="1"/>
             <role xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#_MzO8gPNAEeCovO8AYZymZQ"/>
           </end>
         </ownedConnector>
-        <ownedConnector xmi:id="__zI4QCWdEeGX6PuSE-DJlQ" name="connector-SM-thread">
-          <end xmi:id="__zI4QSWdEeGX6PuSE-DJlQ" partWithPort="_mv6jAPTXEeCn1-FCrfecFg">
+        <ownedConnector xmi:type="uml:Connector" xmi:id="__zI4QCWdEeGX6PuSE-DJlQ" name="connector-SM-thread">
+          <end xmi:type="uml:ConnectorEnd" xmi:id="__zI4QSWdEeGX6PuSE-DJlQ" partWithPort="_mv6jAPTXEeCn1-FCrfecFg">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__zI4QyWdEeGX6PuSE-DJlQ" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__zI4QiWdEeGX6PuSE-DJlQ" value="1"/>
             <role xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#__SLXgNtxEd6nqsBVkgJEEA"/>
           </end>
-          <end xmi:id="__zJfUCWdEeGX6PuSE-DJlQ" partWithPort="_vcPiUCWdEeGX6PuSE-DJlQ">
+          <end xmi:type="uml:ConnectorEnd" xmi:id="__zJfUCWdEeGX6PuSE-DJlQ" partWithPort="_vcPiUCWdEeGX6PuSE-DJlQ">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__zJfUiWdEeGX6PuSE-DJlQ" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__zJfUSWdEeGX6PuSE-DJlQ" value="1"/>
             <role xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#_ZjdOAP-EEd6628OhKk_dpg"/>
@@ -281,14 +289,14 @@ out->writeEvent (event);
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_b1zNUOusEeCTfOY57pgE3w" name="StateMachine"/>
       <packagedElement xmi:type="uml:Class" xmi:id="_IeWosF81EeGbQoflzrdx0g" name="StateMachineWCallEventsAndAnim">
-        <ownedAttribute xmi:id="_IeWosV81EeGbQoflzrdx0g" name="callEventInterceptor" visibility="public" type="_u-qioOUTEd-P08Bciq_LqQ">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_IeWosV81EeGbQoflzrdx0g" name="callEventInterceptor" visibility="public" type="_u-qioOUTEd-P08Bciq_LqQ">
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IeWos181EeGbQoflzrdx0g" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IeWosl81EeGbQoflzrdx0g" value="1"/>
           <defaultValue xmi:type="uml:LiteralString" xmi:id="_IeWotF81EeGbQoflzrdx0g">
             <value xsi:nil="true"/>
           </defaultValue>
         </ownedAttribute>
-        <ownedAttribute xmi:id="_IeWotV81EeGbQoflzrdx0g" name="eventPool" visibility="public">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_IeWotV81EeGbQoflzrdx0g" name="eventPool" visibility="public">
           <type xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_JRmo0PNAEeCovO8AYZymZQ"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IeWot181EeGbQoflzrdx0g" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IeWotl81EeGbQoflzrdx0g" value="1"/>
@@ -296,14 +304,14 @@ out->writeEvent (event);
             <value xsi:nil="true"/>
           </defaultValue>
         </ownedAttribute>
-        <ownedAttribute xmi:id="_IeXPwV81EeGbQoflzrdx0g" name="stateMachine" visibility="public" type="_ens7QOUTEd-P08Bciq_LqQ">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_IeXPwV81EeGbQoflzrdx0g" name="stateMachine" visibility="public" type="_ens7QOUTEd-P08Bciq_LqQ">
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IeXPw181EeGbQoflzrdx0g" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IeXPwl81EeGbQoflzrdx0g" value="1"/>
           <defaultValue xmi:type="uml:LiteralString" xmi:id="_IeXPxF81EeGbQoflzrdx0g">
             <value xsi:nil="true"/>
           </defaultValue>
         </ownedAttribute>
-        <ownedAttribute xmi:id="_IeXPxV81EeGbQoflzrdx0g" name="thread" visibility="public">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_IeXPxV81EeGbQoflzrdx0g" name="thread" visibility="public">
           <type xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_SiY_AP-EEd6628OhKk_dpg"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IeXPx181EeGbQoflzrdx0g" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IeXPxl81EeGbQoflzrdx0g" value="1"/>
@@ -311,81 +319,83 @@ out->writeEvent (event);
             <value xsi:nil="true"/>
           </defaultValue>
         </ownedAttribute>
-        <ownedAttribute xmi:id="_pTD04F81EeGbQoflzrdx0g" name="eclipseServer" visibility="public" type="_xELAwF81EeGbQoflzrdx0g" aggregation="shared">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_pTD04F81EeGbQoflzrdx0g" name="eclipseServer" visibility="public" type="_xELAwF81EeGbQoflzrdx0g" aggregation="shared">
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_rhbJ4F81EeGbQoflzrdx0g" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rhpMUF81EeGbQoflzrdx0g" value="1"/>
           <defaultValue xmi:type="uml:LiteralString" xmi:id="_rhtdwF81EeGbQoflzrdx0g">
             <value xsi:nil="true"/>
           </defaultValue>
         </ownedAttribute>
-        <ownedConnector xmi:id="_IeXPyV81EeGbQoflzrdx0g" name="Connector-SM-Pool">
-          <end xmi:id="_IeXPyl81EeGbQoflzrdx0g" partWithPort="_IeXPwV81EeGbQoflzrdx0g" role="_u7pk4PRUEeCKVJwdD4MMsg">
+        <ownedConnector xmi:type="uml:Connector" xmi:id="_IeXPyV81EeGbQoflzrdx0g" name="Connector-SM-Pool">
+          <end xmi:type="uml:ConnectorEnd" xmi:id="_IeXPyl81EeGbQoflzrdx0g" partWithPort="_IeXPwV81EeGbQoflzrdx0g" role="_u7pk4PRUEeCKVJwdD4MMsg">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IeXPzF81EeGbQoflzrdx0g" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IeXPy181EeGbQoflzrdx0g" value="1"/>
           </end>
-          <end xmi:id="_IeXPzV81EeGbQoflzrdx0g" partWithPort="_IeWotV81EeGbQoflzrdx0g">
+          <end xmi:type="uml:ConnectorEnd" xmi:id="_IeXPzV81EeGbQoflzrdx0g" partWithPort="_IeWotV81EeGbQoflzrdx0g">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IeXPz181EeGbQoflzrdx0g" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IeXPzl81EeGbQoflzrdx0g" value="1"/>
             <role xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#_MzO8gPNAEeCovO8AYZymZQ"/>
           </end>
         </ownedConnector>
-        <ownedConnector xmi:id="_IeXP0F81EeGbQoflzrdx0g" name="connector-CallEvent-Pool">
-          <end xmi:id="_IeXP0V81EeGbQoflzrdx0g" partWithPort="_IeWosV81EeGbQoflzrdx0g" role="_a4NKMOuMEeCTfOY57pgE3w">
+        <ownedConnector xmi:type="uml:Connector" xmi:id="_IeXP0F81EeGbQoflzrdx0g" name="connector-CallEvent-Pool">
+          <end xmi:type="uml:ConnectorEnd" xmi:id="_IeXP0V81EeGbQoflzrdx0g" partWithPort="_IeWosV81EeGbQoflzrdx0g" role="_a4NKMOuMEeCTfOY57pgE3w">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IeXP0181EeGbQoflzrdx0g" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IeXP0l81EeGbQoflzrdx0g" value="1"/>
           </end>
-          <end xmi:id="_IeXP1F81EeGbQoflzrdx0g" partWithPort="_IeWotV81EeGbQoflzrdx0g">
+          <end xmi:type="uml:ConnectorEnd" xmi:id="_IeXP1F81EeGbQoflzrdx0g" partWithPort="_IeWotV81EeGbQoflzrdx0g">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IeXP1l81EeGbQoflzrdx0g" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IeXP1V81EeGbQoflzrdx0g" value="1"/>
             <role xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#_MzO8gPNAEeCovO8AYZymZQ"/>
           </end>
         </ownedConnector>
-        <ownedConnector xmi:id="_IeXP1181EeGbQoflzrdx0g" name="connector-SM-thread">
-          <end xmi:id="_IeXP2F81EeGbQoflzrdx0g" partWithPort="_IeXPwV81EeGbQoflzrdx0g">
+        <ownedConnector xmi:type="uml:Connector" xmi:id="_IeXP1181EeGbQoflzrdx0g" name="connector-SM-thread">
+          <end xmi:type="uml:ConnectorEnd" xmi:id="_IeXP2F81EeGbQoflzrdx0g" partWithPort="_IeXPwV81EeGbQoflzrdx0g">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IeXP2l81EeGbQoflzrdx0g" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IeXP2V81EeGbQoflzrdx0g" value="1"/>
             <role xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#__SLXgNtxEd6nqsBVkgJEEA"/>
           </end>
-          <end xmi:id="_IeXP2181EeGbQoflzrdx0g" partWithPort="_IeXPxV81EeGbQoflzrdx0g">
+          <end xmi:type="uml:ConnectorEnd" xmi:id="_IeXP2181EeGbQoflzrdx0g" partWithPort="_IeXPxV81EeGbQoflzrdx0g">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IeXP3V81EeGbQoflzrdx0g" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IeXP3F81EeGbQoflzrdx0g" value="1"/>
             <role xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#_ZjdOAP-EEd6628OhKk_dpg"/>
           </end>
         </ownedConnector>
-        <ownedConnector xmi:id="_G9Gb4F82EeGbQoflzrdx0g" name="Connector1">
-          <end xmi:id="_G9HC8F82EeGbQoflzrdx0g" partWithPort="_IeXPwV81EeGbQoflzrdx0g" role="_xUE3QF8wEeGerN33d-RdRg">
+        <ownedConnector xmi:type="uml:Connector" xmi:id="_G9Gb4F82EeGbQoflzrdx0g" name="Connector1">
+          <end xmi:type="uml:ConnectorEnd" xmi:id="_G9HC8F82EeGbQoflzrdx0g" partWithPort="_IeXPwV81EeGbQoflzrdx0g" role="_xUE3QF8wEeGerN33d-RdRg">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_G9HC8l82EeGbQoflzrdx0g" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_G9HC8V82EeGbQoflzrdx0g" value="1"/>
           </end>
-          <end xmi:id="_G9HqAF82EeGbQoflzrdx0g" partWithPort="_pTD04F81EeGbQoflzrdx0g" role="_z94Y0F81EeGbQoflzrdx0g">
+          <end xmi:type="uml:ConnectorEnd" xmi:id="_G9HqAF82EeGbQoflzrdx0g" partWithPort="_pTD04F81EeGbQoflzrdx0g" role="_z94Y0F81EeGbQoflzrdx0g">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_G9HqAl82EeGbQoflzrdx0g" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_G9HqAV82EeGbQoflzrdx0g" value="1"/>
           </end>
         </ownedConnector>
       </packagedElement>
     </packagedElement>
-    <profileApplication xmi:id="_e8kikOUUEd-P08Bciq_LqQ">
-      <eAnnotations xmi:id="_fAD7cOUUEd-P08Bciq_LqQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_e8kikOUUEd-P08Bciq_LqQ">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fAD7cOUUEd-P08Bciq_LqQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
         <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/FCM/1#/"/>
       </eAnnotations>
-      <appliedProfile href="pathmap://FCM_PROFILES/FCM.profile.uml#_5mvT0MtjEd2H_o0jIC6qDQ"/>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://FCM_PROFILES/FCM.profile.uml#_5mvT0MtjEd2H_o0jIC6qDQ"/>
     </profileApplication>
-    <profileApplication xmi:id="_cnmBUBE1EeG3cfLoiI6G7g">
-      <eAnnotations xmi:id="_cz4J0BE1EeG3cfLoiI6G7g" source="http://www.eclipse.org/uml2/2.0.0/UML">
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_cnmBUBE1EeG3cfLoiI6G7g">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_cz4J0BE1EeG3cfLoiI6G7g" source="http://www.eclipse.org/uml2/2.0.0/UML">
         <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/>
       </eAnnotations>
-      <appliedProfile href="pathmap://PapyrusC_Cpp_PROFILES/C_Cpp.profile.uml#_j9REUByGEduN1bTiWJ0lyw"/>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://PapyrusC_Cpp_PROFILES/C_Cpp.profile.uml#_j9REUByGEduN1bTiWJ0lyw"/>
     </profileApplication>
   </uml:Model>
   <FCM:InteractionComponent xmi:id="_hanSUOUUEd-P08Bciq_LqQ" base_Class="_u-qioOUTEd-P08Bciq_LqQ"/>
-  <FCM:Template xmi:id="_9E8EUOUUEd-P08Bciq_LqQ" base_Element="_2qJyMOUUEd-P08Bciq_LqQ" kind="LoopOperations"/>
+  <FCM:Template xmi:id="_9E8EUOUUEd-P08Bciq_LqQ" base_Element="_2qJyMOUUEd-P08Bciq_LqQ" kind="LoopOperations">
+    <helper xmi:type="FCM:BindingHelper" href="pathmap://QML_CORE/core.uml#_nLe_sHJDEeOMF7YEvnQt5g"/>
+  </FCM:Template>
   <FCM:Port xmi:id="_a45twOuMEeCTfOY57pgE3w" base_Port="_a4NKMOuMEeCTfOY57pgE3w">
-    <kind href="pathmap://QML_CORE/core.uml#_9Fif4FRxEd6GqrP6fkWBoQ"/>
+    <kind xmi:type="FCM:PortKind" href="pathmap://QML_CORE/core.uml#_9Fif4FRxEd6GqrP6fkWBoQ"/>
   </FCM:Port>
   <FCM:ContainerRule xmi:id="_gsWFgOusEeCTfOY57pgE3w" base_Class="_b1zNUOusEeCTfOY57pgE3w" extensionKind="Aggregation" extension="_uC4BwOusEeCTfOY57pgE3w"/>
   <FCM:ContainerRule xmi:id="_IDtioO68EeCZ9MjsZTV1zw" base_Class="_CV_x4O68EeCZ9MjsZTV1zw" extensionKind="InterceptAllPorts" interceptor="_hanSUOUUEd-P08Bciq_LqQ"/>
   <FCM:Port xmi:id="_u7qzAPRUEeCKVJwdD4MMsg" base_Port="_u7pk4PRUEeCKVJwdD4MMsg">
-    <kind href="pathmap://QML_CORE/core.uml#_9Fif4FRxEd6GqrP6fkWBoQ"/>
+    <kind xmi:type="FCM:PortKind" href="pathmap://QML_CORE/core.uml#_9Fif4FRxEd6GqrP6fkWBoQ"/>
   </FCM:Port>
   <FCM:ContainerRule xmi:id="_RmD0YPTXEeCn1-FCrfecFg" base_Class="_18qdsO67EeCZ9MjsZTV1zw"/>
   <FCM:InterceptionRule xmi:id="_Z5CnUPUQEeCn1-FCrfecFg" interceptionKind="InterceptAllIn" base_Property="_LyxAEPTXEeCn1-FCrfecFg"/>
@@ -394,24 +404,34 @@ out->writeEvent (event);
   <FCM:UseInstanceConfigurator xmi:id="_StgB8CNYEeGj_4swHBbKwg" base_Class="_u-qioOUTEd-P08Bciq_LqQ" configurator="_QQYfQCNYEeGj_4swHBbKwg"/>
   <FCM:ConfigurationProperty xmi:id="_uhdD8CVvEeGaL60JjVj19Q" base_Property="_bL0sACVvEeGaL60JjVj19Q"/>
   <FCM:DerivedElement xmi:id="_3GrfcCWSEeGB3KV6qwTHBw" base_Element="_3GbAwCWSEeGB3KV6qwTHBw">
-    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/SystemInterfaces.uml#_WHyq4Dz6Ed-v9PxuTj6Elw"/>
+    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_WHyq4Dz6Ed-v9PxuTj6Elw"/>
   </FCM:DerivedElement>
   <FCM:DerivedElement xmi:id="_3G7-ICWSEeGB3KV6qwTHBw" base_Element="_3G6I8CWSEeGB3KV6qwTHBw">
-    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/SystemInterfaces.uml#_W7YrADz6Ed-v9PxuTj6Elw"/>
+    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_W7YrADz6Ed-v9PxuTj6Elw"/>
   </FCM:DerivedElement>
   <FCM:Template xmi:id="_nngKECaiEeGRo-gX9igNzw" base_Element="_b5mYgCaiEeGRo-gX9igNzw"/>
   <FCM:Port xmi:id="_JZGWgF8xEeGerN33d-RdRg" base_Port="_xUE3QF8wEeGerN33d-RdRg">
-    <kind href="pathmap://QML_CORE/core.uml#_9Fif4FRxEd6GqrP6fkWBoQ"/>
+    <kind xmi:type="FCM:PortKind" href="pathmap://QML_CORE/core.uml#_9Fif4FRxEd6GqrP6fkWBoQ"/>
   </FCM:Port>
   <FCM:ContainerRule xmi:id="_IeZE8F81EeGbQoflzrdx0g" base_Class="_IeWosF81EeGbQoflzrdx0g"/>
   <FCM:InterceptionRule xmi:id="_IeaTEF81EeGbQoflzrdx0g" interceptionKind="InterceptAllIn" base_Property="_IeWosV81EeGbQoflzrdx0g"/>
   <FCM:Port xmi:id="_5cn5cF81EeGbQoflzrdx0g" base_Port="_z94Y0F81EeGbQoflzrdx0g">
-    <kind href="pathmap://QML_CORE/core.uml#_wySlkFRxEd6GqrP6fkWBoQ"/>
+    <kind xmi:type="FCM:PortKind" href="pathmap://QML_CORE/core.uml#_wySlkFRxEd6GqrP6fkWBoQ"/>
   </FCM:Port>
   <FCM:Connector xmi:id="_RfomgF82EeGbQoflzrdx0g" base_Connector="_G9Gb4F82EeGbQoflzrdx0g">
-    <ic href="pathmap://QML_DISTRIBUTION/distribution.uml#_X9h_kNEBEd6acefdxFk2Lw"/>
+    <ic xmi:type="FCM:InteractionComponent" href="pathmap://QML_DISTRIBUTION/distribution.uml#_X9h_kNEBEd6acefdxFk2Lw"/>
   </FCM:Connector>
   <FCM:Singleton xmi:id="_uqa34F_1EeGbQoflzrdx0g" base_Class="_xELAwF81EeGbQoflzrdx0g"/>
   <FCM:DerivedElement xmi:id="_bmnIYF_4EeGbQoflzrdx0g" base_Element="_bmbiMF_4EeGbQoflzrdx0g" source="_N3m-oF8wEeGerN33d-RdRg"/>
   <FCM:DerivedElement xmi:id="_bmyukF_4EeGbQoflzrdx0g" base_Element="_bmo9kF_4EeGbQoflzrdx0g" source="_ZgY_oF8wEeGerN33d-RdRg"/>
+  <FCM:InstanceConfigurator xmi:id="_SdiecGGDEeO2F4QRMDSOXg" base_Class="_QH7R8GGDEeO2F4QRMDSOXg"/>
+  <FCM:UseInstanceConfigurator xmi:id="_VnhuMGGDEeO2F4QRMDSOXg" base_Class="_xELAwF81EeGbQoflzrdx0g" configurator="_SdiecGGDEeO2F4QRMDSOXg"/>
+  <FCM:Singleton xmi:id="_JOwQEHg_EeOejZqJpKQeww" base_Class="_B0gFAHg_EeOejZqJpKQeww"/>
+  <FCM:Port xmi:id="_hw3T8Hg_EeOejZqJpKQeww" base_Port="_ZXYggHg_EeOejZqJpKQeww">
+    <kind xmi:type="FCM:PortKind" href="pathmap://QML_CORE/core.uml#_9Fif4FRxEd6GqrP6fkWBoQ"/>
+  </FCM:Port>
+  <FCM:Port xmi:id="_ncWQEHg_EeOejZqJpKQeww" base_Port="_MLu-kHg_EeOejZqJpKQeww">
+    <kind xmi:type="FCM:PortKind" href="pathmap://QML_CORE/core.uml#_wySlkFRxEd6GqrP6fkWBoQ"/>
+  </FCM:Port>
+  <FCM:UseInstanceConfigurator xmi:id="_4HKnkHg_EeOejZqJpKQeww" base_Class="_B0gFAHg_EeOejZqJpKQeww" configurator="_SdiecGGDEeO2F4QRMDSOXg"/>
 </xmi:XMI>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/plugin.xml b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/plugin.xml
index 8580e549b30..896dae535c6 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/plugin.xml
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/plugin.xml
@@ -42,6 +42,14 @@
       <client class="org.eclipse.papyrus.qompass.modellibs.core.mappingrules.PushProdPullCons" portKindName="PushProdPullCons">
       </client>
    </extension>
+     <extension id="PushProdPullCons" point="org.eclipse.papyrus.fcm.profile.fcmPortMappingRule">
+      <client class="org.eclipse.papyrus.qompass.modellibs.core.mappingrules.AMIcallback" portKindName="AMIcallback">
+      </client>
+   </extension>
+     <extension id="PushProdPullCons" point="org.eclipse.papyrus.fcm.profile.fcmPortMappingRule">
+      <client class="org.eclipse.papyrus.qompass.modellibs.core.mappingrules.AMIpoll" portKindName="AMIpoll">
+      </client>
+   </extension>
    <extension point="org.eclipse.papyrus.fcm.profile.fcmEmbeddingRule">
       <client class="org.eclipse.papyrus.qompass.modellibs.core.embeddingrules.AccordCall" portKindName="AccordCall">
       </client>
@@ -51,23 +59,23 @@
       </mapping>
    </extension>
    <extension name="CORBA basic types" point="org.eclipse.papyrus.uml.extensionpoints.UMLLibrary">
-      <library description="Qompass: CORBA basic types (long, wchar, ...)" iconpath="platform:/plugin/org.eclipse.papyrus.qompass.designer.core/icons/Qompass-16x16.gif" name="Qompass model library: CORBA basic types" path="pathmap://QML_CORE/corba.uml" provider="CEA LIST">
+      <library description="Qompass: CORBA basic types (long, wchar, ...)" iconpath="platform:/plugin/org.eclipse.papyrus.qompass.designer.ui/icons/Qompass-16x16.gif" name="Qompass model library: CORBA basic types" path="pathmap://QML_CORE/corba.uml" provider="CEA LIST">
       </library>
    </extension>
    <extension name="Qompass core library" point="org.eclipse.papyrus.uml.extensionpoints.UMLLibrary">
-      <library description="Qompass core library" iconpath="platform:/plugin/org.eclipse.papyrus.qompass.designer.core/icons/Qompass-16x16.gif" name="Qompass model library: basic" path="pathmap://QML_CORE/core.uml" provider="CEA LIST">
+      <library description="Qompass core library" iconpath="platform:/plugin/org.eclipse.papyrus.qompass.designer.ui/icons/Qompass-16x16.gif" name="Qompass model library: basic" path="pathmap://QML_CORE/core.uml" provider="CEA LIST">
       </library>
    </extension>
    <extension name="FIFO" point="org.eclipse.papyrus.uml.extensionpoints.UMLLibrary">
-      <library iconpath="platform:/plugin/org.eclipse.papyrus.qompass.designer.core/icons/Qompass-16x16.gif" name="Qompass model library: FIFO" path="pathmap://QML_CORE/fifo.uml" provider="CEA LIST">
+      <library iconpath="platform:/plugin/org.eclipse.papyrus.qompass.designer.ui/icons/Qompass-16x16.gif" name="Qompass model library: FIFO" path="pathmap://QML_CORE/fifo.uml" provider="CEA LIST">
       </library>
 	</extension>
 	<extension name="OS-AL" point="org.eclipse.papyrus.uml.extensionpoints.UMLLibrary">
-		<library iconpath="platform:/plugin/org.eclipse.papyrus.qompass.designer.core/icons/Qompass-16x16.gif" name="Qompass model library: OS abstraction layer (OS-AL)" path="pathmap://QML_CORE/osal.uml" provider="CEA LIST">
+		<library iconpath="platform:/plugin/org.eclipse.papyrus.qompass.designer.ui/icons/Qompass-16x16.gif" name="Qompass model library: OS abstraction layer (OS-AL)" path="pathmap://QML_CORE/osal.uml" provider="CEA LIST">
 		</library>
 	</extension>
 	<extension name="StateMachine" point="org.eclipse.papyrus.uml.extensionpoints.UMLLibrary">
-		<library iconpath="platform:/plugin/org.eclipse.papyrus.qompass.designer.core/icons/Qompass-16x16.gif" name="Qompass model library: State-machines" path="pathmap://QML_CORE/statemachine.uml" provider="CEA LIST">
+		<library iconpath="platform:/plugin/org.eclipse.papyrus.qompass.designer.ui/icons/Qompass-16x16.gif" name="Qompass model library: State-machines" path="pathmap://QML_CORE/statemachine.uml" provider="CEA LIST">
 		</library>
 	</extension>
 	<extension point="org.eclipse.papyrus.uml.diagram.wizards.templates">
@@ -89,7 +97,11 @@
 		</template>
 	</extension>
 	<extension point="org.eclipse.papyrus.qompass.designer.core.instanceConfig">
-		<client class="org.eclipse.papyrus.qompass.modellibs.core.CallEventConfigurator" configuratorID="CallEventConfigurator">
+		<client class="org.eclipse.papyrus.qompass.modellibs.core.iconfigurators.CallEventConfigurator" configuratorID="CallEventConfigurator">
+		</client>
+	</extension>
+	<extension point="org.eclipse.papyrus.qompass.designer.core.instanceConfig">
+		<client class="org.eclipse.papyrus.qompass.modellibs.core.iconfigurators.AnimServiceConfigurator" configuratorID="AnimServiceConfigurator">
 		</client>
 	</extension>
 	<extension point="org.eclipse.ui.newWizards">
@@ -102,7 +114,7 @@
 			category="org.eclipse.ui.Examples/org.eclipse.papyrus.qompass.designer.examples"
 			class="org.eclipse.papyrus.qompass.modellibs.core.HelloWorldModelWizard"
 			finalPerspective="org.eclipse.papyrus.infra.core.perspective"
-			icon="platform:/plugin/org.eclipse.papyrus.qompass.designer.core/icons/Qompass-16x16.gif"
+			icon="platform:/plugin/org.eclipse.papyrus.qompass.designer.ui/icons/Qompass-16x16.gif"
 			id="org.eclipse.papyrus.qompass.modellibs.core.new.HelloWorld"
 			name="Qompass hello world example">
 			<selection class="org.eclipse.core.resources.IResource"/>
@@ -111,12 +123,16 @@
 			category="org.eclipse.ui.Examples/org.eclipse.papyrus.qompass.designer.examples"
 			class="org.eclipse.papyrus.qompass.modellibs.core.ProducerConsumerModelWizard"
 			finalPerspective="org.eclipse.papyrus.infra.core.perspective"
-			icon="platform:/plugin/org.eclipse.papyrus.qompass.designer.core/icons/Qompass-16x16.gif"
+			icon="platform:/plugin/org.eclipse.papyrus.qompass.designer.ui/icons/Qompass-16x16.gif"
 			id="org.eclipse.papyrus.qompass.modellibs.core.new.ProducerConsumer"
 			name="Qompass producer/comsumer example">
 			<selection class="org.eclipse.core.resources.IResource"/>
 		</wizard>
 	</extension>
+	<extension id="LoopOperations" point="org.eclipse.papyrus.fcm.profile.fcmBindingHelper">
+		<client class="org.eclipse.papyrus.qompass.modellibs.core.bindinghelpers.LoopOperations" bindingHelperName="LoopOperations">
+		</client>
+	</extension>
 	<extension point="org.eclipse.help.toc">
 		<toc file="help/modellibs-core-examples.xml"/>
 		<toc file="help/modellibs-core-library.xml"/>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/Activator.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/Activator.java
index f2cbe552f92..369b1e2591a 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/Activator.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/Activator.java
@@ -1,5 +1,6 @@
 package org.eclipse.papyrus.qompass.modellibs.core;
 
+import org.eclipse.papyrus.infra.core.log.LogHelper;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
 
@@ -14,6 +15,8 @@ public class Activator extends AbstractUIPlugin {
 	// The shared instance
 	private static Activator plugin;
 
+    public static LogHelper log;
+
 	/**
 	 * The constructor
 	 */
@@ -29,6 +32,9 @@ public class Activator extends AbstractUIPlugin {
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
 		plugin = this;
+		
+		// register the login helper
+        log = new LogHelper(plugin);
 	}
 
 	/*
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/bindinghelpers/LoopOperations.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/bindinghelpers/LoopOperations.java
new file mode 100644
index 00000000000..2f9874c8b1e
--- /dev/null
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/bindinghelpers/LoopOperations.java
@@ -0,0 +1,114 @@
+package org.eclipse.papyrus.qompass.modellibs.core.bindinghelpers;
+
+import org.eclipse.emf.common.util.BasicEList;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.FCM.util.IBindingHelper;
+import org.eclipse.papyrus.qompass.designer.core.acceleo.AcceleoDriverWrapper;
+import org.eclipse.papyrus.qompass.designer.core.listeners.CopyListener;
+import org.eclipse.papyrus.qompass.designer.core.templates.BindingUtils;
+import org.eclipse.papyrus.qompass.designer.core.templates.TemplateUtils;
+import org.eclipse.papyrus.qompass.designer.core.transformations.Copy;
+import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationException;
+import org.eclipse.papyrus.qompass.modellibs.core.Activator;
+import org.eclipse.uml2.uml.Behavior;
+import org.eclipse.uml2.uml.Class;
+import org.eclipse.uml2.uml.Classifier;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.EnumerationLiteral;
+import org.eclipse.uml2.uml.Interface;
+import org.eclipse.uml2.uml.OpaqueBehavior;
+import org.eclipse.uml2.uml.Operation;
+import org.eclipse.uml2.uml.TemplateBinding;
+import org.eclipse.uml2.uml.Type;
+
+public class LoopOperations implements IBindingHelper, CopyListener {
+
+	private TemplateBinding binding;
+	
+	@Override
+	public EObject copyEObject(Copy copy, EObject sourceEObj) {
+		
+		if(sourceEObj instanceof Operation) {
+			Operation operation = (Operation)sourceEObj;
+
+			Classifier actual = TemplateUtils.getFirstActualFromBinding(binding);
+			Class boundClass = copy.getCopy(operation.getClass_());
+			
+			if(!(actual instanceof Interface)) {
+				return sourceEObj;
+			}
+			Interface passedActualIntf = (Interface)actual;
+			Operation last = null;
+			EList<Element> removalList = new BasicEList<Element>();
+			for(Operation intfOperation : passedActualIntf.getAllOperations()) {
+				for(Element removalElement : removalList) {
+					copy.removeForCopy(removalElement); // enable subsequent instantiations
+				}
+				removalList.clear();
+				last = BindingUtils.instantiateOperation(copy, intfOperation, operation, boundClass);
+				removalList.add(operation);
+				for(Behavior method : operation.getMethods()) {
+					if(method instanceof OpaqueBehavior) {
+						try {
+							Behavior newBehavior =
+								BindingUtils.instantiateBehavior(copy, intfOperation, (OpaqueBehavior)method);
+							newBehavior.setSpecification(last);
+						}
+						catch (TransformationException e) {
+							Activator.log.error(e);;
+						}
+						// removalList.add(method);
+						copy.removeForCopy(method); // enable subsequent instantiations
+					}
+				}
+			}
+			// from a logical viewpoint, we need to copy parameters & name, but not the
+			// operation identity.
+			copy.put(operation, last);
+			return last;
+			/*
+			else { // not LOOP_OPERATIONS
+			Operation newOperation = instantiateOperation(actual, template, operation, boundClass);
+			for(Behavior method : operation.getMethods()) {
+				if(method instanceof OpaqueBehavior) {
+					Behavior newBehavior =
+						instantiateBehavior(actual, template, (OpaqueBehavior)method);
+					newBehavior.setSpecification(newOperation);
+				}
+			}
+			return newOperation;
+			*/
+		}
+		else if(sourceEObj instanceof EnumerationLiteral) {
+				EnumerationLiteral literal = (EnumerationLiteral)sourceEObj;
+				Classifier actual = TemplateUtils.getFirstActualFromBinding(binding);
+				// Type passedActual = getPassedActual(template, actual, boundClass);
+				Type passedActual = actual;
+				if(!(passedActual instanceof Interface)) {
+					return sourceEObj;
+				}
+				Interface passedActualIntf = (Interface)passedActual;
+				EnumerationLiteral newLiteral = null;
+				for(Operation intfOperation : passedActualIntf.getAllOperations()) {
+					copy.removeForCopy(literal);
+					newLiteral = copy.getCopy(literal);
+					try {
+						String newName = AcceleoDriverWrapper.evaluate(literal.getName(), intfOperation, null);
+						newLiteral.setName(newName);
+					}
+					catch (TransformationException e) {
+						Activator.log.error(e);
+						newLiteral.setName("none"); //$NON-NLS-1$
+					}
+				}
+				return newLiteral;
+			}
+		return null;
+	}
+
+	@Override
+	public void handleElement(TemplateBinding binding, Element object) {
+		this.binding = binding;
+	}
+}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/iconfigurators/AnimServiceConfigurator.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/iconfigurators/AnimServiceConfigurator.java
new file mode 100644
index 00000000000..21bc29e0e2e
--- /dev/null
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/iconfigurators/AnimServiceConfigurator.java
@@ -0,0 +1,67 @@
+/*****************************************************************************
+ * 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:
+ *  Ansgar Radermacher  ansgar.radermacher@cea.fr  
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.qompass.modellibs.core.iconfigurators;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.papyrus.qompass.designer.core.deployment.AllocUtils;
+import org.eclipse.papyrus.qompass.designer.core.extensions.IInstanceConfigurator;
+import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationRTException;
+import org.eclipse.uml2.uml.InstanceSpecification;
+import org.eclipse.uml2.uml.NamedElement;
+import org.eclipse.uml2.uml.Property;
+
+/**
+ * Configurator for the Eclipse animation server. This instance is systematically
+ * allocated to a node named "Eclipse" call event (for a state machine): it sets the
+ * portID attribute of the call event interceptor. The interceptor uses this
+ * attribute to initialize the portID attribute within the produced CallEvent
+ * data structure.
+ * 
+ * @author ansgar
+ * 
+ */
+public class AnimServiceConfigurator implements IInstanceConfigurator {
+
+	public final static String eclipseAnimService = "Eclipse"; //$NON-NLS-1$
+
+	/**
+	 * Configure the instance of a CallEvent interceptor. The configuration parameter is the
+	 * index of the port which gets intercepted. It is obtained via an enumeration
+	 * 
+	 * @see org.eclipse.papyrus.qompass.designer.core.extensions.IInstanceConfigurator#configureInstance(org.eclipse.uml2.uml.InstanceSpecification,
+	 *      org.eclipse.uml2.uml.InstanceSpecification, org.eclipse.uml2.uml.Port)
+	 * 
+	 * @param instance
+	 *        the instance that should be configured
+	 * @param componentPart
+	 *        the part representing this instance
+	 * @param context
+	 *        container context
+	 */
+	public void configureInstance(InstanceSpecification instance, Property componentPart, InstanceSpecification parentInstance)
+	{
+		EList<InstanceSpecification> nodes = AllocUtils.getAllNodesOrThreadsParent(parentInstance);
+		if (nodes.size() > 0) {
+			InstanceSpecification node = nodes.get(0);
+			NamedElement animService = node.getNearestPackage().getMember(eclipseAnimService);
+			if (animService instanceof InstanceSpecification) {
+				AllocUtils.allocate(instance, (InstanceSpecification)animService);
+				return;
+			}
+		}
+		throw new TransformationRTException(String.format("Cannot find node <%s> in platform definition", eclipseAnimService)); 
+	}
+
+}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/CallEventConfigurator.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/iconfigurators/CallEventConfigurator.java
index 147ab53e11b..ca3a437adb0 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/CallEventConfigurator.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/iconfigurators/CallEventConfigurator.java
@@ -12,12 +12,10 @@
  *
  *****************************************************************************/
 
-package org.eclipse.papyrus.qompass.modellibs.core;
+package org.eclipse.papyrus.qompass.modellibs.core.iconfigurators;
 
-import org.eclipse.papyrus.qompass.designer.core.acceleo.UMLTool;
 import org.eclipse.papyrus.qompass.designer.core.deployment.DepPlanUtils;
 import org.eclipse.papyrus.qompass.designer.core.extensions.IInstanceConfigurator;
-import org.eclipse.papyrus.qompass.designer.core.transformations.ContainerContext;
 import org.eclipse.uml2.uml.InstanceSpecification;
 import org.eclipse.uml2.uml.Property;
 
@@ -32,7 +30,7 @@ import org.eclipse.uml2.uml.Property;
  */
 public class CallEventConfigurator implements IInstanceConfigurator {
 
-	public final static String portAttribute = "portID";
+	public final static String portAttribute = "portID"; //$NON-NLS-1$
 
 	/**
 	 * Configure the instance of a CallEvent interceptor. The configuration parameter is the
@@ -48,12 +46,12 @@ public class CallEventConfigurator implements IInstanceConfigurator {
 	 * @param context
 	 *        container context
 	 */
-	public void configureInstance(InstanceSpecification instance, Property componentPart, ContainerContext context)
+	public void configureInstance(InstanceSpecification instance, Property componentPart, InstanceSpecification parentInstance)
 	{
-		if(context != null) {
+		if(parentInstance != null) {
 			// make sure that there is an enum par port
-			String literalName = "port_" + UMLTool.varName(context.port);
-			// literalName = "0";
+			// String literalName = "port_" + UMLTool.varName(context.port); //$NON-NLS-1$
+
 			// the associated enumeration is declared by the statemachine (which is included by the bootloader as well)
 
 			DepPlanUtils.configureProperty(instance, portAttribute, 0);
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/AMIcallback.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/AMIcallback.java
new file mode 100644
index 00000000000..05c33faa99d
--- /dev/null
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/AMIcallback.java
@@ -0,0 +1,159 @@
+package org.eclipse.papyrus.qompass.modellibs.core.mappingrules;
+
+import java.util.Iterator;
+
+import org.eclipse.papyrus.FCM.Port;
+import org.eclipse.papyrus.FCM.util.IMappingRule;
+import org.eclipse.papyrus.FCM.util.MapUtil;
+import org.eclipse.uml2.uml.Interface;
+import org.eclipse.uml2.uml.Operation;
+import org.eclipse.uml2.uml.Parameter;
+import org.eclipse.uml2.uml.ParameterDirectionKind;
+import org.eclipse.uml2.uml.Type;
+
+
+public class AMIcallback implements IMappingRule {
+
+	public Interface getProvided(Port p, boolean update) {
+		Type type = p.getBase_Port().getType();
+		if(!(type instanceof Interface))
+			return null;
+
+		Interface typingInterface = (Interface)type;
+		Interface derivedInterface = MapUtil.getOrCreateDerivedInterface(p, "_reply_", type, update);
+		if (!update) {
+			return derivedInterface;
+		}
+
+		for(Operation operation : typingInterface.getOwnedOperations()) {
+			String name = operation.getName();
+
+			if(AMIpoll.hasOutParameters(operation)) {
+
+				// check whether operation already exists. Create, if not
+				Operation derivedOperation = derivedInterface.getOperation(name, null, null);
+				if(derivedOperation == null) {
+					derivedOperation = derivedInterface.createOwnedOperation(name, null, null);
+				}
+
+				// each non-in parameter is in the poll operation. 
+				for(Parameter parameter : operation.getOwnedParameters()) {
+					if(parameter.getDirection() != ParameterDirectionKind.IN_LITERAL) {
+
+						String paramName = parameter.getName();
+						Type paramType = parameter.getType();
+						if(derivedOperation.getOwnedParameter(paramName, paramType) == null) {
+							Parameter newParameter =
+								derivedOperation.createOwnedParameter(parameter.getName(), parameter.getType());
+							newParameter.setDirection(ParameterDirectionKind.IN_LITERAL);
+							newParameter.setLower(parameter.getLower());
+							newParameter.setUpper(parameter.getUpper());
+						}
+					}
+				}
+
+				// remove those parameters that exist in derived, but not original interface.
+				Iterator<Parameter> derivedParameters = derivedOperation.getOwnedParameters().iterator();
+				while(derivedParameters.hasNext()) {
+					Parameter parameter = derivedParameters.next();
+					String paramName = parameter.getName();
+					Type paramType = parameter.getType();
+					if(operation.getOwnedParameter(paramName, paramType) == null) {
+						// not on in original interface, remove from derived as well
+						derivedParameters.remove();
+					}
+				}
+			}
+		}
+
+		// check whether operations in derived interface exist in original interface
+		// (remove, if not)
+		Iterator<Operation> derivedOperations = derivedInterface.getOwnedOperations().iterator();
+		while(derivedOperations.hasNext()) {
+			Operation derivedOperation = derivedOperations.next();
+			String name = derivedOperation.getName();
+			if(name == null) {
+				continue;
+			}
+			if(typingInterface.getOperation(name, null, null) == null) {
+				// not in typing interface, remove
+				derivedOperations.remove();
+			}
+		}
+		return derivedInterface;
+	}
+
+	public Interface getRequired(Port p, boolean update) {
+		Type type = p.getBase_Port().getType();
+		if(!(type instanceof Interface))
+			return null;
+
+		Interface typingInterface = (Interface)type;
+		Interface derivedInterface = MapUtil.getOrCreateDerivedInterface(p, "_req_", type, update); //$NON-NLS-1$
+		if (!update) {
+			return derivedInterface;
+		}
+
+		for(Operation operation : typingInterface.getOwnedOperations()) {
+			String name = operation.getName();
+
+			// check whether operation already exists. Create, if not
+			Operation derivedOperation = derivedInterface.getOperation(name, null, null);
+			if(derivedOperation == null) {
+				derivedOperation = derivedInterface.createOwnedOperation(name, null, null);
+			}
+
+			// request operation contains only in and inout parameters 
+			for(Parameter parameter : operation.getOwnedParameters()) {
+				if((parameter.getDirection() == ParameterDirectionKind.IN_LITERAL) ||
+					(parameter.getDirection() == ParameterDirectionKind.INOUT_LITERAL)) {
+
+					String paramName = parameter.getName();
+					Type paramType = parameter.getType();
+					if(derivedOperation.getOwnedParameter(paramName, paramType) == null) {
+						Parameter newParameter =
+							derivedOperation.createOwnedParameter(parameter.getName(), parameter.getType());
+						newParameter.setDirection(parameter.getDirection());
+						newParameter.setLower(parameter.getLower());
+						newParameter.setUpper(parameter.getUpper());
+					}
+				}
+			}
+
+			// remove those parameters that exist in derived, but not original interface.
+			Iterator<Parameter> derivedParameters = derivedOperation.getOwnedParameters().iterator();
+			while(derivedParameters.hasNext()) {
+				Parameter parameter = derivedParameters.next();
+				String paramName = parameter.getName();
+				Type paramType = parameter.getType();
+				if(operation.getOwnedParameter(paramName, paramType) == null) {
+					// not on in original interface, remove from derived as well
+					derivedParameters.remove();
+				}
+			}
+		}
+
+		// check whether operations in derived interface exist in original interface
+		// (remove, if not)
+		Iterator<Operation> derivedOperations = derivedInterface.getOwnedOperations().iterator();
+		while(derivedOperations.hasNext()) {
+			Operation derivedOperation = derivedOperations.next();
+			String name = derivedOperation.getName();
+			if(name == null) {
+				continue;
+			}
+			if(typingInterface.getOperation(name, null, null) == null) {
+				// not in typing interface, remove
+				derivedOperations.remove();
+			}
+		}
+
+		return derivedInterface;
+	}
+	
+	public boolean needsUpdate(Port p) {
+		// TODO: insufficient condition
+		return (getRequired(p, false) == null) ||
+				(getProvided(p, false) == null);
+	}
+}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/AMIpoll.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/AMIpoll.java
new file mode 100644
index 00000000000..53e395b0077
--- /dev/null
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/AMIpoll.java
@@ -0,0 +1,158 @@
+/*****************************************************************************
+ * 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:
+ *  Ansgar Radermacher  ansgar.radermacher@cea.fr  
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.qompass.modellibs.core.mappingrules;
+
+import java.util.Iterator;
+
+import org.eclipse.papyrus.FCM.Port;
+import org.eclipse.papyrus.FCM.util.IMappingRule;
+import org.eclipse.papyrus.FCM.util.MapUtil;
+import org.eclipse.uml2.uml.Interface;
+import org.eclipse.uml2.uml.Operation;
+import org.eclipse.uml2.uml.Parameter;
+import org.eclipse.uml2.uml.ParameterDirectionKind;
+import org.eclipse.uml2.uml.Type;
+
+
+/**
+ * Implement a CORBA AMI style polling interface
+ * This is defined in the CORBA 3 standard in section 22.6.2
+ * A difference is that we do not return the poller object, but the client uses the original port.
+ * This has the consequence that it is not possible to make multiple asynchronous requests.
+ * 
+ * A second difference is that we do not keep the normal methods in the same interface and prefix the
+ * new ones. (which would probably be a good idea).
+ * 
+ * @author ansgar
+ * 
+ */
+public class AMIpoll implements IMappingRule {
+
+
+	public Interface getProvided(Port p, boolean update) {
+		return null;
+	}
+
+	public Interface getRequired(Port p, boolean update) {
+		Type type = p.getBase_Port().getType();
+		if(!(type instanceof Interface))
+			return null;
+
+		Interface typingInterface = (Interface)type;
+		Interface derivedInterface = MapUtil.getOrCreateDerivedInterface(p, "_", type, update); //$NON-NLS-1$
+		if (!update) {
+			return derivedInterface;
+		}
+		
+		for(Operation operation : typingInterface.getOwnedOperations()) {
+			String name = operation.getName();
+
+			// check whether operation already exists. Create, if not
+			Operation derivedOperation = derivedInterface.getOperation(name, null, null);
+			if(derivedOperation == null) {
+				derivedOperation = derivedInterface.createOwnedOperation(name, null, null);
+			}
+
+			if(hasOutParameters(operation)) {
+				String pollName = name + "Poll"; //$NON-NLS-1$
+				Operation derivedPollOperation = derivedInterface.getOperation(pollName, null, null);
+				if(derivedPollOperation == null) {
+					derivedPollOperation = derivedInterface.createOwnedOperation(pollName, null, null);
+				}
+
+				// each non-in parameter is in the poll operation. 
+				derivedPollOperation.createOwnedParameter("timeout", null); //$NON-NLS-1$
+
+				for(Parameter parameter : operation.getOwnedParameters()) {
+					if(parameter.getDirection() != ParameterDirectionKind.IN_LITERAL) {
+
+						String paramName = parameter.getName();
+						Type paramType = parameter.getType();
+						if(derivedPollOperation.getOwnedParameter(paramName, paramType) == null) {
+							Parameter newParameter =
+								derivedPollOperation.createOwnedParameter(parameter.getName(), parameter.getType());
+							newParameter.setDirection(parameter.getDirection());
+							newParameter.setLower(parameter.getLower());
+							newParameter.setUpper(parameter.getUpper());
+						}
+					}
+				}
+			}
+			// each in and inout parameter is in the request operation. 
+			for(Parameter parameter : operation.getOwnedParameters()) {
+				if((parameter.getDirection() == ParameterDirectionKind.IN_LITERAL) ||
+					(parameter.getDirection() == ParameterDirectionKind.INOUT_LITERAL)) {
+
+					String paramName = parameter.getName();
+					Type paramType = parameter.getType();
+					if(derivedOperation.getOwnedParameter(paramName, paramType) == null) {
+						Parameter newParameter =
+							derivedOperation.createOwnedParameter(parameter.getName(), parameter.getType());
+						newParameter.setDirection(parameter.getDirection());
+						newParameter.setLower(parameter.getLower());
+						newParameter.setUpper(parameter.getUpper());
+					}
+				}
+			}
+			// remove those parameters that exist in derived, but not original interface.
+			Iterator<Parameter> derivedParameters = derivedOperation.getOwnedParameters().iterator();
+			while(derivedParameters.hasNext()) {
+				Parameter parameter = derivedParameters.next();
+				String paramName = parameter.getName();
+				Type paramType = parameter.getType();
+				if((!paramName.equals("timeout")) && //$NON-NLS-1$
+					(operation.getOwnedParameter(paramName, paramType) == null)) {
+					// not on in original interface, remove from derived as well
+					derivedParameters.remove();
+				}
+			}
+		}
+
+		// check whether operations in derived interface exist in original interface
+		// (remove, if not)
+		Iterator<Operation> derivedOperations = derivedInterface.getOwnedOperations().iterator();
+		while(derivedOperations.hasNext()) {
+			Operation derivedOperation = derivedOperations.next();
+			String name = derivedOperation.getName();
+			if(name == null) {
+				continue;
+			}
+			if(name.endsWith("Poll")) { //$NON-NLS-1$
+				// remove Poll postfix
+				name = name.substring(0, name.length() - 4);
+			}
+			if(typingInterface.getOperation(name, null, null) == null) {
+				// not in typing interface, remove
+				derivedOperations.remove();
+			}
+		}
+
+		return derivedInterface;
+	}
+
+	public static boolean hasOutParameters(Operation operation) {
+		for(Parameter parameter : operation.getOwnedParameters()) {
+			if(parameter.getDirection() != ParameterDirectionKind.IN_LITERAL) {
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	public boolean needsUpdate(Port p) {
+		// TODO: insufficient condition
+		return (getRequired(p, false) == null);
+	}
+}
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/PullConsumer.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/PullConsumer.java
index df6d02d5e56..0010236de70 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/PullConsumer.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/PullConsumer.java
@@ -93,7 +93,7 @@ public class PullConsumer implements IMappingRule {
 		Element owner = umlPort.getOwner();
 		String ownerStr = ""; //$NON-NLS-1$
 		if(owner instanceof NamedElement) {
-			ownerStr = " of class " + ((NamedElement)owner).getQualifiedName();
+			ownerStr = " of class " + ((NamedElement)owner).getQualifiedName(); //$NON-NLS-1$
 		}
 		Log.log(Status.INFO, Log.CALC_PORTKIND,
 			p.getKind().getBase_Class().getName() + " => GetRequired on " + umlPort.getName() + ownerStr);
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/PushProdPullCons.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/PushProdPullCons.java
index cd61c5d9070..50f65037250 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/PushProdPullCons.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/PushProdPullCons.java
@@ -44,7 +44,7 @@ public class PushProdPullCons implements IMappingRule {
 		Element owner = umlPort.getOwner();
 		String ownerStr = ""; //$NON-NLS-1$
 		if(owner instanceof NamedElement) {
-			ownerStr = " of class " + ((NamedElement)owner).getQualifiedName();
+			ownerStr = " of class " + ((NamedElement)owner).getQualifiedName(); //$NON-NLS-1$
 		}
 		Log.log(Status.INFO, Log.CALC_PORTKIND,
 			p.getKind().getBase_Class().getName() + " => GetRequired on " + umlPort.getName() + ownerStr);
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/tmpModel/ClientServerTimerTmp.uml b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/tmpModel/ClientServerTimerTmp.uml
deleted file mode 100644
index dff0d18210d..00000000000
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/tmpModel/ClientServerTimerTmp.uml
+++ /dev/null
@@ -1,290 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Alloc="http://www.eclipse.org/papyrus/Alloc/1" xmlns:C_Cpp="http://www.eclipse.org/papyrus/C_Cpp/1" xmlns:FCM="http://www.eclipse.org/papyrus/FCM/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/Alloc/1 http://www.eclipse.org/papyrus/MARTE/1#//Alloc">
-  <uml:Model xmi:id="_O6TiIDLUEd26WNosUASSSw" name="ClientServerTimer">
-    <packageImport xmi:id="_Z4LvQBqvEeOvgeTpolSdGg">
-      <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
-    </packageImport>
-    <packageImport xmi:id="_Z4MWUBqvEeOvgeTpolSdGg">
-      <importedPackage xmi:type="uml:Model" href="pathmap://QML_CORE/core.uml#_O6TiIDLUEd26WNosUASSSw"/>
-    </packageImport>
-    <packageImport xmi:id="_Z4M9YBqvEeOvgeTpolSdGg">
-      <importedPackage xmi:type="uml:Model" href="pathmap://QML_CORE/corba.uml#_DtQEwDLdEd2_U4efLnjQIw"/>
-    </packageImport>
-    <packagedElement xmi:type="uml:Package" xmi:id="_Z4NkcBqvEeOvgeTpolSdGg" name="globalenums"/>
-    <packagedElement xmi:type="uml:Package" xmi:id="_Z4TEABqvEeOvgeTpolSdGg" name="deployment">
-      <packagedElement xmi:type="uml:Package" xmi:id="_Z4TEARqvEeOvgeTpolSdGg" name="linux">
-        <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_Z4TrEBqvEeOvgeTpolSdGg" clientDependency="_aD2zwBqvEeOvgeTpolSdGg" name="mySystem" classifier="_bYJagDLiEd2RVeNawwNNzg">
-          <slot xmi:id="_aEGEUBqvEeOvgeTpolSdGg" definingFeature="_gV1cgDLiEd2RVeNawwNNzg">
-            <value xmi:type="uml:InstanceValue" xmi:id="_aEGEURqvEeOvgeTpolSdGg" instance="_aEBL0BqvEeOvgeTpolSdGg"/>
-          </slot>
-          <slot xmi:id="_aEHScBqvEeOvgeTpolSdGg" definingFeature="_i-I7gDLiEd2RVeNawwNNzg">
-            <value xmi:type="uml:InstanceValue" xmi:id="_aEH5gBqvEeOvgeTpolSdGg" instance="_aEGrYBqvEeOvgeTpolSdGg"/>
-          </slot>
-          <slot xmi:id="_aEOnMBqvEeOvgeTpolSdGg" definingFeature="_lKtZUCjYEeGFbebITJYb9g">
-            <value xmi:type="uml:InstanceValue" xmi:id="_aEOnMRqvEeOvgeTpolSdGg" instance="_aEH5gRqvEeOvgeTpolSdGg"/>
-          </slot>
-        </packagedElement>
-        <packagedElement xmi:type="uml:Abstraction" xmi:id="_aD2zwBqvEeOvgeTpolSdGg" name="allocate mySystem to linux" client="_Z4TrEBqvEeOvgeTpolSdGg" supplier="_6EgaIDa3EeGBl4WmUxMhOA"/>
-        <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_aEBL0BqvEeOvgeTpolSdGg" name="mySystem.server" classifier="_oqZNUDLaEd2qeKRLMdIx_A"/>
-        <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_aEGrYBqvEeOvgeTpolSdGg" name="mySystem.client" classifier="_IfjoETLbEd2qeKRLMdIx_A"/>
-        <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_aEH5gRqvEeOvgeTpolSdGg" name="mySystem.timer">
-          <classifier xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_-X6zMCjZEeGFbebITJYb9g"/>
-          <slot xmi:id="_aEK80hqvEeOvgeTpolSdGg">
-            <definingFeature xmi:type="uml:Property" href="pathmap://QML_CORE/core.uml#_ARs_UCjaEeGFbebITJYb9g"/>
-            <value xmi:type="uml:InstanceValue" xmi:id="_aELj4BqvEeOvgeTpolSdGg" instance="_aEJHoBqvEeOvgeTpolSdGg"/>
-          </slot>
-          <slot xmi:id="_aEOAIBqvEeOvgeTpolSdGg">
-            <definingFeature xmi:type="uml:Property" href="pathmap://QML_CORE/core.uml#_RMqEkCjaEeGFbebITJYb9g"/>
-            <value xmi:type="uml:InstanceValue" xmi:id="_aEOAIRqvEeOvgeTpolSdGg" instance="_aEMK8BqvEeOvgeTpolSdGg"/>
-          </slot>
-        </packagedElement>
-        <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_aEJHoBqvEeOvgeTpolSdGg" name="mySystem.timer.timer">
-          <classifier xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_9V8OQCjYEeGFbebITJYb9g"/>
-          <slot xmi:id="_aEK80BqvEeOvgeTpolSdGg">
-            <definingFeature xmi:type="uml:Property" href="pathmap://QML_CORE/core.uml#_tmNeoCjbEeGFbebITJYb9g"/>
-            <value xmi:type="uml:LiteralInteger" xmi:id="_aEK80RqvEeOvgeTpolSdGg" name="value for periodLength" value="250">
-              <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
-            </value>
-          </slot>
-        </packagedElement>
-        <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_aEMK8BqvEeOvgeTpolSdGg" name="mySystem.timer.thread">
-          <classifier xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_SiY_AP-EEd6628OhKk_dpg"/>
-        </packagedElement>
-      </packagedElement>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Package" xmi:id="_Z4USIBqvEeOvgeTpolSdGg" name="ComponentModel">
-      <packagedElement xmi:type="uml:Package" xmi:id="_Z4USIRqvEeOvgeTpolSdGg" name="System">
-        <packagedElement xmi:type="uml:Class" xmi:id="_bYJagDLiEd2RVeNawwNNzg" name="System_impl">
-          <ownedAttribute xmi:id="_gV1cgDLiEd2RVeNawwNNzg" name="server" type="_oqZNUDLaEd2qeKRLMdIx_A" isUnique="false" aggregation="composite"/>
-          <ownedAttribute xmi:id="_i-I7gDLiEd2RVeNawwNNzg" name="client" visibility="public" type="_IfjoETLbEd2qeKRLMdIx_A" isUnique="false" aggregation="composite">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_d5JgYFl6EeKFQZ_XV_Kn6g" value="1"/>
-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_d5KugFl6EeKFQZ_XV_Kn6g" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_d5MjsFl6EeKFQZ_XV_Kn6g">
-              <value xsi:nil="true"/>
-            </defaultValue>
-          </ownedAttribute>
-          <ownedAttribute xmi:id="_lKtZUCjYEeGFbebITJYb9g" name="timer" visibility="public" aggregation="composite">
-            <type xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_-X6zMCjZEeGFbebITJYb9g"/>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ofEtECjYEeGFbebITJYb9g" value="1"/>
-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ofGiQCjYEeGFbebITJYb9g" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_ofI-gCjYEeGFbebITJYb9g">
-              <value xsi:nil="true"/>
-            </defaultValue>
-          </ownedAttribute>
-          <ownedConnector xmi:id="_fXbtMACUEd-PD8FdFs7bpA" name="qpconnector">
-            <end xmi:id="_fYI30ACUEd-PD8FdFs7bpA" partWithPort="_i-I7gDLiEd2RVeNawwNNzg" role="_DtWn4DLcEd2qeKRLMdIx_A"/>
-            <end xmi:id="_fYLUEACUEd-PD8FdFs7bpA" partWithPort="_gV1cgDLiEd2RVeNawwNNzg" role="_4KiE8DLbEd2qeKRLMdIx_A"/>
-          </ownedConnector>
-          <ownedConnector xmi:id="_s0Ev4CkDEeGDDbdzqSb4UA" name="Connector1">
-            <end xmi:id="_s0FW8CkDEeGDDbdzqSb4UA" partWithPort="_lKtZUCjYEeGFbebITJYb9g">
-              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s0FW8ikDEeGDDbdzqSb4UA" value="1"/>
-              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s0FW8SkDEeGDDbdzqSb4UA" value="1"/>
-              <role xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#_3NSGwCkAEeGDDbdzqSb4UA"/>
-            </end>
-            <end xmi:id="_s0FW8ykDEeGDDbdzqSb4UA" partWithPort="_i-I7gDLiEd2RVeNawwNNzg" role="_U50WMCkDEeGDDbdzqSb4UA">
-              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_s0FW9SkDEeGDDbdzqSb4UA" value="1"/>
-              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_s0FW9CkDEeGDDbdzqSb4UA" value="1"/>
-            </end>
-          </ownedConnector>
-        </packagedElement>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Package" xmi:id="_Z4WuYBqvEeOvgeTpolSdGg" name="Server">
-        <packagedElement xmi:type="uml:Class" xmi:id="_oqZNUDLaEd2qeKRLMdIx_A" clientDependency="_YQqH0JYlEd6G9q9hwr11bw" name="CServer_impl">
-          <ownedAttribute xmi:type="uml:Port" xmi:id="_4KiE8DLbEd2qeKRLMdIx_A" name="p" type="_cn-H0DLbEd2qeKRLMdIx_A" aggregation="composite"/>
-          <interfaceRealization xmi:id="_YQqH0JYlEd6G9q9hwr11bw" name="derived realization of ICompute" client="_oqZNUDLaEd2qeKRLMdIx_A" supplier="_cn-H0DLbEd2qeKRLMdIx_A" contract="_cn-H0DLbEd2qeKRLMdIx_A"/>
-          <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_ML-4AKI5Ed6FqJCjEUrkqQ" name="add" specification="_TbIjUJYlEd6G9q9hwr11bw">
-            <language>C/C++</language>
-            <body>cout &lt;&lt; &quot;server: got add request for a=&quot; &lt;&lt; a &lt;&lt; &quot; and b=&quot; &lt;&lt; b &lt;&lt; endl;
-return a+b;</body>
-          </ownedBehavior>
-          <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_I1R3YAcDEeGnrLqQ0OQeAg" name="mult" specification="_4ZEZwHecEd6r18stFZxmFQ">
-            <language>C/C++</language>
-            <body>cout &lt;&lt; &quot;server: got mult request for a=&quot; &lt;&lt; a &lt;&lt; &quot; and b=&quot; &lt;&lt; b &lt;&lt; endl;
-return a*b;</body>
-          </ownedBehavior>
-          <ownedOperation xmi:id="_TbIjUJYlEd6G9q9hwr11bw" name="add" method="_ML-4AKI5Ed6FqJCjEUrkqQ">
-            <ownedParameter xmi:id="_TbZCAJYlEd6G9q9hwr11bw" name="a">
-              <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
-            </ownedParameter>
-            <ownedParameter xmi:id="_TbdTcJYlEd6G9q9hwr11bw" name="b">
-              <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
-            </ownedParameter>
-            <ownedParameter xmi:id="_TbkoMJYlEd6G9q9hwr11bw" name="res" direction="return">
-              <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
-            </ownedParameter>
-          </ownedOperation>
-          <ownedOperation xmi:id="_4ZEZwHecEd6r18stFZxmFQ" name="mult" method="_I1R3YAcDEeGnrLqQ0OQeAg">
-            <ownedParameter xmi:id="_4ZEZwXecEd6r18stFZxmFQ" name="a">
-              <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
-            </ownedParameter>
-            <ownedParameter xmi:id="_4ZEZwnecEd6r18stFZxmFQ" name="b">
-              <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
-            </ownedParameter>
-            <ownedParameter xmi:id="_4ZEZw3ecEd6r18stFZxmFQ" name="res" direction="return">
-              <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
-            </ownedParameter>
-          </ownedOperation>
-        </packagedElement>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Package" xmi:id="_Z4_nkBqvEeOvgeTpolSdGg" name="Interfaces">
-        <packagedElement xmi:type="uml:Interface" xmi:id="_cn-H0DLbEd2qeKRLMdIx_A" name="ICompute">
-          <ownedOperation xmi:id="_DGs6wDLgEd28fJKJJnUaeQ" name="add" isAbstract="true">
-            <ownedParameter xmi:id="_DGs6wTLgEd28fJKJJnUaeQ" name="a">
-              <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
-              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DGs6wzLgEd28fJKJJnUaeQ" value="1"/>
-              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DGs6wjLgEd28fJKJJnUaeQ" value="1"/>
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_DGs6xDLgEd28fJKJJnUaeQ">
-                <value xsi:nil="true"/>
-              </defaultValue>
-            </ownedParameter>
-            <ownedParameter xmi:id="_DGs6xTLgEd28fJKJJnUaeQ" name="b">
-              <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
-              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DGs6xzLgEd28fJKJJnUaeQ" value="1"/>
-              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DGs6xjLgEd28fJKJJnUaeQ" value="1"/>
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_DGs6yDLgEd28fJKJJnUaeQ">
-                <value xsi:nil="true"/>
-              </defaultValue>
-            </ownedParameter>
-            <ownedParameter xmi:id="_DGs6yTLgEd28fJKJJnUaeQ" name="res" direction="return">
-              <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
-              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DGs6yzLgEd28fJKJJnUaeQ" value="1"/>
-              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DGs6yjLgEd28fJKJJnUaeQ" value="1"/>
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_DGs6zDLgEd28fJKJJnUaeQ">
-                <value xsi:nil="true"/>
-              </defaultValue>
-            </ownedParameter>
-          </ownedOperation>
-          <ownedOperation xmi:id="_L8EY8DLgEd28fJKJJnUaeQ" name="mult" isAbstract="true">
-            <ownedParameter xmi:id="_L8EY8TLgEd28fJKJJnUaeQ" name="a">
-              <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
-              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_L8EY8zLgEd28fJKJJnUaeQ" value="1"/>
-              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L8EY8jLgEd28fJKJJnUaeQ" value="1"/>
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_L8EY9DLgEd28fJKJJnUaeQ">
-                <value xsi:nil="true"/>
-              </defaultValue>
-            </ownedParameter>
-            <ownedParameter xmi:id="_L8EY9TLgEd28fJKJJnUaeQ" name="b">
-              <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
-              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_L8EY9zLgEd28fJKJJnUaeQ" value="1"/>
-              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L8EY9jLgEd28fJKJJnUaeQ" value="1"/>
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_L8EY-DLgEd28fJKJJnUaeQ">
-                <value xsi:nil="true"/>
-              </defaultValue>
-            </ownedParameter>
-            <ownedParameter xmi:id="_L8EY-TLgEd28fJKJJnUaeQ" name="res" direction="return">
-              <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
-              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_L8EY-zLgEd28fJKJJnUaeQ" value="1"/>
-              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L8EY-jLgEd28fJKJJnUaeQ" value="1"/>
-              <defaultValue xmi:type="uml:LiteralString" xmi:id="_L8EY_DLgEd28fJKJJnUaeQ">
-                <value xsi:nil="true"/>
-              </defaultValue>
-            </ownedParameter>
-          </ownedOperation>
-        </packagedElement>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Package" xmi:id="_Z-a6IBqvEeOvgeTpolSdGg" name="Client">
-        <packagedElement xmi:type="uml:Class" xmi:id="_IfjoETLbEd2qeKRLMdIx_A" clientDependency="_vdcwkKDcEd-t8JNe-ruCrQ _qfhbMCozEeGxrprK9wB9iA" name="CClient_impl">
-          <generalization xmi:id="_34FjAPx3Ed6O2oOTPfeAMA">
-            <general xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_N6fa4JsrEd61Eo3nmu3JhQ"/>
-          </generalization>
-          <ownedAttribute xmi:type="uml:Port" xmi:id="_DtWn4DLcEd2qeKRLMdIx_A" name="q" type="_cn-H0DLbEd2qeKRLMdIx_A" aggregation="composite"/>
-          <ownedAttribute xmi:type="uml:Port" xmi:id="_U50WMCkDEeGDDbdzqSb4UA" name="tick" aggregation="composite">
-            <type xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_Xb-y0AweEd6it_RkGhz_AA"/>
-          </ownedAttribute>
-          <interfaceRealization xmi:id="_vdcwkKDcEd-t8JNe-ruCrQ" name="derived realization of IStart" client="_IfjoETLbEd2qeKRLMdIx_A">
-            <supplier xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_PTWzwCS-Ed-A_I32T0fkaA"/>
-            <contract href="pathmap://QML_CORE/sysinterfaces.uml#_PTWzwCS-Ed-A_I32T0fkaA"/>
-          </interfaceRealization>
-          <interfaceRealization xmi:id="_qfhbMCozEeGxrprK9wB9iA" name="derived realization of ITick" client="_IfjoETLbEd2qeKRLMdIx_A">
-            <supplier xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_Xb-y0AweEd6it_RkGhz_AA"/>
-            <contract href="pathmap://QML_CORE/sysinterfaces.uml#_Xb-y0AweEd6it_RkGhz_AA"/>
-          </interfaceRealization>
-          <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_yXNVoKF4Ed6FqJCjEUrkqQ" name="run" specification="_4CRrYHpbEd-X4Z9aZ0cpCQ">
-            <language>C/C++</language>
-            <body>cout &lt;&lt; &quot;call via port q: add(2, 3);&quot; &lt;&lt; endl;
-cout &lt;&lt; &quot;result: &quot; &lt;&lt; q->add(2, 3) &lt;&lt; endl;
-cout &lt;&lt; &quot;now sleeping 10 seconds&quot; &lt;&lt; endl;
-sleep(10);
-cout &lt;&lt; &quot;finishing CClient_impl::run&quot; &lt;&lt; endl;</body>
-          </ownedBehavior>
-          <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_w5uegCozEeGxrprK9wB9iA" name="tick" specification="_qf6cwCozEeGxrprK9wB9iA">
-            <language>C/C++</language>
-            <body>cout &lt;&lt; &quot;call via port tick: mult(4, 5);&quot; &lt;&lt; endl;
-cout &lt;&lt; &quot;result: &quot; &lt;&lt; q->mult(4, 5) &lt;&lt; endl;</body>
-          </ownedBehavior>
-          <ownedOperation xmi:id="_4CRrYHpbEd-X4Z9aZ0cpCQ" name="run" method="_yXNVoKF4Ed6FqJCjEUrkqQ"/>
-          <ownedOperation xmi:id="_qf6cwCozEeGxrprK9wB9iA" name="tick" method="_w5uegCozEeGxrprK9wB9iA"/>
-        </packagedElement>
-      </packagedElement>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Package" xmi:id="_aDg1gBqvEeOvgeTpolSdGg" name="PlatformModel">
-      <packagedElement xmi:type="uml:Package" xmi:id="_aDg1gRqvEeOvgeTpolSdGg" name="HWArchitectureLinuxPlatform">
-        <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_6EgaIDa3EeGBl4WmUxMhOA" name="linux" classifier="_zY9vMDLiEd2RVeNawwNNzg"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Node" xmi:id="_zY9vMDLiEd2RVeNawwNNzg" name="LinuxHost"/>
-    </packagedElement>
-    <profileApplication xmi:id="_Zyy48BqvEeOvgeTpolSdGg">
-      <eAnnotations xmi:id="_Zyy48RqvEeOvgeTpolSdGg" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2#/"/>
-      </eAnnotations>
-      <appliedProfile href="pathmap://UML_PROFILES/StandardL2.profile.uml#_0"/>
-    </profileApplication>
-    <profileApplication xmi:id="_ZzDXoBqvEeOvgeTpolSdGg">
-      <eAnnotations xmi:id="_ZzDXoRqvEeOvgeTpolSdGg" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/>
-      </eAnnotations>
-      <appliedProfile href="pathmap://PapyrusC_Cpp_PROFILES/C_Cpp.profile.uml#_j9REUByGEduN1bTiWJ0lyw"/>
-    </profileApplication>
-    <profileApplication xmi:id="_ZzakABqvEeOvgeTpolSdGg">
-      <eAnnotations xmi:id="_ZzakARqvEeOvgeTpolSdGg" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/FCM/1#/"/>
-      </eAnnotations>
-      <appliedProfile href="pathmap://FCM_PROFILES/FCM.profile.uml#_5mvT0MtjEd2H_o0jIC6qDQ"/>
-    </profileApplication>
-    <profileApplication xmi:id="_Z4Hd0BqvEeOvgeTpolSdGg">
-      <eAnnotations xmi:id="_Z4Hd0RqvEeOvgeTpolSdGg" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/MARTE/1#//Alloc"/>
-      </eAnnotations>
-      <appliedProfile href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_ar8OsAPMEdyuUt-4qHuVvQ"/>
-    </profileApplication>
-    <profileApplication xmi:id="_Z4JTABqvEeOvgeTpolSdGg">
-      <eAnnotations xmi:id="_Z4JTARqvEeOvgeTpolSdGg" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/MARTE/1#//HLAM"/>
-      </eAnnotations>
-      <appliedProfile href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_yNSZIAPMEdyuUt-4qHuVvQ"/>
-    </profileApplication>
-    <profileApplication xmi:id="_Z4LIMBqvEeOvgeTpolSdGg">
-      <eAnnotations xmi:id="_Z4LIMRqvEeOvgeTpolSdGg" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/MARTE/1#//GCM"/>
-      </eAnnotations>
-      <appliedProfile href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_YgAioAPMEdyuUt-4qHuVvQ"/>
-    </profileApplication>
-  </uml:Model>
-  <FCM:RuleApplication xmi:id="_Z4q3cBqvEeOvgeTpolSdGg" base_Class="_oqZNUDLaEd2qeKRLMdIx_A">
-    <containerRule href="pathmap://QML_TRACE/tracing.uml#_ISo6gLdwEd-CtfrGQre34Q"/>
-  </FCM:RuleApplication>
-  <C_Cpp:Include xmi:id="_Z4454BqvEeOvgeTpolSdGg" body="#include &lt;iostream>&#xA;using namespace std;" base_class="_oqZNUDLaEd2qeKRLMdIx_A"/>
-  <FCM:Port xmi:id="_Z54_cBqvEeOvgeTpolSdGg" base_Port="_4KiE8DLbEd2qeKRLMdIx_A">
-    <kind href="pathmap://QML_CORE/core.uml#_wySlkFRxEd6GqrP6fkWBoQ"/>
-  </FCM:Port>
-  <FCM:DerivedElement xmi:id="_Z666MBqvEeOvgeTpolSdGg" base_Element="_TbIjUJYlEd6G9q9hwr11bw" source="_DGs6wDLgEd28fJKJJnUaeQ"/>
-  <FCM:DerivedElement xmi:id="_Z8-vsBqvEeOvgeTpolSdGg" base_Element="_4ZEZwHecEd6r18stFZxmFQ" source="_L8EY8DLgEd28fJKJJnUaeQ"/>
-  <C_Cpp:Include xmi:id="_Z-sm8BqvEeOvgeTpolSdGg" body="#include &lt;iostream>&#xA;using namespace std;&#xA;&#xA;#include &lt;unistd.h>" base_class="_IfjoETLbEd2qeKRLMdIx_A"/>
-  <FCM:Port xmi:id="_Z_4SsBqvEeOvgeTpolSdGg" base_Port="_DtWn4DLcEd2qeKRLMdIx_A">
-    <kind href="pathmap://QML_CORE/core.uml#_9Fif4FRxEd6GqrP6fkWBoQ"/>
-  </FCM:Port>
-  <FCM:Port xmi:id="_aAaeMBqvEeOvgeTpolSdGg" base_Port="_U50WMCkDEeGDDbdzqSb4UA">
-    <kind href="pathmap://QML_CORE/core.uml#_wySlkFRxEd6GqrP6fkWBoQ"/>
-  </FCM:Port>
-  <FCM:DerivedElement xmi:id="_aBhRcBqvEeOvgeTpolSdGg" base_Element="_4CRrYHpbEd-X4Z9aZ0cpCQ">
-    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_C9IK4JsqEd61Eo3nmu3JhQ"/>
-  </FCM:DerivedElement>
-  <FCM:DerivedElement xmi:id="_aCL_0BqvEeOvgeTpolSdGg" base_Element="_qf6cwCozEeGxrprK9wB9iA">
-    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_asFRoAweEd6it_RkGhz_AA"/>
-  </FCM:DerivedElement>
-  <FCM:Target xmi:id="_aDr0oBqvEeOvgeTpolSdGg" base_Node="_zY9vMDLiEd2RVeNawwNNzg">
-    <targetArch href="pathmap://QML_CORE/core.uml#_FYOqwF0OEd-12d_h0i1xhQ"/>
-    <usedOS href="pathmap://QML_CORE/core.uml#_1eULwF0NEd-12d_h0i1xhQ"/>
-  </FCM:Target>
-  <Alloc:Allocate xmi:id="_aD_WoBqvEeOvgeTpolSdGg" base_Abstraction="_aD2zwBqvEeOvgeTpolSdGg"/>
-</xmi:XMI>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/tmpModel/HelloWorldTmp.uml b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/tmpModel/HelloWorldTmp.uml
deleted file mode 100644
index 86722ad1091..00000000000
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/tmpModel/HelloWorldTmp.uml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Alloc="http://www.eclipse.org/papyrus/Alloc/1" xmlns:C_Cpp="http://www.eclipse.org/papyrus/C_Cpp/1" xmlns:FCM="http://www.eclipse.org/papyrus/FCM/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/Alloc/1 http://www.eclipse.org/papyrus/MARTE/1#//Alloc">
-  <uml:Model xmi:id="_O6TiIDLUEd26WNosUASSSw" name="HelloWorld">
-    <packageImport xmi:id="_qjz7QhsAEeOvgeTpolSdGg">
-      <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
-    </packageImport>
-    <packageImport xmi:id="_qjz7QxsAEeOvgeTpolSdGg">
-      <importedPackage xmi:type="uml:Model" href="pathmap://QML_CORE/core.uml#_O6TiIDLUEd26WNosUASSSw"/>
-    </packageImport>
-    <packageImport xmi:id="_qjz7RBsAEeOvgeTpolSdGg">
-      <importedPackage xmi:type="uml:Model" href="pathmap://QML_CORE/corba.uml#_DtQEwDLdEd2_U4efLnjQIw"/>
-    </packageImport>
-    <packagedElement xmi:type="uml:Package" xmi:id="_qj0iUBsAEeOvgeTpolSdGg" name="globalenums"/>
-    <packagedElement xmi:type="uml:Package" xmi:id="_qj0iURsAEeOvgeTpolSdGg" name="deployment">
-      <packagedElement xmi:type="uml:Package" xmi:id="_qj0iUhsAEeOvgeTpolSdGg" name="SystemDepPlan">
-        <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_qj0iUxsAEeOvgeTpolSdGg" clientDependency="_qka_QBsAEeOvgeTpolSdGg" name="mainInstance" classifier="_bYJagDLiEd2RVeNawwNNzg">
-          <slot xmi:id="_qkhF4BsAEeOvgeTpolSdGg" definingFeature="_gV1cgDLiEd2RVeNawwNNzg">
-            <value xmi:type="uml:InstanceValue" xmi:id="_qkhF4RsAEeOvgeTpolSdGg" instance="_qkeCkBsAEeOvgeTpolSdGg"/>
-          </slot>
-        </packagedElement>
-        <packagedElement xmi:type="uml:Abstraction" xmi:id="_qka_QBsAEeOvgeTpolSdGg" name="allocate mainInstance to monoNode" client="_qj0iUxsAEeOvgeTpolSdGg" supplier="_GQ1ekKwHEeCQX8uv_p0Q4A"/>
-        <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_qkeCkBsAEeOvgeTpolSdGg" name="mainInstance.hello" classifier="_tyiqsc__Ed-TP80eVS-2Rg">
-          <slot xmi:id="_qkge0BsAEeOvgeTpolSdGg" definingFeature="_8pupUFTzEeKvFeqt5Q_lqw">
-            <value xmi:type="uml:LiteralString" xmi:id="_qkge0RsAEeOvgeTpolSdGg" name="value for message" value="&quot;Test message&quot;">
-              <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-            </value>
-          </slot>
-        </packagedElement>
-      </packagedElement>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Package" xmi:id="_qj1JYBsAEeOvgeTpolSdGg" name="components">
-      <packagedElement xmi:type="uml:Class" xmi:id="_bYJagDLiEd2RVeNawwNNzg" name="System">
-        <ownedAttribute xmi:id="_gV1cgDLiEd2RVeNawwNNzg" name="hello" visibility="public" type="_tyiqsc__Ed-TP80eVS-2Rg" isUnique="false" aggregation="composite">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_dCT24G6JEeGqWMX2LwdLDw" value="1"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dCUd8G6JEeGqWMX2LwdLDw" value="1"/>
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_dCWTIG6JEeGqWMX2LwdLDw">
-            <value xsi:nil="true"/>
-          </defaultValue>
-        </ownedAttribute>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_tyiqsc__Ed-TP80eVS-2Rg" clientDependency="_Us15gFTzEeKvFeqt5Q_lqw" name="HelloWorld">
-        <generalization xmi:id="_tyiqss__Ed-TP80eVS-2Rg">
-          <general xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_N6fa4JsrEd61Eo3nmu3JhQ"/>
-        </generalization>
-        <ownedAttribute xmi:id="_8pupUFTzEeKvFeqt5Q_lqw" name="message" visibility="public" aggregation="composite">
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__HwK8FTzEeKvFeqt5Q_lqw" value="1"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__HwyAFTzEeKvFeqt5Q_lqw" value="1"/>
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="__HynMFTzEeKvFeqt5Q_lqw">
-            <value xsi:nil="true"/>
-          </defaultValue>
-        </ownedAttribute>
-        <interfaceRealization xmi:id="_Us15gFTzEeKvFeqt5Q_lqw" name="derived realization of IStart" client="_tyiqsc__Ed-TP80eVS-2Rg">
-          <supplier xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_PTWzwCS-Ed-A_I32T0fkaA"/>
-          <contract href="pathmap://QML_CORE/sysinterfaces.uml#_PTWzwCS-Ed-A_I32T0fkaA"/>
-        </interfaceRealization>
-        <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_tyjRwc__Ed-TP80eVS-2Rg" name="run" specification="_UtCt0FTzEeKvFeqt5Q_lqw">
-          <language>C/C++</language>
-          <body>cout &lt;&lt; &quot;Hello world: &quot; &lt;&lt; message &lt;&lt; endl;</body>
-        </ownedBehavior>
-        <ownedOperation xmi:id="_UtCt0FTzEeKvFeqt5Q_lqw" name="run" method="_tyjRwc__Ed-TP80eVS-2Rg"/>
-      </packagedElement>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Package" xmi:id="_qkVfsBsAEeOvgeTpolSdGg" name="platform">
-      <packagedElement xmi:type="uml:Package" xmi:id="_qkVfsRsAEeOvgeTpolSdGg" name="HWArchitecturePlatform">
-        <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_GQ1ekKwHEeCQX8uv_p0Q4A" name="monoNode" classifier="_zY9vMDLiEd2RVeNawwNNzg"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Node" xmi:id="_zY9vMDLiEd2RVeNawwNNzg" name="MonoNode"/>
-    </packagedElement>
-    <profileApplication xmi:id="_qjyGEBsAEeOvgeTpolSdGg">
-      <eAnnotations xmi:id="_qjyGERsAEeOvgeTpolSdGg" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2#/"/>
-      </eAnnotations>
-      <appliedProfile href="pathmap://UML_PROFILES/StandardL2.profile.uml#_0"/>
-    </profileApplication>
-    <profileApplication xmi:id="_qjytIBsAEeOvgeTpolSdGg">
-      <eAnnotations xmi:id="_qjytIRsAEeOvgeTpolSdGg" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/>
-      </eAnnotations>
-      <appliedProfile href="pathmap://PapyrusC_Cpp_PROFILES/C_Cpp.profile.uml#_j9REUByGEduN1bTiWJ0lyw"/>
-    </profileApplication>
-    <profileApplication xmi:id="_qjytIhsAEeOvgeTpolSdGg">
-      <eAnnotations xmi:id="_qjytIxsAEeOvgeTpolSdGg" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/FCM/1#/"/>
-      </eAnnotations>
-      <appliedProfile href="pathmap://FCM_PROFILES/FCM.profile.uml#_5mvT0MtjEd2H_o0jIC6qDQ"/>
-    </profileApplication>
-    <profileApplication xmi:id="_qjzUMBsAEeOvgeTpolSdGg">
-      <eAnnotations xmi:id="_qjzUMRsAEeOvgeTpolSdGg" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/MARTE/1#//GCM"/>
-      </eAnnotations>
-      <appliedProfile href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_YgAioAPMEdyuUt-4qHuVvQ"/>
-    </profileApplication>
-    <profileApplication xmi:id="_qjzUMhsAEeOvgeTpolSdGg">
-      <eAnnotations xmi:id="_qjzUMxsAEeOvgeTpolSdGg" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/MARTE/1#//HLAM"/>
-      </eAnnotations>
-      <appliedProfile href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_yNSZIAPMEdyuUt-4qHuVvQ"/>
-    </profileApplication>
-    <profileApplication xmi:id="_qjz7QBsAEeOvgeTpolSdGg">
-      <eAnnotations xmi:id="_qjz7QRsAEeOvgeTpolSdGg" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/MARTE/1#//Alloc"/>
-      </eAnnotations>
-      <appliedProfile href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_ar8OsAPMEdyuUt-4qHuVvQ"/>
-    </profileApplication>
-  </uml:Model>
-  <FCM:CodeGenOptions xmi:id="_qj3loBsAEeOvgeTpolSdGg" base_Package="_qj1JYBsAEeOvgeTpolSdGg">
-    <progLanguage href="pathmap://QML_CORE/core.uml#_5WrSINzEEeKPWMO32vUmzw"/>
-  </FCM:CodeGenOptions>
-  <C_Cpp:Include xmi:id="_qj73EBsAEeOvgeTpolSdGg" body="#include &lt;iostream>&#xA;using namespace std;" base_class="_tyiqsc__Ed-TP80eVS-2Rg"/>
-  <FCM:ConfigurationProperty xmi:id="_qkEZ8BsAEeOvgeTpolSdGg" base_Property="_8pupUFTzEeKvFeqt5Q_lqw"/>
-  <FCM:DerivedElement xmi:id="_qkQnMBsAEeOvgeTpolSdGg" base_Element="_UtCt0FTzEeKvFeqt5Q_lqw">
-    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_C9IK4JsqEd61Eo3nmu3JhQ"/>
-  </FCM:DerivedElement>
-  <FCM:Target xmi:id="_qkYjABsAEeOvgeTpolSdGg" base_Node="_zY9vMDLiEd2RVeNawwNNzg">
-    <targetArch href="pathmap://QML_CORE/core.uml#_FYOqwF0OEd-12d_h0i1xhQ"/>
-    <usedOS href="pathmap://QML_CORE/core.uml#_1eULwF0NEd-12d_h0i1xhQ"/>
-  </FCM:Target>
-  <Alloc:Allocate xmi:id="_qkdbgBsAEeOvgeTpolSdGg" base_Abstraction="_qka_QBsAEeOvgeTpolSdGg"/>
-</xmi:XMI>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/tmpModel/ProducerConsumerTmp.di b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/tmpModel/ProducerConsumerTmp.di
deleted file mode 100644
index ae313072c4f..00000000000
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/tmpModel/ProducerConsumerTmp.di
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
-  <pageList/>
-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
-    <windows>
-      <children xsi:type="di:TabFolder"/>
-    </windows>
-  </sashModel>
-</di:SashWindowsMngr>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/tmpModel/ProducerConsumerTmp.notation b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/tmpModel/ProducerConsumerTmp.notation
deleted file mode 100644
index bf9abab340f..00000000000
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/tmpModel/ProducerConsumerTmp.notation
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/tmpModel/ProducerConsumerTmp.uml b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/tmpModel/ProducerConsumerTmp.uml
deleted file mode 100644
index ad75c145709..00000000000
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/tmpModel/ProducerConsumerTmp.uml
+++ /dev/null
@@ -1,466 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Alloc="http://www.eclipse.org/papyrus/Alloc/1" xmlns:C_Cpp="http://www.eclipse.org/papyrus/C_Cpp/1" xmlns:FCM="http://www.eclipse.org/papyrus/FCM/1" xmlns:GCM="http://www.eclipse.org/papyrus/GCM/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/Alloc/1 http://www.eclipse.org/papyrus/MARTE/1#//Alloc http://www.eclipse.org/papyrus/GCM/1 http://www.eclipse.org/papyrus/MARTE/1#//GCM">
-  <uml:Model xmi:id="_O6TiIDLUEd26WNosUASSSw" name="ProducerConsumer">
-    <packageImport xmi:id="_LVb5cix0EeOWeqhsjwDAlw">
-      <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
-    </packageImport>
-    <packageImport xmi:id="_LVb5cyx0EeOWeqhsjwDAlw">
-      <importedPackage xmi:type="uml:Model" href="pathmap://QML_CORE/core.uml#_O6TiIDLUEd26WNosUASSSw"/>
-    </packageImport>
-    <packageImport xmi:id="_LVb5dCx0EeOWeqhsjwDAlw">
-      <importedPackage xmi:type="uml:Model" href="pathmap://QML_CORE/corba.uml#_DtQEwDLdEd2_U4efLnjQIw"/>
-    </packageImport>
-    <packageImport xmi:id="_LVcggCx0EeOWeqhsjwDAlw">
-      <importedPackage xmi:type="uml:Model" href="pathmap://QML_CORE/fifo.uml#_ePwqkHLmEd6R5tffIPrlPg"/>
-    </packageImport>
-    <packagedElement xmi:type="uml:Package" xmi:id="_LVcggSx0EeOWeqhsjwDAlw" name="globalenums"/>
-    <packagedElement xmi:type="uml:Package" xmi:id="_LVdHkCx0EeOWeqhsjwDAlw" name="deployment">
-      <packagedElement xmi:type="uml:Package" xmi:id="_LVdHkSx0EeOWeqhsjwDAlw" name="monoPull">
-        <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_LVdHkix0EeOWeqhsjwDAlw" clientDependency="_LVuNUCx0EeOWeqhsjwDAlw" name="mainInstance" classifier="_bYJagDLiEd2RVeNawwNNzg">
-          <slot xmi:id="_LV1iECx0EeOWeqhsjwDAlw" definingFeature="_gV1cgDLiEd2RVeNawwNNzg">
-            <value xmi:type="uml:InstanceValue" xmi:id="_LV1iESx0EeOWeqhsjwDAlw" instance="_LV07ACx0EeOWeqhsjwDAlw"/>
-          </slot>
-          <slot xmi:id="_LV2JICx0EeOWeqhsjwDAlw" definingFeature="_i-I7gDLiEd2RVeNawwNNzg">
-            <value xmi:type="uml:InstanceValue" xmi:id="_LV2JISx0EeOWeqhsjwDAlw" instance="_LV1iEix0EeOWeqhsjwDAlw"/>
-          </slot>
-          <slot xmi:id="_LV5zgix0EeOWeqhsjwDAlw" definingFeature="_ei8sYBSoEeOUifYpcO0mcw">
-            <value xmi:type="uml:InstanceValue" xmi:id="_LV5zgyx0EeOWeqhsjwDAlw" instance="_LV4lYCx0EeOWeqhsjwDAlw"/>
-          </slot>
-          <slot xmi:id="_LYChgCx0EeOWeqhsjwDAlw" definingFeature="p_efVI0E2rEeGl8qrc8BM7vA">
-            <value xmi:type="uml:InstanceValue" xmi:id="_LYChgSx0EeOWeqhsjwDAlw" instance="_LYBTYCx0EeOWeqhsjwDAlw"/>
-          </slot>
-        </packagedElement>
-        <packagedElement xmi:type="uml:Abstraction" xmi:id="_LVuNUCx0EeOWeqhsjwDAlw" name="allocate mainInstance to monoNode" client="_LVdHkix0EeOWeqhsjwDAlw" supplier="_GQ1ekKwHEeCQX8uv_p0Q4A"/>
-        <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_LV07ACx0EeOWeqhsjwDAlw" name="mainInstance.con" classifier="_tyiqsc__Ed-TP80eVS-2Rg"/>
-        <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_LV1iEix0EeOWeqhsjwDAlw" name="mainInstance.prod" classifier="_IfjoETLbEd2qeKRLMdIx_A"/>
-        <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_LV2wMCx0EeOWeqhsjwDAlw" name="mainInstance.main">
-          <classifier xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_SiY_AP-EEd6628OhKk_dpg"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_LV4lYCx0EeOWeqhsjwDAlw" name="mainInstance.pullConThread">
-          <classifier xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_SiY_AP-EEd6628OhKk_dpg"/>
-          <slot xmi:id="_LV5zgCx0EeOWeqhsjwDAlw">
-            <definingFeature xmi:type="uml:Property" href="pathmap://QML_CORE/core.uml#_rVfYoMGJEd-Mveea1W_olA"/>
-            <value xmi:type="uml:LiteralInteger" xmi:id="_LV5zgSx0EeOWeqhsjwDAlw" name="value for priority" value="5">
-              <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
-            </value>
-          </slot>
-        </packagedElement>
-        <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_LYBTYCx0EeOWeqhsjwDAlw" name="mainInstance.fifoconnector">
-          <classifier xmi:type="uml:Class" href="/org.eclipse.papyrus.qompass.modellibs.core/tmpModel/ProducerConsumerTmp.uml#_Y1jF8HPpEd6R5tffIPrlPg"/>
-          <classifier xmi:type="uml:Class" href="pathmap://QML_CORE/fifo.uml#_Y1jF8HPpEd6R5tffIPrlPg"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_zwUHQLF4EeC9yscvWqW-eg" name="mainInstance.fifoconnector">
-          <classifier xmi:type="uml:Class" href="pathmap://QML_CORE/fifo.uml#_Y1jF8HPpEd6R5tffIPrlPg"/>
-          <slot xmi:id="_zwUHQbF4EeC9yscvWqW-eg">
-            <definingFeature xmi:type="uml:Property" href="pathmap://QML_CORE/fifo.uml#_XDRnoHUIEd6R5tffIPrlPg"/>
-            <value xmi:type="uml:LiteralInteger" xmi:id="_zwUuULF4EeC9yscvWqW-eg" name="value for m_size" value="30">
-              <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
-            </value>
-          </slot>
-        </packagedElement>
-      </packagedElement>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Package" xmi:id="_LVdHkyx0EeOWeqhsjwDAlw" name="components">
-      <packagedElement xmi:type="uml:Package" xmi:id="_LVduoCx0EeOWeqhsjwDAlw" name="System">
-        <packagedElement xmi:type="uml:Class" xmi:id="_bYJagDLiEd2RVeNawwNNzg" name="SystemPull_impl">
-          <ownedAttribute xmi:id="_gV1cgDLiEd2RVeNawwNNzg" clientDependency="_9dY5YBSqEeOUifYpcO0mcw" name="con" visibility="public" type="_tyiqsc__Ed-TP80eVS-2Rg" isUnique="false" aggregation="composite">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_dCT24G6JEeGqWMX2LwdLDw" value="1"/>
-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dCUd8G6JEeGqWMX2LwdLDw" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_dCWTIG6JEeGqWMX2LwdLDw">
-              <value xsi:nil="true"/>
-            </defaultValue>
-          </ownedAttribute>
-          <ownedAttribute xmi:id="_ei8sYBSoEeOUifYpcO0mcw" name="pullConThread" visibility="public" aggregation="composite">
-            <type xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_SiY_AP-EEd6628OhKk_dpg"/>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_mx3OkBSoEeOUifYpcO0mcw" value="1"/>
-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_myNz4BSoEeOUifYpcO0mcw" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_mzF9oBSoEeOUifYpcO0mcw">
-              <value xsi:nil="true"/>
-            </defaultValue>
-          </ownedAttribute>
-          <ownedAttribute xmi:id="_i-I7gDLiEd2RVeNawwNNzg" clientDependency="_--_2EBSqEeOUifYpcO0mcw" name="prod" visibility="public" type="_IfjoETLbEd2qeKRLMdIx_A" isUnique="false" aggregation="composite">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_esReUG6JEeGqWMX2LwdLDw" value="1"/>
-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_esSscG6JEeGqWMX2LwdLDw" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_esUhoG6JEeGqWMX2LwdLDw">
-              <value xsi:nil="true"/>
-            </defaultValue>
-          </ownedAttribute>
-          <ownedAttribute xmi:id="p_efVI0E2rEeGl8qrc8BM7vA" name="fifoconnector" type="_Y1jF8HPpEd6R5tffIPrlPg" aggregation="composite"/>
-          <ownedConnector xmi:id="_efVI0E2rEeGl8qrc8BM7vA0" name="c fifoconnector 0">
-            <end xmi:id="_LX_eMix0EeOWeqhsjwDAlw" partWithPort="_i-I7gDLiEd2RVeNawwNNzg" role="_DtWn4DLcEd2qeKRLMdIx_A"/>
-            <end xmi:id="_LX_eMyx0EeOWeqhsjwDAlw" partWithPort="p_efVI0E2rEeGl8qrc8BM7vA" role="_xHb7MHLmEd6R5tffIPrlPg"/>
-          </ownedConnector>
-          <ownedConnector xmi:id="_efVI0E2rEeGl8qrc8BM7vA1" name="c fifoconnector 1">
-            <end xmi:id="_LYAFQSx0EeOWeqhsjwDAlw" partWithPort="_gV1cgDLiEd2RVeNawwNNzg" role="_tyiqs8__Ed-TP80eVS-2Rg"/>
-            <end xmi:id="_LYAFQix0EeOWeqhsjwDAlw" partWithPort="p_efVI0E2rEeGl8qrc8BM7vA" role="_xcu1wHLmEd6R5tffIPrlPg"/>
-          </ownedConnector>
-          <ownedConnector xmi:id="_LYDIkCx0EeOWeqhsjwDAlw" name="alloc to pullConThread">
-            <end xmi:id="_LYDIkSx0EeOWeqhsjwDAlw" partWithPort="_gV1cgDLiEd2RVeNawwNNzg">
-              <role xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#__SLXgNtxEd6nqsBVkgJEEA"/>
-            </end>
-            <end xmi:id="_LYDIkix0EeOWeqhsjwDAlw" partWithPort="_ei8sYBSoEeOUifYpcO0mcw">
-              <role xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#_ZjdOAP-EEd6628OhKk_dpg"/>
-            </end>
-          </ownedConnector>
-        </packagedElement>
-        <packagedElement xmi:type="uml:Abstraction" xmi:id="_9dY5YBSqEeOUifYpcO0mcw" name="Allocate" client="_gV1cgDLiEd2RVeNawwNNzg" supplier="_ei8sYBSoEeOUifYpcO0mcw"/>
-        <packagedElement xmi:type="uml:Abstraction" xmi:id="_--_2EBSqEeOUifYpcO0mcw" name="Allocate" client="_i-I7gDLiEd2RVeNawwNNzg"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Package" xmi:id="_LVeVsix0EeOWeqhsjwDAlw" name="PullConsumer">
-        <packagedElement xmi:type="uml:Class" xmi:id="_tyiqsc__Ed-TP80eVS-2Rg" clientDependency="_DHTiQDF7EeCpQdhNuFCtew" name="PullConsumer_impl">
-          <generalization xmi:id="_tyiqss__Ed-TP80eVS-2Rg">
-            <general xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_-WNegNtxEd6nqsBVkgJEEA"/>
-          </generalization>
-          <ownedAttribute xmi:type="uml:Port" xmi:id="_tyiqs8__Ed-TP80eVS-2Rg" name="p" type="_wFJ3IP91Ed6Jt8e-UqrRdQ" aggregation="composite"/>
-          <interfaceRealization xmi:id="_DHTiQDF7EeCpQdhNuFCtew" name="derived realization of ILifeCycle" client="_tyiqsc__Ed-TP80eVS-2Rg">
-            <supplier xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_T3li0Dz6Ed-v9PxuTj6Elw"/>
-            <contract href="pathmap://QML_CORE/sysinterfaces.uml#_T3li0Dz6Ed-v9PxuTj6Elw"/>
-          </interfaceRealization>
-          <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_tyjRwc__Ed-TP80eVS-2Rg" name="activate" specification="_tyjRy8__Ed-TP80eVS-2Rg">
-            <language>C/C++</language>
-            <body>cout &lt;&lt; &quot;wait for data on port p&quot; &lt;&lt; endl;
-for (int i = 0; i&lt;25; i++) {
-	if (p->hasData ()) {
-		components::interfaces::PubData data = p->pull ();
-		cout &lt;&lt; &quot;received data: x = &quot; &lt;&lt; data.x &lt;&lt; &quot; y = &quot; &lt;&lt; data.y &lt;&lt; endl;
-	}
-	usleep (100*1000);
-}
-cout &lt;&lt; &quot;finished waiting&quot; &lt;&lt; endl;
-</body>
-          </ownedBehavior>
-          <ownedOperation xmi:id="_tyjRy8__Ed-TP80eVS-2Rg" name="activate" method="_tyjRwc__Ed-TP80eVS-2Rg"/>
-          <ownedOperation xmi:id="_tyjRzM__Ed-TP80eVS-2Rg" name="deactivate"/>
-          <ownedOperation xmi:id="_FJPu4CxyEeOMQpc6Y-MAJw" name="configuration_complete"/>
-        </packagedElement>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Package" xmi:id="_LVgK4Sx0EeOWeqhsjwDAlw" name="interfaces">
-        <packagedElement xmi:type="uml:DataType" xmi:id="_wFJ3IP91Ed6Jt8e-UqrRdQ" name="PubData">
-          <ownedAttribute xmi:id="_yywF0P91Ed6Jt8e-UqrRdQ" name="y" isUnique="false" aggregation="composite">
-            <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
-          </ownedAttribute>
-          <ownedAttribute xmi:id="_zUgvEP91Ed6Jt8e-UqrRdQ" name="x" isUnique="false" aggregation="composite">
-            <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
-          </ownedAttribute>
-        </packagedElement>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Package" xmi:id="_LVlDYCx0EeOWeqhsjwDAlw" name="Producer">
-        <packagedElement xmi:type="uml:Class" xmi:id="_IfjoETLbEd2qeKRLMdIx_A" clientDependency="_jkNdADF8EeCpQdhNuFCtew _dNpvUBo4EeONpa5JgejICQ" name="Producer_impl">
-          <generalization xmi:id="_34FjAPx3Ed6O2oOTPfeAMA">
-            <general xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_N6fa4JsrEd61Eo3nmu3JhQ"/>
-          </generalization>
-          <ownedAttribute xmi:type="uml:Port" xmi:id="_DtWn4DLcEd2qeKRLMdIx_A" name="q" type="_wFJ3IP91Ed6Jt8e-UqrRdQ" aggregation="composite"/>
-          <interfaceRealization xmi:id="_jkNdADF8EeCpQdhNuFCtew" name="derived realization of IStart" client="_IfjoETLbEd2qeKRLMdIx_A">
-            <supplier xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_PTWzwCS-Ed-A_I32T0fkaA"/>
-            <contract href="pathmap://QML_CORE/sysinterfaces.uml#_PTWzwCS-Ed-A_I32T0fkaA"/>
-          </interfaceRealization>
-          <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_yXNVoKF4Ed6FqJCjEUrkqQ" name="run" specification="_dH4RIKF4Ed6FqJCjEUrkqQ">
-            <language>C/C++</language>
-            <body>cout &lt;&lt; &quot;publish a value via port q;&quot; &lt;&lt; endl;
-components::interfaces::PubData data;
-data.x = 2;
-data.y = 3;
-for (int i = 0; i&lt;20; i++) {
-	q->push (data);
-	cout &lt;&lt; &quot;.&quot; &lt;&lt; flush;
-	// wait 200ms
-	usleep (200*1000);
-}
-</body>
-          </ownedBehavior>
-          <ownedOperation xmi:id="_dH4RIKF4Ed6FqJCjEUrkqQ" name="run" method="_yXNVoKF4Ed6FqJCjEUrkqQ"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:Dependency" xmi:id="_dNpvUBo4EeONpa5JgejICQ" name="Dependency1" client="_IfjoETLbEd2qeKRLMdIx_A" supplier="_wFJ3IP91Ed6Jt8e-UqrRdQ"/>
-      </packagedElement>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Package" xmi:id="_LVrxECx0EeOWeqhsjwDAlw" name="platform">
-      <packagedElement xmi:type="uml:Package" xmi:id="_LVrxESx0EeOWeqhsjwDAlw" name="HWArchitecturePlatform">
-        <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_GQ1ekKwHEeCQX8uv_p0Q4A" name="monoNode" classifier="_zY9vMDLiEd2RVeNawwNNzg"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Node" xmi:id="_zY9vMDLiEd2RVeNawwNNzg" name="MonoNode"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Package" xmi:id="_LV-sACx0EeOWeqhsjwDAlw" name="DataExchange_PubData">
-      <templateBinding xmi:id="_LV-sASx0EeOWeqhsjwDAlw">
-        <parameterSubstitution xmi:id="_LV-sAix0EeOWeqhsjwDAlw" actual="_wFJ3IP91Ed6Jt8e-UqrRdQ">
-          <formal xmi:type="uml:ClassifierTemplateParameter" href="pathmap://QML_CORE/fifo.uml#_diTcwHLoEd6R5tffIPrlPg"/>
-        </parameterSubstitution>
-        <signature href="pathmap://QML_CORE/fifo.uml#_cHY98HLoEd6R5tffIPrlPg"/>
-      </templateBinding>
-      <packagedElement xmi:type="uml:Package" xmi:id="_LV_6ICx0EeOWeqhsjwDAlw" name="FIFO">
-        <packagedElement xmi:type="uml:Class" xmi:id="_Y1jF8HPpEd6R5tffIPrlPg" clientDependency="_y6XsAF72EeGerN33d-RdRg _LXnDsSx0EeOWeqhsjwDAlw _LXnDsix0EeOWeqhsjwDAlw" name="FIFO_impl">
-          <generalization xmi:id="_Z4Oq8HPpEd6R5tffIPrlPg" general="_wh_EwHLmEd6R5tffIPrlPg"/>
-          <generalization xmi:id="_ws_1gF72EeGerN33d-RdRg">
-            <general xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_-WNegNtxEd6nqsBVkgJEEA"/>
-          </generalization>
-          <ownedAttribute xmi:id="_6iV9wHUHEd6R5tffIPrlPg" name="m_push_pos" isUnique="false" aggregation="composite">
-            <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
-          </ownedAttribute>
-          <ownedAttribute xmi:id="_RlKZIHUIEd6R5tffIPrlPg" name="m_pull_pos" isUnique="false" aggregation="composite">
-            <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
-          </ownedAttribute>
-          <ownedAttribute xmi:id="_XDRnoHUIEd6R5tffIPrlPg" name="m_size" isUnique="false" aggregation="composite">
-            <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_SUhOUBGcEd-rfYlCjUOxJQ" value="1"/>
-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SUpKIBGcEd-rfYlCjUOxJQ" value="1"/>
-            <defaultValue xmi:type="uml:LiteralInteger" xmi:id="_T1yz0BGcEd-rfYlCjUOxJQ" value="20"/>
-          </ownedAttribute>
-          <ownedAttribute xmi:id="_XcO6MHUIEd6R5tffIPrlPg" name="m_filled" isUnique="false" aggregation="composite">
-            <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
-          </ownedAttribute>
-          <ownedAttribute xmi:id="_zNeIsBGZEd-rfYlCjUOxJQ" name="m_fifo" visibility="public" type="_wFJ3IP91Ed6Jt8e-UqrRdQ" isUnique="false" aggregation="composite">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Q8o1YBGcEd-rfYlCjUOxJQ"/>
-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Q8vjEBGcEd-rfYlCjUOxJQ" value="*"/>
-          </ownedAttribute>
-          <interfaceRealization xmi:id="_y6XsAF72EeGerN33d-RdRg" name="derived realization of ILifeCycle" client="_Y1jF8HPpEd6R5tffIPrlPg">
-            <supplier xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_T3li0Dz6Ed-v9PxuTj6Elw"/>
-            <contract href="pathmap://QML_CORE/sysinterfaces.uml#_T3li0Dz6Ed-v9PxuTj6Elw"/>
-          </interfaceRealization>
-          <interfaceRealization xmi:id="_LXnDsSx0EeOWeqhsjwDAlw" name="derived realization of D_Push_PubData" client="_Y1jF8HPpEd6R5tffIPrlPg" supplier="_LXd5wSx0EeOWeqhsjwDAlw" contract="_LXd5wSx0EeOWeqhsjwDAlw"/>
-          <interfaceRealization xmi:id="_LXnDsix0EeOWeqhsjwDAlw" name="derived realization of D_PullConsumer_PubData" client="_Y1jF8HPpEd6R5tffIPrlPg" supplier="_LXjZUCx0EeOWeqhsjwDAlw" contract="_LXjZUCx0EeOWeqhsjwDAlw"/>
-          <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_FjGlgP69Ed6Zw96O-tCw7A" name="pull" specification="_EYx84P68Ed6Zw96O-tCw7A">
-            <ownedParameter xmi:id="_LX9pACx0EeOWeqhsjwDAlw" name="ret" type="_wFJ3IP91Ed6Jt8e-UqrRdQ" direction="return">
-              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_LX9pASx0EeOWeqhsjwDAlw" value="1"/>
-              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LX9pAix0EeOWeqhsjwDAlw" value="1"/>
-            </ownedParameter>
-            <language>C/C++</language>
-            <body>if (m_filled > 0) {
-	int current_pos = m_pull_pos;
-	
-	m_pull_pos ++;
-	m_filled --;
-    if (m_pull_pos == m_size) {
-		m_pull_pos = 0;
-	}
-	return m_fifo [current_pos];
-}</body>
-          </ownedBehavior>
-          <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_IwXLsP69Ed6Zw96O-tCw7A" name="push" specification="_EYsdUP68Ed6Zw96O-tCw7A">
-            <ownedParameter xmi:id="_LX9pAyx0EeOWeqhsjwDAlw" name="data" type="_wFJ3IP91Ed6Jt8e-UqrRdQ">
-              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_LX9pBCx0EeOWeqhsjwDAlw" value="1"/>
-              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LX9pBSx0EeOWeqhsjwDAlw" value="1"/>
-            </ownedParameter>
-            <language>C/C++</language>
-            <body>// copy passed parameters ...
-if (m_filled &lt; m_size) {
-	m_fifo [m_push_pos] = data;
-	m_push_pos ++;
-	m_filled ++;
-	if (m_push_pos == m_size) {
-		m_push_pos = 0;
-	}
-}</body>
-          </ownedBehavior>
-          <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="__Ha0IBJHEd-XjYZ05V-9-Q" name="hasData" specification="_AnQ3QBI9Ed-XjYZ05V-9-Q">
-            <ownedParameter xmi:id="_LX-QECx0EeOWeqhsjwDAlw" name="ret" direction="return">
-              <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_Bv7l0B-VEd6nGq8wpI2tjg"/>
-              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_LX-QESx0EeOWeqhsjwDAlw" value="1"/>
-              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LX-QEix0EeOWeqhsjwDAlw" value="1"/>
-            </ownedParameter>
-            <language>C/C++</language>
-            <body>return (m_filled > 0);</body>
-          </ownedBehavior>
-          <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_QzOqwK8yEeCXIcykFPsB8Q" name="activate" specification="_5IpEwK8xEeCXIcykFPsB8Q">
-            <language>C/C++</language>
-            <body>
-if (m_size == 0) {
-	cerr &lt;&lt; &quot;Warning: size of FIFO is not properly configured (=0!)&quot; &lt;&lt; endl;
-}
-m_fifo = new ProducerConsumer::components::interfaces::PubData[m_size];</body>
-          </ownedBehavior>
-          <ownedOperation xmi:id="_EYx84P68Ed6Zw96O-tCw7A" name="pull" method="_FjGlgP69Ed6Zw96O-tCw7A">
-            <ownedParameter xmi:id="_EYx84f68Ed6Zw96O-tCw7A" name="ret" type="_wFJ3IP91Ed6Jt8e-UqrRdQ" direction="return">
-              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_EYx84v68Ed6Zw96O-tCw7A" value="1"/>
-              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EYx84_68Ed6Zw96O-tCw7A" value="1"/>
-            </ownedParameter>
-          </ownedOperation>
-          <ownedOperation xmi:id="_EYsdUP68Ed6Zw96O-tCw7A" name="push" method="_IwXLsP69Ed6Zw96O-tCw7A">
-            <ownedParameter xmi:id="_EYtEYP68Ed6Zw96O-tCw7A" name="data" type="_wFJ3IP91Ed6Jt8e-UqrRdQ">
-              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_EYtEYf68Ed6Zw96O-tCw7A" value="1"/>
-              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EYtEYv68Ed6Zw96O-tCw7A" value="1"/>
-            </ownedParameter>
-          </ownedOperation>
-          <ownedOperation xmi:id="_AnQ3QBI9Ed-XjYZ05V-9-Q" name="hasData" method="__Ha0IBJHEd-XjYZ05V-9-Q">
-            <ownedParameter xmi:id="_AtKsIBJXEd-QgZm_R1AKbA" name="ret" direction="return">
-              <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_Bv7l0B-VEd6nGq8wpI2tjg"/>
-              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AtNIYBJXEd-QgZm_R1AKbA" value="1"/>
-              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_AtNvcBJXEd-QgZm_R1AKbA" value="1"/>
-            </ownedParameter>
-          </ownedOperation>
-          <ownedOperation xmi:id="_5IpEwK8xEeCXIcykFPsB8Q" name="activate" method="_QzOqwK8yEeCXIcykFPsB8Q"/>
-          <ownedOperation xmi:id="_y7cqEF72EeGerN33d-RdRg" name="deactivate"/>
-          <ownedOperation xmi:id="_LXo44Cx0EeOWeqhsjwDAlw" name="configuration_complete"/>
-        </packagedElement>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_wh_EwHLmEd6R5tffIPrlPg" name="PushPull" isAbstract="true">
-        <generalization xmi:id="_6zGSwHLnEd6R5tffIPrlPg" general="_unqQoHLnEd6R5tffIPrlPg"/>
-        <generalization xmi:id="_9mPv0HLnEd6R5tffIPrlPg" general="_wtZ1IHLnEd6R5tffIPrlPg"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_unqQoHLnEd6R5tffIPrlPg" name="PushP" isAbstract="true">
-        <ownedAttribute xmi:type="uml:Port" xmi:id="_xHb7MHLmEd6R5tffIPrlPg" name="pushP" visibility="public" type="_wFJ3IP91Ed6Jt8e-UqrRdQ" aggregation="composite" isConjugated="true">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_SJlB4DFrEeCz5-DK9j5azg" value="1"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SLJvMDFrEeCz5-DK9j5azg" value="1"/>
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_iRXR8P3IEeC1YdT2qA0bjA">
-            <value xsi:nil="true"/>
-          </defaultValue>
-        </ownedAttribute>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_wtZ1IHLnEd6R5tffIPrlPg" name="PullC" isAbstract="true">
-        <ownedAttribute xmi:type="uml:Port" xmi:id="_xcu1wHLmEd6R5tffIPrlPg" name="pullC" visibility="public" type="_wFJ3IP91Ed6Jt8e-UqrRdQ" aggregation="composite" isConjugated="true">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VhIMgDFrEeCz5-DK9j5azg" value="1"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ViKuUDFrEeCz5-DK9j5azg" value="1"/>
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_2az3IC_fEeKl_vDGXh-OPw">
-            <value xsi:nil="true"/>
-          </defaultValue>
-        </ownedAttribute>
-      </packagedElement>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Package" xmi:id="_LXdSsCx0EeOWeqhsjwDAlw" name="derivedInterfaces">
-      <packagedElement xmi:type="uml:Package" xmi:id="_LXdSsSx0EeOWeqhsjwDAlw" name="ProducerConsumer">
-        <packagedElement xmi:type="uml:Package" xmi:id="_LXdSsix0EeOWeqhsjwDAlw" name="components">
-          <packagedElement xmi:type="uml:Package" xmi:id="_LXd5wCx0EeOWeqhsjwDAlw" name="interfaces">
-            <packagedElement xmi:type="uml:Interface" xmi:id="_LXd5wSx0EeOWeqhsjwDAlw" name="D_Push_PubData">
-              <ownedOperation xmi:id="_LXiyQSx0EeOWeqhsjwDAlw" name="push">
-                <ownedParameter xmi:id="_LXiyQix0EeOWeqhsjwDAlw" name="data" type="_wFJ3IP91Ed6Jt8e-UqrRdQ"/>
-              </ownedOperation>
-            </packagedElement>
-            <packagedElement xmi:type="uml:Interface" xmi:id="_LXjZUCx0EeOWeqhsjwDAlw" name="D_PullConsumer_PubData">
-              <ownedOperation xmi:id="_LXmcoSx0EeOWeqhsjwDAlw" name="pull">
-                <ownedParameter xmi:id="_LXmcoix0EeOWeqhsjwDAlw" name="ret" type="_wFJ3IP91Ed6Jt8e-UqrRdQ" direction="return"/>
-              </ownedOperation>
-              <ownedOperation xmi:id="_LXmcoyx0EeOWeqhsjwDAlw" name="hasData">
-                <ownedParameter xmi:id="_LXnDsCx0EeOWeqhsjwDAlw" name="ret" direction="return">
-                  <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_Bv7l0B-VEd6nGq8wpI2tjg"/>
-                </ownedParameter>
-              </ownedOperation>
-            </packagedElement>
-          </packagedElement>
-        </packagedElement>
-      </packagedElement>
-    </packagedElement>
-    <profileApplication xmi:id="_LVZdMCx0EeOWeqhsjwDAlw">
-      <eAnnotations xmi:id="_LVZdMSx0EeOWeqhsjwDAlw" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2#/"/>
-      </eAnnotations>
-      <appliedProfile href="pathmap://UML_PROFILES/StandardL2.profile.uml#_0"/>
-    </profileApplication>
-    <profileApplication xmi:id="_LVZdMix0EeOWeqhsjwDAlw">
-      <eAnnotations xmi:id="_LVZdMyx0EeOWeqhsjwDAlw" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/>
-      </eAnnotations>
-      <appliedProfile href="pathmap://PapyrusC_Cpp_PROFILES/C_Cpp.profile.uml#_j9REUByGEduN1bTiWJ0lyw"/>
-    </profileApplication>
-    <profileApplication xmi:id="_LVaEQCx0EeOWeqhsjwDAlw">
-      <eAnnotations xmi:id="_LVaEQSx0EeOWeqhsjwDAlw" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/FCM/1#/"/>
-      </eAnnotations>
-      <appliedProfile href="pathmap://FCM_PROFILES/FCM.profile.uml#_5mvT0MtjEd2H_o0jIC6qDQ"/>
-    </profileApplication>
-    <profileApplication xmi:id="_LVaEQix0EeOWeqhsjwDAlw">
-      <eAnnotations xmi:id="_LVaEQyx0EeOWeqhsjwDAlw" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/MARTE/1#//GCM"/>
-      </eAnnotations>
-      <appliedProfile href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_YgAioAPMEdyuUt-4qHuVvQ"/>
-    </profileApplication>
-    <profileApplication xmi:id="_LVarUCx0EeOWeqhsjwDAlw">
-      <eAnnotations xmi:id="_LVbSYCx0EeOWeqhsjwDAlw" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/MARTE/1#//HLAM"/>
-      </eAnnotations>
-      <appliedProfile href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_yNSZIAPMEdyuUt-4qHuVvQ"/>
-    </profileApplication>
-    <profileApplication xmi:id="_LVb5cCx0EeOWeqhsjwDAlw">
-      <eAnnotations xmi:id="_LVb5cSx0EeOWeqhsjwDAlw" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/MARTE/1#//Alloc"/>
-      </eAnnotations>
-      <appliedProfile href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_ar8OsAPMEdyuUt-4qHuVvQ"/>
-    </profileApplication>
-  </uml:Model>
-  <Alloc:Allocate xmi:id="_LVeVsSx0EeOWeqhsjwDAlw" base_Abstraction="_9dY5YBSqEeOUifYpcO0mcw"/>
-  <C_Cpp:Include xmi:id="_11OtwPcaEd-KM6l7lmIPkw" body="#include &lt;unistd.h>&#xA;#include &lt;iostream>&#xA;using namespace std;" base_class="_tyiqsc__Ed-TP80eVS-2Rg"/>
-  <GCM:FlowPort xmi:id="_LVgx8Cx0EeOWeqhsjwDAlw" direction="in" base_Port="_tyiqs8__Ed-TP80eVS-2Rg"/>
-  <FCM:Port xmi:id="_LVgx8Sx0EeOWeqhsjwDAlw" base_Port="_tyiqs8__Ed-TP80eVS-2Rg">
-    <kind href="pathmap://QML_CORE/core.uml#_x5mL4FRxEd6GqrP6fkWBoQ"/>
-  </FCM:Port>
-  <FCM:DerivedElement xmi:id="_LVhZASx0EeOWeqhsjwDAlw" base_Element="_tyjRy8__Ed-TP80eVS-2Rg">
-    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_WHyq4Dz6Ed-v9PxuTj6Elw"/>
-  </FCM:DerivedElement>
-  <FCM:DerivedElement xmi:id="_LViAESx0EeOWeqhsjwDAlw" base_Element="_tyjRzM__Ed-TP80eVS-2Rg">
-    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_W7YrADz6Ed-v9PxuTj6Elw"/>
-  </FCM:DerivedElement>
-  <FCM:DerivedElement xmi:id="_LVinISx0EeOWeqhsjwDAlw" base_Element="_FJPu4CxyEeOMQpc6Y-MAJw">
-    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_ns4qsClUEeO4bs_nkcnKOg"/>
-  </FCM:DerivedElement>
-  <Alloc:Allocate xmi:id="_LVkcUyx0EeOWeqhsjwDAlw" base_Abstraction="_--_2EBSqEeOUifYpcO0mcw"/>
-  <C_Cpp:Include xmi:id="_7SAnAP76Ed6Zw96O-tCw7A" body="#include &lt;unistd.h>&#xA;#include &lt;iostream>&#xA;using namespace std;" base_class="_IfjoETLbEd2qeKRLMdIx_A"/>
-  <FCM:Port xmi:id="_LVm4kCx0EeOWeqhsjwDAlw" base_Port="_DtWn4DLcEd2qeKRLMdIx_A">
-    <kind href="pathmap://QML_CORE/core.uml#_qOK0cFR1Ed6GqrP6fkWBoQ"/>
-  </FCM:Port>
-  <GCM:FlowPort xmi:id="_LVm4kSx0EeOWeqhsjwDAlw" direction="out" base_Port="_DtWn4DLcEd2qeKRLMdIx_A"/>
-  <FCM:DerivedElement xmi:id="_LVoGsCx0EeOWeqhsjwDAlw" base_Element="_dH4RIKF4Ed6FqJCjEUrkqQ">
-    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_C9IK4JsqEd61Eo3nmu3JhQ"/>
-  </FCM:DerivedElement>
-  <FCM:Target xmi:id="_LVtmQCx0EeOWeqhsjwDAlw" base_Node="_zY9vMDLiEd2RVeNawwNNzg">
-    <targetArch href="pathmap://QML_CORE/core.uml#_FYOqwF0OEd-12d_h0i1xhQ"/>
-    <usedOS href="pathmap://QML_CORE/core.uml#_1eULwF0NEd-12d_h0i1xhQ"/>
-  </FCM:Target>
-  <Alloc:Allocate xmi:id="_LV0T8Cx0EeOWeqhsjwDAlw" base_Abstraction="_LVuNUCx0EeOWeqhsjwDAlw"/>
-  <FCM:InteractionComponent xmi:id="_xQ_ccHUuEd6R5tffIPrlPg" base_Class="_Y1jF8HPpEd6R5tffIPrlPg"/>
-  <C_Cpp:Include xmi:id="_fUHyQF8DEeGerN33d-RdRg" body="#include &lt;iostream>&#xA;using namespace std;" base_class="_Y1jF8HPpEd6R5tffIPrlPg"/>
-  <FCM:InteractionComponent xmi:id="_IwT2cP6_Ed6Zw96O-tCw7A" base_Class="_wh_EwHLmEd6R5tffIPrlPg"/>
-  <FCM:Port xmi:id="_42zlMHLnEd6R5tffIPrlPg" base_Port="_xHb7MHLmEd6R5tffIPrlPg">
-    <kind href="pathmap://QML_CORE/core.uml#_qOK0cFR1Ed6GqrP6fkWBoQ"/>
-  </FCM:Port>
-  <FCM:Port xmi:id="_57KlMHLnEd6R5tffIPrlPg" base_Port="_xcu1wHLmEd6R5tffIPrlPg">
-    <kind href="pathmap://QML_CORE/core.uml#_x5mL4FRxEd6GqrP6fkWBoQ"/>
-  </FCM:Port>
-  <FCM:ConfigurationProperty xmi:id="_FxN9cLC0EeCaaIdtw75MLg" base_Property="_XDRnoHUIEd6R5tffIPrlPg"/>
-  <FCM:DerivedElement xmi:id="_EYzyEP68Ed6Zw96O-tCw7A" base_Element="_EYx84P68Ed6Zw96O-tCw7A" source="_LXmcoSx0EeOWeqhsjwDAlw"/>
-  <FCM:DerivedElement xmi:id="_0TVb8P6-Ed6Zw96O-tCw7A" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_7HAIIP6-Ed6Zw96O-tCw7A" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_vfETEARNEd-OidZzGKCpzg" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_op6Y4AnOEd-9beZpMGts2w" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_6tSQAAnUEd-co_m_wv4b6A" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_YMw7cBGZEd-rfYlCjUOxJQ" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_t04d8BGaEd-rfYlCjUOxJQ" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_G7QQABGcEd-rfYlCjUOxJQ" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_C5J9cBGlEd-Jq_XWT8Mhpg" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_IAxtYBI7Ed-3zOZ0RGapGA" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_AnPpIBI9Ed-XjYZ05V-9-Q" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_11WOABJWEd-QgZm_R1AKbA" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_C7WOoBQ-Ed-_dI0JopJMvQ" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_kUNw0Bb8Ed-u0pMEAnvpEQ" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_6-1mQBcKEd-Tda7vKXmT2A" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_EYu5kP68Ed6Zw96O-tCw7A" base_Element="_EYsdUP68Ed6Zw96O-tCw7A" source="_LXiyQSx0EeOWeqhsjwDAlw"/>
-  <FCM:DerivedElement xmi:id="_0TRKgP6-Ed6Zw96O-tCw7A" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_7G9E0P6-Ed6Zw96O-tCw7A" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_vfBPwARNEd-OidZzGKCpzg" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_op38oAnOEd-9beZpMGts2w" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_6tRB4AnUEd-co_m_wv4b6A" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_YMvtUBGZEd-rfYlCjUOxJQ" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_t02owBGaEd-rfYlCjUOxJQ" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_G7PB4BGcEd-rfYlCjUOxJQ" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_C4zYIBGlEd-Jq_XWT8Mhpg" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_IAwfQBI7Ed-3zOZ0RGapGA" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_AnNM4BI9Ed-XjYZ05V-9-Q" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_11TxwBJWEd-QgZm_R1AKbA" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_C7UZcBQ-Ed-_dI0JopJMvQ" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_kUMisBb8Ed-u0pMEAnvpEQ" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_6-zKABcKEd-Tda7vKXmT2A" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_AnVvwBI9Ed-XjYZ05V-9-Q" base_Element="_AnQ3QBI9Ed-XjYZ05V-9-Q" source="_LXmcoyx0EeOWeqhsjwDAlw"/>
-  <FCM:DerivedElement xmi:id="_11YqQBJWEd-QgZm_R1AKbA" base_Element="_AnQ3QBI9Ed-XjYZ05V-9-Q"/>
-  <FCM:DerivedElement xmi:id="_C7YD0BQ-Ed-_dI0JopJMvQ" base_Element="_AnQ3QBI9Ed-XjYZ05V-9-Q"/>
-  <FCM:DerivedElement xmi:id="_kUPmABb8Ed-u0pMEAnvpEQ" base_Element="_AnQ3QBI9Ed-XjYZ05V-9-Q"/>
-  <FCM:DerivedElement xmi:id="_6-3bcBcKEd-Tda7vKXmT2A" base_Element="_AnQ3QBI9Ed-XjYZ05V-9-Q"/>
-  <FCM:Template xmi:id="_LXDDACx0EeOWeqhsjwDAlw" base_Element="_5IpEwK8xEeCXIcykFPsB8Q"/>
-  <FCM:DerivedElement xmi:id="_LXDDASx0EeOWeqhsjwDAlw" base_Element="_5IpEwK8xEeCXIcykFPsB8Q">
-    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_WHyq4Dz6Ed-v9PxuTj6Elw"/>
-  </FCM:DerivedElement>
-  <FCM:DerivedElement xmi:id="_LXbdgCx0EeOWeqhsjwDAlw" base_Element="_y7cqEF72EeGerN33d-RdRg">
-    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_W7YrADz6Ed-v9PxuTj6Elw"/>
-  </FCM:DerivedElement>
-  <FCM:DerivedElement xmi:id="_LXiyQCx0EeOWeqhsjwDAlw" base_Element="_LXd5wSx0EeOWeqhsjwDAlw" source="_wFJ3IP91Ed6Jt8e-UqrRdQ"/>
-  <FCM:DerivedElement xmi:id="_LXmcoCx0EeOWeqhsjwDAlw" base_Element="_LXjZUCx0EeOWeqhsjwDAlw" source="_wFJ3IP91Ed6Jt8e-UqrRdQ"/>
-  <FCM:DerivedElement xmi:id="_LXsjQCx0EeOWeqhsjwDAlw" base_Element="_LXo44Cx0EeOWeqhsjwDAlw">
-    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_ns4qsClUEeO4bs_nkcnKOg"/>
-  </FCM:DerivedElement>
-  <FCM:DeploymentPlan xmi:id="_LVcggix0EeOWeqhsjwDAlw" base_Package="_LVdHkSx0EeOWeqhsjwDAlw"/>
-</xmi:XMI>
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/tmpModel/ProducerTwoConsumersTmp.uml b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/tmpModel/ProducerTwoConsumersTmp.uml
deleted file mode 100644
index 374740863d7..00000000000
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/tmpModel/ProducerTwoConsumersTmp.uml
+++ /dev/null
@@ -1,567 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Alloc="http://www.eclipse.org/papyrus/Alloc/1" xmlns:C_Cpp="http://www.eclipse.org/papyrus/C_Cpp/1" xmlns:FCM="http://www.eclipse.org/papyrus/FCM/1" xmlns:GCM="http://www.eclipse.org/papyrus/GCM/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/Alloc/1 http://www.eclipse.org/papyrus/MARTE/1#//Alloc http://www.eclipse.org/papyrus/GCM/1 http://www.eclipse.org/papyrus/MARTE/1#//GCM">
-  <uml:Model xmi:id="_O6TiIDLUEd26WNosUASSSw" name="ProducerTwoConsumers">
-    <packageImport xmi:id="_oDu70ixyEeOMQpc6Y-MAJw">
-      <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
-    </packageImport>
-    <packageImport xmi:id="_oDu70yxyEeOMQpc6Y-MAJw">
-      <importedPackage xmi:type="uml:Model" href="pathmap://QML_CORE/core.uml#_O6TiIDLUEd26WNosUASSSw"/>
-    </packageImport>
-    <packageImport xmi:id="_oDu71CxyEeOMQpc6Y-MAJw">
-      <importedPackage xmi:type="uml:Model" href="pathmap://QML_CORE/corba.uml#_DtQEwDLdEd2_U4efLnjQIw"/>
-    </packageImport>
-    <packageImport xmi:id="_oDu71SxyEeOMQpc6Y-MAJw">
-      <importedPackage xmi:type="uml:Model" href="pathmap://QML_CORE/fifo.uml#_ePwqkHLmEd6R5tffIPrlPg"/>
-    </packageImport>
-    <packageImport xmi:id="_oDvi4CxyEeOMQpc6Y-MAJw">
-      <importedPackage xmi:type="uml:Model" href="pathmap://QML_TRACE/tracing.uml#_H-ZqYDKeEd-WprEKTCaiMA"/>
-    </packageImport>
-    <packagedElement xmi:type="uml:Package" xmi:id="_oDvi4SxyEeOMQpc6Y-MAJw" name="globalenums"/>
-    <packagedElement xmi:type="uml:Package" xmi:id="_oDwJ8CxyEeOMQpc6Y-MAJw" name="deployment">
-      <packagedElement xmi:type="uml:Package" xmi:id="_oDwJ8SxyEeOMQpc6Y-MAJw" name="monoPull">
-        <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_oDwJ8ixyEeOMQpc6Y-MAJw" clientDependency="_oD7wICxyEeOMQpc6Y-MAJw" name="mainInstance" classifier="_bYJagDLiEd2RVeNawwNNzg">
-          <slot xmi:id="_oEd7oixyEeOMQpc6Y-MAJw" definingFeature="_gV1cgDLiEd2RVeNawwNNzg">
-            <value xmi:type="uml:InstanceValue" xmi:id="_oEd7oyxyEeOMQpc6Y-MAJw" instance="_oEV_0ixyEeOMQpc6Y-MAJw"/>
-          </slot>
-          <slot xmi:id="_oEeisCxyEeOMQpc6Y-MAJw" definingFeature="_i-I7gDLiEd2RVeNawwNNzg">
-            <value xmi:type="uml:InstanceValue" xmi:id="_oEeisSxyEeOMQpc6Y-MAJw" instance="_oEd7pCxyEeOMQpc6Y-MAJw"/>
-          </slot>
-          <slot xmi:id="_oEfJxSxyEeOMQpc6Y-MAJw" definingFeature="_-uMo0FuoEeGjjMeADLT5-g">
-            <value xmi:type="uml:InstanceValue" xmi:id="_oEfJxixyEeOMQpc6Y-MAJw" instance="_oEfJwCxyEeOMQpc6Y-MAJw"/>
-          </slot>
-          <slot xmi:id="_oFt40yxyEeOMQpc6Y-MAJw" definingFeature="_EM2p4FupEeGjjMeADLT5-g">
-            <value xmi:type="uml:InstanceValue" xmi:id="_oFt41CxyEeOMQpc6Y-MAJw" instance="_oFt40CxyEeOMQpc6Y-MAJw"/>
-          </slot>
-        </packagedElement>
-        <packagedElement xmi:type="uml:Abstraction" xmi:id="_oD7wICxyEeOMQpc6Y-MAJw" name="allocate mainInstance to monoNode" client="_oDwJ8ixyEeOMQpc6Y-MAJw" supplier="_GQ1ekKwHEeCQX8uv_p0Q4A"/>
-        <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_oEABkCxyEeOMQpc6Y-MAJw" name="mainInstance.cons1._executor" classifier="_tyiqsc__Ed-TP80eVS-2Rg">
-          <slot xmi:id="_oEd7oCxyEeOMQpc6Y-MAJw" definingFeature="_kLNdAF8DEeGerN33d-RdRg">
-            <value xmi:type="uml:LiteralString" xmi:id="_oEd7oSxyEeOMQpc6Y-MAJw" name="value for name" value="&quot;cons1&quot;">
-              <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-            </value>
-          </slot>
-        </packagedElement>
-        <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_oEV_0ixyEeOMQpc6Y-MAJw" name="mainInstance.cons1" classifier="_cc_tyiqsc__Ed-TP80eVS-2Rg">
-          <slot xmi:id="_oEV_0yxyEeOMQpc6Y-MAJw" definingFeature="e_tyiqsc__Ed-TP80eVS-2Rg">
-            <value xmi:type="uml:InstanceValue" xmi:id="_oEV_1CxyEeOMQpc6Y-MAJw" instance="_oEABkCxyEeOMQpc6Y-MAJw"/>
-          </slot>
-          <slot xmi:id="_oEdUkSxyEeOMQpc6Y-MAJw" definingFeature="p_cc_tyiqsc__Ed-TP80eVS-2Rg1">
-            <value xmi:type="uml:InstanceValue" xmi:id="_oEdUkixyEeOMQpc6Y-MAJw" instance="_oEdUkCxyEeOMQpc6Y-MAJw"/>
-          </slot>
-        </packagedElement>
-        <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_oEdUkCxyEeOMQpc6Y-MAJw" name="mainInstance.cons1.intercept lc0">
-          <classifier xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_5J9coCXQEeGX6PuSE-DJlQ"/>
-          <slot xmi:id="_oEdUkyxyEeOMQpc6Y-MAJw">
-            <definingFeature xmi:type="uml:Property" href="pathmap://QML_CORE//core.uml#_rVfYoMGJEd-Mveea1W_olA"/>
-            <value xmi:type="uml:LiteralInteger" xmi:id="_oEdUlCxyEeOMQpc6Y-MAJw" name="value for priority">
-              <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
-            </value>
-          </slot>
-        </packagedElement>
-        <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_oEd7pCxyEeOMQpc6Y-MAJw" name="mainInstance.pub" classifier="_IfjoETLbEd2qeKRLMdIx_A"/>
-        <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_oEeisixyEeOMQpc6Y-MAJw" name="mainInstance.cons2._executor" classifier="_tyiqsc__Ed-TP80eVS-2Rg">
-          <slot xmi:id="_oEfJwyxyEeOMQpc6Y-MAJw" definingFeature="_kLNdAF8DEeGerN33d-RdRg">
-            <value xmi:type="uml:LiteralString" xmi:id="_oEfJxCxyEeOMQpc6Y-MAJw" name="value for name" value="&quot;cons2&quot;">
-              <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-            </value>
-          </slot>
-        </packagedElement>
-        <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_oEfJwCxyEeOMQpc6Y-MAJw" name="mainInstance.cons2" classifier="_cc_tyiqsc__Ed-TP80eVS-2Rg">
-          <slot xmi:id="_oEfJwSxyEeOMQpc6Y-MAJw" definingFeature="e_tyiqsc__Ed-TP80eVS-2Rg">
-            <value xmi:type="uml:InstanceValue" xmi:id="_oEfJwixyEeOMQpc6Y-MAJw" instance="_oEeisixyEeOMQpc6Y-MAJw"/>
-          </slot>
-        </packagedElement>
-        <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_oFt40CxyEeOMQpc6Y-MAJw" name="mainInstance.fifo" classifier="_Y1jF8HPpEd6R5tffIPrlPg">
-          <slot xmi:id="_oFt40SxyEeOMQpc6Y-MAJw">
-            <definingFeature xmi:type="uml:Property" href="pathmap://QML_CORE/fifo.uml#_XDRnoHUIEd6R5tffIPrlPg"/>
-            <value xmi:type="uml:LiteralInteger" xmi:id="_oFt40ixyEeOMQpc6Y-MAJw" name="value for m_size" value="30">
-              <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
-            </value>
-          </slot>
-        </packagedElement>
-      </packagedElement>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Package" xmi:id="_oDwJ8yxyEeOMQpc6Y-MAJw" name="components">
-      <packagedElement xmi:type="uml:Package" xmi:id="_oDwJ9CxyEeOMQpc6Y-MAJw" name="System">
-        <packagedElement xmi:type="uml:Class" xmi:id="_bYJagDLiEd2RVeNawwNNzg" name="SystemPull_impl">
-          <ownedAttribute xmi:id="_gV1cgDLiEd2RVeNawwNNzg" name="cons1" visibility="public" type="_cc_tyiqsc__Ed-TP80eVS-2Rg" isUnique="false" aggregation="composite">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Wn23gFunEeGjjMeADLT5-g" value="1"/>
-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WoGIEFunEeGjjMeADLT5-g" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_WoP5EFunEeGjjMeADLT5-g">
-              <value xsi:nil="true"/>
-            </defaultValue>
-          </ownedAttribute>
-          <ownedAttribute xmi:id="_i-I7gDLiEd2RVeNawwNNzg" name="pub" type="_IfjoETLbEd2qeKRLMdIx_A" isUnique="false" aggregation="composite"/>
-          <ownedAttribute xmi:id="_-uMo0FuoEeGjjMeADLT5-g" name="cons2" visibility="public" type="_cc_tyiqsc__Ed-TP80eVS-2Rg" aggregation="composite">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kWRdYFupEeGjjMeADLT5-g" value="1"/>
-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kWT5oFupEeGjjMeADLT5-g" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_kXMDYFupEeGjjMeADLT5-g">
-              <value xsi:nil="true"/>
-            </defaultValue>
-          </ownedAttribute>
-          <ownedAttribute xmi:id="_EM2p4FupEeGjjMeADLT5-g" name="fifo" visibility="public" type="_Y1jF8HPpEd6R5tffIPrlPg" aggregation="composite">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IzF1MFupEeGjjMeADLT5-g" value="1"/>
-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IzHDUFupEeGjjMeADLT5-g" value="1"/>
-            <defaultValue xmi:type="uml:LiteralString" xmi:id="_IzI4gFupEeGjjMeADLT5-g">
-              <value xsi:nil="true"/>
-            </defaultValue>
-          </ownedAttribute>
-          <ownedConnector xmi:id="_efVI0E2rEeGl8qrc8BM7vA" name="push">
-            <end xmi:id="_efVv4E2rEeGl8qrc8BM7vA" partWithPort="_i-I7gDLiEd2RVeNawwNNzg" role="_DtWn4DLcEd2qeKRLMdIx_A">
-              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_efVv4k2rEeGl8qrc8BM7vA" value="1"/>
-              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_efVv4U2rEeGl8qrc8BM7vA" value="1"/>
-            </end>
-            <end xmi:id="_efWW8E2rEeGl8qrc8BM7vA" partWithPort="_EM2p4FupEeGjjMeADLT5-g" role="_xHb7MHLmEd6R5tffIPrlPg">
-              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_efWW8k2rEeGl8qrc8BM7vA" value="1"/>
-              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_efWW8U2rEeGl8qrc8BM7vA" value="1"/>
-            </end>
-          </ownedConnector>
-          <ownedConnector xmi:id="_XmCsIFupEeGjjMeADLT5-g" name="pull1">
-            <end xmi:id="_XmDTMFupEeGjjMeADLT5-g" partWithPort="_EM2p4FupEeGjjMeADLT5-g" role="_xcu1wHLmEd6R5tffIPrlPg">
-              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XmDTMlupEeGjjMeADLT5-g" value="1"/>
-              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XmDTMVupEeGjjMeADLT5-g" value="1"/>
-            </end>
-            <end xmi:id="_XmD6QFupEeGjjMeADLT5-g" partWithPort="_gV1cgDLiEd2RVeNawwNNzg" role="_tyiqs8__Ed-TP80eVS-2Rg">
-              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XmD6QlupEeGjjMeADLT5-g" value="1"/>
-              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XmD6QVupEeGjjMeADLT5-g" value="1"/>
-            </end>
-          </ownedConnector>
-          <ownedConnector xmi:id="_YTirUFupEeGjjMeADLT5-g" name="pull2">
-            <end xmi:id="_YTjSYFupEeGjjMeADLT5-g" partWithPort="_EM2p4FupEeGjjMeADLT5-g" role="_xcu1wHLmEd6R5tffIPrlPg">
-              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_YTjSYlupEeGjjMeADLT5-g" value="1"/>
-              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YTjSYVupEeGjjMeADLT5-g" value="1"/>
-            </end>
-            <end xmi:id="_YTjSY1upEeGjjMeADLT5-g" partWithPort="_-uMo0FuoEeGjjMeADLT5-g" role="_tyiqs8__Ed-TP80eVS-2Rg">
-              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_YTjSZVupEeGjjMeADLT5-g" value="1"/>
-              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YTjSZFupEeGjjMeADLT5-g" value="1"/>
-            </end>
-          </ownedConnector>
-        </packagedElement>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Package" xmi:id="_oDwxACxyEeOMQpc6Y-MAJw" name="PullConsumer">
-        <packagedElement xmi:type="uml:Class" xmi:id="_tyiqsc__Ed-TP80eVS-2Rg" clientDependency="_DHTiQDF7EeCpQdhNuFCtew" name="PullConsumer_impl">
-          <generalization xmi:id="_tyiqss__Ed-TP80eVS-2Rg">
-            <general xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_-WNegNtxEd6nqsBVkgJEEA"/>
-          </generalization>
-          <ownedAttribute xmi:type="uml:Port" xmi:id="_tyiqs8__Ed-TP80eVS-2Rg" name="p" type="_wFJ3IP91Ed6Jt8e-UqrRdQ" aggregation="composite"/>
-          <ownedAttribute xmi:id="_kLNdAF8DEeGerN33d-RdRg" name="name">
-            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kLSVgF8DEeGerN33d-RdRg" value="1"/>
-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kLS8kF8DEeGerN33d-RdRg" value="1"/>
-          </ownedAttribute>
-          <interfaceRealization xmi:id="_DHTiQDF7EeCpQdhNuFCtew" name="derived realization of ILifeCycle" client="_tyiqsc__Ed-TP80eVS-2Rg">
-            <supplier xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_T3li0Dz6Ed-v9PxuTj6Elw"/>
-            <contract href="pathmap://QML_CORE/sysinterfaces.uml#_T3li0Dz6Ed-v9PxuTj6Elw"/>
-          </interfaceRealization>
-          <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_tyjRwc__Ed-TP80eVS-2Rg" name="activate" specification="_tyjRy8__Ed-TP80eVS-2Rg">
-            <language>C/C++</language>
-            <body>cout &lt;&lt; &quot;wait for data on port p&quot; &lt;&lt; endl;
-for (int i = 0; i&lt;25; i++) {
-	if (p->hasData ()) {
-		components::interfaces::PubData data = p->pull ();
-		cout &lt;&lt; &quot;Componenent &quot; &lt;&lt; name &lt;&lt; &quot; received data: x = &quot; &lt;&lt; data.x &lt;&lt; &quot; y = &quot; &lt;&lt; data.y &lt;&lt; endl;
-	}
-	usleep (100*1000);
-}
-cout &lt;&lt; &quot;finished waiting&quot; &lt;&lt; endl;
-</body>
-          </ownedBehavior>
-          <ownedOperation xmi:id="_tyjRy8__Ed-TP80eVS-2Rg" name="activate" method="_tyjRwc__Ed-TP80eVS-2Rg"/>
-          <ownedOperation xmi:id="_tyjRzM__Ed-TP80eVS-2Rg" name="deactivate"/>
-        </packagedElement>
-        <packagedElement xmi:type="uml:Class" xmi:id="_cc_tyiqsc__Ed-TP80eVS-2Rg" name="PullConsumer_impl_cc">
-          <ownedAttribute xmi:id="e_tyiqsc__Ed-TP80eVS-2Rg" name="_executor" type="_tyiqsc__Ed-TP80eVS-2Rg" aggregation="composite"/>
-          <ownedAttribute xmi:type="uml:Port" xmi:id="_oEAooCxyEeOMQpc6Y-MAJw" name="p" type="_wFJ3IP91Ed6Jt8e-UqrRdQ" aggregation="composite"/>
-          <ownedAttribute xmi:type="uml:Port" xmi:id="_oENc8SxyEeOMQpc6Y-MAJw" name="lc" aggregation="composite">
-            <type xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_T3li0Dz6Ed-v9PxuTj6Elw"/>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_oENc8ixyEeOMQpc6Y-MAJw" value="1"/>
-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_oENc8yxyEeOMQpc6Y-MAJw" value="1"/>
-          </ownedAttribute>
-          <ownedAttribute xmi:id="p_cc_tyiqsc__Ed-TP80eVS-2Rg1" name="intercept_lc0" aggregation="composite">
-            <type xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_5J9coCXQEeGX6PuSE-DJlQ"/>
-          </ownedAttribute>
-          <ownedConnector xmi:id="_cc_tyiqsc__Ed-TP80eVS-2Rg0" name="delegation p">
-            <end xmi:id="_oEM14SxyEeOMQpc6Y-MAJw" role="_oEAooCxyEeOMQpc6Y-MAJw"/>
-            <end xmi:id="_oENc8CxyEeOMQpc6Y-MAJw" partWithPort="e_tyiqsc__Ed-TP80eVS-2Rg" role="_tyiqs8__Ed-TP80eVS-2Rg"/>
-          </ownedConnector>
-          <ownedConnector xmi:id="_cc_tyiqsc__Ed-TP80eVS-2Rg10" name="c intercept_lc0 0">
-            <end xmi:id="_oEcGcixyEeOMQpc6Y-MAJw" role="_oENc8SxyEeOMQpc6Y-MAJw"/>
-            <end xmi:id="_oEcGcyxyEeOMQpc6Y-MAJw" partWithPort="p_cc_tyiqsc__Ed-TP80eVS-2Rg1">
-              <role xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#__SLXgNtxEd6nqsBVkgJEEA"/>
-            </end>
-          </ownedConnector>
-          <ownedConnector xmi:id="_cc_tyiqsc__Ed-TP80eVS-2Rg11" name="c intercept_lc0 1">
-            <end xmi:id="_oEctgSxyEeOMQpc6Y-MAJw" partWithPort="e_tyiqsc__Ed-TP80eVS-2Rg">
-              <role xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#__SLXgNtxEd6nqsBVkgJEEA"/>
-            </end>
-            <end xmi:id="_oEctgixyEeOMQpc6Y-MAJw" partWithPort="p_cc_tyiqsc__Ed-TP80eVS-2Rg1">
-              <role xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#_ZjdOAP-EEd6628OhKk_dpg"/>
-            </end>
-          </ownedConnector>
-        </packagedElement>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Package" xmi:id="_oDx_ISxyEeOMQpc6Y-MAJw" name="interfaces">
-        <packagedElement xmi:type="uml:DataType" xmi:id="_wFJ3IP91Ed6Jt8e-UqrRdQ" name="PubData">
-          <ownedAttribute xmi:id="_yywF0P91Ed6Jt8e-UqrRdQ" name="y" isUnique="false" aggregation="composite">
-            <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
-          </ownedAttribute>
-          <ownedAttribute xmi:id="_zUgvEP91Ed6Jt8e-UqrRdQ" name="x" isUnique="false" aggregation="composite">
-            <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
-          </ownedAttribute>
-        </packagedElement>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Package" xmi:id="_oD1CcCxyEeOMQpc6Y-MAJw" name="Producer">
-        <packagedElement xmi:type="uml:Class" xmi:id="_IfjoETLbEd2qeKRLMdIx_A" clientDependency="_jkNdADF8EeCpQdhNuFCtew" name="Producer_impl">
-          <generalization xmi:id="_34FjAPx3Ed6O2oOTPfeAMA">
-            <general xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_N6fa4JsrEd61Eo3nmu3JhQ"/>
-          </generalization>
-          <ownedAttribute xmi:type="uml:Port" xmi:id="_DtWn4DLcEd2qeKRLMdIx_A" name="q" type="_wFJ3IP91Ed6Jt8e-UqrRdQ" aggregation="composite">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_zDR50FuoEeGjjMeADLT5-g" value="1"/>
-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zDTH8FuoEeGjjMeADLT5-g" value="1"/>
-          </ownedAttribute>
-          <interfaceRealization xmi:id="_jkNdADF8EeCpQdhNuFCtew" name="derived realization of IStart" client="_IfjoETLbEd2qeKRLMdIx_A">
-            <supplier xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_PTWzwCS-Ed-A_I32T0fkaA"/>
-            <contract href="pathmap://QML_CORE/sysinterfaces.uml#_PTWzwCS-Ed-A_I32T0fkaA"/>
-          </interfaceRealization>
-          <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_yXNVoKF4Ed6FqJCjEUrkqQ" name="run" specification="_dH4RIKF4Ed6FqJCjEUrkqQ">
-            <language>C/C++</language>
-            <body>cout &lt;&lt; &quot;publish a value via port q;&quot; &lt;&lt; endl;
-components::interfaces::PubData data;
-data.x = 2;
-data.y = 3;
-for (int i = 0; i&lt;20; i++) {
-	q->push (data);
-	cout &lt;&lt; &quot;.&quot; &lt;&lt; flush;
-	// wait 200ms
-	usleep (200*1000);
-}
-</body>
-          </ownedBehavior>
-          <ownedOperation xmi:id="_dH4RIKF4Ed6FqJCjEUrkqQ" name="run" method="_yXNVoKF4Ed6FqJCjEUrkqQ"/>
-        </packagedElement>
-      </packagedElement>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Package" xmi:id="_oD6iACxyEeOMQpc6Y-MAJw" name="platform">
-      <packagedElement xmi:type="uml:Package" xmi:id="_oD6iASxyEeOMQpc6Y-MAJw" name="HWArchitecturePlatform">
-        <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_GQ1ekKwHEeCQX8uv_p0Q4A" name="monoNode" classifier="_zY9vMDLiEd2RVeNawwNNzg"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Node" xmi:id="_zY9vMDLiEd2RVeNawwNNzg" name="MonoNode"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Package" xmi:id="_oEg-8CxyEeOMQpc6Y-MAJw" name="DataExchange_PubData">
-      <templateBinding xmi:id="_oEg-8SxyEeOMQpc6Y-MAJw">
-        <parameterSubstitution xmi:id="_oEg-8ixyEeOMQpc6Y-MAJw" actual="_wFJ3IP91Ed6Jt8e-UqrRdQ">
-          <formal xmi:type="uml:ClassifierTemplateParameter" href="pathmap://QML_CORE/fifo.uml#_diTcwHLoEd6R5tffIPrlPg"/>
-        </parameterSubstitution>
-        <signature href="pathmap://QML_CORE/fifo.uml#_cHY98HLoEd6R5tffIPrlPg"/>
-      </templateBinding>
-      <packagedElement xmi:type="uml:Package" xmi:id="_oEg-8yxyEeOMQpc6Y-MAJw" name="FIFO">
-        <packagedElement xmi:type="uml:Class" xmi:id="_Y1jF8HPpEd6R5tffIPrlPg" clientDependency="_y6XsAF72EeGerN33d-RdRg _oFWscCxyEeOMQpc6Y-MAJw _oFWscSxyEeOMQpc6Y-MAJw" name="FIFO_impl">
-          <generalization xmi:id="_Z4Oq8HPpEd6R5tffIPrlPg" general="_wh_EwHLmEd6R5tffIPrlPg"/>
-          <generalization xmi:id="_ws_1gF72EeGerN33d-RdRg">
-            <general xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_-WNegNtxEd6nqsBVkgJEEA"/>
-          </generalization>
-          <ownedAttribute xmi:id="_6iV9wHUHEd6R5tffIPrlPg" name="m_push_pos" isUnique="false" aggregation="composite">
-            <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
-          </ownedAttribute>
-          <ownedAttribute xmi:id="_RlKZIHUIEd6R5tffIPrlPg" name="m_pull_pos" isUnique="false" aggregation="composite">
-            <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
-          </ownedAttribute>
-          <ownedAttribute xmi:id="_XDRnoHUIEd6R5tffIPrlPg" name="m_size" isUnique="false" aggregation="composite">
-            <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_SUhOUBGcEd-rfYlCjUOxJQ" value="1"/>
-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SUpKIBGcEd-rfYlCjUOxJQ" value="1"/>
-            <defaultValue xmi:type="uml:LiteralInteger" xmi:id="_T1yz0BGcEd-rfYlCjUOxJQ" value="20"/>
-          </ownedAttribute>
-          <ownedAttribute xmi:id="_XcO6MHUIEd6R5tffIPrlPg" name="m_filled" isUnique="false" aggregation="composite">
-            <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
-          </ownedAttribute>
-          <ownedAttribute xmi:id="_zNeIsBGZEd-rfYlCjUOxJQ" name="m_fifo" visibility="public" type="_wFJ3IP91Ed6Jt8e-UqrRdQ" isUnique="false" aggregation="composite">
-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Q8o1YBGcEd-rfYlCjUOxJQ"/>
-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Q8vjEBGcEd-rfYlCjUOxJQ" value="*"/>
-          </ownedAttribute>
-          <interfaceRealization xmi:id="_y6XsAF72EeGerN33d-RdRg" name="derived realization of ILifeCycle" client="_Y1jF8HPpEd6R5tffIPrlPg">
-            <supplier xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_T3li0Dz6Ed-v9PxuTj6Elw"/>
-            <contract href="pathmap://QML_CORE/sysinterfaces.uml#_T3li0Dz6Ed-v9PxuTj6Elw"/>
-          </interfaceRealization>
-          <interfaceRealization xmi:id="_oFWscCxyEeOMQpc6Y-MAJw" name="derived realization of D_Push_PubData" client="_Y1jF8HPpEd6R5tffIPrlPg" supplier="_oFMUZCxyEeOMQpc6Y-MAJw" contract="_oFMUZCxyEeOMQpc6Y-MAJw"/>
-          <interfaceRealization xmi:id="_oFWscSxyEeOMQpc6Y-MAJw" name="derived realization of D_PullConsumer_PubData" client="_Y1jF8HPpEd6R5tffIPrlPg" supplier="_oFQl0yxyEeOMQpc6Y-MAJw" contract="_oFQl0yxyEeOMQpc6Y-MAJw"/>
-          <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_FjGlgP69Ed6Zw96O-tCw7A" name="pull" specification="_EYx84P68Ed6Zw96O-tCw7A">
-            <ownedParameter xmi:id="_oFq1gCxyEeOMQpc6Y-MAJw" name="ret" type="_wFJ3IP91Ed6Jt8e-UqrRdQ" direction="return">
-              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_oFq1gSxyEeOMQpc6Y-MAJw" value="1"/>
-              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_oFq1gixyEeOMQpc6Y-MAJw" value="1"/>
-            </ownedParameter>
-            <language>C/C++</language>
-            <body>if (m_filled > 0) {
-	int current_pos = m_pull_pos;
-	
-	m_pull_pos ++;
-	m_filled --;
-    if (m_pull_pos == m_size) {
-		m_pull_pos = 0;
-	}
-	return m_fifo [current_pos];
-}</body>
-          </ownedBehavior>
-          <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_IwXLsP69Ed6Zw96O-tCw7A" name="push" specification="_EYsdUP68Ed6Zw96O-tCw7A">
-            <ownedParameter xmi:id="_oFq1gyxyEeOMQpc6Y-MAJw" name="data" type="_wFJ3IP91Ed6Jt8e-UqrRdQ">
-              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_oFq1hCxyEeOMQpc6Y-MAJw" value="1"/>
-              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_oFq1hSxyEeOMQpc6Y-MAJw" value="1"/>
-            </ownedParameter>
-            <language>C/C++</language>
-            <body>// copy passed parameters ...
-if (m_filled &lt; m_size) {
-	m_fifo [m_push_pos] = data;
-	m_push_pos ++;
-	m_filled ++;
-	if (m_push_pos == m_size) {
-		m_push_pos = 0;
-	}
-}</body>
-          </ownedBehavior>
-          <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="__Ha0IBJHEd-XjYZ05V-9-Q" name="hasData">
-            <ownedParameter xmi:id="_oFq1hixyEeOMQpc6Y-MAJw" name="ret" direction="return">
-              <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_Bv7l0B-VEd6nGq8wpI2tjg"/>
-              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_oFrckCxyEeOMQpc6Y-MAJw" value="1"/>
-              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_oFrckSxyEeOMQpc6Y-MAJw" value="1"/>
-            </ownedParameter>
-            <language>C/C++</language>
-            <body>return (m_filled > 0);</body>
-          </ownedBehavior>
-          <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_QzOqwK8yEeCXIcykFPsB8Q" name="activate" specification="_5IpEwK8xEeCXIcykFPsB8Q">
-            <language>C/C++</language>
-            <body>
-if (m_size == 0) {
-	cerr &lt;&lt; &quot;Warning: size of FIFO is not properly configured (=0!)&quot; &lt;&lt; endl;
-}
-m_fifo = new ProducerTwoConsumers::components::interfaces::PubData[m_size];</body>
-          </ownedBehavior>
-          <ownedOperation xmi:id="_EYx84P68Ed6Zw96O-tCw7A" name="pull" method="_FjGlgP69Ed6Zw96O-tCw7A">
-            <ownedParameter xmi:id="_EYx84f68Ed6Zw96O-tCw7A" name="ret" type="_wFJ3IP91Ed6Jt8e-UqrRdQ" direction="return">
-              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_EYx84v68Ed6Zw96O-tCw7A" value="1"/>
-              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EYx84_68Ed6Zw96O-tCw7A" value="1"/>
-            </ownedParameter>
-          </ownedOperation>
-          <ownedOperation xmi:id="_EYsdUP68Ed6Zw96O-tCw7A" name="push" method="_IwXLsP69Ed6Zw96O-tCw7A">
-            <ownedParameter xmi:id="_EYtEYP68Ed6Zw96O-tCw7A" name="data" type="_wFJ3IP91Ed6Jt8e-UqrRdQ">
-              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_EYtEYf68Ed6Zw96O-tCw7A" value="1"/>
-              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EYtEYv68Ed6Zw96O-tCw7A" value="1"/>
-            </ownedParameter>
-          </ownedOperation>
-          <ownedOperation xmi:id="_5IpEwK8xEeCXIcykFPsB8Q" name="activate" method="_QzOqwK8yEeCXIcykFPsB8Q"/>
-          <ownedOperation xmi:id="_y7cqEF72EeGerN33d-RdRg" name="deactivate"/>
-          <ownedOperation xmi:id="_oFX6kCxyEeOMQpc6Y-MAJw" name="configuration_complete"/>
-          <ownedOperation xmi:id="_oFmkECxyEeOMQpc6Y-MAJw" name="data">
-            <ownedParameter xmi:id="_oFmkESxyEeOMQpc6Y-MAJw" name="ret" direction="return">
-              <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_Bv7l0B-VEd6nGq8wpI2tjg"/>
-              <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_oFmkEixyEeOMQpc6Y-MAJw" value="1"/>
-              <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_oFnLICxyEeOMQpc6Y-MAJw" value="1"/>
-            </ownedParameter>
-          </ownedOperation>
-        </packagedElement>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_wh_EwHLmEd6R5tffIPrlPg" name="PushPull" isAbstract="true">
-        <generalization xmi:id="_6zGSwHLnEd6R5tffIPrlPg" general="_unqQoHLnEd6R5tffIPrlPg"/>
-        <generalization xmi:id="_9mPv0HLnEd6R5tffIPrlPg" general="_wtZ1IHLnEd6R5tffIPrlPg"/>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_unqQoHLnEd6R5tffIPrlPg" name="PushP" isAbstract="true">
-        <ownedAttribute xmi:type="uml:Port" xmi:id="_xHb7MHLmEd6R5tffIPrlPg" name="pushP" visibility="public" type="_wFJ3IP91Ed6Jt8e-UqrRdQ" aggregation="composite" isConjugated="true">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_SJlB4DFrEeCz5-DK9j5azg" value="1"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SLJvMDFrEeCz5-DK9j5azg" value="1"/>
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_iRXR8P3IEeC1YdT2qA0bjA">
-            <value xsi:nil="true"/>
-          </defaultValue>
-        </ownedAttribute>
-      </packagedElement>
-      <packagedElement xmi:type="uml:Class" xmi:id="_wtZ1IHLnEd6R5tffIPrlPg" name="PullC" isAbstract="true">
-        <ownedAttribute xmi:type="uml:Port" xmi:id="_xcu1wHLmEd6R5tffIPrlPg" name="pullC" visibility="public" type="_wFJ3IP91Ed6Jt8e-UqrRdQ" aggregation="composite" isConjugated="true">
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VhIMgDFrEeCz5-DK9j5azg" value="1"/>
-          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ViKuUDFrEeCz5-DK9j5azg" value="1"/>
-          <defaultValue xmi:type="uml:LiteralString" xmi:id="_2az3IC_fEeKl_vDGXh-OPw">
-            <value xsi:nil="true"/>
-          </defaultValue>
-        </ownedAttribute>
-      </packagedElement>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Package" xmi:id="_oFMUYCxyEeOMQpc6Y-MAJw" name="derivedInterfaces">
-      <packagedElement xmi:type="uml:Package" xmi:id="_oFMUYSxyEeOMQpc6Y-MAJw" name="ProducerTwoConsumers">
-        <packagedElement xmi:type="uml:Package" xmi:id="_oFMUYixyEeOMQpc6Y-MAJw" name="components">
-          <packagedElement xmi:type="uml:Package" xmi:id="_oFMUYyxyEeOMQpc6Y-MAJw" name="interfaces">
-            <packagedElement xmi:type="uml:Interface" xmi:id="_oFMUZCxyEeOMQpc6Y-MAJw" name="D_Push_PubData">
-              <ownedOperation xmi:id="_oFQl0SxyEeOMQpc6Y-MAJw" name="push">
-                <ownedParameter xmi:id="_oFQl0ixyEeOMQpc6Y-MAJw" name="data" type="_wFJ3IP91Ed6Jt8e-UqrRdQ"/>
-              </ownedOperation>
-            </packagedElement>
-            <packagedElement xmi:type="uml:Interface" xmi:id="_oFQl0yxyEeOMQpc6Y-MAJw" name="D_PullConsumer_PubData">
-              <ownedOperation xmi:id="_oFVeUSxyEeOMQpc6Y-MAJw" name="pull">
-                <ownedParameter xmi:id="_oFVeUixyEeOMQpc6Y-MAJw" name="ret" type="_wFJ3IP91Ed6Jt8e-UqrRdQ" direction="return"/>
-              </ownedOperation>
-              <ownedOperation xmi:id="_oFWFYCxyEeOMQpc6Y-MAJw" name="data">
-                <ownedParameter xmi:id="_oFWFYSxyEeOMQpc6Y-MAJw" name="ret" direction="return">
-                  <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_Bv7l0B-VEd6nGq8wpI2tjg"/>
-                </ownedParameter>
-              </ownedOperation>
-            </packagedElement>
-          </packagedElement>
-        </packagedElement>
-      </packagedElement>
-    </packagedElement>
-    <profileApplication xmi:id="_oDr4gCxyEeOMQpc6Y-MAJw">
-      <eAnnotations xmi:id="_oDr4gSxyEeOMQpc6Y-MAJw" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2#/"/>
-      </eAnnotations>
-      <appliedProfile href="pathmap://UML_PROFILES/StandardL2.profile.uml#_0"/>
-    </profileApplication>
-    <profileApplication xmi:id="_oDr4gixyEeOMQpc6Y-MAJw">
-      <eAnnotations xmi:id="_oDr4gyxyEeOMQpc6Y-MAJw" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/>
-      </eAnnotations>
-      <appliedProfile href="pathmap://PapyrusC_Cpp_PROFILES/C_Cpp.profile.uml#_j9REUByGEduN1bTiWJ0lyw"/>
-    </profileApplication>
-    <profileApplication xmi:id="_oDr4hCxyEeOMQpc6Y-MAJw">
-      <eAnnotations xmi:id="_oDr4hSxyEeOMQpc6Y-MAJw" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/FCM/1#/"/>
-      </eAnnotations>
-      <appliedProfile href="pathmap://FCM_PROFILES/FCM.profile.uml#_5mvT0MtjEd2H_o0jIC6qDQ"/>
-    </profileApplication>
-    <profileApplication xmi:id="_oDsfkCxyEeOMQpc6Y-MAJw">
-      <eAnnotations xmi:id="_oDsfkSxyEeOMQpc6Y-MAJw" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/MARTE/1#//GCM"/>
-      </eAnnotations>
-      <appliedProfile href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_YgAioAPMEdyuUt-4qHuVvQ"/>
-    </profileApplication>
-    <profileApplication xmi:id="_oDsfkixyEeOMQpc6Y-MAJw">
-      <eAnnotations xmi:id="_oDsfkyxyEeOMQpc6Y-MAJw" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/MARTE/1#//SRM"/>
-      </eAnnotations>
-      <appliedProfile href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_3VS0wAPMEdyuUt-4qHuVvQ"/>
-    </profileApplication>
-    <profileApplication xmi:id="_oDtGoCxyEeOMQpc6Y-MAJw">
-      <eAnnotations xmi:id="_oDtGoSxyEeOMQpc6Y-MAJw" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/MARTE/1#//SRM/SW_ResourceCore"/>
-      </eAnnotations>
-      <appliedProfile href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_-1fcUBJdEdy3Td9UhuLFPg"/>
-    </profileApplication>
-    <profileApplication xmi:id="_oDtGoixyEeOMQpc6Y-MAJw">
-      <eAnnotations xmi:id="_oDttsCxyEeOMQpc6Y-MAJw" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/MARTE/1#//SRM/SW_Concurrency"/>
-      </eAnnotations>
-      <appliedProfile href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_A_vtYBJeEdy3Td9UhuLFPg"/>
-    </profileApplication>
-    <profileApplication xmi:id="_oDttsSxyEeOMQpc6Y-MAJw">
-      <eAnnotations xmi:id="_oDttsixyEeOMQpc6Y-MAJw" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/MARTE/1#//HLAM"/>
-      </eAnnotations>
-      <appliedProfile href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_yNSZIAPMEdyuUt-4qHuVvQ"/>
-    </profileApplication>
-    <profileApplication xmi:id="_oDuUwCxyEeOMQpc6Y-MAJw">
-      <eAnnotations xmi:id="_oDuUwSxyEeOMQpc6Y-MAJw" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/MARTE/1#//SRM/SW_Brokering"/>
-      </eAnnotations>
-      <appliedProfile href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_Cf874BJeEdy3Td9UhuLFPg"/>
-    </profileApplication>
-    <profileApplication xmi:id="_oDuUwixyEeOMQpc6Y-MAJw">
-      <eAnnotations xmi:id="_oDuUwyxyEeOMQpc6Y-MAJw" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/MARTE/1#//SRM/SW_Interaction"/>
-      </eAnnotations>
-      <appliedProfile href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_EIfnABJeEdy3Td9UhuLFPg"/>
-    </profileApplication>
-    <profileApplication xmi:id="_oDu70CxyEeOMQpc6Y-MAJw">
-      <eAnnotations xmi:id="_oDu70SxyEeOMQpc6Y-MAJw" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/MARTE/1#//Alloc"/>
-      </eAnnotations>
-      <appliedProfile href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_ar8OsAPMEdyuUt-4qHuVvQ"/>
-    </profileApplication>
-  </uml:Model>
-  <C_Cpp:Include xmi:id="_11OtwPcaEd-KM6l7lmIPkw" body="#include &lt;iostream>&#xA;#include &lt;unistd.h>&#xA;using namespace std;" base_class="_tyiqsc__Ed-TP80eVS-2Rg"/>
-  <FCM:RuleApplication xmi:id="_Jyda4F7zEeGA7qTe7UD05A" base_Class="_tyiqsc__Ed-TP80eVS-2Rg">
-    <containerRule href="pathmap://QML_CORE/core.uml#_3Jq5MARLEd-OidZzGKCpzg"/>
-    <containerRule href="pathmap://QML_CORE/core.uml#_3Jq5MARLEd-OidZzGKCpzg"/>
-  </FCM:RuleApplication>
-  <GCM:FlowPort xmi:id="_oDx_JSxyEeOMQpc6Y-MAJw" direction="in" base_Port="_tyiqs8__Ed-TP80eVS-2Rg"/>
-  <FCM:Port xmi:id="_oDx_JixyEeOMQpc6Y-MAJw" base_Port="_tyiqs8__Ed-TP80eVS-2Rg">
-    <kind href="pathmap://QML_CORE/core.uml#_x5mL4FRxEd6GqrP6fkWBoQ"/>
-  </FCM:Port>
-  <FCM:ConfigurationProperty xmi:id="_o8LRoF8DEeGerN33d-RdRg" base_Property="_kLNdAF8DEeGerN33d-RdRg"/>
-  <FCM:DerivedElement xmi:id="_oDz0UCxyEeOMQpc6Y-MAJw" base_Element="_tyjRy8__Ed-TP80eVS-2Rg">
-    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_WHyq4Dz6Ed-v9PxuTj6Elw"/>
-  </FCM:DerivedElement>
-  <FCM:DerivedElement xmi:id="_oDz0UixyEeOMQpc6Y-MAJw" base_Element="_tyjRzM__Ed-TP80eVS-2Rg">
-    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_W7YrADz6Ed-v9PxuTj6Elw"/>
-  </FCM:DerivedElement>
-  <C_Cpp:Include xmi:id="_7SAnAP76Ed6Zw96O-tCw7A" body="#include &lt;iostream>&#xA;#include &lt;unistd.h>&#xA;using namespace std;" base_class="_IfjoETLbEd2qeKRLMdIx_A"/>
-  <FCM:Port xmi:id="_IWQqoP6yEd6Ie_kieu_3CQ" base_Port="_DtWn4DLcEd2qeKRLMdIx_A">
-    <kind href="pathmap://QML_CORE/core.uml#_qOK0cFR1Ed6GqrP6fkWBoQ"/>
-  </FCM:Port>
-  <GCM:FlowPort xmi:id="_ow3PkJZ7EeCiU5xXzp1cKQ" direction="out" base_Port="_DtWn4DLcEd2qeKRLMdIx_A"/>
-  <FCM:DerivedElement xmi:id="_oD23oSxyEeOMQpc6Y-MAJw" base_Element="_dH4RIKF4Ed6FqJCjEUrkqQ">
-    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_C9IK4JsqEd61Eo3nmu3JhQ"/>
-  </FCM:DerivedElement>
-  <FCM:Connector xmi:id="_Kgl40FupEeGjjMeADLT5-g" base_Property="_EM2p4FupEeGjjMeADLT5-g"/>
-  <FCM:Target xmi:id="_oD7JECxyEeOMQpc6Y-MAJw" base_Node="_zY9vMDLiEd2RVeNawwNNzg">
-    <targetArch href="pathmap://QML_CORE/core.uml#_FYOqwF0OEd-12d_h0i1xhQ"/>
-    <usedOS href="pathmap://QML_CORE/core.uml#_1eULwF0NEd-12d_h0i1xhQ"/>
-  </FCM:Target>
-  <Alloc:Allocate xmi:id="_oD_agCxyEeOMQpc6Y-MAJw" base_Abstraction="_oD7wICxyEeOMQpc6Y-MAJw"/>
-  <GCM:FlowPort xmi:id="_oEE6ECxyEeOMQpc6Y-MAJw" direction="in" base_Port="_oEAooCxyEeOMQpc6Y-MAJw"/>
-  <FCM:Port xmi:id="_oELnwCxyEeOMQpc6Y-MAJw" base_Port="_oEAooCxyEeOMQpc6Y-MAJw">
-    <kind href="pathmap://QML_CORE/core.uml#_x5mL4FRxEd6GqrP6fkWBoQ"/>
-  </FCM:Port>
-  <FCM:Port xmi:id="_oEUxsCxyEeOMQpc6Y-MAJw" base_Port="_oENc8SxyEeOMQpc6Y-MAJw">
-    <kind href="pathmap://QML_CORE/core.uml#_wySlkFRxEd6GqrP6fkWBoQ"/>
-  </FCM:Port>
-  <FCM:InteractionComponent xmi:id="_xQ_ccHUuEd6R5tffIPrlPg" base_Class="_Y1jF8HPpEd6R5tffIPrlPg"/>
-  <C_Cpp:Include xmi:id="_fUHyQF8DEeGerN33d-RdRg" body="#include &lt;iostream>&#xA;using namespace std;" base_class="_Y1jF8HPpEd6R5tffIPrlPg"/>
-  <FCM:InteractionComponent xmi:id="_IwT2cP6_Ed6Zw96O-tCw7A" base_Class="_wh_EwHLmEd6R5tffIPrlPg"/>
-  <FCM:Port xmi:id="_42zlMHLnEd6R5tffIPrlPg" base_Port="_xHb7MHLmEd6R5tffIPrlPg">
-    <kind href="pathmap://QML_CORE/core.uml#_qOK0cFR1Ed6GqrP6fkWBoQ"/>
-  </FCM:Port>
-  <FCM:Port xmi:id="_57KlMHLnEd6R5tffIPrlPg" base_Port="_xcu1wHLmEd6R5tffIPrlPg">
-    <kind href="pathmap://QML_CORE/core.uml#_x5mL4FRxEd6GqrP6fkWBoQ"/>
-  </FCM:Port>
-  <FCM:ConfigurationProperty xmi:id="_FxN9cLC0EeCaaIdtw75MLg" base_Property="_XDRnoHUIEd6R5tffIPrlPg"/>
-  <FCM:DerivedElement xmi:id="_EYzyEP68Ed6Zw96O-tCw7A" base_Element="_EYx84P68Ed6Zw96O-tCw7A" source="_oFVeUSxyEeOMQpc6Y-MAJw"/>
-  <FCM:DerivedElement xmi:id="_0TVb8P6-Ed6Zw96O-tCw7A" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_7HAIIP6-Ed6Zw96O-tCw7A" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_vfETEARNEd-OidZzGKCpzg" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_op6Y4AnOEd-9beZpMGts2w" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_6tSQAAnUEd-co_m_wv4b6A" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_YMw7cBGZEd-rfYlCjUOxJQ" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_t04d8BGaEd-rfYlCjUOxJQ" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_G7QQABGcEd-rfYlCjUOxJQ" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_C5J9cBGlEd-Jq_XWT8Mhpg" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_IAxtYBI7Ed-3zOZ0RGapGA" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_AnPpIBI9Ed-XjYZ05V-9-Q" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_11WOABJWEd-QgZm_R1AKbA" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_C7WOoBQ-Ed-_dI0JopJMvQ" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_kUNw0Bb8Ed-u0pMEAnvpEQ" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_6-1mQBcKEd-Tda7vKXmT2A" base_Element="_EYx84P68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_EYu5kP68Ed6Zw96O-tCw7A" base_Element="_EYsdUP68Ed6Zw96O-tCw7A" source="_oFQl0SxyEeOMQpc6Y-MAJw"/>
-  <FCM:DerivedElement xmi:id="_0TRKgP6-Ed6Zw96O-tCw7A" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_7G9E0P6-Ed6Zw96O-tCw7A" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_vfBPwARNEd-OidZzGKCpzg" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_op38oAnOEd-9beZpMGts2w" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_6tRB4AnUEd-co_m_wv4b6A" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_YMvtUBGZEd-rfYlCjUOxJQ" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_t02owBGaEd-rfYlCjUOxJQ" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_G7PB4BGcEd-rfYlCjUOxJQ" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_C4zYIBGlEd-Jq_XWT8Mhpg" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_IAwfQBI7Ed-3zOZ0RGapGA" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_AnNM4BI9Ed-XjYZ05V-9-Q" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_11TxwBJWEd-QgZm_R1AKbA" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_C7UZcBQ-Ed-_dI0JopJMvQ" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_kUMisBb8Ed-u0pMEAnvpEQ" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/>
-  <FCM:DerivedElement xmi:id="_6-zKABcKEd-Tda7vKXmT2A" base_Element="_EYsdUP68Ed6Zw96O-tCw7A"/>
-  <FCM:Template xmi:id="_oE-5ACxyEeOMQpc6Y-MAJw" base_Element="_5IpEwK8xEeCXIcykFPsB8Q"/>
-  <FCM:DerivedElement xmi:id="_oE_gECxyEeOMQpc6Y-MAJw" base_Element="_5IpEwK8xEeCXIcykFPsB8Q">
-    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_WHyq4Dz6Ed-v9PxuTj6Elw"/>
-  </FCM:DerivedElement>
-  <FCM:DerivedElement xmi:id="_oFLtUCxyEeOMQpc6Y-MAJw" base_Element="_y7cqEF72EeGerN33d-RdRg">
-    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_W7YrADz6Ed-v9PxuTj6Elw"/>
-  </FCM:DerivedElement>
-  <FCM:DerivedElement xmi:id="_oFQl0CxyEeOMQpc6Y-MAJw" base_Element="_oFMUZCxyEeOMQpc6Y-MAJw" source="_wFJ3IP91Ed6Jt8e-UqrRdQ"/>
-  <FCM:DerivedElement xmi:id="_oFVeUCxyEeOMQpc6Y-MAJw" base_Element="_oFQl0yxyEeOMQpc6Y-MAJw" source="_wFJ3IP91Ed6Jt8e-UqrRdQ"/>
-  <FCM:DerivedElement xmi:id="_oFbk8CxyEeOMQpc6Y-MAJw" base_Element="_oFX6kCxyEeOMQpc6Y-MAJw">
-    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_ns4qsClUEeO4bs_nkcnKOg"/>
-  </FCM:DerivedElement>
-  <FCM:DerivedElement xmi:id="_oFqOcCxyEeOMQpc6Y-MAJw" base_Element="_oFmkECxyEeOMQpc6Y-MAJw" source="_oFWFYCxyEeOMQpc6Y-MAJw"/>
-</xmi:XMI>
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/.classpath b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/.classpath
index 9d5026e8ffd..ad32c83a788 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/.classpath
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/META-INF/MANIFEST.MF b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/META-INF/MANIFEST.MF
index 7b81e14d09e..83d46e36316 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/META-INF/MANIFEST.MF
@@ -7,16 +7,12 @@ Require-Bundle: org.eclipse.ui,
  org.apache.commons.lang;bundle-version="2.3.0",

  org.eclipse.emf.edit.ui;bundle-version="2.6.0",

  org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.0.100",

- org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.1.0",

  org.eclipse.papyrus.infra.core;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.widgets;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.services.decoration;bundle-version="1.0.0",

- org.eclipse.gef;bundle-version="3.8.1",

- org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",

  org.eclipse.uml2.uml;bundle-version="4.0.0",

  org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.emf;bundle-version="1.0.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.0.0"

 Export-Package: org.eclipse.papyrus.infra.services.tracepoints,

@@ -33,5 +29,5 @@ Bundle-Activator: org.eclipse.papyrus.infra.services.tracepoints.Activ
  ator

 Bundle-SymbolicName: org.eclipse.papyrus.infra.services.tracepoints;si

  ngleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

 

diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/Messages.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/Messages.java
new file mode 100644
index 00000000000..e1cc36702a5
--- /dev/null
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/Messages.java
@@ -0,0 +1,30 @@
+package org.eclipse.papyrus.infra.services.tracepoints;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.services.tracepoints.messages"; //$NON-NLS-1$
+	
+	public static String TraceActionSelection_ClassOptions;
+	public static String TraceActionSelection_ImplementationOptions;
+	public static String TraceActionSelection_NoPluginsProvideTraceExt;
+	public static String TraceActionSelection_NotAvail;
+	public static String TraceActionSelection_OperationOptions;
+	public static String TraceActionSelection_SelectTraceAction;
+	public static String TraceActionSelection_StateOptions;
+	
+	public static String TPPreferencePage_ClassOptions;
+	public static String TPPreferencePage_OperationOptions;
+	public static String TPPreferencePage_StateOptions;
+	public static String TPPreferencePage_TMforOperations;
+	public static String TPPreferencePage_TMforPorts;
+	public static String TPPreferencePage_TMforStateMachines;
+	public static String TPPreferencePage_TraceOptions;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TraceActions.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TraceActions.java
index 6eaf7a25518..e8268e95b13 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TraceActions.java
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TraceActions.java
@@ -135,16 +135,16 @@ public class TraceActions {
 	 */
 	public static String getStringPrefix(TraceFeature feature) {
 		if(feature == TraceFeature.Class) {
-			return "C:";
+			return "C:"; //$NON-NLS-1$
 		}
 		if(feature == TraceFeature.Port) {
-			return "P:";
+			return "P:"; //$NON-NLS-1$
 		}
 		else if(feature == TraceFeature.State) {
-			return "S:";
+			return "S:"; //$NON-NLS-1$
 		}
 		else if(feature == TraceFeature.Operation) {
-			return "O:";
+			return "O:"; //$NON-NLS-1$
 		}
 		return null;
 	}
@@ -171,12 +171,12 @@ public class TraceActions {
 		else if(feature == TraceFeature.Operation) {
 			return store.getString(TPPreferenceConstants.P_TRACE_OPTION_OP);
 		}
-		return "";
+		return ""; //$NON-NLS-1$
 	}
 
 	public static String compositeClassOption(int classOption, int stateOption, int operationOption) {
-		return getStringPrefix(TraceFeature.Class) + classOption + "," +
-			getStringPrefix(TraceFeature.State) + stateOption + "," +
+		return getStringPrefix(TraceFeature.Class) + classOption + "," + //$NON-NLS-1$
+			getStringPrefix(TraceFeature.State) + stateOption + "," + //$NON-NLS-1$
 			getStringPrefix(TraceFeature.Operation) + operationOption;
 	}
 
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TraceFunctions.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TraceFunctions.java
index eb9b2fc2a82..24aea1be26c 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TraceFunctions.java
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TraceFunctions.java
@@ -24,21 +24,21 @@ import org.eclipse.papyrus.infra.services.markerlistener.IPapyrusMarker;
 
 public class TraceFunctions implements IDecorationSpecificFunctions {
 
-	public static final String activeBreakpoint16 = "icons/etool16/brkp_16x16.gif";
+	public static final String activeBreakpoint16 = "icons/etool16/brkp_16x16.gif"; //$NON-NLS-1$
 
-	public static final String inActiveBreakpoint16 = "icons/etool16/brkpd_16x16.gif";
+	public static final String inActiveBreakpoint16 = "icons/etool16/brkpd_16x16.gif"; //$NON-NLS-1$
 
-	public static final String activeTracepoint16 = "icons/etool16/trcp_16x16.gif";
+	public static final String activeTracepoint16 = "icons/etool16/trcp_16x16.gif"; //$NON-NLS-1$
 
-	public static final String inActiveTracepoint16 = "icons/etool16/trcpd_16x16.gif";
+	public static final String inActiveTracepoint16 = "icons/etool16/trcpd_16x16.gif"; //$NON-NLS-1$
 
-	public static final String activeBreakpoint9 = "icons/etool16/brkp_9x9.gif";
+	public static final String activeBreakpoint9 = "icons/etool16/brkp_9x9.gif"; //$NON-NLS-1$
 
-	public static final String inActiveBreakpoint9 = "icons/etool16/brkpd_9x9.gif";
+	public static final String inActiveBreakpoint9 = "icons/etool16/brkpd_9x9.gif"; //$NON-NLS-1$
 
-	public static final String activeTracepoint11 = "icons/etool16/trcp_11x12.gif";
+	public static final String activeTracepoint11 = "icons/etool16/trcp_11x12.gif"; //$NON-NLS-1$
 
-	public static final String inActiveTracepoint11 = "icons/etool16/trcp_11x12.gif";
+	public static final String inActiveTracepoint11 = "icons/etool16/trcp_11x12.gif"; //$NON-NLS-1$
 
 	/**
 	 * Return the image descriptor associated with a trace or breakpoint marker
@@ -95,8 +95,8 @@ public class TraceFunctions implements IDecorationSpecificFunctions {
 	public String getMessage(IPapyrusMarker marker) {
 		boolean isActive = marker.getAttribute(TracepointConstants.isActive, false);
 		boolean isTracepoint = marker.getAttribute(TracepointConstants.isTracepoint, false);
-		return (isActive ? "active" : "inactive") + " " +
-			(isTracepoint ? "trace point" : "break point");
+		return (isActive ? "active" : "inactive") + " " +   //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
+			(isTracepoint ? "trace point" : "break point");  //$NON-NLS-1$//$NON-NLS-2$
 	}
 
 	public int getPriority(IMarker marker) {
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TraceMechanism.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TraceMechanism.java
index 3edea4d3717..4866eb27422 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TraceMechanism.java
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TraceMechanism.java
@@ -31,7 +31,7 @@ import org.eclipse.papyrus.infra.services.tracepoints.preferences.TPPreferenceCo
 
 public class TraceMechanism {
 
-	public static final String ITRACE_MECHANISM_ID = Activator.PLUGIN_ID + ".traceMechanism";
+	public static final String ITRACE_MECHANISM_ID = Activator.PLUGIN_ID + ".traceMechanism"; //$NON-NLS-1$
 
 	public static EList<ITraceMechanism> getTraceMechanisms()
 	{
@@ -41,7 +41,7 @@ public class TraceMechanism {
 		for(IConfigurationElement configElement : configElements) {
 			try {
 				// TODO: cache returned instance (avoid creating a new instance each time => more efficient, no need for static attributes)
-				final Object obj = configElement.createExecutableExtension("class");
+				final Object obj = configElement.createExecutableExtension("class"); //$NON-NLS-1$
 				if(obj instanceof ITraceMechanism) {
 					mechanisms.add((ITraceMechanism)obj);
 				}
@@ -62,8 +62,8 @@ public class TraceMechanism {
 		IPreferenceStore store = Activator.getDefault().getPreferenceStore();
 		if(store != null) {
 			if(feature == TraceFeature.Class) {
-				return TraceActions.getStringPrefix(TraceFeature.Port) + store.getInt(TPPreferenceConstants.P_TRACE_IMPLEMENTATION_PORT) + "," +
-					TraceActions.getStringPrefix(TraceFeature.State) + store.getInt(TPPreferenceConstants.P_TRACE_IMPLEMENTATION_SM) + "," +
+				return TraceActions.getStringPrefix(TraceFeature.Port) + store.getInt(TPPreferenceConstants.P_TRACE_IMPLEMENTATION_PORT) + "," + //$NON-NLS-1$
+					TraceActions.getStringPrefix(TraceFeature.State) + store.getInt(TPPreferenceConstants.P_TRACE_IMPLEMENTATION_SM) + "," + //$NON-NLS-1$
 					TraceActions.getStringPrefix(TraceFeature.Operation) + store.getInt(TPPreferenceConstants.P_TRACE_IMPLEMENTATION_OP);
 			}
 			else if(feature == TraceFeature.State) {
@@ -73,7 +73,7 @@ public class TraceMechanism {
 				return store.getString(TPPreferenceConstants.P_TRACE_IMPLEMENTATION_OP);
 			}
 		}
-		return "";
+		return ""; //$NON-NLS-1$
 	}
 
 	/**
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TracepointConstants.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TracepointConstants.java
index f4d617c6e7c..7f29b3ccdde 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TracepointConstants.java
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/TracepointConstants.java
@@ -20,13 +20,13 @@ public class TracepointConstants {
 	/**
 	 * The id of the marker used for tracepoints and breakpoints
 	 */
-	public static final String tpOrbpMarker = "org.eclipse.papyrus.tporbpmarker";
+	public static final String tpOrbpMarker = "org.eclipse.papyrus.tporbpmarker"; //$NON-NLS-1$
 
-	public static final String isActive = "isActive";
+	public static final String isActive = "isActive"; //$NON-NLS-1$
 
-	public static final String isTracepoint = "isTracepoint";
+	public static final String isTracepoint = "isTracepoint"; //$NON-NLS-1$
 
-	public static final String traceAction = "traceAction";
+	public static final String traceAction = "traceAction"; //$NON-NLS-1$
 
-	public static final String traceMechanism = "traceMechanism";
+	public static final String traceMechanism = "traceMechanism"; //$NON-NLS-1$
 }
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/AbstractTracepointCommand.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/AbstractTracepointCommand.java
index 5f6758a19f8..3aacc8ea5cd 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/AbstractTracepointCommand.java
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/AbstractTracepointCommand.java
@@ -68,7 +68,7 @@ abstract public class AbstractTracepointCommand extends AbstractTransactionalCom
 
 	protected void updateResourceAndURI() {
 		resource = selectedElement.eResource();
-		uri = resource.getURI() + "#" + resource.getURIFragment(selectedElement);
+		uri = resource.getURI() + "#" + resource.getURIFragment(selectedElement); //$NON-NLS-1$
 		iresource = WorkspaceSynchronizer.getFile(selectedElement.eResource());
 	}
 
@@ -77,7 +77,7 @@ abstract public class AbstractTracepointCommand extends AbstractTransactionalCom
 		if(iresource != null) {
 			try {
 				for(IMarker marker : iresource.findMarkers(type, false, IResource.DEPTH_INFINITE)) {
-					String markerURI = marker.getAttribute(MarkerConstants.uri, "");
+					String markerURI = marker.getAttribute(MarkerConstants.uri, ""); //$NON-NLS-1$
 					if((markerURI != null) && markerURI.equals(uri)) {
 						return marker;
 					}
@@ -124,7 +124,7 @@ abstract public class AbstractTracepointCommand extends AbstractTransactionalCom
 						id = store.getDefaultString(TPPreferenceConstants.P_TRACE_IMPLEMENTATION_OP);
 					}
 					else if(selectedElement instanceof Port) {
-						id = store.getDefaultString(TPPreferenceConstants.P_TRACE_IMPLEMENTATION_OP);
+						id = store.getDefaultString(TPPreferenceConstants.P_TRACE_IMPLEMENTATION_PORT);
 					}
 					else if(selectedElement instanceof State) {
 						id = store.getDefaultString(TPPreferenceConstants.P_TRACE_IMPLEMENTATION_SM);
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleBreakpointActivationCommand.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleBreakpointActivationCommand.java
index aac91107a20..cb86d378340 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleBreakpointActivationCommand.java
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleBreakpointActivationCommand.java
@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.common.core.command.CommandResult;
 public class ToggleBreakpointActivationCommand extends AbstractTracepointCommand {
 
 	public ToggleBreakpointActivationCommand(EObject selectedElement) {
-		super("Toggle Breakpoint activation", TransactionUtil.getEditingDomain(selectedElement), selectedElement);
+		super("Toggle Breakpoint activation", TransactionUtil.getEditingDomain(selectedElement), selectedElement); //$NON-NLS-1$
 	}
 
 	/**
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleBreakpointCommand.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleBreakpointCommand.java
index 2a3dcc3d415..60c891cd02f 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleBreakpointCommand.java
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleBreakpointCommand.java
@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.common.core.command.CommandResult;
 public class ToggleBreakpointCommand extends AbstractTracepointCommand {
 
 	public ToggleBreakpointCommand(EObject selectedElement) {
-		super("Toggle Breakpoint", TransactionUtil.getEditingDomain(selectedElement), selectedElement);
+		super("Toggle Breakpoint", TransactionUtil.getEditingDomain(selectedElement), selectedElement); //$NON-NLS-1$
 	}
 
 	/**
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleTracepointActivationCommand.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleTracepointActivationCommand.java
index 0b636e0b2cc..6881780fde1 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleTracepointActivationCommand.java
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleTracepointActivationCommand.java
@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.common.core.command.CommandResult;
 public class ToggleTracepointActivationCommand extends AbstractTracepointCommand {
 
 	public ToggleTracepointActivationCommand(EObject selectedElement) {
-		super("Toggle tracepoint activation", TransactionUtil.getEditingDomain(selectedElement), selectedElement);
+		super("Toggle tracepoint activation", TransactionUtil.getEditingDomain(selectedElement), selectedElement); //$NON-NLS-1$
 	}
 
 	/**
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleTracepointCommand.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleTracepointCommand.java
index 178f271b95e..5130ae7dbbb 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleTracepointCommand.java
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/ToggleTracepointCommand.java
@@ -29,7 +29,7 @@ import org.eclipse.papyrus.infra.services.tracepoints.TracepointConstants;
 public class ToggleTracepointCommand extends AbstractTracepointCommand {
 
 	public ToggleTracepointCommand(EObject selectedElement) {
-		super("Toggle tracepoint", TransactionUtil.getEditingDomain(selectedElement), selectedElement);
+		super("Toggle tracepoint", TransactionUtil.getEditingDomain(selectedElement), selectedElement); //$NON-NLS-1$
 	}
 
 	/**
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/TracepointPropertiesCommand.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/TracepointPropertiesCommand.java
index feca6cb8a7c..791bd165fd1 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/TracepointPropertiesCommand.java
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/commands/TracepointPropertiesCommand.java
@@ -32,7 +32,7 @@ import org.eclipse.uml2.uml.Element;
 public class TracepointPropertiesCommand extends AbstractTracepointCommand {
 
 	public TracepointPropertiesCommand(EObject selectedElement) {
-		super("Tracepoint properties", TransactionUtil.getEditingDomain(selectedElement), selectedElement);
+		super("Tracepoint properties", TransactionUtil.getEditingDomain(selectedElement), selectedElement); //$NON-NLS-1$
 	}
 
 	/**
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/dialogs/TraceActionSelection.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/dialogs/TraceActionSelection.java
index b1258f9f19e..5036cd650db 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/dialogs/TraceActionSelection.java
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/dialogs/TraceActionSelection.java
@@ -31,6 +31,7 @@ import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.papyrus.infra.services.tracepoints.ITraceMechanism;
+import org.eclipse.papyrus.infra.services.tracepoints.Messages;
 import org.eclipse.papyrus.infra.services.tracepoints.TraceActions;
 import org.eclipse.papyrus.infra.services.tracepoints.TraceActions.TAClass;
 import org.eclipse.papyrus.infra.services.tracepoints.TraceActions.TAOperation;
@@ -106,7 +107,7 @@ public class TraceActionSelection extends SelectionStatusDialog {
 		else if(m_me instanceof Operation) {
 			traceActionValue = operationOptions.getResult();
 		}
-		String traceMechanism = "";
+		String traceMechanism = ""; //$NON-NLS-1$
 		for(Object tableElement : fTraceImplementations.getCheckedElements()) {
 			traceMechanism = (String)tableElement;
 		};
@@ -149,7 +150,7 @@ public class TraceActionSelection extends SelectionStatusDialog {
 
 			EList<ITraceMechanism> mechanisms = TraceMechanism.getTraceMechanisms();
 			if(mechanisms.size() == 0) {
-				items = new String[]{ "no plugins provide trace extension mechanism" };
+				items = new String[]{ Messages.TraceActionSelection_NoPluginsProvideTraceExt };
 			}
 			else {
 				EList<String> idList = new BasicEList<String>();
@@ -168,7 +169,7 @@ public class TraceActionSelection extends SelectionStatusDialog {
 		Composite contents = (Composite)super.createDialogArea(parent);
 
 		Label label = new Label(contents, SWT.NONE);
-		label.setText("Select trace action for this element");
+		label.setText(Messages.TraceActionSelection_SelectTraceAction);
 
 		// need context dependent dialogs on options
 		// we may need more than one options (e.g. AllOperations + OperationsWithParameters + (begin/end or both?))
@@ -177,28 +178,28 @@ public class TraceActionSelection extends SelectionStatusDialog {
 		String[][] taClassOptions = TraceActions.getStringFields(TAClass.values());
 		String[][] taStateOptions = TraceActions.getStringFields(TAState.values());
 		String[][] taOperationOptions = TraceActions.getStringFields(TAOperation.values());
-		String actionString = m_marker.getAttribute(TracepointConstants.traceAction, "");
-		String mechanismID = m_marker.getAttribute(TracepointConstants.traceMechanism, "");
+		String actionString = m_marker.getAttribute(TracepointConstants.traceAction, ""); //$NON-NLS-1$
+		String mechanismID = m_marker.getAttribute(TracepointConstants.traceMechanism, ""); //$NON-NLS-1$
 
 		if(m_me instanceof State) {
-			stateOptions = new BinaryEncodedMChoiceFieldEditor("State options", 3, taStateOptions, contents, true);
+			stateOptions = new BinaryEncodedMChoiceFieldEditor(Messages.TraceActionSelection_StateOptions, 3, taStateOptions, contents, true);
 			stateOptions.setupViaString(actionString);
 		}
 		else if(m_me instanceof Class) {
-			classOptions = new BinaryEncodedMChoiceFieldEditor("Class options", 3, taClassOptions, contents, true);
-			stateOptions = new BinaryEncodedMChoiceFieldEditor("State options", 3, taStateOptions, contents, true);
-			operationOptions = new BinaryEncodedMChoiceFieldEditor("Operation options", 3, taOperationOptions, contents, true);
+			classOptions = new BinaryEncodedMChoiceFieldEditor(Messages.TraceActionSelection_ClassOptions, 3, taClassOptions, contents, true);
+			stateOptions = new BinaryEncodedMChoiceFieldEditor(Messages.TraceActionSelection_StateOptions, 3, taStateOptions, contents, true);
+			operationOptions = new BinaryEncodedMChoiceFieldEditor(Messages.TraceActionSelection_OperationOptions, 3, taOperationOptions, contents, true);
 			classOptions.setupViaString(TraceActions.getOptions(actionString, TraceFeature.Class));
 			stateOptions.setupViaString(TraceActions.getOptions(actionString, TraceFeature.State));
 			operationOptions.setupViaString(TraceActions.getOptions(actionString, TraceFeature.Operation));
 		}
 		else if(m_me instanceof Operation) {
-			operationOptions = new BinaryEncodedMChoiceFieldEditor("Operation options", 3, taOperationOptions, contents, true);
+			operationOptions = new BinaryEncodedMChoiceFieldEditor(Messages.TraceActionSelection_OperationOptions, 3, taOperationOptions, contents, true);
 			operationOptions.setupViaString(actionString);
 		}
 
 		Group implementationGroup = new Group(parent, SWT.NONE);
-		implementationGroup.setText("Implementation options");
+		implementationGroup.setText(Messages.TraceActionSelection_ImplementationOptions);
 
 		// need additional item how the trace mechanism should be realized, i.e. available tracing mechanisms
 		fTraceImplementations = CheckboxTableViewer.newCheckList(implementationGroup, SWT.H_SCROLL | SWT.V_SCROLL);
@@ -241,7 +242,7 @@ public class TraceActionSelection extends SelectionStatusDialog {
 							}
 						}
 						if(noDesc) {
-							fDescription.setText("<not available>");
+							fDescription.setText(Messages.TraceActionSelection_NotAvail);
 						}
 					}
 				}
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/messages.properties b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/messages.properties
new file mode 100644
index 00000000000..94ce99780de
--- /dev/null
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/messages.properties
@@ -0,0 +1,15 @@
+TPPreferencePage_ClassOptions=Class options
+TPPreferencePage_OperationOptions=Operations options
+TPPreferencePage_StateOptions=State options
+TPPreferencePage_TMforOperations=Trace Mechanism for operations (+construction/destruction)
+TPPreferencePage_TMforPorts=Trace Mechanism for ports
+TPPreferencePage_TMforStateMachines=Trace Mechanism for state machines
+TPPreferencePage_TraceOptions=Trace options
+
+TraceActionSelection_ClassOptions=Class options
+TraceActionSelection_ImplementationOptions=Implementation options
+TraceActionSelection_NoPluginsProvideTraceExt=no plugins provide trace extension mechanism
+TraceActionSelection_NotAvail=<not available>
+TraceActionSelection_OperationOptions=Operation options
+TraceActionSelection_SelectTraceAction=Select trace action for this element
+TraceActionSelection_StateOptions=State options
\ No newline at end of file
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/BinaryEncodedMChoiceFieldEditor.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/BinaryEncodedMChoiceFieldEditor.java
index b8db97671e8..243fbc81143 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/BinaryEncodedMChoiceFieldEditor.java
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/BinaryEncodedMChoiceFieldEditor.java
@@ -61,7 +61,7 @@ public class BinaryEncodedMChoiceFieldEditor extends MultipleChoiceFieldEditor {
 	 *        display contents within a group
 	 */
 	public BinaryEncodedMChoiceFieldEditor(String labeltext, int numColumns, String[][] labelsAndValues, Composite parent, boolean useGroup) {
-		super("", labeltext, numColumns, labelsAndValues, parent, useGroup);
+		super("", labeltext, numColumns, labelsAndValues, parent, useGroup); //$NON-NLS-1$
 	}
 
 	/**
@@ -105,7 +105,7 @@ public class BinaryEncodedMChoiceFieldEditor extends MultipleChoiceFieldEditor {
 		int index = 0;
 		for(String setting[] : settings) {
 			// [0] = name, [1] = value [2] = checked
-			if(setting[2].equals("true")) {
+			if(setting[2].equals("true")) { //$NON-NLS-1$
 				traceActionValue += 1 << index;
 			}
 			index++;
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/TPPreferenceConstants.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/TPPreferenceConstants.java
index 2a0845bb849..ae73d5f9a71 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/TPPreferenceConstants.java
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/TPPreferenceConstants.java
@@ -21,31 +21,31 @@ public class TPPreferenceConstants {
 	/**
 	 * The trace mechanism that should be used by default
 	 */
-	public static final String P_TRACE_IMPLEMENTATION_PORT = "papyrus.trace.implementation.port";
+	public static final String P_TRACE_IMPLEMENTATION_PORT = "papyrus.trace.implementation.port"; //$NON-NLS-1$
 
 	/**
 	 * The trace mechanism that should be used by default
 	 */
-	public static final String P_TRACE_IMPLEMENTATION_OP = "papyrus.trace.implementation.op";
+	public static final String P_TRACE_IMPLEMENTATION_OP = "papyrus.trace.implementation.op"; //$NON-NLS-1$
 
 	/**
 	 * The trace mechanism that should be used by default
 	 */
-	public static final String P_TRACE_IMPLEMENTATION_SM = "papyrus.trace.implementation.sm";
+	public static final String P_TRACE_IMPLEMENTATION_SM = "papyrus.trace.implementation.sm"; //$NON-NLS-1$
 
 
 	/**
 	 * Options for trace implementation via state machines
 	 */
-	public static final String P_TRACE_OPTION_CLASS = "papyrus.trace.option.class";
+	public static final String P_TRACE_OPTION_CLASS = "papyrus.trace.option.class"; //$NON-NLS-1$
 
 	/**
 	 * Options for trace implementation for operations
 	 */
-	public static final String P_TRACE_OPTION_STATE = "papyrus.trace.option.state";
-
+	public static final String P_TRACE_OPTION_STATE = "papyrus.trace.option.state"; //$NON-NLS-1$
+	
 	/**
 	 * Options for trace implementation via state machines
 	 */
-	public static final String P_TRACE_OPTION_OP = "papyrus.trace.option.op";
+	public static final String P_TRACE_OPTION_OP = "papyrus.trace.option.op"; //$NON-NLS-1$
 }
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/TPPreferenceInitializer.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/TPPreferenceInitializer.java
index 096d661169d..ef1cfad72d7 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/TPPreferenceInitializer.java
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/TPPreferenceInitializer.java
@@ -33,7 +33,7 @@ public class TPPreferenceInitializer extends AbstractPreferenceInitializer {
 	public void initializeDefaultPreferences() {
 		IPreferenceStore store = Activator.getDefault().getPreferenceStore();
 		EList<ITraceMechanism> mechanisms = TraceMechanism.getTraceMechanisms();
-		String mechanismID = "";
+		String mechanismID = ""; //$NON-NLS-1$
 		if(mechanisms.size() > 0) {
 			ITraceMechanism mechanism = mechanisms.get(0);
 			// TODO: function need to support null object
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/TPPreferencePage.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/TPPreferencePage.java
index 773c30a6ee1..57554c5b6ea 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/TPPreferencePage.java
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints/src/org/eclipse/papyrus/infra/services/tracepoints/preferences/TPPreferencePage.java
@@ -19,6 +19,7 @@ import org.eclipse.jface.preference.FieldEditorPreferencePage;
 import org.eclipse.jface.preference.RadioGroupFieldEditor;
 import org.eclipse.papyrus.infra.services.tracepoints.Activator;
 import org.eclipse.papyrus.infra.services.tracepoints.ITraceMechanism;
+import org.eclipse.papyrus.infra.services.tracepoints.Messages;
 import org.eclipse.papyrus.infra.services.tracepoints.TraceActions;
 import org.eclipse.papyrus.infra.services.tracepoints.TraceActions.TAClass;
 import org.eclipse.papyrus.infra.services.tracepoints.TraceActions.TAOperation;
@@ -41,7 +42,7 @@ public class TPPreferencePage
 	public TPPreferencePage() {
 		super(GRID);
 		setPreferenceStore(Activator.getDefault().getPreferenceStore());
-		setDescription("Trace options");
+		setDescription(Messages.TPPreferencePage_TraceOptions);
 	}
 
 	/**
@@ -74,25 +75,25 @@ public class TPPreferencePage
 		String[][] taStateOptions = TraceActions.getStringFields(TAState.values());
 		String[][] taOperationOptions = TraceActions.getStringFields(TAOperation.values());
 
-		addField(new BinaryEncodedMChoiceFieldEditor(TPPreferenceConstants.P_TRACE_OPTION_CLASS, "Class options", 3, taClassOptions, getFieldEditorParent(), true));
+		addField(new BinaryEncodedMChoiceFieldEditor(TPPreferenceConstants.P_TRACE_OPTION_CLASS, Messages.TPPreferencePage_ClassOptions, 3, taClassOptions, getFieldEditorParent(), true));
 
-		addField(new BinaryEncodedMChoiceFieldEditor(TPPreferenceConstants.P_TRACE_OPTION_STATE, "State options", 3, taStateOptions, getFieldEditorParent(), true));
+		addField(new BinaryEncodedMChoiceFieldEditor(TPPreferenceConstants.P_TRACE_OPTION_STATE, Messages.TPPreferencePage_StateOptions, 3, taStateOptions, getFieldEditorParent(), true));
 
 		addField(new RadioGroupFieldEditor(
 			TPPreferenceConstants.P_TRACE_OPTION_OP,
-			"Operations options", 3, taOperationOptions, getFieldEditorParent(), true));
+			Messages.TPPreferencePage_OperationOptions, 3, taOperationOptions, getFieldEditorParent(), true));
 
 		addField(new ComboFieldEditor(
 			TPPreferenceConstants.P_TRACE_IMPLEMENTATION_PORT,
-			"Trace Mechanism for ports", mechList, getFieldEditorParent()));
+			Messages.TPPreferencePage_TMforPorts, mechList, getFieldEditorParent()));
 
 		addField(new ComboFieldEditor(
 			TPPreferenceConstants.P_TRACE_IMPLEMENTATION_OP,
-			"Trace Mechanism for operations (+construction/destruction)", mechList, getFieldEditorParent()));
+			Messages.TPPreferencePage_TMforOperations, mechList, getFieldEditorParent()));
 
 		addField(new ComboFieldEditor(
 			TPPreferenceConstants.P_TRACE_IMPLEMENTATION_SM,
-			"Trace Mechanism for state machines", mechList, getFieldEditorParent()));
+			Messages.TPPreferencePage_TMforStateMachines, mechList, getFieldEditorParent()));
 
 	}
 
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/.classpath b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/.classpath
index 64c5e31b7a2..ad32c83a788 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/.classpath
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/META-INF/MANIFEST.MF b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/META-INF/MANIFEST.MF
index 51ae78770c6..885af7ebeb1 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/META-INF/MANIFEST.MF
@@ -8,7 +8,8 @@ Require-Bundle: org.eclipse.papyrus.fcm.profile;bundle-version="1.0.0",
  org.eclipse.papyrus.infra.core;bundle-version="1.0.0",

  org.eclipse.emf.workspace;bundle-version="1.5.0",

  org.eclipse.uml2.uml;bundle-version="4.0.0",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.0"

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.0",

+ org.eclipse.papyrus.qompass.designer.ui;bundle-version="1.0.0"

 Export-Package: org.eclipse.papyrus.qompass.modellibs.tracing,

  org.eclipse.papyrus.qompass.modellibs.tracing.acceleo

 Bundle-Vendor: %providerName

@@ -21,5 +22,5 @@ Bundle-Activator: org.eclipse.papyrus.qompass.modellibs.tracing.Activa
  tor

 Bundle-SymbolicName: org.eclipse.papyrus.qompass.modellibs.tracing;sin

  gleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

 

diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/build.acceleo b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/build.acceleo
index 7814ec58876..94def70bf62 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/build.acceleo
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/build.acceleo
@@ -18,7 +18,7 @@
         <acceleoCompiler 
             sourceFolder="${target.folder}"
             outputFolder="${target.folder}"
-            dependencies="${target.folder}/../../org.eclipse.papyrus.fcm.profile;${target.folder}/../../org.eclipse.papyrus.infra.core.sasheditor;${target.folder}/../../org.eclipse.papyrus.infra.core.sasheditor.di;${target.folder}/../../org.eclipse.papyrus.qompass.modellibs.core;${target.folder}/../../org.eclipse.papyrus.qompass.designer.core;${target.folder}/../../org.eclipse.papyrus.qompass.designer.vsl;${target.folder}/../../org.eclipse.papyrus.cpp.profile;${target.folder}/../../org.eclipse.papyrus.acceleo;${target.folder}/../../org.eclipse.papyrus.uml.tools.utils;${target.folder}/../../org.eclipse.papyrus.infra.widgets.toolbox;${target.folder}/../../org.eclipse.papyrus.infra.services.tracepoints;${target.folder}/../../org.eclipse.papyrus.infra.gmfdiag.common;"
+            dependencies="${target.folder}/../../org.eclipse.papyrus.fcm.profile;${target.folder}/../../org.eclipse.papyrus.infra.core.sasheditor;${target.folder}/../../org.eclipse.papyrus.infra.core.sasheditor.di;${target.folder}/../../org.eclipse.papyrus.qompass.modellibs.core;${target.folder}/../../org.eclipse.papyrus.qompass.designer.core;${target.folder}/../../org.eclipse.papyrus.qompass.designer.vsl;${target.folder}/../../org.eclipse.papyrus.cpp.profile;${target.folder}/../../org.eclipse.papyrus.acceleo;${target.folder}/../../org.eclipse.papyrus.infra.widgets.toolbox;${target.folder}/../../org.eclipse.papyrus.infra.services.tracepoints;${target.folder}/../../org.eclipse.papyrus.qompass.designer.ui;"
             binaryResource="false"
             packagesToRegister="">
         </acceleoCompiler>
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/SampleOOTraceTest.di b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/SampleOOTraceTest.di
new file mode 100644
index 00000000000..4b69336c601
--- /dev/null
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/SampleOOTraceTest.di
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi" xmlns:history="http://www.eclipse.org/papyrus/0.7.0/controlmode">
+  <di:SashWindowsMngr>
+    <pageList>
+      <availablePage>
+        <emfPageIdentifier href="SampleOOTraceTest.notation#_XSHWMF36Ed-UvNEDwY5GNg"/>
+      </availablePage>
+      <availablePage/>
+      <availablePage/>
+      <availablePage>
+        <emfPageIdentifier href="SampleOOTraceTest.notation#_rbZ3IDeFEeGPyrZ5I3hMlA"/>
+      </availablePage>
+      <availablePage>
+        <emfPageIdentifier href="SampleOOTraceTest.notation#_Rk2pgDVlEeKoYLVLZgpRiw"/>
+      </availablePage>
+      <availablePage>
+        <emfPageIdentifier href="SampleOOTraceTest.notation#_57mwQDclEeKAhIrFXfR8zQ"/>
+      </availablePage>
+    </pageList>
+    <sashModel currentSelection="/0/@sashModel/@windows.0/@children.0">
+      <windows>
+        <children xsi:type="di:TabFolder">
+          <children>
+            <emfPageIdentifier href="SampleOOTraceTest.notation#_XSHWMF36Ed-UvNEDwY5GNg"/>
+          </children>
+          <children>
+            <emfPageIdentifier href="SampleOOTraceTest.notation#_rbZ3IDeFEeGPyrZ5I3hMlA"/>
+          </children>
+          <children>
+            <emfPageIdentifier href="SampleOOTraceTest.notation#_Rk2pgDVlEeKoYLVLZgpRiw"/>
+          </children>
+          <children>
+            <emfPageIdentifier href="SampleOOTraceTest.notation#_57mwQDclEeKAhIrFXfR8zQ"/>
+          </children>
+        </children>
+      </windows>
+    </sashModel>
+  </di:SashWindowsMngr>
+  <history:ControledResource/>
+  <history:ControledResource/>
+  <history:ControledResource/>
+  <history:ControledResource/>
+  <history:ControledResource/>
+  <history:ControledResource/>
+  <history:ControledResource/>
+</xmi:XMI>
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/SampleOOTraceTest.notation b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/SampleOOTraceTest.notation
new file mode 100644
index 00000000000..62727ee1920
--- /dev/null
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/SampleOOTraceTest.notation
@@ -0,0 +1,410 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:C_Cpp="http://www.eclipse.org/papyrus/C_Cpp/1" xmlns:FCM="http://www.eclipse.org/papyrus/FCM/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">
+  <notation:Diagram xmi:id="_XSHWMF36Ed-UvNEDwY5GNg" type="PapyrusUMLClassDiagram" name="Interfaces" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_Pj6oUDeEEeGPyrZ5I3hMlA" type="2004" fontName="Sans Serif" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Pj6oUjeEEeGPyrZ5I3hMlA" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Pj7PYDeEEeGPyrZ5I3hMlA" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Pj7PYTeEEeGPyrZ5I3hMlA" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Pj7PYjeEEeGPyrZ5I3hMlA" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Pj7PYzeEEeGPyrZ5I3hMlA" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Pj7PZDeEEeGPyrZ5I3hMlA" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Pj7PZTeEEeGPyrZ5I3hMlA" type="5011"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Pj7PZjeEEeGPyrZ5I3hMlA" visible="false" type="7006">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Pj7PZzeEEeGPyrZ5I3hMlA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Pj7PaDeEEeGPyrZ5I3hMlA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Pj7PaTeEEeGPyrZ5I3hMlA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Pj7PajeEEeGPyrZ5I3hMlA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Pj7PazeEEeGPyrZ5I3hMlA" type="7007">
+        <children xmi:type="notation:Shape" xmi:id="_R8Rm0DeEEeGPyrZ5I3hMlA" type="3007" fontName="Sans Serif" lineColor="0">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1B21kCwNEeK0G9oarbCn5Q" source="CustomAppearance_Annotation">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1I5RsCwNEeK0G9oarbCn5Q" key="CustomAppearance_MaskValue" value="6408"/>
+          </eAnnotations>
+          <element xmi:type="uml:Operation" href="SampleOOTraceTest.uml#_DGs6wDLgEd28fJKJJnUaeQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_R8Rm0TeEEeGPyrZ5I3hMlA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_R8SN4DeEEeGPyrZ5I3hMlA" type="3007" fontName="Sans Serif" lineColor="0">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2ZBc0CwNEeK0G9oarbCn5Q" source="CustomAppearance_Annotation">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2dz2MCwNEeK0G9oarbCn5Q" key="CustomAppearance_MaskValue" value="6408"/>
+          </eAnnotations>
+          <element xmi:type="uml:Operation" href="SampleOOTraceTest.uml#_L8EY8DLgEd28fJKJJnUaeQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_R8SN4TeEEeGPyrZ5I3hMlA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_rsWQcDVdEeKoYLVLZgpRiw" type="3007" fontName="Sans Serif" lineColor="0">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8MrPMDVdEeKoYLVLZgpRiw" source="CustomAppearance_Annotation">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8ftf8DVdEeKoYLVLZgpRiw" key="CustomAppearance_MaskValue" value="6408"/>
+          </eAnnotations>
+          <element xmi:type="uml:Operation" href="SampleOOTraceTest.uml#_rrbqcDVdEeKoYLVLZgpRiw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_rsWQcTVdEeKoYLVLZgpRiw"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_6E33wDW2EeKyT6LlKoWJIA" type="3007" fontName="Sans Serif" lineColor="0">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_JvVlgDW3EeKyT6LlKoWJIA" source="CustomAppearance_Annotation">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_J0pjUDW3EeKyT6LlKoWJIA" key="CustomAppearance_MaskValue" value="6408"/>
+          </eAnnotations>
+          <element xmi:type="uml:Operation" href="SampleOOTraceTest.uml#_6DewoDW2EeKyT6LlKoWJIA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_6E33wTW2EeKyT6LlKoWJIA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Pj7PbDeEEeGPyrZ5I3hMlA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Pj7PbTeEEeGPyrZ5I3hMlA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Pj7PbjeEEeGPyrZ5I3hMlA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Pj7PbzeEEeGPyrZ5I3hMlA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Pj7PcDeEEeGPyrZ5I3hMlA" visible="false" type="7008">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Pj7PcTeEEeGPyrZ5I3hMlA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Pj7PcjeEEeGPyrZ5I3hMlA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Pj7PczeEEeGPyrZ5I3hMlA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Pj7PdDeEEeGPyrZ5I3hMlA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_VTHeYFFyEeOLNIKOajeerQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_VTHeYVFyEeOLNIKOajeerQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VTHeYlFyEeOLNIKOajeerQ"/>
+      </children>
+      <element xmi:type="uml:Interface" href="SampleOOTraceTest.uml#_cn-H0DLbEd2qeKRLMdIx_A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Pj6oUTeEEeGPyrZ5I3hMlA" x="108" y="81" width="321"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_TP_4gDeEEeGPyrZ5I3hMlA" type="2012" fontName="Sans Serif" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TQAfkDeEEeGPyrZ5I3hMlA" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TQAfkTeEEeGPyrZ5I3hMlA" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TQAfkjeEEeGPyrZ5I3hMlA" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TQAfkzeEEeGPyrZ5I3hMlA" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TQAflDeEEeGPyrZ5I3hMlA" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TQAflTeEEeGPyrZ5I3hMlA" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_TQAfljeEEeGPyrZ5I3hMlA" type="5038"/>
+      <element xmi:type="uml:Comment" href="SampleOOTraceTest.uml#_TDDBoDeEEeGPyrZ5I3hMlA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TP_4gTeEEeGPyrZ5I3hMlA" x="513" y="108" width="203"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_ktdOQDW2EeKyT6LlKoWJIA" type="2010" fontName="Sans Serif" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ktd1UDW2EeKyT6LlKoWJIA" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ktd1UTW2EeKyT6LlKoWJIA" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ktd1UjW2EeKyT6LlKoWJIA" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ktd1UzW2EeKyT6LlKoWJIA" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ktd1VDW2EeKyT6LlKoWJIA" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ktd1VTW2EeKyT6LlKoWJIA" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ktd1VjW2EeKyT6LlKoWJIA" type="5035"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_ktd1VzW2EeKyT6LlKoWJIA" type="7020">
+        <children xmi:type="notation:Shape" xmi:id="_m0rZcDW2EeKyT6LlKoWJIA" type="3018" fontName="Sans Serif" lineColor="0">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QleJQJ0lEeKBzo5ONT8mrA" source="CustomAppearance_Annotation">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QrfRsJ0lEeKBzo5ONT8mrA" key="CustomAppearance_MaskValue" value="28"/>
+          </eAnnotations>
+          <element xmi:type="uml:Property" href="SampleOOTraceTest.uml#_m0WCQDW2EeKyT6LlKoWJIA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_m0rZcTW2EeKyT6LlKoWJIA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_yJR6MDW2EeKyT6LlKoWJIA" type="3018" fontName="Sans Serif" lineColor="0">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QlfXYJ0lEeKBzo5ONT8mrA" source="CustomAppearance_Annotation">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Qrf4wJ0lEeKBzo5ONT8mrA" key="CustomAppearance_MaskValue" value="28"/>
+          </eAnnotations>
+          <element xmi:type="uml:Property" href="SampleOOTraceTest.uml#_yJIJMDW2EeKyT6LlKoWJIA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_yJR6MTW2EeKyT6LlKoWJIA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_ktd1WDW2EeKyT6LlKoWJIA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_ktd1WTW2EeKyT6LlKoWJIA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_ktd1WjW2EeKyT6LlKoWJIA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ktd1WzW2EeKyT6LlKoWJIA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_ktecYDW2EeKyT6LlKoWJIA" visible="false" type="7021">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_ktecYTW2EeKyT6LlKoWJIA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_ktecYjW2EeKyT6LlKoWJIA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_ktecYzW2EeKyT6LlKoWJIA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ktecZDW2EeKyT6LlKoWJIA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_VTLIwFFyEeOLNIKOajeerQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_VTLIwVFyEeOLNIKOajeerQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VTLIwlFyEeOLNIKOajeerQ"/>
+      </children>
+      <element xmi:type="uml:DataType" href="SampleOOTraceTest.uml#_krMkcDW2EeKyT6LlKoWJIA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ktdOQTW2EeKyT6LlKoWJIA" x="121" y="262" width="141" height="90"/>
+    </children>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_XSHWMV36Ed-UvNEDwY5GNg"/>
+    <element xmi:type="uml:Package" href="SampleOOTraceTest.uml#_Tp4n8DLaEd2qeKRLMdIx_A"/>
+    <edges xmi:type="notation:Connector" xmi:id="_Y-hhkDeEEeGPyrZ5I3hMlA" type="4013" source="_TP_4gDeEEeGPyrZ5I3hMlA" target="_Pj6oUDeEEeGPyrZ5I3hMlA" lineColor="0">
+      <styles xmi:type="notation:FontStyle" xmi:id="_Y-hhkTeEEeGPyrZ5I3hMlA" fontName="Sans Serif"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Y-hhkjeEEeGPyrZ5I3hMlA" points="[-29, -1, 113, 0]$[-113, -1, 29, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Y_9sADeEEeGPyrZ5I3hMlA" id="(0.14285714285714285,0.5166666666666667)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Y_9sATeEEeGPyrZ5I3hMlA" id="(0.9096573208722741,0.5377358490566038)"/>
+    </edges>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_rbZ3IDeFEeGPyrZ5I3hMlA" type="PapyrusUMLClassDiagram" name="ClassDiagram Client" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_t6z40DeFEeGPyrZ5I3hMlA" type="2008" fontName="Sans Serif" fillColor="8905185" gradient="16777215, 16777215, 0" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_t60f4DeFEeGPyrZ5I3hMlA" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t60f4TeFEeGPyrZ5I3hMlA" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_t60f4jeFEeGPyrZ5I3hMlA" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t60f4zeFEeGPyrZ5I3hMlA" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_t60f5DeFEeGPyrZ5I3hMlA" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_t60f5TeFEeGPyrZ5I3hMlA" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_t61G8DeFEeGPyrZ5I3hMlA" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_t61G8TeFEeGPyrZ5I3hMlA" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_t61G8jeFEeGPyrZ5I3hMlA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_t61G8zeFEeGPyrZ5I3hMlA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_t61G9DeFEeGPyrZ5I3hMlA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t61G9TeFEeGPyrZ5I3hMlA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_t61G9jeFEeGPyrZ5I3hMlA" type="7018">
+        <children xmi:type="notation:Shape" xmi:id="_Q07G0DclEeKAhIrFXfR8zQ" type="3013" fontName="Sans Serif" lineColor="0">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_z-c2gDc_EeKPle9CbXIcpQ" source="CustomAppearance_Annotation">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_0IwpEDc_EeKPle9CbXIcpQ" key="CustomAppearance_MaskValue" value="6408"/>
+          </eAnnotations>
+          <element xmi:type="uml:Operation" href="SampleOOTraceTest.uml#_Qzp7gDclEeKAhIrFXfR8zQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_Q07G0TclEeKAhIrFXfR8zQ"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_cssnQDc_EeKPle9CbXIcpQ" type="3013" fontName="Sans Serif" lineColor="0">
+          <element xmi:type="uml:Operation" href="SampleOOTraceTest.uml#_ZnGj0EdDEeGxo4rn9hBAOQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_cssnQTc_EeKPle9CbXIcpQ" x="15" y="21"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_t61G9zeFEeGPyrZ5I3hMlA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_t61G-DeFEeGPyrZ5I3hMlA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_t61G-TeFEeGPyrZ5I3hMlA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t61G-jeFEeGPyrZ5I3hMlA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_t61G-zeFEeGPyrZ5I3hMlA" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_t61G_DeFEeGPyrZ5I3hMlA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_t61G_TeFEeGPyrZ5I3hMlA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_t61G_jeFEeGPyrZ5I3hMlA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t61G_zeFEeGPyrZ5I3hMlA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_VtNZYFFyEeOLNIKOajeerQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_VtNZYVFyEeOLNIKOajeerQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="SampleOOTraceTest.uml#_7SAnAP76Ed6Zw96O-tCw7A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VtNZYlFyEeOLNIKOajeerQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_VtNZY1FyEeOLNIKOajeerQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_VtNZZFFyEeOLNIKOajeerQ" showTitle="true"/>
+        <element xmi:type="FCM:RuleApplication" href="SampleOOTraceTest.uml#__bC_ADcmEeKAhIrFXfR8zQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VtNZZVFyEeOLNIKOajeerQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_VtNZZlFyEeOLNIKOajeerQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_VtNZZ1FyEeOLNIKOajeerQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VtNZaFFyEeOLNIKOajeerQ"/>
+      </children>
+      <element xmi:type="uml:Class" href="SampleOOTraceTest.uml#_IfjoETLbEd2qeKRLMdIx_A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t6z40TeFEeGPyrZ5I3hMlA" x="90" y="135" width="144"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_fBkXMDeGEeGPyrZ5I3hMlA" type="2012" fontName="Sans Serif" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fBk-QDeGEeGPyrZ5I3hMlA" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fBk-QTeGEeGPyrZ5I3hMlA" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fBk-QjeGEeGPyrZ5I3hMlA" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fBk-QzeGEeGPyrZ5I3hMlA" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fBk-RDeGEeGPyrZ5I3hMlA" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fBllUDeGEeGPyrZ5I3hMlA" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_fBllUTeGEeGPyrZ5I3hMlA" type="5038"/>
+      <element xmi:type="uml:Comment" href="SampleOOTraceTest.uml#_fBRcQDeGEeGPyrZ5I3hMlA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fBkXMTeGEeGPyrZ5I3hMlA" x="45" y="279" width="441" height="89"/>
+    </children>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_rbZ3ITeFEeGPyrZ5I3hMlA"/>
+    <element xmi:type="uml:Package" href="SampleOOTraceTest.uml#_etOZkDLaEd2qeKRLMdIx_A"/>
+    <edges xmi:type="notation:Connector" xmi:id="_f6Wj4DeHEeGPyrZ5I3hMlA" type="4013" source="_fBkXMDeGEeGPyrZ5I3hMlA" target="_t6z40DeFEeGPyrZ5I3hMlA" lineColor="0">
+      <styles xmi:type="notation:FontStyle" xmi:id="_f6Wj4TeHEeGPyrZ5I3hMlA" fontName="Sans Serif"/>
+      <element xsi:nil="true"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_f6Wj4jeHEeGPyrZ5I3hMlA" points="[-3, -11, 18, 93]$[-19, -84, 2, 20]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_f68ZwDeHEeGPyrZ5I3hMlA" id="(0.14512471655328799,0.11224489795918367)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_f68ZwTeHEeGPyrZ5I3hMlA" id="(0.4,0.85)"/>
+    </edges>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_Rk2pgDVlEeKoYLVLZgpRiw" type="PapyrusUMLClassDiagram" name="ClassDiagram Server" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_SeK3IDVlEeKoYLVLZgpRiw" type="2008" fontName="Sans Serif" fillColor="8905185" gradient="16777215, 16777215, 0" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_SeMsUDVlEeKoYLVLZgpRiw" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SeMsUTVlEeKoYLVLZgpRiw" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_SeMsUjVlEeKoYLVLZgpRiw" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SeMsUzVlEeKoYLVLZgpRiw" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_SeMsVDVlEeKoYLVLZgpRiw" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SeMsVTVlEeKoYLVLZgpRiw" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_cLIEoDVlEeKoYLVLZgpRiw" source="Stereotype_Annotation">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cLX8QDVlEeKoYLVLZgpRiw" key="StereotypeWithQualifiedNameList" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cLX8QTVlEeKoYLVLZgpRiw" key="StereotypeList" value="FCM::RuleApplication"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cLX8QjVlEeKoYLVLZgpRiw" key="PropStereoDisplay" value="FCM::RuleApplication.containerRule"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cLX8QzVlEeKoYLVLZgpRiw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cLX8RDVlEeKoYLVLZgpRiw" key="StereotypePropertyLocation" value="Compartment"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_SeNTYDVlEeKoYLVLZgpRiw" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_SeNTYTVlEeKoYLVLZgpRiw" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_SeNTYjVlEeKoYLVLZgpRiw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_SeNTYzVlEeKoYLVLZgpRiw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_SeNTZDVlEeKoYLVLZgpRiw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SeNTZTVlEeKoYLVLZgpRiw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_SeNTZjVlEeKoYLVLZgpRiw" type="7018">
+        <children xmi:type="notation:Shape" xmi:id="_VGZdoDVlEeKoYLVLZgpRiw" type="3013" fontName="Sans Serif" lineColor="0">
+          <element xmi:type="uml:Operation" href="SampleOOTraceTest.uml#_4ZEZwHecEd6r18stFZxmFQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_VGZdoTVlEeKoYLVLZgpRiw"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_VGaEsDVlEeKoYLVLZgpRiw" type="3013" fontName="Sans Serif" lineColor="0">
+          <element xmi:type="uml:Operation" href="SampleOOTraceTest.uml#_TbIjUJYlEd6G9q9hwr11bw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_VGaEsTVlEeKoYLVLZgpRiw"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_VGarwDVlEeKoYLVLZgpRiw" type="3013" fontName="Sans Serif" lineColor="0">
+          <element xmi:type="uml:Operation" href="SampleOOTraceTest.uml#_rrf74DVdEeKoYLVLZgpRiw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_VGarwTVlEeKoYLVLZgpRiw"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_SeNTZzVlEeKoYLVLZgpRiw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_SeNTaDVlEeKoYLVLZgpRiw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_SeNTaTVlEeKoYLVLZgpRiw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SeNTajVlEeKoYLVLZgpRiw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_SeNTazVlEeKoYLVLZgpRiw" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_SeNTbDVlEeKoYLVLZgpRiw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_SeNTbTVlEeKoYLVLZgpRiw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_SeNTbjVlEeKoYLVLZgpRiw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SeNTbzVlEeKoYLVLZgpRiw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Vw_GIFFyEeOLNIKOajeerQ" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Vw_GIVFyEeOLNIKOajeerQ" showTitle="true"/>
+        <element xmi:type="FCM:RuleApplication" href="SampleOOTraceTest.uml#_DWIYoP6yEd6Ie_kieu_3CQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Vw_GIlFyEeOLNIKOajeerQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_VxBiYFFyEeOLNIKOajeerQ" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_VxBiYVFyEeOLNIKOajeerQ" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="SampleOOTraceTest.uml#_Sa4nEP77Ed6Zw96O-tCw7A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VxBiYlFyEeOLNIKOajeerQ"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_VxCJcFFyEeOLNIKOajeerQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_VxCJcVFyEeOLNIKOajeerQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VxCJclFyEeOLNIKOajeerQ"/>
+      </children>
+      <element xmi:type="uml:Class" href="SampleOOTraceTest.uml#_oqZNUDLaEd2qeKRLMdIx_A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SeK3ITVlEeKoYLVLZgpRiw" x="176" y="95" width="266" height="203"/>
+    </children>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_Rk2pgTVlEeKoYLVLZgpRiw"/>
+    <element xmi:type="uml:Package" href="SampleOOTraceTest.uml#_OGM88DLaEd2qeKRLMdIx_A"/>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_57mwQDclEeKAhIrFXfR8zQ" type="PapyrusUMLStateMachineDiagram" name="SmDiagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_57mwQTclEeKAhIrFXfR8zQ" type="2000" fontName="Sans Serif" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_57mwQjclEeKAhIrFXfR8zQ" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_57mwQzclEeKAhIrFXfR8zQ" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_57mwRDclEeKAhIrFXfR8zQ" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_57mwRTclEeKAhIrFXfR8zQ" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_57mwRjclEeKAhIrFXfR8zQ" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_57mwRzclEeKAhIrFXfR8zQ" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_57mwSDclEeKAhIrFXfR8zQ" type="2001">
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_57mwSTclEeKAhIrFXfR8zQ" width="592" height="14"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_57mwSjclEeKAhIrFXfR8zQ" type="2002">
+        <children xmi:type="notation:Shape" xmi:id="_57mwSzclEeKAhIrFXfR8zQ" type="3000" fontName="Sans Serif" lineColor="0">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_57mwTDclEeKAhIrFXfR8zQ" source="ShadowFigure">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_57mwTTclEeKAhIrFXfR8zQ" key="ShadowFigure_Value" value="false"/>
+          </eAnnotations>
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_57mwTjclEeKAhIrFXfR8zQ" source="displayNameLabelIcon">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_57mwTzclEeKAhIrFXfR8zQ" key="displayNameLabelIcon_value" value="false"/>
+          </eAnnotations>
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_57mwUDclEeKAhIrFXfR8zQ" source="QualifiedName">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_57mwUTclEeKAhIrFXfR8zQ" key="QualifiedNameDepth" value="1000"/>
+          </eAnnotations>
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_57mwUjclEeKAhIrFXfR8zQ" source="RegionAnnotationKey">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_57mwUzclEeKAhIrFXfR8zQ" key="RegionZoneKey" value=""/>
+          </eAnnotations>
+          <children xmi:type="notation:DecorationNode" xmi:id="_57mwVDclEeKAhIrFXfR8zQ" type="3002">
+            <children xmi:type="notation:Shape" xmi:id="_66VCUDclEeKAhIrFXfR8zQ" type="6000" fontName="Sans Serif" lineColor="0">
+              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_66VpYDclEeKAhIrFXfR8zQ" source="ShadowFigure">
+                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_66VpYTclEeKAhIrFXfR8zQ" key="ShadowFigure_Value" value="false"/>
+              </eAnnotations>
+              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_66VpYjclEeKAhIrFXfR8zQ" source="displayNameLabelIcon">
+                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_66VpYzclEeKAhIrFXfR8zQ" key="displayNameLabelIcon_value" value="false"/>
+              </eAnnotations>
+              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_66VpZDclEeKAhIrFXfR8zQ" source="QualifiedName">
+                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_66VpZTclEeKAhIrFXfR8zQ" key="QualifiedNameDepth" value="1000"/>
+              </eAnnotations>
+              <children xmi:type="notation:DecorationNode" xmi:id="_66VpZjclEeKAhIrFXfR8zQ" type="6001">
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_67AXwDclEeKAhIrFXfR8zQ" width="109" height="14"/>
+              </children>
+              <children xmi:type="notation:DecorationNode" xmi:id="_66WQcDclEeKAhIrFXfR8zQ" type="6002">
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_66WQcTclEeKAhIrFXfR8zQ" y="14" width="109" height="74"/>
+              </children>
+              <children xmi:type="notation:BasicCompartment" xmi:id="_V17QgFFyEeOLNIKOajeerQ" visible="false" type="compartment_shape_display">
+                <styles xmi:type="notation:TitleStyle" xmi:id="_V17QgVFyEeOLNIKOajeerQ"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V17QglFyEeOLNIKOajeerQ"/>
+              </children>
+              <element xmi:type="uml:State" href="SampleOOTraceTest.uml#_66D8kDclEeKAhIrFXfR8zQ"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_66VCUTclEeKAhIrFXfR8zQ" x="159" y="46" width="109" height="88"/>
+            </children>
+            <children xmi:type="notation:Shape" xmi:id="_9gPUoDclEeKAhIrFXfR8zQ" type="8000" fontName="Sans Serif" lineColor="0">
+              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9gP7sTclEeKAhIrFXfR8zQ" source="ShadowFigure">
+                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9gP7sjclEeKAhIrFXfR8zQ" key="ShadowFigure_Value" value="false"/>
+              </eAnnotations>
+              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9gQiwDclEeKAhIrFXfR8zQ" source="displayNameLabelIcon">
+                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9gQiwTclEeKAhIrFXfR8zQ" key="displayNameLabelIcon_value" value="false"/>
+              </eAnnotations>
+              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9gQiwjclEeKAhIrFXfR8zQ" source="QualifiedName">
+                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9gQiwzclEeKAhIrFXfR8zQ" key="QualifiedNameDepth" value="1000"/>
+              </eAnnotations>
+              <children xmi:type="notation:DecorationNode" xmi:id="_9gQixDclEeKAhIrFXfR8zQ" type="8001">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_9gQixTclEeKAhIrFXfR8zQ" x="26" y="-11"/>
+              </children>
+              <children xmi:type="notation:DecorationNode" xmi:id="_9gQixjclEeKAhIrFXfR8zQ" type="8002">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_9gQixzclEeKAhIrFXfR8zQ" x="25" y="-10"/>
+              </children>
+              <element xmi:type="uml:Pseudostate" href="SampleOOTraceTest.uml#_9f6kgDclEeKAhIrFXfR8zQ"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9gP7sDclEeKAhIrFXfR8zQ" x="43" y="30"/>
+            </children>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_57mwVTclEeKAhIrFXfR8zQ"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_V140QFFyEeOLNIKOajeerQ" visible="false" type="compartment_shape_display">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_V140QVFyEeOLNIKOajeerQ"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V140QlFyEeOLNIKOajeerQ"/>
+          </children>
+          <element xmi:type="uml:Region" href="SampleOOTraceTest.uml#_57WRkDclEeKAhIrFXfR8zQ"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_57mwVjclEeKAhIrFXfR8zQ" width="592" height="245"/>
+        </children>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_57mwVzclEeKAhIrFXfR8zQ" y="14" width="592" height="245"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_V12YAFFyEeOLNIKOajeerQ" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_V12YAVFyEeOLNIKOajeerQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V12YAlFyEeOLNIKOajeerQ"/>
+      </children>
+      <element xmi:type="uml:StateMachine" href="SampleOOTraceTest.uml#_5Vd9UDclEeKAhIrFXfR8zQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_57mwWDclEeKAhIrFXfR8zQ" x="30" y="30" width="592" height="259"/>
+    </children>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_57mwWTclEeKAhIrFXfR8zQ"/>
+    <element xmi:type="uml:StateMachine" href="SampleOOTraceTest.uml#_5Vd9UDclEeKAhIrFXfR8zQ"/>
+    <edges xmi:type="notation:Connector" xmi:id="_8bHfoDclEeKAhIrFXfR8zQ" type="7000" source="_66VCUDclEeKAhIrFXfR8zQ" target="_66VCUDclEeKAhIrFXfR8zQ" smoothness="Normal" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_8bItwDclEeKAhIrFXfR8zQ" visible="false" type="7001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8bItwTclEeKAhIrFXfR8zQ"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_8bItwjclEeKAhIrFXfR8zQ" visible="false" type="7002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8bItwzclEeKAhIrFXfR8zQ"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_8bItxDclEeKAhIrFXfR8zQ" visible="false" type="7003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8bItxTclEeKAhIrFXfR8zQ" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_8bHfoTclEeKAhIrFXfR8zQ" fontName="Sans Serif"/>
+      <element xmi:type="uml:Transition" href="SampleOOTraceTest.uml#_8ZB08DclEeKAhIrFXfR8zQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8bHfojclEeKAhIrFXfR8zQ" points="[3, 1, 40, -51]$[65, 34, 102, -18]$[56, 94, 93, 42]$[-7, 103, 30, 51]$[-35, 56, 2, 4]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8b9NIDclEeKAhIrFXfR8zQ" id="(0.9724770642201835,0.36363636363636365)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8b9NITclEeKAhIrFXfR8zQ" id="(0.6330275229357798,0.9545454545454546)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_-wO84DclEeKAhIrFXfR8zQ" type="7000" source="_9gPUoDclEeKAhIrFXfR8zQ" target="_66VCUDclEeKAhIrFXfR8zQ" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_-wPj8DclEeKAhIrFXfR8zQ" visible="false" type="7001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_-wPj8TclEeKAhIrFXfR8zQ"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_-wQLADclEeKAhIrFXfR8zQ" visible="false" type="7002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_-wQLATclEeKAhIrFXfR8zQ"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_-wQLAjclEeKAhIrFXfR8zQ" visible="false" type="7003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_-wQLAzclEeKAhIrFXfR8zQ" y="60"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_-wO84TclEeKAhIrFXfR8zQ" fontName="Sans Serif"/>
+      <element xmi:type="uml:Transition" href="SampleOOTraceTest.uml#_-v4XkDclEeKAhIrFXfR8zQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-wO84jclEeKAhIrFXfR8zQ" points="[10, 2, -77, -18]$[79, 14, -8, -6]"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-xGfkDclEeKAhIrFXfR8zQ" id="(0.07339449541284404,0.1590909090909091)"/>
+    </edges>
+  </notation:Diagram>
+</xmi:XMI>
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/SampleOOTraceTest.uml b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/SampleOOTraceTest.uml
new file mode 100644
index 00000000000..a0910ed1a3e
--- /dev/null
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/examples/SampleOOTraceTest.uml
@@ -0,0 +1,276 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Alloc="http://www.eclipse.org/papyrus/Alloc/1" xmlns:C_Cpp="http://www.eclipse.org/papyrus/C_Cpp/1" xmlns:FCM="http://www.eclipse.org/papyrus/FCM/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/Alloc/1 http://www.eclipse.org/papyrus/MARTE/1#//Alloc">
+  <uml:Model xmi:id="_O6TiIDLUEd26WNosUASSSw" name="SampleOOTraceTest">
+    <packageImport xmi:type="uml:PackageImport" xmi:id="_O6TiITLUEd26WNosUASSSw">
+      <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+    </packageImport>
+    <packageImport xmi:type="uml:PackageImport" xmi:id="_rwBsMP7AEd6Zw96O-tCw7A">
+      <importedPackage xmi:type="uml:Model" href="pathmap://QML_CORE/corba.uml#_DtQEwDLdEd2_U4efLnjQIw"/>
+    </packageImport>
+    <packageImport xmi:type="uml:PackageImport" xmi:id="__D5MwE2WEeGzNbfAXPgNLA">
+      <importedPackage xmi:type="uml:Model" href="pathmap://QML_TRACE/tracing.uml#_H-ZqYDKeEd-WprEKTCaiMA"/>
+    </packageImport>
+    <packagedElement xmi:type="uml:Package" xmi:id="_OGM88DLaEd2qeKRLMdIx_A" name="Server">
+      <packagedElement xmi:type="uml:Class" xmi:id="_oqZNUDLaEd2qeKRLMdIx_A" clientDependency="_YQqH0JYlEd6G9q9hwr11bw" name="Server_impl" classifierBehavior="_5Vd9UDclEeKAhIrFXfR8zQ">
+        <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_YQqH0JYlEd6G9q9hwr11bw" name="derived realization of ICompute" client="_oqZNUDLaEd2qeKRLMdIx_A" supplier="_cn-H0DLbEd2qeKRLMdIx_A" contract="_cn-H0DLbEd2qeKRLMdIx_A"/>
+        <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_ML-4AKI5Ed6FqJCjEUrkqQ" name="add" specification="_TbIjUJYlEd6G9q9hwr11bw">
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_xOQMoC7NEeOY-cM3M1mqKw" name="a">
+            <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xOzmQC7NEeOY-cM3M1mqKw" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xO_zgC7NEeOY-cM3M1mqKw" value="1"/>
+          </ownedParameter>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_xPLZsC7NEeOY-cM3M1mqKw" name="b">
+            <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xPuzUC7NEeOY-cM3M1mqKw" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xP6ZgC7NEeOY-cM3M1mqKw" value="1"/>
+          </ownedParameter>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_xQF_sC7NEeOY-cM3M1mqKw" name="res" direction="return">
+            <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xQvf8C7NEeOY-cM3M1mqKw" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xQ7GIC7NEeOY-cM3M1mqKw" value="1"/>
+          </ownedParameter>
+          <language>C/C++</language>
+          <body>cout &lt;&lt; &quot;a=&quot; &lt;&lt; a &lt;&lt; &quot; b=&quot; &lt;&lt; b &lt;&lt; &quot; a+b=&quot; &lt;&lt; a+b &lt;&lt; endl;
+return a+b;</body>
+        </ownedBehavior>
+        <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_I1R3YAcDEeGnrLqQ0OQeAg" name="mult" specification="_4ZEZwHecEd6r18stFZxmFQ">
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_xRMy8C7NEeOY-cM3M1mqKw" name="a">
+            <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_qgMSAB6SEd6ITtm_FH3jRw"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xRwzoC7NEeOY-cM3M1mqKw" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xR8Z0C7NEeOY-cM3M1mqKw" value="1"/>
+          </ownedParameter>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_xSInEC7NEeOY-cM3M1mqKw" name="b">
+            <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_wbw4kB6SEd6ITtm_FH3jRw"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xStO0C7NEeOY-cM3M1mqKw" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xS41AC7NEeOY-cM3M1mqKw" value="1"/>
+          </ownedParameter>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_xTFCQC7NEeOY-cM3M1mqKw" name="res" direction="return">
+            <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xTn00C7NEeOY-cM3M1mqKw" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xT0CEC7NEeOY-cM3M1mqKw" value="1"/>
+          </ownedParameter>
+          <language>C/C++</language>
+          <body>cout &lt;&lt; &quot;a*b=&quot; &lt;&lt; a*b;
+return a*b;</body>
+        </ownedBehavior>
+        <ownedBehavior xmi:type="uml:StateMachine" xmi:id="_5Vd9UDclEeKAhIrFXfR8zQ" name="ServerStateMachine">
+          <region xmi:type="uml:Region" xmi:id="_57WRkDclEeKAhIrFXfR8zQ" name="Region1">
+            <transition xmi:type="uml:Transition" xmi:id="_8ZB08DclEeKAhIrFXfR8zQ" name="Transition0" source="_66D8kDclEeKAhIrFXfR8zQ" target="_66D8kDclEeKAhIrFXfR8zQ"/>
+            <transition xmi:type="uml:Transition" xmi:id="_-v4XkDclEeKAhIrFXfR8zQ" name="Transition1" source="_9f6kgDclEeKAhIrFXfR8zQ" target="_66D8kDclEeKAhIrFXfR8zQ"/>
+            <subvertex xmi:type="uml:State" xmi:id="_66D8kDclEeKAhIrFXfR8zQ" name="State0"/>
+            <subvertex xmi:type="uml:Pseudostate" xmi:id="_9f6kgDclEeKAhIrFXfR8zQ" name="Initial0"/>
+          </region>
+        </ownedBehavior>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_4ZEZwHecEd6r18stFZxmFQ" name="mult" method="_I1R3YAcDEeGnrLqQ0OQeAg">
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_nvpKUDVdEeKoYLVLZgpRiw" name="a">
+            <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_qgMSAB6SEd6ITtm_FH3jRw"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nvup4DVdEeKoYLVLZgpRiw" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nvvQ8DVdEeKoYLVLZgpRiw" value="1"/>
+          </ownedParameter>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_nvwfEDVdEeKoYLVLZgpRiw" name="b">
+            <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_wbw4kB6SEd6ITtm_FH3jRw"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nvy7UDVdEeKoYLVLZgpRiw" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nvziYDVdEeKoYLVLZgpRiw" value="1"/>
+          </ownedParameter>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_nv1XkDVdEeKoYLVLZgpRiw" name="res" direction="return">
+            <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nv3z0DVdEeKoYLVLZgpRiw" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nv4a4DVdEeKoYLVLZgpRiw" value="1"/>
+          </ownedParameter>
+        </ownedOperation>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_TbIjUJYlEd6G9q9hwr11bw" name="add" method="_ML-4AKI5Ed6FqJCjEUrkqQ">
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_TbZCAJYlEd6G9q9hwr11bw" name="a">
+            <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
+          </ownedParameter>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_TbdTcJYlEd6G9q9hwr11bw" name="b">
+            <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
+          </ownedParameter>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_TbkoMJYlEd6G9q9hwr11bw" name="res" direction="return">
+            <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
+          </ownedParameter>
+        </ownedOperation>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_rrf74DVdEeKoYLVLZgpRiw" name="check">
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_4UNv4DVdEeKoYLVLZgpRiw" name="write">
+            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4UO-ADVdEeKoYLVLZgpRiw" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4UPlEDVdEeKoYLVLZgpRiw" value="1"/>
+          </ownedParameter>
+        </ownedOperation>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_9OJPEDVkEeKoYLVLZgpRiw" name="testOp">
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_Br-FQDVlEeKoYLVLZgpRiw" name="testPar">
+            <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_9XvcQB6REd6ITtm_FH3jRw"/>
+          </ownedParameter>
+        </ownedOperation>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_6ERa0DW2EeKyT6LlKoWJIA" name="length">
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_FfLX4DW3EeKyT6LlKoWJIA" name="p1" type="_krMkcDW2EeKyT6LlKoWJIA">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_FfN0IDW3EeKyT6LlKoWJIA" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FfObMDW3EeKyT6LlKoWJIA" value="1"/>
+          </ownedParameter>
+        </ownedOperation>
+      </packagedElement>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Package" xmi:id="_Tp4n8DLaEd2qeKRLMdIx_A" name="Interfaces">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_TDDBoDeEEeGPyrZ5I3hMlA" annotatedElement="_cn-H0DLbEd2qeKRLMdIx_A">
+        <body>This interface contains services that are used by the client and provided by the server component</body>
+      </ownedComment>
+      <packagedElement xmi:type="uml:Interface" xmi:id="_cn-H0DLbEd2qeKRLMdIx_A" name="ICompute">
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_DGs6wDLgEd28fJKJJnUaeQ" name="add">
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_DGs6wTLgEd28fJKJJnUaeQ" name="a">
+            <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DGs6wzLgEd28fJKJJnUaeQ" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DGs6wjLgEd28fJKJJnUaeQ" value="1"/>
+          </ownedParameter>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_DGs6xTLgEd28fJKJJnUaeQ" name="b">
+            <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DGs6xzLgEd28fJKJJnUaeQ" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DGs6xjLgEd28fJKJJnUaeQ" value="1"/>
+          </ownedParameter>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_DGs6yTLgEd28fJKJJnUaeQ" name="res" direction="return">
+            <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DGs6yzLgEd28fJKJJnUaeQ" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DGs6yjLgEd28fJKJJnUaeQ" value="1"/>
+          </ownedParameter>
+        </ownedOperation>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_L8EY8DLgEd28fJKJJnUaeQ" name="mult" isAbstract="true">
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_L8EY8TLgEd28fJKJJnUaeQ" name="a">
+            <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_qgMSAB6SEd6ITtm_FH3jRw"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_L8EY8zLgEd28fJKJJnUaeQ" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L8EY8jLgEd28fJKJJnUaeQ" value="1"/>
+          </ownedParameter>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_L8EY9TLgEd28fJKJJnUaeQ" name="b">
+            <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_wbw4kB6SEd6ITtm_FH3jRw"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_L8EY9zLgEd28fJKJJnUaeQ" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L8EY9jLgEd28fJKJJnUaeQ" value="1"/>
+          </ownedParameter>
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_L8EY-TLgEd28fJKJJnUaeQ" name="res" direction="return">
+            <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_L8EY-zLgEd28fJKJJnUaeQ" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L8EY-jLgEd28fJKJJnUaeQ" value="1"/>
+          </ownedParameter>
+        </ownedOperation>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_rrbqcDVdEeKoYLVLZgpRiw" name="check" isAbstract="true">
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_0xTp0DVdEeKoYLVLZgpRiw" name="write">
+            <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
+          </ownedParameter>
+        </ownedOperation>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_6DewoDW2EeKyT6LlKoWJIA" name="length">
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_AP4BcDW3EeKyT6LlKoWJIA" name="p1" type="_krMkcDW2EeKyT6LlKoWJIA"/>
+        </ownedOperation>
+      </packagedElement>
+      <packagedElement xmi:type="uml:DataType" xmi:id="_krMkcDW2EeKyT6LlKoWJIA" name="Point">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_m0WCQDW2EeKyT6LlKoWJIA" name="x" visibility="public">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_-5FTMB6REd6ITtm_FH3jRw"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_pOAoUDW2EeKyT6LlKoWJIA" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_pOB2cDW2EeKyT6LlKoWJIA" value="1"/>
+          <defaultValue xmi:type="uml:LiteralString" xmi:id="_pOESsDW2EeKyT6LlKoWJIA">
+            <value xsi:nil="true"/>
+          </defaultValue>
+        </ownedAttribute>
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_yJIJMDW2EeKyT6LlKoWJIA" name="y" visibility="public">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_-5FTMB6REd6ITtm_FH3jRw"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yd44QDW2EeKyT6LlKoWJIA" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yd6GYDW2EeKyT6LlKoWJIA" value="1"/>
+          <defaultValue xmi:type="uml:LiteralString" xmi:id="_yd77kDW2EeKyT6LlKoWJIA">
+            <value xsi:nil="true"/>
+          </defaultValue>
+        </ownedAttribute>
+      </packagedElement>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Package" xmi:id="_etOZkDLaEd2qeKRLMdIx_A" name="Client">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_fBRcQDeGEeGPyrZ5I3hMlA" annotatedElement="_IfjoETLbEd2qeKRLMdIx_A">
+        <body>The operation &quot;run&quot; (not the associated behavior) has been added automatically by Qompass in order to implement the operations of interfaces provided by ports, in this case of the operations of the &quot;IStart&quot; interface. It would be tedious to manually copy operations from an interface, as it would imply copying the complete signature with all parameters. The component developper has to provide a suitable behavior. A validation rule verifies if operations without behavior exist.</body>
+      </ownedComment>
+      <packagedElement xmi:type="uml:Class" xmi:id="_IfjoETLbEd2qeKRLMdIx_A" clientDependency="_ZmdDkEdDEeGxo4rn9hBAOQ" name="Client_impl">
+        <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_ZmdDkEdDEeGxo4rn9hBAOQ" name="derived realization of IStart" client="_IfjoETLbEd2qeKRLMdIx_A">
+          <supplier xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_PTWzwCS-Ed-A_I32T0fkaA"/>
+          <contract xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_PTWzwCS-Ed-A_I32T0fkaA"/>
+        </interfaceRealization>
+        <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_yXNVoKF4Ed6FqJCjEUrkqQ" name="run" specification="_ZnGj0EdDEeGxo4rn9hBAOQ">
+          <language>C/C++</language>
+          <body>cout &lt;&lt; &quot;call via port q: add (2, 3);&quot; &lt;&lt; endl;
+for (int i=0; i&lt;20; i++) {
+	cout &lt;&lt; &quot;result: &quot; &lt;&lt; q->add (2, (i+3)) &lt;&lt; endl;
+	usleep((i+10)*5*1000);
+	cout &lt;&lt; &quot;result: &quot; &lt;&lt; q->mult (3.0, 7.0) &lt;&lt; endl;
+	usleep(20*1000);
+	testOp(i*2);
+	usleep(30*1000);
+}</body>
+        </ownedBehavior>
+        <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_yVALQDclEeKAhIrFXfR8zQ" name="testOp" specification="_Qzp7gDclEeKAhIrFXfR8zQ">
+          <language>C/C++</language>
+          <body>cout &lt;&lt; &quot;This is a test operation&quot; &lt;&lt; endl;</body>
+        </ownedBehavior>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_ZnGj0EdDEeGxo4rn9hBAOQ" name="run" method="_yXNVoKF4Ed6FqJCjEUrkqQ"/>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_Qzp7gDclEeKAhIrFXfR8zQ" name="testOp" method="_yVALQDclEeKAhIrFXfR8zQ">
+          <ownedParameter xmi:type="uml:Parameter" xmi:id="_rXu4UDc_EeKPle9CbXIcpQ" name="j">
+            <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_9XvcQB6REd6ITtm_FH3jRw"/>
+          </ownedParameter>
+        </ownedOperation>
+      </packagedElement>
+    </packagedElement>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_O6TiIjLUEd26WNosUASSSw">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_O6TiIzLUEd26WNosUASSSw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2#/"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://UML_PROFILES/StandardL2.profile.uml#_0"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_GcC0cAHtEd6HSdiss9GQ0A">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Gd1kMAHtEd6HSdiss9GQ0A" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://PapyrusC_Cpp_PROFILES/C_Cpp.profile.uml#_j9REUByGEduN1bTiWJ0lyw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_z1TwgFW3Ed63BrxiKsw-0Q">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_z2GasFW3Ed63BrxiKsw-0Q" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/FCM/1#/"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://FCM_PROFILES/FCM.profile.uml#_5mvT0MtjEd2H_o0jIC6qDQ"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_1GtD8E0fEeG_H4ME7SR4KA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1RA2gE0fEeG_H4ME7SR4KA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/MARTE/1#//Alloc"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://Papyrus_PROFILES/MARTE.profile.uml#_ar8OsAPMEdyuUt-4qHuVvQ"/>
+    </profileApplication>
+  </uml:Model>
+  <FCM:DerivedElement xmi:id="_B9o7sP6yEd6Ie_kieu_3CQ">
+    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_C9IK4JsqEd61Eo3nmu3JhQ"/>
+  </FCM:DerivedElement>
+  <FCM:DerivedElement xmi:id="_DWb6oP6yEd6Ie_kieu_3CQ" base_Element="_TbIjUJYlEd6G9q9hwr11bw" source="_DGs6wDLgEd28fJKJJnUaeQ"/>
+  <FCM:DerivedElement xmi:id="_DXK6cP6yEd6Ie_kieu_3CQ" base_Element="_4ZEZwHecEd6r18stFZxmFQ" source="_L8EY8DLgEd28fJKJJnUaeQ"/>
+  <FCM:RuleApplication xmi:id="_DWIYoP6yEd6Ie_kieu_3CQ" base_Class="_oqZNUDLaEd2qeKRLMdIx_A">
+    <containerRule xmi:type="FCM:ContainerRule" href="pathmap://QML_TRACE/tracing.uml#_NtAukCqLEeKGrchWittz_g"/>
+    <propagateRule>false</propagateRule>
+    <interceptor href="pathmap://QML_TRACE/tracing.uml#_35od4DKrEd-z5o2wSoJ16A"/>
+  </FCM:RuleApplication>
+  <FCM:Connector xmi:id="_K2_iAP6yEd6Ie_kieu_3CQ"/>
+  <FCM:DerivedElement xmi:id="_RwGb8P6_Ed6Zw96O-tCw7A" source="_DGs6wDLgEd28fJKJJnUaeQ"/>
+  <FCM:DerivedElement xmi:id="_RxVyEP6_Ed6Zw96O-tCw7A" source="_L8EY8DLgEd28fJKJJnUaeQ"/>
+  <C_Cpp:Include xmi:id="_7SAnAP76Ed6Zw96O-tCw7A" body="#include &lt;unistd.h>&#xA;#include &lt;iostream>&#xA;using namespace std;" base_class="_IfjoETLbEd2qeKRLMdIx_A"/>
+  <C_Cpp:Include xmi:id="_Sa4nEP77Ed6Zw96O-tCw7A" body="#include &lt;iostream>&#xA;using namespace std;" base_class="_oqZNUDLaEd2qeKRLMdIx_A"/>
+  <FCM:Connector xmi:id="_Tm9v0ACUEd-PD8FdFs7bpA"/>
+  <FCM:DeploymentPlan xmi:id="_lEueYGLEEd-seu3qyZgHfg"/>
+  <FCM:DeploymentPlan xmi:id="_u_ACgGSuEd-dQdK1-7wIFg"/>
+  <FCM:DeploymentPlan xmi:id="_YK67AGTgEd-rCOWJcspHOA"/>
+  <FCM:ContainerRule xmi:id="_lNrDwH4HEd-rD-b0gnx-AQ"/>
+  <FCM:Configuration xmi:id="_RM9kQH8UEd-7Bsdl4VhuEw" base_Package="_BJc50H8TEd-7Bsdl4VhuEw">
+    <configOptions xmi:type="FCM:ConfigOption" href="pathmap://QML_CORE/core.uml#_u6LqoH7eEd-FNNgSS03RxQ"/>
+  </FCM:Configuration>
+  <FCM:DerivedElement xmi:id="_1E0nUKFhEd-AoOVE_odazw"/>
+  <FCM:Connector xmi:id="_cAkqIMKnEd-LE5cHpAvxBg">
+    <connector xmi:type="FCM:ConnectorImplGroup" href="pathmap://QML_DISTRIBUTION/distribution.uml#_DBP7QMKmEd-hj59jYY3RZQ"/>
+  </FCM:Connector>
+  <FCM:DerivedElement xmi:id="_ZnZewEdDEeGxo4rn9hBAOQ" base_Element="_ZnGj0EdDEeGxo4rn9hBAOQ">
+    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_C9IK4JsqEd61Eo3nmu3JhQ"/>
+  </FCM:DerivedElement>
+  <Alloc:Allocate xmi:id="_hgh4IE0rEeGl_syZE5iOXA"/>
+  <Alloc:Allocate xmi:id="_iwbZwE0rEeGl_syZE5iOXA"/>
+  <Alloc:Allocate xmi:id="_juiAwE0rEeGl_syZE5iOXA"/>
+  <FCM:DerivedElement xmi:id="_rrmpkDVdEeKoYLVLZgpRiw" base_Element="_rrf74DVdEeKoYLVLZgpRiw" source="_rrbqcDVdEeKoYLVLZgpRiw"/>
+  <FCM:DerivedElement xmi:id="_6EbL0DW2EeKyT6LlKoWJIA" base_Element="_6ERa0DW2EeKyT6LlKoWJIA" source="_6DewoDW2EeKyT6LlKoWJIA"/>
+  <FCM:RuleApplication xmi:id="__bC_ADcmEeKAhIrFXfR8zQ" base_Class="_IfjoETLbEd2qeKRLMdIx_A">
+    <containerRule xmi:type="FCM:ContainerRule" href="pathmap://QML_TRACE/tracing.uml#_NtAukCqLEeKGrchWittz_g"/>
+    <propagateRule>false</propagateRule>
+  </FCM:RuleApplication>
+</xmi:XMI>
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/library/tracing.di b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/library/tracing.di
index 606e074c54d..ebdd073cf33 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/library/tracing.di
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/library/tracing.di
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ASCII"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi" xmlns:history="http://www.eclipse.org/papyrus/0.7.0/controlmode">
   <di:SashWindowsMngr xmi:id="_m5icIOxGEd-2rr_yAeKkjQ">
     <pageList xmi:id="_m5icIexGEd-2rr_yAeKkjQ">
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/library/tracing.notation b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/library/tracing.notation
index 20f539ea806..4044845b3f3 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/library/tracing.notation
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/library/tracing.notation
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:FCM="http://www.eclipse.org/papyrus/FCM/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:C_Cpp="http://www.eclipse.org/papyrus/C_Cpp/1" xmlns:FCM="http://www.eclipse.org/papyrus/FCM/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">
   <notation:Diagram xmi:id="_U-SDoIKfEd-xPu-WdpUyIQ" type="CompositeStructure" name="OTF composition" measurementUnit="Pixel">
     <children xmi:type="notation:Shape" xmi:id="_jKzMsIKfEd-xPu-WdpUyIQ" type="2073" fontName="Sans Serif" fontHeight="10" lineColor="0">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jKzzwIKfEd-xPu-WdpUyIQ" source="ShadowFigure">
@@ -42,11 +42,34 @@
           <children xmi:type="notation:BasicCompartment" xmi:id="_rV-pdrniEeCxXoyQxQ47PQ" type="7077">
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rV-pd7niEeCxXoyQxQ47PQ"/>
           </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_5cx7EFKtEeOIeMrdF0AdCg" visible="false" type="compartment_shape_display">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_5cx7EVKtEeOIeMrdF0AdCg"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5cx7ElKtEeOIeMrdF0AdCg"/>
+          </children>
           <element xmi:type="uml:Property" href="tracing.uml#_plSuEF23Ed-12d_h0i1xhQ"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rV9bUbniEeCxXoyQxQ47PQ" x="26" y="5" width="150"/>
         </children>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jK0a1YKfEd-xPu-WdpUyIQ"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5cjRkFKtEeOIeMrdF0AdCg" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5cjRkVKtEeOIeMrdF0AdCg" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="tracing.uml#_ZWEQwDj0Ed-nsvkE2JvSTg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5cjRklKtEeOIeMrdF0AdCg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5cjRk1KtEeOIeMrdF0AdCg" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5cjRlFKtEeOIeMrdF0AdCg" showTitle="true"/>
+        <element xmi:type="FCM:UseInstanceConfigurator" href="tracing.uml#_plb90KbnEeC0_qP7CUZIiQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5cjRlVKtEeOIeMrdF0AdCg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5cj4oFKtEeOIeMrdF0AdCg" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5cj4oVKtEeOIeMrdF0AdCg" showTitle="true"/>
+        <element xmi:type="FCM:InteractionComponent" href="tracing.uml#_7J88sG6FEeGqWMX2LwdLDw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5cj4olKtEeOIeMrdF0AdCg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5cnjAFKtEeOIeMrdF0AdCg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5cnjAVKtEeOIeMrdF0AdCg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5cnjAlKtEeOIeMrdF0AdCg"/>
+      </children>
       <element xmi:type="uml:Class" href="tracing.uml#_aF1w4DKeEd-WprEKTCaiMA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jKzMsYKfEd-xPu-WdpUyIQ" x="126" y="126" width="289" height="109"/>
     </children>
@@ -90,6 +113,20 @@
         <element xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#__SLXgNtxEd6nqsBVkgJEEA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UfVIkSVHEeCPS8GFKAaKxw" x="-10" y="54"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5czwQFKtEeOIeMrdF0AdCg" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5czwQVKtEeOIeMrdF0AdCg" showTitle="true"/>
+        <element xmi:type="FCM:Singleton" href="tracing.uml#_AdBwIDgvEd-9wq2wHPy3lw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5czwQlKtEeOIeMrdF0AdCg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5c0XUFKtEeOIeMrdF0AdCg" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5c0XUVKtEeOIeMrdF0AdCg" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="tracing.uml#_mk_ccD5sEeC-VMxjm_qUAg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5c0XUlKtEeOIeMrdF0AdCg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5c0XU1KtEeOIeMrdF0AdCg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5c0XVFKtEeOIeMrdF0AdCg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5c0XVVKtEeOIeMrdF0AdCg"/>
+      </children>
       <element xmi:type="uml:Class" href="tracing.uml#_apuYoDNwEd-1k-POY2IaLg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="__tMDsfZREd-o7NjgdW2_VA" x="540" y="126" width="199" height="91"/>
     </children>
@@ -107,6 +144,10 @@
       <children xmi:type="notation:BasicCompartment" xmi:id="_SrhBlyVHEeCPS8GFKAaKxw" type="7073">
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SrhBmCVHEeCPS8GFKAaKxw"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5c2MgFKtEeOIeMrdF0AdCg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5c2MgVKtEeOIeMrdF0AdCg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5c2MglKtEeOIeMrdF0AdCg"/>
+      </children>
       <element xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_-WNegNtxEd6nqsBVkgJEEA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SrfzcSVHEeCPS8GFKAaKxw" x="540" y="27" width="199"/>
     </children>
@@ -131,6 +172,20 @@
       <children xmi:type="notation:BasicCompartment" xmi:id="_ap50YKAdEeCF0uoVQbVQRg" type="7073">
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ap50YaAdEeCF0uoVQbVQRg"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5c4owFKtEeOIeMrdF0AdCg" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5c4owVKtEeOIeMrdF0AdCg" showTitle="true"/>
+        <element xmi:type="FCM:UseInstanceConfigurator" href="tracing.uml#_MmzO0KboEeC0_qP7CUZIiQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5c4owlKtEeOIeMrdF0AdCg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5c4ow1KtEeOIeMrdF0AdCg" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5c4oxFKtEeOIeMrdF0AdCg" showTitle="true"/>
+        <element xmi:type="FCM:InteractionComponent" href="tracing.uml#_-t6LoG6FEeGqWMX2LwdLDw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5c4oxVKtEeOIeMrdF0AdCg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5c5P0FKtEeOIeMrdF0AdCg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5c5P0VKtEeOIeMrdF0AdCg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5c5P0lKtEeOIeMrdF0AdCg"/>
+      </children>
       <element xmi:type="uml:Class" href="tracing.uml#_aoSDwKAdEeCF0uoVQbVQRg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ap2xEaAdEeCF0uoVQbVQRg" x="126" y="288" width="289" height="91"/>
     </children>
@@ -177,6 +232,10 @@
         <styles xmi:type="notation:TitleStyle" xmi:id="_Sf6g4jaUEeKkY-29HX5sMQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Sf6g4zaUEeKkY-29HX5sMQ"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5c7sEFKtEeOIeMrdF0AdCg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5c7sEVKtEeOIeMrdF0AdCg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5c7sElKtEeOIeMrdF0AdCg"/>
+      </children>
       <element xmi:type="uml:Class" href="tracing.uml#_MM6RwDaUEeKkY-29HX5sMQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Sf0aQTaUEeKkY-29HX5sMQ" x="126" y="18" width="288" height="73"/>
     </children>
@@ -271,11 +330,19 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_sXzj3ZagEd-kUIqFByffIQ"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sXzj3pagEd-kUIqFByffIQ"/>
           </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_5gA1QFKtEeOIeMrdF0AdCg" visible="false" type="compartment_shape_display">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_5gA1QVKtEeOIeMrdF0AdCg"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5gA1QlKtEeOIeMrdF0AdCg"/>
+          </children>
           <element xmi:type="uml:Class" href="tracing.uml#_W0t44Dj1Ed-nsvkE2JvSTg"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sXxuoZagEd-kUIqFByffIQ" x="40" y="32"/>
         </children>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s6BgGJagEd-kUIqFByffIQ"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5f_nIFKtEeOIeMrdF0AdCg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5f_nIVKtEeOIeMrdF0AdCg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5f_nIlKtEeOIeMrdF0AdCg"/>
+      </children>
       <element xmi:type="uml:Package" href="tracing.uml#_IewAUDguEd-9wq2wHPy3lw"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s6A5AZagEd-kUIqFByffIQ" x="105" y="135" width="316" height="196"/>
     </children>
@@ -325,6 +392,25 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_HtcFqqcIEeCHb6NpAmqEdg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HtcFq6cIEeCHb6NpAmqEdg"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5kEO0FKtEeOIeMrdF0AdCg" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5kEO0VKtEeOIeMrdF0AdCg" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="tracing.uml#_ZWEQwDj0Ed-nsvkE2JvSTg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5kEO0lKtEeOIeMrdF0AdCg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5kE14FKtEeOIeMrdF0AdCg" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5kE14VKtEeOIeMrdF0AdCg" showTitle="true"/>
+        <element xmi:type="FCM:UseInstanceConfigurator" href="tracing.uml#_plb90KbnEeC0_qP7CUZIiQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5kE14lKtEeOIeMrdF0AdCg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5kE141KtEeOIeMrdF0AdCg" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5kE15FKtEeOIeMrdF0AdCg" showTitle="true"/>
+        <element xmi:type="FCM:InteractionComponent" href="tracing.uml#_7J88sG6FEeGqWMX2LwdLDw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5kE15VKtEeOIeMrdF0AdCg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5kGEAFKtEeOIeMrdF0AdCg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5kGEAVKtEeOIeMrdF0AdCg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5kGEAlKtEeOIeMrdF0AdCg"/>
+      </children>
       <element xmi:type="uml:Class" href="tracing.uml#_aF1w4DKeEd-WprEKTCaiMA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HtaQcacIEeCHb6NpAmqEdg" x="77" y="36" width="248" height="118"/>
     </children>
@@ -354,38 +440,23 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_xRAS4rnhEeCxXoyQxQ47PQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xRAS47nhEeCxXoyQxQ47PQ"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5kKVcFKtEeOIeMrdF0AdCg" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5kKVcVKtEeOIeMrdF0AdCg" showTitle="true"/>
+        <element xmi:type="FCM:Singleton" href="tracing.uml#_AdBwIDgvEd-9wq2wHPy3lw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5kKVclKtEeOIeMrdF0AdCg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5kKVc1KtEeOIeMrdF0AdCg" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5kKVdFKtEeOIeMrdF0AdCg" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="tracing.uml#_mk_ccD5sEeC-VMxjm_qUAg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5kKVdVKtEeOIeMrdF0AdCg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5kK8gFKtEeOIeMrdF0AdCg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5kK8gVKtEeOIeMrdF0AdCg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5kK8glKtEeOIeMrdF0AdCg"/>
+      </children>
       <element xmi:type="uml:Class" href="tracing.uml#_apuYoDNwEd-1k-POY2IaLg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xQ_EwbnhEeCxXoyQxQ47PQ" x="414" y="180"/>
     </children>
-    <children xmi:type="notation:Shape" xmi:id="_xRVqELnhEeCxXoyQxQ47PQ" type="2008" fontName="Sans Serif" lineColor="0">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xRVqErnhEeCxXoyQxQ47PQ" source="ShadowFigure">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xRVqE7nhEeCxXoyQxQ47PQ" key="ShadowFigure_Value" value="false"/>
-      </eAnnotations>
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xRWRILnhEeCxXoyQxQ47PQ" source="displayNameLabelIcon">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xRWRIbnhEeCxXoyQxQ47PQ" key="displayNameLabelIcon_value" value="false"/>
-      </eAnnotations>
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xRWRIrnhEeCxXoyQxQ47PQ" source="QualifiedName">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xRWRI7nhEeCxXoyQxQ47PQ" key="QualifiedNameDepth" value="1000"/>
-      </eAnnotations>
-      <children xmi:type="notation:DecorationNode" xmi:id="_xRWRJLnhEeCxXoyQxQ47PQ" type="5029"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_xRWRJbnhEeCxXoyQxQ47PQ" visible="false" type="7017">
-        <styles xmi:type="notation:SortingStyle" xmi:id="_xRWRJrnhEeCxXoyQxQ47PQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_xRWRJ7nhEeCxXoyQxQ47PQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xRWRKLnhEeCxXoyQxQ47PQ"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_xRWRKbnhEeCxXoyQxQ47PQ" visible="false" type="7018">
-        <styles xmi:type="notation:SortingStyle" xmi:id="_xRWRKrnhEeCxXoyQxQ47PQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_xRWRK7nhEeCxXoyQxQ47PQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xRWRLLnhEeCxXoyQxQ47PQ"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_xRWRLbnhEeCxXoyQxQ47PQ" visible="false" type="7019">
-        <styles xmi:type="notation:SortingStyle" xmi:id="_xRWRLrnhEeCxXoyQxQ47PQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_xRWRL7nhEeCxXoyQxQ47PQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xRWRMLnhEeCxXoyQxQ47PQ"/>
-      </children>
-      <element xmi:type="uml:Class" href="pathmap://QML_CORE/OS-AL-core.uml#_-HeCsDj_Edy0Rd6V_tf1-Q"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xRVqEbnhEeCxXoyQxQ47PQ" x="414" y="36" height="91"/>
-    </children>
     <children xmi:type="notation:Shape" xmi:id="_yDfDQLniEeCxXoyQxQ47PQ" type="2008" fontName="Sans Serif" lineColor="0">
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_yDfqULniEeCxXoyQxQ47PQ" source="ShadowFigure">
         <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_yDfqUbniEeCxXoyQxQ47PQ" key="ShadowFigure_Value" value="false"/>
@@ -412,6 +483,15 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_yDgRa7niEeCxXoyQxQ47PQ"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yDgRbLniEeCxXoyQxQ47PQ"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5kWisFKtEeOIeMrdF0AdCg" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5kWisVKtEeOIeMrdF0AdCg" showTitle="true"/>
+        <element xmi:type="FCM:InstanceConfigurator" href="tracing.uml#_nTMOYKbnEeC0_qP7CUZIiQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5kWislKtEeOIeMrdF0AdCg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5kXJwFKtEeOIeMrdF0AdCg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5kXJwVKtEeOIeMrdF0AdCg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5kXJwlKtEeOIeMrdF0AdCg"/>
+      </children>
       <element xmi:type="uml:Class" href="tracing.uml#_kIcwsKbnEeC0_qP7CUZIiQ"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yDfDQbniEeCxXoyQxQ47PQ" x="72" y="216" width="253" height="63"/>
     </children>
@@ -429,18 +509,59 @@
       <element xmi:type="uml:Comment" href="tracing.uml#_hd5WkKPUEeClvI8FjeO1Ow"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zxrqcbniEeCxXoyQxQ47PQ" x="72" y="323" width="415"/>
     </children>
+    <children xmi:type="notation:Shape" xmi:id="_fn2loFLHEeOIeMrdF0AdCg" type="2008" fontName="" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fn3zwFLHEeOIeMrdF0AdCg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fn3zwVLHEeOIeMrdF0AdCg" key="ShadowFigure_Value" value="true"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fn3zwlLHEeOIeMrdF0AdCg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fn3zw1LHEeOIeMrdF0AdCg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fn3zxFLHEeOIeMrdF0AdCg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fn3zxVLHEeOIeMrdF0AdCg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_fn3zxlLHEeOIeMrdF0AdCg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_fn3zx1LHEeOIeMrdF0AdCg" visible="false" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_fn3zyFLHEeOIeMrdF0AdCg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_fn3zyVLHEeOIeMrdF0AdCg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_fn3zylLHEeOIeMrdF0AdCg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fn3zy1LHEeOIeMrdF0AdCg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_fn3zzFLHEeOIeMrdF0AdCg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_fn3zzVLHEeOIeMrdF0AdCg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_fn3zzlLHEeOIeMrdF0AdCg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_fn3zz1LHEeOIeMrdF0AdCg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fn3z0FLHEeOIeMrdF0AdCg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_fn4a0FLHEeOIeMrdF0AdCg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_fn4a0VLHEeOIeMrdF0AdCg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_fn4a0lLHEeOIeMrdF0AdCg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_fn4a01LHEeOIeMrdF0AdCg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fn4a1FLHEeOIeMrdF0AdCg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_foDZ8FLHEeOIeMrdF0AdCg" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_foDZ8VLHEeOIeMrdF0AdCg" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="pathmap://QML_CORE/osal.uml#_UXASAE_gEdy2tpS719xBwQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_foDZ8lLHEeOIeMrdF0AdCg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_foEBAFLHEeOIeMrdF0AdCg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_foEBAVLHEeOIeMrdF0AdCg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_foEBAlLHEeOIeMrdF0AdCg"/>
+      </children>
+      <element xmi:type="uml:Class" href="pathmap://QML_CORE/osal.uml#_-HeCsDj_Edy0Rd6V_tf1-Q"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fn2loVLHEeOIeMrdF0AdCg" x="415" y="36" height="73"/>
+    </children>
     <styles xmi:type="notation:DiagramStyle" xmi:id="_WYtQ8absEeCMd5eKvetORw"/>
     <element xmi:type="uml:Package" href="tracing.uml#_g2IY8DKeEd-WprEKTCaiMA"/>
-    <edges xmi:type="notation:Connector" xmi:id="_xTj3oLnhEeCxXoyQxQ47PQ" type="4008" source="_xQ_EwLnhEeCxXoyQxQ47PQ" target="_xRVqELnhEeCxXoyQxQ47PQ" lineColor="0">
-      <children xmi:type="notation:DecorationNode" xmi:id="_xTkesLnhEeCxXoyQxQ47PQ" type="6026">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_xTkesbnhEeCxXoyQxQ47PQ" y="40"/>
+    <edges xmi:type="notation:Connector" xmi:id="_foL80FLHEeOIeMrdF0AdCg" type="4008" source="_xQ_EwLnhEeCxXoyQxQ47PQ" target="_fn2loFLHEeOIeMrdF0AdCg" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_foMj4FLHEeOIeMrdF0AdCg" type="6026">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_foMj4VLHEeOIeMrdF0AdCg" x="-16" y="119"/>
       </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_xTkesrnhEeCxXoyQxQ47PQ" type="6027">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_xTkes7nhEeCxXoyQxQ47PQ" y="60"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_foNK8FLHEeOIeMrdF0AdCg" type="6027">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_foNK8VLHEeOIeMrdF0AdCg" y="60"/>
       </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_xTj3obnhEeCxXoyQxQ47PQ" fontName="Sans Serif"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="_foL80VLHEeOIeMrdF0AdCg" fontName="Sans Serif"/>
       <element xmi:type="uml:Usage" href="tracing.uml#_7uQr8D4OEeC-VMxjm_qUAg"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xTj3ornhEeCxXoyQxQ47PQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_foL80lLHEeOIeMrdF0AdCg" points="[-50, -25, 414, 205]$[-464, -230, 0, 0]"/>
     </edges>
   </notation:Diagram>
   <notation:Diagram xmi:id="_cL_W0PUPEeCn1-FCrfecFg" type="CompositeStructure" name="ContainerRules" measurementUnit="Pixel">
@@ -485,12 +606,30 @@
             <styles xmi:type="notation:TitleStyle" xmi:id="_lBSjkvUPEeCn1-FCrfecFg"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lBSjk_UPEeCn1-FCrfecFg"/>
           </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_5o65oFKtEeOIeMrdF0AdCg" visible="false" type="AppliedStereotypeCompartement">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_5o65oVKtEeOIeMrdF0AdCg" showTitle="true"/>
+            <element xmi:type="FCM:InterceptionRule" href="tracing.uml#_RBO5IPUQEeCn1-FCrfecFg"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5o65olKtEeOIeMrdF0AdCg"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_5o7gsFKtEeOIeMrdF0AdCg" visible="false" type="compartment_shape_display">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_5o7gsVKtEeOIeMrdF0AdCg"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5o7gslKtEeOIeMrdF0AdCg"/>
+          </children>
           <element xmi:type="uml:Property" href="tracing.uml#_lBO5MPUPEeCn1-FCrfecFg"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lBRVcfUPEeCn1-FCrfecFg" x="31" y="10" width="190"/>
         </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_fLiRJPUPEeCn1-FCrfecFg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fLiRJfUPEeCn1-FCrfecFg"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5o4dYFKtEeOIeMrdF0AdCg" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5o4dYVKtEeOIeMrdF0AdCg" showTitle="true"/>
+        <element xmi:type="FCM:ContainerRule" href="tracing.uml#_ISo6gLdwEd-CtfrGQre34Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5o4dYlKtEeOIeMrdF0AdCg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5o5EcFKtEeOIeMrdF0AdCg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5o5EcVKtEeOIeMrdF0AdCg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5o5EclKtEeOIeMrdF0AdCg"/>
+      </children>
       <element xmi:type="uml:Class" href="tracing.uml#_GVZxwLdwEd-CtfrGQre34Q"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fLhDAfUPEeCn1-FCrfecFg" x="81" y="12" width="262" height="106"/>
     </children>
@@ -535,12 +674,30 @@
             <styles xmi:type="notation:TitleStyle" xmi:id="_pm8gF_UPEeCn1-FCrfecFg"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pm8gGPUPEeCn1-FCrfecFg"/>
           </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_5o_yIFKtEeOIeMrdF0AdCg" visible="false" type="AppliedStereotypeCompartement">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_5o_yIVKtEeOIeMrdF0AdCg" showTitle="true"/>
+            <element xmi:type="FCM:InterceptionRule" href="tracing.uml#_TLg_YPUQEeCn1-FCrfecFg"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5o_yIlKtEeOIeMrdF0AdCg"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_5pAZMFKtEeOIeMrdF0AdCg" visible="false" type="compartment_shape_display">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_5pAZMVKtEeOIeMrdF0AdCg"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5pAZMlKtEeOIeMrdF0AdCg"/>
+          </children>
           <element xmi:type="uml:Property" href="tracing.uml#_pm5cwPUPEeCn1-FCrfecFg"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pm7R8fUPEeCn1-FCrfecFg" x="31" y="4" width="190"/>
         </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_gsVVhfUPEeCn1-FCrfecFg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gsVVhvUPEeCn1-FCrfecFg"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5o988FKtEeOIeMrdF0AdCg" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5o988VKtEeOIeMrdF0AdCg" showTitle="true"/>
+        <element xmi:type="FCM:ContainerRule" href="tracing.uml#_6FqQoKAdEeCF0uoVQbVQRg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5o988lKtEeOIeMrdF0AdCg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5o9881KtEeOIeMrdF0AdCg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5o989FKtEeOIeMrdF0AdCg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5o989VKtEeOIeMrdF0AdCg"/>
+      </children>
       <element xmi:type="uml:Class" href="tracing.uml#_wHuA0KAdEeCF0uoVQbVQRg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gsUucfUPEeCn1-FCrfecFg" x="81" y="135" width="262" height="100"/>
     </children>
@@ -599,12 +756,35 @@
             <styles xmi:type="notation:TitleStyle" xmi:id="_d7RpxvwkEeGWn-a9PUOYcA"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_d7Rpx_wkEeGWn-a9PUOYcA"/>
           </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_5pGf0FKtEeOIeMrdF0AdCg" visible="false" type="AppliedStereotypeCompartement">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_5pGf0VKtEeOIeMrdF0AdCg" showTitle="true"/>
+            <element xmi:type="FCM:InterceptionRule" href="tracing.uml#_m-L0sPwkEeGWn-a9PUOYcA"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5pGf0lKtEeOIeMrdF0AdCg"/>
+          </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_5pGf01KtEeOIeMrdF0AdCg" visible="false" type="compartment_shape_display">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_5pGf1FKtEeOIeMrdF0AdCg"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5pGf1VKtEeOIeMrdF0AdCg"/>
+          </children>
           <element xmi:type="uml:Property" href="tracing.uml#_d7If0PwkEeGWn-a9PUOYcA"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_d7RCsfwkEeGWn-a9PUOYcA" x="31" y="6" width="190" height="46"/>
         </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_I2g2gfwkEeGWn-a9PUOYcA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_I2g2gvwkEeGWn-a9PUOYcA"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5pDcgFKtEeOIeMrdF0AdCg" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5pDcgVKtEeOIeMrdF0AdCg" showTitle="true"/>
+        <element xmi:type="FCM:ContainerRule" href="tracing.uml#_RWQC8PwkEeGWn-a9PUOYcA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5pDcglKtEeOIeMrdF0AdCg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5pDcg1KtEeOIeMrdF0AdCg" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5pDchFKtEeOIeMrdF0AdCg" showTitle="true"/>
+        <element xmi:type="FCM:UseInstanceConfigurator" href="tracing.uml#_5FYwcC8CEeKwPrQVP28AQw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5pDchVKtEeOIeMrdF0AdCg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5pEDkFKtEeOIeMrdF0AdCg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5pEDkVKtEeOIeMrdF0AdCg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5pEDklKtEeOIeMrdF0AdCg"/>
+      </children>
       <element xmi:type="uml:Class" href="tracing.uml#_I2OioPwkEeGWn-a9PUOYcA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_I2dzMfwkEeGWn-a9PUOYcA" x="81" y="252" width="262" height="109"/>
     </children>
@@ -682,12 +862,30 @@
             <styles xmi:type="notation:TitleStyle" xmi:id="_AxGBdS8PEeKVAPO2lpiVnA"/>
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AxGBdi8PEeKVAPO2lpiVnA"/>
           </children>
+          <children xmi:type="notation:BasicCompartment" xmi:id="_5pMmcFKtEeOIeMrdF0AdCg" visible="false" type="compartment_shape_display">
+            <styles xmi:type="notation:TitleStyle" xmi:id="_5pMmcVKtEeOIeMrdF0AdCg"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5pMmclKtEeOIeMrdF0AdCg"/>
+          </children>
           <element xmi:type="uml:Property" href="tracing.uml#_Avfe8C8PEeKVAPO2lpiVnA"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AxC-IS8PEeKVAPO2lpiVnA" x="22" y="15" width="165"/>
         </children>
         <styles xmi:type="notation:TitleStyle" xmi:id="_Ih3fYSqLEeKGrchWittz_g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ih3fYiqLEeKGrchWittz_g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5pJjIFKtEeOIeMrdF0AdCg" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5pJjIVKtEeOIeMrdF0AdCg" showTitle="true"/>
+        <element xmi:type="FCM:ContainerRule" href="tracing.uml#_NtAukCqLEeKGrchWittz_g"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5pJjIlKtEeOIeMrdF0AdCg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5pKKMFKtEeOIeMrdF0AdCg" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5pKKMVKtEeOIeMrdF0AdCg" showTitle="true"/>
+        <element xmi:type="FCM:UseInstanceConfigurator" href="tracing.uml#_gH1RQC8DEeKwPrQVP28AQw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5pKKMlKtEeOIeMrdF0AdCg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5pKKM1KtEeOIeMrdF0AdCg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5pKKNFKtEeOIeMrdF0AdCg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5pKKNVKtEeOIeMrdF0AdCg"/>
+      </children>
       <element xmi:type="uml:Class" href="tracing.uml#_If04ACqLEeKGrchWittz_g"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ihx_0CqLEeKGrchWittz_g" x="81" y="378" width="262" height="109"/>
     </children>
@@ -750,6 +948,10 @@
       <children xmi:type="notation:BasicCompartment" xmi:id="_okSkKPxWEeGOK9t90vpALA" type="7073">
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_okSkKfxWEeGOK9t90vpALA"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5tOx4FKtEeOIeMrdF0AdCg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5tOx4VKtEeOIeMrdF0AdCg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5tOx4lKtEeOIeMrdF0AdCg"/>
+      </children>
       <element xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_-WNegNtxEd6nqsBVkgJEEA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_okTLMPxWEeGOK9t90vpALA" x="550" y="34" width="199"/>
     </children>
@@ -823,6 +1025,10 @@
         <element xmi:type="uml:Port" href="pathmap://QML_CORE/core.uml#_Qk0jYNtuEd2eM5kqcby5ZA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0Fur0TaSEeKxVvAop17bHw" x="280" y="39"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5tQnEFKtEeOIeMrdF0AdCg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5tQnEVKtEeOIeMrdF0AdCg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5tQnElKtEeOIeMrdF0AdCg"/>
+      </children>
       <element xmi:type="uml:Class" href="tracing.uml#_pwl_MPxWEeGOK9t90vpALA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_px1VUfxWEeGOK9t90vpALA" x="136" y="159" width="290" height="67"/>
     </children>
@@ -837,17 +1043,36 @@
         <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rGbJsvxWEeGOK9t90vpALA" key="QualifiedNameDepth" value="1000"/>
       </eAnnotations>
       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__rfwQPxWEeGOK9t90vpALA" source="Stereotype_Annotation">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_KSvqYCdaEeKGdt7FoegMYA" key="StereotypeWithQualifiedNameList" value=""/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_KSvqYSdaEeKGdt7FoegMYA" key="StereotypeList" value="Cpp::CppInclude,Cpp::ManualGeneration"/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_KSvqYidaEeKGdt7FoegMYA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_KSwRcCdaEeKGdt7FoegMYA" key="PropStereoDisplay" value=""/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_KSwRcSdaEeKGdt7FoegMYA" key="StereotypePropertyLocation" value="Compartment"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6EPjsFKtEeOIeMrdF0AdCg" key="StereotypeWithQualifiedNameList" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6EPjsVKtEeOIeMrdF0AdCg" key="StereotypeList" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6EPjslKtEeOIeMrdF0AdCg" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6EQKwFKtEeOIeMrdF0AdCg" key="PropStereoDisplay" value=""/>
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6EQKwVKtEeOIeMrdF0AdCg" key="StereotypePropertyLocation" value="Compartment"/>
       </eAnnotations>
       <children xmi:type="notation:DecorationNode" xmi:id="_rGbJs_xWEeGOK9t90vpALA" type="5156"/>
       <children xmi:type="notation:BasicCompartment" xmi:id="_rGbJtPxWEeGOK9t90vpALA" type="7073">
         <styles xmi:type="notation:TitleStyle" xmi:id="_rGbJtfxWEeGOK9t90vpALA"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rGbJtvxWEeGOK9t90vpALA"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5tU4gFKtEeOIeMrdF0AdCg" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5tU4gVKtEeOIeMrdF0AdCg" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="tracing.uml#__rP4oPxWEeGOK9t90vpALA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5tU4glKtEeOIeMrdF0AdCg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5tU4g1KtEeOIeMrdF0AdCg" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5tU4hFKtEeOIeMrdF0AdCg" showTitle="true"/>
+        <element xmi:type="FCM:Template" href="tracing.uml#_flfM8PzhEeGe5LUTfvP5hQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5tU4hVKtEeOIeMrdF0AdCg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5tU4hlKtEeOIeMrdF0AdCg" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5tU4h1KtEeOIeMrdF0AdCg" showTitle="true"/>
+        <element xmi:type="C_Cpp:ManualGeneration" href="tracing.uml#_KSTlgCdaEeKGdt7FoegMYA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5tU4iFKtEeOIeMrdF0AdCg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5tVfkFKtEeOIeMrdF0AdCg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5tVfkVKtEeOIeMrdF0AdCg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5tVfklKtEeOIeMrdF0AdCg"/>
+      </children>
       <element xmi:type="uml:Class" href="tracing.uml#_rGPjgPxWEeGOK9t90vpALA"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rGaiofxWEeGOK9t90vpALA" x="135" y="342" width="298" height="100"/>
     </children>
@@ -894,6 +1119,10 @@
         <styles xmi:type="notation:TitleStyle" xmi:id="__O5ogvzSEeGKDvxFM1SZ_g"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="__O5og_zSEeGKDvxFM1SZ_g"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5tX70FKtEeOIeMrdF0AdCg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5tX70VKtEeOIeMrdF0AdCg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5tX70lKtEeOIeMrdF0AdCg"/>
+      </children>
       <element xmi:type="uml:Class" href="tracing.uml#_v-VBcPzSEeGKDvxFM1SZ_g"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="__O1XEPzSEeGKDvxFM1SZ_g" x="585" y="162" width="154" height="55"/>
     </children>
@@ -912,6 +1141,25 @@
         <styles xmi:type="notation:TitleStyle" xmi:id="_7peyUjHKEeKt1a2SZnJmwg"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7peyUzHKEeKt1a2SZnJmwg"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5tZxAFKtEeOIeMrdF0AdCg" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5tZxAVKtEeOIeMrdF0AdCg" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="tracing.uml#_gvf4IDHKEeKt1a2SZnJmwg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5tZxAlKtEeOIeMrdF0AdCg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5tZxA1KtEeOIeMrdF0AdCg" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5tZxBFKtEeOIeMrdF0AdCg" showTitle="true"/>
+        <element xmi:type="FCM:Template" href="tracing.uml#_gvnM4DHKEeKt1a2SZnJmwg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5tZxBVKtEeOIeMrdF0AdCg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5tZxBlKtEeOIeMrdF0AdCg" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5tZxB1KtEeOIeMrdF0AdCg" showTitle="true"/>
+        <element xmi:type="C_Cpp:ManualGeneration" href="tracing.uml#_gvnz8DHKEeKt1a2SZnJmwg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5tZxCFKtEeOIeMrdF0AdCg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5tZxCVKtEeOIeMrdF0AdCg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5taYEFKtEeOIeMrdF0AdCg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5taYEVKtEeOIeMrdF0AdCg"/>
+      </children>
       <element xmi:type="uml:Class" href="tracing.uml#_gveqADHKEeKt1a2SZnJmwg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7pVBUTHKEeKt1a2SZnJmwg" x="586" y="234" width="153" height="46"/>
     </children>
@@ -930,6 +1178,25 @@
         <styles xmi:type="notation:TitleStyle" xmi:id="_a4_EUTWGEeKGAYOVxzQeAg" showTitle="true"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_a4_EUjWGEeKGAYOVxzQeAg"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5tcNQFKtEeOIeMrdF0AdCg" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5tcNQVKtEeOIeMrdF0AdCg" showTitle="true"/>
+        <element xmi:type="C_Cpp:ManualGeneration" href="tracing.uml#_WUbVADV7EeKGAYOVxzQeAg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5tcNQlKtEeOIeMrdF0AdCg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5tcNQ1KtEeOIeMrdF0AdCg" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5tcNRFKtEeOIeMrdF0AdCg" showTitle="true"/>
+        <element xmi:type="C_Cpp:Include" href="tracing.uml#_ZdHkQDV7EeKGAYOVxzQeAg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5tcNRVKtEeOIeMrdF0AdCg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5tcNRlKtEeOIeMrdF0AdCg" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5tcNR1KtEeOIeMrdF0AdCg" showTitle="true"/>
+        <element xmi:type="FCM:Template" href="tracing.uml#_HOvQ0DWSEeKGAYOVxzQeAg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5tcNSFKtEeOIeMrdF0AdCg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5tc0UFKtEeOIeMrdF0AdCg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5tc0UVKtEeOIeMrdF0AdCg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5tc0UlKtEeOIeMrdF0AdCg"/>
+      </children>
       <element xmi:type="uml:Class" href="tracing.uml#_C4FREDV7EeKGAYOVxzQeAg"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_a416YTWGEeKGAYOVxzQeAg" x="585" y="108" width="154" height="47"/>
     </children>
@@ -948,6 +1215,10 @@
         <styles xmi:type="notation:TitleStyle" xmi:id="_ihmtwjaSEeKxVvAop17bHw"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ihmtwzaSEeKxVvAop17bHw"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5tepgFKtEeOIeMrdF0AdCg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5tepgVKtEeOIeMrdF0AdCg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5tepglKtEeOIeMrdF0AdCg"/>
+      </children>
       <element xmi:type="uml:Class" href="tracing.uml#_dcP9gDaSEeKxVvAop17bHw"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ihO6UTaSEeKxVvAop17bHw" x="135" y="72" width="289" height="55"/>
     </children>
@@ -1069,6 +1340,10 @@
         <styles xmi:type="notation:FilteringStyle" xmi:id="_P4g8vSmiEeKp-eCvZDLsaw"/>
         <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P4g8vimiEeKp-eCvZDLsaw"/>
       </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5wSF4FKtEeOIeMrdF0AdCg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5wSF4VKtEeOIeMrdF0AdCg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5wSF4lKtEeOIeMrdF0AdCg"/>
+      </children>
       <element xmi:type="uml:Class" href="tracing.uml#_P2j04CmiEeKp-eCvZDLsaw"/>
       <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P4dSUSmiEeKp-eCvZDLsaw" x="356" y="157"/>
     </children>
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/library/tracing.uml b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/library/tracing.uml
index 40427054a55..2a7232c407c 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/library/tracing.uml
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/models/library/tracing.uml
@@ -1,51 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xmi:XMI xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:C_Cpp="http://www.eclipse.org/papyrus/C_Cpp/1" xmlns:FCM="http://www.eclipse.org/papyrus/FCM/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:l2="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">
   <uml:Model xmi:id="_H-ZqYDKeEd-WprEKTCaiMA" name="Tracing">
-    <packageImport xmi:id="_H-ZqYTKeEd-WprEKTCaiMA">
+    <packageImport xmi:type="uml:PackageImport" xmi:id="_H-ZqYTKeEd-WprEKTCaiMA">
       <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
     </packageImport>
-    <packageImport xmi:id="_2NyU8DguEd-9wq2wHPy3lw">
+    <packageImport xmi:type="uml:PackageImport" xmi:id="_2NyU8DguEd-9wq2wHPy3lw">
       <importedPackage xmi:type="uml:Model" href="pathmap://QML_CORE/core.uml#_O6TiIDLUEd26WNosUASSSw"/>
     </packageImport>
-    <packageImport xmi:id="_XW7KkEQYEd-RDttIPD8NUg">
+    <packageImport xmi:type="uml:PackageImport" xmi:id="_XW7KkEQYEd-RDttIPD8NUg">
       <importedPackage xmi:type="uml:Model" href="pathmap://QML_CORE/osal.uml#_ROTQYC-OEdySSa8YESkO2w"/>
     </packageImport>
-    <packageImport xmi:id="_DRgF0D4NEeC-VMxjm_qUAg">
+    <packageImport xmi:type="uml:PackageImport" xmi:id="_DRgF0D4NEeC-VMxjm_qUAg">
       <importedPackage xmi:type="uml:Model" href="pathmap://QML_CORE/corba.uml#_DtQEwDLdEd2_U4efLnjQIw"/>
     </packageImport>
     <packagedElement xmi:type="uml:Package" xmi:id="_g2IY8DKeEd-WprEKTCaiMA" name="traceInterceptor">
-      <packageMerge xmi:id="_2RoSYKNfEeCdIOXlyrCmKQ">
-        <mergedPackage href="pathmap://QML_CORE/core.uml#_mMCK8PiPEd2UhpY2Y3WUyg"/>
+      <packageMerge xmi:type="uml:PackageMerge" xmi:id="_2RoSYKNfEeCdIOXlyrCmKQ">
+        <mergedPackage xmi:type="uml:Package" href="pathmap://QML_CORE/core.uml#_mMCK8PiPEd2UhpY2Y3WUyg"/>
       </packageMerge>
       <packagedElement xmi:type="uml:Package" xmi:id="_1rsK8PwkEeGWn-a9PUOYcA" name="otf">
-        <ownedComment xmi:id="_YUcjcKAeEeCF0uoVQbVQRg" annotatedElement="_aoSDwKAdEeCF0uoVQbVQRg">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_YUcjcKAeEeCF0uoVQbVQRg" annotatedElement="_aoSDwKAdEeCF0uoVQbVQRg">
           <body>Variant of OTF trace that only reports values that change.</body>
         </ownedComment>
-        <ownedComment xmi:id="_hd5WkKPUEeClvI8FjeO1Ow" annotatedElement="_kIcwsKbnEeC0_qP7CUZIiQ">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_hd5WkKPUEeClvI8FjeO1Ow" annotatedElement="_kIcwsKbnEeC0_qP7CUZIiQ">
           <body>A prior variant had a link with the methodCall_comp signature, since the operationIDs should be different, depending on the called component. This leads to a large number of generated classes. Current solution: configure the IDs on an instance level via ths InstanceConfigurator
 </body>
         </ownedComment>
-        <ownedComment xmi:id="_bb4kQLniEeCxXoyQxQ47PQ" annotatedElement="_aF1w4DKeEd-WprEKTCaiMA">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_bb4kQLniEeCxXoyQxQ47PQ" annotatedElement="_aF1w4DKeEd-WprEKTCaiMA">
           <body>Trace implementation based on OTF trace library. Aggregates singleton TraceInit</body>
         </ownedComment>
         <packagedElement xmi:type="uml:Class" xmi:id="_aF1w4DKeEd-WprEKTCaiMA" clientDependency="_BuqlQDOcEd-1k-POY2IaLg" name="OTFTrace_impl">
-          <generalization xmi:id="_WdRuUDaUEeKkY-29HX5sMQ" general="_MM6RwDaUEeKkY-29HX5sMQ"/>
-          <ownedAttribute xmi:id="_aF1w5TKeEd-WprEKTCaiMA" name="timestamp" isUnique="false">
+          <generalization xmi:type="uml:Generalization" xmi:id="_WdRuUDaUEeKkY-29HX5sMQ" general="_MM6RwDaUEeKkY-29HX5sMQ"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_aF1w5TKeEd-WprEKTCaiMA" name="timestamp" isUnique="false">
             <type xmi:type="uml:Class" href="pathmap://QML_CORE/osal.uml#_FuKEEDj8Edy0Rd6V_tf1-Q"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_aF1w5zKeEd-WprEKTCaiMA" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_aF1w5jKeEd-WprEKTCaiMA" value="1"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_plSuEF23Ed-12d_h0i1xhQ" name="traceInit" type="_apuYoDNwEd-1k-POY2IaLg" isUnique="false" aggregation="shared">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_plSuEF23Ed-12d_h0i1xhQ" name="traceInit" type="_apuYoDNwEd-1k-POY2IaLg" isUnique="false" aggregation="shared">
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xUhqoF23Ed-12d_h0i1xhQ" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xUpmcF23Ed-12d_h0i1xhQ" value="1"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_mfNqoBavEeGq1uSGvh4rcQ" name="hasDeclaredFunctions" isStatic="true">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_mfNqoBavEeGq1uSGvh4rcQ" name="hasDeclaredFunctions" isStatic="true">
             <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_Bv7l0B-VEd6nGq8wpI2tjg"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_mfSjIBavEeGq1uSGvh4rcQ" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_mfTKMBavEeGq1uSGvh4rcQ" value="1"/>
             <defaultValue xmi:type="uml:LiteralBoolean" xmi:id="_u-498Ba1EeGq1uSGvh4rcQ"/>
           </ownedAttribute>
-          <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_aF1w6DKeEd-WprEKTCaiMA" name="&lt;%name%>" specification="_aF1w7zKeEd-WprEKTCaiMA">
+          <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_aF1w6DKeEd-WprEKTCaiMA" name="[name/]" specification="_aF1w7zKeEd-WprEKTCaiMA">
             <language>C/C++</language>
             <body>[import org::eclipse::papyrus::qompass::designer::core::acceleo::UMLTool/]
 [import org::eclipse::papyrus::qompass::designer::core::acceleo::utils_cpp/]
@@ -91,149 +91,149 @@ OTF_Writer * writer = Tracing::TraceInit::getWriter();
 OTF_Writer_writeDefFunction (writer, streamNr, &lt;%enumSvcPrefix%>::id_&lt;%owner.varName%>_&lt;%varName%>, &lt;%quoteLiteral(&quot;InterfaceEnum&quot;, &quot;id_&lt;%owner.varName%>_&lt;%varName%>&quot;)%>, fctGroupID, 0);
 &lt;%}%></body>
           </ownedBehavior>
-          <ownedOperation xmi:id="_aF1w7zKeEd-WprEKTCaiMA" name="[name/]" visibility="public" method="_aF1w6DKeEd-WprEKTCaiMA">
-            <ownedComment xmi:id="_4e51QBatEeGq1uSGvh4rcQ">
+          <ownedOperation xmi:type="uml:Operation" xmi:id="_aF1w7zKeEd-WprEKTCaiMA" name="[name/]" visibility="public" method="_aF1w6DKeEd-WprEKTCaiMA">
+            <ownedComment xmi:type="uml:Comment" xmi:id="_4e51QBatEeGq1uSGvh4rcQ">
               <body>&lt;&lt;TextualRepresentation>>public '&lt;%name%>' () { }</body>
             </ownedComment>
           </ownedOperation>
-          <ownedOperation xmi:id="_aF1w8TKeEd-WprEKTCaiMA" name="updateTimestamp" method="_aF1w6jKeEd-WprEKTCaiMA"/>
-          <ownedOperation xmi:id="_35DgwBauEeGq1uSGvh4rcQ" name="declareFunctions" method="_73ynMBauEeGq1uSGvh4rcQ"/>
+          <ownedOperation xmi:type="uml:Operation" xmi:id="_aF1w8TKeEd-WprEKTCaiMA" name="updateTimestamp" method="_aF1w6jKeEd-WprEKTCaiMA"/>
+          <ownedOperation xmi:type="uml:Operation" xmi:id="_35DgwBauEeGq1uSGvh4rcQ" name="declareFunctions" method="_73ynMBauEeGq1uSGvh4rcQ"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Usage" xmi:id="_BuqlQDOcEd-1k-POY2IaLg" name="OTFTrace_impl => TraceInit" client="_aF1w4DKeEd-WprEKTCaiMA" supplier="_apuYoDNwEd-1k-POY2IaLg"/>
         <packagedElement xmi:type="uml:Package" xmi:id="_U1rDwPL5Ed-1eY2qOvQSbw" name="TraceImpl">
-          <ownedTemplateSignature xmi:id="_krDBAPL5Ed-1eY2qOvQSbw" parameter="_krDoEvL5Ed-1eY2qOvQSbw">
+          <ownedTemplateSignature xmi:type="uml:TemplateSignature" xmi:id="_krDBAPL5Ed-1eY2qOvQSbw" parameter="_krDoEvL5Ed-1eY2qOvQSbw">
             <ownedParameter xmi:type="uml:ClassifierTemplateParameter" xmi:id="_krDoEvL5Ed-1eY2qOvQSbw" parameteredElement="_krDoE_L5Ed-1eY2qOvQSbw">
               <ownedParameteredElement xmi:type="uml:Class" xmi:id="_krDoE_L5Ed-1eY2qOvQSbw" name="T" templateParameter="_krDoEvL5Ed-1eY2qOvQSbw">
-                <eAnnotations xmi:id="_krDoFPL5Ed-1eY2qOvQSbw" source="http://www.eclipse.org/emf/2002/Ecore">
-                  <details xmi:id="_krDoFfL5Ed-1eY2qOvQSbw" key="constraints" value="InterfaceIsAbstract AtMostOneID UniqueFeatureNames UniqueOperationSignatures NoCircularSuperTypes WellFormedMapEntryClass ConsistentSuperTypes"/>
+                <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_krDoFPL5Ed-1eY2qOvQSbw" source="http://www.eclipse.org/emf/2002/Ecore">
+                  <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_krDoFfL5Ed-1eY2qOvQSbw" key="constraints" value="InterfaceIsAbstract AtMostOneID UniqueFeatureNames UniqueOperationSignatures NoCircularSuperTypes WellFormedMapEntryClass ConsistentSuperTypes"/>
                 </eAnnotations>
-                <generalization xmi:id="_krDoFvL5Ed-1eY2qOvQSbw">
+                <generalization xmi:type="uml:Generalization" xmi:id="_krDoFvL5Ed-1eY2qOvQSbw">
                   <general xmi:type="uml:Class" href="pathmap://UML_METAMODELS/Ecore.metamodel.uml#EClassifier"/>
                 </generalization>
-                <ownedAttribute xmi:id="_krDoF_L5Ed-1eY2qOvQSbw" name="abstract" visibility="public" isOrdered="true">
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_krDoF_L5Ed-1eY2qOvQSbw" name="abstract" visibility="public" isOrdered="true">
                   <type xmi:type="uml:PrimitiveType" href="pathmap://UML_METAMODELS/Ecore.metamodel.uml#EBoolean"/>
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_krDoGPL5Ed-1eY2qOvQSbw"/>
                 </ownedAttribute>
-                <ownedAttribute xmi:id="_krDoGfL5Ed-1eY2qOvQSbw" name="interface" visibility="public" isOrdered="true">
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_krDoGfL5Ed-1eY2qOvQSbw" name="interface" visibility="public" isOrdered="true">
                   <type xmi:type="uml:PrimitiveType" href="pathmap://UML_METAMODELS/Ecore.metamodel.uml#EBoolean"/>
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_krDoGvL5Ed-1eY2qOvQSbw"/>
                 </ownedAttribute>
-                <ownedAttribute xmi:id="_krDoG_L5Ed-1eY2qOvQSbw" name="eSuperTypes" type="_krDoE_L5Ed-1eY2qOvQSbw" isOrdered="true">
-                  <eAnnotations xmi:id="_krDoHPL5Ed-1eY2qOvQSbw" source="http://www.eclipse.org/emf/2002/GenModel">
-                    <details xmi:id="_krDoHfL5Ed-1eY2qOvQSbw" key="suppressedUnsetVisibility" value="true"/>
-                    <details xmi:id="_krDoHvL5Ed-1eY2qOvQSbw" key="suppressedIsSetVisibility" value="true"/>
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_krDoG_L5Ed-1eY2qOvQSbw" name="eSuperTypes" type="_krDoE_L5Ed-1eY2qOvQSbw" isOrdered="true">
+                  <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_krDoHPL5Ed-1eY2qOvQSbw" source="http://www.eclipse.org/emf/2002/GenModel">
+                    <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_krDoHfL5Ed-1eY2qOvQSbw" key="suppressedUnsetVisibility" value="true"/>
+                    <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_krDoHvL5Ed-1eY2qOvQSbw" key="suppressedIsSetVisibility" value="true"/>
                   </eAnnotations>
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_krDoIPL5Ed-1eY2qOvQSbw"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_krDoH_L5Ed-1eY2qOvQSbw" value="*"/>
                 </ownedAttribute>
-                <ownedAttribute xmi:id="_krDoIfL5Ed-1eY2qOvQSbw" name="eOperations" isOrdered="true" aggregation="composite">
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_krDoIfL5Ed-1eY2qOvQSbw" name="eOperations" isOrdered="true" aggregation="composite">
                   <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/Ecore.metamodel.uml#EOperation"/>
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_krDoI_L5Ed-1eY2qOvQSbw"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_krDoIvL5Ed-1eY2qOvQSbw" value="*"/>
                 </ownedAttribute>
-                <ownedAttribute xmi:id="_krDoJPL5Ed-1eY2qOvQSbw" name="eAllAttributes" isOrdered="true" isReadOnly="true" isDerived="true">
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_krDoJPL5Ed-1eY2qOvQSbw" name="eAllAttributes" isOrdered="true" isReadOnly="true" isDerived="true">
                   <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/Ecore.metamodel.uml#EAttribute"/>
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_krDoJvL5Ed-1eY2qOvQSbw"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_krDoJfL5Ed-1eY2qOvQSbw" value="*"/>
                 </ownedAttribute>
-                <ownedAttribute xmi:id="_krDoJ_L5Ed-1eY2qOvQSbw" name="eAllReferences" isOrdered="true" isReadOnly="true" isDerived="true">
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_krDoJ_L5Ed-1eY2qOvQSbw" name="eAllReferences" isOrdered="true" isReadOnly="true" isDerived="true">
                   <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/Ecore.metamodel.uml#EReference"/>
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_krDoKfL5Ed-1eY2qOvQSbw"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_krDoKPL5Ed-1eY2qOvQSbw" value="*"/>
                 </ownedAttribute>
-                <ownedAttribute xmi:id="_krDoKvL5Ed-1eY2qOvQSbw" name="eReferences" isOrdered="true" isReadOnly="true" isDerived="true">
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_krDoKvL5Ed-1eY2qOvQSbw" name="eReferences" isOrdered="true" isReadOnly="true" isDerived="true">
                   <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/Ecore.metamodel.uml#EReference"/>
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_krDoLPL5Ed-1eY2qOvQSbw"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_krDoK_L5Ed-1eY2qOvQSbw" value="*"/>
                 </ownedAttribute>
-                <ownedAttribute xmi:id="_krDoLfL5Ed-1eY2qOvQSbw" name="eAttributes" isOrdered="true" isReadOnly="true" isDerived="true">
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_krDoLfL5Ed-1eY2qOvQSbw" name="eAttributes" isOrdered="true" isReadOnly="true" isDerived="true">
                   <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/Ecore.metamodel.uml#EAttribute"/>
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_krDoL_L5Ed-1eY2qOvQSbw"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_krDoLvL5Ed-1eY2qOvQSbw" value="*"/>
                 </ownedAttribute>
-                <ownedAttribute xmi:id="_krDoMPL5Ed-1eY2qOvQSbw" name="eAllContainments" isOrdered="true" isReadOnly="true" isDerived="true">
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_krDoMPL5Ed-1eY2qOvQSbw" name="eAllContainments" isOrdered="true" isReadOnly="true" isDerived="true">
                   <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/Ecore.metamodel.uml#EReference"/>
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_krDoMvL5Ed-1eY2qOvQSbw"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_krDoMfL5Ed-1eY2qOvQSbw" value="*"/>
                 </ownedAttribute>
-                <ownedAttribute xmi:id="_krDoM_L5Ed-1eY2qOvQSbw" name="eAllOperations" isOrdered="true" isReadOnly="true" isDerived="true">
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_krDoM_L5Ed-1eY2qOvQSbw" name="eAllOperations" isOrdered="true" isReadOnly="true" isDerived="true">
                   <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/Ecore.metamodel.uml#EOperation"/>
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_krDoNfL5Ed-1eY2qOvQSbw"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_krDoNPL5Ed-1eY2qOvQSbw" value="*"/>
                 </ownedAttribute>
-                <ownedAttribute xmi:id="_krDoNvL5Ed-1eY2qOvQSbw" name="eAllStructuralFeatures" isOrdered="true" isReadOnly="true" isDerived="true">
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_krDoNvL5Ed-1eY2qOvQSbw" name="eAllStructuralFeatures" isOrdered="true" isReadOnly="true" isDerived="true">
                   <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/Ecore.metamodel.uml#EStructuralFeature"/>
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_krDoOPL5Ed-1eY2qOvQSbw"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_krDoN_L5Ed-1eY2qOvQSbw" value="*"/>
                 </ownedAttribute>
-                <ownedAttribute xmi:id="_krDoOfL5Ed-1eY2qOvQSbw" name="eAllSuperTypes" type="_krDoE_L5Ed-1eY2qOvQSbw" isOrdered="true" isReadOnly="true" isDerived="true">
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_krDoOfL5Ed-1eY2qOvQSbw" name="eAllSuperTypes" type="_krDoE_L5Ed-1eY2qOvQSbw" isOrdered="true" isReadOnly="true" isDerived="true">
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_krDoO_L5Ed-1eY2qOvQSbw"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_krDoOvL5Ed-1eY2qOvQSbw" value="*"/>
                 </ownedAttribute>
-                <ownedAttribute xmi:id="_krDoPPL5Ed-1eY2qOvQSbw" name="eIDAttribute" isOrdered="true" isReadOnly="true" isDerived="true">
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_krDoPPL5Ed-1eY2qOvQSbw" name="eIDAttribute" isOrdered="true" isReadOnly="true" isDerived="true">
                   <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/Ecore.metamodel.uml#EAttribute"/>
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_krDoPfL5Ed-1eY2qOvQSbw"/>
                 </ownedAttribute>
-                <ownedAttribute xmi:id="_krDoPvL5Ed-1eY2qOvQSbw" name="eStructuralFeatures" isOrdered="true" aggregation="composite">
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_krDoPvL5Ed-1eY2qOvQSbw" name="eStructuralFeatures" isOrdered="true" aggregation="composite">
                   <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/Ecore.metamodel.uml#EStructuralFeature"/>
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_krDoQPL5Ed-1eY2qOvQSbw"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_krDoP_L5Ed-1eY2qOvQSbw" value="*"/>
                 </ownedAttribute>
-                <ownedAttribute xmi:id="_krDoQfL5Ed-1eY2qOvQSbw" name="eGenericSuperTypes" isOrdered="true" aggregation="composite">
-                  <eAnnotations xmi:id="_krDoQvL5Ed-1eY2qOvQSbw" source="http://www.eclipse.org/emf/2002/GenModel">
-                    <details xmi:id="_krDoQ_L5Ed-1eY2qOvQSbw" key="suppressedUnsetVisibility" value="true"/>
-                    <details xmi:id="_krDoRPL5Ed-1eY2qOvQSbw" key="suppressedIsSetVisibility" value="true"/>
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_krDoQfL5Ed-1eY2qOvQSbw" name="eGenericSuperTypes" isOrdered="true" aggregation="composite">
+                  <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_krDoQvL5Ed-1eY2qOvQSbw" source="http://www.eclipse.org/emf/2002/GenModel">
+                    <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_krDoQ_L5Ed-1eY2qOvQSbw" key="suppressedUnsetVisibility" value="true"/>
+                    <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_krDoRPL5Ed-1eY2qOvQSbw" key="suppressedIsSetVisibility" value="true"/>
                   </eAnnotations>
                   <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/Ecore.metamodel.uml#EGenericType"/>
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_krDoRvL5Ed-1eY2qOvQSbw"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_krDoRfL5Ed-1eY2qOvQSbw" value="*"/>
                 </ownedAttribute>
-                <ownedAttribute xmi:id="_krDoR_L5Ed-1eY2qOvQSbw" name="eAllGenericSuperTypes" isOrdered="true" isReadOnly="true" isDerived="true">
+                <ownedAttribute xmi:type="uml:Property" xmi:id="_krDoR_L5Ed-1eY2qOvQSbw" name="eAllGenericSuperTypes" isOrdered="true" isReadOnly="true" isDerived="true">
                   <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/Ecore.metamodel.uml#EGenericType"/>
                   <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_krDoSfL5Ed-1eY2qOvQSbw"/>
                   <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_krDoSPL5Ed-1eY2qOvQSbw" value="*"/>
                 </ownedAttribute>
-                <ownedOperation xmi:id="_krDoSvL5Ed-1eY2qOvQSbw" name="isSuperTypeOf" visibility="public">
-                  <ownedParameter xmi:id="_krDoS_L5Ed-1eY2qOvQSbw" isOrdered="true" direction="return">
+                <ownedOperation xmi:type="uml:Operation" xmi:id="_krDoSvL5Ed-1eY2qOvQSbw" name="isSuperTypeOf" visibility="public">
+                  <ownedParameter xmi:type="uml:Parameter" xmi:id="_krDoS_L5Ed-1eY2qOvQSbw" isOrdered="true" direction="return">
                     <type xmi:type="uml:PrimitiveType" href="pathmap://UML_METAMODELS/Ecore.metamodel.uml#EBoolean"/>
                     <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_krDoTPL5Ed-1eY2qOvQSbw"/>
                   </ownedParameter>
-                  <ownedParameter xmi:id="_krDoTfL5Ed-1eY2qOvQSbw" name="someClass" type="_krDoE_L5Ed-1eY2qOvQSbw" isOrdered="true">
+                  <ownedParameter xmi:type="uml:Parameter" xmi:id="_krDoTfL5Ed-1eY2qOvQSbw" name="someClass" type="_krDoE_L5Ed-1eY2qOvQSbw" isOrdered="true">
                     <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_krDoTvL5Ed-1eY2qOvQSbw"/>
                   </ownedParameter>
                 </ownedOperation>
-                <ownedOperation xmi:id="_krDoT_L5Ed-1eY2qOvQSbw" name="getFeatureCount" visibility="public">
-                  <ownedParameter xmi:id="_krDoUPL5Ed-1eY2qOvQSbw" isOrdered="true" direction="return">
+                <ownedOperation xmi:type="uml:Operation" xmi:id="_krDoT_L5Ed-1eY2qOvQSbw" name="getFeatureCount" visibility="public">
+                  <ownedParameter xmi:type="uml:Parameter" xmi:id="_krDoUPL5Ed-1eY2qOvQSbw" isOrdered="true" direction="return">
                     <type xmi:type="uml:PrimitiveType" href="pathmap://UML_METAMODELS/Ecore.metamodel.uml#EInt"/>
                     <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_krDoUfL5Ed-1eY2qOvQSbw"/>
                   </ownedParameter>
                 </ownedOperation>
-                <ownedOperation xmi:id="_krDoUvL5Ed-1eY2qOvQSbw" name="getEStructuralFeature" visibility="public">
-                  <ownedParameter xmi:id="_krDoU_L5Ed-1eY2qOvQSbw" isOrdered="true" direction="return">
+                <ownedOperation xmi:type="uml:Operation" xmi:id="_krDoUvL5Ed-1eY2qOvQSbw" name="getEStructuralFeature" visibility="public">
+                  <ownedParameter xmi:type="uml:Parameter" xmi:id="_krDoU_L5Ed-1eY2qOvQSbw" isOrdered="true" direction="return">
                     <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/Ecore.metamodel.uml#EStructuralFeature"/>
                     <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_krDoVPL5Ed-1eY2qOvQSbw"/>
                   </ownedParameter>
-                  <ownedParameter xmi:id="_krDoVfL5Ed-1eY2qOvQSbw" name="featureID" isOrdered="true">
+                  <ownedParameter xmi:type="uml:Parameter" xmi:id="_krDoVfL5Ed-1eY2qOvQSbw" name="featureID" isOrdered="true">
                     <type xmi:type="uml:PrimitiveType" href="pathmap://UML_METAMODELS/Ecore.metamodel.uml#EInt"/>
                     <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_krDoVvL5Ed-1eY2qOvQSbw"/>
                   </ownedParameter>
                 </ownedOperation>
-                <ownedOperation xmi:id="_krDoV_L5Ed-1eY2qOvQSbw" name="getFeatureID" visibility="public">
-                  <ownedParameter xmi:id="_krDoWPL5Ed-1eY2qOvQSbw" isOrdered="true" direction="return">
+                <ownedOperation xmi:type="uml:Operation" xmi:id="_krDoV_L5Ed-1eY2qOvQSbw" name="getFeatureID" visibility="public">
+                  <ownedParameter xmi:type="uml:Parameter" xmi:id="_krDoWPL5Ed-1eY2qOvQSbw" isOrdered="true" direction="return">
                     <type xmi:type="uml:PrimitiveType" href="pathmap://UML_METAMODELS/Ecore.metamodel.uml#EInt"/>
                     <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_krDoWfL5Ed-1eY2qOvQSbw"/>
                   </ownedParameter>
-                  <ownedParameter xmi:id="_krDoWvL5Ed-1eY2qOvQSbw" name="feature" isOrdered="true">
+                  <ownedParameter xmi:type="uml:Parameter" xmi:id="_krDoWvL5Ed-1eY2qOvQSbw" name="feature" isOrdered="true">
                     <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/Ecore.metamodel.uml#EStructuralFeature"/>
                     <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_krDoW_L5Ed-1eY2qOvQSbw"/>
                   </ownedParameter>
                 </ownedOperation>
-                <ownedOperation xmi:id="_krDoXPL5Ed-1eY2qOvQSbw" name="getEStructuralFeature" visibility="public">
-                  <ownedParameter xmi:id="_krDoXfL5Ed-1eY2qOvQSbw" isOrdered="true" direction="return">
+                <ownedOperation xmi:type="uml:Operation" xmi:id="_krDoXPL5Ed-1eY2qOvQSbw" name="getEStructuralFeature" visibility="public">
+                  <ownedParameter xmi:type="uml:Parameter" xmi:id="_krDoXfL5Ed-1eY2qOvQSbw" isOrdered="true" direction="return">
                     <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/Ecore.metamodel.uml#EStructuralFeature"/>
                     <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_krDoXvL5Ed-1eY2qOvQSbw"/>
                   </ownedParameter>
-                  <ownedParameter xmi:id="_krDoX_L5Ed-1eY2qOvQSbw" name="featureName" isOrdered="true">
+                  <ownedParameter xmi:type="uml:Parameter" xmi:id="_krDoX_L5Ed-1eY2qOvQSbw" name="featureName" isOrdered="true">
                     <type xmi:type="uml:PrimitiveType" href="pathmap://UML_METAMODELS/Ecore.metamodel.uml#EString"/>
                     <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_krDoYPL5Ed-1eY2qOvQSbw"/>
                   </ownedParameter>
@@ -243,11 +243,11 @@ OTF_Writer_writeDefFunction (writer, streamNr, &lt;%enumSvcPrefix%>::id_&lt;%own
           </ownedTemplateSignature>
         </packagedElement>
         <packagedElement xmi:type="uml:Class" xmi:id="_aoSDwKAdEeCF0uoVQbVQRg" clientDependency="_Mgn2cKKXEeCdIOXlyrCmKQ" name="OTFTrace_vc">
-          <generalization xmi:id="_nQ6YMKAdEeCF0uoVQbVQRg" general="_aF1w4DKeEd-WprEKTCaiMA"/>
-          <ownedAttribute xmi:id="_EWKx4KD0EeCFDJJCA2W5wg" name="m_first">
+          <generalization xmi:type="uml:Generalization" xmi:id="_nQ6YMKAdEeCF0uoVQbVQRg" general="_aF1w4DKeEd-WprEKTCaiMA"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_EWKx4KD0EeCFDJJCA2W5wg" name="m_first">
             <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_Bv7l0B-VEd6nGq8wpI2tjg"/>
           </ownedAttribute>
-          <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_4LoXcKAeEeCF0uoVQbVQRg" name="&lt;%name%>" specification="_k4TsoKAeEeCF0uoVQbVQRg">
+          <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_4LoXcKAeEeCF0uoVQbVQRg" name="[name/]" specification="_k4TsoKAeEeCF0uoVQbVQRg">
             <language>C/C++</language>
             <body>// &lt;instance>_&lt;port>_&lt;operation>
 // easier: &lt;component>_&lt;port>_&lt;operation>
@@ -307,8 +307,8 @@ if (doTrace) {
             <language>C/C++</language>
             <body>m_first = true;</body>
           </ownedBehavior>
-          <ownedOperation xmi:id="_k4TsoKAeEeCF0uoVQbVQRg" name="&lt;%name%>" method="_4LoXcKAeEeCF0uoVQbVQRg"/>
-          <ownedOperation xmi:id="_rlkwoKD0EeCFDJJCA2W5wg" name="OTFTrace_vc" method="_CyKWkKD2EeCFDJJCA2W5wg"/>
+          <ownedOperation xmi:type="uml:Operation" xmi:id="_k4TsoKAeEeCF0uoVQbVQRg" name="[name/]" method="_4LoXcKAeEeCF0uoVQbVQRg"/>
+          <ownedOperation xmi:type="uml:Operation" xmi:id="_rlkwoKD0EeCFDJJCA2W5wg" name="OTFTrace_vc" method="_CyKWkKD2EeCFDJJCA2W5wg"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Dependency" xmi:id="_Mgn2cKKXEeCdIOXlyrCmKQ" name="OTFTrace_vc => BString" client="_aoSDwKAdEeCF0uoVQbVQRg">
           <supplier xmi:type="uml:Class" href="pathmap://QML_CORE/osal.uml#_0AwCEDO0EdyG-pUz-bb-Lg"/>
@@ -318,15 +318,15 @@ if (doTrace) {
       <packagedElement xmi:type="uml:Class" xmi:id="_kIcwsKbnEeC0_qP7CUZIiQ" name="IConfiguratorTrace"/>
       <packagedElement xmi:type="uml:Class" xmi:id="_nUAnQC8HEeKwPrQVP28AQw" name="IConfiguratorOTF"/>
       <packagedElement xmi:type="uml:Class" xmi:id="_MM6RwDaUEeKkY-29HX5sMQ" name="Trace" isAbstract="true">
-        <generalization xmi:id="_MM6RwTaUEeKkY-29HX5sMQ">
+        <generalization xmi:type="uml:Generalization" xmi:id="_MM6RwTaUEeKkY-29HX5sMQ">
           <general xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_Zx2ZUA1jEd6tvthBDl600Q"/>
         </generalization>
-        <ownedAttribute xmi:id="_MM6RwjaUEeKkY-29HX5sMQ" name="portName" visibility="public">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_MM6RwjaUEeKkY-29HX5sMQ" name="portName" visibility="public">
           <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_MM6RwzaUEeKkY-29HX5sMQ" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MM6RxDaUEeKkY-29HX5sMQ" value="1"/>
         </ownedAttribute>
-        <ownedAttribute xmi:id="_MM6RxTaUEeKkY-29HX5sMQ" name="instanceName">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_MM6RxTaUEeKkY-29HX5sMQ" name="instanceName">
           <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_MM6RxjaUEeKkY-29HX5sMQ" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MM6RxzaUEeKkY-29HX5sMQ" value="1"/>
@@ -334,20 +334,20 @@ if (doTrace) {
       </packagedElement>
     </packagedElement>
     <packagedElement xmi:type="uml:Package" xmi:id="_VzFlMLnhEeCxXoyQxQ47PQ" name="containerrules">
-      <ownedComment xmi:id="_aX6QECVIEeCPS8GFKAaKxw" annotatedElement="_GVZxwLdwEd-CtfrGQre34Q">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_aX6QECVIEeCPS8GFKAaKxw" annotatedElement="_GVZxwLdwEd-CtfrGQre34Q">
         <body>OTF (Open trace format) tracing mechanism</body>
       </ownedComment>
-      <ownedComment xmi:id="_z43k0ChKEeKFu939Pz1RFA" annotatedElement="_wHuA0KAdEeCF0uoVQbVQRg">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_z43k0ChKEeKFu939Pz1RFA" annotatedElement="_wHuA0KAdEeCF0uoVQbVQRg">
         <body>An OTF based trace mechanism that tracks value changes</body>
       </ownedComment>
-      <ownedComment xmi:id="_06dksChKEeKFu939Pz1RFA" annotatedElement="_I2OioPwkEeGWn-a9PUOYcA">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_06dksChKEeKFu939Pz1RFA" annotatedElement="_I2OioPwkEeGWn-a9PUOYcA">
         <body>LTTng based trace mechanism for port interception</body>
       </ownedComment>
-      <ownedComment xmi:id="_LlPEIDdMEeKDRPyuWXNFNA" annotatedElement="_If04ACqLEeKGrchWittz_g">
+      <ownedComment xmi:type="uml:Comment" xmi:id="_LlPEIDdMEeKDRPyuWXNFNA" annotatedElement="_If04ACqLEeKGrchWittz_g">
         <body>LTTng LW mechanism for operations</body>
       </ownedComment>
       <packagedElement xmi:type="uml:Class" xmi:id="_GVZxwLdwEd-CtfrGQre34Q" name="RTraceOTF">
-        <ownedAttribute xmi:id="_lBO5MPUPEeCn1-FCrfecFg" name="trace" visibility="public" type="_aF1w4DKeEd-WprEKTCaiMA">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_lBO5MPUPEeCn1-FCrfecFg" name="trace" visibility="public" type="_aF1w4DKeEd-WprEKTCaiMA">
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wNCqUPUPEeCn1-FCrfecFg" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wNIJ4PUPEeCn1-FCrfecFg" value="1"/>
           <defaultValue xmi:type="uml:LiteralString" xmi:id="_wNMbUPUPEeCn1-FCrfecFg">
@@ -356,7 +356,7 @@ if (doTrace) {
         </ownedAttribute>
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_wHuA0KAdEeCF0uoVQbVQRg" name="RTraceOTF_VC">
-        <ownedAttribute xmi:id="_pm5cwPUPEeCn1-FCrfecFg" name="traceVC" visibility="public" type="_aoSDwKAdEeCF0uoVQbVQRg">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_pm5cwPUPEeCn1-FCrfecFg" name="traceVC" visibility="public" type="_aoSDwKAdEeCF0uoVQbVQRg">
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yevnMPUPEeCn1-FCrfecFg" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yez4oPUPEeCn1-FCrfecFg" value="1"/>
           <defaultValue xmi:type="uml:LiteralString" xmi:id="_ye3jAPUPEeCn1-FCrfecFg">
@@ -365,7 +365,7 @@ if (doTrace) {
         </ownedAttribute>
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_I2OioPwkEeGWn-a9PUOYcA" name="RTraceLTTNG">
-        <ownedAttribute xmi:id="_d7If0PwkEeGWn-a9PUOYcA" name="interceptor" visibility="public" type="_pwl_MPxWEeGOK9t90vpALA">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_d7If0PwkEeGWn-a9PUOYcA" name="interceptor" visibility="public" type="_pwl_MPxWEeGOK9t90vpALA">
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gYc20PwkEeGWn-a9PUOYcA" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gZTLYPwkEeGWn-a9PUOYcA" value="1"/>
           <defaultValue xmi:type="uml:LiteralString" xmi:id="_gZWOsPwkEeGWn-a9PUOYcA">
@@ -374,14 +374,14 @@ if (doTrace) {
         </ownedAttribute>
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_vt7dACdbEeKGdt7FoegMYA" name="Copy_Of_RTraceLTTNG">
-        <ownedAttribute xmi:id="_vt7dASdbEeKGdt7FoegMYA" name="interceptor" visibility="public" type="_pwl_MPxWEeGOK9t90vpALA">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_vt7dASdbEeKGdt7FoegMYA" name="interceptor" visibility="public" type="_pwl_MPxWEeGOK9t90vpALA">
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_vt7dAidbEeKGdt7FoegMYA" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vt7dAydbEeKGdt7FoegMYA" value="1"/>
           <defaultValue xmi:type="uml:LiteralString" xmi:id="_vt7dBCdbEeKGdt7FoegMYA">
             <value xsi:nil="true"/>
           </defaultValue>
         </ownedAttribute>
-        <ownedAttribute xmi:id="_vt7dBSdbEeKGdt7FoegMYA" name="tp" visibility="public" type="_rGPjgPxWEeGOK9t90vpALA">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_vt7dBSdbEeKGdt7FoegMYA" name="tp" visibility="public" type="_rGPjgPxWEeGOK9t90vpALA">
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_vt7dBidbEeKGdt7FoegMYA" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vt7dBydbEeKGdt7FoegMYA" value="1"/>
           <defaultValue xmi:type="uml:LiteralString" xmi:id="_vt7dCCdbEeKGdt7FoegMYA">
@@ -390,7 +390,7 @@ if (doTrace) {
         </ownedAttribute>
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_If04ACqLEeKGrchWittz_g" clientDependency="_riv0oC5vEeKMZ5P9cEChlg" name="LTTngLWRule">
-        <ownedAttribute xmi:id="_Avfe8C8PEeKVAPO2lpiVnA" name="instanceName" visibility="public">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_Avfe8C8PEeKVAPO2lpiVnA" name="instanceName" visibility="public">
           <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_BuA8sC8PEeKVAPO2lpiVnA" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_BuFOIC8PEeKVAPO2lpiVnA" value="1"/>
@@ -406,14 +406,14 @@ if (doTrace) {
 [operation.invokeTP()/]
 [/template]</body>
         </ownedBehavior>
-        <ownedOperation xmi:id="_eZ1RMCqLEeKGrchWittz_g" name="interceptOperation" method="_DGqhEC2jEeKEc8wNVBgHJg"/>
+        <ownedOperation xmi:type="uml:Operation" xmi:id="_eZ1RMCqLEeKGrchWittz_g" name="interceptOperation" method="_DGqhEC2jEeKEc8wNVBgHJg"/>
       </packagedElement>
       <packagedElement xmi:type="uml:Dependency" xmi:id="_riv0oC5vEeKMZ5P9cEChlg" name="Dependency1" client="_If04ACqLEeKGrchWittz_g" supplier="_rGPjgPxWEeGOK9t90vpALA"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Package" xmi:id="_QOOpsPzOEeGKDvxFM1SZ_g" name="traceExtension">
       <packagedElement xmi:type="uml:Package" xmi:id="_QApWIPzNEeGKDvxFM1SZ_g" name="lttng">
-        <packageMerge xmi:id="_kGXHMPzNEeGKDvxFM1SZ_g">
-          <mergedPackage href="pathmap://QML_CORE/core.uml#_m7SIwOUYEd-P08Bciq_LqQ"/>
+        <packageMerge xmi:type="uml:PackageMerge" xmi:id="_kGXHMPzNEeGKDvxFM1SZ_g">
+          <mergedPackage xmi:type="uml:Package" href="pathmap://QML_CORE/core.uml#_m7SIwOUYEd-P08Bciq_LqQ"/>
         </packageMerge>
         <packagedElement xmi:type="uml:Class" xmi:id="_rGPjgPxWEeGOK9t90vpALA" name="LTTngClassTP"/>
       </packagedElement>
@@ -424,22 +424,22 @@ if (doTrace) {
           <supplier xmi:type="uml:Class" href="pathmap://QML_CORE/osal.uml#_-HeCsDj_Edy0Rd6V_tf1-Q"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Class" xmi:id="_apuYoDNwEd-1k-POY2IaLg" clientDependency="_UcPagD1nEd-Bk-AHd6yyoA _7uQr8D4OEeC-VMxjm_qUAg" name="TraceInit">
-          <generalization xmi:id="_9zJj0DguEd-9wq2wHPy3lw">
+          <generalization xmi:type="uml:Generalization" xmi:id="_9zJj0DguEd-9wq2wHPy3lw">
             <general xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_-WNegNtxEd6nqsBVkgJEEA"/>
           </generalization>
-          <ownedAttribute xmi:id="_vYRuQDj1Ed-nsvkE2JvSTg" name="writer" isStatic="true" type="_W0t44Dj1Ed-nsvkE2JvSTg" isUnique="false" aggregation="shared"/>
-          <ownedAttribute xmi:id="_ZZ8mwDwLEd-CbfVdCYNz6Q" name="manager" isStatic="true" type="_LjsBkDwLEd-CbfVdCYNz6Q" isUnique="false" aggregation="shared"/>
-          <ownedAttribute xmi:id="_28RZED4NEeC-VMxjm_qUAg" name="streamNr" isStatic="true">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_vYRuQDj1Ed-nsvkE2JvSTg" name="writer" isStatic="true" type="_W0t44Dj1Ed-nsvkE2JvSTg" isUnique="false" aggregation="shared"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_ZZ8mwDwLEd-CbfVdCYNz6Q" name="manager" isStatic="true" type="_LjsBkDwLEd-CbfVdCYNz6Q" isUnique="false" aggregation="shared"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_28RZED4NEeC-VMxjm_qUAg" name="streamNr" isStatic="true">
             <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
           </ownedAttribute>
-          <ownedAttribute xmi:id="_cy5msJ6oEeCNsP1Kjt4f_w" name="sema" isStatic="true">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_cy5msJ6oEeCNsP1Kjt4f_w" name="sema" isStatic="true">
             <type xmi:type="uml:Class" href="pathmap://QML_CORE/osal.uml#_D8njME_gEdy2tpS719xBwQ"/>
             <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_czA7cJ6oEeCNsP1Kjt4f_w" value="1"/>
             <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_czCJkJ6oEeCNsP1Kjt4f_w" value="1"/>
           </ownedAttribute>
-          <interfaceRealization xmi:id="_UcPagD1nEd-Bk-AHd6yyoA" name="derived realization of ILifeCycle" client="_apuYoDNwEd-1k-POY2IaLg">
-            <supplier xmi:type="uml:Interface" href="pathmap://QML_CORE/SystemInterfaces.uml#_T3li0Dz6Ed-v9PxuTj6Elw"/>
-            <contract href="pathmap://QML_CORE/SystemInterfaces.uml#_T3li0Dz6Ed-v9PxuTj6Elw"/>
+          <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_UcPagD1nEd-Bk-AHd6yyoA" name="derived realization of ILifeCycle" client="_apuYoDNwEd-1k-POY2IaLg">
+            <supplier xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_T3li0Dz6Ed-v9PxuTj6Elw"/>
+            <contract xmi:type="uml:Interface" href="pathmap://QML_CORE/sysinterfaces.uml#_T3li0Dz6Ed-v9PxuTj6Elw"/>
           </interfaceRealization>
           <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_ILWGsDgvEd-9wq2wHPy3lw" name="activate" specification="_Ucl_0D1nEd-Bk-AHd6yyoA">
             <language>C/C++</language>
@@ -520,8 +520,8 @@ return processID;</body>
             <language>C/C++</language>
             <body>sema.post();</body>
           </ownedBehavior>
-          <ownedOperation xmi:id="_RNVZoDj1Ed-nsvkE2JvSTg" name="getWriter" isStatic="true" method="_uUZ2cDj1Ed-nsvkE2JvSTg">
-            <ownedParameter xmi:id="_v6J20Dj2Ed-nsvkE2JvSTg" name="ret" type="_W0t44Dj1Ed-nsvkE2JvSTg" direction="return">
+          <ownedOperation xmi:type="uml:Operation" xmi:id="_RNVZoDj1Ed-nsvkE2JvSTg" name="getWriter" isStatic="true" method="_uUZ2cDj1Ed-nsvkE2JvSTg">
+            <ownedParameter xmi:type="uml:Parameter" xmi:id="_v6J20Dj2Ed-nsvkE2JvSTg" name="ret" type="_W0t44Dj1Ed-nsvkE2JvSTg" direction="return">
               <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_zsxM0Dj2Ed-nsvkE2JvSTg" value="1"/>
               <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_zsya8Dj2Ed-nsvkE2JvSTg" value="1"/>
               <defaultValue xmi:type="uml:LiteralString" xmi:id="_zszCADj2Ed-nsvkE2JvSTg">
@@ -529,23 +529,23 @@ return processID;</body>
               </defaultValue>
             </ownedParameter>
           </ownedOperation>
-          <ownedOperation xmi:id="_Ucl_0D1nEd-Bk-AHd6yyoA" name="activate" method="_ILWGsDgvEd-9wq2wHPy3lw"/>
-          <ownedOperation xmi:id="_UdpIsD1nEd-Bk-AHd6yyoA" name="deactivate" method="_2f_-UD1oEd-Bk-AHd6yyoA"/>
-          <ownedOperation xmi:id="_MR0d4ChjEeC5Ga5kAgjl0g" name="TraceInit" method="_W9k18ChjEeC5Ga5kAgjl0g"/>
-          <ownedOperation xmi:id="_uegYAD4MEeC-VMxjm_qUAg" name="getProcessID" isStatic="true" method="_g2IBUD4NEeC-VMxjm_qUAg">
-            <ownedParameter xmi:id="_1PmRUD4MEeC-VMxjm_qUAg" name="ret" direction="return">
+          <ownedOperation xmi:type="uml:Operation" xmi:id="_Ucl_0D1nEd-Bk-AHd6yyoA" name="activate" method="_ILWGsDgvEd-9wq2wHPy3lw"/>
+          <ownedOperation xmi:type="uml:Operation" xmi:id="_UdpIsD1nEd-Bk-AHd6yyoA" name="deactivate" method="_2f_-UD1oEd-Bk-AHd6yyoA"/>
+          <ownedOperation xmi:type="uml:Operation" xmi:id="_MR0d4ChjEeC5Ga5kAgjl0g" name="TraceInit" method="_W9k18ChjEeC5Ga5kAgjl0g"/>
+          <ownedOperation xmi:type="uml:Operation" xmi:id="_uegYAD4MEeC-VMxjm_qUAg" name="getProcessID" isStatic="true" method="_g2IBUD4NEeC-VMxjm_qUAg">
+            <ownedParameter xmi:type="uml:Parameter" xmi:id="_1PmRUD4MEeC-VMxjm_qUAg" name="ret" direction="return">
               <type xmi:type="uml:PrimitiveType" href="pathmap://QML_CORE/corba.uml#_FxVBkB6LEd6Nj_33Eb_pxw"/>
             </ownedParameter>
           </ownedOperation>
-          <ownedOperation xmi:id="_VIPBEJ6oEeCNsP1Kjt4f_w" name="wait" isStatic="true" method="_KUVkMJ6pEeCNsP1Kjt4f_w"/>
-          <ownedOperation xmi:id="_Wm5-gJ6oEeCNsP1Kjt4f_w" name="post" isStatic="true" method="_LNI0cJ6pEeCNsP1Kjt4f_w"/>
+          <ownedOperation xmi:type="uml:Operation" xmi:id="_VIPBEJ6oEeCNsP1Kjt4f_w" name="wait" isStatic="true" method="_KUVkMJ6pEeCNsP1Kjt4f_w"/>
+          <ownedOperation xmi:type="uml:Operation" xmi:id="_Wm5-gJ6oEeCNsP1Kjt4f_w" name="post" isStatic="true" method="_LNI0cJ6pEeCNsP1Kjt4f_w"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Package" xmi:id="_IewAUDguEd-9wq2wHPy3lw" name="externtypes">
           <packagedElement xmi:type="uml:Class" xmi:id="_W0t44Dj1Ed-nsvkE2JvSTg" name="OTF_Writer"/>
           <packagedElement xmi:type="uml:Class" xmi:id="_LjsBkDwLEd-CbfVdCYNz6Q" name="OTF_FileManager"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Package" xmi:id="_L90lEDYGEd-JF_b-mKqY4g" name="TraceTesting">
-          <ownedTemplateSignature xmi:id="_NJOoQDYGEd-JF_b-mKqY4g" parameter="_m8qNQDYKEd-JF_b-mKqY4g">
+          <ownedTemplateSignature xmi:type="uml:TemplateSignature" xmi:id="_NJOoQDYGEd-JF_b-mKqY4g" parameter="_m8qNQDYKEd-JF_b-mKqY4g">
             <ownedParameter xmi:type="uml:ClassifierTemplateParameter" xmi:id="_m8qNQDYKEd-JF_b-mKqY4g" parameteredElement="_pfAOMDYKEd-JF_b-mKqY4g">
               <ownedParameteredElement xmi:type="uml:Enumeration" xmi:id="_pfAOMDYKEd-JF_b-mKqY4g" name="ParamEnumeration" templateParameter="_m8qNQDYKEd-JF_b-mKqY4g"/>
             </ownedParameter>
@@ -558,7 +558,7 @@ return processID;</body>
 	OTF_Writer_writeDefFunction (writer, 0, &lt;%name%>, &quot;&lt;%name%>&quot;, 0, 0);
 &lt;%}%></body>
             </ownedBehavior>
-            <ownedOperation xmi:id="_QNXx4jYKEd-JF_b-mKqY4g" name="initDefs" isStatic="true" method="_QNXx4TYKEd-JF_b-mKqY4g"/>
+            <ownedOperation xmi:type="uml:Operation" xmi:id="_QNXx4jYKEd-JF_b-mKqY4g" name="initDefs" isStatic="true" method="_QNXx4TYKEd-JF_b-mKqY4g"/>
           </packagedElement>
         </packagedElement>
       </packagedElement>
@@ -576,26 +576,26 @@ return processID;</body>
             <language>C/C++</language>
             <body>TRACEPOINT_EVENT([tpName/], destroyClass, [clazz.qualifiedName /])</body>
           </ownedBehavior>
-          <ownedOperation xmi:id="_UvQpMCmiEeKp-eCvZDLsaw" name="LTTngCreateDestroy" method="__CHDcCmlEeKp-eCvZDLsaw"/>
-          <ownedOperation xmi:id="_VUW6UCmiEeKp-eCvZDLsaw" name="LTTngCreateDestroy" method="_B-fVACmmEeKp-eCvZDLsaw"/>
+          <ownedOperation xmi:type="uml:Operation" xmi:id="_UvQpMCmiEeKp-eCvZDLsaw" name="LTTngCreateDestroy" method="__CHDcCmlEeKp-eCvZDLsaw"/>
+          <ownedOperation xmi:type="uml:Operation" xmi:id="_VUW6UCmiEeKp-eCvZDLsaw" name="LTTngCreateDestroy" method="_B-fVACmmEeKp-eCvZDLsaw"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Class" xmi:id="_C4FREDV7EeKGAYOVxzQeAg" name="InitLttng"/>
       </packagedElement>
     </packagedElement>
     <packagedElement xmi:type="uml:Package" xmi:id="_HkxCkDY_EeKxVvAop17bHw" name="traceInterceptorPort">
-      <packageMerge xmi:id="_M9DV4DY_EeKxVvAop17bHw">
-        <mergedPackage href="pathmap://QML_CORE/core.uml#_gEZXADY7EeKvFqG4YPX3sg"/>
+      <packageMerge xmi:type="uml:PackageMerge" xmi:id="_M9DV4DY_EeKxVvAop17bHw">
+        <mergedPackage xmi:type="uml:Package" href="pathmap://QML_CORE/core.uml#_gEZXADY7EeKvFqG4YPX3sg"/>
       </packageMerge>
       <packagedElement xmi:type="uml:Package" xmi:id="_5gDNYPwkEeGWn-a9PUOYcA" name="lttng">
-        <ownedComment xmi:id="_r8PXYPxWEeGOK9t90vpALA" annotatedElement="_pwl_MPxWEeGOK9t90vpALA">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_r8PXYPxWEeGOK9t90vpALA" annotatedElement="_pwl_MPxWEeGOK9t90vpALA">
           <body>Interceptor</body>
         </ownedComment>
-        <ownedComment xmi:id="_ttvxQPxWEeGOK9t90vpALA" annotatedElement="_rGPjgPxWEeGOK9t90vpALA">
+        <ownedComment xmi:type="uml:Comment" xmi:id="_ttvxQPxWEeGOK9t90vpALA" annotatedElement="_rGPjgPxWEeGOK9t90vpALA">
           <body>Trace Provider
 </body>
         </ownedComment>
         <packagedElement xmi:type="uml:Class" xmi:id="_pwl_MPxWEeGOK9t90vpALA" clientDependency="_BV2G4PzTEeGKDvxFM1SZ_g _9ygUUDHKEeKt1a2SZnJmwg _c0nqkDWGEeKGAYOVxzQeAg" name="LTTngInterceptor">
-          <generalization xmi:id="_1963sPxWEeGOK9t90vpALA" general="_dcP9gDaSEeKxVvAop17bHw"/>
+          <generalization xmi:type="uml:Generalization" xmi:id="_1963sPxWEeGOK9t90vpALA" general="_dcP9gDaSEeKxVvAop17bHw"/>
           <ownedBehavior xmi:type="uml:OpaqueBehavior" xmi:id="_qLhLMPxXEeGOK9t90vpALA" name="[name/]" specification="_YU5H4PxXEeGOK9t90vpALA">
             <language>C/C++</language>
             <body>[import org::eclipse::papyrus::qompass::designer::core::acceleo::utils_cpp/]
@@ -609,7 +609,7 @@ return processID;</body>
 [if not (type = null)]return [/if]rconn->[operation.cppCall()/];
 [/template]</body>
           </ownedBehavior>
-          <ownedOperation xmi:id="_YU5H4PxXEeGOK9t90vpALA" name="[name/]" method="_qLhLMPxXEeGOK9t90vpALA"/>
+          <ownedOperation xmi:type="uml:Operation" xmi:id="_YU5H4PxXEeGOK9t90vpALA" name="[name/]" method="_qLhLMPxXEeGOK9t90vpALA"/>
         </packagedElement>
         <packagedElement xmi:type="uml:Usage" xmi:id="_BV2G4PzTEeGKDvxFM1SZ_g" name="Usage1" client="_pwl_MPxWEeGOK9t90vpALA" supplier="_v-VBcPzSEeGKDvxFM1SZ_g"/>
         <packagedElement xmi:type="uml:Class" xmi:id="_gveqADHKEeKt1a2SZnJmwg" name="LTTngIntfTP"/>
@@ -617,117 +617,120 @@ return processID;</body>
         <packagedElement xmi:type="uml:Dependency" xmi:id="_c0nqkDWGEeKGAYOVxzQeAg" name="Dependency2" client="_pwl_MPxWEeGOK9t90vpALA" supplier="_C4FREDV7EeKGAYOVxzQeAg"/>
       </packagedElement>
       <packagedElement xmi:type="uml:Class" xmi:id="_dcP9gDaSEeKxVvAop17bHw" name="TracePort" isAbstract="true">
-        <generalization xmi:id="_dcP9gTaSEeKxVvAop17bHw">
+        <generalization xmi:type="uml:Generalization" xmi:id="_dcP9gTaSEeKxVvAop17bHw">
           <general xmi:type="uml:Class" href="pathmap://QML_CORE/core.uml#_Zx2ZUA1jEd6tvthBDl600Q"/>
         </generalization>
-        <ownedAttribute xmi:id="_dcP9gjaSEeKxVvAop17bHw" name="portName" visibility="public">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_dcP9gjaSEeKxVvAop17bHw" name="portName" visibility="public">
           <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_dcP9gzaSEeKxVvAop17bHw" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dcP9hDaSEeKxVvAop17bHw" value="1"/>
         </ownedAttribute>
-        <ownedAttribute xmi:id="_dcP9hTaSEeKxVvAop17bHw" name="instanceName">
+        <ownedAttribute xmi:type="uml:Property" xmi:id="_dcP9hTaSEeKxVvAop17bHw" name="instanceName">
           <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_dcP9hjaSEeKxVvAop17bHw" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dcP9hzaSEeKxVvAop17bHw" value="1"/>
         </ownedAttribute>
       </packagedElement>
     </packagedElement>
-    <profileApplication xmi:id="_H_B8gDKeEd-WprEKTCaiMA">
-      <eAnnotations xmi:id="_H_DxsDKeEd-WprEKTCaiMA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_H_B8gDKeEd-WprEKTCaiMA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_H_DxsDKeEd-WprEKTCaiMA" source="http://www.eclipse.org/uml2/2.0.0/UML">
         <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2#/"/>
       </eAnnotations>
-      <appliedProfile href="pathmap://UML_PROFILES/StandardL2.profile.uml#_0"/>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://UML_PROFILES/StandardL2.profile.uml#_0"/>
     </profileApplication>
-    <profileApplication xmi:id="_-DLL0DKnEd-WprEKTCaiMA">
-      <eAnnotations xmi:id="_-DXZEDKnEd-WprEKTCaiMA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_-DLL0DKnEd-WprEKTCaiMA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-DXZEDKnEd-WprEKTCaiMA" source="http://www.eclipse.org/uml2/2.0.0/UML">
         <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/FCM/1#/"/>
       </eAnnotations>
-      <appliedProfile href="pathmap://FCM_PROFILES/FCM.profile.uml#_5mvT0MtjEd2H_o0jIC6qDQ"/>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://FCM_PROFILES/FCM.profile.uml#_5mvT0MtjEd2H_o0jIC6qDQ"/>
     </profileApplication>
-    <profileApplication xmi:id="_N6l98DguEd-9wq2wHPy3lw">
-      <eAnnotations xmi:id="_N6vH4DguEd-9wq2wHPy3lw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_N6l98DguEd-9wq2wHPy3lw">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_N6vH4DguEd-9wq2wHPy3lw" source="http://www.eclipse.org/uml2/2.0.0/UML">
         <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/C_Cpp/1#/"/>
       </eAnnotations>
-      <appliedProfile href="pathmap://PapyrusC_Cpp_PROFILES/C_Cpp.profile.uml#_j9REUByGEduN1bTiWJ0lyw"/>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://PapyrusC_Cpp_PROFILES/C_Cpp.profile.uml#_j9REUByGEduN1bTiWJ0lyw"/>
     </profileApplication>
   </uml:Model>
   <l2:ModelLibrary xmi:id="_ICaAoDKeEd-WprEKTCaiMA" base_Package="_H-ZqYDKeEd-WprEKTCaiMA"/>
   <FCM:Template xmi:id="_bKc-kDNZEd-0bO2vHbUkEA" base_Element="_aF1w7zKeEd-WprEKTCaiMA" kind="LoopOperations">
+    <helper xmi:type="FCM:BindingHelper" href="pathmap://QML_CORE/core.uml#_nLe_sHJDEeOMF7YEvnQt5g"/>
     <formalParam xmi:type="uml:Interface" href="pathmap://QML_CORE/core.uml#_ZzlzMPfBEd2TbIfwytOyPA"/>
     <templateParam xmi:type="uml:Interface" href="pathmap://QML_CORE/core.uml#_ZzlzMPfBEd2TbIfwytOyPA"/>
   </FCM:Template>
   <FCM:DerivedElement xmi:id="_Adb_0DgvEd-9wq2wHPy3lw">
-    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/SystemInterfaces.uml#_C9IK4JsqEd61Eo3nmu3JhQ"/>
+    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_C9IK4JsqEd61Eo3nmu3JhQ"/>
   </FCM:DerivedElement>
   <FCM:Singleton xmi:id="_AdBwIDgvEd-9wq2wHPy3lw" base_Class="_apuYoDNwEd-1k-POY2IaLg"/>
   <C_Cpp:Include xmi:id="_ZWEQwDj0Ed-nsvkE2JvSTg" body="#include &lt;otflib/otf.h>" base_class="_aF1w4DKeEd-WprEKTCaiMA"/>
   <C_Cpp:External xmi:id="_ZVArYDj1Ed-nsvkE2JvSTg" name="otflib/OTF_Writer.h" base_class="_W0t44Dj1Ed-nsvkE2JvSTg"/>
   <C_Cpp:Ptr xmi:id="_9n7OYDj2Ed-nsvkE2JvSTg" base_parameter="_v6J20Dj2Ed-nsvkE2JvSTg"/>
   <FCM:DerivedElement xmi:id="_UdG9MD1nEd-Bk-AHd6yyoA" base_Element="_Ucl_0D1nEd-Bk-AHd6yyoA">
-    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/SystemInterfaces.uml#_WHyq4Dz6Ed-v9PxuTj6Elw"/>
+    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_WHyq4Dz6Ed-v9PxuTj6Elw"/>
   </FCM:DerivedElement>
   <FCM:DerivedElement xmi:id="_UeZ9sD1nEd-Bk-AHd6yyoA" base_Element="_UdpIsD1nEd-Bk-AHd6yyoA">
-    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/SystemInterfaces.uml#_W7YrADz6Ed-v9PxuTj6Elw"/>
+    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_W7YrADz6Ed-v9PxuTj6Elw"/>
   </FCM:DerivedElement>
   <C_Cpp:Virtual xmi:id="___fNAD1nEd-Bk-AHd6yyoA" base_operation="_UdpIsD1nEd-Bk-AHd6yyoA"/>
   <C_Cpp:Virtual xmi:id="_AHNwMD1pEd-Bk-AHd6yyoA" base_operation="_Ucl_0D1nEd-Bk-AHd6yyoA"/>
   <FCM:DerivedElement xmi:id="_Q44J0EI7Ed-BYfDlJlYJUQ" base_Element="_Ucl_0D1nEd-Bk-AHd6yyoA">
-    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/SystemInterfaces.uml#_WHyq4Dz6Ed-v9PxuTj6Elw"/>
+    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_WHyq4Dz6Ed-v9PxuTj6Elw"/>
   </FCM:DerivedElement>
   <FCM:DerivedElement xmi:id="_Q5EXEEI7Ed-BYfDlJlYJUQ" base_Element="_UdpIsD1nEd-Bk-AHd6yyoA">
-    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/SystemInterfaces.uml#_W7YrADz6Ed-v9PxuTj6Elw"/>
+    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_W7YrADz6Ed-v9PxuTj6Elw"/>
   </FCM:DerivedElement>
   <FCM:DerivedElement xmi:id="_6f5KEEJEEd-Ps4Bfh0j9LQ" base_Element="_Ucl_0D1nEd-Bk-AHd6yyoA">
-    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/SystemInterfaces.uml#_WHyq4Dz6Ed-v9PxuTj6Elw"/>
+    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_WHyq4Dz6Ed-v9PxuTj6Elw"/>
   </FCM:DerivedElement>
   <FCM:DerivedElement xmi:id="_6gni0EJEEd-Ps4Bfh0j9LQ" base_Element="_UdpIsD1nEd-Bk-AHd6yyoA">
-    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/SystemInterfaces.uml#_W7YrADz6Ed-v9PxuTj6Elw"/>
+    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_W7YrADz6Ed-v9PxuTj6Elw"/>
   </FCM:DerivedElement>
   <FCM:DerivedElement xmi:id="__8ZM4EPiEd-NwdL0D_IutQ" base_Element="_Ucl_0D1nEd-Bk-AHd6yyoA">
-    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/SystemInterfaces.uml#_WHyq4Dz6Ed-v9PxuTj6Elw"/>
+    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_WHyq4Dz6Ed-v9PxuTj6Elw"/>
   </FCM:DerivedElement>
   <FCM:DerivedElement xmi:id="__8bpIEPiEd-NwdL0D_IutQ" base_Element="_UdpIsD1nEd-Bk-AHd6yyoA">
-    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/SystemInterfaces.uml#_W7YrADz6Ed-v9PxuTj6Elw"/>
+    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_W7YrADz6Ed-v9PxuTj6Elw"/>
   </FCM:DerivedElement>
   <FCM:DerivedElement xmi:id="_Md_SIEQYEd-RDttIPD8NUg" base_Element="_Ucl_0D1nEd-Bk-AHd6yyoA">
-    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/SystemInterfaces.uml#_WHyq4Dz6Ed-v9PxuTj6Elw"/>
+    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_WHyq4Dz6Ed-v9PxuTj6Elw"/>
   </FCM:DerivedElement>
   <FCM:DerivedElement xmi:id="_MeJqMEQYEd-RDttIPD8NUg" base_Element="_UdpIsD1nEd-Bk-AHd6yyoA">
-    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/SystemInterfaces.uml#_W7YrADz6Ed-v9PxuTj6Elw"/>
+    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_W7YrADz6Ed-v9PxuTj6Elw"/>
   </FCM:DerivedElement>
   <FCM:DerivedElement xmi:id="_ibefIFKoEd-OfYmxqPWG5g" base_Element="_Ucl_0D1nEd-Bk-AHd6yyoA">
-    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/SystemInterfaces.uml#_WHyq4Dz6Ed-v9PxuTj6Elw"/>
+    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_WHyq4Dz6Ed-v9PxuTj6Elw"/>
   </FCM:DerivedElement>
   <FCM:DerivedElement xmi:id="_ibg7YFKoEd-OfYmxqPWG5g" base_Element="_UdpIsD1nEd-Bk-AHd6yyoA">
-    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/SystemInterfaces.uml#_W7YrADz6Ed-v9PxuTj6Elw"/>
+    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_W7YrADz6Ed-v9PxuTj6Elw"/>
   </FCM:DerivedElement>
   <FCM:DerivedElement xmi:id="_KshoEFmvEd-9TNLvplUFDQ" base_Element="_Ucl_0D1nEd-Bk-AHd6yyoA">
-    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/SystemInterfaces.uml#_WHyq4Dz6Ed-v9PxuTj6Elw"/>
+    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_WHyq4Dz6Ed-v9PxuTj6Elw"/>
   </FCM:DerivedElement>
   <FCM:DerivedElement xmi:id="_KskrYFmvEd-9TNLvplUFDQ" base_Element="_UdpIsD1nEd-Bk-AHd6yyoA">
-    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/SystemInterfaces.uml#_W7YrADz6Ed-v9PxuTj6Elw"/>
+    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_W7YrADz6Ed-v9PxuTj6Elw"/>
   </FCM:DerivedElement>
   <FCM:DerivedElement xmi:id="_JK7ncF2qEd-12d_h0i1xhQ" base_Element="_Ucl_0D1nEd-Bk-AHd6yyoA">
-    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/SystemInterfaces.uml#_WHyq4Dz6Ed-v9PxuTj6Elw"/>
+    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_WHyq4Dz6Ed-v9PxuTj6Elw"/>
   </FCM:DerivedElement>
   <FCM:DerivedElement xmi:id="_JK-qwF2qEd-12d_h0i1xhQ" base_Element="_UdpIsD1nEd-Bk-AHd6yyoA">
-    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/SystemInterfaces.uml#_W7YrADz6Ed-v9PxuTj6Elw"/>
+    <source xmi:type="uml:Operation" href="pathmap://QML_CORE/sysinterfaces.uml#_W7YrADz6Ed-v9PxuTj6Elw"/>
   </FCM:DerivedElement>
   <C_Cpp:ExternLibrary xmi:id="_Sv6AMIKiEd-XA4A2KZ9L7Q" base_Package="_IewAUDguEd-9wq2wHPy3lw">
-    <libs>otf</libs>
     <libPaths>/OTF-1.5/otflib/.libs</libPaths>
+    <libs>otf</libs>
     <includes>/OTF-1.5</includes>
     <includes>otflib/includes.h</includes>
   </C_Cpp:ExternLibrary>
   <FCM:ContainerRule xmi:id="_ISo6gLdwEd-CtfrGQre34Q" base_Class="_GVZxwLdwEd-CtfrGQre34Q" extensionKind="InterceptAllPorts" interceptor="_35od4DKrEd-z5o2wSoJ16A">
-    <forConfig href="pathmap://QML_CORE/core.uml#_u6LqoH7eEd-FNNgSS03RxQ"/>
+    <forConfig xmi:type="FCM:ConfigOption" href="pathmap://QML_CORE/core.uml#_u6LqoH7eEd-FNNgSS03RxQ"/>
   </FCM:ContainerRule>
   <C_Cpp:External xmi:id="_AGg3EPT8Ed-jjdbo8hMhwA" name="otflib/OTF_FileManager.h" base_class="_LjsBkDwLEd-CbfVdCYNz6Q"/>
   <C_Cpp:Include xmi:id="_mk_ccD5sEeC-VMxjm_qUAg" body="#include &lt;OS_AL/Sets/SetOf.h>&#xA;OS_AL::Sets::SetOf &lt;int> processSet;" base_class="_apuYoDNwEd-1k-POY2IaLg"/>
   <FCM:ContainerRule xmi:id="_6FqQoKAdEeCF0uoVQbVQRg" base_Class="_wHuA0KAdEeCF0uoVQbVQRg" extensionKind="InterceptAllPorts" interceptor="_JvP0oKAeEeCF0uoVQbVQRg" propagate="true">
-    <forConfig href="pathmap://QML_CORE/core.uml#_u6LqoH7eEd-FNNgSS03RxQ"/>
+    <forConfig xmi:type="FCM:ConfigOption" href="pathmap://QML_CORE/core.uml#_u6LqoH7eEd-FNNgSS03RxQ"/>
   </FCM:ContainerRule>
-  <FCM:Template xmi:id="_pplDQKAeEeCF0uoVQbVQRg" base_Element="_k4TsoKAeEeCF0uoVQbVQRg" kind="LoopOperations"/>
+  <FCM:Template xmi:id="_pplDQKAeEeCF0uoVQbVQRg" base_Element="_k4TsoKAeEeCF0uoVQbVQRg" kind="LoopOperations">
+    <helper xmi:type="FCM:BindingHelper" href="pathmap://QML_CORE/core.uml#_nLe_sHJDEeOMF7YEvnQt5g"/>
+  </FCM:Template>
   <FCM:InstanceConfigurator xmi:id="_nTMOYKbnEeC0_qP7CUZIiQ" base_Class="_kIcwsKbnEeC0_qP7CUZIiQ"/>
   <FCM:UseInstanceConfigurator xmi:id="_plb90KbnEeC0_qP7CUZIiQ" base_Class="_aF1w4DKeEd-WprEKTCaiMA" configurator="_nUB1YC8HEeKwPrQVP28AQw"/>
   <FCM:UseInstanceConfigurator xmi:id="_MmzO0KboEeC0_qP7CUZIiQ" base_Class="_aoSDwKAdEeCF0uoVQbVQRg" configurator="_nUB1YC8HEeKwPrQVP28AQw"/>
@@ -737,10 +740,10 @@ return processID;</body>
   <FCM:InteractionComponent xmi:id="_7J88sG6FEeGqWMX2LwdLDw" base_Class="_aF1w4DKeEd-WprEKTCaiMA"/>
   <FCM:InteractionComponent xmi:id="_-t6LoG6FEeGqWMX2LwdLDw" base_Class="_aoSDwKAdEeCF0uoVQbVQRg"/>
   <FCM:ContainerRule xmi:id="_RWQC8PwkEeGWn-a9PUOYcA" base_Class="_I2OioPwkEeGWn-a9PUOYcA">
-    <forConfig href="pathmap://QML_CORE/core.uml#_u6LqoH7eEd-FNNgSS03RxQ"/>
+    <forConfig xmi:type="FCM:ConfigOption" href="pathmap://QML_CORE/core.uml#_u6LqoH7eEd-FNNgSS03RxQ"/>
   </FCM:ContainerRule>
   <FCM:InterceptionRule xmi:id="_m-L0sPwkEeGWn-a9PUOYcA" interceptionKind="InterceptAll" base_Property="_d7If0PwkEeGWn-a9PUOYcA"/>
-  <C_Cpp:Include xmi:id="__rP4oPxWEeGOK9t90vpALA" header="[import org::eclipse::papyrus::qompass::modellibs::tracing::acceleo::traceLTTng/]&#xA;&#xA;[template public LTTngTP(clazz : Class)]&#xA;[clazz.declareTP()/]&#xA;[/template]" base_class="_rGPjgPxWEeGOK9t90vpALA" preBody="#define TRACEPOINT_CREATE_PROBES&#xA;#define TRACEPOINT_DEFINE"/>
+  <C_Cpp:Include xmi:id="__rP4oPxWEeGOK9t90vpALA" preBody="#define TRACEPOINT_CREATE_PROBES&#xA;#define TRACEPOINT_DEFINE" header="[import org::eclipse::papyrus::qompass::modellibs::tracing::acceleo::traceLTTng/]&#xA;&#xA;[template public LTTngTP(clazz : Class)]&#xA;[clazz.declareTP()/]&#xA;[/template]" base_class="_rGPjgPxWEeGOK9t90vpALA"/>
   <FCM:Template xmi:id="_bKW5IPxXEeGOK9t90vpALA" base_Element="_YU5H4PxXEeGOK9t90vpALA" kind="LoopOperations"/>
   <C_Cpp:ExternLibrary xmi:id="_t_sHUPzOEeGKDvxFM1SZ_g" base_Package="_nAkZEPzOEeGKDvxFM1SZ_g">
     <libs>lttng-ust</libs>
@@ -754,7 +757,7 @@ return processID;</body>
   <l2:Create xmi:id="_X1okQCmiEeKp-eCvZDLsaw" base_BehavioralFeature="_UvQpMCmiEeKp-eCvZDLsaw"/>
   <l2:Destroy xmi:id="_ZJYEECmiEeKp-eCvZDLsaw" base_BehavioralFeature="_VUW6UCmiEeKp-eCvZDLsaw"/>
   <FCM:ContainerRule xmi:id="_NtAukCqLEeKGrchWittz_g" base_Class="_If04ACqLEeKGrchWittz_g" kind="LightWeightOORule">
-    <forConfig href="pathmap://QML_CORE/core.uml#_u6LqoH7eEd-FNNgSS03RxQ"/>
+    <forConfig xmi:type="FCM:ConfigOption" href="pathmap://QML_CORE/core.uml#_u6LqoH7eEd-FNNgSS03RxQ"/>
   </FCM:ContainerRule>
   <FCM:Template xmi:id="_AhsuYCqMEeKGrchWittz_g" base_Element="_eZ1RMCqLEeKGrchWittz_g"/>
   <FCM:InterceptionRule xmi:id="_IN6uwC2jEeKEc8wNVBgHJg" interceptionKind="InterceptAll" base_Operation="_eZ1RMCqLEeKGrchWittz_g"/>
@@ -762,10 +765,10 @@ return processID;</body>
   <FCM:UseInstanceConfigurator xmi:id="_5FYwcC8CEeKwPrQVP28AQw" base_Class="_I2OioPwkEeGWn-a9PUOYcA" configurator="_nTMOYKbnEeC0_qP7CUZIiQ"/>
   <FCM:UseInstanceConfigurator xmi:id="_gH1RQC8DEeKwPrQVP28AQw" base_Class="_If04ACqLEeKGrchWittz_g" configurator="_nTMOYKbnEeC0_qP7CUZIiQ"/>
   <FCM:InstanceConfigurator xmi:id="_nUB1YC8HEeKwPrQVP28AQw" base_Class="_nUAnQC8HEeKwPrQVP28AQw"/>
-  <C_Cpp:Include xmi:id="_gvf4IDHKEeKt1a2SZnJmwg" header="[import org::eclipse::papyrus::qompass::modellibs::tracing::acceleo::traceLTTng/]&#xA;&#xA;[template public LTTngTP(intf : Interface)]&#xA;[intf.declareTP()/]&#xA;[/template]" base_class="_gveqADHKEeKt1a2SZnJmwg" preBody="#define TRACEPOINT_CREATE_PROBES&#xA;#define TRACEPOINT_DEFINE"/>
+  <C_Cpp:Include xmi:id="_gvf4IDHKEeKt1a2SZnJmwg" preBody="#define TRACEPOINT_CREATE_PROBES&#xA;#define TRACEPOINT_DEFINE" header="[import org::eclipse::papyrus::qompass::modellibs::tracing::acceleo::traceLTTng/]&#xA;&#xA;[template public LTTngTP(intf : Interface)]&#xA;[intf.declareTP()/]&#xA;[/template]" base_class="_gveqADHKEeKt1a2SZnJmwg"/>
   <FCM:Template xmi:id="_gvnM4DHKEeKt1a2SZnJmwg" base_Element="_gveqADHKEeKt1a2SZnJmwg"/>
   <C_Cpp:ManualGeneration xmi:id="_gvnz8DHKEeKt1a2SZnJmwg" extensionBody="c" base_Class="_gveqADHKEeKt1a2SZnJmwg"/>
   <C_Cpp:ManualGeneration xmi:id="_WUbVADV7EeKGAYOVxzQeAg" extensionBody="c" base_Class="_C4FREDV7EeKGAYOVxzQeAg"/>
-  <C_Cpp:Include xmi:id="_ZdHkQDV7EeKGAYOVxzQeAg" header="[import org::eclipse::papyrus::qompass::designer::core::acceleo::UMLTool/]&#xA;[import org::eclipse::papyrus::qompass::designer::core::acceleo::TransformationContext/]&#xA;&#xA;[template public LTTngTP(cl : Classifier)]&#xA;#include &lt;lttng/tracepoint.h>&#xA;&#xA;TRACEPOINT_MODEL_EMF_URI(UMLmodel, starting, &quot;[getSourceRoot().getURI()/]&quot;)&#xA;[/template]&#xA;" base_class="_C4FREDV7EeKGAYOVxzQeAg" preBody=""/>
+  <C_Cpp:Include xmi:id="_ZdHkQDV7EeKGAYOVxzQeAg" header="[import org::eclipse::papyrus::qompass::designer::core::acceleo::UMLTool/]&#xA;[import org::eclipse::papyrus::qompass::designer::core::acceleo::TransformationContext/]&#xA;&#xA;[template public LTTngTP(cl : Classifier)]&#xA;#include &lt;lttng/tracepoint.h>&#xA;&#xA;TRACEPOINT_MODEL_EMF_URI(UMLmodel, starting, &quot;[getSourceRoot().getURI()/]&quot;)&#xA;[/template]&#xA;" base_class="_C4FREDV7EeKGAYOVxzQeAg"/>
   <FCM:Template xmi:id="_HOvQ0DWSEeKGAYOVxzQeAg" base_Element="_C4FREDV7EeKGAYOVxzQeAg" kind="PassClassifier"/>
 </xmi:XMI>
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/plugin.xml b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/plugin.xml
index 59fc39dabaa..97a573d0cf9 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/plugin.xml
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/plugin.xml
@@ -12,7 +12,7 @@
 	<extension
       point="org.eclipse.papyrus.uml.extensionpoints.UMLLibrary">
       <library
-            iconpath="platform:/plugin/org.eclipse.papyrus.qompass.designer.core/icons/Qompass-16x16.gif"
+            iconpath="platform:/plugin/org.eclipse.papyrus.qompass.designer.ui/icons/Qompass-16x16.gif"
             name="Qompass model library: tracing"
             path="pathmap://QML_TRACE/tracing.uml"
             provider="CEA LIST">
@@ -41,7 +41,7 @@
 			category="org.eclipse.ui.Examples/org.eclipse.papyrus.qompass.designer.examples"
 			class="org.eclipse.papyrus.qompass.modellibs.tracing.ClientServerTraceTestModelWizard"
 			finalPerspective="org.eclipse.papyrus.infra.core.perspective"
-			icon="platform:/plugin/org.eclipse.papyrus.qompass.designer.core/icons/Qompass-16x16.gif"
+			icon="platform:/plugin/org.eclipse.papyrus.qompass.designer.ui/icons/Qompass-16x16.gif"
 			id="org.eclipse.papyrus.qompass.modellibs.tracing.newb.ClientServerTraceTest"
 			name="Qompass client/server example with tracing">
 			<selection class="org.eclipse.core.resources.IResource"/>
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/ClientServerTraceTestModelWizard.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/ClientServerTraceTestModelWizard.java
index 44b716be54a..c3274d24415 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/ClientServerTraceTestModelWizard.java
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/ClientServerTraceTestModelWizard.java
@@ -6,6 +6,6 @@ import org.eclipse.papyrus.qompass.modellibs.core.ModelCopyWizard;
 public class ClientServerTraceTestModelWizard extends ModelCopyWizard {
 	
 	public ClientServerTraceTestModelWizard () {
-		modelName = "ClientServerTraceTest";
+		modelName = "ClientServerTraceTest"; //$NON-NLS-1$
 	}
 }
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/IConfiguratorOTF.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/IConfiguratorOTF.java
index 6dae4aa1244..3ebfe5a3d26 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/IConfiguratorOTF.java
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/IConfiguratorOTF.java
@@ -4,50 +4,55 @@ import org.eclipse.papyrus.qompass.designer.core.PortUtils;
 import org.eclipse.papyrus.qompass.designer.core.Utils;
 import org.eclipse.papyrus.qompass.designer.core.deployment.DepPlanUtils;
 import org.eclipse.papyrus.qompass.designer.core.extensions.IInstanceConfigurator;
-import org.eclipse.papyrus.qompass.designer.core.transformations.ContainerContext;
+import org.eclipse.papyrus.qompass.designer.core.transformations.ContainerTrafo;
 import org.eclipse.uml2.uml.InstanceSpecification;
 import org.eclipse.uml2.uml.Interface;
 import org.eclipse.uml2.uml.Operation;
+import org.eclipse.uml2.uml.Port;
 import org.eclipse.uml2.uml.Property;
 
 
 public class IConfiguratorOTF implements IInstanceConfigurator {
 
-	static final String PROP_PORT_NAME = "portName";
-
-	static final String PROP_INSTANCE_NAME = "instanceName";
+	static final String PROP_PORT_NAME = "portName"; //$NON-NLS-1$
 
+	static final String PROP_INSTANCE_NAME = "instanceName"; //$NON-NLS-1$
+	
 	/**
 	 * Configure the passed trace instance
 	 * 
 	 * @see org.eclipse.papyrus.qompass.designer.gentools.core.extensions.IInstanceConfigurator
 	 */
-	public void configureInstance(InstanceSpecification instance, Property componentPart, ContainerContext context) {
+	public void configureInstance(InstanceSpecification instance, Property componentPart, InstanceSpecification parentInstance) {
 		// The tracing code needs informations about the component instance and port.
 
-		DepPlanUtils.configureProperty(instance, PROP_INSTANCE_NAME, "\"" + instance.getName() + "\"");
-
+		DepPlanUtils.configureProperty(instance, PROP_INSTANCE_NAME, StringConstants.QUOTE + instance.getName() + StringConstants.QUOTE);
+	
 		// port in context => interception of port => provide information about port and interface
-		if(context.port != null) {
+		ContainerTrafo containerTrafo = ContainerTrafo.getContainerTrafo(parentInstance);
+		if (containerTrafo == null) {
+			return;
+		}
+		Port port = containerTrafo.getInterceptedPort(componentPart);
+		if(port != null) {
 			// obtain required or provided interface (TODO: will fail, if both are provided!)
-			Interface intf = PortUtils.getProvided(context.port);
+			Interface intf = PortUtils.getProvided(port);
 			if(intf == null) {
-				intf = PortUtils.getRequired(context.port);
+				intf = PortUtils.getRequired(port);
 			}
 
-			DepPlanUtils.configureProperty(instance, PROP_PORT_NAME, "\"" + context.port.getName() + "\"");
+			DepPlanUtils.configureProperty(instance, PROP_PORT_NAME, StringConstants.QUOTE + port.getName() + StringConstants.QUOTE);
 			if(intf != null) {
 				// this is specific for OTF:
 				// each container contains an attribute (id_<name>) for each operation. This is configured here,
 				// since we add instance information to the trace (is that useful??, seems like a hack)
+				// TODO: originally, we used executorIS *in source model*
 				for(Operation op : intf.getOperations()) {
-					String id = Utils.getTop(context.executorIS).getName() + "::Tracing::Trace::ID_" +
-						context.executorIS.getName().replace(".", "_") + "_" + op.getName();
-					DepPlanUtils.configureProperty(instance, "id_" + op.getName(), id);
+					String id = Utils.getTop(instance).getName() + "::Tracing::Trace::ID_" + //$NON-NLS-1$
+						instance.getName().replace(".", "_") + "_" + op.getName();  //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
+					DepPlanUtils.configureProperty(instance, "id_" + op.getName(), id); //$NON-NLS-1$
 				}
 			}
 		}
-
-
 	}
 }
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/IConfiguratorTrace.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/IConfiguratorTrace.java
index 7c76623710f..c921ce96a3c 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/IConfiguratorTrace.java
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/IConfiguratorTrace.java
@@ -2,9 +2,9 @@ package org.eclipse.papyrus.qompass.modellibs.tracing;
 
 import org.eclipse.papyrus.qompass.designer.core.deployment.DepPlanUtils;
 import org.eclipse.papyrus.qompass.designer.core.extensions.IInstanceConfigurator;
-import org.eclipse.papyrus.qompass.designer.core.transformations.ContainerContext;
 import org.eclipse.papyrus.qompass.designer.core.transformations.ContainerTrafo;
 import org.eclipse.uml2.uml.InstanceSpecification;
+import org.eclipse.uml2.uml.Port;
 import org.eclipse.uml2.uml.Property;
 
 public class IConfiguratorTrace implements IInstanceConfigurator {
@@ -18,7 +18,7 @@ public class IConfiguratorTrace implements IInstanceConfigurator {
 	 * 
 	 * @see org.eclipse.papyrus.qompass.designer.gentools.core.extensions.IInstanceConfigurator
 	 */
-	public void configureInstance(InstanceSpecification instance, Property componentPart, ContainerContext context) {
+	public void configureInstance(InstanceSpecification instance, Property componentPart, InstanceSpecification parentInstance) {
 		// The tracing code needs informations about the component instance and port.
 
 		String instanceName = instance.getName();
@@ -30,11 +30,15 @@ public class IConfiguratorTrace implements IInstanceConfigurator {
 			}
 		}
 
-		DepPlanUtils.configureProperty(instance, PROP_INSTANCE_NAME, "\"" + instanceName + "\"");
+		DepPlanUtils.configureProperty(instance, PROP_INSTANCE_NAME, StringConstants.QUOTE + instanceName + StringConstants.QUOTE);
 
 		// port in context => interception of port => provide information about port and interface
-		if(context.port != null) {
-			DepPlanUtils.configureProperty(instance, PROP_PORT_NAME, "\"" + context.port.getName() + "\"");
+		ContainerTrafo containerTrafo = ContainerTrafo.getContainerTrafo(parentInstance);
+		if (containerTrafo != null) {
+			Port port = containerTrafo.getInterceptedPort(componentPart);
+			if(port != null) {
+				DepPlanUtils.configureProperty(instance, PROP_PORT_NAME, StringConstants.QUOTE + port.getName() + StringConstants.QUOTE);
+			}
 		}
 	}
 }
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/QompassTraceMechanism.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/QompassTraceMechanism.java
index e9593ba3cd2..e3e0ca8da86 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/QompassTraceMechanism.java
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/QompassTraceMechanism.java
@@ -23,8 +23,8 @@ import org.eclipse.papyrus.infra.services.tracepoints.TraceActions.TAOperation;
 import org.eclipse.papyrus.infra.services.tracepoints.TracepointConstants;
 import org.eclipse.papyrus.qompass.designer.core.Description;
 import org.eclipse.papyrus.qompass.designer.core.Log;
-import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil;
 import org.eclipse.papyrus.qompass.designer.core.Utils;
+import org.eclipse.papyrus.uml.tools.utils.StereotypeUtil;
 import org.eclipse.uml2.uml.Class;
 import org.eclipse.uml2.uml.Element;
 import org.eclipse.uml2.uml.NamedElement;
@@ -34,7 +34,7 @@ import org.eclipse.uml2.uml.Property;
 
 public class QompassTraceMechanism implements ITraceMechanism {
 
-	public static final String EC3M_TRACING_URI = "pathmap://QML_TRACE/tracing.uml";
+	public static final String EC3M_TRACING_URI = "pathmap://QML_TRACE/tracing.uml"; //$NON-NLS-1$
 
 	public static final URI tracingURI = URI.createURI(EC3M_TRACING_URI);
 
@@ -104,7 +104,7 @@ public class QompassTraceMechanism implements ITraceMechanism {
 	public boolean isForTracing(ContainerRule rule) {
 		for(ConfigOption co : rule.getForConfig()) {
 			// TODO: not very clean to used fixed string
-			if(co.getBase_Class().getName().equals("Trace")) {
+			if(co.getBase_Class().getName().equals("Trace")) { //$NON-NLS-1$
 				return true;
 			}
 		}
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/StringConstants.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/StringConstants.java
new file mode 100644
index 00000000000..d3ced2536a6
--- /dev/null
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/StringConstants.java
@@ -0,0 +1,5 @@
+package org.eclipse.papyrus.qompass.modellibs.tracing;
+
+public class StringConstants {
+	public static final String QUOTE = "\""; //$NON-NLS-1$
+}
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/acceleo/traceLTTng.mtl b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/acceleo/traceLTTng.mtl
index af7a3358147..cdddfb7314a 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/acceleo/traceLTTng.mtl
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/acceleo/traceLTTng.mtl
@@ -112,7 +112,7 @@ tracepoint([tpName1()/], [operation.tpName2()/], instanceName[if (operation.para
 [/template]
 
 
-[template flattenParNameAndType(parameter : Parameter) post(trim())]
+[template public flattenParNameAndType(parameter : Parameter) post(trim())]
 [if (type.oclIsTypeOf(DataType))]
 	[for (attribute : Property | type.oclAsType(DataType).attribute) separator(', ')][attribute.type.cppTypeWB()/], [parameter.name + '_' + attribute.name/][/for]
 [else]
@@ -120,7 +120,7 @@ tracepoint([tpName1()/], [operation.tpName2()/], instanceName[if (operation.para
 [/if]
 [/template]
 
-[template flattenParName(parameter : Parameter) post(trim())]
+[template public flattenParName(parameter : Parameter) post(trim())]
 [if (type.oclIsTypeOf(DataType))]
 	[for (attribute : Property | type.oclAsType(DataType).attribute) separator(', ')][parameter.name + '.' + attribute.name/][/for]
 [else]
@@ -129,7 +129,7 @@ tracepoint([tpName1()/], [operation.tpName2()/], instanceName[if (operation.para
 [/template]
 
 
-[template flattenCtfType(type : Type, name : String) post(trim())]
+[template public flattenCtfType(type : Type, name : String) post(trim())]
 [if (type.oclIsTypeOf(DataType))]
 	[for (attribute : Property | type.oclAsType(DataType).attribute) separator('\n')][ctfType(attribute.type, name + '_' + attribute.name)/][/for]
 [else]
@@ -138,7 +138,7 @@ tracepoint([tpName1()/], [operation.tpName2()/], instanceName[if (operation.para
 [/template]
 
 
-[template cppTypeWB(type : Type) post(trim())]
+[template public cppTypeWB(type : Type) post(trim())]
 [if
 	(type.qualifiedName = 'UMLPrimitiveTypes::Boolean') or
 	(type.qualifiedName = 'PrimitiveTypes::Boolean') or
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/.classpath b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/.classpath
index 64c5e31b7a2..ad32c83a788 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/.classpath
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/META-INF/MANIFEST.MF b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/META-INF/MANIFEST.MF
index e0fce383d89..b0db12aefc8 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/META-INF/MANIFEST.MF
@@ -21,7 +21,6 @@ Bundle-Name: %pluginName
 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.views.tracepoints.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.views.tracepoints;singleton:=

- true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Bundle-SymbolicName: org.eclipse.papyrus.views.tracepoints;singleton:=true

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

 

diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/build.properties b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/build.properties
index 8c05b0ac6b9..7b97eb1d17a 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/build.properties
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/build.properties
@@ -4,7 +4,6 @@ bin.includes = plugin.xml,\
                META-INF/,\
                .,\
                icons/,\
-               contexts.xml,\
                about.html,\
                plugin.properties
 src.includes = about.html
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/contexts.xml b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/contexts.xml
deleted file mode 100644
index b3b18ae3d68..00000000000
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/contexts.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<contexts>
-	<context id="viewer" title="Sample View">
-		<description>This is the context help for the sample view with a table viewer. It was generated by a PDE template.</description>
-		<topic href="/PLUGINS_ROOT/org.eclipse.platform.doc.isv/guide/ua_help_context.htm" label="Context-sensitive help">
-			<enablement>
-				<with variable="platform">
-	            	<test property="org.eclipse.core.runtime.isBundleInstalled" args="org.eclipse.platform.doc.isv"/>
-	     		</with>
-			</enablement>
-		</topic>
-	</context>
-</contexts>
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/plugin.xml b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/plugin.xml
index 43cfbf7e29e..208df21df9f 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/plugin.xml
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/plugin.xml
@@ -12,23 +12,4 @@
             id="org.eclipse.papyrus.views.tracepoints.views.Tracepoints">
       </view>
    </extension>
-   <extension
-         point="org.eclipse.ui.perspectiveExtensions">
-      <perspectiveExtension
-            targetID="org.eclipse.jdt.ui.JavaPerspective">
-         <view
-               ratio="0.5"
-               relative="org.eclipse.ui.views.TaskList"
-               relationship="right"
-               id="org.eclipse.papyrus.views.tracepoints.views.SampleView">
-         </view>
-      </perspectiveExtension>
-   </extension>
-   <extension
-         point="org.eclipse.help.contexts">
-      <contexts
-            file="contexts.xml">
-      </contexts>
-   </extension>
-
 </plugin>
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/ComponentPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/ComponentPreferencePage.java
index 1455bc22b1b..fd5f20c6e87 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/ComponentPreferencePage.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/ComponentPreferencePage.java
@@ -17,7 +17,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.robotml.diagram.architecture.edit.part.ArchitectureDiagramEditPart;
 
 
@@ -60,13 +60,13 @@ public class ComponentPreferencePage extends ArchitectureDiagramNodePreferencePa
 
 		// Initialize default visibility for compartments in preference page.
 		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
+			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(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			String showCompartmentTitleKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);
+			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
 	}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/PortPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/PortPreferencePage.java
index 5eb0ed20981..05ea323b1a4 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/PortPreferencePage.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/PortPreferencePage.java
@@ -13,7 +13,7 @@
 package org.eclipse.papyrus.robotml.diagram.architecture.preferences;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.robotml.diagram.architecture.edit.part.ArchitectureDiagramEditPart;
 
 public class PortPreferencePage extends ArchitectureDiagramNodePreferencePage {
@@ -27,8 +27,8 @@ public class PortPreferencePage extends ArchitectureDiagramNodePreferencePage {
 	}
 
 	public static void initDefaults(IPreferenceStore store) {
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 20);
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 20);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 20);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 20);
 	}
 
 }
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/PropertyPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/PropertyPreferencePage.java
index 2db78022737..90050e87235 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/PropertyPreferencePage.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.architecture/src-gen/org/eclipse/papyrus/robotml/diagram/architecture/preferences/PropertyPreferencePage.java
@@ -13,7 +13,7 @@
 package org.eclipse.papyrus.robotml.diagram.architecture.preferences;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.robotml.diagram.architecture.edit.part.ArchitectureDiagramEditPart;
 
 public class PropertyPreferencePage extends ArchitectureDiagramNodePreferencePage {
@@ -33,7 +33,7 @@ public class PropertyPreferencePage extends ArchitectureDiagramNodePreferencePag
 	public static void initDefaults(IPreferenceStore store) {
 		// set the true value for the compartment visibility
 		for(String name : compartments) {
-			String preferenceName = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
+			String preferenceName = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
 			store.setDefault(preferenceName, true);
 		}
 	}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/DataTypePreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/DataTypePreferencePage.java
index d2a3402cf9b..c52d20a4966 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/DataTypePreferencePage.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/DataTypePreferencePage.java
@@ -12,7 +12,7 @@
 package org.eclipse.papyrus.robotml.diagram.datatypedef.preferences;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.robotml.diagram.datatypedef.edit.part.DatatypeDefEditPart;
 
 public class DataTypePreferencePage extends DatatypeDefNodePreferencePage {
@@ -30,11 +30,11 @@ public class DataTypePreferencePage extends DatatypeDefNodePreferencePage {
 	}
 
 	public static void initDefaults(IPreferenceStore store) {
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 100);
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 100);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 100);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100);
 		// set the true value for the compartment visibility
 		for(String name : compartments) {
-			String preferenceName = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
+			String preferenceName = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
 			store.setDefault(preferenceName, true);
 		}
 	}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/DiagramPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/DiagramPreferencePage.java
index 3603b07aed4..9f2781b2caf 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/DiagramPreferencePage.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/DiagramPreferencePage.java
@@ -12,7 +12,7 @@
 package org.eclipse.papyrus.robotml.diagram.datatypedef.preferences;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.robotml.diagram.datatypedef.edit.part.DatatypeDefEditPart;
 
 public class DiagramPreferencePage extends DatatypeDefNodePreferencePage {
@@ -26,8 +26,8 @@ public class DiagramPreferencePage extends DatatypeDefNodePreferencePage {
 	}
 
 	public static void initDefaults(IPreferenceStore store) {
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 20);
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 20);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 20);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 20);
 	}
 
 }
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/EnumerationPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/EnumerationPreferencePage.java
index a96e76aafdc..e1bd4d08e50 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/EnumerationPreferencePage.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/EnumerationPreferencePage.java
@@ -12,7 +12,7 @@
 package org.eclipse.papyrus.robotml.diagram.datatypedef.preferences;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.robotml.diagram.datatypedef.edit.part.DatatypeDefEditPart;
 
 public class EnumerationPreferencePage extends DatatypeDefNodePreferencePage {
@@ -30,11 +30,11 @@ public class EnumerationPreferencePage extends DatatypeDefNodePreferencePage {
 	}
 
 	public static void initDefaults(IPreferenceStore store) {
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 100);
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 100);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 100);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100);
 		// set the true value for the compartment visibility
 		for(String name : compartments) {
-			String preferenceName = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
+			String preferenceName = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
 			store.setDefault(preferenceName, true);
 		}
 	}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/PackagePreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/PackagePreferencePage.java
index d05f4685127..8fd621a0b79 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/PackagePreferencePage.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/PackagePreferencePage.java
@@ -12,7 +12,7 @@
 package org.eclipse.papyrus.robotml.diagram.datatypedef.preferences;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.robotml.diagram.datatypedef.edit.part.DatatypeDefEditPart;
 
 public class PackagePreferencePage extends DatatypeDefNodePreferencePage {
@@ -30,11 +30,11 @@ public class PackagePreferencePage extends DatatypeDefNodePreferencePage {
 	}
 
 	public static void initDefaults(IPreferenceStore store) {
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 200);
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 100);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 200);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100);
 		// set the true value for the compartment visibility
 		for(String name : compartments) {
-			String preferenceName = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
+			String preferenceName = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
 			store.setDefault(preferenceName, true);
 		}
 	}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/PrimitiveTypePreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/PrimitiveTypePreferencePage.java
index 59639db2f83..144dbf82999 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/PrimitiveTypePreferencePage.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/PrimitiveTypePreferencePage.java
@@ -12,7 +12,7 @@
 package org.eclipse.papyrus.robotml.diagram.datatypedef.preferences;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.robotml.diagram.datatypedef.edit.part.DatatypeDefEditPart;
 
 public class PrimitiveTypePreferencePage extends DatatypeDefNodePreferencePage {
@@ -26,8 +26,8 @@ public class PrimitiveTypePreferencePage extends DatatypeDefNodePreferencePage {
 	}
 
 	public static void initDefaults(IPreferenceStore store) {
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 100);
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 50);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 100);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 50);
 	}
 
 }
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/SignalPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/SignalPreferencePage.java
index d4ae3502f51..7a3dc0e8a94 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/SignalPreferencePage.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.datatypedef/src-gen/org/eclipse/papyrus/robotml/diagram/datatypedef/preferences/SignalPreferencePage.java
@@ -12,7 +12,7 @@
 package org.eclipse.papyrus.robotml.diagram.datatypedef.preferences;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.robotml.diagram.datatypedef.edit.part.DatatypeDefEditPart;
 
 public class SignalPreferencePage extends DatatypeDefNodePreferencePage {
@@ -30,11 +30,11 @@ public class SignalPreferencePage extends DatatypeDefNodePreferencePage {
 	}
 
 	public static void initDefaults(IPreferenceStore store) {
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 100);
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 100);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 100);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100);
 		// set the true value for the compartment visibility
 		for(String name : compartments) {
-			String preferenceName = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
+			String preferenceName = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
 			store.setDefault(preferenceName, true);
 		}
 	}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/DiagramPreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/DiagramPreferencePage.java
index a928721b41b..d5ff1b1b0de 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/DiagramPreferencePage.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/DiagramPreferencePage.java
@@ -12,7 +12,7 @@
 package org.eclipse.papyrus.robotml.diagram.interfacedef.preferences;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.robotml.diagram.interfacedef.edit.part.InterfaceDefEditPart;
 
 public class DiagramPreferencePage extends InterfaceDefNodePreferencePage {
@@ -26,8 +26,8 @@ public class DiagramPreferencePage extends InterfaceDefNodePreferencePage {
 	}
 
 	public static void initDefaults(IPreferenceStore store) {
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 20);
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 20);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 20);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 20);
 	}
 
 }
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/InterfacePreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/InterfacePreferencePage.java
index 6976094db28..418ace190c6 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/InterfacePreferencePage.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/InterfacePreferencePage.java
@@ -12,7 +12,7 @@
 package org.eclipse.papyrus.robotml.diagram.interfacedef.preferences;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.robotml.diagram.interfacedef.edit.part.InterfaceDefEditPart;
 
 public class InterfacePreferencePage extends InterfaceDefNodePreferencePage {
@@ -30,11 +30,11 @@ public class InterfacePreferencePage extends InterfaceDefNodePreferencePage {
 	}
 
 	public static void initDefaults(IPreferenceStore store) {
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 100);
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 100);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 100);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100);
 		// set the true value for the compartment visibility
 		for(String name : compartments) {
-			String preferenceName = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
+			String preferenceName = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
 			store.setDefault(preferenceName, true);
 		}
 	}
diff --git a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/PackagePreferencePage.java b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/PackagePreferencePage.java
index 82759960cfa..36b92ad4487 100644
--- a/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/PackagePreferencePage.java
+++ b/extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.interfacedef/src-gen/org/eclipse/papyrus/robotml/diagram/interfacedef/preferences/PackagePreferencePage.java
@@ -12,7 +12,7 @@
 package org.eclipse.papyrus.robotml.diagram.interfacedef.preferences;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.robotml.diagram.interfacedef.edit.part.InterfaceDefEditPart;
 
 public class PackagePreferencePage extends InterfaceDefNodePreferencePage {
@@ -30,11 +30,11 @@ public class PackagePreferencePage extends InterfaceDefNodePreferencePage {
 	}
 
 	public static void initDefaults(IPreferenceStore store) {
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 200);
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 100);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 200);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100);
 		// set the true value for the compartment visibility
 		for(String name : compartments) {
-			String preferenceName = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
+			String preferenceName = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
 			store.setDefault(preferenceName, true);
 		}
 	}
diff --git a/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/.classpath b/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/.classpath
new file mode 100644
index 00000000000..8a8f1668cdc
--- /dev/null
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<classpath>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

+	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="output" path="bin"/>

+</classpath>

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable.converter/.project b/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/.project
index f5d365ab83a..f5d365ab83a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable.converter/.project
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/.project
diff --git a/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/.settings/org.eclipse.jdt.core.prefs b/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..f287d53cf45
--- /dev/null
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1

+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6

+org.eclipse.jdt.core.compiler.compliance=1.6

+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

+org.eclipse.jdt.core.compiler.source=1.6

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable.converter/META-INF/MANIFEST.MF b/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/META-INF/MANIFEST.MF
index 68b127c8adc..68b127c8adc 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable.converter/META-INF/MANIFEST.MF
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/META-INF/MANIFEST.MF
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable.converter/OSGI-INF/l10n/bundle.properties b/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/OSGI-INF/l10n/bundle.properties
index e26619d4d2f..e26619d4d2f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable.converter/OSGI-INF/l10n/bundle.properties
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/OSGI-INF/l10n/bundle.properties
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable.converter/about.html b/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/about.html
index 598b3684879..598b3684879 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable.converter/about.html
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/about.html
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable.converter/build.properties b/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/build.properties
index 1961e7848c9..1961e7848c9 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable.converter/build.properties
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/build.properties
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable.converter/plugin.pdoc b/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/plugin.pdoc
index e76e9322193..e76e9322193 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable.converter/plugin.pdoc
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/plugin.pdoc
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable.converter/plugin.xml b/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/plugin.xml
index cf6573c0c4d..cf6573c0c4d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable.converter/plugin.xml
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/plugin.xml
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable.converter/src/org/eclipse/papyrus/uml/nattable/converter/Activator.java b/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/src/org/eclipse/papyrus/uml/nattable/converter/Activator.java
index 859ab8f36c4..859ab8f36c4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable.converter/src/org/eclipse/papyrus/uml/nattable/converter/Activator.java
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/src/org/eclipse/papyrus/uml/nattable/converter/Activator.java
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable.converter/src/org/eclipse/papyrus/uml/nattable/converter/handlers/ConvertAllTablesHandler.java b/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/src/org/eclipse/papyrus/uml/nattable/converter/handlers/ConvertAllTablesHandler.java
index 3575a6649f1..3575a6649f1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable.converter/src/org/eclipse/papyrus/uml/nattable/converter/handlers/ConvertAllTablesHandler.java
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/src/org/eclipse/papyrus/uml/nattable/converter/handlers/ConvertAllTablesHandler.java
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable.converter/src/org/eclipse/papyrus/uml/nattable/converter/handlers/ConvertOldTableHandler.java b/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/src/org/eclipse/papyrus/uml/nattable/converter/handlers/ConvertOldTableHandler.java
index 6930666bb11..6930666bb11 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable.converter/src/org/eclipse/papyrus/uml/nattable/converter/handlers/ConvertOldTableHandler.java
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/src/org/eclipse/papyrus/uml/nattable/converter/handlers/ConvertOldTableHandler.java
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable.converter/src/org/eclipse/papyrus/uml/nattable/converter/messages/Messages.java b/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/src/org/eclipse/papyrus/uml/nattable/converter/messages/Messages.java
index b428d500191..b428d500191 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable.converter/src/org/eclipse/papyrus/uml/nattable/converter/messages/Messages.java
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/src/org/eclipse/papyrus/uml/nattable/converter/messages/Messages.java
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable.converter/src/org/eclipse/papyrus/uml/nattable/converter/messages/messages.properties b/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/src/org/eclipse/papyrus/uml/nattable/converter/messages/messages.properties
index 2aaf1bcc60a..2aaf1bcc60a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable.converter/src/org/eclipse/papyrus/uml/nattable/converter/messages/messages.properties
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/src/org/eclipse/papyrus/uml/nattable/converter/messages/messages.properties
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/.classpath b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/.classpath
index f6326c88c74..f6326c88c74 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/.classpath
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/.classpath
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/.project b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/.project
index c95a6c4418d..c95a6c4418d 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/.project
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/.project
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/META-INF/MANIFEST.MF b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/META-INF/MANIFEST.MF
index 87d8f00812d..5ea468624d3 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/META-INF/MANIFEST.MF
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.facet.widgets.nattable.instance;bundle-version="0.1.0",

  org.eclipse.emf.facet.infra.browser.custom;visibility:=reexport,

  org.eclipse.ui.workbench,

- com.google.guava;bundle-version="10.0.1",

+ com.google.guava;bundle-version="11.0.0",

  org.eclipse.papyrus.infra.emf;bundle-version="1.0.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.default/about.html b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.default/about.html
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/about.html
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/build.properties b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/build.properties
index 854052f66d4..854052f66d4 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/build.properties
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/build.properties
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/custom-src/org/eclipse/papyrus/infra/table/instance/util/TableContentsUtils.java b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/custom-src/org/eclipse/papyrus/infra/table/instance/util/TableContentsUtils.java
index adb5edc4d7f..adb5edc4d7f 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/custom-src/org/eclipse/papyrus/infra/table/instance/util/TableContentsUtils.java
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/custom-src/org/eclipse/papyrus/infra/table/instance/util/TableContentsUtils.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/model/papyrustableinstance.ecore b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/model/papyrustableinstance.ecore
index 19092e38d55..19092e38d55 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/model/papyrustableinstance.ecore
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/model/papyrustableinstance.ecore
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/model/papyrustableinstance.genmodel b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/model/papyrustableinstance.genmodel
index d98cf5d65bd..d98cf5d65bd 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/model/papyrustableinstance.genmodel
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/model/papyrustableinstance.genmodel
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/plugin.properties b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/plugin.properties
index 8de7ccf1e58..8de7ccf1e58 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/plugin.properties
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/plugin.properties
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/plugin.xml b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/plugin.xml
index 77083607b71..77083607b71 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/plugin.xml
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/plugin.xml
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/Activator.java b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/Activator.java
index 06103eb245a..06103eb245a 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/Activator.java
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/Activator.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/PapyrusTableInstance.java b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/PapyrusTableInstance.java
index 197bc08133e..197bc08133e 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/PapyrusTableInstance.java
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/PapyrusTableInstance.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/PapyrustableinstanceFactory.java b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/PapyrustableinstanceFactory.java
index a724600c975..a724600c975 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/PapyrustableinstanceFactory.java
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/PapyrustableinstanceFactory.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/PapyrustableinstancePackage.java b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/PapyrustableinstancePackage.java
index 8225654ec0a..8225654ec0a 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/PapyrustableinstancePackage.java
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/PapyrustableinstancePackage.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/impl/PapyrusTableInstanceImpl.java b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/impl/PapyrusTableInstanceImpl.java
index 7b9318da85d..7b9318da85d 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/impl/PapyrusTableInstanceImpl.java
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/impl/PapyrusTableInstanceImpl.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/impl/PapyrustableinstanceFactoryImpl.java b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/impl/PapyrustableinstanceFactoryImpl.java
index fd7ec822bdc..fd7ec822bdc 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/impl/PapyrustableinstanceFactoryImpl.java
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/impl/PapyrustableinstanceFactoryImpl.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/impl/PapyrustableinstancePackageImpl.java b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/impl/PapyrustableinstancePackageImpl.java
index c4800df16e8..c4800df16e8 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/impl/PapyrustableinstancePackageImpl.java
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/impl/PapyrustableinstancePackageImpl.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/util/PapyrustableinstanceAdapterFactory.java b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/util/PapyrustableinstanceAdapterFactory.java
index a0a7b717956..a0a7b717956 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/util/PapyrustableinstanceAdapterFactory.java
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/util/PapyrustableinstanceAdapterFactory.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/util/PapyrustableinstanceSwitch.java b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/util/PapyrustableinstanceSwitch.java
index 4a494087777..4a494087777 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/util/PapyrustableinstanceSwitch.java
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/infra/table/instance/papyrustableinstance/util/PapyrustableinstanceSwitch.java
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/.classpath b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/.classpath
index 2d1a4302f04..2d1a4302f04 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/.classpath
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/.classpath
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/.project b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/.project
index db2442f94ec..db2442f94ec 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/.project
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/.project
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/.settings/org.eclipse.core.resources.prefs b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/.settings/org.eclipse.core.resources.prefs
index c82fec208fa..c82fec208fa 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/.settings/org.eclipse.core.resources.prefs
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/.settings/org.eclipse.jdt.core.prefs b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/.settings/org.eclipse.jdt.core.prefs
index eef3e01dddb..eef3e01dddb 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/META-INF/MANIFEST.MF b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/META-INF/MANIFEST.MF
index 2afb7c89239..2afb7c89239 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/META-INF/MANIFEST.MF
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/META-INF/MANIFEST.MF
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/about.html b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/about.html
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/about.html
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/build.properties b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/build.properties
index 8f5a4c96094..8f5a4c96094 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/build.properties
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/build.properties
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/documentation.pdoc b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/documentation.pdoc
index e7a7257ea7e..e7a7257ea7e 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/documentation.pdoc
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/documentation.pdoc
diff --git a/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/icons/table.png b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/icons/table.png
new file mode 100644
index 00000000000..2a979527f4a
--- /dev/null
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/icons/table.png
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/plugin.properties b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/plugin.properties
index 218c6567b7f..218c6567b7f 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/plugin.properties
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/plugin.properties
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/plugin.xml b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/plugin.xml
index 9281887daf2..9281887daf2 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/plugin.xml
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/plugin.xml
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableFacet.facetSet b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableFacet.facetSet
index b766ef65cfe..b766ef65cfe 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableFacet.facetSet
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableFacet.facetSet
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableFacetCustomization.uiCustom b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableFacetCustomization.uiCustom
index 6b65c85443d..6b65c85443d 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableFacetCustomization.uiCustom
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableFacetCustomization.uiCustom
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableInstanceCustomization.uiCustom b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableInstanceCustomization.uiCustom
index 14f759c0697..14f759c0697 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableInstanceCustomization.uiCustom
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableInstanceCustomization.uiCustom
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableQuery.querySet b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableQuery.querySet
index 607a65452d2..607a65452d2 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableQuery.querySet
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableQuery.querySet
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/Activator.java b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/Activator.java
index e7433ff7ace..e7433ff7ace 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/Activator.java
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/Activator.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/AbstractTableModelExplorerHandler.java b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/AbstractTableModelExplorerHandler.java
index 9ff84a43227..9ff84a43227 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/AbstractTableModelExplorerHandler.java
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/AbstractTableModelExplorerHandler.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/DeleteTableHandler.java b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/DeleteTableHandler.java
index 6c9a9372551..6c9a9372551 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/DeleteTableHandler.java
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/DeleteTableHandler.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/DuplicateTableHandler.java b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/DuplicateTableHandler.java
index 2c1d11697b0..2c1d11697b0 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/DuplicateTableHandler.java
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/DuplicateTableHandler.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/RenameTableHandler.java b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/RenameTableHandler.java
index 3c007165413..3c007165413 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/RenameTableHandler.java
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/handlers/RenameTableHandler.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/messages/Messages.java b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/messages/Messages.java
index 7fe4c99c629..7fe4c99c629 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/messages/Messages.java
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/messages/Messages.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/messages/messages.properties b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/messages/messages.properties
index c5ff485ad7f..c5ff485ad7f 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/messages/messages.properties
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/messages/messages.properties
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/providers/TablePropertyTester.java b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/providers/TablePropertyTester.java
index 495e63ae231..495e63ae231 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/providers/TablePropertyTester.java
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/providers/TablePropertyTester.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/GetContainedTables.java b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/GetContainedTables.java
index 3a902c9dd57..3a902c9dd57 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/GetContainedTables.java
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/GetContainedTables.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/GetTableIcon.java b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/GetTableIcon.java
index c0a41845d41..241afbf5cad 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/GetTableIcon.java
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/GetTableIcon.java
@@ -26,6 +26,8 @@ public class GetTableIcon extends AbstractGetEditorIconQuery implements IJavaMod
 	 * {@inheritDoc}
 	 */
 	public String evaluate(final PapyrusTableInstance context, final ParameterValueList parameterValues) throws ModelQueryExecutionException {
-		return "/" + getEditorRegistry(context).getEditorURLIcon(context); //$NON-NLS-1$
+		
+		System.out.println("/org.eclipse.papyrus.infra.table.modelexplorer/icons/table.png");
+		return "/org.eclipse.papyrus.infra.table.modelexplorer/icons/table.png";// + getEditorRegistry(context).getEditorURLIcon(context); //$NON-NLS-1$
 	}
 }
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/GetTableName.java b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/GetTableName.java
index a1da86b8526..a1da86b8526 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/GetTableName.java
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/GetTableName.java
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/IsTableContainer.java b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/IsTableContainer.java
index 5c7883c5908..5c7883c5908 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/IsTableContainer.java
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/infra/table/modelexplorer/queries/IsTableContainer.java
diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/.classpath b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/.classpath
new file mode 100644
index 00000000000..2d1a4302f04
--- /dev/null
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<classpath>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

+	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="output" path="bin"/>

+</classpath>

diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/.project b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/.project
new file mode 100644
index 00000000000..754f5c7db6a
--- /dev/null
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.papyrus.uml.compare.ui</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.jdt.core.javabuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.ManifestBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.SchemaBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.pde.PluginNature</nature>

+		<nature>org.eclipse.jdt.core.javanature</nature>

+	</natures>

+</projectDescription>

diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/.settings/org.eclipse.jdt.core.prefs b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/.settings/org.eclipse.jdt.core.prefs
index 44217f8c068..44217f8c068 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.common/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/META-INF/MANIFEST.MF b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..a8f5c59fcf5
--- /dev/null
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,21 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.uml.compare.ui;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.eclipse.papyrus.uml.compare.ui.Activator
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.core.expressions;bundle-version="3.4.500",
+ org.eclipse.core.resources;bundle-version="3.8.100",
+ org.eclipse.papyrus.infra.core.log;bundle-version="0.10.0",
+ org.eclipse.emf.compare.ide.ui;bundle-version="3.0.0",
+ org.eclipse.emf.edit;bundle-version="2.9.0",
+ org.eclipse.emf.common,
+ org.eclipse.uml2.uml;bundle-version="4.1.0",
+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="0.10.0",
+ org.eclipse.uml2.uml.edit;bundle-version="4.1.0",
+ org.eclipse.emf.compare.edit;bundle-version="3.1.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-ActivationPolicy: lazy
+Bundle-Vendor: %providerName
diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/about.html b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/about.html
new file mode 100644
index 00000000000..82d49bf5f81
--- /dev/null
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

+<title>About</title>

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>June 5, 2007</p>	

+<h3>License</h3>

+

+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

+indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

+apply to your use of any object code in the Content.  Check the Redistributor's license that was 

+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

+indicated below, the terms and conditions of the EPL still apply to any source code in the Content

+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

+

+</body>

+</html>

diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/build.properties b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/build.properties
new file mode 100644
index 00000000000..6f20375d6c7
--- /dev/null
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/build.properties
@@ -0,0 +1,5 @@
+source.. = src/

+output.. = bin/

+bin.includes = META-INF/,\

+               .,\

+               plugin.xml

diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/icons/UMLModelFile.gif b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/icons/UMLModelFile.gif
new file mode 100644
index 00000000000..4eb1fb5a8dd
--- /dev/null
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/icons/UMLModelFile.gif
diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/icons/papyrus_compare_16x16.png b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/icons/papyrus_compare_16x16.png
new file mode 100644
index 00000000000..4e38b20444a
--- /dev/null
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/icons/papyrus_compare_16x16.png
diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/icons/papyrus_compare_32x32.png b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/icons/papyrus_compare_32x32.png
new file mode 100644
index 00000000000..af0c3a85b54
--- /dev/null
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/icons/papyrus_compare_32x32.png
diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/icons/papyrus_compare_editor.gif b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/icons/papyrus_compare_editor.gif
new file mode 100644
index 00000000000..e817df6ff0c
--- /dev/null
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/icons/papyrus_compare_editor.gif
diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/plugin.properties b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/plugin.properties
new file mode 100644
index 00000000000..1b84f8a90f8
--- /dev/null
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/plugin.properties
@@ -0,0 +1,4 @@
+#

+

+pluginName = Papyrus Compare Integration (Incubation)

+providerName = Eclipse Modeling Project

diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/plugin.xml b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/plugin.xml
new file mode 100644
index 00000000000..b36b44abfd7
--- /dev/null
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/plugin.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<?eclipse version="3.4"?>

+<plugin>

+   <!-- <extension

+         point="org.eclipse.ui.commands">

+      <command

+            categoryId="org.eclipse.papyrus.editor.category"

+            description="Open the Papyrus Model Compare Editor"

+            id="org.eclipse.papyrus.uml.compare.ui.command"

+            name="Papyrus Model Compare Editor">

+      </command>

+   </extension>

+   <extension

+         point="org.eclipse.ui.handlers">

+      <handler

+            class="org.eclipse.papyrus.uml.compare.ui.handler.CompareUMLFileHandler"

+            commandId="org.eclipse.papyrus.uml.compare.ui.command">

+      </handler>

+      

+      

+   </extension>

+   <extension

+         point="org.eclipse.ui.menus">

+      <menuContribution

+    allPopups="true"

+    locationURI="popup:org.eclipse.ui.popup.any?after=additions">

+	<command

+	       commandId="org.eclipse.papyrus.uml.compare.ui.command"

+	       style="push">

+	    <visibleWhen

+	          checkEnabled="false">

+	       <with

+	             variable="selection">

+	          <iterate

+	                ifEmpty="false"

+	                operator="and">

+	             <adapt

+	                   type="org.eclipse.core.resources.IFile">

+	             </adapt>

+	          </iterate>

+	       </with>

+	    </visibleWhen>

+	</command>

+</menuContribution>

+   </extension> -->

+   <extension

+         point="org.eclipse.emf.compare.edit.adapterFactory">

+      <factory

+            class="org.eclipse.papyrus.uml.compare.ui.provider.PapyrusCompareAdapterFactory"

+            ranking="11"

+            supportedTypes="org.eclipse.emf.edit.provider.IItemLabelProvider"

+            uri="http://www.eclipse.org/uml2/4.0.0/UML">

+      </factory>

+   </extension>

+

+</plugin>

diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/src/org/eclipse/papyrus/uml/compare/ui/Activator.java b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/src/org/eclipse/papyrus/uml/compare/ui/Activator.java
new file mode 100644
index 00000000000..5b9be30878b
--- /dev/null
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/src/org/eclipse/papyrus/uml/compare/ui/Activator.java
@@ -0,0 +1,64 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+

+package org.eclipse.papyrus.uml.compare.ui;

+

+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.compare.ui"; //$NON-NLS-1$

+

+	// The shared instance

+	private static Activator plugin;

+	

+	/**

+	 * The constructor

+	 */

+	public Activator() {

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

+	 */

+	public void start(BundleContext context) throws Exception {

+		super.start(context);

+		plugin = this;

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

+	 */

+	public void stop(BundleContext context) throws Exception {

+		plugin = null;

+		super.stop(context);

+	}

+

+	/**

+	 * Returns the shared instance

+	 *

+	 * @return the shared instance

+	 */

+	public static Activator getDefault() {

+		return plugin;

+	}

+

+}

diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/src/org/eclipse/papyrus/uml/compare/ui/provider/PapyrusCompareAdapterFactory.java b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/src/org/eclipse/papyrus/uml/compare/ui/provider/PapyrusCompareAdapterFactory.java
new file mode 100644
index 00000000000..a36acf4ec29
--- /dev/null
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.ui/src/org/eclipse/papyrus/uml/compare/ui/provider/PapyrusCompareAdapterFactory.java
@@ -0,0 +1,76 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+

+package org.eclipse.papyrus.uml.compare.ui.provider;

+

+import org.eclipse.emf.common.notify.Adapter;

+import org.eclipse.emf.common.notify.Notifier;

+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

+import org.eclipse.emf.common.notify.impl.AdapterImpl;

+import org.eclipse.emf.edit.provider.IItemLabelProvider;

+import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

+import org.eclipse.papyrus.infra.services.labelprovider.service.impl.LabelProviderServiceImpl;

+import org.eclipse.uml2.uml.Element;

+

+

+

+public class PapyrusCompareAdapterFactory extends AdapterFactoryImpl {

+

+	/**

+	 * The instance of the actual label provider

+	 */

+	private LabelProviderAdapter instance = new LabelProviderAdapter();

+	

+	/** 

+	 * Overrides AdapatFactoryImple.adapt so that, if the target element is an Element,

+	 * and if the requested adaptation type is IItemLabelProvider,

+	 * the production of the adapter is delegated to delegate.

+	 * 

+	 * @see org.eclipse.emf.common.notify.impl.AdapterFactoryImpl#adapt(org.eclipse.emf.common.notify.Notifier, java.lang.Object)

+	 */

+	@Override

+	public Adapter adapt(Notifier target, Object type) {

+		if (target instanceof Element && type == IItemLabelProvider.class) {

+			return instance;

+		}

+		return super.adapt(target, type);

+	}

+	

+	private class LabelProviderAdapter extends AdapterImpl implements IItemLabelProvider {

+		

+		/**

+		 * An instance of the Papyrus label provider service

+		 */

+		private LabelProviderService service = new LabelProviderServiceImpl();

+		

+		/**

+		 * Delegates production of the text label to the

+		 * label provider associated with the Papyrus label provider service

+		 */

+		public String getText(Object object) {

+			String result = service.getLabelProvider().getText(object);

+			return result;

+		}

+

+		/**

+		 * Delegates production of the image to the

+		 * label provider associated with the Papyrus label provider service

+		 */

+		public Object getImage(Object object) {

+			Object result = service.getLabelProvider().getImage(object);

+			return result;

+		}

+		

+	};

+}

diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.feature/feature.xml
index 9fa2850ddda..dd326c00e2e 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.feature/feature.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.feature/feature.xml
@@ -1,13 +1,18 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.extra.feature" label="%featureName" provider-name="%providerName" version="1.0.0.qualifier">

+<?xml version="1.0" encoding="UTF-8"?>

+<feature

+      id="org.eclipse.papyrus.extra.feature"

+      label="%featureName"

+      version="1.0.0.qualifier"

+      provider-name="%providerName">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

-      Copyright (c) 2008-2013 CEA LIST, Atos Origin, Conselleria de

-Infraestructuras y Transporte, Generalitat de la Comunitat Valenciana

-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

+      Copyright (c) 2008-2013 CEA LIST, Atos Origin, Conselleria de
+Infraestructuras y Transporte, Generalitat de la Comunitat Valenciana
+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

    </copyright>

 

@@ -15,46 +20,84 @@ http://www.eclipse.org/legal/epl-v10.html
       %license

    </license>

 

-   <includes id="org.eclipse.papyrus.extra.migration.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.extra.migration.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.uml.export.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.uml.export.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.extra.cdo.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.extra.cdo.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.extra.diagramtemplate.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.extra.diagramtemplate.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.extra.dsml.validation.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.extra.dsml.validation.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.extra.eastadl.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.extra.eastadl.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.extra.infra.gmfdiag.css.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.extra.marte.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.extra.marte.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.extra.marte.properties.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.extra.marte.properties.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.extra.marte.textedit.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.extra.marte.textedit.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.extra.uml.compare.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.extra.uml.compare.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.extra.umlrt.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.extra.umlrt.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.java.generator.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.java.generator.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.java.reverse.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.java.reverse.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.extra.robotml.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.extra.robotml.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.extra.qompass.designer.basic.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.extra.qompass.designer.basic.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.extra.qompass.designer.tracing.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.extra.qompass.designer.tracing.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.extra.cpp.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.extra.cpp.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.java.profile.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.java.profile.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.robotml.generators.intempora.rtmaps.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.robotml.generators.intempora.rtmaps.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.tablemigration.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.extra.uml.diagram.css.feature" version="0.0.0"/>

-

-</feature>
\ No newline at end of file
+</feature>

diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.infra.gmfdiag.css.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.infra.gmfdiag.css.feature/feature.xml
deleted file mode 100644
index e72ec98add6..00000000000
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.infra.gmfdiag.css.feature/feature.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.extra.infra.gmfdiag.css.feature" label="Papyrus CSS Feature (Incubation)" provider-name="Eclipse Modeling Project" version="1.0.0.qualifier">

-

-   <copyright url="http://www.eclipse.org/legal/epl-v10.html">

-      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

-   </copyright>

-

-   <license url="%licenseURL">

-      %license

-   </license>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.css" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.css.configuration" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.css.properties" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.css.xtext" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.css.theme" install-size="0" version="0.0.0"/>

-

-</feature>
\ No newline at end of file
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.sources.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.sources.feature/feature.xml
index 9c13740a07d..a9089eebf27 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.sources.feature/feature.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.sources.feature/feature.xml
@@ -1,13 +1,18 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.extra.sources.feature" label="%featureName" provider-name="%providerName" version="1.0.0.qualifier">

+<?xml version="1.0" encoding="UTF-8"?>

+<feature

+      id="org.eclipse.papyrus.extra.sources.feature"

+      label="%featureName"

+      version="1.0.0.qualifier"

+      provider-name="%providerName">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

-      Copyright (c) 2008-2013 CEA LIST, Atos Origin, Conselleria de

-Infraestructuras y Transporte, Generalitat de la Comunitat Valenciana

-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

+      Copyright (c) 2008-2013 CEA LIST, Atos Origin, Conselleria de
+Infraestructuras y Transporte, Generalitat de la Comunitat Valenciana
+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

    </copyright>

 

@@ -15,48 +20,84 @@ http://www.eclipse.org/legal/epl-v10.html
       %license

    </license>

 

-   <includes id="org.eclipse.papyrus.extra.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.extra.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.extra.migration.source.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.extra.migration.source.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.uml.export.source.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.uml.export.source.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.extra.cdo.source.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.extra.cdo.source.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.extra.diagramtemplate.source.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.extra.diagramtemplate.source.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.extra.dsml.validation.source.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.extra.dsml.validation.source.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.extra.eastadl.source.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.extra.eastadl.source.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.extra.infra.gmfdiag.css.source.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.extra.marte.source.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.extra.marte.source.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.extra.marte.properties.source.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.extra.marte.properties.source.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.extra.marte.textedit.source.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.extra.marte.textedit.source.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.extra.uml.compare.source.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.extra.uml.compare.source.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.extra.umlrt.source.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.extra.umlrt.source.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.java.generator.source.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.java.generator.source.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.java.reverse.source.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.java.reverse.source.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.extra.robotml.source.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.extra.robotml.source.feature" version="0.0.0"/>

-         

-   <includes id="org.eclipse.papyrus.extra.qompass.designer.basic.source.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.extra.qompass.designer.basic.source.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.extra.qompass.designer.tracing.source.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.extra.qompass.designer.tracing.source.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.extra.cpp.source.feature" version="0.0.0"/>

-         

-   <includes id="org.eclipse.papyrus.java.profile.source.feature" version="0.0.0"/>

-       

-   <includes id="org.eclipse.papyrus.robotml.generators.intempora.rtmaps.source.feature" version="0.0.0"/>

-   

-   <includes id="org.eclipse.papyrus.extra.uml.diagram.css.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.extra.cpp.source.feature"

+         version="0.0.0"/>

 

-</feature>
\ No newline at end of file
+   <includes

+         id="org.eclipse.papyrus.java.profile.source.feature"

+         version="0.0.0"/>

+

+   <includes

+         id="org.eclipse.papyrus.robotml.generators.intempora.rtmaps.source.feature"

+         version="0.0.0"/>

+

+</feature>

diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.uml.diagram.css.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.uml.diagram.css.feature/feature.xml
deleted file mode 100644
index 00f1f4fa714..00000000000
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.uml.diagram.css.feature/feature.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.extra.uml.diagram.css.feature" label="Papyrus UML CSS Feature (Incubation)" provider-name="Eclipse Modeling Project" version="1.0.0.qualifier">

-

-   <copyright url="http://www.eclipse.org/legal/epl-v10.html">

-      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

-   </copyright>

-

-   <license url="%licenseURL">

-      %license

-   </license>

-

-   <requires>

-      <import feature="org.eclipse.papyrus.extra.infra.gmfdiag.css.feature" version="0.10.1.qualifier"/>

-   </requires>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.uml.diagram.css" install-size="0" unpack="false" version="0.0.0"/>

-

-</feature>
\ No newline at end of file
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.uml.diagram.css.feature/.project b/features/papyrus-extra-features/org.eclipse.papyrus.tablemigration.feature/.project
index 4a107d490e8..77780999cd2 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.uml.diagram.css.feature/.project
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.tablemigration.feature/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-	<name>org.eclipse.papyrus.extra.uml.diagram.css.feature</name>

+	<name>org.eclipse.papyrus.tablemigration.feature</name>

 	<comment></comment>

 	<projects>

 	</projects>

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sysml.table.feature/build.properties b/features/papyrus-extra-features/org.eclipse.papyrus.tablemigration.feature/build.properties
index 128baaa4d3b..128baaa4d3b 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.sysml.table.feature/build.properties
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.tablemigration.feature/build.properties
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.table.feature/epl-v10.html b/features/papyrus-extra-features/org.eclipse.papyrus.tablemigration.feature/epl-v10.html
index cb1073a4bad..cb1073a4bad 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.table.feature/epl-v10.html
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.tablemigration.feature/epl-v10.html
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.table.feature/feature.properties b/features/papyrus-extra-features/org.eclipse.papyrus.tablemigration.feature/feature.properties
index 3d80ed179fc..3d80ed179fc 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.table.feature/feature.properties
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.tablemigration.feature/feature.properties
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.tablemigration.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.tablemigration.feature/feature.xml
new file mode 100644
index 00000000000..f622326abc8
--- /dev/null
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.tablemigration.feature/feature.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<feature

+      id="org.eclipse.papyrus.tablemigration.feature"

+      label="Papyrus table (Incubation)"

+      version="1.0.0.qualifier"

+      provider-name="Eclipse Modeling Project">

+

+   <copyright url="http://www.eclipse.org/legal/epl-v10.html">

+      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

+   </copyright>

+

+   <license url="%licenseURL">

+      %license

+   </license>

+

+   <plugin

+         id="org.eclipse.papyrus.infra.table.instance"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.papyrus.infra.table.modelexplorer"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.papyrus.infra.emf.nattable.converter"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+</feature>

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.table.feature/license.html b/features/papyrus-extra-features/org.eclipse.papyrus.tablemigration.feature/license.html
index f19c483b9c8..f19c483b9c8 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.table.feature/license.html
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.tablemigration.feature/license.html
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.doc.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.doc.feature/feature.xml
index b3e6cb1f0f2..fda4b0ff72f 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.doc.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.doc.feature/feature.xml
@@ -1,11 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.doc.feature" label="Papyrus Documentation Feature (Incubation)" provider-name="Eclipse Modeling Project" version="1.0.0.qualifier">

+<?xml version="1.0" encoding="UTF-8"?>

+<feature

+      id="org.eclipse.papyrus.doc.feature"

+      label="Papyrus Documentation Feature (Incubation)"

+      version="1.0.0.qualifier"

+      provider-name="Eclipse Modeling Project">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

-      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

+      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

    </copyright>

 

@@ -13,16 +18,49 @@ http://www.eclipse.org/legal/epl-v10.html
       %license

    </license>

 

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.css.doc" install-size="0" version="0.0.0"/>

+   <plugin

+         id="org.eclipse.papyrus.infra.gmfdiag.css.doc"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"/>

 

-   <plugin download-size="0" id="org.eclipse.papyrus.uml.search.ui.doc" install-size="0" unpack="false" version="0.0.0"/>

+   <plugin

+         id="org.eclipse.papyrus.uml.search.ui.doc"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

 

-   <plugin download-size="0" id="org.eclipse.papyrus.cdo.ui.doc" install-size="0" unpack="false" version="0.0.0"/>

+   <plugin

+         id="org.eclipse.papyrus.cdo.ui.doc"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

 

-   <plugin download-size="0" id="org.eclipse.papyrus.uml.diagram.common.doc" install-size="0" version="0.0.0"/>

+   <plugin

+         id="org.eclipse.papyrus.uml.diagram.common.doc"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"/>

 

-   <plugin download-size="0" id="org.eclipse.papyrus.uml.diagram.profile.doc" install-size="0" version="0.0.0"/>

+   <plugin

+         id="org.eclipse.papyrus.uml.diagram.profile.doc"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"/>

 

-   <plugin download-size="0" id="org.eclipse.papyrus.dsml.validation.doc" install-size="0" unpack="false" version="0.0.0"/>

+   <plugin

+         id="org.eclipse.papyrus.dsml.validation.doc"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

 

-</feature>
\ No newline at end of file
+   <plugin

+         id="org.eclipse.papyrus.uml.doc"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"/>

+

+</feature>

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/feature.xml
index ec6e344c914..4ef94005770 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.feature/feature.xml
@@ -1,11 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.infra.feature" label="Papyrus infra (Incubation)" provider-name="Eclipse Modeling Project" version="1.0.0.qualifier">

+<?xml version="1.0" encoding="UTF-8"?>

+<feature

+      id="org.eclipse.papyrus.infra.feature"

+      label="Papyrus infra (Incubation)"

+      version="1.0.0.qualifier"

+      provider-name="Eclipse Modeling Project">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

-      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

+      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

    </copyright>

 

@@ -13,28 +18,94 @@ http://www.eclipse.org/legal/epl-v10.html
       %license

    </license>

 

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.export" install-size="0" unpack="false" version="0.0.0"/>

+   <plugin

+         id="org.eclipse.papyrus.infra.export"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

 

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.extendedtypes" install-size="0" unpack="false" version="0.0.0"/>

+   <plugin

+         id="org.eclipse.papyrus.infra.extendedtypes"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

 

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.extendedtypes.emf" install-size="0" unpack="false" version="0.0.0"/>

+   <plugin

+         id="org.eclipse.papyrus.infra.extendedtypes.emf"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

 

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.onefile" install-size="0" unpack="false" version="0.0.0"/>

+   <plugin

+         id="org.eclipse.papyrus.infra.onefile"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

 

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.ui.resources" install-size="0" unpack="false" version="0.0.0"/>

+   <plugin

+         id="org.eclipse.papyrus.infra.ui.resources"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

 

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.tools" install-size="0" unpack="false" version="0.0.0"/>

+   <plugin

+         id="org.eclipse.papyrus.infra.tools"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

 

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.constraints" install-size="0" unpack="false" version="0.0.0"/>

+   <plugin

+         id="org.eclipse.papyrus.infra.constraints"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

 

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.constraints.edit" install-size="0" unpack="false" version="0.0.0"/>

+   <plugin

+         id="org.eclipse.papyrus.infra.constraints.edit"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

 

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.constraints.editor" install-size="0" unpack="false" version="0.0.0"/>

+   <plugin

+         id="org.eclipse.papyrus.infra.constraints.editor"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

 

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.hyperlink" install-size="0" unpack="false" version="0.0.0"/>

+   <plugin

+         id="org.eclipse.papyrus.infra.hyperlink"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

 

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.doc" install-size="0" version="0.0.0"/>

+   <plugin

+         id="org.eclipse.papyrus.infra.doc"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"/>

 

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.psf" install-size="0" unpack="false" version="0.0.0"/>

+   <plugin

+         id="org.eclipse.papyrus.infra.psf"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

 

-</feature>
\ No newline at end of file
+   <plugin

+         id="org.eclipse.papyrus.infra.newchild"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+</feature>

diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.infra.gmfdiag.css.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.css.feature/.project
index f5e3fb34787..7905f6c0105 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.infra.gmfdiag.css.feature/.project
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.css.feature/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-	<name>org.eclipse.papyrus.extra.infra.gmfdiag.css.feature</name>

+	<name>org.eclipse.papyrus.infra.gmfdiag.css.feature</name>

 	<comment></comment>

 	<projects>

 	</projects>

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.table.feature/build.properties b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.css.feature/build.properties
index 128baaa4d3b..128baaa4d3b 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.table.feature/build.properties
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.css.feature/build.properties
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sysml.table.feature/epl-v10.html b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.css.feature/epl-v10.html
index cb1073a4bad..cb1073a4bad 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.sysml.table.feature/epl-v10.html
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.css.feature/epl-v10.html
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.infra.gmfdiag.css.feature/feature.properties b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.css.feature/feature.properties
index 6fabaaf2db3..6fabaaf2db3 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.infra.gmfdiag.css.feature/feature.properties
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.css.feature/feature.properties
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.css.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.css.feature/feature.xml
new file mode 100644
index 00000000000..4d94561e67c
--- /dev/null
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.css.feature/feature.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<feature

+      id="org.eclipse.papyrus.infra.gmfdiag.css.feature"

+      label="Papyrus CSS Feature (Incubation)"

+      version="1.0.0.qualifier"

+      provider-name="Eclipse Modeling Project">

+

+   <copyright url="http://www.eclipse.org/legal/epl-v10.html">

+      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

+   </copyright>

+

+   <license url="%licenseURL">

+      %license

+   </license>

+

+   <plugin

+         id="org.eclipse.papyrus.infra.gmfdiag.css"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.papyrus.infra.gmfdiag.css.configuration"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.papyrus.infra.gmfdiag.css.properties"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.papyrus.infra.gmfdiag.css.xtext"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.papyrus.infra.gmfdiag.css.theme"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"/>

+

+   <plugin

+         id="org.eclipse.papyrus.infra.gmfdiag.css.model"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.papyrus.infra.gmfdiag.css.palette"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+</feature>

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sysml.table.feature/license.html b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.css.feature/license.html
index f19c483b9c8..f19c483b9c8 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.sysml.table.feature/license.html
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.css.feature/license.html
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature/feature.xml
index 4824b6735e1..1bfc5e18dba 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.gmfdiag.feature/feature.xml
@@ -1,11 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.infra.gmfdiag.feature" label="Papyrus GMF diagram (Incubation)" provider-name="Eclipse Modeling Project" version="1.0.0.qualifier">

+<?xml version="1.0" encoding="UTF-8"?>

+<feature

+      id="org.eclipse.papyrus.infra.gmfdiag.feature"

+      label="Papyrus GMF diagram (Incubation)"

+      version="1.0.0.qualifier"

+      provider-name="Eclipse Modeling Project">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

-      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

+      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

    </copyright>

 

@@ -17,40 +22,116 @@ http://www.eclipse.org/legal/epl-v10.html
       <import plugin="org.apache.log4j"/>

    </requires>

 

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.commands" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.navigation" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.outline" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.preferences" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.properties" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.widgets" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.common" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.modelexplorer" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.css.model" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.extensionpoints.editors" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.dnd" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.hyperlink" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.viewersearcher" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.controlmode" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.xtext.glue" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.menu" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.css.palette" install-size="0" unpack="false" version="0.0.0"/>

-

-</feature>
\ No newline at end of file
+   <plugin

+         id="org.eclipse.papyrus.infra.gmfdiag.commands"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.papyrus.infra.gmfdiag.navigation"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.papyrus.infra.gmfdiag.outline"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.papyrus.infra.gmfdiag.preferences"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.papyrus.infra.gmfdiag.properties"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.papyrus.infra.gmfdiag.widgets"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.papyrus.infra.gmfdiag.common"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.papyrus.infra.gmfdiag.modelexplorer"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.papyrus.extensionpoints.editors"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.papyrus.infra.gmfdiag.dnd"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.papyrus.infra.gmfdiag.hyperlink"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.papyrus.infra.gmfdiag.viewersearcher"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.papyrus.infra.gmfdiag.controlmode"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.papyrus.infra.gmfdiag.xtext.glue"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.papyrus.infra.gmfdiag.menu"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+</feature>

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature/feature.xml
index 5f528cf7a95..6db5534b1a3 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.nattable.feature/feature.xml
@@ -1,11 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.infra.nattable.feature" label="Papyrus Table - New Version (Incubation)" provider-name="Eclipse Modeling Project" version="1.0.0.qualifier">

+<?xml version="1.0" encoding="UTF-8"?>

+<feature

+      id="org.eclipse.papyrus.infra.nattable.feature"

+      label="Papyrus Table - New Version (Incubation)"

+      version="1.0.0.qualifier"

+      provider-name="Eclipse Modeling Project">

 

    <copyright url="epl-v10.html">

-      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

+      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

    </copyright>

 

@@ -13,30 +18,88 @@ http://www.eclipse.org/legal/epl-v10.html
       %license

    </license>

 

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.nattable.model" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.nattable.model.edit" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.nattable.model.editor" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.nattable" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.nattable.common" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.nattable.modelexplorer" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.nattable.views.config" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.nattable.views.editor" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.emf.nattable.converter" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.emf.nattable" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.nattable.controlmode" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.nattable.properties" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.nebula.widgets.nattable.core" install-size="0" unpack="false" version="0.0.0"/>

-

-</feature>
\ No newline at end of file
+   <plugin

+         id="org.eclipse.papyrus.infra.nattable.model"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.papyrus.infra.nattable.model.edit"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.papyrus.infra.nattable.model.editor"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.papyrus.infra.nattable"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.papyrus.infra.nattable.common"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.papyrus.infra.nattable.modelexplorer"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.papyrus.infra.nattable.views.config"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.papyrus.infra.nattable.views.editor"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.papyrus.infra.emf.nattable"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.papyrus.infra.nattable.controlmode"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.papyrus.infra.nattable.properties"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.nebula.widgets.nattable.core"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+</feature>

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.table.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.table.feature/feature.xml
deleted file mode 100644
index e0261705f79..00000000000
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.table.feature/feature.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.infra.table.feature" label="Papyrus table (Incubation)" provider-name="Eclipse Modeling Project" version="1.0.0.qualifier">

-

-   <copyright url="http://www.eclipse.org/legal/epl-v10.html">

-      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

-   </copyright>

-

-   <license url="%licenseURL">

-      %license

-   </license>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.table.common" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.table.instance" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.table.menu" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.table.modelexplorer" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.table.properties" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.table.controlmode" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit" install-size="0" unpack="false" version="0.0.0"/>

-

-   <plugin download-size="0" id="org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor" install-size="0" unpack="false" version="0.0.0"/>

-

-</feature>
\ No newline at end of file
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml
index 39c94c103b3..09ba237a3c1 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml
@@ -1,11 +1,17 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.sdk.feature" label="Papyrus UML (Incubation)" plugin="org.eclipse.papyrus.infra.core" provider-name="Eclipse Modeling Project" version="1.0.0.qualifier">

+<?xml version="1.0" encoding="UTF-8"?>

+<feature

+      id="org.eclipse.papyrus.sdk.feature"

+      label="Papyrus UML (Incubation)"

+      version="1.0.0.qualifier"

+      provider-name="Eclipse Modeling Project"

+      plugin="org.eclipse.papyrus.infra.core">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

-      Copyright (c) 2012, 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

+      Copyright (c) 2012, 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

    </copyright>

 

@@ -13,74 +19,147 @@ http://www.eclipse.org/legal/epl-v10.html
       %license

    </license>

 

-   <includes id="org.eclipse.papyrus.customization.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.customization.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.editor.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.editor.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.infra.core.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.infra.core.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.infra.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.infra.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.infra.gmfdiag.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.infra.gmfdiag.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.infra.queries.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.infra.queries.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.infra.services.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.infra.services.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.infra.table.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.infra.widget.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.infra.widget.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.sysml.diagram.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.sysml.diagram.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.sysml.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.sysml.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.uml.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.sysml.table.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.uml.modelexplorer.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.uml.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.uml.properties.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.uml.modelexplorer.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.uml.tools.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.uml.properties.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.views.modelexplorer.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.uml.table.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.views.properties.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.uml.tools.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.uml.diagram.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.views.modelexplorer.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.sysml.properties.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.views.properties.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.infra.emf.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.uml.diagram.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.sysml.modelexplorer.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.sysml.properties.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.uml.textedit.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.infra.emf.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.uml.alf.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.sysml.modelexplorer.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.xwt.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.uml.textedit.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.infra.discovery.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.uml.alf.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.views.validation.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.xwt.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.doc.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.infra.discovery.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.views.search.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.views.validation.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.uml.search.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.doc.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.uml.xtext.integration.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.views.search.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.infra.nattable.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.uml.search.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.sysml.nattable.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.uml.xtext.integration.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.uml.nattable.feature"

+         version="0.0.0"/>

 

-  <includes id="org.eclipse.papyrus.infra.nattable.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.infra.gmfdiag.css.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.sysml.nattable.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.uml.diagram.css.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.uml.nattable.feature" version="0.0.0"/>

+   <plugin

+         id="com.google.guava"

+         download-size="0"

+         install-size="0"

+         version="11.0.2.v201303041551"

+         unpack="false"/>

 

-</feature>
\ No newline at end of file
+</feature>

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sdk.sources.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.sdk.sources.feature/feature.xml
index 981c6a94f17..addad57e29e 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.sdk.sources.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.sdk.sources.feature/feature.xml
@@ -1,11 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.sdk.sources.feature" label="Papyrus SDK Binaries and sources (Incubation)" provider-name="Eclipse Modeling Project" version="1.0.0.qualifier">

+<?xml version="1.0" encoding="UTF-8"?>

+<feature

+      id="org.eclipse.papyrus.sdk.sources.feature"

+      label="Papyrus UML SDK (Incubation)"

+      version="1.0.0.qualifier"

+      provider-name="Eclipse Modeling Project">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

-      Copyright (c) 2012, 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

+      Copyright (c) 2012, 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

    </copyright>

 

@@ -13,74 +18,140 @@ http://www.eclipse.org/legal/epl-v10.html
       %license

    </license>

 

-   <includes id="org.eclipse.papyrus.sdk.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.sdk.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.customization.source.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.customization.source.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.editor.source.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.editor.source.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.infra.core.source.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.infra.core.source.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.infra.source.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.infra.source.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.infra.gmfdiag.source.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.infra.gmfdiag.source.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.infra.queries.source.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.infra.queries.source.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.infra.services.source.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.infra.services.source.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.infra.table.source.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.infra.widget.source.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.infra.widget.source.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.sysml.diagram.source.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.sysml.diagram.source.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.sysml.source.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.sysml.source.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.uml.source.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.sysml.table.source.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.uml.modelexplorer.source.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.uml.source.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.uml.properties.source.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.uml.modelexplorer.source.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.uml.tools.source.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.uml.properties.source.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.views.modelexplorer.source.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.uml.table.source.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.views.properties.source.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.uml.tools.source.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.uml.diagram.source.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.views.modelexplorer.source.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.sysml.properties.source.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.views.properties.source.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.infra.emf.source.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.uml.diagram.source.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.uml.textedit.source.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.sysml.properties.source.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.uml.alf.source.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.infra.emf.source.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.xwt.source.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.uml.textedit.source.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.infra.discovery.source.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.uml.alf.source.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.views.validation.source.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.xwt.source.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.doc.source.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.infra.discovery.source.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.views.search.source.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.views.validation.source.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.uml.search.source.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.doc.source.feature" version="0.0.0"/>

-         

-   <includes id="org.eclipse.papyrus.views.search.source.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.uml.xtext.integration.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.uml.search.source.feature" version="0.0.0"/>

-   

-   <includes id="org.eclipse.papyrus.uml.xtext.integration.feature" version="0.0.0"/>

-   

-   <includes id="org.eclipse.papyrus.infra.nattable.source.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.infra.nattable.source.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.sysml.nattable.source.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.sysml.nattable.source.feature"

+         version="0.0.0"/>

 

-   <includes id="org.eclipse.papyrus.uml.nattable.source.feature" version="0.0.0"/>

+   <includes

+         id="org.eclipse.papyrus.uml.nattable.source.feature"

+         version="0.0.0"/>

 

-</feature>
\ No newline at end of file
+   <includes

+         id="org.eclipse.papyrus.infra.gmfdiag.css.source.feature"

+         version="0.0.0"/>

+

+   <includes

+         id="org.eclipse.papyrus.uml.diagram.css.source.feature"

+         version="0.0.0"/>

+

+</feature>

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sysml.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.sysml.feature/feature.xml
index 0b5909ea3ac..c9981be16b0 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.sysml.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.sysml.feature/feature.xml
@@ -1,24 +1,42 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.sysml.feature" label="%featureName" provider-name="%providerName" version="1.0.0.qualifier">

+<?xml version="1.0" encoding="UTF-8"?>

+<feature

+      id="org.eclipse.papyrus.sysml.feature"

+      label="%featureName"

+      version="1.0.0.qualifier"

+      provider-name="%providerName">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

-      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

+      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

    </copyright>

 

    <license url="%licenseURL">

-		%license

-	</license>

+      %license

+   </license>

 

-   <plugin download-size="0" id="org.eclipse.papyrus.sysml" install-size="0" unpack="false" version="0.0.0"/>

+   <plugin

+         id="org.eclipse.papyrus.sysml"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

 

-   <plugin download-size="0" id="org.eclipse.papyrus.sysml.facets" install-size="0" unpack="false" version="0.0.0"/>

+   <plugin

+         id="org.eclipse.papyrus.sysml.service.types"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

 

-   <plugin download-size="0" id="org.eclipse.papyrus.sysml.service.types" install-size="0" unpack="false" version="0.0.0"/>

+   <plugin

+         id="org.eclipse.papyrus.sysml.edit"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

 

-   <plugin download-size="0" id="org.eclipse.papyrus.sysml.edit" install-size="0" unpack="false" version="0.0.0"/>

-

-</feature>
\ No newline at end of file
+</feature>

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.css.feature/.project b/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.css.feature/.project
new file mode 100644
index 00000000000..c936b08cba8
--- /dev/null
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.css.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.papyrus.uml.diagram.css.feature</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.pde.FeatureBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.pde.FeatureNature</nature>

+	</natures>

+</projectDescription>

diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.uml.diagram.css.feature/build.properties b/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.css.feature/build.properties
index 463be2d773f..463be2d773f 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.uml.diagram.css.feature/build.properties
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.css.feature/build.properties
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.table.feature/epl-v10.html b/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.css.feature/epl-v10.html
index cb1073a4bad..cb1073a4bad 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.table.feature/epl-v10.html
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.css.feature/epl-v10.html
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.uml.diagram.css.feature/feature.properties b/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.css.feature/feature.properties
index 36eec9ba698..36eec9ba698 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.uml.diagram.css.feature/feature.properties
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.css.feature/feature.properties
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.css.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.css.feature/feature.xml
new file mode 100644
index 00000000000..a2604b096dd
--- /dev/null
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.css.feature/feature.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<feature

+      id="org.eclipse.papyrus.uml.diagram.css.feature"

+      label="Papyrus CSS UML Feature (Incubation)"

+      version="1.0.0.qualifier"

+      provider-name="Eclipse Modeling Project">

+

+   <copyright url="http://www.eclipse.org/legal/epl-v10.html">

+      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

+   </copyright>

+

+   <license url="%licenseURL">

+      %license

+   </license>

+

+   <requires>

+      <import feature="org.eclipse.papyrus.infra.gmfdiag.css.feature" version="0.10.1.qualifier"/>

+   </requires>

+

+   <plugin

+         id="org.eclipse.papyrus.uml.diagram.css"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+</feature>

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.uml.table.feature/license.html b/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.css.feature/license.html
index f19c483b9c8..f19c483b9c8 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.uml.table.feature/license.html
+++ b/features/papyrus-main-features/org.eclipse.papyrus.uml.diagram.css.feature/license.html
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.views.modelexplorer.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.views.modelexplorer.feature/feature.xml
index ac5167ee998..78c9a80713e 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.views.modelexplorer.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.views.modelexplorer.feature/feature.xml
@@ -1,22 +1,49 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.views.modelexplorer.feature" label="%featureName" provider-name="%providerName" version="1.0.0.qualifier">

+<?xml version="1.0" encoding="UTF-8"?>

+<feature

+      id="org.eclipse.papyrus.views.modelexplorer.feature"

+      label="%featureName"

+      version="1.0.0.qualifier"

+      provider-name="%providerName">

 

    <copyright url="http://www.eclipse.org/legal/epl-v10.html">

-      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

+      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

    </copyright>

 

    <license url="%licenseURL">

-		%license

-	</license>

+      %license

+   </license>

 

-   <plugin download-size="0" id="org.eclipse.papyrus.views.modelexplorer" install-size="0" unpack="false" version="0.0.0"/>

+   <plugin

+         id="org.eclipse.papyrus.views.modelexplorer"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

 

-   <plugin download-size="0" id="org.eclipse.papyrus.views.modelexplorer.resourceloading" install-size="0" unpack="false" version="0.0.0"/>

+   <plugin

+         id="org.eclipse.papyrus.views.modelexplorer.resourceloading"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

 

-   <plugin download-size="0" id="org.eclipse.papyrus.views.modelexplorer.widgets" install-size="0" unpack="false" version="0.0.0"/>

+   <plugin

+         id="org.eclipse.papyrus.views.modelexplorer.widgets"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

 

-</feature>
\ No newline at end of file
+   <plugin

+         id="org.eclipse.papyrus.views.modelexplorer.newchild"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+</feature>

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/EcoreGenerator.java b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/EcoreGenerator.java
index a001aaf3909..8198e5c3d07 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/EcoreGenerator.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/EcoreGenerator.java
@@ -237,7 +237,7 @@ public class EcoreGenerator extends AbstractQVTGenerator {
 			ecorePackage = (EPackage)loadEMFModel(packageURI);

 			ModelExtent inPackage = new BasicModelExtent(Collections.singletonList(ecorePackage));

 

-			PropertiesRoot root = ConfigurationManager.instance.getPropertiesRoot();

+			PropertiesRoot root = ConfigurationManager.getInstance().getPropertiesRoot();

 			ModelExtent inRoot = new BasicModelExtent(Collections.singletonList(root));

 

 			LinkedList<ModelExtent> result = new LinkedList<ModelExtent>();

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/ProfileGenerator.java b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/ProfileGenerator.java
index 5bc604718fa..3ff740ee691 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/ProfileGenerator.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/ProfileGenerator.java
@@ -96,7 +96,7 @@ public class ProfileGenerator extends AbstractQVTGenerator {
 			}

 			ModelExtent inUml = new BasicModelExtent(Collections.singletonList(umlContext));

 

-			PropertiesRoot root = ConfigurationManager.instance.getPropertiesRoot();

+			PropertiesRoot root = ConfigurationManager.getInstance().getPropertiesRoot();

 			ModelExtent inRoot = new BasicModelExtent(Collections.singletonList(root));

 

 			LinkedList<ModelExtent> result = new LinkedList<ModelExtent>();

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/layout/ProfileWithDatatypes.java b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/layout/ProfileWithDatatypes.java
index eae51078835..40bb1b8af93 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/layout/ProfileWithDatatypes.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/layout/ProfileWithDatatypes.java
@@ -60,7 +60,7 @@ public class ProfileWithDatatypes extends StandardLayoutGenerator {
 	@Override

 	protected CompositeWidget layoutCategorizedEditors(Category category, List<PropertyEditor> editors) {

 		if(((TypeCategory)category).isDatatype) {

-			CompositeWidgetType compositeType = ConfigurationManager.instance.getDefaultCompositeType();

+			CompositeWidgetType compositeType = ConfigurationManager.getInstance().getDefaultCompositeType();

 

 			CompositeWidget container = UiFactory.eINSTANCE.createCompositeWidget();

 			container.setWidgetType(compositeType);

@@ -148,7 +148,7 @@ public class ProfileWithDatatypes extends StandardLayoutGenerator {
 	}

 

 	protected Layout createLayout(Integer columns) {

-		LayoutType propertiesLayoutType = ConfigurationManager.instance.getDefaultLayoutType();

+		LayoutType propertiesLayoutType = ConfigurationManager.getInstance().getDefaultLayoutType();

 

 		Layout layout = UiFactory.eINSTANCE.createLayout();

 		ValueAttribute numColumns = UiFactory.eINSTANCE.createValueAttribute();

@@ -162,7 +162,7 @@ public class ProfileWithDatatypes extends StandardLayoutGenerator {
 	}

 

 	protected CompositeWidgetType getGroupComposite() {

-		for(Environment environment : ConfigurationManager.instance.getPropertiesRoot().getEnvironments()) {

+		for(Environment environment : ConfigurationManager.getInstance().getPropertiesRoot().getEnvironments()) {

 			for(CompositeWidgetType widgetType : environment.getCompositeWidgetTypes()) {

 				if(widgetType.getNamespace() == null && widgetType.getWidgetClass().equals("Group")) {

 					return widgetType;

@@ -171,11 +171,11 @@ public class ProfileWithDatatypes extends StandardLayoutGenerator {
 		}

 

 		Activator.log.warn("Cannot find the Group composite type");

-		return ConfigurationManager.instance.getDefaultCompositeType();

+		return ConfigurationManager.getInstance().getDefaultCompositeType();

 	}

 

 	protected PropertyEditorType getViewEditor() {

-		for(Environment environment : ConfigurationManager.instance.getPropertiesRoot().getEnvironments()) {

+		for(Environment environment : ConfigurationManager.getInstance().getPropertiesRoot().getEnvironments()) {

 			for(PropertyEditorType widgetType : environment.getPropertyEditorTypes()) {

 				if(widgetType.getNamespace() != null && "ppe".equals(widgetType.getNamespace().getName()) && widgetType.getWidgetClass().equals("ViewEditor")) {

 					return widgetType;

@@ -184,7 +184,7 @@ public class ProfileWithDatatypes extends StandardLayoutGenerator {
 		}

 

 		Activator.log.warn("Cannot find the Group composite type");

-		return ConfigurationManager.instance.getDefaultEditorType(Type.STRING, false);

+		return ConfigurationManager.getInstance().getDefaultEditorType(Type.STRING, false);

 	}

 

 	@Override

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/layout/StandardLayoutGenerator.java b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/layout/StandardLayoutGenerator.java
index 48f6a4786a5..b1805b0001e 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/layout/StandardLayoutGenerator.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/layout/StandardLayoutGenerator.java
@@ -61,7 +61,7 @@ public class StandardLayoutGenerator implements ILayoutGenerator {
 		editorsByCategory.clear();

 		namespaces.clear();

 

-		namespaces.addAll(ConfigurationManager.instance.getBaseNamespaces());

+		namespaces.addAll(ConfigurationManager.getInstance().getBaseNamespaces());

 

 		sortEditors(editors);

 

@@ -80,8 +80,8 @@ public class StandardLayoutGenerator implements ILayoutGenerator {
 	}

 

 	protected CompositeWidget layoutCategorizedEditors(Category category, List<PropertyEditor> editors) {

-		CompositeWidgetType compositeType = ConfigurationManager.instance.getDefaultCompositeType();

-		LayoutType propertiesLayoutType = ConfigurationManager.instance.getDefaultLayoutType();

+		CompositeWidgetType compositeType = ConfigurationManager.getInstance().getDefaultCompositeType();

+		LayoutType propertiesLayoutType = ConfigurationManager.getInstance().getDefaultLayoutType();

 

 		CompositeWidget container = UiFactory.eINSTANCE.createCompositeWidget();

 		container.setWidgetType(compositeType);

@@ -130,9 +130,9 @@ public class StandardLayoutGenerator implements ILayoutGenerator {
 	}

 

 	protected CompositeWidget createSectionRoot() {

-		CompositeWidgetType compositeType = ConfigurationManager.instance.getDefaultCompositeType();

+		CompositeWidgetType compositeType = ConfigurationManager.getInstance().getDefaultCompositeType();

 		namespaces.add(compositeType.getNamespace());

-		LayoutType propertiesLayoutType = ConfigurationManager.instance.getDefaultLayoutType();

+		LayoutType propertiesLayoutType = ConfigurationManager.getInstance().getDefaultLayoutType();

 		namespaces.add(propertiesLayoutType.getNamespace());

 

 		CompositeWidget sectionRoot = UiFactory.eINSTANCE.createCompositeWidget();

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/CreateContextWizard.java b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/CreateContextWizard.java
index 09f93767ded..4a08d8f2c91 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/CreateContextWizard.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/wizard/CreateContextWizard.java
@@ -98,7 +98,7 @@ public class CreateContextWizard extends Wizard implements INewWizard {
 			return false;

 		}

 

-		ConfigurationManager configManager = ConfigurationManager.instance;

+		ConfigurationManager configManager = ConfigurationManager.getInstance();

 

 		for(Context context : contexts) {

 			Tab defaultTab = ContextsFactory.eINSTANCE.createTab();

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src/org/eclipse/papyrus/customization/properties/model/xwt/resource/XWTResource.java b/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src/org/eclipse/papyrus/customization/properties/model/xwt/resource/XWTResource.java
index 17a56849b00..211d1dc8d66 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src/org/eclipse/papyrus/customization/properties/model/xwt/resource/XWTResource.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src/org/eclipse/papyrus/customization/properties/model/xwt/resource/XWTResource.java
@@ -48,6 +48,7 @@ import org.eclipse.papyrus.customization.properties.model.xwt.format.XMLFormatte
 import org.eclipse.papyrus.views.properties.contexts.Context;

 import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager;

 import org.eclipse.papyrus.views.properties.ui.CompositeWidget;

+import org.eclipse.papyrus.views.properties.ui.UiPackage;

 import org.eclipse.papyrus.views.properties.util.PropertiesUtil;

 

 /**

@@ -169,7 +170,7 @@ public class XWTResource extends ResourceImpl {
 		List<Context> contexts = new LinkedList<Context>(findContexts());

 

 		ModelExtent inXml = getModelExtent(genericXMLRoot);

-		ModelExtent inRoot = getModelExtent(ConfigurationManager.instance.getPropertiesRoot());

+		ModelExtent inRoot = getModelExtent(ConfigurationManager.getInstance().getPropertiesRoot());

 		ModelExtent inContexts = new BasicModelExtent(contexts);

 		ModelExtent outUI = new BasicModelExtent();

 

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/UIEditor.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/UIEditor.java
index 2a4a1f6b487..a4ce4f09e3d 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/UIEditor.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/UIEditor.java
@@ -126,6 +126,7 @@ public class UIEditor extends EcoreEditor implements ITabbedPropertySheetPageCon
 			final StringEditor filterPattern = new StringEditor(parent, SWT.NONE, Messages.UIEditor_FilterViews);

 			filterPattern.addCommitListener(new ICommitListener() {

 

+				@Override

 				public void commit(AbstractEditor editor) {

 					filter.setPattern((String)filterPattern.getValue());

 					selectionViewer.refresh();

@@ -321,7 +322,7 @@ public class UIEditor extends EcoreEditor implements ITabbedPropertySheetPageCon
 	private void refreshContext() {

 		Context context = getContext();

 		if(context != null) {

-			ConfigurationManager.instance.refresh(context);

+			ConfigurationManager.getInstance().refresh(context);

 		}

 	}

 

@@ -333,6 +334,7 @@ public class UIEditor extends EcoreEditor implements ITabbedPropertySheetPageCon
 		return iPropertySheetPage;

 	}

 

+	@Override

 	public String getContributorId() {

 		return "CustomizationPropertyView"; //$NON-NLS-1$

 	}

@@ -375,6 +377,7 @@ public class UIEditor extends EcoreEditor implements ITabbedPropertySheetPageCon
 	 */

 	protected IPropertySheetPage iPropertySheetPage;

 

+	@Override

 	public void commandStackChanged(EventObject event) {

 		getViewer().refresh();

 		for(Preview preview : previews) {

@@ -416,9 +419,11 @@ public class UIEditor extends EcoreEditor implements ITabbedPropertySheetPageCon
 		//

 		commandStack.addCommandStackListener(new CommandStackListener() {

 

+			@Override

 			public void commandStackChanged(final EventObject event) {

 				getContainer().getDisplay().asyncExec(new Runnable() {

 

+					@Override

 					public void run() {

 						firePropertyChange(IEditorPart.PROP_DIRTY);

 

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/actions/CreateSectionAction.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/actions/CreateSectionAction.java
index e3c5e222c9b..aef909d7e75 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/actions/CreateSectionAction.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/actions/CreateSectionAction.java
@@ -111,8 +111,9 @@ public class CreateSectionAction extends StaticSelectionCommandAction {
 

 		if(tab == null) {

 			Context context = (Context)view.eContainer();

-			if(context.getTabs().size() > 0)

+			if(context.getTabs().size() > 0) {

 				tab = context.getTabs().get(0);

+			}

 		}

 

 		if(tab == null) {

@@ -152,10 +153,10 @@ public class CreateSectionAction extends StaticSelectionCommandAction {
 			newWidget.getAttributes().add(attribute);

 		}

 

-		newWidget.setWidgetType(ConfigurationManager.instance.getDefaultCompositeType());

+		newWidget.setWidgetType(ConfigurationManager.getInstance().getDefaultCompositeType());

 

 		Layout layout = UiFactory.eINSTANCE.createLayout();

-		layout.setLayoutType(ConfigurationManager.instance.getDefaultLayoutType());

+		layout.setLayoutType(ConfigurationManager.getInstance().getDefaultLayoutType());

 		newWidget.setLayout(layout);

 

 		return newWidget;

@@ -184,10 +185,11 @@ public class CreateSectionAction extends StaticSelectionCommandAction {
 	}

 

 	private Command getSetWidgetCommand(CompositeWidget newWidget, Section section) {

-		if(section.getWidget() == null)

+		if(section.getWidget() == null) {

 			return SetCommand.create(editingDomain, section, section.eClass().getEStructuralFeature("widget"), newWidget); //$NON-NLS-1$

-		else

+		} else {

 			return UnexecutableCommand.INSTANCE;

+		}

 	}

 

 	private String getSectionFile() {

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/actions/CreateSectionWidgetAction.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/actions/CreateSectionWidgetAction.java
index 0302df85068..5ae86d0adac 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/actions/CreateSectionWidgetAction.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/editor/actions/CreateSectionWidgetAction.java
@@ -87,10 +87,10 @@ public class CreateSectionWidgetAction extends StaticSelectionCommandAction {
 			newWidget.getAttributes().add(attribute);

 		}

 

-		newWidget.setWidgetType(ConfigurationManager.instance.getDefaultCompositeType());

+		newWidget.setWidgetType(ConfigurationManager.getInstance().getDefaultCompositeType());

 

 		Layout layout = UiFactory.eINSTANCE.createLayout();

-		layout.setLayoutType(ConfigurationManager.instance.getDefaultLayoutType());

+		layout.setLayoutType(ConfigurationManager.getInstance().getDefaultLayoutType());

 		newWidget.setLayout(layout);

 

 		return newWidget;

@@ -119,9 +119,10 @@ public class CreateSectionWidgetAction extends StaticSelectionCommandAction {
 	}

 

 	private Command getSetWidgetCommand(CompositeWidget newWidget) {

-		if(section.getWidget() == null)

+		if(section.getWidget() == null) {

 			return SetCommand.create(editingDomain, section, section.eClass().getEStructuralFeature("widget"), newWidget); //$NON-NLS-1$

-		else

+		} else {

 			return UnexecutableCommand.INSTANCE;

+		}

 	}

 }

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/CustomizationModelElement.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/CustomizationModelElement.java
index f2b996b9b79..0a7f2493da5 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/CustomizationModelElement.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/modelelement/CustomizationModelElement.java
@@ -122,7 +122,7 @@ public class CustomizationModelElement extends AbstractModelElement {
 			if(feature.getEType() == EnvironmentPackage.eINSTANCE.getPropertyEditorType()) {

 				return new PropertyEditorTypeContentProvider(strategyProvider, (PropertyEditor)delegate.getSource());

 			} else {

-				return new EMFGraphicalContentProvider(strategyProvider, ConfigurationManager.instance.getResourceSet(), "history_" + feature.getName());

+				return new EMFGraphicalContentProvider(strategyProvider, ConfigurationManager.getInstance().getResourceSet(), "history_" + feature.getName());

 			}

 		}

 		return provider;

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/DependencyContentProvider.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/DependencyContentProvider.java
index 28699027757..b18156e3179 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/DependencyContentProvider.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/DependencyContentProvider.java
@@ -33,8 +33,9 @@ public class DependencyContentProvider extends AbstractStaticContentProvider {
 		this.source = source;

 	}

 

+	@Override

 	public Object[] getElements() {

-		List<Context> registeredContexts = new LinkedList<Context>(ConfigurationManager.instance.getContexts());

+		List<Context> registeredContexts = new LinkedList<Context>(ConfigurationManager.getInstance().getContexts());

 		List<Context> localContexts = new LinkedList<Context>();

 		for(Resource resource : source.eResource().getResourceSet().getResources()) {

 			for(EObject element : resource.getContents()) {

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/EnvironmentContentProvider.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/EnvironmentContentProvider.java
index a1a2565786e..59576535b44 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/EnvironmentContentProvider.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/EnvironmentContentProvider.java
@@ -48,7 +48,7 @@ public class EnvironmentContentProvider extends SemanticEMFContentProvider imple
 		}

 

 		List<Object> allObjects = new LinkedList<Object>();

-		for(Environment environment : ConfigurationManager.instance.getPropertiesRoot().getEnvironments()) {

+		for(Environment environment : ConfigurationManager.getInstance().getPropertiesRoot().getEnvironments()) {

 			allObjects.addAll((List<?>)environment.eGet(feature));

 		}

 		return allObjects.toArray(new EObject[0]);

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/TabContentProvider.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/TabContentProvider.java
index e50515b6b62..a76ac374974 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/TabContentProvider.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/providers/TabContentProvider.java
@@ -42,22 +42,25 @@ public class TabContentProvider extends AbstractContextualContentProvider {
 		super(source);

 	}

 

+	@Override

 	public Object[] getElements() {

 		List<Tab> tabs = new LinkedList<Tab>();

 		for(Context context : contexts) {

-			if(isValidContext(context))

+			if(isValidContext(context)) {

 				tabs.addAll(context.getTabs());

+			}

 		}

 		return tabs.toArray();

 	}

 

 	private boolean isValidContext(Context context) {

 		if(editableTabsOnly) {

-			return !ConfigurationManager.instance.isPlugin(context);

+			return !ConfigurationManager.getInstance().isPlugin(context);

 		}

 		return true;

 	}

 

+	@Override

 	public Object[] getElements(Object inputElement) {

 		return getElements();

 	}

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/workspace/WorkspaceContextCopyAction.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/workspace/WorkspaceContextCopyAction.java
index ea2603568a9..bb5662c6cae 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/workspace/WorkspaceContextCopyAction.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/storage/actions/workspace/WorkspaceContextCopyAction.java
@@ -54,10 +54,12 @@ import org.eclipse.papyrus.views.properties.util.PropertiesUtil;
  */

 public class WorkspaceContextCopyAction implements IContextCopyAction {

 

+	@Override

 	public String getLabel() {

 		return Messages.CustomizationDialog_copyToWorkspace;

 	}

 

+	@Override

 	public String getToolTip() {

 		return Messages.CustomizationDialog_createNewCopyByCopy;

 	}

@@ -80,6 +82,7 @@ public class WorkspaceContextCopyAction implements IContextCopyAction {
 	 *         If an error occured : the previous context cannot be read, or

 	 *         the new context cannot be created

 	 */

+	@Override

 	public Context copy(Context source, String targetName, IProgressMonitor monitor) throws CoreException {

 		SubMonitor sub = SubMonitor.convert(monitor, 1);

 

@@ -99,7 +102,7 @@ public class WorkspaceContextCopyAction implements IContextCopyAction {
 			IStatus copyResult = copyAll(sourceContext, new File(targetDirectory, targetName + ".ctx"), sub.newChild(1, SubMonitor.SUPPRESS_NONE)); //$NON-NLS-1$

 

 			if(copyResult.isOK()) {

-				result = ConfigurationManager.instance.getContext(targetModelUri);

+				result = ConfigurationManager.getInstance().getContext(targetModelUri);

 

 				result.setName(targetName);

 				result.setPrototype(source);

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/CopyContextAction.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/CopyContextAction.java
index 5339f53576d..8825fdc5aca 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/CopyContextAction.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/CopyContextAction.java
@@ -64,14 +64,15 @@ public class CopyContextAction {
 		try {

 			dialog.run(true, true, new IRunnableWithProgress() {

 

+				@Override

 				public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {

 					try {

 						result[0] = delegate.copy(source, targetName, monitor);

 

 						if(result[0] != null) {

-							ConfigurationManager.instance.addContext(result[0], activate);

+							ConfigurationManager.getInstance().addContext(result[0], activate);

 							if(activate) {

-								ConfigurationManager.instance.disableContext(source, true);

+								ConfigurationManager.getInstance().disableContext(source, true);

 							}

 						}

 					} catch (CoreException ex) {

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/CustomizationDialog.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/CustomizationDialog.java
index 257b99d3a87..55a51087db6 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/CustomizationDialog.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/CustomizationDialog.java
@@ -96,7 +96,7 @@ public class CustomizationDialog extends TrayDialog implements SelectionListener
 		label.setText(Messages.CustomizationDialog_selectContextToEdit);

 		label.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1));

 

-		Collection<Context> contexts = ConfigurationManager.instance.getCustomizableContexts();

+		Collection<Context> contexts = ConfigurationManager.getInstance().getCustomizableContexts();

 

 		availableContexts = new List(contents, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);

 		availableContexts.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));

@@ -109,7 +109,7 @@ public class CustomizationDialog extends TrayDialog implements SelectionListener
 			public String getText(final Object element) {

 				if(element != null && element instanceof Context) {

 					Context context = (Context)element;

-					return context.getName() + (ConfigurationManager.instance.isPlugin(context) ? Messages.CustomizationDialog_plugin : ""); //$NON-NLS-1$

+					return context.getName() + (ConfigurationManager.getInstance().isPlugin(context) ? Messages.CustomizationDialog_plugin : ""); //$NON-NLS-1$

 				}

 				return super.getText(element);

 			}

@@ -131,11 +131,11 @@ public class CustomizationDialog extends TrayDialog implements SelectionListener
 				copyContext.setData(copyAction);

 				copyContext.setEnabled(false);

 				copyContext.addSelectionListener(this);

-				

+

 				copyContextButtons.add(copyContext);

 			}

 		}

-		if (copyContextButtons.size() == 1) {

+		if(copyContextButtons.size() == 1) {

 			// special case:  use a simpler label than "Copy to Workspace..."

 			copyContextButtons.get(0).setText(Messages.CustomizationDialog_copy);

 		}

@@ -154,6 +154,7 @@ public class CustomizationDialog extends TrayDialog implements SelectionListener
 

 		availableContextsViewer.addSelectionChangedListener(new ISelectionChangedListener() {

 

+			@Override

 			public void selectionChanged(final SelectionChangedEvent event) {

 				IStructuredSelection selection = (IStructuredSelection)event.getSelection();

 				boolean activate = false;

@@ -161,7 +162,7 @@ public class CustomizationDialog extends TrayDialog implements SelectionListener
 				IContextStorageActionProvider provider = null;

 				if(!selection.isEmpty()) {

 					Context context = (Context)selection.getFirstElement();

-					activate = !ConfigurationManager.instance.isPlugin(context);

+					activate = !ConfigurationManager.getInstance().isPlugin(context);

 					provider = actionRegistry.getStorageActionProvider(context);

 				}

 

@@ -227,11 +228,12 @@ public class CustomizationDialog extends TrayDialog implements SelectionListener
 			try {

 				InputDialog dialog = new InputDialog(getShell(), Messages.CustomizationDialog_enterConfigurationName, Messages.CustomizationDialog_enterConfigurationName, Messages.CustomizationDialog_copyOf + sourceContext.getName(), new IInputValidator() {

 

+					@Override

 					public String isValid(final String newText) {

 						if(newText.trim().equals("")) { //$NON-NLS-1$

 							return Messages.CustomizationDialog_configurationNameNotEmpty;

 						}

-						if(ConfigurationManager.instance.getContext(newText) != null) {

+						if(ConfigurationManager.getInstance().getContext(newText) != null) {

 							return Messages.CustomizationDialog_configurationWithSameNameExists;

 						}

 						return null;

@@ -243,8 +245,8 @@ public class CustomizationDialog extends TrayDialog implements SelectionListener
 				if(result == Window.OK) {

 					String targetName = dialog.getText();

 					Context newContext = action.copy(sourceContext, targetName, false);

-					if (newContext != null) {

-						availableContextsViewer.setInput(ConfigurationManager.instance.getContexts());

+					if(newContext != null) {

+						availableContextsViewer.setInput(ConfigurationManager.getInstance().getContexts());

 						availableContextsViewer.setSelection(new StructuredSelection(newContext), true);

 					}

 				}

@@ -263,7 +265,7 @@ public class CustomizationDialog extends TrayDialog implements SelectionListener
 		Object element = selection.getFirstElement();

 		if(element instanceof Context) {

 			Context sourceContext = (Context)element;

-			if(ConfigurationManager.instance.isPlugin(sourceContext)) {

+			if(ConfigurationManager.getInstance().isPlugin(sourceContext)) {

 				Activator.log.warn(Messages.CustomizationDialog_cannotDeletePluginContext);

 				//Plugin context cannot be deleted

 				return;

@@ -280,7 +282,7 @@ public class CustomizationDialog extends TrayDialog implements SelectionListener
 			if(result == 0) { //0 is "Yes" (It is *not* the same 0 as Window.OK)

 				RemoveContextAction action = new RemoveContextAction(deleteAction);

 				action.removeContext(sourceContext);

-				availableContextsViewer.setInput(ConfigurationManager.instance.getContexts());

+				availableContextsViewer.setInput(ConfigurationManager.getInstance().getContexts());

 			}

 		}

 	}

@@ -296,6 +298,7 @@ public class CustomizationDialog extends TrayDialog implements SelectionListener
 	}

 

 

+	@Override

 	public void widgetSelected(final SelectionEvent e) {

 		if(e.widget == editContext) {

 			editAction();

@@ -306,12 +309,13 @@ public class CustomizationDialog extends TrayDialog implements SelectionListener
 		}

 	}

 

+	@Override

 	public void widgetDefaultSelected(final SelectionEvent e) {

 		if(e.widget == availableContexts) {

 			IStructuredSelection selection = (IStructuredSelection)availableContextsViewer.getSelection();

 			if(!selection.isEmpty()) {

 				Context context = (Context)selection.getFirstElement();

-				if(ConfigurationManager.instance.isPlugin(context)) {

+				if(ConfigurationManager.getInstance().isPlugin(context)) {

 					if(copyContextButtons.size() == 1) {

 						copyAction((IContextCopyAction)copyContextButtons.get(0).getData());

 					}

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/RemoveContextAction.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/RemoveContextAction.java
index 9394f09f37a..3a34fe1a383 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/RemoveContextAction.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/RemoveContextAction.java
@@ -52,10 +52,11 @@ public class RemoveContextAction {
 		try {

 			dialog.run(false, false, new IRunnableWithProgress() {

 

+				@Override

 				public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {

 					try {

 						delegate.delete(sourceContext, monitor);

-						ConfigurationManager.instance.deleteContext(sourceContext);

+						ConfigurationManager.getInstance().deleteContext(sourceContext);

 					} catch (CoreException ex) {

 						Activator.log.error(ex);

 					}

diff --git a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/display/DisplayManager.java b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/display/DisplayManager.java
index c7709df2df3..8bfcc4d6759 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/display/DisplayManager.java
+++ b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/display/DisplayManager.java
@@ -19,7 +19,7 @@ public class DisplayManager {
 

 	private DisplayManager() {

 		//TODO : Use a local constraint engine, and remove the context declaration in plugin.xml

-		constraintEngine = ConfigurationManager.instance.constraintEngine;

+		constraintEngine = ConfigurationManager.getInstance().getConstraintEngine();

 

 		//TODO : Add support for local constraint engines in the creation factories

 		//		constraintEngine = new DefaultViewConstraintEngine();

diff --git a/plugins/developer/org.eclipse.papyrus.def/dynamic-templates3.5/codegen/aspects/impl/diagram/editparts/NodeEditPart.xpt b/plugins/developer/org.eclipse.papyrus.def/dynamic-templates3.5/codegen/aspects/impl/diagram/editparts/NodeEditPart.xpt
index 6276096669c..370d17c5bf0 100644
--- a/plugins/developer/org.eclipse.papyrus.def/dynamic-templates3.5/codegen/aspects/impl/diagram/editparts/NodeEditPart.xpt
+++ b/plugins/developer/org.eclipse.papyrus.def/dynamic-templates3.5/codegen/aspects/impl/diagram/editparts/NodeEditPart.xpt
@@ -111,8 +111,8 @@ new org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolic
 	protected org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure createNodePlate() {

 		String prefElementId="«elementType.displayName»";

 		org.eclipse.jface.preference.IPreferenceStore store =«getDiagram().editorGen.plugin.getActivatorQualifiedClassName()».getInstance().getPreferenceStore();

-		String preferenceConstantWitdh=org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId,  org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight=org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId,  org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh=org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId,  org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight=org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId,  org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.HEIGHT);

 		org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure result = new org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		

 		«EXPAND setupNodePlate-»

@@ -190,13 +190,13 @@ switch («EXPAND xpt::editor::VisualIDRegistry::getVisualIDMethodCall FOR getDia
 					.getFillStyle_FillColor()){

 			String prefColor = null;

 			if (feature == org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant("«elementType.displayName»", org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE);

+				prefColor = org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant("«elementType.displayName»", org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE);

 			} else if (feature == org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE

 					.getFontStyle_FontColor()) {

-				prefColor = org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant("«elementType.displayName»", org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FONT);

+				prefColor = org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant("«elementType.displayName»", org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FONT);

 			} else if (feature == org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE

 					.getFillStyle_FillColor()) {

-				prefColor = org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant("«elementType.displayName»", org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL);

+				prefColor = org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant("«elementType.displayName»", org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities

 						.RGBToInteger(org.eclipse.jface.preference.PreferenceConverter

@@ -205,7 +205,7 @@ switch («EXPAND xpt::editor::VisualIDRegistry::getVisualIDMethodCall FOR getDia
 		} else if (feature == org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE

 					.getFillStyle_Transparency() || feature == org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE

 					.getFillStyle_Gradient()) {

-			String prefGradient = org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant("«elementType.displayName»", org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant("«elementType.displayName»", org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT);

 			org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(

 						preferenceStore.getString(prefGradient));

 			if(feature == org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE

diff --git a/plugins/developer/org.eclipse.papyrus.def/dynamic-templates3.5/codegen/aspects/xpt/providers/ViewProvider.xpt b/plugins/developer/org.eclipse.papyrus.def/dynamic-templates3.5/codegen/aspects/xpt/providers/ViewProvider.xpt
index 6472f8e7025..fd570b7ccf5 100644
--- a/plugins/developer/org.eclipse.papyrus.def/dynamic-templates3.5/codegen/aspects/xpt/providers/ViewProvider.xpt
+++ b/plugins/developer/org.eclipse.papyrus.def/dynamic-templates3.5/codegen/aspects/xpt/providers/ViewProvider.xpt
@@ -507,8 +507,8 @@ protected org.eclipse.gmf.runtime.emf.type.core.IElementType getSemanticElementT
 	«EXPAND xpt::Common::generatedMemberComment»

 	private void initFontStyleFromPrefs(org.eclipse.gmf.runtime.notation.View view, final org.eclipse.jface.preference.IPreferenceStore store, String elementName)

 	{

-		String fontConstant = org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.FONT);

-		String fontColorConstant = org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FONT);

+		String fontConstant = org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.FONT);

+		String fontColorConstant = org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FONT);

 				

 		org.eclipse.gmf.runtime.notation.FontStyle viewFontStyle = (org.eclipse.gmf.runtime.notation.FontStyle) view.getStyle(org.eclipse.gmf.runtime.notation.NotationPackage.Literals.FONT_STYLE);

 		if (viewFontStyle != null) 

@@ -527,7 +527,7 @@ protected org.eclipse.gmf.runtime.emf.type.core.IElementType getSemanticElementT
 	«EXPAND xpt::Common::generatedMemberComment»

 	private void initForegroundFromPrefs(org.eclipse.gmf.runtime.notation.View view, final org.eclipse.jface.preference.IPreferenceStore store, String elementName)

 	{

-		String lineColorConstant = org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE);

+		String lineColorConstant = org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE);

 		org.eclipse.swt.graphics.RGB lineRGB = org.eclipse.jface.preference.PreferenceConverter.getColor(store, lineColorConstant);

 		org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(view, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getLineStyle_LineColor(), org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities.RGBToInteger(lineRGB));

 	}

@@ -535,9 +535,9 @@ protected org.eclipse.gmf.runtime.emf.type.core.IElementType getSemanticElementT
 	«EXPAND xpt::Common::generatedMemberComment»

 	private void initBackgroundFromPrefs(org.eclipse.gmf.runtime.notation.View view, final org.eclipse.jface.preference.IPreferenceStore store, String elementName)

 	{

-		String fillColorConstant = org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL);

-		String gradientColorConstant = org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT);

-		String gradientPolicyConstant = org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY);

+		String fillColorConstant = org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL);

+		String gradientColorConstant = org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT);

+		String gradientPolicyConstant = org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName,org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.GRADIENT_POLICY);

 	

 	

 		org.eclipse.swt.graphics.RGB fillRGB = org.eclipse.jface.preference.PreferenceConverter.getColor(store, fillColorConstant);

diff --git a/plugins/developer/org.eclipse.papyrus.def/dynamic-templates3.5/codegen/xpt/preferences/LinkPreferencePage.xpt b/plugins/developer/org.eclipse.papyrus.def/dynamic-templates3.5/codegen/xpt/preferences/LinkPreferencePage.xpt
index 617bf286b25..0568f5f9e21 100644
--- a/plugins/developer/org.eclipse.papyrus.def/dynamic-templates3.5/codegen/xpt/preferences/LinkPreferencePage.xpt
+++ b/plugins/developer/org.eclipse.papyrus.def/dynamic-templates3.5/codegen/xpt/preferences/LinkPreferencePage.xpt
@@ -42,7 +42,7 @@ public class «EXPAND className» extends org.eclipse.papyrus.infra.gmfdiag.pref
 		    String key = «getDiagram().editPartsPackageName».«getDiagram().editPartClassName».MODEL_ID+"_«elementType.displayName»";

 		    java.util.Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 			for(String role : map.keySet()){

-				String preferenceName = org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getLabelElementConstant(key, role, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.LABEL_VISIBILITY);

+				String preferenceName = org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getLabelElementConstant(key, role, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.LABEL_VISIBILITY);

 				store.setDefault(preferenceName, map.get(role));

 			}

 		«ENDIF-»

diff --git a/plugins/developer/org.eclipse.papyrus.def/dynamic-templates3.5/codegen/xpt/preferences/NodePreferencePage.xpt b/plugins/developer/org.eclipse.papyrus.def/dynamic-templates3.5/codegen/xpt/preferences/NodePreferencePage.xpt
index eb55939b482..ef9fbc38b3f 100644
--- a/plugins/developer/org.eclipse.papyrus.def/dynamic-templates3.5/codegen/xpt/preferences/NodePreferencePage.xpt
+++ b/plugins/developer/org.eclipse.papyrus.def/dynamic-templates3.5/codegen/xpt/preferences/NodePreferencePage.xpt
@@ -54,19 +54,19 @@ public class «EXPAND className» extends org.eclipse.papyrus.infra.gmfdiag.pref
 	public static void initDefaults(org.eclipse.jface.preference.IPreferenceStore store) {

 		

 		String key = «getDiagram().editPartsPackageName».«getDiagram().editPartClassName».MODEL_ID+"_«elementType.displayName»";

-		store.setDefault(org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(key, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.WIDTH),«defaultSizeWidth(self.viewmap, 40)»);

-	    store.setDefault(org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(key, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.HEIGHT),«defaultSizeHeight(self.viewmap, 40)»);

+		store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(key, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.WIDTH),«defaultSizeWidth(self.viewmap, 40)»);

+	    store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(key, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.HEIGHT),«defaultSizeHeight(self.viewmap, 40)»);

 	 

 	 	«IF compartments->size() <> 0-»

 	 		java.util.Map<String, Boolean> map = getStaticCompartmentVisibilityPreferences();

 			for(String name : map.keySet()){

-				String preferenceName = org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getLabelElementConstant(key, name, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+				String preferenceName = org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getLabelElementConstant(key, name, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 				store.setDefault(preferenceName, map.get(name));

 			}

 			

 			map = getStaticCompartmentTitleVisibilityPreferences();

 			for(String name : map.keySet()){

-				String preferenceName = org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getLabelElementConstant(key, name, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+				String preferenceName = org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getLabelElementConstant(key, name, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);

 				store.setDefault(preferenceName, map.get(name));

 			}

 	 	«ENDIF-»

@@ -79,21 +79,21 @@ public class «EXPAND className» extends org.eclipse.papyrus.infra.gmfdiag.pref
 			 	java.util.Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 			 	«ENDIF»

 		 	for(String role : map.keySet()){

-				String preferenceName = org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getLabelElementConstant(key, role, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.LABEL_VISIBILITY);

+				String preferenceName = org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getLabelElementConstant(key, role, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.LABEL_VISIBILITY);

 				store.setDefault(preferenceName, map.get(role));

 			}

 		 «ENDIF-»

 	 	«REM» end of the add for papyrusgmfgenextension::LabelVisibilityPreference «ENDREM»

 	 

-	    //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+	    //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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/Papyrus_CSS_tooltip.png b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/Papyrus_CSS_tooltip.png
new file mode 100644
index 00000000000..917fa97468c
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/Papyrus_CSS_tooltip.png
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/css-toc.xml b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/css-toc.xml
index 0d6d4bf4734..342b9e023d3 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/css-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/css-toc.xml
@@ -10,13 +10,16 @@
 		</topic>
 		<topic href="resource/css.html#With_the_Papyrus_tooling" label="With the Papyrus tooling"></topic>
 	</topic>
+	<topic href="resource/css.html#Supported_properties" label="Supported properties">
+		<topic href="resource/css.html#Selector_properties" label="Selector properties"></topic>
+		<topic href="resource/css.html#Style_properties" label="Style properties"></topic>
+	</topic>
 	<topic href="resource/css.html#Manipulating_styles" label="Manipulating styles"></topic>
 	<topic href="resource/css.html#Deploying_a_CSS_Theme" label="Deploying a CSS Theme"></topic>
 	<topic href="resource/css.html#Limitations_and_issues" label="Limitations and issues">
 		<topic href="resource/css.html#Selectors" label="Selectors">
 			<topic href="resource/css.html#Selector_inheritance" label="Selector inheritance"></topic>
-			<topic href="resource/css.html#Profile.2FStereotype_support" label="Profile/Stereotype support"></topic>
-			<topic href="resource/css.html#Labels_and_compartments" label="Labels and compartments"></topic>
+			<topic href="resource/css.html#Labels" label="Labels"></topic>
 			<topic href="resource/css.html#Events_support" label="Events support"></topic>
 		</topic>
 		<topic href="resource/css.html#Stylesheets" label="Stylesheets">
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/css.html b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/css.html
index 513cae32efe..bed22e628e6 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/css.html
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/css.html
@@ -119,13 +119,12 @@
 	</p>
 	<ul>
 		<li><b>*</b>: Matches all elements<br /></li>
-		<li><b>ElementType</b>: Matches the elements of type “ElementType”<br />
-		</li>
-		<li><b>.myStyle</b>: Matches the elements on which the style “myStyle”
-			is applied<br />
-		</li>
-		<li><b>#myID</b>: Matches the element with the CSS ID “myID”. The CSS
-			ID must be unique among a diagram. To avoid confusing the users,
+		<li><b>ElementType</b>: Matches the elements of type
+			“ElementType”<br /></li>
+		<li><b>.myStyle</b>: Matches the elements on which the style
+			“myStyle” is applied<br /></li>
+		<li><b>#myID</b>: Matches the element with the CSS ID “myID”. The
+			CSS ID must be unique among a diagram. To avoid confusing the users,
 			and because this selector doesn’t make much sense on diagrams, this
 			selector has been disabled in Papyrus.<br />
 		</li>
@@ -147,21 +146,17 @@
 		combinators:<br />
 	</p>
 	<ul>
-		<li>Selector1 Selector2: Descendant selector. Matches the
+		<li><b>Selector1 Selector2</b>: Descendant selector. Matches the
 			elements which match Selector2 and are contained in an element
-			matching Selector1<br />
-		</li>
-		<li>Selector1 &gt; Selector2: Child selector. Matches the
+			matching Selector1<br /></li>
+		<li><b>Selector1 &gt; Selector2</b>: Child selector. Matches the
 			elements which match Selector2 and are directly contained in an
-			element matching Selector2<br />
-		</li>
-		<li>Selector1 + Selector2: Sibling selector. Matches the elements
-			which match Selector2 and are immediately preceded by a Sibling
-			element which match Selector1.<br />
-		</li>
-		<li>Selector1, Selector2: Alternative selector. Matches elements
-			matching either Selector1 or Selector2<br />
-		</li>
+			element matching Selector2<br /></li>
+		<li><b>Selector1 + Selector2</b>: Sibling selector. Matches the
+			elements which match Selector2 and are immediately preceded by a
+			Sibling element which match Selector1.<br /></li>
+		<li><b>Selector1, Selector2</b>: Alternative selector. Matches
+			elements matching either Selector1 or Selector2<br /></li>
 	</ul>
 	<p>A rule also contains a list of properties, in the form
 		property:value;</p>
@@ -216,6 +211,13 @@
 </pre>
 	<p>Meaning: The elements with the "Block" stereotype must be
 		displayed in bold.</p>
+	<pre class="source-css">[appliedStereotypes~=Block][isEncapsulated=true]{
+	fontColor:red;
+}
+</pre>
+	<p>Meaning: The elements with the "Block" stereotype, and the
+		stereotype property "isEncapsulated" set to true, must be displayed in
+		red.</p>
 	<h2 id="With_the_Papyrus_tooling">With the Papyrus tooling</h2>
 	<p>Papyrus also provides a tool to generate a CSS Rule from an
 		element displayed in the diagram. You need to create a stylesheet
@@ -268,6 +270,74 @@
 		applied to the selected object. It is used to choose the graphical
 		properties to apply on the objects matching the conditions.<br />
 	</p>
+	<h1 id="Supported_properties">Supported properties</h1>
+	<h2 id="Selector_properties">Selector properties</h2>
+	<p>Selector properties are semantic element properties. They can be
+		used with one of the following syntaxes:</p>
+	<p>
+		<b>[isAbstract=true]</b>
+	</p>
+	<p>
+		<b>Class[isAbstract=true]</b>
+	</p>
+	<p>The supported semantic element properties are:</p>
+	<ul>
+		<li>Strings: <b>[name=MyName]</b>, <b>[name="My name"]</b> (Quotes are required for complex
+			Strings)<br /></li>
+		<li>Integers: <b>[size="12"]</b>
+			(Quotes are required) <br /></li>
+		<li>Booleans: <b>[isAbstract=true]</b>
+			(Quotes are optional)<br /></li>
+		<li>Enumerations: <b>[visibility=visible]</b>
+			(Quotes are optional)&lt;br /&gt;
+		</li>
+		<li>References to named elements (UML NamedElement or Ecore
+			ENamedElement): <b>[type=String]</b><br />
+		</li>
+	</ul>
+	<p>Some selectors can also be used to represent some specific parts
+		of an element. For example, it is possible to hide a specific
+		compartment:</p>
+	<pre class="source-css">Class &gt; Compartment[kind="attribute"] {
+	visible:false;
+}
+
+Class &gt; Compartment[kind="symbol"] {
+	visible:true;
+}
+
+Compartment[kind="structure"]{
+	collapsed:true;
+}
+
+</pre>
+	<h2 id="Style_properties">Style properties</h2>
+	<p>
+		Style properties are graphical properties supported by the display.
+		Note that some graphical elements may not support some specific
+		properties (Either because they shouldn't support them, or because
+		they are not yet implemented). For example, a UML::Class will not
+		support the <i>italic</i> property, because in UML, <i>italic</i>
+		means <i>abstract</i>.
+	</p>
+	<p>The CSS Supports all GMF Notation properties, as well as a few
+		Papyrus-specific properties. This chapter will only list all the
+		Papyrus-specific properties.</p>
+	<p>The simplest way to discover new style properties is to use the
+		Appearance tab of the Properties view in Papyrus. When hovering one of
+		the appearance properties, the tooltip indicates the name of the
+		corresponding CSS property</p>
+	<p>
+		<img title="CSS Property in tooltip" alt="CSS Property in tooltip"
+			border="0" src="Papyrus_CSS_tooltip.png" /><br />
+	</p>
+	<p>The following custom properties are supported:</p>
+	<p>
+		displayBorder: true | false<br /> displayName: true | false<br />
+		maintainSymbolRatio: true | false<br /> <br /> elementIcon: true |
+		false<br /> shadow: true | false<br /> <br /> qualifiedNameDepth: full
+		| none | [int]<br />
+	</p>
 	<h1 id="Manipulating_styles">Manipulating styles</h1>
 	<p>The computed styles will be applied automatically. For example,
 		if your stylesheet tells that all your abstract classes must be red,
@@ -325,8 +395,8 @@
 	</p>
 	<h2 id="Selectors">Selectors</h2>
 	<p>
-		Currently, it is not possible to handle complex selectors in the
-		Papyrus stylesheets.<br />
+		Currently, some complex selectors are not supported in the Papyrus
+		stylesheets.<br />
 	</p>
 	<h3 id="Selector_inheritance">Selector inheritance</h3>
 	<p>
@@ -334,20 +404,9 @@
 		Metaclass. For example, a Behavior will not inherit styles from a
 		Class, although a Behavior actually is a Class.<br />
 	</p>
-	<h3 id="Profile.2FStereotype_support">Profile/Stereotype support</h3>
-	<p>
-		It is not possible to restrict a selector to an applied stereotype.
-		There is currently no way to specify that a style should only apply to
-		classes on which the <i>SysML::Blocks::Block</i> stereotype is
-		applied.<br />
-	</p>
-	<h3 id="Labels_and_compartments">Labels and compartments</h3>
-	<p>
-		It is currently not possible to customize labels from the Stylesheets
-		(e.g. show/hide type for all properties). It is not possible to
-		show/hide or collapse compartments either (e.g. hide the nested
-		classifier compartment in a Class).<br />
-	</p>
+	<h3 id="Labels">Labels</h3>
+	<p>It is currently not possible to customize labels from the
+		Stylesheets (e.g. show/hide type for all properties).</p>
 	<h3 id="Events_support">Events support</h3>
 	<p>
 		Selectors based on user events are not yet implemented. For example,
@@ -359,7 +418,7 @@
 	<h3 id="Model_stylesheets">Model stylesheets</h3>
 	<p>
 		Currently, stylesheets can only be applied to a Diagram. It is not yet
-		possible to apply a stylesheet on a Model.<br />
+		possible to apply a stylesheet on a Model or a Project.<br />
 	</p>
 	<h3 id="Workspace_stylesheets">Workspace stylesheets</h3>
 	<p>
@@ -380,10 +439,6 @@
 			href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=386574">Bug
 				386574</a>: [CSS - Refresh] Only the active diagram is
 			refresh when the stylesheets change<br /></li>
-		<li><a
-			href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=390534">Bug
-				390534</a>: [CSS - Appearance] Undoing graphical changes
-			results in unexpected behavior</li>
 	</ul>
 </body>
 </html>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/css.mediawiki b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/css.mediawiki
index af149a34c2e..a397e482448 100644
--- a/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/css.mediawiki
+++ b/plugins/doc/org.eclipse.papyrus.infra.gmfdiag.css.doc/resource/css.mediawiki
@@ -56,21 +56,21 @@ The CSS syntax is a list of rules, which associates selectors and properties.<br
 

 Eclipse implements the 2.1 version of the CSS syntax. The available selectors are:<br> 

 

-*<pre>*</pre>:matches all elements<br> 

-*ElementType: Matches the elements of type �ElementType�<br> 

-*.myStyle: Matches the elements on which the style �myStyle� is applied<br> 

-*#myID: Matches the element with the CSS ID �myID�. The CSS ID must be unique among a diagram. To avoid confusing the users, and because this selector doesn�t make much sense on diagrams, this selector has been disabled in Papyrus.<br> 

-*[property=value]: Matches the elements which have a property �property� with the value �value�. It can also match the properties of Stereotypes<br>

-*[appliedStereotypes~="MyStereotype"]: Matches the elements on which the Stereotype "MyStereotype" is applied. You can use either the Stereotype's name or qualified name (MyProfile::MyPackage::MyStereotype). Note: always use the "~=" operator (Which means "contains"), because elements can have more than one applied stereotype.

+*'''*''': Matches all elements<br> 

+*'''ElementType''': Matches the elements of type �ElementType�<br> 

+*'''.myStyle''': Matches the elements on which the style �myStyle� is applied<br> 

+*'''#myID''': Matches the element with the CSS ID �myID�. The CSS ID must be unique among a diagram. To avoid confusing the users, and because this selector doesn�t make much sense on diagrams, this selector has been disabled in Papyrus.<br> 

+*'''[property=value]''': Matches the elements which have a property �property� with the value �value�. It can also match the properties of Stereotypes<br>

+*'''[appliedStereotypes~="MyStereotype"]''': Matches the elements on which the Stereotype "MyStereotype" is applied. You can use either the Stereotype's name or qualified name (MyProfile::MyPackage::MyStereotype). Note: always use the "~=" operator (Which means "contains"), because elements can have more than one applied stereotype.

 

 The pseudo-selectors are currently not used in Papyrus.<br> 

 

 These selectors can be combined using one of the following combinators:<br> 

 

-*Selector1 Selector2: Descendant selector. Matches the elements which match Selector2 and are contained in an element matching Selector1<br> 

-*Selector1 &gt; Selector2: Child selector. Matches the elements which match Selector2 and are directly contained in an element matching Selector2<br> 

-*Selector1 + Selector2: Sibling selector. Matches the elements which match Selector2 and are immediately preceded by a Sibling element which match Selector1.<br> 

-*Selector1, Selector2: Alternative selector. Matches elements matching either Selector1 or Selector2<br>

+*'''Selector1 Selector2''': Descendant selector. Matches the elements which match Selector2 and are contained in an element matching Selector1<br> 

+*'''Selector1 &gt; Selector2''': Child selector. Matches the elements which match Selector2 and are directly contained in an element matching Selector2<br> 

+*'''Selector1 + Selector2''': Sibling selector. Matches the elements which match Selector2 and are immediately preceded by a Sibling element which match Selector1.<br> 

+*'''Selector1, Selector2''': Alternative selector. Matches elements matching either Selector1 or Selector2<br>

 

 A rule also contains a list of properties, in the form property:value; 

 

@@ -111,6 +111,13 @@ Meaning: The properties directly contained in a Class, which is drawn on a Class
 

 Meaning: The elements with the "Block" stereotype must be displayed in bold.

 

+<source lang="css">[appliedStereotypes~=Block][isEncapsulated=true]{

+	fontColor:red;

+}</source>

+

+Meaning: The elements with the "Block" stereotype, and the stereotype property "isEncapsulated" set to true, must be displayed in red.

+

+

 == With the Papyrus tooling  ==

 

 Papyrus also provides a tool to generate a CSS Rule from an element displayed in the diagram. You need to create a stylesheet before you can edit it with the Create style tool, and it is recommended (Although not required) to associate this style sheet with your current diagram. 

@@ -134,7 +141,61 @@ In the conditions tab, there are three groups of options:<br>
 *You can add restrictions on the current value(s) of the element (e.g. the style will be applied to concrete classes). Only primitive type and enumerated attributes are supported here. 

 *The style name is used to apply a style manually.<br>

 

-The properties tab contains all the graphical properties that can be applied to the selected object. It is used to choose the graphical properties to apply on the objects matching the conditions.<br> 

+The properties tab contains all the graphical properties that can be applied to the selected object. It is used to choose the graphical properties to apply on the objects matching the conditions.<br>

+

+= Supported properties =

+

+== Selector properties ==

+

+Selector properties are semantic element properties. They can be used with one of the following syntaxes:

+

+'''[isAbstract=true]'''

+

+'''Class[isAbstract=true]'''

+

+The supported semantic element properties are:

+

+* Strings: '''[name=MyName]''', '''[name="My name"]''' (Quotes are required for complex Strings)<br/>

+* Integers: '''[size="12"]''' (Quotes are required) <br/>

+* Booleans: '''[isAbstract=true]''' (Quotes are optional)<br/>

+* Enumerations: '''[visibility=visible]''' (Quotes are optional)<br />

+* References to named elements (UML NamedElement or Ecore ENamedElement): '''[type=String]'''<br/>

+

+Some selectors can also be used to represent some specific parts of an element. For example, it is possible to hide a specific compartment:

+

+<source lang="css">Class > Compartment[kind="attribute"] {

+	visible:false;

+}

+

+Class > Compartment[kind="symbol"] {

+	visible:true;

+}

+

+Compartment[kind="structure"]{

+	collapsed:true;

+}

+</source>

+

+== Style properties ==

+

+Style properties are graphical properties supported by the display. Note that some graphical elements may not support some specific properties (Either because they shouldn't support them, or because they are not yet implemented). For example, a UML::Class will not support the ''italic'' property, because in UML, ''italic'' means ''abstract''.

+

+The CSS Supports all GMF Notation properties, as well as a few Papyrus-specific properties. This chapter will only list all the Papyrus-specific properties.

+

+The simplest way to discover new style properties is to use the Appearance tab of the Properties view in Papyrus. When hovering one of the appearance properties, the tooltip indicates the name of the corresponding CSS property

+

+[[Image:Papyrus CSS tooltip.png|CSS Property in tooltip]]<br> 

+

+The following custom properties are supported:

+

+displayBorder: true | false<br/>

+displayName: true | false<br/>

+maintainSymbolRatio: true | false<br/>

+<br/>

+elementIcon: true | false<br/>

+shadow: true | false<br/>

+<br/>

+qualifiedNameDepth: full | none | [int]<br/>

 

 = Manipulating styles  =

 

@@ -172,19 +233,15 @@ There are currently a few identified limitations to the Stylesheet framework, as
 

 == Selectors  ==

 

-Currently, it is not possible to handle complex selectors in the Papyrus stylesheets.<br> 

+Currently, some complex selectors are not supported in the Papyrus stylesheets.<br> 

 

 === Selector inheritance  ===

 

-It is not possible to apply a style to all descendant of a given Metaclass. For example, a Behavior will not inherit styles from a Class, although a Behavior actually is a Class.<br> 

-

-=== Profile/Stereotype support  ===

-

-It is not possible to restrict a selector to an applied stereotype. There is currently no way to specify that a style should only apply to classes on which the ''SysML::Blocks::Block'' stereotype is applied.<br> 

+It is not possible to apply a style to all descendant of a given Metaclass. For example, a Behavior will not inherit styles from a Class, although a Behavior actually is a Class.<br>  

 

-=== Labels and compartments  ===

+=== Labels ===

 

-It is currently not possible to customize labels from the Stylesheets (e.g. show/hide type for all properties). It is not possible to show/hide or collapse compartments either (e.g. hide the nested classifier compartment in a Class).<br> 

+It is currently not possible to customize labels from the Stylesheets (e.g. show/hide type for all properties). 

 

 === Events support  ===

 

@@ -194,7 +251,7 @@ Selectors based on user events are not yet implemented. For example, the CSS spe
 

 === Model stylesheets  ===

 

-Currently, stylesheets can only be applied to a Diagram. It is not yet possible to apply a stylesheet on a Model.<br> 

+Currently, stylesheets can only be applied to a Diagram. It is not yet possible to apply a stylesheet on a Model or a Project.<br> 

 

 === Workspace stylesheets  ===

 

@@ -206,4 +263,3 @@ The following bugs have been identified:<br>
 

 *[https://bugs.eclipse.org/bugs/show_bug.cgi?id=372322 Bug 372322]: [Diagram - Refresh] The refresh action is not correctly binded to F5<br> 

 *[https://bugs.eclipse.org/bugs/show_bug.cgi?id=386574 Bug 386574]: [CSS - Refresh] Only the active diagram is refresh when the stylesheets change<br> 

-*[https://bugs.eclipse.org/bugs/show_bug.cgi?id=390534 Bug 390534]: [CSS - Appearance] Undoing graphical changes results in unexpected behavior

diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/.project b/plugins/doc/org.eclipse.papyrus.uml.doc/.project
new file mode 100644
index 00000000000..3d8c60578e2
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/.project
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.papyrus.uml.doc</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.pde.ManifestBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.SchemaBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.pde.PluginNature</nature>

+	</natures>

+</projectDescription>

diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/.settings/org.eclipse.core.resources.prefs b/plugins/doc/org.eclipse.papyrus.uml.doc/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 00000000000..4216b790e5b
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1

+encoding//resource/PapyrusStarterGuide-toc.xml=utf-8

+encoding//resource/PapyrusStarterGuide.html=utf-8

diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.uml.doc/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..8f9b57b3e0e
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.help;bundle-version="3.6.0",
+ org.eclipse.papyrus.infra.doc;bundle-version="1.0.0"
+Bundle-ManifestVersion: 2
+Bundle-Name: Papyrus UML User Guide (Incubation)
+Bundle-SymbolicName: org.eclipse.papyrus.uml.doc;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: Eclipse Modeling Project
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/about.html b/plugins/doc/org.eclipse.papyrus.uml.doc/about.html
new file mode 100644
index 00000000000..209103075a7
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

+<title>About</title>

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>November 14, 2008</p>	

+<h3>License</h3>

+

+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

+indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

+apply to your use of any object code in the Content.  Check the Redistributor's license that was 

+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

+indicated below, the terms and conditions of the EPL still apply to any source code in the Content

+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>

+

+</body>

+</html>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/build.properties b/plugins/doc/org.eclipse.papyrus.uml.doc/build.properties
new file mode 100644
index 00000000000..ba2a4b028d5
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/build.properties
@@ -0,0 +1,4 @@
+bin.includes = META-INF/,\

+               plugin.xml,\

+               about.html,\

+               resource/

diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/plugin.xml b/plugins/doc/org.eclipse.papyrus.uml.doc/plugin.xml
new file mode 100644
index 00000000000..443cdcda029
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/plugin.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<?eclipse version="3.4"?>

+<plugin>

+   <extension

+         point="org.eclipse.help.toc">

+      <toc

+            file="resource/PapyrusStarterGuide-main-toc.xml"

+            primary="false">

+      </toc>

+      <toc

+            file="resource/PapyrusStarterGuide-toc.xml"

+            primary="false">

+      </toc>

+   </extension>

+

+</plugin>

diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ActivityDiagram.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ActivityDiagram.bmp
new file mode 100644
index 00000000000..ce150ed16d0
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ActivityDiagram.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ClassDiagram.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ClassDiagram.bmp
new file mode 100644
index 00000000000..ecbfd96c698
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ClassDiagram.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ClassDiagramEditorBase.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ClassDiagramEditorBase.bmp
new file mode 100644
index 00000000000..d39a0d74fd5
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ClassDiagramEditorBase.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ClassDiagramEditorNewAgg.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ClassDiagramEditorNewAgg.bmp
new file mode 100644
index 00000000000..a72ba31434c
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ClassDiagramEditorNewAgg.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ClassDiagramEditorNewAss.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ClassDiagramEditorNewAss.bmp
new file mode 100644
index 00000000000..251060abd70
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ClassDiagramEditorNewAss.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/CommunicationDiagram.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/CommunicationDiagram.bmp
new file mode 100644
index 00000000000..35e1cdd0c9f
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/CommunicationDiagram.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/CompositeStructure.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/CompositeStructure.bmp
new file mode 100644
index 00000000000..adbeeb8cfcb
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/CompositeStructure.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/DiagramEditor.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/DiagramEditor.bmp
new file mode 100644
index 00000000000..4e82c94cba3
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/DiagramEditor.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/DiagramEditorFields.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/DiagramEditorFields.bmp
new file mode 100644
index 00000000000..b30e976b628
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/DiagramEditorFields.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/DiagramEditorFieldsPointers.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/DiagramEditorFieldsPointers.bmp
new file mode 100644
index 00000000000..5259119a843
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/DiagramEditorFieldsPointers.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/EclipseArchitecture.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/EclipseArchitecture.bmp
new file mode 100644
index 00000000000..cea20f60bc0
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/EclipseArchitecture.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/EclipseView.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/EclipseView.bmp
new file mode 100644
index 00000000000..18d6597bfaf
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/EclipseView.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/EditingView.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/EditingView.bmp
new file mode 100644
index 00000000000..28f04781b6e
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/EditingView.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ElementContextMenuDia.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ElementContextMenuDia.bmp
new file mode 100644
index 00000000000..bd79eb310d0
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ElementContextMenuDia.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ElementContextMenuDiaDelHide.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ElementContextMenuDiaDelHide.bmp
new file mode 100644
index 00000000000..a0680064d83
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ElementContextMenuDiaDelHide.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ElementContextMenuDiaFormat.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ElementContextMenuDiaFormat.bmp
new file mode 100644
index 00000000000..0e1c51a9fb6
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ElementContextMenuDiaFormat.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ExportWiz.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ExportWiz.bmp
new file mode 100644
index 00000000000..48e6c07a047
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ExportWiz.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/Feature-Plug-in.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/Feature-Plug-in.bmp
new file mode 100644
index 00000000000..4a4eeab0274
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/Feature-Plug-in.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/IkonOpenPerspective.png b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/IkonOpenPerspective.png
new file mode 100644
index 00000000000..d887221695c
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/IkonOpenPerspective.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ImportWiz.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ImportWiz.bmp
new file mode 100644
index 00000000000..f505187abb8
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ImportWiz.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/InstallNewSoftware.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/InstallNewSoftware.bmp
new file mode 100644
index 00000000000..7e2ce2c8036
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/InstallNewSoftware.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/InstallPapyrusComp.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/InstallPapyrusComp.bmp
new file mode 100644
index 00000000000..ec0306a73bd
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/InstallPapyrusComp.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ModelExpl.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ModelExpl.bmp
new file mode 100644
index 00000000000..4c96e45b6ed
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ModelExpl.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ModelProjResourcesFS.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ModelProjResourcesFS.bmp
new file mode 100644
index 00000000000..9b83f8dd607
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ModelProjResourcesFS.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ModelProjResourcesPE.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ModelProjResourcesPE.bmp
new file mode 100644
index 00000000000..11157c7c6da
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ModelProjResourcesPE.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ModelValidationView.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ModelValidationView.bmp
new file mode 100644
index 00000000000..bd40576507f
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ModelValidationView.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/MyProject.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/MyProject.bmp
new file mode 100644
index 00000000000..b07a71f5abc
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/MyProject.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/NewActor.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/NewActor.bmp
new file mode 100644
index 00000000000..3ee16271152
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/NewActor.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/NewAttribute.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/NewAttribute.bmp
new file mode 100644
index 00000000000..3ae5925c9e0
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/NewAttribute.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/NewClass.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/NewClass.bmp
new file mode 100644
index 00000000000..d4292e62b98
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/NewClass.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/NewDiagram.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/NewDiagram.bmp
new file mode 100644
index 00000000000..0f77a431dff
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/NewDiagram.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/NewOperation.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/NewOperation.bmp
new file mode 100644
index 00000000000..1de99f275d9
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/NewOperation.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/NewPackage.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/NewPackage.bmp
new file mode 100644
index 00000000000..87e43b999dd
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/NewPackage.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/NewUseCase.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/NewUseCase.bmp
new file mode 100644
index 00000000000..313587fbbe5
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/NewUseCase.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/OutlineView.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/OutlineView.bmp
new file mode 100644
index 00000000000..55390342176
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/OutlineView.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/PapyrusStarterGuide-main-toc.xml b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/PapyrusStarterGuide-main-toc.xml
new file mode 100644
index 00000000000..cd8a9501ee4
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/PapyrusStarterGuide-main-toc.xml
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<toc label="Papyrus UML Starter Guide" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocUser">
+   <topic href="resource/PapyrusStarterGuide.html" label="Papyrus UML Starter Guide">
+      <link toc="resource/PapyrusStarterGuide-toc.xml"/>
+      <anchor id="UMLStarterDoc"/>
+   </topic>	
+</toc>
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/PapyrusStarterGuide-toc.xml b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/PapyrusStarterGuide-toc.xml
new file mode 100644
index 00000000000..ec44f564d2c
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/PapyrusStarterGuide-toc.xml
@@ -0,0 +1,146 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<toc topic="resource/PapyrusStarterGuide.html" label="PapyrusStarterGuide">
+	<topic href="resource/PapyrusStarterGuide.html" label="1 Overview">
+		<topic href="resource/PapyrusStarterGuide.html#1.1_Table_of_Contents" label="1.1 Table of Contents"></topic>
+	</topic>
+	<topic href="resource/PapyrusStarterGuide.html#2_Introduction" label="2 Introduction">
+		<topic href="resource/PapyrusStarterGuide.html#2.1_Legend" label="2.1 Legend"></topic>
+	</topic>
+	<topic href="resource/PapyrusStarterGuide.html#3_Installation" label="3 Installation">
+		<topic href="resource/PapyrusStarterGuide.html#3.1_Install_Eclipse_Standard" label="3.1 Install Eclipse Standard"></topic>
+		<topic href="resource/PapyrusStarterGuide.html#3.2_Install_basic_Papyrus" label="3.2 Install basic Papyrus"></topic>
+		<topic href="resource/PapyrusStarterGuide.html#3.3_Additional_installation_for_Papyrus_UML_RT_modeling" label="3.3 Additional installation for Papyrus UML RT modeling"></topic>
+	</topic>
+	<topic href="resource/PapyrusStarterGuide.html#4_Eclipse" label="4 Eclipse">
+		<topic href="resource/PapyrusStarterGuide.html#4.1_Architecture" label="4.1 Architecture"></topic>
+		<topic href="resource/PapyrusStarterGuide.html#4.2_Workspace" label="4.2 Workspace"></topic>
+		<topic href="resource/PapyrusStarterGuide.html#4.3_Resources" label="4.3 Resources"></topic>
+		<topic href="resource/PapyrusStarterGuide.html#4.4_Workbench" label="4.4 Workbench">
+			<topic href="resource/PapyrusStarterGuide.html#4.4.1_Views" label="4.4.1 Views">
+				<topic href="resource/PapyrusStarterGuide.html#4.4.1.1_Single_views" label="4.4.1.1 Single views"></topic>
+				<topic href="resource/PapyrusStarterGuide.html#4.4.1.2_Stacked_views" label="4.4.1.2 Stacked views"></topic>
+			</topic>
+		</topic>
+		<topic href="resource/PapyrusStarterGuide.html#4.5_Preferences" label="4.5 Preferences"></topic>
+		<topic href="resource/PapyrusStarterGuide.html#4.6_Import_and_Export" label="4.6 Import and Export"></topic>
+	</topic>
+	<topic href="resource/PapyrusStarterGuide.html#5_Modeling" label="5 Modeling">
+		<topic href="resource/PapyrusStarterGuide.html#5.1_Model_and_diagrams" label="5.1 Model and diagrams"></topic>
+	</topic>
+	<topic href="resource/PapyrusStarterGuide.html#6_Tutorials" label="6 Tutorials">
+		<topic href="resource/PapyrusStarterGuide.html#6.1_Getting_started" label="6.1 Getting started">
+			<topic href="resource/PapyrusStarterGuide.html#6.1.1_Exploring_perspectives" label="6.1.1 Exploring perspectives">
+				<topic href="resource/PapyrusStarterGuide.html#6.1.1.1_Exploring_the_.27.27Papyrus.27.27_perspective" label="6.1.1.1 Exploring the ''Papyrus'' perspective"></topic>
+				<topic href="resource/PapyrusStarterGuide.html#6.1.1.2_Exploring_and_customizing_the_Resource_perspective" label="6.1.1.2 Exploring and customizing the Resource perspective"></topic>
+			</topic>
+			<topic href="resource/PapyrusStarterGuide.html#6.1.2_Creating_a_project.2C_folder_and_files" label="6.1.2 Creating a project, folder and files">
+				<topic href="resource/PapyrusStarterGuide.html#6.1.2.1_Creating_a_new_general_project" label="6.1.2.1 Creating a new general project"></topic>
+				<topic href="resource/PapyrusStarterGuide.html#6.1.2.2_Creating_a_new_folder" label="6.1.2.2 Creating a new folder"></topic>
+				<topic href="resource/PapyrusStarterGuide.html#6.1.2.3_Creating_and_editing_a_new_file" label="6.1.2.3 Creating and editing a new file"></topic>
+				<topic href="resource/PapyrusStarterGuide.html#6.1.2.4_Creating_another_file" label="6.1.2.4 Creating another file"></topic>
+			</topic>
+			<topic href="resource/PapyrusStarterGuide.html#6.1.3_Exploring_editors_and_views" label="6.1.3 Exploring editors and views">
+				<topic href="resource/PapyrusStarterGuide.html#6.1.3.1_Maximizing_and_restoring_an_editor" label="6.1.3.1 Maximizing and restoring an editor"></topic>
+				<topic href="resource/PapyrusStarterGuide.html#6.1.3.2_Tiling_and_restacking_the_editors" label="6.1.3.2 Tiling and restacking the editors"></topic>
+				<topic href="resource/PapyrusStarterGuide.html#6.1.3.3_Organizing_views" label="6.1.3.3 Organizing views"></topic>
+				<topic href="resource/PapyrusStarterGuide.html#6.1.3.4_Using_view_menus" label="6.1.3.4 Using view menus"></topic>
+				<topic href="resource/PapyrusStarterGuide.html#6.1.3.5_Closing_and_opening_views" label="6.1.3.5 Closing and opening views"></topic>
+			</topic>
+			<topic href="resource/PapyrusStarterGuide.html#6.1.4_Exporting_and_importing_a_project" label="6.1.4 Exporting and importing a project">
+				<topic href="resource/PapyrusStarterGuide.html#6.1.4.1_Exporting_a_project" label="6.1.4.1 Exporting a project"></topic>
+				<topic href="resource/PapyrusStarterGuide.html#6.1.4.2_Removing_the_project_from_the_workspace" label="6.1.4.2 Removing the project from the workspace"></topic>
+				<topic href="resource/PapyrusStarterGuide.html#6.1.4.3_Importing_a_project" label="6.1.4.3 Importing a project"></topic>
+			</topic>
+			<topic href="resource/PapyrusStarterGuide.html#6.1.5_Conclusion" label="6.1.5 Conclusion"></topic>
+		</topic>
+		<topic href="resource/PapyrusStarterGuide.html#6.2_Creating_profiles" label="6.2 Creating profiles"></topic>
+		<topic href="resource/PapyrusStarterGuide.html#6.3_Creating_models" label="6.3 Creating models">
+			<topic href="resource/PapyrusStarterGuide.html#6.3.1_Use_case_modeling" label="6.3.1 Use case modeling"></topic>
+			<topic href="resource/PapyrusStarterGuide.html#6.3.2_Design_modeling" label="6.3.2 Design modeling"></topic>
+			<topic href="resource/PapyrusStarterGuide.html#6.3.3_RT_modeling" label="6.3.3 RT modeling"></topic>
+		</topic>
+	</topic>
+	<topic href="resource/PapyrusStarterGuide.html#7_Papyrus" label="7 Papyrus">
+		<topic href="resource/PapyrusStarterGuide.html#7.1_Papyrus_resources_in_the_workspace" label="7.1 Papyrus resources in the workspace"></topic>
+		<topic href="resource/PapyrusStarterGuide.html#7.2_The_Papyrus_perspective" label="7.2 The Papyrus perspective">
+			<topic href="resource/PapyrusStarterGuide.html#7.2.1_Project_Explorer_view" label="7.2.1 Project Explorer view"></topic>
+			<topic href="resource/PapyrusStarterGuide.html#7.2.2_Model_Explorer_view" label="7.2.2 Model Explorer view"></topic>
+			<topic href="resource/PapyrusStarterGuide.html#7.2.3_Editing_view" label="7.2.3 Editing view"></topic>
+			<topic href="resource/PapyrusStarterGuide.html#7.2.4_Outline_view" label="7.2.4 Outline view"></topic>
+			<topic href="resource/PapyrusStarterGuide.html#7.2.5_Properties_view" label="7.2.5 Properties view"></topic>
+			<topic href="resource/PapyrusStarterGuide.html#7.2.6_Model_Validation_view" label="7.2.6 Model Validation view"></topic>
+			<topic href="resource/PapyrusStarterGuide.html#7.2.7_Search_view" label="7.2.7 Search view"></topic>
+		</topic>
+		<topic href="resource/PapyrusStarterGuide.html#7.3_Diagram_editing_in_Papyrus" label="7.3 Diagram editing in Papyrus">
+			<topic href="resource/PapyrusStarterGuide.html#7.3.1_Diagram_editors" label="7.3.1 Diagram editors"></topic>
+			<topic href="resource/PapyrusStarterGuide.html#7.3.2_Basic_tool_techniques" label="7.3.2 Basic tool techniques">
+				<topic href="resource/PapyrusStarterGuide.html#7.3.2.1_Creating_diagrams" label="7.3.2.1 Creating diagrams"></topic>
+				<topic href="resource/PapyrusStarterGuide.html#7.3.2.2_Scrolling_and_panning_in_diagrams" label="7.3.2.2 Scrolling and panning in diagrams"></topic>
+				<topic href="resource/PapyrusStarterGuide.html#7.3.2.3_Creating_an_element_in_a_diagram" label="7.3.2.3 Creating an element in a diagram"></topic>
+				<topic href="resource/PapyrusStarterGuide.html#7.3.2.4_Delete_and_hide" label="7.3.2.4 Delete and hide"></topic>
+				<topic href="resource/PapyrusStarterGuide.html#7.3.2.5_Formating_and_validating_diagrams" label="7.3.2.5 Formating and validating diagrams"></topic>
+			</topic>
+		</topic>
+		<topic href="resource/PapyrusStarterGuide.html#7.4_UML_modeling" label="7.4 UML modeling">
+			<topic href="resource/PapyrusStarterGuide.html#7.4.1_Diagrams" label="7.4.1 Diagrams">
+				<topic href="resource/PapyrusStarterGuide.html#7.4.1.1_Diagrams_related_to_Use_Cases" label="7.4.1.1 Diagrams related to Use Cases">
+					<topic href="resource/PapyrusStarterGuide.html#7.4.1.1.1_Use_case_diagram" label="7.4.1.1.1 Use case diagram"></topic>
+					<topic href="resource/PapyrusStarterGuide.html#7.4.1.1.2_Activity_diagram" label="7.4.1.1.2 Activity diagram"></topic>
+					<topic href="resource/PapyrusStarterGuide.html#7.4.1.1.3_Interaction_diagrams" label="7.4.1.1.3 Interaction diagrams">
+						<topic href="resource/PapyrusStarterGuide.html#7.4.1.1.3.1_Sequence_diagram" label="7.4.1.1.3.1 Sequence diagram"></topic>
+						<topic href="resource/PapyrusStarterGuide.html#7.4.1.1.3.2_Communication_diagram" label="7.4.1.1.3.2 Communication diagram"></topic>
+					</topic>
+				</topic>
+				<topic href="resource/PapyrusStarterGuide.html#7.4.1.2_Diagrams_related_to_Classes" label="7.4.1.2 Diagrams related to Classes">
+					<topic href="resource/PapyrusStarterGuide.html#7.4.1.2.1_Class_diagram" label="7.4.1.2.1 Class diagram"></topic>
+					<topic href="resource/PapyrusStarterGuide.html#7.4.1.2.2_Composite_structure_diagram" label="7.4.1.2.2 Composite structure diagram"></topic>
+					<topic href="resource/PapyrusStarterGuide.html#7.4.1.2.3_State_machine_diagram" label="7.4.1.2.3 State machine diagram"></topic>
+				</topic>
+			</topic>
+			<topic href="resource/PapyrusStarterGuide.html#7.4.2_Model_elements" label="7.4.2 Model elements">
+				<topic href="resource/PapyrusStarterGuide.html#7.4.2.1_Package" label="7.4.2.1 Package"></topic>
+				<topic href="resource/PapyrusStarterGuide.html#7.4.2.2_Use_Case" label="7.4.2.2 Use Case"></topic>
+				<topic href="resource/PapyrusStarterGuide.html#7.4.2.3_Actor" label="7.4.2.3 Actor"></topic>
+				<topic href="resource/PapyrusStarterGuide.html#7.4.2.4_Class" label="7.4.2.4 Class">
+					<topic href="resource/PapyrusStarterGuide.html#7.4.2.5.1_Attributes_on_Classes" label="7.4.2.5.1 Attributes on Classes"></topic>
+					<topic href="resource/PapyrusStarterGuide.html#7.4.2.5.2_Operations_on_Classes" label="7.4.2.5.2 Operations on Classes"></topic>
+				</topic>
+			</topic>
+			<topic href="resource/PapyrusStarterGuide.html#7.4.3_Relationships" label="7.4.3 Relationships"></topic>
+		</topic>
+		<topic href="resource/PapyrusStarterGuide.html#7.5_UML_RT_modeling" label="7.5 UML RT modeling">
+			<topic href="resource/PapyrusStarterGuide.html#7.5.1_Additional_modeling_elements" label="7.5.1 Additional modeling elements">
+				<topic href="resource/PapyrusStarterGuide.html#7.5.1.1_Capsule_Class" label="7.5.1.1 Capsule Class"></topic>
+				<topic href="resource/PapyrusStarterGuide.html#7.5.1.2_Protocol_Class" label="7.5.1.2 Protocol Class"></topic>
+			</topic>
+			<topic href="resource/PapyrusStarterGuide.html#7.5.2_Using_C_in_a_model" label="7.5.2 Using C in a model"></topic>
+			<topic href="resource/PapyrusStarterGuide.html#7.5.3_C_service_library" label="7.5.3 C service library">
+				<topic href="resource/PapyrusStarterGuide.html#7.5.3.1_Sending_messages" label="7.5.3.1 Sending messages"></topic>
+			</topic>
+			<topic href="resource/PapyrusStarterGuide.html#7.5.4_Transformation_from_model_to_code" label="7.5.4 Transformation from model to code"></topic>
+			<topic href="resource/PapyrusStarterGuide.html#7.5.5_Edit_the_generated_code" label="7.5.5 Edit the generated code"></topic>
+			<topic href="resource/PapyrusStarterGuide.html#7.5.6_Compiling_and_linking_the_generated_code" label="7.5.6 Compiling and linking the generated code"></topic>
+			<topic href="resource/PapyrusStarterGuide.html#7.5.7_Using_external_libraries" label="7.5.7 Using external libraries"></topic>
+			<topic href="resource/PapyrusStarterGuide.html#7.5.8_Running_the_application" label="7.5.8 Running the application"></topic>
+			<topic href="resource/PapyrusStarterGuide.html#7.5.9_Model_components" label="7.5.9 Model components"></topic>
+		</topic>
+		<topic href="resource/PapyrusStarterGuide.html#7.6_Papyrus_in_a_team_environment" label="7.6 Papyrus in a team environment">
+			<topic href="resource/PapyrusStarterGuide.html#7.6.1_Model_fragmentation" label="7.6.1 Model fragmentation"></topic>
+			<topic href="resource/PapyrusStarterGuide.html#7.6.2_Source_configuration_management" label="7.6.2 Source configuration management"></topic>
+			<topic href="resource/PapyrusStarterGuide.html#7.6.3_Compare_and_Merge" label="7.6.3 Compare and Merge"></topic>
+		</topic>
+		<topic href="resource/PapyrusStarterGuide.html#7.7_Model_validation" label="7.7 Model validation">
+			<topic href="resource/PapyrusStarterGuide.html#7.7.1_Object_Constrain_Language_.28OCL.29" label="7.7.1 Object Constrain Language (OCL)"></topic>
+			<topic href="resource/PapyrusStarterGuide.html#7.7.2_Defining_constraints_using_OCL" label="7.7.2 Defining constraints using OCL"></topic>
+		</topic>
+		<topic href="resource/PapyrusStarterGuide.html#7.8_Searching" label="7.8 Searching"></topic>
+		<topic href="resource/PapyrusStarterGuide.html#7.9_Sample_models" label="7.9 Sample models">
+			<topic href="resource/PapyrusStarterGuide.html#7.9.1_Class_model_with_inheritance" label="7.9.1 Class model with inheritance"></topic>
+			<topic href="resource/PapyrusStarterGuide.html#7.9.2_Send_and_receive_data" label="7.9.2 Send and receive data"></topic>
+			<topic href="resource/PapyrusStarterGuide.html#7.9.3_Interprocess_communication" label="7.9.3 Interprocess communication"></topic>
+		</topic>
+		<topic href="resource/PapyrusStarterGuide.html#7.10_UML_profiling" label="7.10 UML profiling"></topic>
+	</topic>
+	<topic href="resource/PapyrusStarterGuide.html#8_Support" label="8 Support"></topic>
+	<topic href="resource/PapyrusStarterGuide.html#9_References" label="9 References"></topic>
+</toc>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/PapyrusStarterGuide.html b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/PapyrusStarterGuide.html
new file mode 100644
index 00000000000..0eedcc90492
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/PapyrusStarterGuide.html
@@ -0,0 +1,4 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/></head><body><h1 id="1_Overview">1 Overview</h1><p>Papyrus is an environment for editing any kind of <a href="http://www.eclipse.org/modeling/emf/">EMF model</a>, particularly supporting UML 2 (<a href="http://www.omg.org/spec/UML/2.4.1/">Unified Modeling Language (UML) version 2.4.1</a> ) and related modeling languages such as SysML (<a href="http://www.omg.org/spec/SysML/">System Modeling Language</a> ) and MARTE (<a href="http://www.omg.org/omgmarte/Specification.htm/">Modeling and Analysis of Real-Time and Embedded systems</a> ). Papyrus also offers very advanced support for UML profiles that enables users to define editors for DSLs (Domain Specific Languages) based on the UML 2 standard.</p><p>Papyrus is a collection of plug-ins and features on top of the Eclipse Modeling Framework. For more information about Eclipse, please go to the Eclipse web site <a href="http://www.eclipse.org/">eclipse.org</a>. Some of the terminology used in this Papyrus user guide are basic Eclipse concepts and briefly described here. To get more information about the Eclipse concepts, please visit the <i>Workbench User Guide</i> by selecting <b>Help &gt; Help Contents</b> from within Eclipse.</p><h2 id="1.1_Table_of_Contents">1.1 Table of Contents</h2><ol style="list-style: none;"><li><a href="#1_Overview">1 Overview</a><ol style="list-style: none;"><li><a href="#1.1_Table_of_Contents">1.1 Table of Contents</a></li></ol></li><li><a href="#2_Introduction">2 Introduction</a><ol style="list-style: none;"><li><a href="#2.1_Legend">2.1 Legend</a></li></ol></li><li><a href="#3_Installation">3 Installation</a><ol style="list-style: none;"><li><a href="#3.1_Install_Eclipse_Standard">3.1 Install Eclipse Standard</a></li><li><a href="#3.2_Install_basic_Papyrus">3.2 Install basic Papyrus</a></li><li><a href="#3.3_Additional_installation_steps">3.3 Additional installation steps</a></li></ol></li><li><a href="#4_Eclipse">4 Eclipse</a><ol style="list-style: none;"><li><a href="#4.1_Architecture">4.1 Architecture</a></li><li><a href="#4.2_Workspace">4.2 Workspace</a></li><li><a href="#4.3_Resources">4.3 Resources</a></li><li><a href="#4.4_Workbench">4.4 Workbench</a><ol style="list-style: none;"><li><a href="#4.4.1_Views">4.4.1 Views</a><ol style="list-style: none;"><li><a href="#4.4.1.1_Single_views">4.4.1.1 Single views</a></li><li><a href="#4.4.1.2_Stacked_views">4.4.1.2 Stacked views</a></li></ol></li></ol></li><li><a href="#4.5_Preferences">4.5 Preferences</a></li><li><a href="#4.6_Import_and_Export">4.6 Import and Export</a></li></ol></li><li><a href="#5_Modeling">5 Modeling</a><ol style="list-style: none;"><li><a href="#5.1_Model_and_diagrams">5.1 Model and diagrams</a></li></ol></li><li><a href="#6_Tutorials">6 Tutorials</a><ol style="list-style: none;"><li><a href="#6.1_Getting_started_with_general_Eclipse_functionality">6.1 Getting started with general Eclipse functionality</a><ol style="list-style: none;"><li><a href="#6.1.1_Exploring_perspectives">6.1.1 Exploring perspectives</a><ol style="list-style: none;"><li><a href="#6.1.1.1_Exploring_the_.27.27Papyrus.27.27_perspective">6.1.1.1 Exploring the ''Papyrus'' perspective</a></li><li><a href="#6.1.1.2_Exploring_and_customizing_the_Resource_perspective">6.1.1.2 Exploring and customizing the Resource perspective</a></li></ol></li><li><a href="#6.1.2_Creating_a_new_project.2C_folder_and_files">6.1.2 Creating a new project, folder and files</a><ol style="list-style: none;"><li><a href="#6.1.2.1_Creating_a_new_general_project">6.1.2.1 Creating a new general project</a></li><li><a href="#6.1.2.2_Creating_a_new_folder">6.1.2.2 Creating a new folder</a></li><li><a href="#6.1.2.3_Creating_and_editing_a_new_file">6.1.2.3 Creating and editing a new file</a></li><li><a href="#6.1.2.4_Creating_another_file">6.1.2.4 Creating another file</a></li></ol></li><li><a href="#6.1.3_Exploring_editors_and_views">6.1.3 Exploring editors and views</a><ol style="list-style: none;"><li><a href="#6.1.3.1_Maximizing_and_restoring_an_editor">6.1.3.1 Maximizing and restoring an editor</a></li><li><a href="#6.1.3.2_Tiling_and_restacking_the_editors">6.1.3.2 Tiling and restacking the editors</a></li><li><a href="#6.1.3.3_Organizing_views">6.1.3.3 Organizing views</a></li><li><a href="#6.1.3.4_Using_view_menus">6.1.3.4 Using view menus</a></li><li><a href="#6.1.3.5_Closing_and_opening_views">6.1.3.5 Closing and opening views</a></li></ol></li><li><a href="#6.1.4_Exporting_and_importing_a_project">6.1.4 Exporting and importing a project</a><ol style="list-style: none;"><li><a href="#6.1.4.1_Exporting_a_project">6.1.4.1 Exporting a project</a></li><li><a href="#6.1.4.2_Removing_the_project_from_the_workspace">6.1.4.2 Removing the project from the workspace</a></li><li><a href="#6.1.4.3_Importing_a_project">6.1.4.3 Importing a project</a></li></ol></li><li><a href="#6.1.5_Conclusion">6.1.5 Conclusion</a></li></ol></li><li><a href="#6.2_Creating_profiles">6.2 Creating profiles</a></li><li><a href="#6.3_Creating_models_using_Papyrus">6.3 Creating models using Papyrus</a><ol style="list-style: none;"><li><a href="#6.3.1_Use-case_modeling">6.3.1 Use-case modeling</a></li><li><a href="#6.3.2_Design_modeling">6.3.2 Design modeling</a><ol style="list-style: none;"><li><a href="#6.3.2.1_Create_a_new_UML_project">6.3.2.1 Create a new UML project</a></li><li><a href="#6.3.2.2_Create_new_packages_to_be_used_for_classes">6.3.2.2 Create new packages to be used for classes</a></li><li><a href="#6.3.2.3_Create_new_classes">6.3.2.3 Create new classes</a></li><li><a href="#6.3.2.4_Create_new_class_diagrams">6.3.2.4 Create new class diagrams</a></li><li><a href="#6.3.2.5_Create_new_operations_and_attributes">6.3.2.5 Create new operations and attributes</a></li><li><a href="#6.3.2.6_Create_new_relationships_between_classes">6.3.2.6 Create new relationships between classes</a></li><li><a href="#6.3.2.7_Create_a_new_package_to_be_used_for_objects">6.3.2.7 Create a new package to be used for objects</a></li><li><a href="#6.3.2.8_Create_new_objects">6.3.2.8 Create new objects</a></li><li><a href="#6.3.2.9_Create_a_new_class_diagram">6.3.2.9 Create a new class diagram</a></li><li><a href="#6.3.2.10_Create_new_relationships_between_objects">6.3.2.10 Create new relationships between objects</a></li><li><a href="#6.3.2.11_Conclusion">6.3.2.11 Conclusion</a></li></ol></li><li><a href="#6.3.3_RT_modeling">6.3.3 RT modeling</a></li></ol></li></ol></li><li><a href="#7_Papyrus">7 Papyrus</a><ol style="list-style: none;"><li><a href="#7.1_Papyrus_resources_in_the_workspace">7.1 Papyrus resources in the workspace</a></li><li><a href="#7.2_The_Papyrus_perspective">7.2 The Papyrus perspective</a><ol style="list-style: none;"><li><a href="#7.2.1_Project_Explorer_view">7.2.1 Project Explorer view</a></li><li><a href="#7.2.2_Model_Explorer_view">7.2.2 Model Explorer view</a></li><li><a href="#7.2.3_Editing_view">7.2.3 Editing view</a></li><li><a href="#7.2.4_Outline_view">7.2.4 Outline view</a></li><li><a href="#7.2.5_Properties_view">7.2.5 Properties view</a></li><li><a href="#7.2.6_Model_Validation_view">7.2.6 Model Validation view</a></li><li><a href="#7.2.7_Search_view">7.2.7 Search view</a></li></ol></li><li><a href="#7.3_Diagram_editing_in_Papyrus">7.3 Diagram editing in Papyrus</a><ol style="list-style: none;"><li><a href="#7.3.1_Diagram_editors">7.3.1 Diagram editors</a></li><li><a href="#7.3.2_Basic_tool_techniques">7.3.2 Basic tool techniques</a><ol style="list-style: none;"><li><a href="#7.3.2.1_Creating_diagrams">7.3.2.1 Creating diagrams</a></li><li><a href="#7.3.2.2_Scrolling_and_panning_in_diagrams">7.3.2.2 Scrolling and panning in diagrams</a></li><li><a href="#7.3.2.3_Creating_an_element_in_a_diagram">7.3.2.3 Creating an element in a diagram</a></li><li><a href="#7.3.2.4_Delete_and_hide">7.3.2.4 Delete and hide</a></li><li><a href="#7.3.2.5_Formating_and_validating_diagrams">7.3.2.5 Formating and validating diagrams</a></li></ol></li></ol></li><li><a href="#7.4_UML_modeling">7.4 UML modeling</a><ol style="list-style: none;"><li><a href="#7.4.1_Package">7.4.1 Package</a></li><li><a href="#7.4.2_Use-case">7.4.2 Use-case</a></li><li><a href="#7.4.3_Actor">7.4.3 Actor</a></li><li><a href="#7.4.4_Class">7.4.4 Class</a><ol style="list-style: none;"><li><a href="#7.4.4.1_Attributes_on_classes">7.4.4.1 Attributes on classes</a></li><li><a href="#7.4.4.2_Operations_on_classes">7.4.4.2 Operations on classes</a></li></ol></li><li><a href="#7.4.5_Object">7.4.5 Object</a></li><li><a href="#7.4.6_Relationships">7.4.6 Relationships</a></li><li><a href="#7.4.7_Diagrams">7.4.7 Diagrams</a><ol style="list-style: none;"><li><a href="#7.4.7.1_Diagrams_related_to_use-cases">7.4.7.1 Diagrams related to use-cases</a></li><li><a href="#7.4.7.2_Diagrams_related_to_classes">7.4.7.2 Diagrams related to classes</a></li></ol></li></ol></li><li><a href="#7.5_UML_RT_modeling">7.5 UML RT modeling</a><ol style="list-style: none;"><li><a href="#7.5.1_Additional_modeling_elements">7.5.1 Additional modeling elements</a><ol style="list-style: none;"><li><a href="#7.5.1.1_Capsule_class">7.5.1.1 Capsule class</a></li><li><a href="#7.5.1.2_Protocol_class">7.5.1.2 Protocol class</a></li></ol></li><li><a href="#7.5.2_Using_C.2B.2B_in_a_model">7.5.2 Using C++ in a model</a></li><li><a href="#7.5.3_C.2B.2B_service_library">7.5.3 C++ service library</a><ol style="list-style: none;"><li><a href="#7.5.3.1_Sending_messages">7.5.3.1 Sending messages</a></li></ol></li><li><a href="#7.5.4_Transformation_from_model_to_code">7.5.4 Transformation from model to code</a></li><li><a href="#7.5.5_Edit_the_generated_code">7.5.5 Edit the generated code</a></li><li><a href="#7.5.6_Compiling_and_linking_the_generated_code">7.5.6 Compiling and linking the generated code</a></li><li><a href="#7.5.7_Using_external_libraries">7.5.7 Using external libraries</a></li><li><a href="#7.5.8_Running_the_system">7.5.8 Running the system</a></li></ol></li><li><a href="#7.6_Papyrus_in_a_team_environment">7.6 Papyrus in a team environment</a><ol style="list-style: none;"><li><a href="#7.6.1_Model_fragmentation">7.6.1 Model fragmentation</a></li><li><a href="#7.6.2_Source_configuration_management">7.6.2 Source configuration management</a></li><li><a href="#7.6.3_Compare_and_Merge">7.6.3 Compare and Merge</a></li></ol></li><li><a href="#7.7_Model_validation">7.7 Model validation</a><ol style="list-style: none;"><li><a href="#7.7.1_Object_Constrain_Language_.28OCL.29">7.7.1 Object Constrain Language (OCL)</a></li><li><a href="#7.7.2_Defining_constraints_using_OCL">7.7.2 Defining constraints using OCL</a></li></ol></li><li><a href="#7.8_Searching">7.8 Searching</a></li><li><a href="#7.9_Sample_models">7.9 Sample models</a><ol style="list-style: none;"><li><a href="#7.9.1_Class_model_with_inheritance">7.9.1 Class model with inheritance</a></li><li><a href="#7.9.2_Send_and_receive_data">7.9.2 Send and receive data</a></li><li><a href="#7.9.3_Interprocess_communication">7.9.3 Interprocess communication</a></li></ol></li><li><a href="#7.10_UML_profiling">7.10 UML profiling</a></li></ol></li><li><a href="#8_Support">8 Support</a></li><li><a href="#9_References">9 References</a></li></ol><h1 id="2_Introduction">2 Introduction</h1><p>Papyrus is built on the extensible Eclipse framework and is an implementation of the OMG (Object Management Group) specification <a href="http://www.omg.org/spec/UML/2.4.1/">Unified Modeling Language (UML) version 2.4.1</a>. Papyrus is a comprehensive UML modeling environment, where many diagrams can be used to view different aspects of a system. Behind all diagrams, there is a model where all modeling elements, used in these diagrams, are kept. The model keeps the consistency between the diagrams.</p><p>UML diagrams can help system architects and developers understand, collaborate on and develop a system. Architects and managers can use diagrams to visualize an entire system or project and separate systems into smaller components for development.</p><p>System developers can use diagrams to specify, visualize, and document systems, which can increase efficiency and improve their system design. Also code can be generated from UML models.</p><p>Since UML is general-purpose modeling language in the field of software engineering, it is possible to adapt UML to specific domains. This is done by creating and applying UML profiles. Papyrus is a complete UML modeling environment, which also can be used to develop UML profiles.</p><h2 id="2.1_Legend">2.1 Legend</h2><p>In this user guide, bold text is used for menu selections, e.g. <b>Help &gt; Welcome</b> means from the <b>Help</b> item on the main menu, select the <b>Welcome</b> item.</p><p>A context menu is the pop-up menu that appears when right clicking on something, e.g. right click on a class select <b>New Child &gt; Create a new Operation</b>, will create a new operation on the class, using the class' context menu.</p><p>When text should be typed in, it is indicated by inline code, e.g. <code>this text should be typed in</code>.</p><p>Fields in wizards, pop-up windows, different editors, radio buttons and check boxes are indicated by italic text, e.g. set the field <i>Name</i> to <code>MyClass</code>.</p><h1 id="3_Installation"><div id="Installation">3 Installation</div></h1><p>It is a several step process to install Papyrus and its optional components. The <i>Eclipse Standard</i> must first be installed and when that is done, Papyrus is installed on top of <i>Eclipse Standard</i>.</p><h2 id="3.1_Install_Eclipse_Standard">3.1 Install Eclipse Standard</h2><p><i>Eclipse Standard</i> is installed from the <a href="http://www.eclipse.org/downloads/">Eclipse download page</a>. On the download page select <i>Eclipse Standard &lt;version number&gt;</i> to install. Follow the install wizard to complete the installation.</p><h2 id="3.2_Install_basic_Papyrus">3.2 Install basic Papyrus</h2><p>When <i>Eclipse Standard</i> is installed, go to <b>Help &gt; Install New Software</b> and type in <code><a href="http://download.eclipse.org/releases/kepler/">http://download.eclipse.org/releases/kepler/</a></code> in the field named <i>Work with:</i>.</p><p><b>Note!</b> When this user guide was written, the Kepler release of Eclipse was the latest. Select the latest official Eclipse release.</p><p><b>Note!</b> In some industrial environments, a proxy has to be used instead of this type of direct URL to the Eclipse web-site. To configure Eclipse to use a proxy is done under <b>Windows &gt; Preferences</b> and <b>General &gt; Network Connections</b></p><p><center><div class="thumb middle"><div class="thumbinner" style="width:566px;"><a href="InstallNewSoftware.bmp" class="image"><img class="thumbimage" width="564" align="middle" border="0" src="InstallNewSoftware.bmp"/></a><div class="thumbcaption">Figure 1: Install New Software wizard</div></div></div></center></p><p>In the <i>Name</i> column of the wizard, scroll down to <i>Modeling</i> and expand to the next level. Under <i>Modeling</i>, select <i>Papyrus UML</i> and follow the installation wizard to complete the installation.</p><p>When Eclipse is restarted, the environment is now ready for UML modeling.</p><h2 id="3.3_Additional_installation_steps">3.3 Additional installation steps</h2><p>After installation of the basic Papyrus feature, go to <b>Help &gt; Install Papyrus Additional Components</b>. In the wizard that pops up, select the needed additional Papyrus components, e.g. to be able to do UML RT modeling, the <i>Real Time</i> component is needed. It is also recommended to install the <i>Diagram Stylesheets</i> and <i>Papyrus Compare</i> components. Follow the installation wizard to complete the installation.</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:439px;"><a href="InstallPapyrusComp.bmp" class="image"><img class="thumbimage" width="437" align="middle" border="0" src="InstallPapyrusComp.bmp"/></a><div class="thumbcaption">Figure 2: The Install Papyrus Additional Components wizard</div></div></div></center></p><h1 id="4_Eclipse">4 Eclipse</h1><p>Papyrus is built on the Eclipse framework, so most of its look and feel is inherited from Eclipse.</p><p>The Eclipse framework has a plug-in architecture, where plug-ins can be grouped into features. Features and plug-ins can be added to an existing Eclipse installation.</p><h2 id="4.1_Architecture">4.1 Architecture</h2><p>The plug-in architecture applies also for all subsystems. A plug-in is the smallest unit of Eclipse Platform functionality that can be developed and delivered separately. Usually, a small tool is written as a single plug-in, whereas a complex tool has its functionality split across several plug-ins. Except for a small kernel known as the Platform Runtime, all of the Eclipse Platform's functionality is located in plug-ins. Plug-ins can be grouped into features.</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:502px;"><a href="EclipseArchitecture.bmp" class="image"><img class="thumbimage" width="500" align="middle" border="0" src="EclipseArchitecture.bmp"/></a><div class="thumbcaption">Figure 3: The Eclipse architecture</div></div></div></center></p><p>Plug-ins are coded in Java. A typical plug-in consists of Java code in a JAR (Java Archive) library, some read-only files, and other resources such as images, Web templates, message catalogs, native code libraries, and so on. Some plug-ins do not contain code at all. One such example is a plug-in that contributes online help in the form of HTML pages. A single plug-in’s code libraries and read-only content are located together in a directory in the file system, or at a base URL on a server. There is also a mechanism that permits a plug-in to be synthesized from several separate fragments, each in their own directory or URL. This is the mechanism used to deliver separate language packs for an internationalized plug-in.</p><p>Each plug-in has a manifest file declaring its interconnections to other plug-ins. The interconnection model is simple: a plug-in declares any number of named extension points, and any number of extensions to one or more extension points in other plug-ins.</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:292px;"><a href="Feature-Plug-in.bmp" class="image"><img class="thumbimage" width="290" align="middle" border="0" src="Feature-Plug-in.bmp"/></a><div class="thumbcaption">Figure 4: Plug-ins and Features</div></div></div></center></p><h2 id="4.2_Workspace"><div id="Workspace">4.2 Workspace</div></h2><p>The workspace is located in the file-system and is the place where Eclipse resources (files, folders and projects) are stored. When Eclipse is started, a pop-up window appears, where a workspace should be selected. One instance of Eclipse is connected to one workspace.</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:595px;"><a href="WorkspacePopup.bmp" class="image"><img class="thumbimage" width="593" align="middle" border="0" src="WorkspacePopup.bmp"/></a><div class="thumbcaption">Figure 5: Pop-up window to select the workspace</div></div></div></center></p><p>In the file system all resources are stored in the selected workspace and in the same hierarchical structure as in the <i>Project Explorer</i>.</p><h2 id="4.3_Resources">4.3 Resources</h2><p>Resources are a collective term for the projects, folders, and files that exist in the workbench. The resources are stored in the workspace, where the projects are on the first level. Inside a project, there are files and folders in the same hierarchical structure as in the <i>Project Explorer</i> and <i>Model Explorer</i>.</p><p>Files appear in the file system as files and folders are Unix directories or Windows folders and may contain other files and folders. Each time a file is saved, a copy is saved, which makes it possible to replace the current file with a previous edit or even restore a deleted file. Earlier versions of a file can be compared to the contents of all the local edits. Each edit in the local history is time stamped, i.e. is uniquely represented by the date and time the file was saved.</p><p>Projects can be viewed as the top level folder in the file system under the workspace. In Eclipse there are different types of projects, e.g. Model, C/C or Java projects and they are the top level resource in the <i>Project Explorer</i>. Projects can be closed and opened in the <i>Project Explorer</i>.</p><h2 id="4.4_Workbench"><div id="Workbench">4.4 Workbench</div></h2><p>The workbench is the Eclipse user interface and is used to navigate, view, and edit resources in a workspace, i.e. the workbench is the Eclipse IDE's application window. The workbench presents one or more editors and <i>views</i> that are gathered into adjustable groups (<i>perspectives</i>).</p><p>The first time Eclipse is started, after the installation, a <i>Welcome</i> page is presented. Take a few minutes to explore the product overview and getting started information that is located here.</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:482px;"><a href="WelcomePage.bmp" class="image"><img class="thumbimage" width="480" align="middle" border="0" src="WelcomePage.bmp"/></a><div class="thumbcaption">Figure 6: The Eclipse welcome page</div></div></div></center></p><p>To return to the ordinary workbench, just click on the workbench icon up to the right. When starting Eclipse, subsequent times, the workbench appears directly. To visit the welcome page at any time, just select <b>Help &gt; Welcome</b>.</p><p>The title bar of the workbench window and the little Papyrus icon to the right indicates which <i>perspective</i> is active. In this example, the Papyrus <i>perspective</i> is in use. The <i>Project Explorer</i> and the <i>Model Explorer, Outline, Properties</i> views, etc. are open, along with a <i>Class Diagram</i> editor and its tool palette.</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:514px;"><a href="Workbench.bmp" class="image"><img class="thumbimage" width="512" align="middle" border="0" src="Workbench.bmp"/></a><div class="thumbcaption">Figure 7: The Papyrus perspective in the workbench</div></div></div></center></p><p>It is easy to toggle between perspectives by clicking on some shown <i>perspective</i> in top of the right hand corner or open a new one by clicking on the <i>Open Perspective</i> icon <img border="0" src="IkonOpenPerspective.png"/> and browse to the <i>perspective</i> to open. It is also possible to reorganize a <i>perspective</i>, open/close <i>views</i>, customize menus, etc. and then save the <i>perspective</i> with a new name by <b>Window &gt; Save Perspective As ...</b>.</p><h3 id="4.4.1_Views">4.4.1 Views</h3><p><i>Views</i> and editors are the main visual entities that appear in the workbench. Any given <i>perspective</i> can contain multiple editors and a number of surrounding <i>views</i> that provide context.<i>Views</i> provide different ways to visualize, navigate and edit the resources in the Eclipse workspace. <i>Views</i> can be single or stacked on top of each other.</p><p><i>Views</i>, including editor views, can be resize, moved, detached. In addition, a <i>view</i> can be maximized to cover the entire workbench by double-clicking on its tab. By double-clicking once more, it will return to its original size. Some <i>views</i> has a view specific menu, e.g. <i>Project Explorer</i> view, where some specific view settings could be done.</p><p>To add a new <i>view</i> to the active <i>perspective</i>, use <b>Window &gt; Show View</b>and if the desired <i>view</i> does not appear on top of the pop-up menu, select <b>Other</b>, which opens up a <i>view</i> browser, where all available <i>views</i> are organized in different categories.</p><h4 id="4.4.1.1_Single_views">4.4.1.1 Single views</h4><p>In the workbench figure, above, several single views appears, e.g. <i>Outline, Class Diagram</i> editor, <i>Help, Project Explorer</i> and <i>Model Explorer</i> views. The <i>single view</i> has only one tab with the view name. By draging a <i>single view</i> tab and release it on another <i>single view</i> tab, <i>stacked views</i> are created.</p><h4 id="4.4.1.2_Stacked_views">4.4.1.2 Stacked views</h4><p>In the workbench figure, above, also <i>stacked views</i> appear, e.g. <i>Properties</i> and <i>Model Validation</i> views. To select the one that should be on top of the stack, just click on its tab and it becomes visible. By selecting a <i>stacked view</i> and drag it besides another view in the workbench, a <i>single view</i> will appear.</p><h2 id="4.5_Preferences">4.5 Preferences</h2><p>To customize the settings for the Eclipse workbench and the installed features, the preference window is used. Use <b>Windows &gt; Preferences</b> to open it, e.g. under <b>General &gt; Keys</b> in the preference window there are shortcuts and keys defined for the user interface. Here they can be redefined or own sets could be defined.</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:558px;"><a href="Preferences.bmp" class="image"><img class="thumbimage" width="556" align="middle" border="0" src="Preferences.bmp"/></a><div class="thumbcaption">Figure 8: The preference window</div></div></div></center></p><p>The preference window pages can be searched using the filter function. To filter by matching the page title, simply type the name of the page and the available pages will be presented below.</p><p>The filter also searches on keywords. By the history controls (the left, right and drop-down arrows up in the right corner of the preference window) it is possible to navigate through previously viewed pages. To step back or forward several pages at a time, click the drop-down arrow and a list of the most recently viewed preference pages are displayed.</p><h2 id="4.6_Import_and_Export">4.6 Import and Export</h2><p>Projects can be shared between workspaces by using project import and export, which are done through wizards. To open the import wizard, use <b>File &gt; Import</b> and in several steps select what, where from and if it should be imported as a copy or just referenced. To export resources, There are also an export wizard, which is opened by <b>File &gt; Export</b> and select details about what should be exported, if it should be compressed and where to export it to.</p><table><tr><td><p><div class="thumb middle"><div class="thumbinner" style="width:422px;"><a href="ImportWiz.bmp" class="image"><img class="thumbimage" width="420" align="middle" border="0" src="ImportWiz.bmp"/></a><div class="thumbcaption">Figure 9: Import wizard</div></div></div>    </p></td><td><p><div class="thumb middle"><div class="thumbinner" style="width:540px;"><a href="ExportWiz.bmp" class="image"><img class="thumbimage" width="538" align="middle" border="0" src="ExportWiz.bmp"/></a><div class="thumbcaption">Figure 10: Export wizard</div></div></div></p></td></tr></table><p>When importing a project into the used workspace, it can be copied by checking the box <i>Copy ...</i> in the import wizard. If this check box is unchecked, there will just be a reference to the other workspace and when editing that project, it will be edited in its original place. Be aware of that when doing so, several instances of Eclipse may edit the same resource.</p><p>When exporting a project, browse to the place where to export it to name it and select if and how compression should be used.</p><h1 id="5_Modeling">5 Modeling</h1><p>Papyrus is a comprehensive UML modeling environment, where diagrams can be used to view different aspects of a system. Behind all the diagrams, there is a model where the modeling elements, used in these diagrams, are stored. The model maintains the consistency between all diagrams.</p><p>A model is the collection of all the modeling elements and relationships that compose a software system. Papyrus enables the creation, viewing and manipulation of UML diagrams as specified in the <a href="http://www.omg.org/spec/UML/2.4.1/">UML 2 specification</a>.</p><p>The model defines every element, representing some part of the system. Multiple model diagrams can reference an element many times. Each of the different diagrams can view a different aspect of the system.</p><p>The model is the basis of the diagrams and keep the diagrams consistent. The diagrams are stored in the model's hierarchical structure. Some are owned by a modeling element like a class and some are just organized into packages and then owned by the package (a.k.a folders in basic Eclipse projects). <b>Note!</b> the top level of the model is the model package, which is a special kind of a package.</p><h2 id="5.1_Model_and_diagrams">5.1 Model and diagrams</h2><p>The model is the basis for all diagrams and maintains the consistency between the diagrams. The model is a collection of definitions of elements that compose the system and the relationships between them. Diagrams can be used to view subsets of the underlying model and from various view points. A model of a system may require many different diagrams to represent different views of the system for different project stakeholders.</p><p>In Papyrus, diagrams are be viewed and created in the <i>Model Explorer</i> view. The <i>Model Explorer</i> shows diagrams in their logical place within the model.</p><p>The visual representation of a system that diagrams provide can offer both low-level and high-level insights into the concepts and design of a system.</p><h1 id="6_Tutorials">6 Tutorials</h1><p>The tutorials are focused on selected topics regarding the use of Papyrus and contains step by step instructions on how to create and manipulate the workbench and models.</p><h2 id="6.1_Getting_started_with_general_Eclipse_functionality">6.1 Getting started with general Eclipse functionality</h2><p>This tutorial is about to understand the workbench environment and the basic Eclipse terminology.</p><h3 id="6.1.1_Exploring_perspectives">6.1.1 Exploring perspectives</h3><p>This part demonstrates the differences between the <i>Papyrus</i> and the <i>Resource</i> perspectives and also how to customize the <i>Resource</i> perspective.</p><h4 id="6.1.1.1_Exploring_the_.27.27Papyrus.27.27_perspective">6.1.1.1 Exploring the <i>Papyrus</i> perspective</h4><p>Explore the Papyrus default menus, toolbar, and views in the <i>Papyrus</i> perspective.</p><ol><li>To switch to the <i>Payrus</i> perspective, click <b>Window &gt; Open Perspective &gt; Other</b>. Then choose the <i>Papyrus</i> perspective. (Notice the workbench title bar and perspective bar reflect that the <i>Papyrus</i> perspective is active. Notice also the main menu items, toolbar buttons, and views that is visible in this perspective.)</li><li>Click <b>File &gt; New</b> and notice that the menu contains the items <i>Papyrus Project</i> and <i>Papyrus Model</i> among other items.</li><li>Click <b>Window &gt; Show View</b> and notice that the menu contains the items <i>Model Explorer</i>, <i>Model Validation</i> and more.</li></ol><h4 id="6.1.1.2_Exploring_and_customizing_the_Resource_perspective">6.1.1.2 Exploring and customizing the Resource perspective</h4><p>Explore the default menu, toolbar, and views in the <i>Resource</i> perspective and customize a menu.</p><ol><li>To switch to the <i>Resource</i> perspective, click <b>Window &gt; Open Perspective &gt; Other</b>. Then choose the <i>Resource</i> perspective. Notice that the workbench title bar and perspective bar reflect that the <i>Resource</i> perspective is active. (Notice the main menu items, toolbar buttons, and views visible in this perspective)</li><li>Click <b>File &gt; New</b> and notice that there are no Papyrus items in the menu.</li><li>Click <b>Window &gt; Show View</b> and notice that the menu does NOT contain the items <i>Model Explorer</i> and <i>Model Validation</i>.</li><li>Click <b>Window &gt; Customize Perspective</b>. Ensure that the workbench title bar and perspective bar reflect that the <i>Resource</i> perspective is active.</li><li>In the <i>Customize Perspective - Resource</i> pop-up window, select the <i>Shortcuts</i> tab and select <b>Show View</b> from the <i>Submenus</i> combo box.</li><li>Clear all check boxes in the <i>Shortcut Categories</i> list.</li><li>Click <i>General</i>(not check the check box) in the <i>Shortcut Categories</i> list, select the check box next to <i>Project Explorer</i> in the <i>Shortcuts</i> list, and click <i>OK</i>.</li><li>Click <b>Window &gt; Show View</b> and notice the menu now just contains the <i>Project Explorer</i> item.</li></ol><h3 id="6.1.2_Creating_a_new_project.2C_folder_and_files">6.1.2 Creating a new project, folder and files</h3><p>In this section a new project, folder and files will be created in the <i>Resource</i> perspective.</p><h4 id="6.1.2.1_Creating_a_new_general_project">6.1.2.1 Creating a new general project</h4><p>Create a new project in the <i>Resource</i> perspective by completing these steps:</p><ol><li>If necessary switch to the <i>Resource</i> perspective by clicking on <b>Window &gt; Open Perspective &gt; Other</b>. Then choose the <i>Resource</i> perspective. If the <i>Resource</i> perspective already is active, click on <b>Window &gt; Reset Perspective...</b> to get back to its default configuration.</li><li>Click <b>File &gt; New &gt; Project</b>.</li><li>In the <i>New Project</i> wizard, name the project <code>My Project</code> and click <i>Finish</i>.</li></ol><h4 id="6.1.2.2_Creating_a_new_folder">6.1.2.2 Creating a new folder</h4><p>Create a folder in the project:</p><ol><li>Right-click on <i>My Project</i> in the <i>Project Explorer</i> and select <b>New &gt; Folder</b>.</li><li>Type <code>Text Files</code> in the the field <i>Folder name</i>, and then click <i>Finish</i>.</li></ol><h4 id="6.1.2.3_Creating_and_editing_a_new_file">6.1.2.3 Creating and editing a new file</h4><p>Create a file in the folder:</p><ol><li>In the <i>Project Explorer</i>, right-click on the <i>Text Files</i> folder and select <b>New &gt; File</b>.</li><li>In the <i>New File</i> wizard, ensure that <i>My Project/Text Files</i> is the parent folder. Type <code>My File</code> as the file name and click <i>Finish</i>. (Notice that a text editor opens in the editing view for the created resource)</li><li>Enter any text into the editor view for <i>My File</i>. Notice the asterisk (*) next to the file name indicates unsaved changes.</li><li>Press <i>Ctrl S</i> to save the work. Notice that the asterisk disappears.</li></ol><h4 id="6.1.2.4_Creating_another_file">6.1.2.4 Creating another file</h4><p>Create another file in the <i>Text Files</i> folder, using the workbench menu this time.</p><ol><li>On the workbench menu, click <b>File &gt; New &gt; File</b>.</li><li>In the <i>New File</i> wizard, expand <i>My Project</i> and then select <i>Text Files</i> as the parent folder.</li><li>Type <code>My Other File</code> as the file name and click <i>Finish</i>.</li><li>Reviewing the contents of the <i>Project Explorer</i> view, which should be like this</li></ol><p><center><div class="thumb middle"><div class="thumbinner" style="width:202px;"><a href="MyProject.bmp" class="image"><img class="thumbimage" width="200" align="middle" border="0" src="MyProject.bmp"/></a></div></div></center></p><h3 id="6.1.3_Exploring_editors_and_views">6.1.3 Exploring editors and views</h3><p>This section demonstrates how to manipulate views and editors.</p><h4 id="6.1.3.1_Maximizing_and_restoring_an_editor">6.1.3.1 Maximizing and restoring an editor</h4><p>Maximize one of the editors to expand the viewable area:</p><ol><li>Double-click the file name on the editor tab for <i>My File</i>.</li><li>Double-click the file name again to restore the editor to its original size.</li></ol><h4 id="6.1.3.2_Tiling_and_restacking_the_editors">6.1.3.2 Tiling and restacking the editors</h4><p>Currently, the editors are stacked one in front of the other. Try tiling them horizontally and vertically:</p><ol><li>Click the <i>My Other File</i> editor tab and drag it to the bottom of the editor pane. Colored frames indicates how the views will be tiled. Drop the editor and notice that the editors are tiled horizontally.</li><li>Drag the <i>My Other File</i> editor tab to the left of the editor pane and release it. Notice that the editors are tiled vertically.</li><li>Restack the editors by dragging one of the editor tabs on top of the other.</li></ol><h4 id="6.1.3.3_Organizing_views">6.1.3.3 Organizing views</h4><p>Try moving a view:</p><ol><li>Drag the title bar of the <i>Outline</i> view onto the title bar of the <i>Project Explorer</i>.</li><li>Experiment by dragging the title bar of the <i>Outline</i> view to various locations within the workbench.</li><li>Return the <i>Outline</i> view to its original place to the lower left of the workbench. It is always possible to return to the default configuration of the active perspective by clicking on <b>Windows &gt; Reset Perspective...</b></li></ol><h4 id="6.1.3.4_Using_view_menus">6.1.3.4 Using view menus</h4><p>Some views has view menus, e.g. <i>Project Explorer</i> view, which is indicated by a down arrow in the upper-right corner of the view. Click this down arrow of the <i>Project Explorer</i> view and review the pull-down menu options specific for this view.</p><h4 id="6.1.3.5_Closing_and_opening_views">6.1.3.5 Closing and opening views</h4><p>If a view does not appear in the workbench, it can be open by using the <b>Window</b> menu:</p><ol><li>Close the <i>Project Explorer</i> view by right-click on the <i>Project Explorer</i> view tab and select <b>Close</b>.</li><li>Click <b>Window &gt; Show View &gt; Other</b> and type <code>Project Explorer</code> in the filter text box.</li><li>Select <i>Project Explorer</i> and click <i>OK</i> which opens the view again.</li></ol><h3 id="6.1.4_Exporting_and_importing_a_project">6.1.4 Exporting and importing a project</h3><p>This section demonstrates how projects can be shared between users and workspaces using the <i>export</i> and <i>import</i> feature.</p><h4 id="6.1.4.1_Exporting_a_project">6.1.4.1 Exporting a project</h4><p>Export <i>My Project</i> to a compressed file:</p><ol><li>Select <b>File &gt; Export...</b> from the workbench menu.</li><li>In the <i>Export</i> wizard, expand <b>General</b>, and then select <b>Archive File</b>. Click <i>Next</i>.</li><li>Check the check box next to <i>My Project</i> in the resource list.</li><li>Click <i>Browse</i> to specify an export destination in the <i>To archive file</i> field. Note the available options for archive formats.</li><li>In the <i>Browse</i> window, select the <i>Desktop</i> as the destination folder and type <code>My Project</code> as the file name. Click <i>OK</i>.</li><li>In the <i>Export</i> wizard, click <i>Finish</i> to perform the export process.</li><li>View the desktop and notice the new compressed (.zip) file.</li></ol><h4 id="6.1.4.2_Removing_the_project_from_the_workspace">6.1.4.2 Removing the project from the workspace</h4><p>Remove <i>My Project</i> from the workspace:</p><ol><li>Right-click <i>My Project</i> in the <i>Project Explorer</i> and select <b>Delete</b> from the context menu.</li><li>In the <i>Delete Resources</i> pop-up window, make sure to check the</li></ol><p><i>Delete project contents on disk</i> check box. Click <i>OK</i>. Note: If this check box is unchecked, the resource will just be deleted from the Workbench, but it will still exist in the workspace. (Notice <i>My Project</i> is no longer listed in the <i>Project Explorer</i>)</p><h4 id="6.1.4.3_Importing_a_project">6.1.4.3 Importing a project</h4><p>Import <i>My Project</i> from a compressed file:</p><ol><li>Select <b>File &gt; Import...</b> from the workbench menu.</li><li>In the <i>Import</i> wizard, expand <b>General</b>, and then select <b>Existing Projects into Workspace</b>. Click <i>Next</i>.</li><li>Click the <b>Select archive file</b> radio button.</li><li>Click the <i>Browse</i> button.</li><li>In the <i>Browse</i> window, browse to the <i>Desktop</i> and select <b>My Project.zip</b> and click <i>Open</i>.</li></ol>#In the <p><i>Import</i> wizard, check the check box next to <i>My Project</i> and click <i>Finish</i> to perform the import process. (Notice <i>My Project</i> is once again listed in the <i>Project Explorer</i>)</p><h3 id="6.1.5_Conclusion">6.1.5 Conclusion</h3><p>The basic features of the Eclipse workbench have now been demonstrated.</p><ul><li>How to view and customize perspectives.</li><li>How to create a project, folder and files.</li><li>How to manipulate editors and views.</li><li>How to export and import projects.</li></ul><h2 id="6.2_Creating_profiles">6.2 Creating profiles</h2><h2 id="6.3_Creating_models_using_Papyrus">6.3 Creating models using Papyrus</h2><h3 id="6.3.1_Use-case_modeling">6.3.1 Use-case modeling</h3><h3 id="6.3.2_Design_modeling">6.3.2 Design modeling</h3><p>This is a tutorial about general class and object modeling using Papyrus.</p><h4 id="6.3.2.1_Create_a_new_UML_project">6.3.2.1 Create a new UML project</h4><p>Create a new UML modeling project as follows:</p><ol><li>If necessary switch to the <i>Papyrus</i> perspective by clicking on <b>Window &gt; Open Perspective &gt; Other</b>. Then choose the <i>Papyrus</i> perspective. If the <i>Papyrus</i> perspective is already active, click on <b>Window &gt; Reset Perspective...</b> to get back to its default configuration.</li><li>Click <b>File &gt; New &gt; Papyrus Project</b>.</li><li>In the <i>New Papyrus Project</i> wizard, name the project <code>My Design Model</code> and click <i>Next</i>.</li><li>Make sure that the radio button <i>UML</i> is selected and click <i>Next</i>.</li><li>Under the section <i>You can load a template</i>, check the box <i>A UML model with basic primitive types (ModelWithBasicTypes)</i> and click on <i>Finish</i>.</li></ol><h4 id="6.3.2.2_Create_new_packages_to_be_used_for_classes">6.3.2.2 Create new packages to be used for classes</h4><p>Create two packages in the model:</p><ol><li>Right-click on the <i>model</i> package in the <i>Model Explorer</i>, select <b>New Child &gt; Create a new Package</b> and select the created package in the <i>Model Explorer</i>.</li><li>In the <i>Properties</i> view type <code>Clients</code> in the the field <i>Name</i>.</li><li>Right-click on the <i>model</i> package in the <i>Model Explorer</i>, select <b>New Child &gt; Create a new Package</b> and select the created package in the <i>Model Explorer</i>.</li><li>In the <i>Properties</i> view type <code>Server</code> in the the field <i>Name</i>.</li></ol><h4 id="6.3.2.3_Create_new_classes">6.3.2.3 Create new classes</h4><p>Create two classes in the <i>Server</i> package. One is called <i>Server1</i> and the other is called <i>DataClass1</i>:</p><ol><li>Right-click on the <i>Server</i> package in the <i>Model Explorer</i>, select <b>New Child &gt; Create a new Class</b> and select the created class in the <i>Model Explorer</i>.</li><li>In the <i>Properties</i> view type <code>Server1</code> in the the field <i>Name</i>.</li><li>Right-click on the <i>Server</i> package in the <i>Model Explorer</i>, select <b>New Child &gt; Create a new Class</b> and select the created class in the <i>Model Explorer</i>.</li><li>In the <i>Properties</i> view type <code>DataClass1</code> in the the field <i>Name</i>.</li></ol><p>Create three different client classes in the <i>Clients</i> package:</p><ol><li>Right-click on the <i>Clients</i> package in the <i>Model Explorer</i>, select <b>New Child &gt; Create a new Class</b> and select the created class in the <i>Model Explorer</i>.</li><li>In the <i>Properties</i> view type <code>Client1</code> in the the field <i>Name</i>.</li><li>Right-click on the <i>Clients</i> package in the <i>Model Explorer</i>, select <b>New Child &gt; Create a new Class</b> and select the created class in the <i>Model Explorer</i>.</li><li>In the <i>Properties</i> view type <code>Client2</code> in the the field <i>Name</i>.</li><li>Right-click on the <i>Clients</i> package in the <i>Model Explorer</i>, select <b>New Child &gt; Create a new Class</b> and select the created class in the <i>Model Explorer</i>.</li><li>In the <i>Properties</i> view type <code>ClientRoot</code> in the the field <i>Name</i>.</li></ol><h4 id="6.3.2.4_Create_new_class_diagrams">6.3.2.4 Create new class diagrams</h4><p>Create two class diagrams in the model:</p><ol><li>Right-click on the <i>model</i> package in the <i>Model Explorer</i>, select <b>New Diagram &gt; Create a new Class Diagram</b> and type <code>Packages</code> in the <i>Enter a new diagram name</i> pop-up window.</li><li>Right-click on the <i>model</i> package in the <i>Model Explorer</i>, select <b>New Diagram &gt; Create a new Class Diagram</b> and type <code>Classes</code> in the <i>Enter a new diagram name</i> pop-up window.</li></ol><h4 id="6.3.2.5_Create_new_operations_and_attributes">6.3.2.5 Create new operations and attributes</h4><ol><li>Right-click on the class <i>DataClass1</i> and select <b>New Child &gt; Create a new Property</b> and select the created attribute in the <i>Model Explorer</i>.  </li><li>In the <i>Properties</i> view, type <code>Field1</code> in the field <i>Name</i> and by the <i>Type</i> field click on the <img border="0" src="TypeKey.bmp"/> key and select <i>Integer</i> from the <i>UML Primitive Types</i>. This cause the created attribute to be named <i>Field1</i> and to be of type <i>Integer</i>.</li><li>Follow the above pattern to also create the attributes <i>Field2</i> of type <i>Integer</i>, <i>Field3</i> of type <i>String</i>, and <i>Field4</i> of type <i>String</i> on class <i>DataClass1</i>.</li><li>Create the attributes <i>Attribute2</i> of type <i>String</i>, <i>Attribute4</i> of type <i>Integer</i> and <i>Attribute5</i> of type <i>DataClass1</i> on class <i>Client1</i>.</li><li>Create the attribute <i>Attribute3</i> on class <i>Client2</i>.</li><li>Create the attribute <i>Attribute1</i> on class <i>Server1</i>.</li><li>Create the operation <i>service1</i> on class <i>Server1</i> by right-click on on the class <i>Server1</i> and select <b>New Child &gt; Create a new Operation</b> and select the created operation in the <i>Model Explorer</i>.</li><li>In the <i>Properties</i> view, type <code>service1</code> in the the field <i>Name</i> and by the <i>Owned parameter</i> field click on the <img border="0" src="PlusKey.bmp"/> key.</li><li>In the <i>Create a new parameter</i> pop-up window, type <code>service1return</code> in the <i>Name</i> field, select <i>return</i> from the <i>Direction</i> field drop down list and by the <i>Type</i> field click on the <img border="0" src="TypeKey.bmp"/> key and select <i>Integer</i> from the <i>UML Primitive Types</i>. This causes the return type of the operation to be defined as an integer.</li></ol><h4 id="6.3.2.6_Create_new_relationships_between_classes">6.3.2.6 Create new relationships between classes</h4><p>Create a <i>Dependency</i> relationship between the <i>Clients</i> and the <i>Server</i> packages:</p><ol><li>Open the <i>Diagram Packages</i> diagram by double click on it in the <i>Model Explorer</i></li><li>Drag the <i>Clients</i> package to the class diagram (by click on it and while holding the mouse button down, move the cursor to the editing area in the class diagram editor and release it).</li><li>Drag the <i> Server</i> package to the class diagram.</li><li>Select the <i>Dependency</i> tool from the <i>Edges</i> drawer in the <i>Palette</i>, click on the <i>Clients</i> package and then on the <i>Server</i> package in the class diagram.</li><li>Type <code>Dependency</code> as the name of the relationship.</li></ol><p>Create a <i>Generalization</i> relationship between the classes <i>Client2</i> and <i>Client1</i>, i.e. make <i>Client2</i> a sub-class of <i>Client1</i>:</p><ol><li>Open the <i>Diagram Classes</i> diagram by double click on it in the <i>Model Explorer</i></li><li>Drag the <i>Client1</i> class to the class diagram.</li><li>Drag the <i>Client2</i> class to the class diagram.</li><li>Select the <i>Generalization</i> tool from the <i>Edges</i> drawer in the <i>Palette</i>, click on the <i>Client2</i> class and then on the <i>Client1</i> class in the class diagram.</li></ol><p>Create a <i>Composite</i> relationships between the classes <i>ClientRoot</i> and <i>Client1</i> plus <i>ClientRoot</i> and <i>Client2</i>:</p><ol><li>Continue with the already opened class diagram <i>Diagram Classes</i>.</li><li>Drag the <i>ClientRoot</i> class to the class diagram.</li><li>Select the <i>Association</i> tool from the <i>Edges</i> drawer in the <i>Palette</i>, click on the <i>ClientRoot</i> class and the on the <i>Client1</i> class in the class diagram.</li><li>Select the created association in the class diagram and in the <i>Properties</i> view, rename the association to <code>cr-c1</code>.</li><li>Also in the same <i>Properties</i> view, at the member end, named <i>client1</i>, by the <i>Aggregation</i> field, select <i>composite</i> from the drop down list.</li><li>Select the <i>Association</i> tool from the <i>Edges</i> drawer in the <i>Palette</i>, click on the <i>ClientRoot</i> class and the on the <i>Client2</i> class in the class diagram.</li><li>Select the created association in the class diagram and in the <i>Properties</i> view, rename the association to <code>cr-c2</code>.</li><li>Also in the same <i>Properties</i> view, at the member end, named <i>client2</i>, by the <i>Aggregation</i> field, select <i>composite</i> from the drop down list.</li></ol><h4 id="6.3.2.7_Create_a_new_package_to_be_used_for_objects">6.3.2.7 Create a new package to be used for objects</h4><p>Create a new package in the model:</p><ol><li>Right-click on the <i>model</i> package in the <i>Model Explorer</i>, select <b>New Child &gt; Create a new Package</b> and select the created package in the <i>Model Explorer</i>.</li><li>In the <i>Properties</i> view type <code>Objects</code> in the the field <i>Name</i>.</li></ol><h4 id="6.3.2.8_Create_new_objects">6.3.2.8 Create new objects</h4><p>Create objects (instances of classes) in the <i>Objects</i> package:</p><ol><li>Right-click on the <i>Objects</i> package in the <i>Model Explorer</i>, select <b>New Child &gt; Create a new InstanceSpecification</b> and select the created object (InstanceSpecification) in the <i>Model Explorer</i>.</li><li>In the <i>Properties</i> view type <code>clientObj1</code> in the the field <i>Name</i> and by the <i>Classifier</i> field click on the <img border="0" src="PlusKey.bmp"/> key. In the <i>Classifier</i> window that pops up, browse to the <i>Client2</i> class and click on the <img border="0" src="Arrow.bmp"/> key, which specifies the object's class as shown in figure 11.</li></ol><p><center><div class="thumb middle"><div class="thumbinner" style="width:402px;"><a href="ClassifierPopUp.bmp" class="image"><img class="thumbimage" width="400" align="middle" border="0" src="ClassifierPopUp.bmp"/></a><div class="thumbcaption">Figure 11: The Classifier pop up window</div></div></div></center></p><p>Follow the same pattern to create:</p><ol><li>An object called <i>clientObj2</i> in the <i>Objects</i> package based on class <i>Clent2</i>.</li><li>An object called <i>serverObj1</i> in the <i>Objects</i> package based on class <i>Server1</i>.</li></ol><h4 id="6.3.2.9_Create_a_new_class_diagram">6.3.2.9 Create a new class diagram</h4><p>Create a class diagrams in the model to depicts the created objects:</p><ol><li>Right-click on the <i>model</i> package in the <i>Model Explorer</i>, select <b>New Diagram &gt; Create a new Class Diagram</b> and type <code>Objects</code> in the the <i>Enter a new diagram name</i> pop-up window.</li></ol><h4 id="6.3.2.10_Create_new_relationships_between_objects">6.3.2.10 Create new relationships between objects</h4><p>Create a <i>Dependency</i> relationship between the clients and the server objects:</p><ol><li>Open the <i>Diagram Objects</i> diagram by double click on it in the <i>Model Explorer</i></li><li>Drag the <i>clientObj1</i> object to the class diagram (by click on it and while holding the mouse button down, move the cursor to the editing area in the class diagram editor and release it).</li><li>Drag the <i>clientObj2</i> object to the class diagram</li><li>Drag the <i>serverObj1</i> object to the class diagram.</li><li>Select the <i>Dependency</i> tool from the <i>Edges</i> drawer in the <i>Palette</i>, click on the <i>clientObj1</i> object and then on the <i>serverObj1</i> object in the class diagram. Leave the default name on the relationship.</li><li>Also create a <i>Dependency</i> relationship between the <i>clientObj2 and the </i>serverObj1''.</li></ol><h4 id="6.3.2.11_Conclusion">6.3.2.11 Conclusion</h4><p>In this tutorial the following model was created:</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:402px;"><a href="DesignModelEx1.bmp" class="image"><img class="thumbimage" width="400" align="middle" border="0" src="DesignModelEx1.bmp"/></a><div class="thumbcaption">Figure 12: Two packages on top in the model</div></div></div></center></p><p><center><div class="thumb middle"><div class="thumbinner" style="width:402px;"><a href="DesignModelEx2.bmp" class="image"><img class="thumbimage" width="400" align="middle" border="0" src="DesignModelEx2.bmp"/></a><div class="thumbcaption">Figure 13: Relationships between the client classes</div></div></div></center></p><p><b>Note!</b> The inherited attributes depicted in figure 13 on the <i>Client2</i> class.</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:402px;"><a href="ObjectDiagram.bmp" class="image"><img class="thumbimage" width="400" align="middle" border="0" src="ObjectDiagram.bmp"/></a><div class="thumbcaption">Figure 14: Objects in the model and their relationships</div></div></div></center></p><h3 id="6.3.3_RT_modeling">6.3.3 RT modeling</h3><h1 id="7_Papyrus">7 Papyrus</h1><p>Papyrus can be used to do</p><ul><li>General UML modeling.</li><li>UML RT modeling, which is described in the section <a href="#6.3.3_RT_modeling">6.3.3_RT_modeling</a> when the UML RT profile is applied.</li><li>SysML modeling when the SysML profile is applied.</li><li>MARTE modeling when the MARTE profile is applied.</li><li>UML profiles, which is described in the section <a href="#7.10_UML_profiling">UMLprofiling</a> .</li></ul><p>In Papyrus, different UML profiles can be applied. When installing Papyrus, as described in section <a href="#3_Installation">Installation</a> , also the UML, UML RT, SysML and MARTE profiles can be added. When creating a new Papyrus project, the type of Papyrus project is selected. Project types to chose from are SysML, Profile and UML.</p><h2 id="7.1_Papyrus_resources_in_the_workspace">7.1 Papyrus resources in the workspace</h2><p>When modeling in Papyrus, three types of resources are stored in the workspace.</p><table><tr><td><p><div class="thumb middle"><div class="thumbinner" style="width:402px;"><a href="ModelProjResourcesFS.bmp" class="image"><img class="thumbimage" width="400" align="middle" border="0" src="ModelProjResourcesFS.bmp"/></a><div class="thumbcaption">Figure 15: Resources in the file system</div></div></div></p></td><td><p><div class="thumb middle"><div class="thumbinner" style="width:202px;"><a href="ModelProjResourcesPE.bmp" class="image"><img class="thumbimage" width="200" align="middle" border="0" src="ModelProjResourcesPE.bmp"/></a><div class="thumbcaption">Figure 16: Resources in the Project Explorer</div></div></div></p></td></tr></table><ul><li><b>.di</b> file persists the status of the workbench, i.e. which diagrams and views are opened, etc.</li><li><b>.notation</b> file persists the information about the diagrams in the model.</li><li><b>.uml</b> file persists the UML model.</li></ul><p>Note! In this case the model is contained in three files. When working in an industrial context, the model may need to be split up into several fragments in order for several designers to work concurrently with the same model. This is described in section <a href="#7.6_Papyrus_in_a_team_environment">Papyrus in a team environment</a> .</p><h2 id="7.2_The_Papyrus_perspective">7.2 The Papyrus perspective</h2><p>When Papyrus is installed a predefined perspective called <i>Papyrus</i> is made available. This is the perspective to use when modeling with Papyrus. The Papyrus perspective can be customized to the user needs and saved as new perspective ( see section <a href="#4.4_Workbench">Workbench</a> ).</p><h3 id="7.2.1_Project_Explorer_view">7.2.1 Project Explorer view</h3><p>The <i>Project Explorer</i> view is used to browse, select and manipulate resources in the workspace. Projects or working sets are the top level in this view. From the <i>Project Explorer's</i> (right click on the white space) context menu, e.g. new projects can be created.</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:202px;"><a href="ProjectExpl.bmp" class="image"><img class="thumbimage" width="200" align="middle" border="0" src="ProjectExpl.bmp"/></a><div class="thumbcaption">Figure 17: The Project Explorer</div></div></div></center></p><p>In some views, as in this case, there is a view specific menu (indicated in Figure 13 with a red ring). Here some settings can be applied for the view, e.g. if the top level should be working sets or projects.</p><h3 id="7.2.2_Model_Explorer_view">7.2.2 Model Explorer view</h3><p>In the <i>Model Explorer</i> view, the model that has been opened in the <i>Project Explorer</i>, can be browsed and edited. Model elements can be added by using the context menu of any existing modeling element, including the model package and packages. Diagrams can also be added by using the context menus. Existing diagrams can be opened in an appropriate editor by just double clicking on the diagram in the <i>Model Explorer</i>.</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:202px;"><a href="ModelExpl.bmp" class="image"><img class="thumbimage" width="200" align="middle" border="0" src="ModelExpl.bmp"/></a><div class="thumbcaption">Figure 18: The Model Explorer</div></div></div></center></p><h3 id="7.2.3_Editing_view">7.2.3 Editing view</h3><p>The <i>Editing View</i> is in the middle part of the workbench and here opens different types of editors, depending on the type of resource to edit, e.g. if a class diagram is opened, the class diagram editor will be visible in the <i>Editing View</i>.</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:402px;"><a href="EditingView.bmp" class="image"><img class="thumbimage" width="400" align="middle" border="0" src="EditingView.bmp"/></a><div class="thumbcaption">Figure 19: The Editing View</div></div></div></center></p><p>How to use editors is described in section <a href="#7.3_Diagram_editing_in_Papyrus">Editors in Papyrus</a>.</p><h3 id="7.2.4_Outline_view">7.2.4 Outline view</h3><p>The <i>Outline View</i> is connected to the <i>Editing View</i> and gives an overview of what is open in the <i>Editing View</i>. The <i>Outline View</i> may be used to pan the <i>Editing View</i> or to select some information that will be highlighted in the <i>Editing View</i>. The shaded area is the area that is visible in the <i>Editing View</i>.</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:202px;"><a href="OutlineView.bmp" class="image"><img class="thumbimage" width="200" align="middle" border="0" src="OutlineView.bmp"/></a><div class="thumbcaption">Figure 20: The Outline View</div></div></div></center></p><h3 id="7.2.5_Properties_view">7.2.5 Properties view</h3><p>The <i>Properties view</i> is a stacked view which is located at the bottom of the workbench and shows the properties of a selected modeling element. The modeling element can be selected in the Model Explorer or in a diagram. The properties are categorized under different tabs located to the left in the <i>Properties view</i>.</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:502px;"><a href="PropertiesView.bmp" class="image"><img class="thumbimage" width="500" align="middle" border="0" src="PropertiesView.bmp"/></a><div class="thumbcaption">Figure 21: The Properties View</div></div></div></center></p><p>In this view the properties may be viewed and edited, e.g. rename the operation and change the visibility of the operation.</p><h3 id="7.2.6_Model_Validation_view">7.2.6 Model Validation view</h3><p>From the context menu in the <i>Model Explorer</i> it is possible to validate the entire model or parts of it (for more details see section <a href="#7.7_Model_validation">Model validation</a> . All warnings and errors appear in the <i>Model Validation View</i>, which is a stacked view together with the <i>Properties View</i> and the <i>Search View</i> at the bottom of the workbench.</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:502px;"><a href="ModelValidationView.bmp" class="image"><img class="thumbimage" width="500" align="middle" border="0" src="ModelValidationView.bmp"/></a><div class="thumbcaption">Figure 22: The Model Validation View</div></div></div></center></p><p>The model validation constraints are customizable and how to work with it is described in section <a href="#7.7_Model_validation">Model validation</a> .</p><h3 id="7.2.7_Search_view">7.2.7 Search view</h3><p>It is possible to do searches on a selected resource in a specific project or in the entire workspace. When the search is finished, the result appears in the <i>Search View</i>. Details about specifying searches is described in the <a href="#7.8_Searching">Searching</a> section.</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:502px;"><a href="SearchView.bmp" class="image"><img class="thumbimage" width="500" align="middle" border="0" src="SearchView.bmp"/></a><div class="thumbcaption">Figure 23: The Search View</div></div></div></center></p><p>The example in Figure 23 shows the result of a model search for <i>Class1</i> in the entire workspace.</p><h2 id="7.3_Diagram_editing_in_Papyrus"><div id="EditorsinPapyrus">7.3 Diagram editing in Papyrus</div></h2><p>To edit diagrams different editors are available in Papyrus. They have the same basic look and feel. When double clicking on some diagram in the <i>Model Explorer</i>, the diagram opens in the editing view. An outline view and a tool palette are also opened. Creating a new diagram in the <i>Model Explorer</i> will also open up a diagram editor together with its tool palette and outline view.</p><h3 id="7.3.1_Diagram_editors">7.3.1 Diagram editors</h3><p>When a diagram editor is opened in Papyrus, three views are opened:</p><ul><li>Editing surface</li><li>Palette</li><li>Outline</li></ul><p><center><div class="thumb middle"><div class="thumbinner" style="width:502px;"><a href="DiagramEditorFieldsPointers.bmp" class="image"><img class="thumbimage" width="500" align="middle" border="0" src="DiagramEditorFieldsPointers.bmp"/></a><div class="thumbcaption">Figure 24: Parts of a diagram editor (as an example, the class diagram editor is used)</div></div></div></center></p><p>Figure 24 shows the different parts of a diagram editor. In this case the class diagram editor has been chosen as an example. The <i>Editing surface</i> is where the diagram editing is taken place. The <i>Outline view</i> gives an overview of the entire diagram. The blue shaded part in the <i>Outline view</i> shows what is visible in the editing surface. The <i>Palette</i> contains <i>Drawers</i> and in each drawer there are <i>Tools</i> to be used to add different things into the diagram. In Figure 22, the <i>Nodes</i> drawer is closed and the <i>Edges</i> drawer is opened. In the <i>Edges</i> drawer there are <i>Tools</i> to create different types of edges. By clicking on a drawer, it toggles open and close drawer.</p><h3 id="7.3.2_Basic_tool_techniques">7.3.2 Basic tool techniques</h3><p>Diagrams can be created in different places in the model such as they can be owned by model elements like classes or packages. Diagrams can also be placed on top of the model directly under the model package.</p><h4 id="7.3.2.1_Creating_diagrams">7.3.2.1 Creating diagrams</h4><p>To create a diagram, right click on the model element that should be the owner of the diagram and select <b>New Diagram</b> from the context menu. A new level of menu appears, displaying all types of diagrams that are available to create in this place, e.g. Figure 21 shows the available diagram types that can be created directly on top in the model package.</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:502px;"><a href="NewDiagram.bmp" class="image"><img class="thumbimage" width="500" align="middle" border="0" src="NewDiagram.bmp"/></a><div class="thumbcaption">Figure 25: Available diagram types that can be created directly under the model package</div></div></div></center></p><p><b>Note!</b> In Figure 25, no adaptation of Papyrus has taken place, hence all diagram types according pops up.</p><h4 id="7.3.2.2_Scrolling_and_panning_in_diagrams">7.3.2.2 Scrolling and panning in diagrams</h4><p>Scrolling and panning in diagrams can be done by either:</p><ul><li>Use the outline view and click (hold down) and drag the blue shaded area around, which simultaneously pans the editing surface.</li><li>Use the vertical and horizontal scroll bars in the editing surface.</li></ul><h4 id="7.3.2.3_Creating_an_element_in_a_diagram">7.3.2.3 Creating an element in a diagram</h4><p>Elements can be created in a diagram directly, by using a tool from the palette, e.g. to create a class</p><ol><li>Open a class diagram</li><li>Open the nodes drawer</li><li>Click on the class tool</li><li>Click somewhere in the editing surface</li><li>Name the class</li></ol><p>If an element already exists in the model, just click on (hold down) the element in the <i>Model Explorer</i> and drag it to the editing surface. When releasing the mouse key, the modeling element appears in the diagram.</p><h4 id="7.3.2.4_Delete_and_hide">7.3.2.4 Delete and hide</h4><p>In a diagram, elements can be deleted or hided.</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:202px;"><a href="ElementContextMenuDiaDelHide.bmp" class="image"><img class="thumbimage" width="200" align="middle" border="0" src="ElementContextMenuDiaDelHide.bmp"/></a><div class="thumbcaption">Figure 26: Context menu of an element in a diagram</div></div></div></center></p><p>Right click on an element in a diagram and do</p><ul><li><b>Delete Selected Element</b> will delete the element from the entire model and also from all diagrams where it was present.</li><li><b>Hide Selected Element</b> will hide the element just in this diagram.</li></ul><p><b>Note!</b> These menu items have short cuts, i.e. instead of using the context menu, just select the element in the diagram and use the <b>Delete</b> or <b>Shift-Delete</b> keys</p><h4 id="7.3.2.5_Formating_and_validating_diagrams">7.3.2.5 Formating and validating diagrams</h4><p>Diagrams can be adjusted and graphically edited to get a nicer look also using the element context menu. From the same context menu it is also possible to validate the model or specific parts of the model.</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:302px;"><a href="ElementContextMenuDiaFormat.bmp" class="image"><img class="thumbimage" width="300" align="middle" border="0" src="ElementContextMenuDiaFormat.bmp"/></a><div class="thumbcaption">Figure 27: Example of the Format sub context menu</div></div></div></center></p><p>In Figure 27 several menu items are shown, e.g.:</p><ul><li><b>Validation</b> to validate the model partly or fully</li><li><b>Format</b> to do some advanced formating of the diagram like adjustments, routing, etc. as shown in the sub context menu in Figure 25</li><li><b>Filter</b> to select/unselect parts of symbols that should be visible or not</li></ul><h2 id="7.4_UML_modeling"><div id="UMLmodeling">7.4 UML modeling</div></h2><p>With Papyrus, UML models can be created. This is done using different types of diagrams. Modeling elements can be created in these diagrams or directly in the <i>Model Explorer</i>. Diagrams are created in the <i>Model Explorer</i> and when doing so a diagram editor together with its tool palette and outline view are also opened. Section <a href="#7.3_Diagram_editing_in_Papyrus">Diagram editing in Papyrus</a> describes how to work with diagram editors.</p><p>The most common modeling elements are:</p><ul><li>Package</li><li>Use-case</li><li>Actor</li><li>Class</li><li>Object</li></ul><h3 id="7.4.1_Package">7.4.1 Package</h3><p>A <i>package</i> is a general UML grouping element, comparable to a folder in Windows or a directory in Unix. It is used to bring order in the model. A <i>package</i> may have a semantical meaning (e.g. representing a subsystem) and then a UML stereotype, defined in a applied UML Profile, may be added to it (e.g. &lt;&lt; subsystem &gt;&gt;). To create a new <i>package</i>, right click on the owning element, e.g. the model package and from the context menu select <b>New Child &gt; Create a new Package</b></p><p><center><div class="thumb middle"><div class="thumbinner" style="width:502px;"><a href="NewPackage.bmp" class="image"><img class="thumbimage" width="500" align="middle" border="0" src="NewPackage.bmp"/></a><div class="thumbcaption">Figure 28: Create a new Package</div></div></div></center></p><h3 id="7.4.2_Use-case">7.4.2 Use-case</h3><p>A <i>use-case</i> is a functionality in the system. A <i>use-case</i> is a model of the dialogue between actors and the system. It should return a result of measurable value to at least one actor. A <i>use-case</i> is initiated by an actor to invoke a certain functionality in the system.
+A <i>use-case</i> is a complete and meaningful flow of events.
+Taken together, all <i>use-cases</i> constitute all possible ways of using the system.</p><p>To create a new <i>use-case</i>, right click on the owning element, e.g. a package and from the context menu select <b>New Child &gt; Create a new UseCase</b></p><p><center><div class="thumb middle"><div class="thumbinner" style="width:502px;"><a href="NewUseCase.bmp" class="image"><img class="thumbimage" width="500" align="middle" border="0" src="NewUseCase.bmp"/></a><div class="thumbcaption">Figure 29: Create a new use-case</div></div></div></center></p><h3 id="7.4.3_Actor">7.4.3 Actor</h3><p>An <i>actor</i> is something external to the system, but interacts with it. An <i>actor</i> may be a human being or another system. It may be active or passive. An <i>actor</i> interacts (active <i>actor</i>) or receive (passive <i>actor</i>) information from one or several use-cases.</p><p>To create a new <i>actor</i>, right click on the owning element, e.g. a package and from the context menu select <b>New Child &gt; Create a new Actor</b></p><p><center><div class="thumb middle"><div class="thumbinner" style="width:502px;"><a href="NewActor.bmp" class="image"><img class="thumbimage" width="500" align="middle" border="0" src="NewActor.bmp"/></a><div class="thumbcaption">Figure 30: Create a new actor</div></div></div></center></p><h3 id="7.4.4_Class">7.4.4 Class</h3><p>A <i>class</i> is an extensible template for creating objects, providing initial values for state (member variables, attributes) and implementations of behavior (member functions, methods, operations). </p><p>Collectively attributes define the structure of a <i>class</i>. A class may have any number of attributes or none. Attributes are typically implemented as variables. An attribute has a type, which tells us what kind of attribute it is. Typical types of attributes are integer, Boolean, real, and enumeration. These types are called primitive types. More complex types are defined by other <i>classes</i>.</p><p>Collectively operations define the behavior of the <i>class</i>. A <i>class</i> may have any number of operations or none. Operations are implemented as functions or procedures.</p><p>To create a new <i>class</i>, right click on the owning element, e.g. a package and from the context menu select <b>New Child &gt; Create a new Class</b></p><p><center><div class="thumb middle"><div class="thumbinner" style="width:502px;"><a href="NewClass.bmp" class="image"><img class="thumbimage" width="500" align="middle" border="0" src="NewClass.bmp"/></a><div class="thumbcaption">Figure 31: Create a new class</div></div></div></center></p><h4 id="7.4.4.1_Attributes_on_classes">7.4.4.1 Attributes on classes</h4><p>When a <i>class</i> is created, <i>attributes</i> can be added to it by using the context menu of the <i>class</i>. To create a new <i>attribute</i> on the a <i>class</i> select <b>New Child &gt; Create a new Property</b> from its context menu.</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:502px;"><a href="NewAttribute.bmp" class="image"><img class="thumbimage" width="500" align="middle" border="0" src="NewAttribute.bmp"/></a><div class="thumbcaption">Figure 32: Create a new attribute</div></div></div></center></p><p>The visibility, type and default value of the attribute are set in the properties view when the attribute is selected.</p><h4 id="7.4.4.2_Operations_on_classes">7.4.4.2 Operations on classes</h4><p>When a <i>class</i> is created, <i>operations</i> can be added to it by using the context menu of the <i>class</i>. To create a new <i>operation</i> on the a <i>class</i> select <b>New Child &gt; Create a new Operation</b> from its context menu.</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:502px;"><a href="NewOperation.bmp" class="image"><img class="thumbimage" width="500" align="middle" border="0" src="NewOperation.bmp"/></a><div class="thumbcaption">Figure 33: Create a new operation</div></div></div></center></p><p>The visibility, arguments and return type of the operation are set in the properties view when the operation is selected.</p><p>Regarding the arguments and return type of the an operation, select the <img border="0" src="PlusKey.bmp"/> key by the <i>Owned parameter</i> field.</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:602px;"><a href="ClassOp1.bmp" class="image"><img class="thumbimage" width="600" align="middle" border="0" src="ClassOp1.bmp"/></a><div class="thumbcaption">Figure 34: Create a new argument</div></div></div></center></p><p>Then the following window pops up and from the drop list in the <i>Direction</i> field, select the direction of the argument. In the <i>Name</i> field the name of the argument is written and the type is defined in the <i>Type</i> field.</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:602px;"><a href="ClassOp2.bmp" class="image"><img class="thumbimage" width="600" align="middle" border="0" src="ClassOp2.bmp"/></a><div class="thumbcaption">Figure 35: Select the argument´s direction</div></div></div></center></p><p>The direction <i>return</i> defines the return type of the operation. Only one argument can have the return direction.</p><h3 id="7.4.5_Object">7.4.5 Object</h3><p>An <i>object</i> is an instance of a class. In UML it is called and <i>InstanceSpecification</i>, which is a more general term since it can be used for instances of other classifiers than classes. </p><p>To create a new <i>object</i>, right click on the owning element, e.g. a package and from the context menu select <b>New Child &gt; Create a new InstanceSpecification</b></p><p><center><div class="thumb middle"><div class="thumbinner" style="width:502px;"><a href="NewObject.bmp" class="image"><img class="thumbimage" width="500" align="middle" border="0" src="NewObject.bmp"/></a><div class="thumbcaption">Figure 36: Create a new object</div></div></div></center></p><p>The class to be instanciated is selected by clicking on the <img border="0" src="PlusKey.bmp"/> key by the <i>Classifier</i> field in the <i>Properties</i> view of the <i>InstanceSpecification</i>. This will open the <i>Classifier</i> pop-up window (figure 37), where the class to be used is selected.</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:502px;"><a href="ClassifierPopup.bmp" class="image"><img class="thumbimage" width="500" align="middle" border="0" src="ClassifierPopup.bmp"/></a><div class="thumbcaption">Figure 37: Classifier pop-up window</div></div></div></center></p><h3 id="7.4.6_Relationships">7.4.6 Relationships</h3><p>There are different types of relationships that can be used in diagrams, hence in the model between different modeling elements.</p><pre>    <div class="thumb middle"><div class="thumbinner" style="width:302px;"><a href="Relationships.bmp" class="image"><img class="thumbimage" width="300" align="middle" border="0" src="Relationships.bmp"/></a></div></div>
+</pre><p>Navigability can be unidirectional or bidirectional for <i>Association</i>, <i>Aggregation</i> and <i>Composition</i>.</p><p><i>Association</i> specifies peer-to-peer relationships between model elements, e.g. if a Class-x has an attribute of type Class-y, it can be viewed in a class diagram as and <i>Association</i> between Class-x and Class-y.</p><p><i>Aggregation</i> is used to model a whole/part relationship between model elements. The part element can exist without the whole. <i>Aggregation</i> causes the generated code to contain the aggregate either by reference or by value, depending on the details of the relationship. E.g. to model an aggregation, the aggregate (Department) has an aggregation association to its constituent parts (Employee). A hollow diamond is attached to the end of an association path on the side of the aggregate (the whole) to indicate aggregation.</p><p><i>Composition</i> is an aggregation with strong ownership, i.e. when the container is destroyed, all of its composite objects are destroyed as well.</p><p><i>Dependency</i> is a relationship in which one model element uses another. <i>Dependency</i> may exist between classes if a message is sent from one class to the other or if one class mentions the other as a parameter to an operation. <i>Dependency</i> may exist between packages if one package is dependent on another.</p><p>A <i>Dependency</i> relationship causes a class to be generated with inclusions or references to another class.</p><p>A <i>Generalization</i> relationship causes a class to be generated as a subclass of another class.</p><p>The <i>Realizes</i> relationship specifies that, e.g. an implementation realizes a specification. The <i>Realizes</i> relationship does not affect the code.</p><p>To create a relationship between two modeling elements, use the tool palette in the diagram editor, e.g. to create an <i>Association</i> between two classes, select the <i>Association</i> tool in the tool palette, click on the source element and then click on the destination element as described in figure 38.</p><p><div class="thumb middle"><div class="thumbinner" style="width:502px;"><a href="ClassDiagramEditorNewAss.bmp" class="image"><img class="thumbimage" width="500" align="middle" border="0" src="ClassDiagramEditorNewAss.bmp"/></a><div class="thumbcaption">Figure 38: Create a new Association</div></div></div></p><p>In the <i>Edges</i> drawer in the tool palette, all available relationships are shown. To create a <i>Generalization</i> relationship, select the <i>Generalization</i> tool from the tool palette and follow the same procedure as described.</p><p>The <i>Aggregation</i> and the <i>Composition</i> relationships are a special kind of an <i>Association</i> relationship. To create any of these, an <i>Association</i> relationship needs first to be created. Then select the created <i>Association</i> and in the properties view, change the <i>Aggregation</i> field at the appropriate end of the <i>Association</i> to <i>shared</i>(if an <i>Aggregation</i> is desired) or to <i>composite</i> (if a <i>Composition</i> is desired). Figure 39 shows how to do it.</p><p><div class="thumb middle"><div class="thumbinner" style="width:502px;"><a href="ClassDiagramEditorNewAgg.bmp" class="image"><img class="thumbimage" width="500" align="middle" border="0" src="ClassDiagramEditorNewAgg.bmp"/></a><div class="thumbcaption">Figure 39: Create a new Association</div></div></div></p><p>When the <i>Association</i> is created, the <i>Aggregation</i> field is set to <i>none</i> by default. When doing the change at the destination end (as in figure 35), the diamond shows up at the source end of the relationship.</p><h3 id="7.4.7_Diagrams">7.4.7 Diagrams</h3><p>UML has many different types of diagrams to capture all different aspects of a system. To capture and refine requirements, diagrams related to use-cases are used. To specify the architecture and design, diagrams related to classes and packages are used. To specify the implementation, state and activity diagrams are used, etc.</p><p>The different diagrams in UML 2 are shown in figure 40 and here they are structured after diagram type. In the following of this section they are organized how they are used. </p><p><center><div class="thumb middle"><div class="thumbinner" style="width:502px;"><a href="UMLdiagrams.png" class="image"><img class="thumbimage" width="500" align="middle" border="0" src="UMLdiagrams.png"/></a><div class="thumbcaption">Figure 40: UMl 2 diagram types</div></div></div></center></p><p><b>Note!</b> In Papyrus class diagrams are also used as object diagrams.</p><h4 id="7.4.7.1_Diagrams_related_to_use-cases">7.4.7.1 Diagrams related to use-cases</h4><p>When working with requirement capture and refinement, use-case modeling is used and any or all of the following diagrams can be used:</p><ul><li>Use-case diagram</li><li>Activity diagram</li><li>Interaction diagram<ul><li>Sequence diagram</li><li>Collaboration diagram</li></ul></li></ul><p>A <i>use-case diagram</i> describe how different <i>Actors</i> use different functionality of the system. Implicitly, it also define the system boundary, since it shows what should be performed by the system and what exists outside the system. The elements used in <i>use-case diagrams</i> are:</p><ul><li><b>Actors</b> interact with, but are outside the system.</li><li><b>Use-cases</b> are some functionality that are performed by the system.</li><li><b>Relationships</b> between elements.</li></ul><p>A diagram may depict all or some of the use-cases of a system.</p><p><center><div class="thumb middle"><div class="thumbinner" style="width:602px;"><a href="UCdiagram.bmp" class="image"><img class="thumbimage" width="600" align="middle" border="0" src="UCdiagram.bmp"/></a><div class="thumbcaption">Figure 41: Use-case diagram</div></div></div></center></p><p>A <i>use-case</i> interacts with an <i>actor</i> and perform something useful for that <i>actor</i>. A <i>use-case</i> exist because of its main flow, but all odd cases and error situations have to be specified. A <i>use-case</i> has a black box and a white box view. The black box view is preferably described in plain text or by using activity diagrams. The white box view is described by one or several sequence diagrams.</p><p>All <i>use-cases</i> together span the entire functionality of the system. <i>Actors</i>, <i>use-cases</i> and <i>use-case diagrams</i> are owned by packages (general UML packages or model packages).</p><p>To create a <i>use-case diagram</i>, right click on the owning package and select <b>New Diagram &gt; Create a new UseCase Diagram</b> from its context menu.</p><p>An <i>activity diagram</i> is a kind of behavioral diagram and shows flow of control from activity to activity. It is used to specify a use-case black box view. It can also be used to specify a flow chart for a class operation.</p><p>The main elements in an <i>activity diagram</i> are:</p><ul><li>Initial and end states</li><li>Activities</li><li>States</li><li>Transitions</li><li>Synchronization lines</li><li>Decisions</li><li>Partitions</li></ul><p><center><div class="thumb middle"><div class="thumbinner" style="width:602px;"><a href="ActivityDiagram.bmp" class="image"><img class="thumbimage" width="600" align="middle" border="0" src="ActivityDiagram.bmp"/></a><div class="thumbcaption">Figure 42: Activity diagram</div></div></div></center></p><p>The <i>activity diagram</i> is preferably used to specify the black box behavior of a use-case instead of using plain text. It may also be used to specify a flow chart for a class operation.<i>Activity diagrams</i> are owned by use-cases or classes. </p><p>To create an <i>activity diagram</i>, right click on the owning use-case or class and select <b>New Diagram &gt; Create a new Activity Diagram</b> from its context menu.</p><p>Interaction diagrams are used to specify how different modeling elements interacts. Here two types are described, the <i>sequence diagram</i> and the <i>communication diagram</i>.</p><p>A <i>sequence diagram</i> describes the interactions between elements as a time ordered set of messages. One or several <i>sequence diagrams</i> are used to specify the white box view of a use-case.</p><p>Sequences involving collaborating elementsThe main elements in a <i>sequence diagram</i> are:</p><ul><li>Class instances (objects)</li><li>Life lines</li><li>Messages</li><li>Combined fragments</li></ul><p><center><div class="thumb middle"><div class="thumbinner" style="width:602px;"><a href="SequenceDiagram.bmp" class="image"><img class="thumbimage" width="600" align="middle" border="0" src="SequenceDiagram.bmp"/></a><div class="thumbcaption">Figure 43: Sequence diagram</div></div></div></center></p><p>The example (Figure 43) describes Interaction1, two objects (instances of Class1 and Class2) are created and interacts by messages. The time goes down along the life lines. In the bottom, there is a combined fragment of type "Ref" which is a reference to another interaction, Interaction2, meaning that the sequences in that interaction are executed.There are a lot of combined fragment types, e.g. type "Loop" specifies a loop, type "Alt" specifies alternatives, etc. All combined fragment types are defined in <a href="http://www.omg.org/spec/UML/2.4.1/">Unified Modeling Language (UML) version 2.4.1</a></p><p><i>Sequence diagrams</i> are owned by use-cases or communication diagrams (see below). </p><p>To create a <i>sequence diagram</i>, right click on the owning use-case or communication diagram and select <b>New Diagram &gt; Create a new Sequence Diagram</b> from its context menu.</p><p><i>Communication diagrams</i> show the lines of communication among a set of objects to accomplish a specific purpose. They act as the framework for sequence diagrams and define access paths between elements. i.e. <i>communication diagrams</i> are used to specify a use-case's white box communication channels between elements in the system.</p><p>The main elements in a <i>collaboration diagram</i> are:</p><ul><li>Class instances (objects)</li><li>Access paths</li><li>Messages</li></ul><p><center><div class="thumb middle"><div class="thumbinner" style="width:602px;"><a href="CommunicationDiagram.bmp" class="image"><img class="thumbimage" width="600" align="middle" border="0" src="CommunicationDiagram.bmp"/></a><div class="thumbcaption">Figure 44: Communication diagram</div></div></div></center></p><p>The example (Figure 44) describes access paths between objects and which messages are passed in these paths.<i>Communication diagrams</i> are owned by use-cases. </p><p>To create a <i>communication diagram</i>, right click on the owning use-case and select <b>New Diagram &gt; Create a new Communication Diagram</b> from its context menu.</p><h4 id="7.4.7.2_Diagrams_related_to_classes">7.4.7.2 Diagrams related to classes</h4><p>When modeling classes, any or all of the following diagrams may be used:</p><ul><li><i>Class diagrams</i></li><li><i>Composite structure diagrams</i></li><li><i>State diagrams</i></li></ul><p>As described above, activity diagrams may also be used to specify a flowchart for a class operation.</p><p><i>Class diagrams</i> depict static views of the system. A <i>class diagram</i> may represent all or part of the class structure of a system. Typically there are many <i>class diagrams</i> in a model. Usually one or many <i>class diagrams</i> are used to specify the inheritance structure in the system. <i>Class diagrams</i> may also be used to define dependency rules between packages.</p><p>The main elements in a <i>class diagram</i> are:</p><ul><li>Packages</li><li>Classes</li><li>Relationships</li></ul><p><center><div class="thumb middle"><div class="thumbinner" style="width:602px;"><a href="ClassDiagram.bmp" class="image"><img class="thumbimage" width="600" align="middle" border="0" src="ClassDiagram.bmp"/></a><div class="thumbcaption">Figure 45: Class diagram</div></div></div></center></p><p>The example (Figure 45) shows a <i>class diagram</i> used to specify an inheritance structure between classes. Note: The <i>Generalization</i> relationship and the indication of the inherited attributes in Class1 and Class2.</p><p><i>Class diagrams</i> are owned by ordinary UML packages or model packages. </p><p>To create a <i>class diagram</i>, right click on the owning package and select <b>New Diagram &gt; Create a new Class Diagram</b> from its context menu.</p><p>The <i>composite structure diagram</i> specifies structure classes contents, i.e. how the class uses <i>roles</i> (instances from other classes) and how they are connected to fulfill its responsibility.</p><p>The main elements in a <i>composite structure diagram</i> are:</p><ul><li>Contained roles (instances of classes)</li><li>Ports (interface objects)</li><li>Connectors</li></ul><p><center><div class="thumb middle"><div class="thumbinner" style="width:602px;"><a href="CompositeStructure.bmp" class="image"><img class="thumbimage" width="600" align="middle" border="0" src="CompositeStructure.bmp"/></a><div class="thumbcaption">Figure 46: Composite structure diagram</div></div></div></center></p><p>The example (Figure 46) shows a <i>composite structure diagram</i> used to specify the structural contents of Class4. Note: Class4 uses one instance (class2) of Class2 and one instance (class3) of Class3 and they are connected between Class2/Port1 and Class3/Port2.</p><p><i>Composite structure diagrams</i> are owned by structured classes. </p><p>To create a <i>composite structure diagram</i>, right click on the owning class and select <b>New Diagram &gt; Create a new Composite Structure Diagram</b> from its context menu.</p><p>The <i>state machine diagram</i> specifies the behavior of a class. It is used when the class is state rich, i.e. has an event driven behavior. If the class has no states, activity diagrams can be used.</p><p>The main elements in a <i>state machine diagram</i> are:</p><ul><li>States</li><li>Transitions</li><li>Effect code</li><li>Triggering events</li><li>Pseudo states, e.g. initial, final and choice points</li></ul><p><center><div class="thumb middle"><div class="thumbinner" style="width:602px;"><a href="StateDiagram.bmp" class="image"><img class="thumbimage" width="600" align="middle" border="0" src="StateDiagram.bmp"/></a><div class="thumbcaption">Figure 47: State machine diagram</div></div></div></center></p><p>The example (Figure 47) shows a <i>state machine diagram</i> that has an initial pseudo state, three states and transitions between them. On each transition (except for initialize), a <i>triggering event</i> is specified, which defines the event that makes the transition to be taken. Transitions and states may have effect code, which specify detailed behavior to be executed when an associated transition is taken.</p><p><i>State machine diagrams</i> are owned by classes. </p><p>To create a <i>state machine diagram</i>, right click on the owning class and select <b>New Diagram &gt; Create a new State Machine Diagram</b> from its context menu.</p><h2 id="7.5_UML_RT_modeling"><div id="UMLRTmodeling">7.5 UML RT modeling</div></h2><p>When creating models UML is used. Since UML is general-purpose modeling language in the field of software engineering, it is possible to adapt UML to specific domains. This is done by creating and applying UML profiles. When using UML for RT modeling with Capsules and Protocols, the UML RT profile is applied. When a profile is applied we can say that Papyrus has been specialized. There is a specific use-case in Papyrus to develop UML profiles and when doing so a domain specific modeling language is defined. This use-case is described in section <a href="#7.10_UML_profiling">UML profiling</a> in this user guide.</p><h3 id="7.5.1_Additional_modeling_elements">7.5.1 Additional modeling elements</h3><h4 id="7.5.1.1_Capsule_class">7.5.1.1 Capsule class</h4><h4 id="7.5.1.2_Protocol_class">7.5.1.2 Protocol class</h4><h3 id="7.5.2_Using_C.2B.2B_in_a_model">7.5.2 Using C++ in a model</h3><h3 id="7.5.3_C.2B.2B_service_library">7.5.3 C++ service library</h3><h4 id="7.5.3.1_Sending_messages">7.5.3.1 Sending messages</h4><h3 id="7.5.4_Transformation_from_model_to_code">7.5.4 Transformation from model to code</h3><h3 id="7.5.5_Edit_the_generated_code">7.5.5 Edit the generated code</h3><h3 id="7.5.6_Compiling_and_linking_the_generated_code">7.5.6 Compiling and linking the generated code</h3><h3 id="7.5.7_Using_external_libraries">7.5.7 Using external libraries</h3><h3 id="7.5.8_Running_the_system">7.5.8 Running the system</h3><h2 id="7.6_Papyrus_in_a_team_environment"><div id="Papyrusinateamenvironment">7.6 Papyrus in a team environment</div></h2><h3 id="7.6.1_Model_fragmentation">7.6.1 Model fragmentation</h3><h3 id="7.6.2_Source_configuration_management">7.6.2 Source configuration management</h3><h3 id="7.6.3_Compare_and_Merge">7.6.3 Compare and Merge</h3><h2 id="7.7_Model_validation"><div id="Modelvalidation">7.7 Model validation</div></h2><h3 id="7.7.1_Object_Constrain_Language_.28OCL.29">7.7.1 Object Constrain Language (OCL)</h3><h3 id="7.7.2_Defining_constraints_using_OCL">7.7.2 Defining constraints using OCL</h3><h2 id="7.8_Searching"><div id="Searching">7.8 Searching</div></h2><h2 id="7.9_Sample_models">7.9 Sample models</h2><p>In the Papyrus installation directory There are several sample models</p><h3 id="7.9.1_Class_model_with_inheritance">7.9.1 Class model with inheritance</h3><h3 id="7.9.2_Send_and_receive_data">7.9.2 Send and receive data</h3><h3 id="7.9.3_Interprocess_communication">7.9.3 Interprocess communication</h3><h2 id="7.10_UML_profiling"><div id="UMLprofiling">7.10 UML profiling</div></h2><p>TBD include the information in the user guide "About UML profiling"</p><h1 id="8_Support">8 Support</h1><p>To report bugs, suggest improvements, view the status of the Papyrus project, discuss different Papyrus subjects, etc. please use the following references:</p><ul><li><a href="http://www.eclipse.org/papyrus/">The Papyrus project home page</a></li><li><a href="http://www.eclipse.org/forums/index.php/f/121/">The Papyrus discussion forum</a></li><li>Proposals for Papyrus improvements</li><li><a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;short_desc_type=allwordssubstr&amp;short_desc=&amp;classification=Modeling&amp;product=MDT.Papyrus&amp;component=Core&amp;long_desc_type=allwordssubstr&amp;long_desc=&amp;bug_file_loc_type=allwordssubstr&amp;bug_file_loc=&amp;status_whiteboard_type=allwordssubstr&amp;status_whiteboard=&amp;keywords_type=allwords&amp;keywords=&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;emailtype1=exact&amp;email1=&amp;emailtype2=substring&amp;email2=&amp;bugidtype=include&amp;bug_id=&amp;votes=&amp;chfieldfrom=&amp;chfieldto=Now&amp;chfieldvalue=&amp;cmdtype=doit&amp;order=Reuse%20same%20sort%20as%20last%20time&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=">Bugzilla_to_report_bugs</a></li></ul><h1 id="9_References">9 References</h1><ol><li><a href="http://www.eclipse.org/">eclipse.org</a></li><li><a href="http://www.eclipse.org/modeling/emf/">EMF model</a></li><li><a href="http://www.eclipse.org/downloads/">Eclipse download page</a></li><li><a href="http://www.omg.org/spec/UML/2.4.1/">Unified Modeling Language (UML) version 2.4.1</a></li><li><a href="http://www.omg.org/spec/SysML/">System Modeling Language</a></li><li><a href="http://www.omg.org/omgmarte/Specification.htm/">Modeling and Analysis of Real-Time and Embedded systems</a></li></ol></body></html>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/PapyrusStarterGuide.mediawiki b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/PapyrusStarterGuide.mediawiki
new file mode 100644
index 00000000000..5b96dc2f7b0
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/PapyrusStarterGuide.mediawiki
@@ -0,0 +1,982 @@
+

+= 1 Overview =

+

+Papyrus is an environment for editing any kind of [http://www.eclipse.org/modeling/emf/ EMF model], particularly supporting UML 2 ([http://www.omg.org/spec/UML/2.4.1/ Unified Modeling Language (UML) version 2.4.1] ) and related modeling languages such as SysML ([http://www.omg.org/spec/SysML/ System Modeling Language] ) and MARTE ([http://www.omg.org/omgmarte/Specification.htm/ Modeling and Analysis of Real-Time and Embedded systems] ). Papyrus also offers very advanced support for UML profiles that enables users to define editors for DSLs (Domain Specific Languages) based on the UML 2 standard.

+

+Papyrus is a collection of plug-ins and features on top of the Eclipse Modeling Framework. For more information about Eclipse, please go to the Eclipse web site [http://www.eclipse.org/ eclipse.org]. Some of the terminology used in this Papyrus user guide are basic Eclipse concepts and briefly described here. To get more information about the Eclipse concepts, please visit the ''Workbench User Guide'' by selecting '''Help &gt; Help Contents''' from within Eclipse.

+

+== 1.1 Table of Contents ==

+

+__TOC__

+

+= 2 Introduction =

+

+Papyrus is built on the extensible Eclipse framework and is an implementation of the OMG (Object Management Group) specification [http://www.omg.org/spec/UML/2.4.1/ Unified Modeling Language (UML) version 2.4.1]. Papyrus is a comprehensive UML modeling environment, where many diagrams can be used to view different aspects of a system. Behind all diagrams, there is a model where all modeling elements, used in these diagrams, are kept. The model keeps the consistency between the diagrams.

+

+UML diagrams can help system architects and developers understand, collaborate on and develop a system. Architects and managers can use diagrams to visualize an entire system or project and separate systems into smaller components for development.

+

+System developers can use diagrams to specify, visualize, and document systems, which can increase efficiency and improve their system design. Also code can be generated from UML models.

+

+Since UML is general-purpose modeling language in the field of software engineering, it is possible to adapt UML to specific domains. This is done by creating and applying UML profiles. Papyrus is a complete UML modeling environment, which also can be used to develop UML profiles.

+

+== 2.1 Legend ==

+

+In this user guide, bold text is used for menu selections, e.g. '''Help &gt; Welcome''' means from the '''Help''' item on the main menu, select the '''Welcome''' item.

+

+A context menu is the pop-up menu that appears when right clicking on something, e.g. right click on a class select '''New Child &gt; Create a new Operation''', will create a new operation on the class, using the class' context menu.

+

+When text should be typed in, it is indicated by inline code, e.g. <code>this text should be typed in</code>.

+

+Fields in wizards, pop-up windows, different editors, radio buttons and check boxes are indicated by italic text, e.g. set the field ''Name'' to <code>MyClass</code>.

+

+= <div id="Installation">3 Installation</div> =

+

+It is a several step process to install Papyrus and its optional components. The ''Eclipse Standard'' must first be installed and when that is done, Papyrus is installed on top of ''Eclipse Standard''.

+

+== 3.1 Install Eclipse Standard ==

+

+''Eclipse Standard'' is installed from the [http://www.eclipse.org/downloads/ Eclipse download page]. On the download page select ''Eclipse Standard <version number>'' to install. Follow the install wizard to complete the installation.

+

+== 3.2 Install basic Papyrus ==

+

+When ''Eclipse Standard'' is installed, go to '''Help &gt; Install New Software''' and type in <code>http://download.eclipse.org/releases/kepler/</code> in the field named ''Work with:''.

+

+'''Note!''' When this user guide was written, the Kepler release of Eclipse was the latest. Select the latest official Eclipse release.

+

+'''Note!''' In some industrial environments, a proxy has to be used instead of this type of direct URL to the Eclipse web-site. To configure Eclipse to use a proxy is done under '''Windows &gt; Preferences''' and '''General &gt; Network Connections'''

+

+<center>[[File:InstallNewSoftware.bmp|thumb|center|thumb|564px|Figure 1: Install New Software wizard]]</center>

+

+In the ''Name'' column of the wizard, scroll down to ''Modeling'' and expand to the next level. Under ''Modeling'', select ''Papyrus UML'' and follow the installation wizard to complete the installation.

+

+When Eclipse is restarted, the environment is now ready for UML modeling.

+

+== 3.3 Additional installation steps ==

+

+After installation of the basic Papyrus feature, go to '''Help &gt; Install Papyrus Additional Components'''. In the wizard that pops up, select the needed additional Papyrus components, e.g. to be able to do UML RT modeling, the ''Real Time'' component is needed. It is also recommended to install the ''Diagram Stylesheets'' and ''Papyrus Compare'' components. Follow the installation wizard to complete the installation.

+

+<center>[[File:InstallPapyrusComp.bmp|thumb|center|thumb|437px|Figure 2: The Install Papyrus Additional Components wizard]]</center>

+

+= 4 Eclipse =

+

+Papyrus is built on the Eclipse framework, so most of its look and feel is inherited from Eclipse.

+

+The Eclipse framework has a plug-in architecture, where plug-ins can be grouped into features. Features and plug-ins can be added to an existing Eclipse installation.

+

+== 4.1 Architecture ==

+

+The plug-in architecture applies also for all subsystems. A plug-in is the smallest unit of Eclipse Platform functionality that can be developed and delivered separately. Usually, a small tool is written as a single plug-in, whereas a complex tool has its functionality split across several plug-ins. Except for a small kernel known as the Platform Runtime, all of the Eclipse Platform's functionality is located in plug-ins. Plug-ins can be grouped into features.

+

+<center>[[File:EclipseArchitecture.bmp|center|thumb|500px|Figure 3: The Eclipse architecture]]</center>

+

+Plug-ins are coded in Java. A typical plug-in consists of Java code in a JAR (Java Archive) library, some read-only files, and other resources such as images, Web templates, message catalogs, native code libraries, and so on. Some plug-ins do not contain code at all. One such example is a plug-in that contributes online help in the form of HTML pages. A single plug-in’s code libraries and read-only content are located together in a directory in the file system, or at a base URL on a server. There is also a mechanism that permits a plug-in to be synthesized from several separate fragments, each in their own directory or URL. This is the mechanism used to deliver separate language packs for an internationalized plug-in.

+

+Each plug-in has a manifest file declaring its interconnections to other plug-ins. The interconnection model is simple: a plug-in declares any number of named extension points, and any number of extensions to one or more extension points in other plug-ins.

+

+<center>[[File:Feature-Plug-in.bmp|center|thumb|290px|Figure 4: Plug-ins and Features]]</center>

+

+== <div id="Workspace">4.2 Workspace</div> ==

+

+The workspace is located in the file-system and is the place where Eclipse resources (files, folders and projects) are stored. When Eclipse is started, a pop-up window appears, where a workspace should be selected. One instance of Eclipse is connected to one workspace.

+

+<center>[[File:WorkspacePopup.bmp|center|thumb|593px|Figure 5: Pop-up window to select the workspace]]</center>

+

+In the file system all resources are stored in the selected workspace and in the same hierarchical structure as in the ''Project Explorer''.

+

+== 4.3 Resources ==

+

+Resources are a collective term for the projects, folders, and files that exist in the workbench. The resources are stored in the workspace, where the projects are on the first level. Inside a project, there are files and folders in the same hierarchical structure as in the ''Project Explorer'' and ''Model Explorer''.

+

+Files appear in the file system as files and folders are Unix directories or Windows folders and may contain other files and folders. Each time a file is saved, a copy is saved, which makes it possible to replace the current file with a previous edit or even restore a deleted file. Earlier versions of a file can be compared to the contents of all the local edits. Each edit in the local history is time stamped, i.e. is uniquely represented by the date and time the file was saved.

+

+Projects can be viewed as the top level folder in the file system under the workspace. In Eclipse there are different types of projects, e.g. Model, C/C or Java projects and they are the top level resource in the ''Project Explorer''. Projects can be closed and opened in the ''Project Explorer''.

+

+== <div id="Workbench">4.4 Workbench</div> ==

+

+The workbench is the Eclipse user interface and is used to navigate, view, and edit resources in a workspace, i.e. the workbench is the Eclipse IDE's application window. The workbench presents one or more editors and ''views'' that are gathered into adjustable groups (''perspectives'').

+

+The first time Eclipse is started, after the installation, a ''Welcome'' page is presented. Take a few minutes to explore the product overview and getting started information that is located here.

+

+<center>[[File:WelcomePage.bmp|center|thumb|480px|Figure 6: The Eclipse welcome page]]</center>

+

+To return to the ordinary workbench, just click on the workbench icon up to the right. When starting Eclipse, subsequent times, the workbench appears directly. To visit the welcome page at any time, just select '''Help &gt; Welcome'''.

+

+The title bar of the workbench window and the little Papyrus icon to the right indicates which ''perspective'' is active. In this example, the Papyrus ''perspective'' is in use. The ''Project Explorer'' and the ''Model Explorer, Outline, Properties'' views, etc. are open, along with a ''Class Diagram'' editor and its tool palette.

+

+<center>[[File:Workbench.bmp|center|thumb|512px|Figure 7: The Papyrus perspective in the workbench]]</center>

+

+It is easy to toggle between perspectives by clicking on some shown ''perspective'' in top of the right hand corner or open a new one by clicking on the ''Open Perspective'' icon [[File:IkonOpenPerspective.png]] and browse to the ''perspective'' to open. It is also possible to reorganize a ''perspective'', open/close ''views'', customize menus, etc. and then save the ''perspective'' with a new name by '''Window &gt; Save Perspective As ...'''.

+

+=== 4.4.1 Views ===

+

+''Views'' and editors are the main visual entities that appear in the workbench. Any given ''perspective'' can contain multiple editors and a number of surrounding ''views'' that provide context.''Views'' provide different ways to visualize, navigate and edit the resources in the Eclipse workspace. ''Views'' can be single or stacked on top of each other.

+

+''Views'', including editor views, can be resize, moved, detached. In addition, a ''view'' can be maximized to cover the entire workbench by double-clicking on its tab. By double-clicking once more, it will return to its original size. Some ''views'' has a view specific menu, e.g. ''Project Explorer'' view, where some specific view settings could be done.

+

+To add a new ''view'' to the active ''perspective'', use '''Window &gt; Show View'''and if the desired ''view'' does not appear on top of the pop-up menu, select '''Other''', which opens up a ''view'' browser, where all available ''views'' are organized in different categories.

+

+==== 4.4.1.1 Single views ====

+

+In the workbench figure, above, several single views appears, e.g. ''Outline, Class Diagram'' editor, ''Help, Project Explorer'' and ''Model Explorer'' views. The ''single view'' has only one tab with the view name. By draging a ''single view'' tab and release it on another ''single view'' tab, ''stacked views'' are created.

+

+==== 4.4.1.2 Stacked views ====

+

+In the workbench figure, above, also ''stacked views'' appear, e.g. ''Properties'' and ''Model Validation'' views. To select the one that should be on top of the stack, just click on its tab and it becomes visible. By selecting a ''stacked view'' and drag it besides another view in the workbench, a ''single view'' will appear.

+

+== 4.5 Preferences ==

+

+To customize the settings for the Eclipse workbench and the installed features, the preference window is used. Use '''Windows &gt; Preferences''' to open it, e.g. under '''General &gt; Keys''' in the preference window there are shortcuts and keys defined for the user interface. Here they can be redefined or own sets could be defined.

+

+<center>[[File:Preferences.bmp|center|thumb|556px|Figure 8: The preference window]]</center>

+

+The preference window pages can be searched using the filter function. To filter by matching the page title, simply type the name of the page and the available pages will be presented below.

+

+The filter also searches on keywords. By the history controls (the left, right and drop-down arrows up in the right corner of the preference window) it is possible to navigate through previously viewed pages. To step back or forward several pages at a time, click the drop-down arrow and a list of the most recently viewed preference pages are displayed.

+

+== 4.6 Import and Export ==

+

+Projects can be shared between workspaces by using project import and export, which are done through wizards. To open the import wizard, use '''File &gt; Import''' and in several steps select what, where from and if it should be imported as a copy or just referenced. To export resources, There are also an export wizard, which is opened by '''File &gt; Export''' and select details about what should be exported, if it should be compressed and where to export it to.

+

+{|

+|

+[[File:ImportWiz.bmp|center|thumb|420px|Figure 9: Import wizard]]    

+|

+[[File:ExportWiz.bmp|center|thumb|538px|Figure 10: Export wizard]]

+|}

+

+When importing a project into the used workspace, it can be copied by checking the box ''Copy ...'' in the import wizard. If this check box is unchecked, there will just be a reference to the other workspace and when editing that project, it will be edited in its original place. Be aware of that when doing so, several instances of Eclipse may edit the same resource.

+

+When exporting a project, browse to the place where to export it to name it and select if and how compression should be used.

+

+= 5 Modeling =

+

+Papyrus is a comprehensive UML modeling environment, where diagrams can be used to view different aspects of a system. Behind all the diagrams, there is a model where the modeling elements, used in these diagrams, are stored. The model maintains the consistency between all diagrams.

+

+A model is the collection of all the modeling elements and relationships that compose a software system. Papyrus enables the creation, viewing and manipulation of UML diagrams as specified in the [http://www.omg.org/spec/UML/2.4.1/ UML 2 specification].

+

+The model defines every element, representing some part of the system. Multiple model diagrams can reference an element many times. Each of the different diagrams can view a different aspect of the system.

+

+The model is the basis of the diagrams and keep the diagrams consistent. The diagrams are stored in the model's hierarchical structure. Some are owned by a modeling element like a class and some are just organized into packages and then owned by the package (a.k.a folders in basic Eclipse projects). '''Note!''' the top level of the model is the model package, which is a special kind of a package.

+

+== 5.1 Model and diagrams ==

+

+The model is the basis for all diagrams and maintains the consistency between the diagrams. The model is a collection of definitions of elements that compose the system and the relationships between them. Diagrams can be used to view subsets of the underlying model and from various view points. A model of a system may require many different diagrams to represent different views of the system for different project stakeholders.

+

+In Papyrus, diagrams are be viewed and created in the ''Model Explorer'' view. The ''Model Explorer'' shows diagrams in their logical place within the model.

+

+The visual representation of a system that diagrams provide can offer both low-level and high-level insights into the concepts and design of a system.

+

+= 6 Tutorials =

+

+The tutorials are focused on selected topics regarding the use of Papyrus and contains step by step instructions on how to create and manipulate the workbench and models.

+

+== 6.1 Getting started with general Eclipse functionality==

+

+This tutorial is about to understand the workbench environment and the basic Eclipse terminology.

+

+=== 6.1.1 Exploring perspectives ===

+

+This part demonstrates the differences between the ''Papyrus'' and the ''Resource'' perspectives and also how to customize the ''Resource'' perspective.

+

+==== 6.1.1.1 Exploring the ''Papyrus'' perspective ====

+

+Explore the Papyrus default menus, toolbar, and views in the ''Papyrus'' perspective.

+

+# To switch to the ''Payrus'' perspective, click '''Window &gt; Open Perspective &gt; Other'''. Then choose the ''Papyrus'' perspective. (Notice the workbench title bar and perspective bar reflect that the ''Papyrus'' perspective is active. Notice also the main menu items, toolbar buttons, and views that is visible in this perspective.)

+# Click '''File &gt; New''' and notice that the menu contains the items ''Papyrus Project'' and ''Papyrus Model'' among other items.

+# Click '''Window &gt; Show View''' and notice that the menu contains the items ''Model Explorer'', ''Model Validation'' and more.

+

+==== 6.1.1.2 Exploring and customizing the Resource perspective ====

+

+Explore the default menu, toolbar, and views in the ''Resource'' perspective and customize a menu.

+

+# To switch to the ''Resource'' perspective, click '''Window &gt; Open Perspective &gt; Other'''. Then choose the ''Resource'' perspective. Notice that the workbench title bar and perspective bar reflect that the ''Resource'' perspective is active. (Notice the main menu items, toolbar buttons, and views visible in this perspective)

+# Click '''File &gt; New''' and notice that there are no Papyrus items in the menu.

+# Click '''Window &gt; Show View''' and notice that the menu does NOT contain the items ''Model Explorer'' and ''Model Validation''.

+# Click '''Window &gt; Customize Perspective'''. Ensure that the workbench title bar and perspective bar reflect that the ''Resource'' perspective is active.

+# In the ''Customize Perspective - Resource'' pop-up window, select the ''Shortcuts'' tab and select '''Show View''' from the ''Submenus'' combo box.

+# Clear all check boxes in the ''Shortcut Categories'' list.

+# Click ''General''(not check the check box) in the ''Shortcut Categories'' list, select the check box next to ''Project Explorer'' in the ''Shortcuts'' list, and click ''OK''.

+# Click '''Window &gt; Show View''' and notice the menu now just contains the ''Project Explorer'' item.

+

+=== 6.1.2 Creating a new project, folder and files ===

+

+In this section a new project, folder and files will be created in the ''Resource'' perspective.

+

+==== 6.1.2.1 Creating a new general project ====

+

+Create a new project in the ''Resource'' perspective by completing these steps:

+

+# If necessary switch to the ''Resource'' perspective by clicking on '''Window &gt; Open Perspective &gt; Other'''. Then choose the ''Resource'' perspective. If the ''Resource'' perspective already is active, click on '''Window &gt; Reset Perspective...''' to get back to its default configuration.

+# Click '''File &gt; New &gt; Project'''.

+# In the ''New Project'' wizard, name the project <code>My Project</code> and click ''Finish''.

+

+==== 6.1.2.2 Creating a new folder ====

+

+Create a folder in the project:

+

+# Right-click on ''My Project'' in the ''Project Explorer'' and select '''New &gt; Folder'''.

+# Type <code>Text Files</code> in the the field ''Folder name'', and then click ''Finish''.

+

+==== 6.1.2.3 Creating and editing a new file ====

+

+Create a file in the folder:

+

+# In the ''Project Explorer'', right-click on the ''Text Files'' folder and select '''New &gt; File'''.

+# In the ''New File'' wizard, ensure that ''My Project/Text Files'' is the parent folder. Type <code>My File</code> as the file name and click ''Finish''. (Notice that a text editor opens in the editing view for the created resource)

+# Enter any text into the editor view for ''My File''. Notice the asterisk (*) next to the file name indicates unsaved changes.

+# Press ''Ctrl S'' to save the work. Notice that the asterisk disappears.

+

+==== 6.1.2.4 Creating another file ====

+

+Create another file in the ''Text Files'' folder, using the workbench menu this time.

+

+# On the workbench menu, click '''File &gt; New &gt; File'''.

+# In the ''New File'' wizard, expand ''My Project'' and then select ''Text Files'' as the parent folder.

+# Type <code>My Other File</code> as the file name and click ''Finish''.

+# Reviewing the contents of the ''Project Explorer'' view, which should be like this

+

+<center>[[File:MyProject.bmp|center|thumb|200px]]</center>

+

+=== 6.1.3 Exploring editors and views ===

+

+This section demonstrates how to manipulate views and editors.

+

+==== 6.1.3.1 Maximizing and restoring an editor ====

+

+Maximize one of the editors to expand the viewable area:

+

+# Double-click the file name on the editor tab for ''My File''.

+# Double-click the file name again to restore the editor to its original size.

+

+==== 6.1.3.2 Tiling and restacking the editors ====

+

+Currently, the editors are stacked one in front of the other. Try tiling them horizontally and vertically:

+

+# Click the ''My Other File'' editor tab and drag it to the bottom of the editor pane. Colored frames indicates how the views will be tiled. Drop the editor and notice that the editors are tiled horizontally.

+# Drag the ''My Other File'' editor tab to the left of the editor pane and release it. Notice that the editors are tiled vertically.

+# Restack the editors by dragging one of the editor tabs on top of the other.

+

+==== 6.1.3.3 Organizing views ====

+

+Try moving a view:

+

+# Drag the title bar of the ''Outline'' view onto the title bar of the ''Project Explorer''.

+# Experiment by dragging the title bar of the ''Outline'' view to various locations within the workbench.

+# Return the ''Outline'' view to its original place to the lower left of the workbench. It is always possible to return to the default configuration of the active perspective by clicking on '''Windows &gt; Reset Perspective...'''

+

+==== 6.1.3.4 Using view menus ====

+

+Some views has view menus, e.g. ''Project Explorer'' view, which is indicated by a down arrow in the upper-right corner of the view. Click this down arrow of the ''Project Explorer'' view and review the pull-down menu options specific for this view.

+

+==== 6.1.3.5 Closing and opening views ====

+

+If a view does not appear in the workbench, it can be open by using the '''Window''' menu:

+

+# Close the ''Project Explorer'' view by right-click on the ''Project Explorer'' view tab and select '''Close'''.

+# Click '''Window &gt; Show View &gt; Other''' and type <code>Project Explorer</code> in the filter text box.

+# Select ''Project Explorer'' and click ''OK'' which opens the view again.

+

+=== 6.1.4 Exporting and importing a project ===

+

+This section demonstrates how projects can be shared between users and workspaces using the ''export'' and ''import'' feature.

+

+==== 6.1.4.1 Exporting a project ====

+

+Export ''My Project'' to a compressed file:

+

+# Select '''File &gt; Export...''' from the workbench menu.

+# In the ''Export'' wizard, expand '''General''', and then select '''Archive File'''. Click ''Next''.

+# Check the check box next to ''My Project'' in the resource list.

+# Click ''Browse'' to specify an export destination in the ''To archive file'' field. Note the available options for archive formats.

+# In the ''Browse'' window, select the ''Desktop'' as the destination folder and type <code>My Project</code> as the file name. Click ''OK''.

+# In the ''Export'' wizard, click ''Finish'' to perform the export process.

+# View the desktop and notice the new compressed (.zip) file.

+

+==== 6.1.4.2 Removing the project from the workspace ====

+

+Remove ''My Project'' from the workspace:

+

+# Right-click ''My Project'' in the ''Project Explorer'' and select '''Delete''' from the context menu.

+# In the ''Delete Resources'' pop-up window, make sure to check the

+

+''Delete project contents on disk'' check box. Click ''OK''. Note: If this check box is unchecked, the resource will just be deleted from the Workbench, but it will still exist in the workspace. (Notice ''My Project'' is no longer listed in the ''Project Explorer'')

+

+==== 6.1.4.3 Importing a project ====

+

+Import ''My Project'' from a compressed file:

+

+# Select '''File &gt; Import...''' from the workbench menu.

+# In the ''Import'' wizard, expand '''General''', and then select '''Existing Projects into Workspace'''. Click ''Next''.

+# Click the '''Select archive file''' radio button.

+# Click the ''Browse'' button.

+# In the ''Browse'' window, browse to the ''Desktop'' and select '''My Project.zip''' and click ''Open''.

+

+<nowiki>#In the </nowiki>''Import'' wizard, check the check box next to ''My Project'' and click ''Finish'' to perform the import process. (Notice ''My Project'' is once again listed in the ''Project Explorer'')

+

+=== 6.1.5 Conclusion ===

+

+The basic features of the Eclipse workbench have now been demonstrated.

+

+* How to view and customize perspectives.

+* How to create a project, folder and files.

+* How to manipulate editors and views.

+* How to export and import projects.

+

+== 6.2 Creating profiles ==

+

+== 6.3 Creating models using Papyrus ==

+

+=== 6.3.1 Use-case modeling ===

+

+=== 6.3.2 Design modeling ===

+

+This is a tutorial about general class and object modeling using Papyrus.

+

+==== 6.3.2.1 Create a new UML project ====

+

+Create a new UML modeling project as follows:

+

+# If necessary switch to the ''Papyrus'' perspective by clicking on '''Window &gt; Open Perspective &gt; Other'''. Then choose the ''Papyrus'' perspective. If the ''Papyrus'' perspective is already active, click on '''Window &gt; Reset Perspective...''' to get back to its default configuration.

+# Click '''File &gt; New &gt; Papyrus Project'''.

+# In the ''New Papyrus Project'' wizard, name the project <code>My Design Model</code> and click ''Next''.

+# Make sure that the radio button ''UML'' is selected and click ''Next''.

+# Under the section ''You can load a template'', check the box ''A UML model with basic primitive types (ModelWithBasicTypes)'' and click on ''Finish''.

+

+==== 6.3.2.2 Create new packages to be used for classes====

+

+Create two packages in the model:

+

+# Right-click on the ''model'' package in the ''Model Explorer'', select '''New Child &gt; Create a new Package''' and select the created package in the ''Model Explorer''.

+# In the ''Properties'' view type <code>Clients</code> in the the field ''Name''.

+# Right-click on the ''model'' package in the ''Model Explorer'', select '''New Child &gt; Create a new Package''' and select the created package in the ''Model Explorer''.

+# In the ''Properties'' view type <code>Server</code> in the the field ''Name''.

+

+==== 6.3.2.3 Create new classes ====

+

+Create two classes in the ''Server'' package. One is called ''Server1'' and the other is called ''DataClass1'':

+

+# Right-click on the ''Server'' package in the ''Model Explorer'', select '''New Child &gt; Create a new Class''' and select the created class in the ''Model Explorer''.

+# In the ''Properties'' view type <code>Server1</code> in the the field ''Name''.

+# Right-click on the ''Server'' package in the ''Model Explorer'', select '''New Child &gt; Create a new Class''' and select the created class in the ''Model Explorer''.

+# In the ''Properties'' view type <code>DataClass1</code> in the the field ''Name''.

+

+Create three different client classes in the ''Clients'' package:

+

+# Right-click on the ''Clients'' package in the ''Model Explorer'', select '''New Child &gt; Create a new Class''' and select the created class in the ''Model Explorer''.

+# In the ''Properties'' view type <code>Client1</code> in the the field ''Name''.

+# Right-click on the ''Clients'' package in the ''Model Explorer'', select '''New Child &gt; Create a new Class''' and select the created class in the ''Model Explorer''.

+# In the ''Properties'' view type <code>Client2</code> in the the field ''Name''.

+# Right-click on the ''Clients'' package in the ''Model Explorer'', select '''New Child &gt; Create a new Class''' and select the created class in the ''Model Explorer''.

+# In the ''Properties'' view type <code>ClientRoot</code> in the the field ''Name''.

+

+==== 6.3.2.4 Create new class diagrams ====

+

+Create two class diagrams in the model:

+

+# Right-click on the ''model'' package in the ''Model Explorer'', select '''New Diagram &gt; Create a new Class Diagram''' and type <code>Packages</code> in the ''Enter a new diagram name'' pop-up window.

+# Right-click on the ''model'' package in the ''Model Explorer'', select '''New Diagram &gt; Create a new Class Diagram''' and type <code>Classes</code> in the ''Enter a new diagram name'' pop-up window.

+

+==== 6.3.2.5 Create new operations and attributes ====

+

+# Right-click on the class ''DataClass1'' and select '''New Child &gt; Create a new Property''' and select the created attribute in the ''Model Explorer''.  

+# In the ''Properties'' view, type <code>Field1</code> in the field ''Name'' and by the ''Type'' field click on the [[File:TypeKey.bmp]] key and select ''Integer'' from the ''UML Primitive Types''. This cause the created attribute to be named ''Field1'' and to be of type ''Integer''.

+# Follow the above pattern to also create the attributes ''Field2'' of type ''Integer'', ''Field3'' of type ''String'', and ''Field4'' of type ''String'' on class ''DataClass1''.

+# Create the attributes ''Attribute2'' of type ''String'', ''Attribute4'' of type ''Integer'' and ''Attribute5'' of type ''DataClass1'' on class ''Client1''.

+# Create the attribute ''Attribute3'' on class ''Client2''.

+# Create the attribute ''Attribute1'' on class ''Server1''.

+# Create the operation ''service1'' on class ''Server1'' by right-click on on the class ''Server1'' and select '''New Child &gt; Create a new Operation''' and select the created operation in the ''Model Explorer''.

+# In the ''Properties'' view, type <code>service1</code> in the the field ''Name'' and by the ''Owned parameter'' field click on the [[File:PlusKey.bmp]] key.

+# In the ''Create a new parameter'' pop-up window, type <code>service1return</code> in the ''Name'' field, select ''return'' from the ''Direction'' field drop down list and by the ''Type'' field click on the [[File:TypeKey.bmp]] key and select ''Integer'' from the ''UML Primitive Types''. This causes the return type of the operation to be defined as an integer.

+

+

+==== 6.3.2.6 Create new relationships between classes ====

+

+Create a ''Dependency'' relationship between the ''Clients'' and the ''Server'' packages:

+

+# Open the ''Diagram Packages'' diagram by double click on it in the ''Model Explorer''

+# Drag the ''Clients'' package to the class diagram (by click on it and while holding the mouse button down, move the cursor to the editing area in the class diagram editor and release it).

+# Drag the '' Server'' package to the class diagram.

+# Select the ''Dependency'' tool from the ''Edges'' drawer in the ''Palette'', click on the ''Clients'' package and then on the ''Server'' package in the class diagram.

+# Type <code>Dependency</code> as the name of the relationship.

+

+Create a ''Generalization'' relationship between the classes ''Client2'' and ''Client1'', i.e. make ''Client2'' a sub-class of ''Client1'':

+

+# Open the ''Diagram Classes'' diagram by double click on it in the ''Model Explorer''

+# Drag the ''Client1'' class to the class diagram.

+# Drag the ''Client2'' class to the class diagram.

+# Select the ''Generalization'' tool from the ''Edges'' drawer in the ''Palette'', click on the ''Client2'' class and then on the ''Client1'' class in the class diagram.

+

+Create a ''Composite'' relationships between the classes ''ClientRoot'' and ''Client1'' plus ''ClientRoot'' and ''Client2'':

+

+# Continue with the already opened class diagram ''Diagram Classes''.

+# Drag the ''ClientRoot'' class to the class diagram.

+# Select the ''Association'' tool from the ''Edges'' drawer in the ''Palette'', click on the ''ClientRoot'' class and the on the ''Client1'' class in the class diagram.

+# Select the created association in the class diagram and in the ''Properties'' view, rename the association to <code>cr-c1</code>.

+# Also in the same ''Properties'' view, at the member end, named ''client1'', by the ''Aggregation'' field, select ''composite'' from the drop down list.

+# Select the ''Association'' tool from the ''Edges'' drawer in the ''Palette'', click on the ''ClientRoot'' class and the on the ''Client2'' class in the class diagram.

+# Select the created association in the class diagram and in the ''Properties'' view, rename the association to <code>cr-c2</code>.

+# Also in the same ''Properties'' view, at the member end, named ''client2'', by the ''Aggregation'' field, select ''composite'' from the drop down list.

+

+==== 6.3.2.7 Create a new package to be used for objects ====

+

+Create a new package in the model:

+

+# Right-click on the ''model'' package in the ''Model Explorer'', select '''New Child &gt; Create a new Package''' and select the created package in the ''Model Explorer''.

+# In the ''Properties'' view type <code>Objects</code> in the the field ''Name''.

+

+==== 6.3.2.8 Create new objects ====

+

+Create objects (instances of classes) in the ''Objects'' package:

+

+# Right-click on the ''Objects'' package in the ''Model Explorer'', select '''New Child &gt; Create a new InstanceSpecification''' and select the created object (InstanceSpecification) in the ''Model Explorer''.

+# In the ''Properties'' view type <code>clientObj1</code> in the the field ''Name'' and by the ''Classifier'' field click on the [[File:PlusKey.bmp]] key. In the ''Classifier'' window that pops up, browse to the ''Client2'' class and click on the [[File:Arrow.bmp]] key, which specifies the object's class as shown in figure 11.

+

+<center>[[File:ClassifierPopUp.bmp|center|thumb|400px|Figure 11: The Classifier pop up window]]</center>

+

+Follow the same pattern to create:

+

+# An object called ''clientObj2'' in the ''Objects'' package based on class ''Clent2''.

+# An object called ''serverObj1'' in the ''Objects'' package based on class ''Server1''.

+

+==== 6.3.2.9 Create a new class diagram ====

+

+Create a class diagrams in the model to depicts the created objects:

+

+# Right-click on the ''model'' package in the ''Model Explorer'', select '''New Diagram &gt; Create a new Class Diagram''' and type <code>Objects</code> in the the ''Enter a new diagram name'' pop-up window.

+

+==== 6.3.2.10 Create new relationships between objects ====

+

+Create a ''Dependency'' relationship between the clients and the server objects:

+

+# Open the ''Diagram Objects'' diagram by double click on it in the ''Model Explorer''

+# Drag the ''clientObj1'' object to the class diagram (by click on it and while holding the mouse button down, move the cursor to the editing area in the class diagram editor and release it).

+# Drag the ''clientObj2'' object to the class diagram

+# Drag the ''serverObj1'' object to the class diagram.

+# Select the ''Dependency'' tool from the ''Edges'' drawer in the ''Palette'', click on the ''clientObj1'' object and then on the ''serverObj1'' object in the class diagram. Leave the default name on the relationship.

+# Also create a ''Dependency'' relationship between the ''clientObj2 and the ''serverObj1''.

+

+==== 6.3.2.11 Conclusion ====

+

+In this tutorial the following model was created:

+

+<center>[[File:DesignModelEx1.bmp|center|thumb|400px|Figure 12: Two packages on top in the model]]</center>

+

+<center>[[File:DesignModelEx2.bmp|center|thumb|400px|Figure 13: Relationships between the client classes]]</center>

+

+'''Note!''' The inherited attributes depicted in figure 13 on the ''Client2'' class.

+

+<center>[[File:ObjectDiagram.bmp|center|thumb|400px|Figure 14: Objects in the model and their relationships]]</center>

+

+=== 6.3.3 RT modeling ===

+

+

+

+= 7 Papyrus =

+

+Papyrus can be used to do

+

+* General UML modeling.

+* UML RT modeling, which is described in the section [[#6.3.3_RT_modeling]] when the UML RT profile is applied.

+* SysML modeling when the SysML profile is applied.

+* MARTE modeling when the MARTE profile is applied.

+* UML profiles, which is described in the section [[#7.10_UML_profiling|UMLprofiling]] .

+

+In Papyrus, different UML profiles can be applied. When installing Papyrus, as described in section [[#3_Installation|Installation]] , also the UML, UML RT, SysML and MARTE profiles can be added. When creating a new Papyrus project, the type of Papyrus project is selected. Project types to chose from are SysML, Profile and UML.

+

+== 7.1 Papyrus resources in the workspace ==

+

+When modeling in Papyrus, three types of resources are stored in the workspace.

+{|

+|

+[[File:ModelProjResourcesFS.bmp|center|thumb|400px|Figure 15: Resources in the file system]]

+|

+[[File:ModelProjResourcesPE.bmp|center|thumb|200px|Figure 16: Resources in the Project Explorer]]

+|}

+* '''.di''' file persists the status of the workbench, i.e. which diagrams and views are opened, etc.

+* '''.notation''' file persists the information about the diagrams in the model.

+* '''.uml''' file persists the UML model.

+

+Note! In this case the model is contained in three files. When working in an industrial context, the model may need to be split up into several fragments in order for several designers to work concurrently with the same model. This is described in section [[#7.6_Papyrus_in_a_team_environment|Papyrus in a team environment]] .

+

+== 7.2 The Papyrus perspective ==

+

+When Papyrus is installed a predefined perspective called ''Papyrus'' is made available. This is the perspective to use when modeling with Papyrus. The Papyrus perspective can be customized to the user needs and saved as new perspective ( see section [[#4.4_Workbench|Workbench]] ).

+

+=== 7.2.1 Project Explorer view ===

+

+The ''Project Explorer'' view is used to browse, select and manipulate resources in the workspace. Projects or working sets are the top level in this view. From the ''Project Explorer's'' (right click on the white space) context menu, e.g. new projects can be created.

+

+<center>[[File:ProjectExpl.bmp|center|thumb|200px|Figure 17: The Project Explorer]]</center>

+

+In some views, as in this case, there is a view specific menu (indicated in Figure 13 with a red ring). Here some settings can be applied for the view, e.g. if the top level should be working sets or projects.

+

+=== 7.2.2 Model Explorer view ===

+

+In the ''Model Explorer'' view, the model that has been opened in the ''Project Explorer'', can be browsed and edited. Model elements can be added by using the context menu of any existing modeling element, including the model package and packages. Diagrams can also be added by using the context menus. Existing diagrams can be opened in an appropriate editor by just double clicking on the diagram in the ''Model Explorer''.

+

+<center>[[File:ModelExpl.bmp|center|thumb|200px|Figure 18: The Model Explorer]]</center>

+

+=== 7.2.3 Editing view ===

+

+The ''Editing View'' is in the middle part of the workbench and here opens different types of editors, depending on the type of resource to edit, e.g. if a class diagram is opened, the class diagram editor will be visible in the ''Editing View''.

+

+<center>[[File:EditingView.bmp|center|thumb|400px|Figure 19: The Editing View]]</center>

+

+How to use editors is described in section [[#7.3_Diagram_editing_in_Papyrus|Editors in Papyrus]].

+

+=== 7.2.4 Outline view ===

+

+The ''Outline View'' is connected to the ''Editing View'' and gives an overview of what is open in the ''Editing View''. The ''Outline View'' may be used to pan the ''Editing View'' or to select some information that will be highlighted in the ''Editing View''. The shaded area is the area that is visible in the ''Editing View''.

+

+<center>[[File:OutlineView.bmp|center|thumb|200px|Figure 20: The Outline View]]</center>

+

+

+=== 7.2.5 Properties view ===

+

+The ''Properties view'' is a stacked view which is located at the bottom of the workbench and shows the properties of a selected modeling element. The modeling element can be selected in the Model Explorer or in a diagram. The properties are categorized under different tabs located to the left in the ''Properties view''.

+

+<center>[[File:PropertiesView.bmp|center|thumb|500px|Figure 21: The Properties View]]</center>

+

+

+In this view the properties may be viewed and edited, e.g. rename the operation and change the visibility of the operation.

+

+=== 7.2.6 Model Validation view ===

+

+From the context menu in the ''Model Explorer'' it is possible to validate the entire model or parts of it (for more details see section [[#7.7_Model_validation|Model validation]] . All warnings and errors appear in the ''Model Validation View'', which is a stacked view together with the ''Properties View'' and the ''Search View'' at the bottom of the workbench.

+

+<center>[[File:ModelValidationView.bmp|center|thumb|500px|Figure 22: The Model Validation View]]</center>

+

+

+The model validation constraints are customizable and how to work with it is described in section [[#7.7_Model_validation|Model validation]] .

+

+=== 7.2.7 Search view ===

+

+It is possible to do searches on a selected resource in a specific project or in the entire workspace. When the search is finished, the result appears in the ''Search View''. Details about specifying searches is described in the [[#7.8_Searching|Searching]] section.

+

+<center>[[File:SearchView.bmp|center|thumb|500px|Figure 23: The Search View]]</center>

+

+The example in Figure 23 shows the result of a model search for ''Class1'' in the entire workspace.

+

+== <div id="EditorsinPapyrus">7.3 Diagram editing in Papyrus</div> ==

+

+To edit diagrams different editors are available in Papyrus. They have the same basic look and feel. When double clicking on some diagram in the ''Model Explorer'', the diagram opens in the editing view. An outline view and a tool palette are also opened. Creating a new diagram in the ''Model Explorer'' will also open up a diagram editor together with its tool palette and outline view.

+

+=== 7.3.1 Diagram editors ===

+

+When a diagram editor is opened in Papyrus, three views are opened:

+

+* Editing surface

+* Palette

+* Outline

+

+<center>[[File:DiagramEditorFieldsPointers.bmp|center|thumb|500px|Figure 24: Parts of a diagram editor (as an example, the class diagram editor is used)]]</center>

+

+Figure 24 shows the different parts of a diagram editor. In this case the class diagram editor has been chosen as an example. The ''Editing surface'' is where the diagram editing is taken place. The ''Outline view'' gives an overview of the entire diagram. The blue shaded part in the ''Outline view'' shows what is visible in the editing surface. The ''Palette'' contains ''Drawers'' and in each drawer there are ''Tools'' to be used to add different things into the diagram. In Figure 22, the ''Nodes'' drawer is closed and the ''Edges'' drawer is opened. In the ''Edges'' drawer there are ''Tools'' to create different types of edges. By clicking on a drawer, it toggles open and close drawer.

+

+=== 7.3.2 Basic tool techniques ===

+

+Diagrams can be created in different places in the model such as they can be owned by model elements like classes or packages. Diagrams can also be placed on top of the model directly under the model package.

+

+==== 7.3.2.1 Creating diagrams ====

+

+To create a diagram, right click on the model element that should be the owner of the diagram and select '''New Diagram''' from the context menu. A new level of menu appears, displaying all types of diagrams that are available to create in this place, e.g. Figure 21 shows the available diagram types that can be created directly on top in the model package.

+

+<center>[[File:NewDiagram.bmp|center|thumb|500px|Figure 25: Available diagram types that can be created directly under the model package]]</center>

+

+'''Note!''' In Figure 25, no adaptation of Papyrus has taken place, hence all diagram types according pops up.

+

+==== 7.3.2.2 Scrolling and panning in diagrams ====

+

+Scrolling and panning in diagrams can be done by either:

+

+* Use the outline view and click (hold down) and drag the blue shaded area around, which simultaneously pans the editing surface.

+* Use the vertical and horizontal scroll bars in the editing surface.

+

+==== 7.3.2.3 Creating an element in a diagram ====

+

+Elements can be created in a diagram directly, by using a tool from the palette, e.g. to create a class

+

+# Open a class diagram

+# Open the nodes drawer

+# Click on the class tool

+# Click somewhere in the editing surface

+# Name the class

+

+If an element already exists in the model, just click on (hold down) the element in the ''Model Explorer'' and drag it to the editing surface. When releasing the mouse key, the modeling element appears in the diagram.

+

+==== 7.3.2.4 Delete and hide ====

+

+In a diagram, elements can be deleted or hided.

+

+<center>[[File:ElementContextMenuDiaDelHide.bmp|center|thumb|200px|Figure 26: Context menu of an element in a diagram]]</center>

+

+Right click on an element in a diagram and do

+

+* '''Delete Selected Element''' will delete the element from the entire model and also from all diagrams where it was present.

+* '''Hide Selected Element''' will hide the element just in this diagram.

+

+'''Note!''' These menu items have short cuts, i.e. instead of using the context menu, just select the element in the diagram and use the '''Delete''' or '''Shift-Delete''' keys

+

+==== 7.3.2.5 Formating and validating diagrams ====

+

+Diagrams can be adjusted and graphically edited to get a nicer look also using the element context menu. From the same context menu it is also possible to validate the model or specific parts of the model.

+

+<center>[[File:ElementContextMenuDiaFormat.bmp|center|thumb|300px|Figure 27: Example of the Format sub context menu]]</center>

+

+In Figure 27 several menu items are shown, e.g.:

+

+* '''Validation''' to validate the model partly or fully

+* '''Format''' to do some advanced formating of the diagram like adjustments, routing, etc. as shown in the sub context menu in Figure 25

+* '''Filter''' to select/unselect parts of symbols that should be visible or not

+

+== <div id="UMLmodeling">7.4 UML modeling</div> ==

+

+With Papyrus, UML models can be created. This is done using different types of diagrams. Modeling elements can be created in these diagrams or directly in the ''Model Explorer''. Diagrams are created in the ''Model Explorer'' and when doing so a diagram editor together with its tool palette and outline view are also opened. Section [[#7.3_Diagram_editing_in_Papyrus|Diagram editing in Papyrus]] describes how to work with diagram editors.

+

+The most common modeling elements are:

+

+* Package

+* Use-case

+* Actor

+* Class

+* Object

+

+=== 7.4.1 Package ===

+

+A ''package'' is a general UML grouping element, comparable to a folder in Windows or a directory in Unix. It is used to bring order in the model. A ''package'' may have a semantical meaning (e.g. representing a subsystem) and then a UML stereotype, defined in a applied UML Profile, may be added to it (e.g. &lt;&lt; subsystem &gt;&gt;). To create a new ''package'', right click on the owning element, e.g. the model package and from the context menu select '''New Child &gt; Create a new Package'''

+

+<center>[[File:NewPackage.bmp|center|thumb|500px|Figure 28: Create a new Package]]</center>

+

+=== 7.4.2 Use-case ===

+

+A ''use-case'' is a functionality in the system. A ''use-case'' is a model of the dialogue between actors and the system. It should return a result of measurable value to at least one actor. A ''use-case'' is initiated by an actor to invoke a certain functionality in the system.

+A ''use-case'' is a complete and meaningful flow of events.

+Taken together, all ''use-cases'' constitute all possible ways of using the system.

+

+To create a new ''use-case'', right click on the owning element, e.g. a package and from the context menu select '''New Child &gt; Create a new UseCase'''

+

+<center>[[File:NewUseCase.bmp|center|thumb|500px|Figure 29: Create a new use-case]]</center>

+

+=== 7.4.3 Actor ===

+

+An ''actor'' is something external to the system, but interacts with it. An ''actor'' may be a human being or another system. It may be active or passive. An ''actor'' interacts (active ''actor'') or receive (passive ''actor'') information from one or several use-cases.

+

+To create a new ''actor'', right click on the owning element, e.g. a package and from the context menu select '''New Child &gt; Create a new Actor'''

+

+<center>[[File:NewActor.bmp|center|thumb|500px|Figure 30: Create a new actor]]</center>

+

+=== 7.4.4 Class ===

+

+A ''class'' is an extensible template for creating objects, providing initial values for state (member variables, attributes) and implementations of behavior (member functions, methods, operations). 

+

+Collectively attributes define the structure of a ''class''. A class may have any number of attributes or none. Attributes are typically implemented as variables. An attribute has a type, which tells us what kind of attribute it is. Typical types of attributes are integer, Boolean, real, and enumeration. These types are called primitive types. More complex types are defined by other ''classes''.

+

+Collectively operations define the behavior of the ''class''. A ''class'' may have any number of operations or none. Operations are implemented as functions or procedures.

+

+To create a new ''class'', right click on the owning element, e.g. a package and from the context menu select '''New Child &gt; Create a new Class'''

+

+<center>[[File:NewClass.bmp|center|thumb|500px|Figure 31: Create a new class]]</center>

+

+==== 7.4.4.1 Attributes on classes ====

+

+When a ''class'' is created, ''attributes'' can be added to it by using the context menu of the ''class''. To create a new ''attribute'' on the a ''class'' select '''New Child &gt; Create a new Property''' from its context menu.

+

+<center>[[File:NewAttribute.bmp|center|thumb|500px|Figure 32: Create a new attribute]]</center>

+

+The visibility, type and default value of the attribute are set in the properties view when the attribute is selected.

+

+==== 7.4.4.2 Operations on classes ====

+

+When a ''class'' is created, ''operations'' can be added to it by using the context menu of the ''class''. To create a new ''operation'' on the a ''class'' select '''New Child &gt; Create a new Operation''' from its context menu.

+

+<center>[[File:NewOperation.bmp|center|thumb|500px|Figure 33: Create a new operation]]</center>

+

+The visibility, arguments and return type of the operation are set in the properties view when the operation is selected.

+

+Regarding the arguments and return type of the an operation, select the [[File:PlusKey.bmp]] key by the ''Owned parameter'' field.

+

+<center>[[File:ClassOp1.bmp|center|thumb|600px|Figure 34: Create a new argument]]</center>

+

+Then the following window pops up and from the drop list in the ''Direction'' field, select the direction of the argument. In the ''Name'' field the name of the argument is written and the type is defined in the ''Type'' field.

+

+<center>[[File:ClassOp2.bmp|center|thumb|600px|Figure 35: Select the argument�s direction]]</center>

+

+The direction ''return'' defines the return type of the operation. Only one argument can have the return direction.

+

+=== 7.4.5 Object ===

+

+An ''object'' is an instance of a class. In UML it is called and ''InstanceSpecification'', which is a more general term since it can be used for instances of other classifiers than classes. 

+

+To create a new ''object'', right click on the owning element, e.g. a package and from the context menu select '''New Child &gt; Create a new InstanceSpecification'''

+

+<center>[[File:NewObject.bmp|center|thumb|500px|Figure 36: Create a new object]]</center>

+

+The class to be instanciated is selected by clicking on the [[File:PlusKey.bmp]] key by the ''Classifier'' field in the ''Properties'' view of the ''InstanceSpecification''. This will open the ''Classifier'' pop-up window (figure 37), where the class to be used is selected.

+

+<center>[[File:ClassifierPopup.bmp|center|thumb|500px|Figure 37: Classifier pop-up window]]</center>

+

+=== 7.4.6 Relationships ===

+

+There are different types of relationships that can be used in diagrams, hence in the model between different modeling elements.

+

+     [[Image:Relationships.bmp|center|thumb|300px]]

+

+Navigability can be unidirectional or bidirectional for ''Association'', ''Aggregation'' and ''Composition''.

+

+''Association'' specifies peer-to-peer relationships between model elements, e.g. if a Class-x has an attribute of type Class-y, it can be viewed in a class diagram as and ''Association'' between Class-x and Class-y.

+

+''Aggregation'' is used to model a whole/part relationship between model elements. The part element can exist without the whole. ''Aggregation'' causes the generated code to contain the aggregate either by reference or by value, depending on the details of the relationship. E.g. to model an aggregation, the aggregate (Department) has an aggregation association to its constituent parts (Employee). A hollow diamond is attached to the end of an association path on the side of the aggregate (the whole) to indicate aggregation.

+

+''Composition'' is an aggregation with strong ownership, i.e. when the container is destroyed, all of its composite objects are destroyed as well.

+

+''Dependency'' is a relationship in which one model element uses another. ''Dependency'' may exist between classes if a message is sent from one class to the other or if one class mentions the other as a parameter to an operation. ''Dependency'' may exist between packages if one package is dependent on another.

+

+A ''Dependency'' relationship causes a class to be generated with inclusions or references to another class.

+

+A ''Generalization'' relationship causes a class to be generated as a subclass of another class.

+

+The ''Realizes'' relationship specifies that, e.g. an implementation realizes a specification. The ''Realizes'' relationship does not affect the code.

+

+To create a relationship between two modeling elements, use the tool palette in the diagram editor, e.g. to create an ''Association'' between two classes, select the ''Association'' tool in the tool palette, click on the source element and then click on the destination element as described in figure 38.

+

+[[Image:ClassDiagramEditorNewAss.bmp|center|thumb|500px|Figure 38: Create a new Association]]

+

+

+In the ''Edges'' drawer in the tool palette, all available relationships are shown. To create a ''Generalization'' relationship, select the ''Generalization'' tool from the tool palette and follow the same procedure as described.

+

+The ''Aggregation'' and the ''Composition'' relationships are a special kind of an ''Association'' relationship. To create any of these, an ''Association'' relationship needs first to be created. Then select the created ''Association'' and in the properties view, change the ''Aggregation'' field at the appropriate end of the ''Association'' to ''shared''(if an ''Aggregation'' is desired) or to ''composite'' (if a ''Composition'' is desired). Figure 39 shows how to do it.

+

+[[Image:ClassDiagramEditorNewAgg.bmp|center|thumb|500px|Figure 39: Create a new Association]]

+

+When the ''Association'' is created, the ''Aggregation'' field is set to ''none'' by default. When doing the change at the destination end (as in figure 35), the diamond shows up at the source end of the relationship.

+

+=== 7.4.7 Diagrams ===

+

+UML has many different types of diagrams to capture all different aspects of a system. To capture and refine requirements, diagrams related to use-cases are used. To specify the architecture and design, diagrams related to classes and packages are used. To specify the implementation, state and activity diagrams are used, etc.

+

+The different diagrams in UML 2 are shown in figure 40 and here they are structured after diagram type. In the following of this section they are organized how they are used. 

+

+<center>[[File:UMLdiagrams.png|center|thumb|500px|Figure 40: UMl 2 diagram types]]</center>

+

+'''Note!''' In Papyrus class diagrams are also used as object diagrams.

+

+==== 7.4.7.1 Diagrams related to use-cases ====

+

+When working with requirement capture and refinement, use-case modeling is used and any or all of the following diagrams can be used:

+

+* Use-case diagram

+* Activity diagram

+* Interaction diagram

+** Sequence diagram

+** Collaboration diagram

+

+

+A ''use-case diagram'' describe how different ''Actors'' use different functionality of the system. Implicitly, it also define the system boundary, since it shows what should be performed by the system and what exists outside the system. The elements used in ''use-case diagrams'' are:

+

+* '''Actors''' interact with, but are outside the system.

+* '''Use-cases''' are some functionality that are performed by the system.

+* '''Relationships''' between elements.

+

+A diagram may depict all or some of the use-cases of a system.

+

+<center>[[File:UCdiagram.bmp|center|thumb|600px|Figure 41: Use-case diagram]]</center>

+

+A ''use-case'' interacts with an ''actor'' and perform something useful for that ''actor''. A ''use-case'' exist because of its main flow, but all odd cases and error situations have to be specified. A ''use-case'' has a black box and a white box view. The black box view is preferably described in plain text or by using activity diagrams. The white box view is described by one or several sequence diagrams.

+

+All ''use-cases'' together span the entire functionality of the system. ''Actors'', ''use-cases'' and ''use-case diagrams'' are owned by packages (general UML packages or model packages).

+

+To create a ''use-case diagram'', right click on the owning package and select '''New Diagram &gt; Create a new UseCase Diagram''' from its context menu.

+

+

+An ''activity diagram'' is a kind of behavioral diagram and shows flow of control from activity to activity. It is used to specify a use-case black box view. It can also be used to specify a flow chart for a class operation.

+

+The main elements in an ''activity diagram'' are:

+

+* Initial and end states

+* Activities

+* States

+* Transitions

+* Synchronization lines

+* Decisions

+* Partitions

+

+<center>[[File:ActivityDiagram.bmp|center|thumb|600px|Figure 42: Activity diagram]]</center>

+

+The ''activity diagram'' is preferably used to specify the black box behavior of a use-case instead of using plain text. It may also be used to specify a flow chart for a class operation.''Activity diagrams'' are owned by use-cases or classes. 

+

+To create an ''activity diagram'', right click on the owning use-case or class and select '''New Diagram &gt; Create a new Activity Diagram''' from its context menu.

+

+

+Interaction diagrams are used to specify how different modeling elements interacts. Here two types are described, the ''sequence diagram'' and the ''communication diagram''.

+

+

+A ''sequence diagram'' describes the interactions between elements as a time ordered set of messages. One or several ''sequence diagrams'' are used to specify the white box view of a use-case.

+

+Sequences involving collaborating elementsThe main elements in a ''sequence diagram'' are:

+

+* Class instances (objects)

+* Life lines

+* Messages

+* Combined fragments

+

+<center>[[File:SequenceDiagram.bmp|center|thumb|600px|Figure 43: Sequence diagram]]</center>

+

+The example (Figure 43) describes Interaction1, two objects (instances of Class1 and Class2) are created and interacts by messages. The time goes down along the life lines. In the bottom, there is a combined fragment of type "Ref" which is a reference to another interaction, Interaction2, meaning that the sequences in that interaction are executed.There are a lot of combined fragment types, e.g. type "Loop" specifies a loop, type "Alt" specifies alternatives, etc. All combined fragment types are defined in [http://www.omg.org/spec/UML/2.4.1/ Unified Modeling Language (UML) version 2.4.1]

+

+''Sequence diagrams'' are owned by use-cases or communication diagrams (see below). 

+

+To create a ''sequence diagram'', right click on the owning use-case or communication diagram and select '''New Diagram &gt; Create a new Sequence Diagram''' from its context menu.

+

+

+''Communication diagrams'' show the lines of communication among a set of objects to accomplish a specific purpose. They act as the framework for sequence diagrams and define access paths between elements. i.e. ''communication diagrams'' are used to specify a use-case's white box communication channels between elements in the system.

+

+The main elements in a ''collaboration diagram'' are:

+

+* Class instances (objects)

+* Access paths

+* Messages

+

+<center>[[File:CommunicationDiagram.bmp|center|thumb|600px|Figure 44: Communication diagram]]</center>

+

+

+The example (Figure 44) describes access paths between objects and which messages are passed in these paths.''Communication diagrams'' are owned by use-cases. 

+

+To create a ''communication diagram'', right click on the owning use-case and select '''New Diagram &gt; Create a new Communication Diagram''' from its context menu.

+

+==== 7.4.7.2 Diagrams related to classes ====

+

+When modeling classes, any or all of the following diagrams may be used:

+

+* ''Class diagrams''

+* ''Composite structure diagrams''

+* ''State diagrams''

+

+As described above, activity diagrams may also be used to specify a flowchart for a class operation.

+

+

+''Class diagrams'' depict static views of the system. A ''class diagram'' may represent all or part of the class structure of a system. Typically there are many ''class diagrams'' in a model. Usually one or many ''class diagrams'' are used to specify the inheritance structure in the system. ''Class diagrams'' may also be used to define dependency rules between packages.

+

+The main elements in a ''class diagram'' are:

+

+* Packages

+* Classes

+* Relationships

+

+<center>[[File:ClassDiagram.bmp|center|thumb|600px|Figure 45: Class diagram]]</center>

+

+The example (Figure 45) shows a ''class diagram'' used to specify an inheritance structure between classes. Note: The ''Generalization'' relationship and the indication of the inherited attributes in Class1 and Class2.

+

+''Class diagrams'' are owned by ordinary UML packages or model packages. 

+

+To create a ''class diagram'', right click on the owning package and select '''New Diagram &gt; Create a new Class Diagram''' from its context menu.

+

+

+The ''composite structure diagram'' specifies structure classes contents, i.e. how the class uses ''roles'' (instances from other classes) and how they are connected to fulfill its responsibility.

+

+The main elements in a ''composite structure diagram'' are:

+

+* Contained roles (instances of classes)

+* Ports (interface objects)

+* Connectors

+

+<center>[[File:CompositeStructure.bmp|center|thumb|600px|Figure 46: Composite structure diagram]]</center>

+

+The example (Figure 46) shows a ''composite structure diagram'' used to specify the structural contents of Class4. Note: Class4 uses one instance (class2) of Class2 and one instance (class3) of Class3 and they are connected between Class2/Port1 and Class3/Port2.

+

+''Composite structure diagrams'' are owned by structured classes. 

+

+To create a ''composite structure diagram'', right click on the owning class and select '''New Diagram &gt; Create a new Composite Structure Diagram''' from its context menu.

+

+

+The ''state machine diagram'' specifies the behavior of a class. It is used when the class is state rich, i.e. has an event driven behavior. If the class has no states, activity diagrams can be used.

+

+The main elements in a ''state machine diagram'' are:

+

+* States

+* Transitions

+* Effect code

+* Triggering events

+* Pseudo states, e.g. initial, final and choice points

+

+<center>[[File:StateDiagram.bmp|center|thumb|600px|Figure 47: State machine diagram]]</center>

+

+The example (Figure 47) shows a ''state machine diagram'' that has an initial pseudo state, three states and transitions between them. On each transition (except for initialize), a ''triggering event'' is specified, which defines the event that makes the transition to be taken. Transitions and states may have effect code, which specify detailed behavior to be executed when an associated transition is taken.

+

+''State machine diagrams'' are owned by classes. 

+

+To create a ''state machine diagram'', right click on the owning class and select '''New Diagram &gt; Create a new State Machine Diagram''' from its context menu.

+

+

+== <div id="UMLRTmodeling">7.5 UML RT modeling</div> ==

+

+When creating models UML is used. Since UML is general-purpose modeling language in the field of software engineering, it is possible to adapt UML to specific domains. This is done by creating and applying UML profiles. When using UML for RT modeling with Capsules and Protocols, the UML RT profile is applied. When a profile is applied we can say that Papyrus has been specialized. There is a specific use-case in Papyrus to develop UML profiles and when doing so a domain specific modeling language is defined. This use-case is described in section [[#7.10_UML_profiling |UML profiling]] in this user guide.

+

+=== 7.5.1 Additional modeling elements ===

+

+==== 7.5.1.1 Capsule class ====

+

+==== 7.5.1.2 Protocol class ====

+

+=== 7.5.2 Using C++ in a model ===

+

+=== 7.5.3 C++ service library ===

+

+==== 7.5.3.1 Sending messages ====

+

+=== 7.5.4 Transformation from model to code ===

+

+=== 7.5.5 Edit the generated code ===

+

+=== 7.5.6 Compiling and linking the generated code ===

+

+=== 7.5.7 Using external libraries ===

+

+=== 7.5.8 Running the system ===

+

+== <div id="Papyrusinateamenvironment">7.6 Papyrus in a team environment</div> ==

+

+=== 7.6.1 Model fragmentation ===

+

+=== 7.6.2 Source configuration management ===

+

+=== 7.6.3 Compare and Merge ===

+

+== <div id="Modelvalidation">7.7 Model validation</div> ==

+

+=== 7.7.1 Object Constrain Language (OCL) ===

+

+=== 7.7.2 Defining constraints using OCL ===

+

+== <div id="Searching">7.8 Searching</div> ==

+

+== 7.9 Sample models ==

+

+In the Papyrus installation directory There are several sample models

+

+=== 7.9.1 Class model with inheritance ===

+

+=== 7.9.2 Send and receive data ===

+

+=== 7.9.3 Interprocess communication ===

+

+== <div id="UMLprofiling">7.10 UML profiling</div> ==

+

+TBD include the information in the user guide "About UML profiling"

+

+= 8 Support =

+

+To report bugs, suggest improvements, view the status of the Papyrus project, discuss different Papyrus subjects, etc. please use the following references:

+

+* [http://www.eclipse.org/papyrus/ The Papyrus project home page]

+* [http://www.eclipse.org/forums/index.php/f/121/ The Papyrus discussion forum]

+* Proposals for Papyrus improvements

+* [https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&classification=Modeling&product=MDT.Papyrus&component=Core&long_desc_type=allwordssubstr&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&status_whiteboard_type=allwordssubstr&status_whiteboard=&keywords_type=allwords&keywords=&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailtype1=exact&email1=&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse%20same%20sort%20as%20last%20time&field0-0-0=noop&type0-0-0=noop&value0-0-0= Bugzilla_to_report_bugs]

+

+= 9 References =

+# [http://www.eclipse.org/ eclipse.org]

+# [http://www.eclipse.org/modeling/emf/ EMF model]

+# [http://www.eclipse.org/downloads/ Eclipse download page]

+# [http://www.omg.org/spec/UML/2.4.1/ Unified Modeling Language (UML) version 2.4.1]

+# [http://www.omg.org/spec/SysML/ System Modeling Language]

+# [http://www.omg.org/omgmarte/Specification.htm/ Modeling and Analysis of Real-Time and Embedded systems]
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/PapyrusStarterGuide.pdf b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/PapyrusStarterGuide.pdf
new file mode 100644
index 00000000000..9d66e352db6
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/PapyrusStarterGuide.pdf
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/Preferences.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/Preferences.bmp
new file mode 100644
index 00000000000..4ae9abb00d2
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/Preferences.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ProjectExpl.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ProjectExpl.bmp
new file mode 100644
index 00000000000..3c5171557d6
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ProjectExpl.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/PropertiesView.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/PropertiesView.bmp
new file mode 100644
index 00000000000..5fbed2fa110
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/PropertiesView.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/Relationships.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/Relationships.bmp
new file mode 100644
index 00000000000..2e739eabe47
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/Relationships.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/SearchView.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/SearchView.bmp
new file mode 100644
index 00000000000..b74183c0777
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/SearchView.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/SequenceDiagram.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/SequenceDiagram.bmp
new file mode 100644
index 00000000000..104d2da3fcb
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/SequenceDiagram.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/StateDiagram.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/StateDiagram.bmp
new file mode 100644
index 00000000000..0005e29f839
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/StateDiagram.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/UCdiagram.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/UCdiagram.bmp
new file mode 100644
index 00000000000..5a0ce561e9d
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/UCdiagram.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ValidationConstraints.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ValidationConstraints.bmp
new file mode 100644
index 00000000000..1c69e697969
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/ValidationConstraints.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/WelcomePage.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/WelcomePage.bmp
new file mode 100644
index 00000000000..4d63a9ba7c0
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/WelcomePage.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/Workbench.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/Workbench.bmp
new file mode 100644
index 00000000000..8dbb1476af0
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/Workbench.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.doc/resource/WorkspacePopup.bmp b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/WorkspacePopup.bmp
new file mode 100644
index 00000000000..267fd10af3a
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.uml.doc/resource/WorkspacePopup.bmp
diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/advanced_search.png b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/advanced_search.png
index 074447082bd..5d8932cfe9a 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/advanced_search.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/advanced_search.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/body_search.png b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/body_search.png
index abf3be5c4a5..7a88be13b15 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/body_search.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/body_search.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/replace.png b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/replace.png
index 61656494e41..32e0df131ea 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/replace.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/replace.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/requirement_search.png b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/requirement_search.png
index 0d767cf2bf7..c7fa4152bc1 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/requirement_search.png
+++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/requirement_search.png
diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/search-main-toc.xml b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/search-main-toc.xml
index 48267f8e8ba..14ecc4b1eb5 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/search-main-toc.xml
+++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/search-main-toc.xml
@@ -2,7 +2,7 @@
 <toc label="Search" link_to="../org.eclipse.papyrus.infra.doc/toc.xml#PapyrusDocUser">

    <topic href="resource/search.html" label="Search in Models">

       <link toc="resource/search-toc.xml"/>

-      <anchor id="searchInModel"/>

+      <anchor id="SearchID"/>

    </topic>

 	

 </toc>

diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/search.html b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/search.html
index 9d521d3272d..978df0a3cd5 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/search.html
+++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/search.html
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"/></head><body><p>In this documentation, we will use this UML model to illustrate the search features. </p><p><img border="0" src="search-model1.png"/></p><h1 id="Search_elements">Search elements</h1><p>The search feature of Papyrus helps the user to find elements in the models. The user can choose between a text search and an OCL search.</p><p>As it is shown in the following image the user chooses the query kind he wants to use: </p><p><img border="0" src="query_kind.png"/> </p><h1 id="Text_search">Text search</h1><p>The user can do a simple search or an advanced search.
-The user makes his choice in the A area of the following image which represents the text search dialog.</p><p><img border="0" src="search_kind.png"/> </p><h2 id="Simple_search">Simple search</h2><p>The following image illustrates a simple text search dialog:</p><p><img border="0" src="simple_search.png"/> </p><ul><li>The user can specify the string pattern he/she is looking for in the A area. <ul><li>Check the "Case sensitive" if case must be considered. </li><li>The user may also want to use regular expression to express the query. Then check "Regular expression" button. The regular expression must respect Java Regex.</li></ul></li><li>The user chooses whether he wants to search only in the name attribute of instances of UML::NamedElement or in all string attributes of instances of UML metaClasses, in B area.</li></ul><p>For instance, the following search: </p><p><img border="0" src="C-search.png"/></p><p>will provide the following results: </p><p><img border="0" src="C-result.png"/></p><p>The comment is not returned because we were note looking for all string attributes. </p><p>However, this search:</p><p><img border="0" src="comment-search.png"/></p><p>will return : </p><p><img border="0" src="comment-result.png"/></p><h2 id="Advanced_search">Advanced search</h2><p>The following image shows the advanced text search dialog.</p><p><img border="0" src="advanced_search.png"/></p><ul><li>As in the simple search the user can specify the string pattern he/she is looking for, and may indicate if he uses regular expression or if he wants to consider case, in the A area. </li><li>The user can filter the types of elements to search the string pattern in by selecting the UML metaClasses or applied stereotypes in area B . He can also choose in which attributes he wants to do the research.</li><li>In the C area, the user can select all subelements of the actual selected element. For example, if the user selects "NamedElement" and clicks on "Select subelements",all metaClasses which inherit of UML::NamedElement will be checked. If the name attribute of "NamedElement" is checked and the user selects "NamedElement" and then clicks on "Select subelements",all instances of UML::NamedElement and their name attribute will be checked.</li></ul><p>In the following image we search the pattern "my"  in the attribute body of the metaClass "Comment". The research will give us all the instances of "Comment" having an attribute body matching with the string pattern. </p><p><img border="0" src="body_search.png"/></p><p>The result will be</p><p><img border="0" src="body_result.png"/></p><p>If the user select a stereotype or an UML metaClass without indicating a string pattern, the research will give him all the instances of the metaClasses he checked and all the elements having the applied stereotypes he checked.</p><p>For example the result of this research:</p><pre><img border="0" src="requirement_search.png"/>
+The user makes his choice in the A area of the following image which represents the text search dialog.</p><p><img border="0" src="search_kind.png"/> </p><h2 id="Simple_search">Simple search</h2><p>The following image illustrates a simple text search dialog:</p><p><img border="0" src="simple_search.png"/> </p><ul><li>The user can specify the string pattern he/she is looking for in the A area. <ul><li>Check the "Case sensitive" if case must be considered. </li><li>The user may also want to use regular expression to express the query. Then check "Regular expression" button. The regular expression must respect Java Regex.</li></ul></li><li>The user chooses whether he wants to search only in the name attribute of instances of UML::NamedElement or in all string attributes of instances of UML metaClasses, in B area.</li></ul><p>For instance, the following search: </p><p><img border="0" src="C-search.png"/></p><p>will provide the following results: </p><p><img border="0" src="C-result.png"/></p><p>The comment is not returned because we were note looking for all string attributes. </p><p>However, this search:</p><p><img border="0" src="comment-search.png"/></p><p>will return : </p><p><img border="0" src="comment-result.png"/></p><h2 id="Advanced_search">Advanced search</h2><p>The following image shows the advanced text search dialog.</p><p><img border="0" src="advanced_search.png"/></p><ul><li>As in the simple search the user can specify the string pattern he/she is looking for, and may indicate if he uses regular expression or if he wants to consider case, in the A area. </li><li>The user can filter the types of elements to search the string pattern in by selecting the UML metaClasses or applied stereotypes in area B . He can also choose in which attributes he wants to do the research. The stereotypes displayed in the B area are the stereotypes which can be applied on elements from the model(s) corresponding to the selected scope, for example if the selected scope is "Selected resources" only the stereotypes defined in the profiles applied on the current model will be displayed, but if the selected scope is "Workspace" the stereotypes defined in all the profiles applied on models from the current workspace will be displayed.</li><li>In the C area, the user can select all subelements of the actual selected element. For example, if the user selects "NamedElement" and clicks on "Select subelements",all metaClasses which inherit of UML::NamedElement will be checked. If the name attribute of "NamedElement" is checked and the user selects "NamedElement" and then clicks on "Select subelements",all instances of UML::NamedElement and their name attribute will be checked.    If the user changes the selected scope he should click on the refresh types button, this will update the list of stereotypes displayed.</li><li>The user can specify, in the D area, if he wants to search for model elements with all the specified stereotype (the ones checked in the B area).</li></ul><p>In the following image we search the pattern "my"  in the attribute body of the metaClass "Comment". The research will give us all the instances of "Comment" having an attribute body matching with the string pattern. </p><p><img border="0" src="body_search.png"/></p><p>The result will be</p><p><img border="0" src="body_result.png"/></p><p>If the user select a stereotype or an UML metaClass without indicating a string pattern, the research will give him all the instances of the metaClasses he checked and all the elements having the applied stereotypes he checked.</p><p>For example the result of this research:</p><pre><img border="0" src="requirement_search.png"/>
 </pre><p>will be</p><pre><img border="0" src="requirement_result.png"/>
 </pre><h1 id="OCL_search">OCL search</h1><p>The following image shows an OCL search dialog</p><p><img border="0" src="OCL.png"/></p><p>The user writes his OCL query in the A area.
-The scope must be "Selected resources" if the user wants to do this kind of query.</p><h1 id="Replace_String">Replace String</h1><p>Should the user want to replace the matches of your search with another string, he/she may click on the "Replace" button in the search dialog. A new dialog will popup:</p><p><img border="0" src="replace.png"/></p><p>As mentioned on the dialog, the replace action is mostly undoable. Matches that are found in a resource that is not opened in an editor will be replaced and will be save so that the user cannot undo the modification. </p><h1 id="Filter">Filter</h1><p>The user can filter the results of the search by selecting the types of the elements he/she wants to show.</p><p>For instance, on the following search (we use the model 1): </p><p><img border="0" src="a-search.png"/></p><p>the user may filter the results by clicking on the icon identified in a red rectangle in the following picture: </p><p><img border="0" src="a-results.png"/></p><p>this will open a new dialog where the user can select the metaclasses he/she want to show: </p><p><img border="0" src="filter.png"/></p><p>then, the result page will show only the matches of the selected type: </p><p><img border="0" src="my-filtered.png"/></p><p>If the user wants to remove this filtering, he/she may click on the Filters button as illustrated in previous picture. This will open the following dialog: </p><p><img border="0" src="select-filters.png"/></p><p><hr/>
+The scope must be "Selected resources" if the user wants to do this kind of query.</p><h1 id="Replace_String">Replace String</h1><p>Should the user want to replace the matches of your search with another string, he/she may click on the "Replace" button in the search dialog. A new dialog will popup:</p><p><img border="0" src="replace.png"/></p><p>More details about the refactoring tool in the Model Refactor Wizard page.</p><h1 id="Filter">Filter</h1><p>The user can filter the results of the search by selecting the types of the elements he/she wants to show.</p><p>For instance, on the following search (we use the model 1): </p><p><img border="0" src="a-search.png"/></p><p>the user may filter the results by clicking on the icon identified in a red rectangle in the following picture: </p><p><img border="0" src="a-results.png"/></p><p>this will open a new dialog where the user can select the metaclasses he/she want to show: </p><p><img border="0" src="filter.png"/></p><p>then, the result page will show only the matches of the selected type: </p><p><img border="0" src="my-filtered.png"/></p><p>If the user wants to remove this filtering, he/she may click on the Filters button as illustrated in previous picture. This will open the following dialog: </p><p><img border="0" src="select-filters.png"/></p><p><hr/>
 This work is developed by <a href="http://www-list.cea.fr">CEA LIST</a> and sponsored by <a href="http://www.ericsson.com">Ericsson</a> in the context of Polarsys <a href="http://wiki.eclipse.org/Polarsys">http://wiki.eclipse.org/Polarsys</a></p></body></html>
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/search.mediawiki b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/search.mediawiki
index 2c1b8aa202a..444807ed899 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/search.mediawiki
+++ b/plugins/doc/org.eclipse.papyrus.uml.search.ui.doc/resource/search.mediawiki
@@ -50,8 +50,10 @@ The following image shows the advanced text search dialog.
 [[image:advanced_search.png]]

 

 * As in the simple search the user can specify the string pattern he/she is looking for, and may indicate if he uses regular expression or if he wants to consider case, in the A area. 

-* The user can filter the types of elements to search the string pattern in by selecting the UML metaClasses or applied stereotypes in area B . He can also choose in which attributes he wants to do the research.

-* In the C area, the user can select all subelements of the actual selected element. For example, if the user selects "NamedElement" and clicks on "Select subelements",all metaClasses which inherit of UML::NamedElement will be checked. If the name attribute of "NamedElement" is checked and the user selects "NamedElement" and then clicks on "Select subelements",all instances of UML::NamedElement and their name attribute will be checked.

+* The user can filter the types of elements to search the string pattern in by selecting the UML metaClasses or applied stereotypes in area B . He can also choose in which attributes he wants to do the research. The stereotypes displayed in the B area are the stereotypes which can be applied on elements from the model(s) corresponding to the selected scope, for example if the selected scope is "Selected resources" only the stereotypes defined in the profiles applied on the current model will be displayed, but if the selected scope is "Workspace" the stereotypes defined in all the profiles applied on models from the current workspace will be displayed.

+* In the C area, the user can select all subelements of the actual selected element. For example, if the user selects "NamedElement" and clicks on "Select subelements",all metaClasses which inherit of UML::NamedElement will be checked. If the name attribute of "NamedElement" is checked and the user selects "NamedElement" and then clicks on "Select subelements",all metaClasses which inherit UML::NamedElement and their name attribute will be checked.    If the user changes the selected scope he should click on the refresh types button, this will update the list of stereotypes displayed.

+*The user can specify, in the D area, if he wants to search for model elements with all the specified stereotype (the ones checked in the B area).

+

 

 

 In the following image we search the pattern "my"  in the attribute body of the metaClass "Comment". The research will give us all the instances of "Comment" having an attribute body matching with the string pattern. 

@@ -88,7 +90,7 @@ Should the user want to replace the matches of your search with another string,
 

 [[Image:replace.png]]

 

-As mentioned on the dialog, the replace action is mostly undoable. Matches that are found in a resource that is not opened in an editor will be replaced and will be save so that the user cannot undo the modification. 

+More details about the refactoring tool in the Model Refactor Wizard page.

 

 =Filter=

 The user can filter the results of the search by selecting the types of the elements he/she wants to show.

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF
index fae37aaf919..9fea77c193b 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF
@@ -11,8 +11,8 @@ Require-Bundle: org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.0"
  org.eclipse.gef;bundle-version="3.8.1",

  org.eclipse.emf.ecore.xmi;bundle-version="2.8.0",

  org.eclipse.emf.workspace;bundle-version="1.5.1",

- com.google.guava,

  org.eclipse.papyrus.infra.tools;bundle-version="1.0.0",

+ com.google.guava;bundle-version="11.0.0",

  org.eclipse.core.filesystem

 Export-Package: org.eclipse.papyrus.infra.core,

  org.eclipse.papyrus.infra.core.contentoutline,

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/plugin.xml b/plugins/infra/core/org.eclipse.papyrus.infra.core/plugin.xml
index c694ca9d561..5ea051c054f 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/plugin.xml
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/plugin.xml
@@ -329,6 +329,13 @@
       </category>

    </extension>

    <extension

+         point="org.eclipse.ui.importWizards">

+      <category

+            id="org.eclipse.papyrus.infra.core.importcategory"

+            name="Papyrus">

+      </category>

+   </extension>

+   <extension

        id="org.eclipse.papyrus.modelmarker"

        name="model marker"

        point="org.eclipse.core.resources.markers">

diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF
index e0f8c48a48e..b2fdcac9a08 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF
@@ -28,7 +28,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.gmf.runtime.common.core;bundle-version="1.7.0",

  org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",

  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",

- com.google.guava;bundle-version="10.0.1"

+ com.google.guava;bundle-version="11.0.0"

 Export-Package: org.eclipse.papyrus.infra.emf,

  org.eclipse.papyrus.infra.emf.commands,

  org.eclipse.papyrus.infra.emf.databinding,

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/AbstractStyleHandler.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/AbstractStyleHandler.java
index 20630eb8add..14d89f7bc71 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/AbstractStyleHandler.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/src/org/eclipse/papyrus/infra/gmfdiag/css/configuration/handler/AbstractStyleHandler.java
@@ -165,7 +165,7 @@ public abstract class AbstractStyleHandler extends AbstractHandler {
 

 		try {

 			resource.save(new HashMap<Object, Object>());

-			BaseCSSEngine.instance.reset();

+			BaseCSSEngine.INSTANCE.reset();

 			DiagramHelper.setNeedsRefresh();

 			DiagramHelper.refreshDiagrams();

 		} catch (IOException ex) {

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/ui/MultipleStylableElement.xwt b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/ui/MultipleStylableElement.xwt
index f4d2cf428bf..208f3a1d236 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/ui/MultipleStylableElement.xwt
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/ui/MultipleStylableElement.xwt
@@ -8,5 +8,5 @@
 	<Composite.layout>

 		<GridLayout numColumns="1"></GridLayout>

 	</Composite.layout>

-	<css:ResetStyleWidget></css:ResetStyleWidget>

+	<css:ResetStyleWidget input="{Binding}"></css:ResetStyleWidget>

 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/ui/SingleDiagram.xwt b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/ui/SingleDiagram.xwt
index 36e0cdb35e2..64704634d72 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/ui/SingleDiagram.xwt
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/ui/SingleDiagram.xwt
@@ -18,7 +18,7 @@
 		<Composite.layout>

 			<GridLayout></GridLayout>

 		</Composite.layout>

-		<css:ResetStyleWidget></css:ResetStyleWidget>

+		<css:ResetStyleWidget input="{Binding}"></css:ResetStyleWidget>

 	</Composite>

 	<Composite>

 		<Composite.layout>

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/ui/SingleStylableElement.xwt b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/ui/SingleStylableElement.xwt
index d993f070dd5..b4b4f789285 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/ui/SingleStylableElement.xwt
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/model/properties/ui/SingleStylableElement.xwt
@@ -11,7 +11,7 @@
 		<Composite.layout>

 			<GridLayout></GridLayout>

 		</Composite.layout>

-		<css:ResetStyleWidget></css:ResetStyleWidget>

+		<css:ResetStyleWidget input="{Binding}"></css:ResetStyleWidget>

 	</Composite>

 	<Composite>

 		<Composite.layout>

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/widgets/ResetStyleWidget.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/widgets/ResetStyleWidget.java
index d514aa3b5d6..470316e7202 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/widgets/ResetStyleWidget.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/widgets/ResetStyleWidget.java
@@ -11,12 +11,9 @@
  *****************************************************************************/

 package org.eclipse.papyrus.infra.gmfdiag.css.properties.widgets;

 

-import java.util.HashMap;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.papyrus.infra.gmfdiag.css.handler.ResetStyleHandler;

-import org.eclipse.papyrus.infra.gmfdiag.css.properties.Activator;

+import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.papyrus.infra.gmfdiag.css.helper.ResetStyleHelper;

+import org.eclipse.papyrus.views.properties.modelelement.DataSource;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.events.SelectionEvent;

 import org.eclipse.swt.events.SelectionListener;

@@ -28,6 +25,8 @@ public class ResetStyleWidget implements SelectionListener {
 

 	private Button button;

 

+	private DataSource input;

+

 	public ResetStyleWidget(Composite parent, int style) {

 		button = new Button(parent, SWT.PUSH);

 		button.addSelectionListener(this);

@@ -36,17 +35,12 @@ public class ResetStyleWidget implements SelectionListener {
 	}

 

 	public void widgetSelected(SelectionEvent event) {

-		if(event.widget != button) {

+		if(event.widget != button || input == null) {

 			return;

 		}

 

-		ResetStyleHandler handler = new ResetStyleHandler();

-		try {

-			//FIXME: The ExecutionEvent needs the EclipseContext

-			handler.execute(new ExecutionEvent(null, new HashMap<String, String>(), event, null));

-		} catch (ExecutionException ex) {

-			Activator.log.error(ex);

-		}

+		IStructuredSelection viewSelection = input.getSelection();

+		ResetStyleHelper.resetStyle(viewSelection);

 	}

 

 	public void widgetDefaultSelected(SelectionEvent e) {

@@ -68,4 +62,12 @@ public class ResetStyleWidget implements SelectionListener {
 	public String getToolTipText() {

 		return button.getToolTipText();

 	}

+

+	public void setInput(DataSource input) {

+		this.input = input;

+	}

+

+	public DataSource getInput() {

+		return input;

+	}

 }

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/xtend-gen/org/eclipse/papyrus/infra/gmfdiag/generator/.gitignore b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/xtend-gen/org/eclipse/papyrus/infra/gmfdiag/generator/.gitignore
new file mode 100644
index 00000000000..d721d4ae5ab
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/xtend-gen/org/eclipse/papyrus/infra/gmfdiag/generator/.gitignore
@@ -0,0 +1 @@
+/CSSGenerator.java
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF
index 2117563cefa..fceb5e1cd38 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF
@@ -15,7 +15,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.core;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.services.markerlistener;bundle-version="1.0.0",

- org.eclipse.gmf.runtime.notation.edit;bundle-version="1.7.0"

+ org.eclipse.gmf.runtime.notation.edit;bundle-version="1.7.0",

+ org.w3c.dom.svg;bundle-version="1.1.0"

 Export-Package: org.eclipse.papyrus.infra.gmfdiag.css,

  org.eclipse.papyrus.infra.gmfdiag.css.converters,

  org.eclipse.papyrus.infra.gmfdiag.css.dom,

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/plugin.xml b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/plugin.xml
index b82a4ff395c..db704829b92 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/plugin.xml
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/plugin.xml
@@ -10,34 +10,6 @@
 			uri="http://www.eclipse.org/gmf/runtime/1.0.2/notation">

 		</factory>

 	</extension>

-	<extension point="org.eclipse.ui.handlers">

-		<handler

-			class="org.eclipse.papyrus.infra.gmfdiag.css.handler.CSSRefreshHandler"

-			commandId="org.eclipse.ui.file.refresh">

-			<activeWhen>

-				<and>

-					<with variable="activePartId">

-						<equals value="org.eclipse.papyrus.infra.core.papyrusEditor">

-						</equals>

-					</with>

-					<with variable="activeContexts">

-						<iterate ifEmpty="false" operator="or">

-							<equals value="Papyrus CSS">

-							</equals>

-						</iterate>

-					</with>

-				</and>

-			</activeWhen>

-		</handler>

-	</extension>

- <extension

-       point="org.eclipse.ui.contexts">

-    <context

-          description="A context used to indicate that the Papyrus CSS support is available"

-          id="Papyrus CSS"

-          name="Papyrus CSS context">

-    </context>

- </extension>

  <extension

        point="org.eclipse.papyrus.infra.emf.appearance.styleProvider">

     <styleprovider

@@ -102,5 +74,11 @@
           priority="1"

           startKind="lazy">

     </service>

+ </extension>

+ <extension

+       point="org.eclipse.papyrus.infra.gmfdiag.common.svgPostProcessors">

+    <postProcessor

+          implementation="org.eclipse.papyrus.infra.gmfdiag.css.CssSvgPostProcessor">

+    </postProcessor>

  </extension>
 </plugin>

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/Activator.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/Activator.java
index ebd1ac8dd40..14d5da1206a 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/Activator.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/Activator.java
@@ -12,9 +12,6 @@
 package org.eclipse.papyrus.infra.gmfdiag.css;

 

 import org.eclipse.papyrus.infra.core.log.LogHelper;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.ui.contexts.IContextService;

 import org.eclipse.ui.plugin.AbstractUIPlugin;

 import org.osgi.framework.BundleContext;

 

@@ -57,18 +54,6 @@ public class Activator extends AbstractUIPlugin {
 		super.start(context);

 		plugin = this;

 		log = new LogHelper(this);

-

-		if(Display.getCurrent() != null) {

-			Display.getCurrent().asyncExec(new Runnable() {

-

-				public void run() {

-					IContextService contextService = (IContextService)PlatformUI.getWorkbench().getService(IContextService.class);

-					contextService.activateContext(CSS);

-				}

-			});

-		} else {

-			log.warn("Cannot activate the CSS Context");

-		}

 	}

 

 	/*

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CssSvgPostProcessor.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CssSvgPostProcessor.java
new file mode 100755
index 00000000000..6e1b287f012
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/CssSvgPostProcessor.java
@@ -0,0 +1,419 @@
+/*****************************************************************************

+ * 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:

+ *  Laurent Wouters <laurent.wouters@cea.fr> CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.gmfdiag.css;

+

+import java.io.IOException;

+import java.io.InputStream;

+import java.util.ArrayList;

+import java.util.Arrays;

+import java.util.Collection;

+import java.util.HashMap;

+import java.util.List;

+import java.util.Map;

+import java.util.Map.Entry;

+import java.util.WeakHashMap;

+

+import org.eclipse.e4.ui.css.core.engine.CSSEngine;

+import org.eclipse.e4.ui.css.core.impl.dom.CSSStyleRuleImpl;

+import org.eclipse.e4.ui.css.core.impl.sac.ExtendedSelector;

+import org.eclipse.e4.ui.css.xml.engine.CSSXMLEngineImpl;

+import org.eclipse.emf.common.util.URI;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.resource.Resource;

+import org.eclipse.emf.ecore.resource.URIConverter;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.Shape;

+import org.eclipse.gmf.runtime.notation.StringValueStyle;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.handler.IRefreshHandlerPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.handler.RefreshHandler;

+import org.eclipse.papyrus.infra.gmfdiag.common.service.shape.SVGPostProcessor;

+import org.eclipse.ui.IEditorPart;

+import org.w3c.css.sac.SelectorList;

+import org.w3c.dom.Element;

+import org.w3c.dom.Node;

+import org.w3c.dom.css.CSSRule;

+import org.w3c.dom.css.CSSStyleRule;

+import org.w3c.dom.css.CSSStyleSheet;

+import org.w3c.dom.css.DocumentCSS;

+import org.w3c.dom.stylesheets.StyleSheet;

+import org.w3c.dom.svg.SVGDocument;

+

+/**

+ * Represents a SVG post-processor that applies the current CSS style provided by the view

+ *

+ * @author Laurent Wouters

+ */

+//TODO: This post processor doesn't depend on the GMF/CSS integration. It could be possible to apply styles to SVG images

+//without having the GMF/CSS integration. This class might be moved to gmfdiag.common

+@SuppressWarnings("restriction")

+public class CssSvgPostProcessor implements SVGPostProcessor, IRefreshHandlerPart {

+

+	/**

+	 * The name of the CSS property that points to the CSS file for the SVG figure

+	 */

+	private static final String CSS_PROPERTY_SVG_STYLESHEET = "svgCSSFile";

+

+	/**

+	 * The name of the CSS property that defines the name of the CSS class to look for in the SVG figure

+	 */

+	private static final String CSS_PROPERTY_SVG_CLASS = "svgCSSClass";

+

+	/**

+	 * The CSS engine for this post-processor

+	 */

+	private CSSEngine engine;

+

+	/**

+	 * Maps of URIs for CSS stylesheets refered to with relative paths

+	 */

+	private WeakHashMap<Resource, Map<String, URI>> relativePaths;

+

+	/**

+	 * List of the loaded stylesheets

+	 */

+	private Collection<URI> loadedSheets;

+

+	/**

+	 * List of stylesheets that could not be loaded

+	 */

+	private Collection<URI> failedSheets;

+

+	/**

+	 * Hive of styled SVG element per document that stores the original style of the SVG elements

+	 */

+	private Map<SVGDocument, Map<Element, Map<String, String>>> styledDocuments;

+

+	/**

+	 * Initializes this processor

+	 */

+	public CssSvgPostProcessor() {

+		engine = new CSSXMLEngineImpl();

+		relativePaths = new WeakHashMap<Resource, Map<String, URI>>();

+		loadedSheets = new ArrayList<URI>();

+		failedSheets = new ArrayList<URI>();

+		styledDocuments = new HashMap<SVGDocument, Map<Element, Map<String, String>>>();

+		RefreshHandler.register(this);

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.infra.gmfdiag.common.handler.IRefreshHandlerPart#refresh(org.eclipse.ui.IEditorPart)

+	 */

+	public void refresh(IEditorPart editorPart) {

+		relativePaths.clear();

+		loadedSheets.clear();

+		failedSheets.clear();

+		styledDocuments.clear();

+		engine.reset();

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.infra.gmfdiag.common.service.shape.SVGPostProcessor#postProcess(org.eclipse.emf.ecore.EObject,

+	 *      org.w3c.dom.svg.SVGDocument)

+	 */

+	public void postProcess(EObject view, SVGDocument document) {

+		if(view instanceof Shape) {

+			View shape = (View)view;

+			// Retrieve the applied CSS stylesheet if necessary

+			StringValueStyle nsURI = (StringValueStyle)shape.getNamedStyle(NotationPackage.eINSTANCE.getStringValueStyle(), CSS_PROPERTY_SVG_STYLESHEET);

+			if(nsURI != null) {

+				loadStylesheet(getCanonicalURI(shape.getElement(), nsURI.getStringValue()));

+			}

+			// Retrieve the applied CSS class

+			StringValueStyle nsClassName = (StringValueStyle)shape.getNamedStyle(NotationPackage.eINSTANCE.getStringValueStyle(), CSS_PROPERTY_SVG_CLASS);

+			String className = "";

+			if(nsClassName != null) {

+				className = nsClassName.getStringValue();

+			}

+			// Apply the style

+			document.getDocumentElement().setAttribute("class", className);

+			applyStyles(document);

+		}

+	}

+

+	/**

+	 * Loads the stylesheet at the given URI into the CSS engine

+	 *

+	 * @param uri

+	 *        The URI to load the stylesheet from

+	 */

+	private void loadStylesheet(URI uri) {

+		if(uri == null || uri.isEmpty()) {

+			return;

+		}

+		if(loadedSheets.contains(uri)) {

+			return;

+		}

+		if(failedSheets.contains(uri)) {

+			return;

+		}

+		InputStream stream;

+		try {

+			stream = URIConverter.INSTANCE.createInputStream(uri);

+		} catch (IOException e) {

+			Activator.log.error("Failed to locate stylesheet from " + uri, e);

+			failedSheets.add(uri);

+			return;

+		}

+		StyleSheet sheet = null;

+		try {

+			sheet = engine.parseStyleSheet(stream);

+		} catch (IOException e) {

+			Activator.log.error("Failed to load stylesheet at " + uri, e);

+			failedSheets.add(uri);

+		} finally {

+			try {

+				stream.close();

+			} catch (IOException e) {

+			}

+		}

+		if(sheet != null) {

+			loadedSheets.add(uri);

+		}

+	}

+

+	/**

+	 * Translates the given uri as a string to a canonical Eclipse URI

+	 * The URI may be relative to the currently edited EMF resource

+	 *

+	 * @param model

+	 *        The model element used to retrieve the EMF resource that is currently edited

+	 * @param uri

+	 *        The potentially relative URI of a stylesheet

+	 * @return The canonical URI of the resource

+	 */

+	private URI getCanonicalURI(EObject model, String uri) {

+		if(uri.startsWith("platform:/")) {

+			return URI.createURI(uri);

+		}

+

+		Map<String, URI> resMap = relativePaths.get(model.eResource());

+		if(resMap == null) {

+			resMap = new HashMap<String, URI>();

+			relativePaths.put(model.eResource(), resMap);

+		}

+		URI canonical = resMap.get(uri);

+		if(canonical != null) {

+			return canonical;

+		}

+

+		URI resURI = model.eResource().getURI();

+		if(!resURI.isPlatform()) {

+			return null;

+		}

+		StringBuilder builder = new StringBuilder("platform:/");

+		String[] segments = resURI.segments();

+		for(int i = 0; i < segments.length - 1; i++) {

+			builder.append(segments[i]);

+			builder.append("/");

+		}

+		builder.append(uri);

+		canonical = URI.createURI(builder.toString());

+		resMap.put(uri, canonical);

+		return canonical;

+	}

+

+

+	/**

+	 * Applies the CSS styles to the given SVG document

+	 *

+	 * @param document

+	 *        The SVG document

+	 */

+	private void applyStyles(SVGDocument document) {

+		List<CSSStyleRule> rules = getAllRulesIn(engine.getDocumentCSS());

+		Map<Element, Map<String, String>> originals = styledDocuments.get(document);

+		if(originals == null) {

+			originals = new HashMap<Element, Map<String, String>>();

+			styledDocuments.put(document, originals);

+		}

+		applyStyles(document.getDocumentElement(), rules, originals);

+	}

+

+	/**

+	 * Recursively applies the CSS rule on this SVG element

+	 *

+	 * @param element

+	 *        The SVG element

+	 * @param rules

+	 *        The CSS rules in effect

+	 * @param originals

+	 *        The original styling properties of the elements

+	 */

+	private void applyStyles(Element element, List<CSSStyleRule> rules, Map<Element, Map<String, String>> originals) {

+		// recursively apply to DOM elements

+		for(int i = 0; i != element.getChildNodes().getLength(); i++) {

+			Node child = element.getChildNodes().item(i);

+			if(child instanceof Element) {

+				applyStyles((Element)child, rules, originals);

+			}

+		}

+

+		// make a copy of the original styling properties

+		Map<String, String> style = originals.get(element);

+		if(style == null) {

+			style = getBaseStyle(element);

+			originals.put(element, style);

+		}

+		style = new HashMap<String, String>(style);

+

+		// get the applicable CSS rules

+		List<CSSStyleRule> applicable = getApplicableRules(element, rules);

+		// apply the CSS rules to the styling properties

+		for(CSSStyleRule rule : applicable) {

+			applyRuleTo(rule, style);

+		}

+

+		// serialize the result and put it back into the DOM

+		StringBuilder builder = new StringBuilder();

+		int count = 0;

+		for(Entry<String, String> entry : style.entrySet()) {

+			if(count != 0) {

+				builder.append(";");

+			}

+			builder.append(entry.getKey());

+			builder.append(":");

+			builder.append(entry.getValue());

+			count++;

+		}

+		element.setAttribute("style", builder.toString());

+	}

+

+	/**

+	 * Builds a list of the CSS style rules for the given CSS document

+	 *

+	 * @param css

+	 *        The CSS document

+	 * @return The CSS style rules

+	 */

+	private List<CSSStyleRule> getAllRulesIn(DocumentCSS css) {

+		List<CSSStyleRule> result = new ArrayList<CSSStyleRule>();

+		for(int i = 0; i != css.getStyleSheets().getLength(); i++) {

+			StyleSheet ss = css.getStyleSheets().item(i);

+			if(ss instanceof CSSStyleSheet) {

+				CSSStyleSheet cs = (CSSStyleSheet)ss;

+				for(int j = 0; j != cs.getCssRules().getLength(); j++) {

+					CSSRule rule = cs.getCssRules().item(j);

+					if(rule.getType() == CSSRule.STYLE_RULE) {

+						result.add((CSSStyleRule)rule);

+					}

+				}

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * Filters the CSS rules that applies for the given SVG element

+	 *

+	 * @param svgElement

+	 *        A SVG element

+	 * @param rules

+	 *        The set of active rules

+	 * @return The matching rules

+	 */

+	private List<CSSStyleRule> getApplicableRules(Element svgElement, List<CSSStyleRule> rules) {

+		List<CSSStyleRule> matching = new ArrayList<CSSStyleRule>();

+

+		// Matches the rules using the selectors

+		for(CSSStyleRule rule : rules) {

+			SelectorList selectors = ((CSSStyleRuleImpl)rule).getSelectorList();

+			boolean match = true;

+			for(int i = 0; i != selectors.getLength(); i++) {

+				ExtendedSelector xs = (ExtendedSelector)selectors.item(i);

+				if(!xs.match(svgElement, null)) {

+					match = false;

+					break;

+				}

+			}

+			if(match) {

+				matching.add(rule);

+			}

+		}

+

+		// No match => stop

+		if(matching.isEmpty()) {

+			return matching;

+		}

+

+		// Remove the parent rules

+		boolean[] available = new boolean[matching.size()];

+		Arrays.fill(available, 0, available.length, true);

+		for(int i = 0; i != matching.size(); i++) {

+			CSSStyleRule rule = matching.get(i);

+			if(rule != null && rule.getParentRule() != null) {

+				for(int j = 0; j != matching.size(); j++) {

+					if(matching.get(i) == rule.getParentRule()) {

+						available[i] = false;

+						break;

+					}

+				}

+			}

+		}

+		List<CSSStyleRule> result = new ArrayList<CSSStyleRule>();

+		for(int i = 0; i != matching.size(); i++) {

+			if(available[i]) {

+				result.add(matching.get(i));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * Loads the styling properties of a SVG element from the DOM

+	 *

+	 * @param element

+	 *        The SVG element

+	 * @return The styling properties in the DOM

+	 */

+	private Map<String, String> getBaseStyle(Element element) {

+		HashMap<String, String> result = new HashMap<String, String>();

+		String styleValue = element.getAttribute("style");

+		if(styleValue != null && !styleValue.isEmpty()) {

+			String[] props = styleValue.split(";");

+			for(int i = 0; i != props.length; i++) {

+				String[] temp = props[i].split(":");

+				if(temp.length == 2) {

+					result.put(temp[0], temp[1]);

+				} else if(temp.length > 2) {

+					StringBuilder builder = new StringBuilder(temp[1]);

+					for(int j = 2; j != temp.length; j++) {

+						builder.append(":");

+						builder.append(temp[j]);

+					}

+					result.put(temp[0], builder.toString());

+				}

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * Recursively applies the given CSS rule and its parent on the map of properties

+	 *

+	 * @param rule

+	 *        The CSS rule to apply

+	 * @param properties

+	 *        The map of CSS properties to build

+	 */

+	private void applyRuleTo(CSSStyleRule rule, Map<String, String> properties) {

+		if(rule.getParentRule() != null) {

+			applyRuleTo((CSSStyleRule)rule.getParentRule(), properties);

+		}

+		for(int i = 0; i != rule.getStyle().getLength(); i++) {

+			String name = rule.getStyle().item(i);

+			String value = rule.getStyle().getPropertyCSSValue(name).getCssText();

+			properties.put(name, value);

+		}

+	}

+}

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/command/ResetStyleCommand.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/command/ResetStyleCommand.java
new file mode 100644
index 00000000000..26d718edd61
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/command/ResetStyleCommand.java
@@ -0,0 +1,162 @@
+/*****************************************************************************

+ * Copyright (c) 2012 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.gmfdiag.css.command;

+

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.Set;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EStructuralFeature;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gmf.runtime.notation.Diagram;

+import org.eclipse.gmf.runtime.notation.NamedStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.Style;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.helper.NotationHelper;

+import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSAnnotations;

+import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSStyles;

+

+

+public class ResetStyleCommand extends RecordingCommand {

+

+	private static Set<String> papyrusStyleAnnotations = new HashSet<String>();

+

+	static {

+		papyrusStyleAnnotations.add(VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON);

+		papyrusStyleAnnotations.add(VisualInformationPapyrusConstants.SHADOWFIGURE);

+		papyrusStyleAnnotations.add(VisualInformationPapyrusConstants.QUALIFIED_NAME);

+	}

+

+	private Iterator<?> iterator;

+

+	public ResetStyleCommand(TransactionalEditingDomain domain, Iterator<?> iterator) {

+		super(domain);

+		this.iterator = iterator;

+	}

+

+	@Override

+	public void doExecute() {

+		while(iterator.hasNext()) {

+			Object selectedItem = iterator.next();

+			View view = NotationHelper.findView(selectedItem);

+			if(view == null) {

+				continue;

+			}

+

+			if(view instanceof Diagram) {

+				resetDiagram((Diagram)view);

+				break;

+			} else {

+				//Reset the style attribute to their default value

+				resetStyle(view, true);

+			}

+		}

+	}

+

+	private void resetDiagram(Diagram diagram) {

+		for(Object viewObject : diagram.getChildren()) {

+			if(viewObject instanceof View) {

+				resetStyle((View)viewObject, true);

+			}

+		}

+		for(Object lineObject : diagram.getEdges()) {

+			if(lineObject instanceof View) {

+				resetStyle((View)lineObject, true);

+			}

+		}

+	}

+

+	private void resetStyle(View view, boolean recursive) {

+		resetStyle(view);

+		if(recursive) {

+			for(Object childObject : view.getChildren()) {

+				if(childObject instanceof View) {

+					resetStyle((View)childObject, recursive);

+				}

+			}

+		}

+	}

+

+	private void resetStyle(View view) {

+

+		Iterator<?> styleIterator = view.getStyles().iterator();

+		while(styleIterator.hasNext()) {

+			Object styleObject = styleIterator.next();

+			if(styleObject instanceof NamedStyle) {

+				NamedStyle customStyle = (NamedStyle)styleObject;

+				if(!CSSStyles.RESERVED_KEYWORDS.contains(customStyle.getName())) {

+					styleIterator.remove();

+				}

+			} else if(styleObject instanceof Style) {

+				resetStyle((Style)styleObject);

+			}

+		}

+

+		if(view instanceof Style) {

+			resetStyle((Style)view);

+		}

+

+		//Remove the "forceValue" annotations

+		resetAnnotations(view);

+		//Remove the Papyrus Style EAnnotations

+		resetStyleAnnotations(view);

+

+		if(view.eClass() != NotationPackage.eINSTANCE.getDecorationNode()) {

+			//Reset the visibility (Except for labels which are not yet supported)

+			view.eUnset(NotationPackage.eINSTANCE.getView_Visible());

+		}

+	}

+

+	private void resetStyle(Style style) {

+		if(style instanceof NamedStyle) {

+			//Skip custom styles. 

+			//TODO: We should skip CSS Styles (CSSClass, CSSId, CSSStyle, DiagramStyleSheets),

+			//and reset custom GMF Styles (elementIcon, shadow, ...). 

+			//What about external custom styles (ie. unkwnown styles)?

+			//They should be stylable, but they might contain something we don't want to reset...

+			return;

+		}

+

+		for(EStructuralFeature feature : style.eClass().getEAllStructuralFeatures()) {

+			//Only edit Style features

+			if(NotationPackage.eINSTANCE.getStyle().isSuperTypeOf(feature.getEContainingClass())) {

+				//Reset the value to default

+				style.eUnset(feature);

+			}

+		}

+	}

+

+	//Resets the "Force Value" annotations (Tags to indicate that the user 

+	//has manually selected a value, which will override the CSS Style)

+	private void resetAnnotations(View view) {

+		Iterator<EAnnotation> iterator = view.getEAnnotations().iterator();

+		while(iterator.hasNext()) {

+			if(CSSAnnotations.CSS_FORCE_VALUE.equals(iterator.next().getSource())) {

+				iterator.remove();

+			}

+		}

+	}

+

+	//Resets the "Custom style" Annotations (elementIcon, shadow, qualifiedName)

+	private void resetStyleAnnotations(View view) {

+		Iterator<EAnnotation> iterator = view.getEAnnotations().iterator();

+		while(iterator.hasNext()) {

+			if(papyrusStyleAnnotations.contains(iterator.next().getSource())) {

+				iterator.remove();

+			}

+		}

+	}

+}

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/BaseCSSEngine.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/BaseCSSEngine.java
index 0c65a8180a9..afc1f8103a8 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/BaseCSSEngine.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/BaseCSSEngine.java
@@ -16,7 +16,10 @@ import java.net.URL;
 

 import org.eclipse.e4.ui.css.core.dom.IElementProvider;

 import org.eclipse.e4.ui.css.core.engine.CSSElementContext;

+import org.eclipse.papyrus.infra.gmfdiag.common.handler.IRefreshHandlerPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.handler.RefreshHandler;

 import org.eclipse.papyrus.infra.gmfdiag.css.Activator;

+import org.eclipse.ui.IEditorPart;

 import org.w3c.dom.Element;

 

 /**

@@ -30,9 +33,10 @@ import org.w3c.dom.Element;
  * @see DiagramCSSEngine

  */

 @SuppressWarnings("restriction")

-public class BaseCSSEngine extends ExtendedCSSEngineImpl {

+public class BaseCSSEngine extends ExtendedCSSEngineImpl implements IRefreshHandlerPart {

 

 	private BaseCSSEngine() {

+		RefreshHandler.register(this);

 		try {

 			styleSheetURLs.add(new URL("platform:/plugin/" + Activator.PLUGIN_ID + "/resources/base.css")); //$NON-NLS-1$ //$NON-NLS-2$

 		} catch (MalformedURLException ex) {

@@ -43,7 +47,15 @@ public class BaseCSSEngine extends ExtendedCSSEngineImpl {
 	/**

 	 * The Singleton instance of BaseCSSEngine

 	 */

-	public static ExtendedCSSEngine instance = new BaseCSSEngine();

+	public static final ExtendedCSSEngine INSTANCE = new BaseCSSEngine();

+

+	/**

+	 * @see org.eclipse.papyrus.infra.gmfdiag.common.handler.IRefreshHandlerPart#refresh(org.eclipse.ui.IEditorPart)

+	 */

+	public void refresh(IEditorPart editorPart) {

+		// Resets this engine, regardless of the current editor

+		this.reset();

+	}

 

 	//Unsupported operations. The BaseCSSEngine should never be used directly.

 

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/WorkspaceCSSEngine.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/WorkspaceCSSEngine.java
index 6ac7f335a79..f01dfca3c52 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/WorkspaceCSSEngine.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/engine/WorkspaceCSSEngine.java
@@ -34,7 +34,7 @@ import org.w3c.dom.Element;
 public class WorkspaceCSSEngine extends ExtendedCSSEngineImpl {

 

 	private WorkspaceCSSEngine() {

-		super(BaseCSSEngine.instance);

+		super(BaseCSSEngine.INSTANCE);

 	}

 

 	public static ExtendedCSSEngine instance = new WorkspaceCSSEngine();

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/handler/CSSRefreshHandler.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/handler/CSSRefreshHandler.java
deleted file mode 100644
index f538b278ad0..00000000000
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/handler/CSSRefreshHandler.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.css.handler;

-

-import org.eclipse.core.commands.ExecutionEvent;

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.papyrus.infra.gmfdiag.common.handler.RefreshHandler;

-import org.eclipse.papyrus.infra.gmfdiag.css.engine.BaseCSSEngine;

-

-/**

- * A Handler for refreshing a single Papyrus Diagram

- * It will refresh the CSS Stylesheets before refreshing the diagram.

- * 

- * @author Camille Letavernier

- * 

- */

-public class CSSRefreshHandler extends RefreshHandler {

-

-	@Override

-	public Object execute(ExecutionEvent event) throws ExecutionException {

-		BaseCSSEngine.instance.reset();

-		return super.execute(event);

-	}

-}

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/handler/ResetStyleHandler.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/handler/ResetStyleHandler.java
index f2dcb79960e..2cbfb1c521e 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/handler/ResetStyleHandler.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/handler/ResetStyleHandler.java
@@ -11,34 +11,15 @@
  *****************************************************************************/

 package org.eclipse.papyrus.infra.gmfdiag.css.handler;

 

-import java.util.HashSet;

-import java.util.Iterator;

-import java.util.Set;

-

 import org.eclipse.core.commands.AbstractHandler;

 import org.eclipse.core.commands.ExecutionEvent;

 import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.emf.common.command.Command;

-import org.eclipse.emf.ecore.EAnnotation;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.edit.domain.EditingDomain;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.NamedStyle;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.Style;

-import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.viewers.ISelection;

 import org.eclipse.jface.viewers.IStructuredSelection;

 import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;

 import org.eclipse.papyrus.infra.core.services.ServiceException;

 import org.eclipse.papyrus.infra.core.utils.ServiceUtilsForActionHandlers;

-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.gmfdiag.common.helper.NotationHelper;

-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSAnnotations;

-import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSStyles;

+import org.eclipse.papyrus.infra.gmfdiag.css.helper.ResetStyleHelper;

 

 

 /**

@@ -46,22 +27,18 @@ import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSStyles;
  * for a set of GMF Views.

  * 

  * @author Camille Letavernier

+ * 

+ * @deprecated Not used. Use ResetStyleHelper instead

  */

+@Deprecated

 public class ResetStyleHandler extends AbstractHandler {

 

-	private static Set<String> papyrusStyleAnnotations = new HashSet<String>();

-	static {

-		papyrusStyleAnnotations.add(VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON);

-		papyrusStyleAnnotations.add(VisualInformationPapyrusConstants.SHADOWFIGURE);

-		papyrusStyleAnnotations.add(VisualInformationPapyrusConstants.QUALIFIED_NAME);

-	}

-

 	public Object execute(ExecutionEvent event) throws ExecutionException {

 		ISelection selection;

 

 		try {

 			//FIXME: Use ServiceUtilsForHandlers

-			//FIXME: This method is sometimes called manually with a null ExecutionEvent. It won't work with ServiceUtilsForHandlers  

+			//FIXME: This method is sometimes called manually with a null ExecutionEvent. It won't work with ServiceUtilsForHandlers

 			IMultiDiagramEditor editor = ServiceUtilsForActionHandlers.getInstance().getServiceRegistry().getService(IMultiDiagramEditor.class);

 			selection = editor.getEditorSite().getSelectionProvider().getSelection();

 		} catch (ServiceException ex) {

@@ -78,156 +55,10 @@ public class ResetStyleHandler extends AbstractHandler {
 		}

 

 		IStructuredSelection sSelection = (IStructuredSelection)selection;

-		Iterator<?> iterator = sSelection.iterator();

-

-		TransactionalEditingDomain domain = null;

-		while(iterator.hasNext()) {

-			Object selectedItem = iterator.next();

-			View view = NotationHelper.findView(selectedItem);

-			if(view == null) {

-				continue;

-			}

-

-			EditingDomain editingDomain = EMFHelper.resolveEditingDomain(view);

-			if(editingDomain instanceof TransactionalEditingDomain) {

-				domain = (TransactionalEditingDomain)editingDomain;

-			}

-			break;

-		}

-

-		if(domain == null) {

-			return null;

-		}

 

-		Command command = new ResetStyleCommand(domain, sSelection);

-		domain.getCommandStack().execute(command);

+		ResetStyleHelper.resetStyle(sSelection);

 

 		return null;

 	}

 

-	private class ResetStyleCommand extends RecordingCommand {

-

-		private IStructuredSelection selection;

-

-		public ResetStyleCommand(TransactionalEditingDomain domain, IStructuredSelection selection) {

-			super(domain);

-			this.selection = selection;

-		}

-

-		@Override

-		public void doExecute() {

-			Iterator<?> iterator = selection.iterator();

-			while(iterator.hasNext()) {

-				Object selectedItem = iterator.next();

-				View view = NotationHelper.findView(selectedItem);

-				if(view == null) {

-					continue;

-				}

-

-				if(view instanceof Diagram) {

-					resetDiagram((Diagram)view);

-					break;

-				} else {

-					//Reset the style attribute to their default value

-					resetStyle(view, true);

-				}

-			}

-		}

-

-		private void resetDiagram(Diagram diagram) {

-			for(Object viewObject : diagram.getChildren()) {

-				if(viewObject instanceof View) {

-					resetStyle((View)viewObject, true);

-				}

-			}

-			for(Object lineObject : diagram.getEdges()) {

-				if(lineObject instanceof View) {

-					resetStyle((View)lineObject, true);

-				}

-			}

-		}

-

-		private void resetStyle(View view, boolean recursive) {

-			resetStyle(view);

-			if(recursive) {

-				for(Object childObject : view.getChildren()) {

-					if(childObject instanceof View) {

-						resetStyle((View)childObject, recursive);

-					}

-				}

-			}

-		}

-

-		private void resetStyle(View view) {

-

-			Iterator<?> styleIterator = view.getStyles().iterator();

-			while(styleIterator.hasNext()) {

-				Object styleObject = styleIterator.next();

-				if(styleObject instanceof NamedStyle) {

-					NamedStyle customStyle = (NamedStyle)styleObject;

-					if(!CSSStyles.RESERVED_KEYWORDS.contains(customStyle.getName())) {

-						styleIterator.remove();

-					}

-				} else if(styleObject instanceof Style) {

-					resetStyle((Style)styleObject);

-				}

-			}

-

-			if(view instanceof Style) {

-				resetStyle((Style)view);

-			}

-

-			//Remove the "forceValue" annotations

-			resetAnnotations(view);

-			//Remove the Papyrus Style EAnnotations

-			resetStyleAnnotations(view);

-

-			if(view.eClass() != NotationPackage.eINSTANCE.getDecorationNode()) {

-				//Reset the visibility (Except for labels which are not yet supported)

-				view.eUnset(NotationPackage.eINSTANCE.getView_Visible());

-			}

-		}

-

-		private void resetStyle(Style style) {

-			if(style instanceof NamedStyle) {

-				//Skip custom styles. 

-				//TODO: We should skip CSS Styles (CSSClass, CSSId, CSSStyle, DiagramStyleSheets),

-				//and reset custom GMF Styles (elementIcon, shadow, ...). 

-				//What about external custom styles (ie. unkwnown styles)?

-				//They should be stylable, but they might contain something we don't want to reset...

-				return;

-			}

-

-			for(EStructuralFeature feature : style.eClass().getEAllStructuralFeatures()) {

-				//Only edit Style features

-				if(NotationPackage.eINSTANCE.getStyle().isSuperTypeOf(feature.getEContainingClass())) {

-					//Reset the value to default

-					style.eUnset(feature);

-				}

-			}

-		}

-

-		//Resets the "Force Value" annotations (Tags to indicate that the user 

-		//has manually selected a value, which will override the CSS Style)

-		private void resetAnnotations(View view) {

-			Iterator<EAnnotation> iterator = view.getEAnnotations().iterator();

-			while(iterator.hasNext()) {

-				if(CSSAnnotations.CSS_FORCE_VALUE.equals(iterator.next().getSource())) {

-					iterator.remove();

-				}

-			}

-		}

-

-		//Resets the "Custom style" Annotations (elementIcon, shadow, qualifiedName)

-		private void resetStyleAnnotations(View view) {

-			Iterator<EAnnotation> iterator = view.getEAnnotations().iterator();

-			while(iterator.hasNext()) {

-				if(papyrusStyleAnnotations.contains(iterator.next().getSource())) {

-					iterator.remove();

-				}

-			}

-		}

-	}

-

-

 }

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/helper/CSSHelper.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/helper/CSSHelper.java
index e1e37b3d120..32f9cfbb29b 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/helper/CSSHelper.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/helper/CSSHelper.java
@@ -44,6 +44,9 @@ public class CSSHelper {
 	 * @see #installCSSSupport(ResourceSet)

 	 */

 	public static boolean isCSSSupported(ResourceSet resourceSet) {

+		if(resourceSet == null) {

+			return false;

+		}

 		return resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().get(NotationModel.NOTATION_FILE_EXTENSION) instanceof CSSNotationResourceFactory;

 	}

 }

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/helper/ResetStyleHelper.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/helper/ResetStyleHelper.java
new file mode 100644
index 00000000000..4f0634b12e9
--- /dev/null
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/src/org/eclipse/papyrus/infra/gmfdiag/css/helper/ResetStyleHelper.java
@@ -0,0 +1,67 @@
+package org.eclipse.papyrus.infra.gmfdiag.css.helper;

+

+import java.util.Collection;

+import java.util.Iterator;

+

+import org.eclipse.emf.common.command.Command;

+import org.eclipse.emf.edit.domain.EditingDomain;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.helper.NotationHelper;

+import org.eclipse.papyrus.infra.gmfdiag.css.command.ResetStyleCommand;

+

+

+public class ResetStyleHelper {

+

+	public static void resetStyle(IStructuredSelection selection) {

+		if(selection == null || selection.isEmpty()) {

+			return;

+		}

+

+		Iterator<?> selectionIterator = selection.iterator();

+

+		TransactionalEditingDomain editingDomain = getEditingDomain(selectionIterator);

+

+		resetStyle(editingDomain, selection.iterator());

+	}

+

+	public static void resetStyle(Collection<?> selection) {

+		if(selection == null) {

+			return;

+		}

+

+		TransactionalEditingDomain editingDomain = getEditingDomain(selection.iterator());

+

+		resetStyle(editingDomain, selection.iterator());

+	}

+

+	public static void resetStyle(TransactionalEditingDomain domain, Iterator<?> iterator) {

+		if(domain == null || iterator == null || !iterator.hasNext()) {

+			return;

+		}

+

+		Command command = new ResetStyleCommand(domain, iterator);

+		domain.getCommandStack().execute(command);

+	}

+

+	private static TransactionalEditingDomain getEditingDomain(Iterator<?> iterator) {

+		while(iterator.hasNext()) {

+			Object selectedItem = iterator.next();

+			View view = NotationHelper.findView(selectedItem);

+			if(view == null) {

+				continue;

+			}

+

+			EditingDomain editingDomain = EMFHelper.resolveEditingDomain(view);

+			if(editingDomain instanceof TransactionalEditingDomain) {

+				return (TransactionalEditingDomain)editingDomain;

+			}

+			break;

+		}

+

+		return null;

+	}

+

+}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF
index 725995de2b5..228de9530db 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF
@@ -6,6 +6,7 @@ Export-Package: org.eclipse.papyrus.infra.gmfdiag.common,
  org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom,

  org.eclipse.papyrus.infra.gmfdiag.common.editpart,

  org.eclipse.papyrus.infra.gmfdiag.common.editpolicies,

+ org.eclipse.papyrus.infra.gmfdiag.common.figure.edge,

  org.eclipse.papyrus.infra.gmfdiag.common.figure.node,

  org.eclipse.papyrus.infra.gmfdiag.common.handler,

  org.eclipse.papyrus.infra.gmfdiag.common.helper,

@@ -14,6 +15,7 @@ Export-Package: org.eclipse.papyrus.infra.gmfdiag.common,
  org.eclipse.papyrus.infra.gmfdiag.common.preferences,

  org.eclipse.papyrus.infra.gmfdiag.common.providers,

  org.eclipse.papyrus.infra.gmfdiag.common.service.shape,

+ org.eclipse.papyrus.infra.gmfdiag.common.snap,

  org.eclipse.papyrus.infra.gmfdiag.common.types,

  org.eclipse.papyrus.infra.gmfdiag.common.undocontext,

  org.eclipse.papyrus.infra.gmfdiag.common.utils

@@ -35,7 +37,7 @@ Require-Bundle: org.eclipse.emf.edit.ui;bundle-version="2.5.0",
  org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0",

  org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.2.1",

  org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.0",

- com.google.guava;bundle-version="10.0.1",

+ com.google.guava;bundle-version="11.0.0",

  org.eclipse.papyrus.infra.tools;bundle-version="1.0.0",

  org.eclipse.emf.databinding;bundle-version="1.3.0",

  org.eclipse.core.databinding.property;bundle-version="1.4.200",

@@ -48,7 +50,8 @@ Require-Bundle: org.eclipse.emf.edit.ui;bundle-version="2.5.0",
  org.apache.batik.dom.svg;bundle-version="[1.6.0,1.7.0)",

  org.apache.batik.dom;bundle-version="[1.6.0,1.7.0)",

  org.apache.batik.xml;bundle-version="[1.6.0,1.7.0)",

- org.eclipse.gmf.tooling.runtime

+ org.eclipse.gmf.tooling.runtime,

+ com.ibm.icu

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-ClassPath: .

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml
index af729be666e..412b9fe2c4f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml
@@ -169,4 +169,15 @@
          type="java.util.Collection">

    </propertyTester>
 </extension>

+<extension

+      point="org.eclipse.papyrus.infra.gmfdiag.common.shapeProvider">

+   <shapeProvider

+         class="org.eclipse.papyrus.infra.gmfdiag.common.providers.StyleBasedShapeProvider"

+         description="Provides shapes based on the applied styles."

+         id="org.eclipse.papyrus.infra.gmfdiag.common.providers.StyleBasedShapeProvider"

+         name="StyleBasedShapeProvider">

+      <Priority

+            name="Low"></Priority>

+   </shapeProvider>

+</extension>

 </plugin>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/GmfMultiDiagramDocumentProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/GmfMultiDiagramDocumentProvider.java
index d4a28218e96..2a5576437a9 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/GmfMultiDiagramDocumentProvider.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/GmfMultiDiagramDocumentProvider.java
@@ -836,15 +836,24 @@ public class GmfMultiDiagramDocumentProvider extends AbstractDocumentProvider im
 		private ResourceSetModificationListener myResourceSetListener;

 

 		/**

-		 * @generated

+		 * @generated not

 		 */

 		public ResourceSetInfo(IDiagramDocument document, IEditorInput editorInput) {

 			super(document);

 			myDocument = document;

 			myEditorInput = editorInput;

 			startResourceListening();

-			myResourceSetListener = new ResourceSetModificationListener(this);

-			getResourceSet().eAdapters().add(myResourceSetListener);

+			for (Adapter a : getResourceSet().eAdapters()){

+    		    if (a instanceof ResourceSetModificationListener){

+    		        myResourceSetListener = (ResourceSetModificationListener) a ;

+    		        break;

+    		    }

+    		}

+    		if (myResourceSetListener == null){

+    		    myResourceSetListener = new ResourceSetModificationListener();

+    		    getResourceSet().eAdapters().add(myResourceSetListener);

+    		}

+    		myResourceSetListener.addResourceSet(this);

 		}

 

 		/**

@@ -887,14 +896,17 @@ public class GmfMultiDiagramDocumentProvider extends AbstractDocumentProvider im
 		 */

 		public void dispose() {

 			stopResourceListening();

-			getResourceSet().eAdapters().remove(myResourceSetListener);

-			for(Iterator it = getResourceSet().getResources().iterator(); it.hasNext();) {

-				Resource resource = (Resource)it.next();

+			myResourceSetListener.removeResourceSet(this);

+			if(myResourceSetListener.isEmpty()){

+			    getResourceSet().eAdapters().remove(myResourceSetListener);

+			}

+//			for(Iterator it = getResourceSet().getResources().iterator(); it.hasNext();) {

+//				Resource resource = (Resource)it.next();

 				// Do not unload the resource because the DocumentProvider can be disposed while its

 				// Diagram node is

 				// kept for future re-openeing.

 				// resource.unload();

-			}

+//			}

 		}

 

 		/**

@@ -1054,29 +1066,41 @@ public class GmfMultiDiagramDocumentProvider extends AbstractDocumentProvider im
 	}

 

 	/**

-	 * @generated

+	 * @generated not

 	 */

 	private class ResourceSetModificationListener extends EContentAdapter {

 

 		/**

-		 * @generated

+		 * @generated 

 		 */

 		private NotificationFilter myModifiedFilter;

 

 		/**

-		 * @generated

+		 * @generated not

 		 */

-		private ResourceSetInfo myInfo;

-

+		private List<ResourceSetInfo> myInfos;

+		

 		/**

-		 * @generated

+		 * @generated not

 		 */

-		public ResourceSetModificationListener(ResourceSetInfo info) {

-			myInfo = info;

+		public ResourceSetModificationListener() {

+			myInfos = new ArrayList<GmfMultiDiagramDocumentProvider.ResourceSetInfo>();

 			myModifiedFilter = NotificationFilter.createEventTypeFilter(Notification.SET).or(

 					NotificationFilter.createEventTypeFilter(Notification.UNSET)).and(

 					NotificationFilter.createFeatureFilter(Resource.class, Resource.RESOURCE__IS_MODIFIED));

 		}

+		

+		public void addResourceSet(ResourceSetInfo info) {

+            myInfos.add(info);

+        }

+        

+        public boolean removeResourceSet(ResourceSetInfo info){

+            return myInfos.remove(info);

+        }

+        

+        public boolean isEmpty(){

+            return myInfos.isEmpty();

+        }

 

 		/**

 		 * @generated

@@ -1090,27 +1114,28 @@ public class GmfMultiDiagramDocumentProvider extends AbstractDocumentProvider im
 					Resource resource = (Resource)notification.getNotifier();

 					if(resource.isLoaded()) {

 						boolean modified = false;

-						for(Iterator it = myInfo.getResourceSet().getResources().iterator(); it.hasNext() && !modified;) {

+						for(Iterator it = resource.getResourceSet().getResources().iterator(); it.hasNext() && !modified;) {

 							Resource nextResource = (Resource)it.next();

 							if(nextResource.isLoaded()) {

 								modified = nextResource.isModified();

 							}

 						}

-						boolean dirtyStateChanged = false;

-						synchronized(myInfo) {

-							if(modified != myInfo.fCanBeSaved) {

-								myInfo.fCanBeSaved = modified;

-								dirtyStateChanged = true;

-							}

-							if(!resource.isModified()) {

-								myInfo.setSynchronized(resource);

+						for(ResourceSetInfo myInfo : myInfos){

+							boolean dirtyStateChanged = false;

+							synchronized(myInfo) {

+								if(modified != myInfo.fCanBeSaved) {

+									myInfo.fCanBeSaved = modified;

+									dirtyStateChanged = true;

+								}

+								if(!resource.isModified()) {

+									myInfo.setSynchronized(resource);

+								}

 							}

-						}

-						if(dirtyStateChanged) {

-							fireElementDirtyStateChanged(myInfo.getEditorInput(), modified);

-

-							if(!modified) {

-								myInfo.setModificationStamp(computeModificationStamp(myInfo));

+							if(dirtyStateChanged) {

+								fireElementDirtyStateChanged(myInfo.getEditorInput(), modified);

+								if(!modified) {

+									myInfo.setModificationStamp(computeModificationStamp(myInfo));

+								}

 							}

 						}

 					}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/SynchronizableGmfDiagramEditor.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/SynchronizableGmfDiagramEditor.java
index 9e8cd47e2d4..9f5c2f46113 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/SynchronizableGmfDiagramEditor.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/SynchronizableGmfDiagramEditor.java
@@ -21,15 +21,27 @@ import java.util.List;
 import org.eclipse.gef.DefaultEditDomain;

 import org.eclipse.gef.GraphicalViewer;

 import org.eclipse.gef.commands.CommandStack;

+import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.internal.properties.WorkspaceViewerProperties;

 import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditDomain;

+import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramGraphicalViewer;

 import org.eclipse.gmf.runtime.diagram.ui.resources.editor.parts.DiagramDocumentEditor;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;

 import org.eclipse.gmf.runtime.notation.Diagram;

+import org.eclipse.jface.preference.IPreferenceStore;

+import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.commands.CheckedDiagramCommandStack;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.CommandIds;

+import org.eclipse.papyrus.infra.tools.util.EclipseCommandUtils;

 import org.eclipse.papyrus.infra.widgets.util.IRevealSemanticElement;

 import org.eclipse.papyrus.infra.widgets.util.NavigationTarget;

+import org.eclipse.swt.graphics.RGB;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.ui.commands.ICommandService;

 

 /**

  * 

@@ -37,6 +49,8 @@ import org.eclipse.papyrus.infra.widgets.util.NavigationTarget;
  * 

  */

 

+@SuppressWarnings("restriction")

+//suppress the warning for WorkspaceViewerProperties

 public class SynchronizableGmfDiagramEditor extends DiagramDocumentEditor implements IRevealSemanticElement, NavigationTarget {

 

 	public SynchronizableGmfDiagramEditor(boolean hasFlyoutPalette) {

@@ -113,8 +127,11 @@ public class SynchronizableGmfDiagramEditor extends DiagramDocumentEditor implem
 		return false;

 	}

 

+	/**

+	 * {@inheritDoc}

+	 */

 	@Override

-	public Object getAdapter(Class type) {

+	public Object getAdapter(@SuppressWarnings("rawtypes") Class type) {

 		if(type == DiagramEditPart.class) {

 			return getDiagramEditPart();

 		}

@@ -149,4 +166,77 @@ public class SynchronizableGmfDiagramEditor extends DiagramDocumentEditor implem
 		DiagramEditDomain diagEditDomain = (DiagramEditDomain)getDiagramEditDomain();

 		diagEditDomain.setActionManager(createActionManager());

 	}

+

+	/**

+	 * {@inheritDoc}

+	 */

+	@Override

+	public void setFocus() {

+		super.setFocus();

+		updateToggleActionState();

+	}

+

+

+	/**

+	 * this command update the status of the toggle actions

+	 */

+	protected void updateToggleActionState() {

+		final ICommandService commandService = (ICommandService)PlatformUI.getWorkbench().getActiveWorkbenchWindow().getService(ICommandService.class);

+		if(commandService != null) {

+			final IPreferenceStore wsPreferenceStore = ((DiagramGraphicalViewer)getDiagramGraphicalViewer()).getWorkspaceViewerPreferenceStore();

+			org.eclipse.core.commands.Command command = commandService.getCommand(CommandIds.VIEW_GRID_COMMAND);

+			EclipseCommandUtils.updateToggleCommandState(command, wsPreferenceStore.getBoolean(WorkspaceViewerProperties.VIEWGRID));

+

+			command = commandService.getCommand(CommandIds.VIEW_RULER_COMMAND);

+			EclipseCommandUtils.updateToggleCommandState(command, wsPreferenceStore.getBoolean(WorkspaceViewerProperties.VIEWRULERS));

+

+			command = commandService.getCommand(CommandIds.VIEW_PAGE_BREAK_COMMAND);

+			EclipseCommandUtils.updateToggleCommandState(command, wsPreferenceStore.getBoolean(WorkspaceViewerProperties.VIEWPAGEBREAKS));

+

+			command = commandService.getCommand(CommandIds.SNAP_TO_GRID_COMMAND);

+			EclipseCommandUtils.updateToggleCommandState(command, wsPreferenceStore.getBoolean(WorkspaceViewerProperties.SNAPTOGRID));

+

+		} else {

+			throw new RuntimeException(String.format("The Eclipse service {0} has not been found", ICommandService.class)); //$NON-NLS-1$

+		}

+	}

+

+

+	@Override

+	protected void addDefaultPreferences() {

+		super.addDefaultPreferences();

+		final PreferencesHint preferencesHint = getPreferencesHint();

+		final IPreferenceStore globalPreferenceStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+		final String diagramType = getDiagram().getType();

+		//get the preferences

+		final boolean viewGrid = globalPreferenceStore.getBoolean(PreferencesConstantsHelper.getDiagramConstant(diagramType, PreferencesConstantsHelper.VIEW_GRID));

+		final boolean viewRuler = globalPreferenceStore.getBoolean(PreferencesConstantsHelper.getDiagramConstant(diagramType, PreferencesConstantsHelper.VIEW_RULER));

+		final int rulerUnit = globalPreferenceStore.getInt(PreferencesConstantsHelper.getDiagramConstant(diagramType, PreferencesConstantsHelper.RULER_UNITS));

+		final boolean snapToGrid = globalPreferenceStore.getBoolean(PreferencesConstantsHelper.getDiagramConstant(diagramType, PreferencesConstantsHelper.SNAP_TO_GRID));

+		final boolean snapToGeometry = globalPreferenceStore.getBoolean(PreferencesConstantsHelper.getDiagramConstant(diagramType, PreferencesConstantsHelper.SNAP_TO_GEOMETRY));

+		final RGB rgb = PreferenceConverter.getColor(globalPreferenceStore, PreferencesConstantsHelper.getDiagramConstant(diagramType, PreferencesConstantsHelper.GRID_LINE_COLOR));

+		final int gridLineColor = FigureUtilities.RGBToInteger(rgb);

+		final double gridSpacing = globalPreferenceStore.getDouble(PreferencesConstantsHelper.getDiagramConstant(diagramType, PreferencesConstantsHelper.GRID_SPACING));

+		final boolean gridOrder = globalPreferenceStore.getBoolean(PreferencesConstantsHelper.getDiagramConstant(diagramType, PreferencesConstantsHelper.GRID_ORDER));

+		final int gridLineStyle = globalPreferenceStore.getInt(PreferencesConstantsHelper.getDiagramConstant(diagramType, PreferencesConstantsHelper.GRID_LINE_STYLE));

+

+		//set the preferences

+		final IPreferenceStore localStore = getWorkspaceViewerPreferenceStore();

+		localStore.setValue(PreferencesConstantsHelper.VIEW_GRID_CONSTANT, viewGrid);

+		localStore.setValue(PreferencesConstantsHelper.VIEW_RULERS_CONSTANT, viewRuler);

+		localStore.setValue(PreferencesConstantsHelper.RULER_UNITS_CONSTANT, rulerUnit);

+		localStore.setValue(PreferencesConstantsHelper.SNAP_TO_GRID_CONSTANT, snapToGrid);

+		localStore.setValue(PreferencesConstantsHelper.SNAP_TO_GEOMETRY_CONSTANT, snapToGeometry);

+		localStore.setValue(PreferencesConstantsHelper.GRID_LINE_COLOR_CONSTANT, gridLineColor);

+		localStore.setValue(PreferencesConstantsHelper.GRID_SPACING_CONSTANT, gridSpacing);

+		

+		//to force refresh

+		localStore.setValue(PreferencesConstantsHelper.GRID_ORDER_CONSTANT, !gridOrder);

+		localStore.setValue(PreferencesConstantsHelper.GRID_ORDER_CONSTANT, gridOrder);

+		

+		localStore.setValue(PreferencesConstantsHelper.GRID_LINE_STYLE_CONSTANT, gridLineStyle);

+

+	}

+

+

 }

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ConnectionEditPart.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ConnectionEditPart.java
index 3c825d1c5a6..8c916fd9450 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ConnectionEditPart.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/ConnectionEditPart.java
@@ -11,8 +11,17 @@
  *****************************************************************************/

 package org.eclipse.papyrus.infra.gmfdiag.common.editpart;

 

+import org.eclipse.draw2d.Graphics;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPolicy;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart;

+import org.eclipse.gmf.runtime.notation.Connector;

+import org.eclipse.gmf.runtime.notation.IntValueStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.StringValueStyle;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusConnectionEndEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.edge.PapyrusEdgeFigure;

 

 

 /**

@@ -20,8 +29,124 @@ import org.eclipse.gmf.runtime.notation.View;
  */

 public abstract class ConnectionEditPart extends ConnectionNodeEditPart implements IPapyrusEditPart {

 

+	/**

+	 * CSS property for the line style

+	 */

+	protected static final String LINE_STYLE = "lineStyle";

+

+	/**

+	 * CSS property for the line dashes' length

+	 */

+	protected static final String LINE_DASH_LENGTH = "lineDashLength";

+

+	/**

+	 * CSS property for the length between line dashes

+	 */

+	protected static final String LINE_DASH_GAP = "lineDashGap";

+

 	public ConnectionEditPart(View view) {

 		super(view);

 	}

 

+	/**

+	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart#refresh()

+	 */

+	@Override

+	public void refresh() {

+		super.refresh();

+		IFigure figure = this.getFigure();

+		Object model = this.getModel();

+		if (figure instanceof PapyrusEdgeFigure && model instanceof Connector) {

+			Connector connector = (Connector) model;

+			PapyrusEdgeFigure edge = (PapyrusEdgeFigure) figure;

+			String lineStyle = extract((StringValueStyle) connector.getNamedStyle(NotationPackage.eINSTANCE.getStringValueStyle(), LINE_STYLE));

+			int lineDashLength = extract((IntValueStyle) connector.getNamedStyle(NotationPackage.eINSTANCE.getIntValueStyle(), LINE_DASH_LENGTH));

+			int lineDashGap = extract((IntValueStyle) connector.getNamedStyle(NotationPackage.eINSTANCE.getIntValueStyle(), LINE_DASH_GAP));

+			if (lineStyle != null) {

+				setupLineStyle(edge, lineStyle, connector.getLineWidth(), lineDashLength, lineDashGap);

+			} else {

+				edge.resetStyle();

+			}

+		}

+	}

+

+	/**

+	 * Extracts the primitive value from the given style

+	 * 

+	 * @param style

+	 *            The style

+	 * @return The primitive value

+	 */

+	private String extract(StringValueStyle style) {

+		if (style == null || style.getStringValue() == null || style.getStringValue().isEmpty()) {

+			return null;

+		}

+		return style.getStringValue();

+	}

+

+	/**

+	 * Extracts the primitive value from the given style

+	 * 

+	 * @param style

+	 *            The style

+	 * @return The primitive value

+	 */

+	private int extract(IntValueStyle style) {

+		if (style == null) {

+			return 0;

+		}

+		return style.getIntValue();

+	}

+

+	/**

+	 * Setups the line style of the edge according to the given CSS style

+	 * 

+	 * @param edge

+	 *            The shape to setup

+	 * @param style

+	 *            The CSS style

+	 * @param originalWidth

+	 *            Original width of the connector

+	 * @param lineDashLength

+	 *            Length of the dashes

+	 * @param lineDashGap

+	 *            Length of the gap between dashes

+	 */

+	private void setupLineStyle(PapyrusEdgeFigure edge, String style, int originalWidth, int lineDashLength, int lineDashGap) {

+		if ("none".equals(style)) {

+			edge.resetStyle();

+		} else {

+			if ("hidden".equals(style)) {

+				edge.setLineStyle(Graphics.LINE_SOLID);

+				edge.setLineWidth(0);

+				edge.setVisible(false);

+			} else if ("dotted".equals(style)) {

+				edge.setLineStyle(Graphics.LINE_DOT);

+				edge.setLineWidth(originalWidth);

+			} else if ("dashed".equals(style)) {

+				edge.setLineStyle(Graphics.LINE_CUSTOM);

+				edge.setLineWidth(originalWidth);

+				edge.setLineDash(new int[] { lineDashLength, lineDashGap });

+			} else if ("solid".equals(style)) {

+				edge.setLineStyle(Graphics.LINE_SOLID);

+				edge.setLineWidth(originalWidth);

+			} else if ("double".equals(style)) {

+				edge.setLineWidth(originalWidth * 2);

+			}

+		}

+	}

+

+

+

+	/**

+	 * 

+	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart#createDefaultEditPolicies()

+	 * 

+	 */

+	@Override

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.CONNECTION_ENDPOINTS_ROLE, new PapyrusConnectionEndEditPolicy());

+	}

+

 }

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/NodeEditPart.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/NodeEditPart.java
index 17efad531d0..2c908630217 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/NodeEditPart.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/NodeEditPart.java
@@ -19,6 +19,9 @@ import java.util.List;
 import org.eclipse.draw2d.IFigure;

 import org.eclipse.draw2d.StackLayout;

 import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.DragTracker;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractBorderedShapeEditPart;

 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

 import org.eclipse.gmf.runtime.notation.BooleanValueStyle;

@@ -29,9 +32,11 @@ import org.eclipse.gmf.runtime.notation.datatype.GradientData;
 import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.BorderDisplayEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.FollowSVGSymbolEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusResizableShapeEditPolicy;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure;

 import org.eclipse.papyrus.infra.gmfdiag.common.service.shape.ShapeService;

+import org.eclipse.papyrus.infra.gmfdiag.common.snap.PapyrusDragEditPartsTrackerEx;

 import org.eclipse.swt.graphics.Color;

 import org.w3c.dom.svg.SVGDocument;

 

@@ -283,4 +288,29 @@ public abstract class NodeEditPart extends AbstractBorderedShapeEditPart impleme
 			return super.getContentPane();

 		}

 	}

+

+	/**

+	 * 

+	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#getDragTracker(org.eclipse.gef.Request)

+	 * 

+	 * @param request

+	 * @return

+	 */

+	@Override

+	public DragTracker getDragTracker(final Request request) {

+		return new PapyrusDragEditPartsTrackerEx(this, true, false, false);

+	}

+	

+	/**

+	 * TODO : remove this override when the bug will be fixed

+	 * See Bug 424943 ResizableEditPolicy#getResizeCommand duplicates request ignoring some request values

+	 * 

+	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeEditPart#getPrimaryDragEditPolicy()

+	 * 

+	 * @return

+	 */

+	public EditPolicy getPrimaryDragEditPolicy() {

+		EditPolicy policy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		return policy != null ? policy : new PapyrusResizableShapeEditPolicy();

+	}

 }

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusDiagramEditPart.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusDiagramEditPart.java
index 663728f869c..e7e3d3fb811 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusDiagramEditPart.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/PapyrusDiagramEditPart.java
@@ -14,11 +14,12 @@
 package org.eclipse.papyrus.infra.gmfdiag.common.editpart;

 

 import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.XYLayoutWithConstrainedResizedEditPolicy;

 

-public class PapyrusDiagramEditPart

-		extends DiagramEditPart {

+public class PapyrusDiagramEditPart extends DiagramEditPart {

 

 	private IConflictingEditPartFilter conflictFilter = IConflictingEditPartFilter.DEFAULT;

 

@@ -28,7 +29,7 @@ public class PapyrusDiagramEditPart
 

 	@Override

 	protected void removeChild(EditPart child) {

-		if (!getConflictingEditPartFilter().isConflicting(child)) {

+		if(!getConflictingEditPartFilter().isConflicting(child)) {

 			super.removeChild(child);

 		}

 	}

@@ -38,8 +39,16 @@ public class PapyrusDiagramEditPart
 	}

 

 	public void setConflictingEditPartFilter(IConflictingEditPartFilter filter) {

-		this.conflictFilter = (filter == null)

-			? IConflictingEditPartFilter.DEFAULT

-			: filter;

+		this.conflictFilter = (filter == null) ? IConflictingEditPartFilter.DEFAULT : filter;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart#createDefaultEditPolicies()

+	 * 

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, new XYLayoutWithConstrainedResizedEditPolicy());

 	}

 }

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/XYLayoutShapeCompartmentEditPart.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/XYLayoutShapeCompartmentEditPart.java
new file mode 100644
index 00000000000..f1b3c4fa79d
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpart/XYLayoutShapeCompartmentEditPart.java
@@ -0,0 +1,50 @@
+/*****************************************************************************

+ * 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:

+ *		

+ *		 Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.gmfdiag.common.editpart;

+

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.XYLayoutWithConstrainedResizedEditPolicy;

+

+/**

+ * 

+ * This compartment edit part must be used for CompartmentEditPart with XYlayoutEditPolicy

+ * This class replace default editpolicy by ours 424942: [Diagram] Papyrus shall ease resizing of model elements owning children

+ * 

+ */

+public class XYLayoutShapeCompartmentEditPart extends ShapeCompartmentEditPart {

+

+

+	/**

+	 * 

+	 * Constructor.

+	 * 

+	 * @param view

+	 */

+	public XYLayoutShapeCompartmentEditPart(final View view) {

+		super(view);

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart#createDefaultEditPolicies()

+	 * 

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, new XYLayoutWithConstrainedResizedEditPolicy());

+	}

+

+}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/PapyrusConnectionEndEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/PapyrusConnectionEndEditPolicy.java
new file mode 100644
index 00000000000..a80954e1f03
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/PapyrusConnectionEndEditPolicy.java
@@ -0,0 +1,53 @@
+/*****************************************************************************

+ * 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:

+ *		

+ *		CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.gmfdiag.common.editpolicies;

+

+import java.util.ArrayList;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.gef.ConnectionEditPart;

+import org.eclipse.gef.editpolicies.ConnectionEndpointEditPolicy;

+import org.eclipse.papyrus.infra.gmfdiag.common.snap.PapyrusConnectionEndpointHandle;

+

+

+/**

+ * 

+ * This class allows to provides our own EndPointHandle to provide our own DragTracker

+ * 

+ */

+public class PapyrusConnectionEndEditPolicy extends ConnectionEndpointEditPolicy {

+

+	/**

+	 * 

+	 * Constructor.

+	 * 

+	 */

+	public PapyrusConnectionEndEditPolicy() {

+		super();

+	}

+

+	/**

+	 * @see org.eclipse.gef.editpolicies.SelectionHandlesEditPolicy#createSelectionHandles()

+	 */

+	@Override

+	protected List<?> createSelectionHandles() {

+		List<PapyrusConnectionEndpointHandle> list = new ArrayList<PapyrusConnectionEndpointHandle>();

+		list.add(new PapyrusConnectionEndpointHandle((ConnectionEditPart)getHost(), ConnectionLocator.SOURCE));

+		list.add(new PapyrusConnectionEndpointHandle((ConnectionEditPart)getHost(), ConnectionLocator.TARGET));

+		return list;

+	}

+

+

+}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/PapyrusResizableShapeEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/PapyrusResizableShapeEditPolicy.java
new file mode 100644
index 00000000000..74c05d41c4d
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/PapyrusResizableShapeEditPolicy.java
@@ -0,0 +1,53 @@
+/*****************************************************************************

+ * 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:

+ *		

+ *		CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.gmfdiag.common.editpolicies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.requests.ChangeBoundsRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableShapeEditPolicy;

+

+/**

+ * 

+ * See Bug 424943 ResizableEditPolicy#getResizeCommand duplicates request ignoring some request values

+ * TODO : remove this class when the bug will be fixed

+ */

+public class PapyrusResizableShapeEditPolicy extends ResizableShapeEditPolicy {

+

+	/**

+	 * Returns the command contribution for the given resize request. By

+	 * default, the request is re-dispatched to the host's parent as a {@link org.eclipse.gef.RequestConstants#REQ_RESIZE_CHILDREN}. The

+	 * parent's edit policies determine how to perform the resize based on the

+	 * layout manager in use.

+	 * 

+	 * @param request

+	 *        the resize request

+	 * @return the command contribution obtained from the parent

+	 */

+	protected Command getResizeCommand(ChangeBoundsRequest request) {

+		ChangeBoundsRequest req = new ChangeBoundsRequest(REQ_RESIZE_CHILDREN);

+		req.setCenteredResize(request.isCenteredResize());

+		req.setConstrainedMove(request.isConstrainedMove());

+		req.setConstrainedResize(request.isConstrainedResize());

+		req.setSnapToEnabled(request.isSnapToEnabled());

+		req.setEditParts(getHost());

+

+		req.setMoveDelta(request.getMoveDelta());

+		req.setSizeDelta(request.getSizeDelta());

+		req.setLocation(request.getLocation());

+		req.setExtendedData(request.getExtendedData());

+		req.setResizeDirection(request.getResizeDirection());

+		return getHost().getParent().getCommand(req);

+	}

+

+}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/XYLayoutWithConstrainedResizedEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/XYLayoutWithConstrainedResizedEditPolicy.java
new file mode 100644
index 00000000000..464d745788e
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/editpolicies/XYLayoutWithConstrainedResizedEditPolicy.java
@@ -0,0 +1,78 @@
+/*****************************************************************************

+ * 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:

+ *		

+ *		 Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.gmfdiag.common.editpolicies;

+

+import java.util.List;

+

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.NodeEditPart;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.CompoundCommand;

+import org.eclipse.gef.requests.ChangeBoundsRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.XYLayoutEditPolicy;

+

+/**

+ * 

+ * This edit policy allows to resize parent from NORTH, NORTH_WEST or WEST without moving its children

+ * 

+ */

+public class XYLayoutWithConstrainedResizedEditPolicy extends XYLayoutEditPolicy {

+

+	/**

+	 * Returns the <code>Command</code> to resize a group of children.

+	 * 

+	 * @param request

+	 *        the ChangeBoundsRequest

+	 * @return the Command

+	 */

+	protected Command getChangeConstraintCommand(ChangeBoundsRequest request) {

+		final CompoundCommand resize = new CompoundCommand("Resize Command");//$NON-NLS-1$

+		GraphicalEditPart child;

+		final List<?> children = request.getEditParts();

+		final Point move = request.getMoveDelta();

+		final int direction = request.getResizeDirection();

+		boolean forceLocation = request.isConstrainedResize() && (direction == PositionConstants.WEST || direction == PositionConstants.NORTH || direction == PositionConstants.NORTH_WEST);

+		for(int i = 0; i < children.size(); i++) {

+			child = (GraphicalEditPart)children.get(i);

+			resize.add(createChangeConstraintCommand(request, child, translateToModelConstraint(getConstraintFor(request, child))));

+			if(forceLocation) {

+				for(Object object : child.getChildren()) {

+					if(object instanceof CompartmentEditPart) {

+						final EditPolicy layoutPolicy = ((CompartmentEditPart)object).getEditPolicy(EditPolicy.LAYOUT_ROLE);

+						if(layoutPolicy instanceof org.eclipse.gef.editpolicies.XYLayoutEditPolicy) {

+							for(final Object current : ((CompartmentEditPart)object).getChildren()) {

+								if(current instanceof NodeEditPart) {

+									final ChangeBoundsRequest forceLocationRequest = new ChangeBoundsRequest();

+									forceLocationRequest.setType("move");//$NON-NLS-1$

+									forceLocationRequest.setMoveDelta(move.getNegated());

+									forceLocationRequest.setEditParts((EditPart)current);

+									final Command tmp = ((NodeEditPart)current).getCommand(forceLocationRequest);

+									if(tmp != null) {

+										resize.add(tmp);

+									}

+								}

+							}

+						}

+					}

+				}

+			}

+		}

+		return resize.unwrap();

+	}

+}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/edge/PapyrusEdgeFigure.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/edge/PapyrusEdgeFigure.java
new file mode 100644
index 00000000000..011a7184d54
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/edge/PapyrusEdgeFigure.java
@@ -0,0 +1,359 @@
+/*****************************************************************************

+ * 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.infra.gmfdiag.common.figure.edge;

+

+import java.util.Collection;

+import java.util.HashMap;

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.List;

+import java.util.Map;

+import java.util.Set;

+

+import org.eclipse.draw2d.Connection;

+import org.eclipse.draw2d.Graphics;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.PointList;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.ConnectionEditPart;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.GraphicalViewer;

+import org.eclipse.gef.editparts.AbstractGraphicalEditPart;

+import org.eclipse.gmf.runtime.common.ui.services.editor.EditorService;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;

+import org.eclipse.papyrus.infra.core.editor.CoreMultiDiagramEditor;

+import org.eclipse.papyrus.infra.tools.util.EditorHelper;

+import org.eclipse.ui.IEditorPart;

+import org.eclipse.ui.IWorkbench;

+import org.eclipse.ui.IWorkbenchWindow;

+import org.eclipse.ui.PlatformUI;

+

+/**

+ * 

+ * This class should be the super class of all Papyrus figure.

+ * Its provides the way to draw common bendpoints bigger than others

+ * 

+ */

+public abstract class PapyrusEdgeFigure extends PolylineConnectionEx {

+

+	/**

+	 * Diameter to use for the bendpoints

+	 */

+	private int bendpointDiameter;

+

+	/**

+	 * 

+	 * Constructor.

+	 * 

+	 */

+	public PapyrusEdgeFigure() {

+		super();

+		setBendPointDiameter(7);

+	}

+

+	/**

+	 * We override this method to circle on bendpoints when a segment of the link is shared with another link of the same kind

+	 * 

+	 * @see org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx#outlineShape(org.eclipse.draw2d.Graphics)

+	 * 

+	 * @param g

+	 */

+	protected void outlineShape(Graphics g) {

+		super.outlineShape(g);

+		drawConnectionPoint(g);

+	}

+

+	/**

+	 * Resets the style of this figure to its default implementation

+	 */

+	public void resetStyle() {

+

+	}

+

+	/**

+	 * 

+	 * @param g

+	 * 

+	 */

+	@SuppressWarnings("unchecked")

+	protected void drawConnectionPoint(final Graphics g) {

+		final PointList bendPoints = getPoints();

+		if(getDrawBendpointPreferenceValue() && bendPoints.size() > 2 && getBendPointDiameter() > 1) {

+			final Map<?, ?> visualPartMap = getVisualPartMap(this);

+			if(visualPartMap != null) {

+				final EditPart currentEditPart = (EditPart)visualPartMap.get(this);

+				EClass eClass = null;

+				if(currentEditPart instanceof IGraphicalEditPart) {

+					final EObject el = ((IGraphicalEditPart)currentEditPart).resolveSemanticElement();

+					if(el != null) {

+						eClass = el.eClass();

+					}

+				}

+				if(currentEditPart instanceof ConnectionEditPart && eClass != null) {

+					final EditPart sourceEP = ((ConnectionEditPart)currentEditPart).getSource();

+					final EditPart targetEP = ((ConnectionEditPart)currentEditPart).getTarget();

+					final Set<Object> allConnectionsEP = new HashSet<Object>();

+					//1. get all potential editpart connections

+					if(sourceEP instanceof AbstractGraphicalEditPart && targetEP instanceof AbstractGraphicalEditPart) {

+						allConnectionsEP.addAll(((AbstractGraphicalEditPart)sourceEP).getSourceConnections());

+						allConnectionsEP.addAll(((AbstractGraphicalEditPart)targetEP).getSourceConnections());

+						allConnectionsEP.addAll(((AbstractGraphicalEditPart)sourceEP).getTargetConnections());

+						allConnectionsEP.addAll(((AbstractGraphicalEditPart)targetEP).getTargetConnections());

+						allConnectionsEP.remove(currentEditPart);

+					}

+

+					//2. get the figure for these connections

+					final Set<Connection> allConnections = new HashSet<Connection>();

+					if(allConnectionsEP.size() > 0) {

+						for(final Object current : allConnectionsEP) {

+							//the editpart be instance of the same class

+							if(current.getClass().isInstance(currentEditPart) && currentEditPart.getClass().isInstance(current) && current instanceof IGraphicalEditPart) {

+								final EObject resolvedElement = ((IGraphicalEditPart)current).resolveSemanticElement();

+								if(resolvedElement != null && eClass != null && resolvedElement.eClass() != eClass) {

+									continue;//we draw ben point only for elements which have the same eClass, when this eClass is not null

+								}

+								final IFigure currentFig = ((IGraphicalEditPart)current).getFigure();

+								if(currentFig instanceof Connection) {

+									allConnections.add((Connection)currentFig);

+								}

+							}

+						}

+					}

+

+					//3. find and draw big bendpoints

+					if(allConnections.size() > 0) {

+						final Map<Point, Boolean> visibility = new HashMap<Point, Boolean>();

+						visibility.put(bendPoints.getFirstPoint(), Boolean.FALSE);

+						visibility.put(bendPoints.getLastPoint(), Boolean.FALSE);

+						for(int i = 1; i < bendPoints.size() - 1; i++) {

+							final Point currentPt = bendPoints.getPoint(i);

+							visibility.put(currentPt, isACommonBendpoint(this, i, allConnections));

+						}

+

+						//clear the map : remove all unnecessary true value

+						//01110 -> 01010

+						int indexFirstOne = -1;

+						for(int i = 0; i < bendPoints.size(); i++) {

+							boolean first = visibility.get(bendPoints.getPoint(i));

+							if(first && indexFirstOne < 0) {

+								indexFirstOne = i;

+							}

+							if((!first) && indexFirstOne >= 0) {

+								for(int j = (indexFirstOne + 1); j < i - 1; j++) {

+									visibility.put(bendPoints.getPoint(j), false);

+								}

+								indexFirstOne = -1;

+							}

+						}

+

+

+						//initialize the graphics

+						if(getBackgroundColor() != null) {

+							g.setForegroundColor(getBackgroundColor());

+						}

+						if(getForegroundColor() != null) {

+							g.setBackgroundColor(getForegroundColor());

+						}

+

+						//paint the connection points

+						//we don't allow to draw connection point on the start AND on the end of the figure (even if this case is possible in case of 2 full lines fully superimposed

+						final int diameter = getBendPointDiameter();

+						for(int i = 1; i < bendPoints.size() - 1; i++) {

+							final Point currentPt = bendPoints.getPoint(i);

+							if(visibility.get(currentPt)) {

+								g.fillOval(currentPt.x - ((diameter - 1) / 2), currentPt.y - ((diameter - 1) / 2), diameter, diameter);

+							}

+						}

+						//reset the graphics

+						if(getBackgroundColor() != null) {

+							g.setBackgroundColor(getBackgroundColor());

+						}

+						if(getForegroundColor() != null) {

+							g.setForegroundColor(getForegroundColor());

+						}

+					}

+				}

+

+			}

+		}

+

+	}

+

+	/**

+	 * 

+	 * @return

+	 *         <code>true</code> according to the preference store

+	 */

+	protected boolean getDrawBendpointPreferenceValue() {

+		return false;

+	}

+

+	/**

+	 * 

+	 * @param figure

+	 *        a figure

+	 * @return

+	 *         the visual part map for this figure or <code>null</code> if not found

+	 */

+	protected Map<?, ?> getVisualPartMap(final IFigure figure) {

+		IEditorPart part = EditorHelper.getCurrentEditor();

+		if(part instanceof CoreMultiDiagramEditor) {

+			final List<IEditorPart> visibleEditors = ((CoreMultiDiagramEditor)part).getISashWindowsContainer().getVisibleIEditorParts();

+			for(final IEditorPart current : visibleEditors) {

+				final GraphicalViewer viewer = (GraphicalViewer)current.getAdapter(GraphicalViewer.class);

+				final Map<?, ?> visualPartMap = viewer.getVisualPartMap();

+				if(visualPartMap.containsKey(figure)) {

+					return visualPartMap;

+				}

+			}

+		} else {

+			//used when papyrus has been "unsashified"

+			final IWorkbench workbench = PlatformUI.getWorkbench();

+			if(workbench != null) {

+				final IWorkbenchWindow window = workbench.getActiveWorkbenchWindow();

+				if(window != null) {

+					final List<?> editors = EditorService.getInstance().getRegisteredEditorParts();

+					for(Iterator<?> j = editors.iterator(); j.hasNext();) {

+						final IEditorPart editor = (IEditorPart)j.next();

+						if(editor.getEditorSite().getWorkbenchWindow() == window) {

+							if(editor instanceof IDiagramWorkbenchPart) {

+								final IDiagramWorkbenchPart de = (IDiagramWorkbenchPart)editor;

+								final GraphicalViewer viewer = de.getDiagramGraphicalViewer();

+								final Map<?, ?> visualPartMap = viewer.getVisualPartMap();

+								if(visualPartMap.containsKey(figure)) {

+									return visualPartMap;

+								}

+							}

+						}

+					}

+				}

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * 

+	 * @param figure

+	 *        the figure owning this point

+	 * @param indexOfTheTestedPoint

+	 * @param connections

+	 *        the collection of others connections which could share the bendpoint

+	 * @return

+	 *         true if the tested point is common with others connections

+	 */

+	public boolean isACommonBendpoint(final Connection figure, final int indexOfTheTestedPoint, final Collection<Connection> connections) {

+		final PointList list = ((Connection)figure).getPoints();

+		final Point thePoint = list.getPoint(indexOfTheTestedPoint);

+		//we need to verify if this point is a common bendpoint with another one

+

+		for(final Connection current : connections) {

+			//to be a common bendpoints, the point AND (the point Before it OR the point After it) MUST be on the same segment

+			final PointList localList = ((Connection)current).getPoints();

+			for(int i = 0; i < localList.size() - 1; i++) {

+				final Point tmp1 = localList.getPoint(i);

+				final Point tmp2 = localList.getPoint(i + 1);

+

+				boolean isOnSegment = isOnSegment(thePoint, tmp1, tmp2);

+				if(isOnSegment) {

+					boolean isOnSegment2 = isOnSegment(list.getPoint(indexOfTheTestedPoint + 1), tmp1, tmp2);

+					if(isOnSegment2) {

+						return true;

+					}

+

+					isOnSegment2 = isOnSegment(list.getPoint(indexOfTheTestedPoint - 1), tmp1, tmp2);

+					if(isOnSegment2) {

+						return true;

+					}

+				}

+			}

+		}

+		return false;

+	}

+

+

+	/**

+	 * 

+	 * @param pt

+	 *        a point to test

+	 * @param pt1

+	 *        the first point of a segment

+	 * @param pt2

+	 *        the second point of a segment

+	 * @return

+	 *         true if the point pt is on the segment [pt1, pt2]

+	 */

+	public static final boolean isOnSegment(final Point pt, final Point pt1, final Point pt2) {

+		final Point first;

+		final Point second;

+		if(pt1.x < pt2.x) {

+			first = pt1;

+			second = pt2;

+		} else {

+			first = pt2;

+			second = pt1;

+		}

+		if(pt.x >= first.x && pt.x <= second.x) {

+			if((pt.y <= first.y && pt.y >= second.y) || (pt.y >= first.y && pt.y <= second.y)) {

+				//y = ax+b;

+				//we determine a;

+				double firstX = first.preciseX();

+				double secondX = second.preciseX();

+				double firstY = first.preciseY();

+				double secondY = second.preciseY();

+				if(secondX == firstX) {

+					return pt.preciseX() == secondX;

+				}

+				double a = (secondY - firstY) / (secondX - firstX);

+

+				//we determine b;

+				double b = firstY - a * firstX;

+

+				return pt.preciseY() == a * pt.preciseX() + b;

+			}

+		}

+		return false;

+	}

+

+

+	/**

+	 * Calculate the best diameter and set the diameter value

+	 * 

+	 * @param diameter

+	 *        the diameter of the bendpoints (if diameter<=1, we set the diameter to 0)

+	 */

+	public void setBendPointDiameter(final int diameter) {

+		if(diameter <= 1) {

+			this.bendpointDiameter = 0;

+		}

+		if(diameter % 2 == 1) {

+			this.bendpointDiameter = diameter;

+		} else {

+			setBendPointDiameter(diameter + 1);

+		}

+	}

+

+	/**

+	 * 

+	 * @return

+	 *         the bendpoint diameter

+	 */

+	protected final int getBendPointDiameter() {

+		return this.bendpointDiameter;

+	}

+}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/SVGNodePlateFigure.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/SVGNodePlateFigure.java
index 8f5725d5e72..203c45ee77e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/SVGNodePlateFigure.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/figure/node/SVGNodePlateFigure.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * 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

@@ -9,15 +9,20 @@
  *

  * Contributors:

  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

+ *  Laurent Wouters (CEA LIST) laurent.wouters@cea.fr - Refactoring, cleanup, added support for PapyrusLabel element

  *****************************************************************************/

 package org.eclipse.papyrus.infra.gmfdiag.common.figure.node;

 

 import java.util.ArrayList;

+import java.util.Collection;

+import java.util.List;

 

 import org.apache.batik.dom.svg.AbstractSVGPathSegList.SVGPathSegMovetoLinetoItem;

 import org.eclipse.draw2d.IFigure;

 import org.eclipse.draw2d.geometry.PointList;

+import org.eclipse.draw2d.geometry.PrecisionDimension;

 import org.eclipse.draw2d.geometry.PrecisionPoint;

+import org.eclipse.draw2d.geometry.PrecisionRectangle;

 import org.eclipse.draw2d.geometry.Rectangle;

 import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

 import org.w3c.dom.Element;

@@ -27,46 +32,244 @@ import org.w3c.dom.svg.SVGLength;
 import org.w3c.dom.svg.SVGPathElement;

 import org.w3c.dom.svg.SVGPathSeg;

 import org.w3c.dom.svg.SVGPathSegList;

+import org.w3c.dom.svg.SVGRectElement;

 import org.w3c.dom.svg.SVGSVGElement;

 

 /**

- * this figure is used to make links following SVG shape

- * 

- * 

+ * This figure is used to make links following SVG shape

  */

 public class SVGNodePlateFigure extends DefaultSizeNodeFigure {

 

-	protected SVGPathSegList pathSegList = null;

+	/**

+	 * Represents a transformation from SVG to Draw2D coordinates.

+	 * This class replaces the Draw2D Transform class which can only operate over Draw2D points.

+	 * This class always defines a transformation that is composed of a scaling operation followed by a translation operation.

+	 *

+	 * @author Laurent Wouters

+	 */

+	private static class SvgToDraw2DTransform {

+

+		private double scaleX;

+

+		private double scaleY;

+

+		private double translationX;

+

+		private double translationY;

+

+		/**

+		 * Initializes this transformation

+		 *

+		 * @param scaleX

+		 *        Scale on the X axis

+		 * @param scaleY

+		 *        Scale on the Y axis

+		 * @param translationX

+		 *        Translation on the X axis

+		 * @param translationY

+		 *        Translation on the Y axis

+		 */

+		public SvgToDraw2DTransform(double scaleX, double scaleY, double translationX, double translationY) {

+			this.scaleX = scaleX;

+			this.scaleY = scaleY;

+			this.translationX = translationX;

+			this.translationY = translationY;

+		}

+

+		/**

+		 * Transforms the given points in the target frame of reference

+		 *

+		 * @param point

+		 *        The point to transform

+		 * @return The transformed point in the target frame of reference

+		 */

+		public PrecisionPoint transform(PrecisionPoint point) {

+			return new PrecisionPoint(point.preciseX() * scaleX + translationX, point.preciseY() * scaleY + translationY);

+		}

+

+		/**

+		 * Transforms the given rectangle in the target frame of reference

+		 *

+		 * @param rectangle

+		 *        The rectangle to transform

+		 * @return The transformed rectangle in the target frame of reference

+		 */

+		public PrecisionRectangle transform(PrecisionRectangle rectangle) {

+			return new PrecisionRectangle(rectangle.preciseX() * scaleX + translationX, rectangle.preciseY() * scaleY + translationY, rectangle.preciseWidth() * scaleX, rectangle.preciseHeight() * scaleY);

+		}

+	}

 

 	protected SVGDocument svgDocument = null;

 

+	private PrecisionDimension svgDimension = null;

+

+	private List<PrecisionPoint> outlinePoints = null;

+

+	private PrecisionDimension outlineDimension = null;

+

+	private PrecisionRectangle labelBounds = null;

+

 	protected DefaultSizeNodeFigure defaultNodePlate;

 

 

 	/**

-	 * associate the SVG document that represent the SVG

-	 * 

+	 * Initializes the figure.

+	 *

+	 * @param width

+	 *        The figure's original width

+	 * @param height

+	 *        The figure's original height

+	 */

+	public SVGNodePlateFigure(int width, int height) {

+		super(width, height);

+	}

+

+

+	/**

+	 * Associates the given SVG document to this figure

+	 *

 	 * @param svgDocument

 	 *        the SVG document

 	 */

 	public void setSVGDocument(SVGDocument svgDocument) {

-		if(svgDocument == null) {

-			this.svgDocument = null;

-			this.pathSegList = null;

+		this.svgDocument = svgDocument;

+		if(svgDocument != null) {

+			this.svgDimension = getSvgDimension(svgDocument);

+			Element element = svgDocument.getElementById("PapyrusPath");

+			if(element != null) {

+				outlinePoints = toDraw2DPoints(((SVGPathElement)element).getPathSegList());

+				outlineDimension = getDimensionOf(outlinePoints);

+			}

+			element = svgDocument.getElementById("PapyrusLabel");

+			if(element != null) {

+				labelBounds = toDraw2DRectangle((SVGRectElement)element);

+			}

 		} else {

-			this.svgDocument = svgDocument;

-			Element path = svgDocument.getElementById("PapyrusPath");

-			if(path != null) {

-				SVGPathElement svgPath = (SVGPathElement)path;

-				SVGPathSegList segmentList = svgPath.getPathSegList();

-				this.setSegemntList(segmentList);

+			this.svgDimension = null;

+			this.outlinePoints = null;

+			this.outlineDimension = null;

+			this.labelBounds = null;

+		}

+	}

+

+	/**

+	 * Transforms the given SVG animated length to a base value, assuming the units in the SVG are pixels

+	 *

+	 * @param length

+	 *        The SVG length

+	 * @return The base value as a double

+	 */

+	private double getValueOf(SVGAnimatedLength length) {

+		if(length == null) {

+			return 0;

+		}

+		SVGLength base = length.getBaseVal();

+		if(base == null) {

+			return 0;

+		}

+		return base.getValue();

+	}

+

+	/**

+	 * Gets the dimension of the SVG document, assuming the units in the SVG are pixels

+	 *

+	 * @param svgDocument

+	 *        The SVG document

+	 * @return The equivalent Draw2D dimension

+	 */

+	private PrecisionDimension getSvgDimension(SVGDocument svgDocument) {

+		double svgWidth = 0;

+		double svgHeight = 0;

+		SVGSVGElement svgElement = svgDocument.getRootElement();

+		if(svgElement != null) {

+			svgWidth = getValueOf(svgElement.getWidth());

+			svgHeight = getValueOf(svgElement.getHeight());

+		}

+		return new PrecisionDimension(svgWidth, svgHeight);

+	}

+

+	/**

+	 * Transforms the given SVG path to a list of Draw2D precision points, assuming the units in the SVG are pixels

+	 *

+	 * @param segments

+	 *        The SVG path as a list of segments

+	 * @return The list of the corresponding Draw2D points

+	 */

+	private List<PrecisionPoint> toDraw2DPoints(SVGPathSegList segments) {

+		ArrayList<PrecisionPoint> pointList = new ArrayList<PrecisionPoint>();

+

+		// current coordinates

+		double currentX = 0;

+		double currentY = 0;

+		for(int i = 0; i < segments.getNumberOfItems(); i++) {

+			SVGPathSeg seg = segments.getItem(i);

+			if(seg instanceof SVGPathSegMovetoLinetoItem) {

+				SVGPathSegMovetoLinetoItem linetoItem = (SVGPathSegMovetoLinetoItem)seg;

+				String letter = linetoItem.getPathSegTypeAsLetter();

+				double x = linetoItem.getX();

+				double y = linetoItem.getY();

+				if(letter.equals("M")) {

+					currentX = x;

+					currentY = y;

+					pointList.add(new PrecisionPoint(currentX, currentY));

+				} else if(letter.equals("m")) {

+					currentX = currentX + x;

+					currentY = currentY + y;

+					pointList.add(new PrecisionPoint(currentX, currentY));

+				} else if(letter.equals("L")) {

+					currentX = x;

+					currentY = y;

+					pointList.add(new PrecisionPoint(currentX, currentY));

+				} else if(letter.equals("l")) {

+					currentX = currentX + x;

+					currentY = currentY + y;

+					pointList.add(new PrecisionPoint(currentX, currentY));

+				}

+			} else {

+				System.err.println("Unsupported SVG segment in PapyrusPath at index " + i + " in SVG document");

 			}

 		}

+

+		return pointList;

 	}

 

 	/**

-	 * set the node plate that is wrapped by it.

-	 * 

+	 * Gets the dimension of the given collection of points

+	 *

+	 * @param points

+	 *        A list of points

+	 * @return The dimension of the points

+	 */

+	private PrecisionDimension getDimensionOf(Collection<PrecisionPoint> points) {

+		double maxWidth = 0;

+		double maxHeight = 0;

+		for(PrecisionPoint point : points) {

+			maxWidth = Math.max(maxWidth, point.preciseX());

+			maxHeight = Math.max(maxHeight, point.preciseY());

+		}

+		return new PrecisionDimension(maxWidth, maxHeight);

+	}

+

+	/**

+	 * Transforms the given SVG rectangle to a Draw2D rectangle, assuming the units in the SVG are pixels

+	 *

+	 * @param element

+	 *        The SVG rectangle

+	 * @return The equivalent Draw2D rectangle

+	 */

+	private PrecisionRectangle toDraw2DRectangle(SVGRectElement element) {

+		return new PrecisionRectangle(

+				getValueOf(element.getX()),

+				getValueOf(element.getY()),

+				getValueOf(element.getWidth()),

+				getValueOf(element.getHeight()));

+	}

+

+

+

+	/**

+	 * Sets the node plate that is wrapped by it.

+	 *

 	 * @param defaultNodePlate

 	 */

 	public void setDefaultNodePlate(IFigure defaultNodePlate) {

@@ -80,158 +283,84 @@ public class SVGNodePlateFigure extends DefaultSizeNodeFigure {
 	}

 

 	/**

-	 * 

-	 * Constructor.

-	 * 

-	 * @param width

-	 * @param height

+	 * Gets the transformation from SVG to Draw2D positions

+	 *

+	 * @param innerWidth

+	 *        Maximum width of the elements to transform

+	 * @param innerHeight

+	 *        Maximum height of the elements to transform

+	 * @param anchor

+	 *        The Draw2D rectangle anchoring the SVG figure

+	 * @return The transformation

 	 */

-	public SVGNodePlateFigure(int width, int height) {

-		super(width, height);

+	private SvgToDraw2DTransform getTransform(double innerWidth, double innerHeight, Rectangle anchor) {

+		PrecisionDimension maxDim = new PrecisionDimension(Math.max(svgDimension.preciseWidth(), innerWidth), Math.max(svgDimension.preciseHeight(), innerHeight));

+		return new SvgToDraw2DTransform(

+				anchor.width / maxDim.preciseWidth(),

+				anchor.height / maxDim.preciseHeight(),

+				anchor.x,

+				anchor.y);

 	}

 

 	/**

-	 * set the papyrus path to follow the shape

-	 * 

-	 * @param pathSegList

+	 * Gets the current Draw2D anchor for the SVG figure

+	 *

+	 * @return The Draw2D anchor as a Rectangle

 	 */

-

-	public void setSegemntList(SVGPathSegList pathSegList) {

-		this.pathSegList = pathSegList;

-	}

-

-	public boolean containShapeCompatment() {

+	private Rectangle getDraw2DAnchor() {

 		if(this.getChildren().size() > 0 && this.getChildren().get(0) instanceof IFigure) {

 			IFigure primaryShape = (IFigure)this.getChildren().get(0);

 			for(Object subFigure : primaryShape.getChildren()) {

 				if(subFigure instanceof ScalableCompartmentFigure) {

-					return true;

+					return ((IFigure)subFigure).getBounds();

 				}

 			}

 		}

-		return false;

+		return getHandleBounds();

 	}

 

-	public IFigure getShapeCompatment() {

-		if(this.getChildren().size() > 0 && this.getChildren().get(0) instanceof IFigure) {

-			IFigure primaryShape = (IFigure)this.getChildren().get(0);

-			for(Object subFigure : primaryShape.getChildren()) {

-				if(subFigure instanceof ScalableCompartmentFigure) {

-					return (IFigure)subFigure;

-				}

-			}

-		}

-		return null;

-	}

-

-

-	// This returns as the anchoring area only the central line

+	/**

+	 * @see org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure#getPolygonPoints()

+	 */

 	@Override

 	public PointList getPolygonPoints() {

-		if(this.pathSegList == null) {

+		if(this.outlinePoints == null) {

 			if(defaultNodePlate != null) {

 				defaultNodePlate.setBounds(this.getBounds());

 				return defaultNodePlate.getPolygonPoints();

 			}

 			return super.getPolygonPoints();

 		}

-		double svgWidth = 0;

-		double svgHeight = 0;

-		SVGSVGElement svgElement = svgDocument.getRootElement();

-		if(svgElement != null) {

-			SVGAnimatedLength widthALength = svgElement.getWidth();

-			SVGAnimatedLength heightALength = svgElement.getHeight();

-			if(widthALength != null && heightALength != null) {

-				SVGLength svgWidthLength = widthALength.getBaseVal();

-				SVGLength svgHeightLength = heightALength.getBaseVal();

-				if(svgWidthLength != null && svgHeightLength != null) {

-					//	if( width.getUnitType()==width.SVG_LENGTHTYPE_PX){

-					svgWidth = svgWidthLength.getValueInSpecifiedUnits();

-					svgHeight = svgHeightLength.getValueInSpecifiedUnits();

-					//	}

-				}

-			}

-		}

-

-		//transform coordinate to absolute in the context of the SVG

-		//getBounds

-		ArrayList<PrecisionPoint> pointList = new ArrayList<PrecisionPoint>();

-

-		//current absolute coordinates

-		float currentAbsoluteSVGPositionX = 0;

-		float currentAbsoluteSVGPositionY = 0;

-		for(int i = 0; i < pathSegList.getNumberOfItems(); i++) {

-			SVGPathSeg seg = pathSegList.getItem(i);

-			if(seg instanceof SVGPathSegMovetoLinetoItem) {

-				SVGPathSegMovetoLinetoItem linetoItem = (SVGPathSegMovetoLinetoItem)seg;

-				//short value =linetoItem.getPathSegType();

-				String letter = linetoItem.getPathSegTypeAsLetter();

-				float x = linetoItem.getX();

-				float y = linetoItem.getY();

-				//	System.out.println("value="+value +" letter="+letter+ " x="+ x+ " y="+y);

-				if(letter.equals("M")) {

-					currentAbsoluteSVGPositionX = x;

-					currentAbsoluteSVGPositionY = y;

-					pointList.add(new PrecisionPoint(currentAbsoluteSVGPositionX, currentAbsoluteSVGPositionY));

-				} else if(letter.equals("m")) {

-					currentAbsoluteSVGPositionX = currentAbsoluteSVGPositionX + x;

-					currentAbsoluteSVGPositionY = currentAbsoluteSVGPositionY + y;

-					pointList.add(new PrecisionPoint(currentAbsoluteSVGPositionX, currentAbsoluteSVGPositionY));

-				} else if(letter.equals("L")) {

-					currentAbsoluteSVGPositionX = x;

-					currentAbsoluteSVGPositionY = y;

-					pointList.add(new PrecisionPoint(currentAbsoluteSVGPositionX, currentAbsoluteSVGPositionY));

-				} else if(letter.equals("l")) {

-					currentAbsoluteSVGPositionX = currentAbsoluteSVGPositionX + x;

-					currentAbsoluteSVGPositionY = currentAbsoluteSVGPositionY + y;

-					pointList.add(new PrecisionPoint(currentAbsoluteSVGPositionX, currentAbsoluteSVGPositionY));

-				}

-			} else {

-				System.err.println("this is not i linear segment " + i);

-			}

-		}

-

 

-		//get the original size of SVG

-		double maxWitdh = 0;

-		double maxHeight = 0;

-		if(svgWidth != 0 && svgHeight != 0) {

-			maxWitdh = svgWidth;

-			maxHeight = svgHeight;

-		} else {

-			for(int i = 0; i < pointList.size(); i++) {

-				PrecisionPoint point = pointList.get(i);

-				if(point.preciseX() > maxWitdh) {

-					maxWitdh = point.preciseX();

-				}

-				if(point.preciseY() > maxHeight) {

-					maxHeight = point.preciseY();

-				}

-			}

-		}

-		//System.out.println("Size of the SVG figure is= "+maxHeight +" "+maxHeight);

+		SvgToDraw2DTransform transform = getTransform(outlineDimension.preciseWidth(), outlineDimension.preciseHeight(), getDraw2DAnchor());

 		PointList points = new PointList(5);

-		Rectangle anchorableRectangle = null;

-		if(containShapeCompatment()) {

-			anchorableRectangle = getShapeCompatment().getBounds();

+		for(PrecisionPoint point : outlinePoints) {

+			points.addPoint(transform.transform(point));

 		}

+		return points;

+	}

 

-		else {

-			anchorableRectangle = getHandleBounds();

-		}

-		double ratioX = anchorableRectangle.width / maxWitdh;

-		double ratioY = anchorableRectangle.height / maxHeight;

-		//PackageFigure packageFigure = getPackageFigure();

-		//System.out.println("Begin-------------" );

-

-		for(int i = 0; i < pointList.size(); i++) {

-			PrecisionPoint point = pointList.get(i);

-			double x = point.preciseX() * ratioX;

-			double y = point.preciseY() * ratioY;

-			points.addPoint(anchorableRectangle.x + (int)x, anchorableRectangle.y + (int)y);

-			//System.out.println("add point x="+x +" y=" +y +" ratioX= "+ratioX+" ratioY="+ratioY );

+	/**

+	 * Determines whether this figure defines the bounds of a possible label

+	 *

+	 * @return <code>true</code> if this figures defines the bounds of the label

+	 */

+	public boolean hasLabelBounds() {

+		return (labelBounds != null);

+	}

+

+	/**

+	 * Gets the bounds of the label, if they are defined

+	 *

+	 * @param anchor

+	 *        The Draw2D rectangle anchoring the SVG figure

+	 * @return The label's bounds, or <code>null</code> if they are not defined

+	 */

+	public Rectangle getLabelBounds(Rectangle anchor) {

+		if(labelBounds == null) {

+			return null;

 		}

-		//System.out.println("End-------------" );

-		return points;

+		SvgToDraw2DTransform transform = getTransform(labelBounds.preciseRight(), labelBounds.preciseBottom(), anchor);

+		return transform.transform(labelBounds);

 	}

 }

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/handler/IRefreshHandlerPart.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/handler/IRefreshHandlerPart.java
new file mode 100755
index 00000000000..c5d11f271fc
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/handler/IRefreshHandlerPart.java
@@ -0,0 +1,29 @@
+/*****************************************************************************

+ * 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:

+ *  Laurent Wouters (CEA LIST) laurent.wouters@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.gmfdiag.common.handler;

+

+import org.eclipse.ui.IEditorPart;

+

+/**

+ * Represents a handler of refresh event

+ * 

+ * @author Laurent Wouters

+ */

+public interface IRefreshHandlerPart {

+	/**

+	 * Refresh what needs to be, taking into account that the active editor is the given one

+	 * 

+	 * @param editorPart

+	 *            The currently active editor

+	 */

+	void refresh(IEditorPart editorPart);

+}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/handler/RefreshHandler.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/handler/RefreshHandler.java
index fe74c2fd726..dacfdea5e41 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/handler/RefreshHandler.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/handler/RefreshHandler.java
@@ -11,6 +11,11 @@
  *****************************************************************************/

 package org.eclipse.papyrus.infra.gmfdiag.common.handler;

 

+import java.lang.ref.WeakReference;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+

 import org.eclipse.core.commands.AbstractHandler;

 import org.eclipse.core.commands.ExecutionEvent;

 import org.eclipse.core.commands.ExecutionException;

@@ -31,6 +36,25 @@ import org.eclipse.ui.IEditorPart;
 //TODO: To be refactored. Move to infra/gmfdiag/menu when the plugin exists

 public class RefreshHandler extends AbstractHandler {

 

+	/**

+	 * The registry of refresh handler parts that are NOT specific to an editor

+	 * We use weak references so that we do not block the garbage collection of objects

+	 */

+	private static Collection<WeakReference<IRefreshHandlerPart>> PARTS = new LinkedList<WeakReference<IRefreshHandlerPart>>();

+	

+	/**

+	 * Register a refresher part that is not attached to any editor

+	 * 

+	 * @param refresher

+	 *            The refresher part

+	 */

+	public static synchronized void register(IRefreshHandlerPart refresher) {

+		PARTS.add(new WeakReference<IRefreshHandlerPart>(refresher));

+	}

+	

+	/**

+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

+	 */

 	public Object execute(ExecutionEvent event) throws ExecutionException {

 		IEditorPart activeEditor;

 		try {

@@ -40,8 +64,25 @@ public class RefreshHandler extends AbstractHandler {
 			return null;

 		}

 

+		// Refresh the base GMF objects

 		DiagramHelper.refresh(activeEditor);

 

+		// Call the relevant hooks

+		callRefresherHooks(activeEditor);

+

 		return null;

 	}

+	

+	private synchronized void callRefresherHooks(IEditorPart activeEditor) {

+		Iterator<WeakReference<IRefreshHandlerPart>> iterator = PARTS.iterator();

+		while (iterator.hasNext()) {

+			WeakReference<IRefreshHandlerPart> wr = iterator.next();

+			IRefreshHandlerPart part = wr.get();

+			if (part != null) {

+				part.refresh(activeEditor);

+			} else {

+				iterator.remove();

+			}

+		}

+	}

 }

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/messages/Messages.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/messages/Messages.java
new file mode 100644
index 00000000000..0843a4eafb7
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/messages/Messages.java
@@ -0,0 +1,21 @@
+package org.eclipse.papyrus.infra.gmfdiag.common.messages;

+

+import org.eclipse.osgi.util.NLS;

+

+public class Messages extends NLS {

+

+	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.gmfdiag.common.messages.messages"; //$NON-NLS-1$

+

+	public static String UnitsUtils_Centimeters;

+

+	public static String UnitsUtils_Inches;

+

+	public static String UnitsUtils_Pixels;

+	static {

+		// initialize resource bundle

+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);

+	}

+

+	private Messages() {

+	}

+}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/messages/messages.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/messages/messages.properties
new file mode 100644
index 00000000000..1d8adde52ab
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/messages/messages.properties
@@ -0,0 +1,3 @@
+UnitsUtils_Centimeters=Centimeters

+UnitsUtils_Inches=Inches

+UnitsUtils_Pixels=Pixels

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/utils/PreferenceConstantHelper.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/preferences/PreferencesConstantsHelper.java
index 467878e69a7..1ff44b8c5a6 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/utils/PreferenceConstantHelper.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/preferences/PreferencesConstantsHelper.java
@@ -1,17 +1,21 @@
-/****************************************************************************

- * Copyright (c) 2009 Atos Origin.

- *  

+/*****************************************************************************

+ * 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:

- *		Thibault Landre (Atos Origin) - Initial API and implementation

- *      Lorenzo Vincent (CEA LIST) - Add Compartment Visibility

- *      Vincent Lorenzo (CEA-LIst) -  bug 335989: [Preferences] [Enhancement] Add a group for labels in each Connection Preference Page

+ *		

+ *		CEA LIST - Initial API and implementation

+ *

  *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.preferences.utils;

+package org.eclipse.papyrus.infra.gmfdiag.common.preferences;

+

+import org.eclipse.gmf.runtime.diagram.ui.internal.properties.WorkspaceViewerProperties;

+

+

 

 /**

  * <p>

@@ -40,22 +44,23 @@ package org.eclipse.papyrus.infra.gmfdiag.preferences.utils;
  * </p>

  * 

  */

-public class PreferenceConstantHelper {

+@SuppressWarnings("restriction")

+public class PreferencesConstantsHelper {

 

 	/**

 	 * Prefix for preference for Papyrus Level editor

 	 */

-	public static String PAPYRUS_EDITOR_PREFERENCE_PREFIX = "PAPYRUS_EDITOR"; //$NON-NLS-1$

+	public final static String PAPYRUS_EDITOR_PREFERENCE_PREFIX = "PAPYRUS_EDITOR"; //$NON-NLS-1$

 

 	/**

 	 * Prefix for preference for Diagram Level

 	 */

-	public static String DIAGRAM_PREFERENCE_PREFIX = "DIAGRAM_"; //$NON-NLS-1$

+	public final static String DIAGRAM_PREFERENCE_PREFIX = "DIAGRAM_"; //$NON-NLS-1$

 

 	/**

 	 * Prefix for preference for element Level

 	 */

-	public static String DIAGRAM_ELEMENT = "ELEMENT_"; //$NON-NLS-1$

+	public final static String DIAGRAM_ELEMENT = "ELEMENT_"; //$NON-NLS-1$

 

 	private final static String COLOR = "color."; //$NON-NLS-1$

 

@@ -81,7 +86,7 @@ public class PreferenceConstantHelper {
 

 	private final static String GRADIENT_POLICY_CONSTANT = GRADIENT + POLICY;

 

-	private final static String JUMPLINK_STATUS_CONSTANT = JUMPLINK + "status"; //$NON-NLS-1$

+	private final static String JUMPLINK_STATUS_CONSTANT = JUMPLINK + "status"; //$NON-NLS-1$ 

 

 	private final static String JUMPLINK_REVERSE_CONSTANT = JUMPLINK + "reverse"; //$NON-NLS-1$

 

@@ -115,6 +120,28 @@ public class PreferenceConstantHelper {
 

 	private final static String LOCATION_Y_CONSTANT = "location_y"; //$NON-NLS-1$

 

+	public final static String VIEW_RULERS_CONSTANT = WorkspaceViewerProperties.VIEWRULERS;

+

+	public final static String VIEW_GRID_CONSTANT = WorkspaceViewerProperties.VIEWGRID;

+

+	public final static String RULER_UNITS_CONSTANT = WorkspaceViewerProperties.RULERUNIT;

+

+	public final static String SNAP_TO_GRID_CONSTANT = WorkspaceViewerProperties.SNAPTOGRID;

+

+	public final static String SNAP_TO_GEOMETRY_CONSTANT = WorkspaceViewerProperties.SNAPTOGEOMETRY;

+

+	public final static String GRID_LINE_COLOR_CONSTANT = WorkspaceViewerProperties.GRIDLINECOLOR;

+

+	public final static String GRID_SPACING_CONSTANT = WorkspaceViewerProperties.GRIDSPACING;

+

+	public final static String GRID_ORDER_CONSTANT = WorkspaceViewerProperties.GRIDORDER;

+

+	public final static String GRID_LINE_STYLE_CONSTANT = WorkspaceViewerProperties.GRIDLINESTYLE;

+

+	public final static String VIEW_PAGE_BREAK_CONSTANT = WorkspaceViewerProperties.VIEWPAGEBREAKS;

+

+	public final static String DRAW_CONNECTION_POINT_CONSTANT = "drawConnectionPoint"; //$NON-NLS-1$

+

 	/**

 	 * A preference of type COLOR FILL

 	 */

@@ -230,6 +257,63 @@ public class PreferenceConstantHelper {
 	 */

 	public static final int LOCATION_Y = LOCATION_X + 1;

 

+	/**

+	 * A preference to diplay or not the rulers

+	 */

+	public static final int VIEW_RULER = LOCATION_Y + 1;

+

+	/**

+	 * A preference to diplay or not the grid

+	 */

+

+	public static final int VIEW_GRID = VIEW_RULER + 1;

+

+	/**

+	 * A preference to change the ruler unit

+	 */

+

+	public static final int RULER_UNITS = VIEW_GRID + 1;

+

+	/**

+	 * A preference to snap the created element to the grid

+	 */

+	public static final int SNAP_TO_GRID = RULER_UNITS + 1;

+

+	/**

+	 * A preference to snap the created element to the shape

+	 */

+	public static final int SNAP_TO_GEOMETRY = SNAP_TO_GRID + 1;

+

+	/**

+	 * A preference to change the grid color

+	 */

+	public static final int GRID_LINE_COLOR = SNAP_TO_GEOMETRY + 1;

+

+	/**

+	 * A preference to change the grid spacing

+	 */

+	public static final int GRID_SPACING = GRID_LINE_COLOR + 1;

+

+	/**

+	 * A preference to change the Z order of the Grid

+	 */

+	public static final int GRID_ORDER = GRID_SPACING + 1;

+

+	/**

+	 * A preference to change the style of the grid

+	 */

+	public static final int GRID_LINE_STYLE = GRID_ORDER + 1;

+

+	/**

+	 * A preference to view the page break on the diagram

+	 */

+	public static final int VIEW_PAGE_BREAK = GRID_LINE_STYLE + 1;

+	

+	/**

+	 * A preference to draw big point when 2 links have a common part

+	 */

+	public static final int DRAW_CONNECTION_POINT = VIEW_PAGE_BREAK +1;

+

 

 	/**

 	 * Get the preference constant used to store the preference of an element.

@@ -315,6 +399,36 @@ public class PreferenceConstantHelper {
 		case LOCATION_Y:

 			sb.append(LOCATION_Y_CONSTANT);

 			break;

+		case VIEW_RULER:

+			sb.append(VIEW_RULERS_CONSTANT);

+			break;

+		case VIEW_GRID:

+			sb.append(VIEW_GRID_CONSTANT);

+			break;

+		case RULER_UNITS:

+			sb.append(RULER_UNITS_CONSTANT);

+			break;

+		case SNAP_TO_GRID:

+			sb.append(SNAP_TO_GRID_CONSTANT);

+			break;

+		case SNAP_TO_GEOMETRY:

+			sb.append(SNAP_TO_GEOMETRY_CONSTANT);

+			break;

+		case GRID_LINE_COLOR:

+			sb.append(GRID_LINE_COLOR_CONSTANT);

+			break;

+		case GRID_SPACING:

+			sb.append(GRID_SPACING_CONSTANT);

+			break;

+		case GRID_ORDER:

+			sb.append(GRID_ORDER_CONSTANT);

+			break;

+		case GRID_LINE_STYLE:

+			sb.append(GRID_LINE_STYLE_CONSTANT);

+			break;

+		case VIEW_PAGE_BREAK:

+			sb.append(VIEW_PAGE_BREAK_CONSTANT);

+			break;
 		default:

 			break;

 		}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/LineStyleLabelProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/LineStyleLabelProvider.java
new file mode 100644
index 00000000000..2da396ee2a3
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/LineStyleLabelProvider.java
@@ -0,0 +1,120 @@
+/*****************************************************************************

+ * 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:

+ *		

+ *		CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.gmfdiag.common.providers;

+

+import org.eclipse.draw2d.Graphics;

+import org.eclipse.jface.viewers.ILabelProvider;

+import org.eclipse.jface.viewers.ILabelProviderListener;

+import org.eclipse.swt.graphics.Image;

+

+/**

+ * 

+ * Label Provider for line style

+ * 

+ */

+public class LineStyleLabelProvider implements ILabelProvider {

+

+

+	public static final String LINE_STYLE_SOLID_STRING = "Solid";

+

+	public static final String LINE_STYLE_DASH_STRING = "Dash";

+

+	public static final String LINE_STYLE_DOT_STRING = "Dot";

+

+	public static final String LINE_STYLE_DASH_DOT_STRING = "Dash Dot";

+

+	public static final String LINE_STYLE_DASH_DOT_DOT_STRING = "Dash Dot Dot";

+

+	public static final String LINE_STYLE_CUSTOM = "Custom";

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)

+	 * 

+	 * @param listener

+	 */

+	public void addListener(ILabelProviderListener listener) {

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()

+	 * 

+	 */

+	public void dispose() {

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)

+	 * 

+	 * @param element

+	 * @param property

+	 * @return

+	 */

+	public boolean isLabelProperty(Object element, String property) {

+		return false;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)

+	 * 

+	 * @param listener

+	 */

+	public void removeListener(ILabelProviderListener listener) {

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+	public Image getImage(Object element) {

+		return null;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+	public String getText(Object element) {

+		if(element instanceof Integer) {

+			int lineStyle = (Integer)element;

+			switch(lineStyle) {

+			case Graphics.LINE_SOLID:

+				return LINE_STYLE_SOLID_STRING;

+			case Graphics.LINE_DASH:

+				return LINE_STYLE_DASH_STRING;

+			case Graphics.LINE_DOT:

+				return LINE_STYLE_DOT_STRING;

+			case Graphics.LINE_DASHDOT:

+				return LINE_STYLE_DASH_DOT_STRING;

+			case Graphics.LINE_DASHDOTDOT:

+				return LINE_STYLE_DASH_DOT_DOT_STRING;

+			case Graphics.LINE_CUSTOM:

+				return LINE_STYLE_CUSTOM;

+			default:

+				break;

+			}

+		}

+		return null;

+	}

+

+}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/ShapeDecorator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/ShapeDecorator.java
index 860946c90ff..63a1c6fb9f0 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/ShapeDecorator.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/ShapeDecorator.java
@@ -83,10 +83,10 @@ public class ShapeDecorator extends AbstractDecorator implements NotificationLis
 	protected static final int IMAGE_HEIGHT = 36; // 32

 

 	/** name of the boolean style to manage visibility of the figure */

-	public static final String SHAPE_DECORATOR_VISIBILITY = "shape_visibility";

+	public static final String SHAPE_DECORATOR_VISIBILITY = "shapeVisibility";

 

 	/** name of the boolean style to manage direction of the decoration in the figure */

-	public static final String SHAPE_DECORATOR_DIRECTION = "shape_direction";

+	public static final String SHAPE_DECORATOR_DIRECTION = "shapeDirection";

 

 	/** listener on the custom style for visibility */

 	protected CustomBooleanStyleObservableValue visibilityObservable;

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/StyleBasedShapeProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/StyleBasedShapeProvider.java
new file mode 100755
index 00000000000..cb188ea99d6
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/StyleBasedShapeProvider.java
@@ -0,0 +1,136 @@
+/*****************************************************************************

+ * Copyright (c) 2014 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *		CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.gmfdiag.common.providers;

+

+import java.io.IOException;

+import java.util.ArrayList;

+import java.util.List;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.diagram.core.listener.DiagramEventBroker;

+import org.eclipse.gmf.runtime.diagram.core.listener.NotificationListener;

+import org.eclipse.gmf.runtime.draw2d.ui.render.RenderedImage;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.StringValueStyle;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.Activator;

+import org.eclipse.papyrus.infra.gmfdiag.common.service.shape.AbstractShapeProvider;

+import org.eclipse.papyrus.infra.gmfdiag.common.service.shape.ProviderNotificationManager;

+import org.w3c.dom.svg.SVGDocument;

+

+/**

+ * Shape provider based on the applied style

+ * 

+ * @author Laurent Wouters

+ */

+public class StyleBasedShapeProvider extends AbstractShapeProvider {

+

+	protected static final String STYLE_PROPERTY = "svgFile";

+

+	private ProviderNotificationManager manager;

+

+	private List<SVGDocument> listEmptySVG;

+	private List<RenderedImage> listEmptyRendered;

+	private List<SVGDocument> listSingletonSVG;

+	private List<RenderedImage> listSingletonRendered;

+

+	public StyleBasedShapeProvider() {

+		listEmptySVG = new ArrayList<SVGDocument>(0);

+		listEmptyRendered = new ArrayList<RenderedImage>(0);

+		listSingletonSVG = new ArrayList<SVGDocument>(1);

+		listSingletonSVG.add(null);

+		listSingletonRendered = new ArrayList<RenderedImage>(1);

+		listSingletonRendered.add(null);

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.infra.gmfdiag.common.service.shape.IShapeProvider#getShapes(org.eclipse.emf.ecore.EObject)

+	 */

+	@Override

+	public List<RenderedImage> getShapes(EObject view) {

+		if (!(view instanceof View))

+			return listEmptyRendered;

+		View v = (View) view;

+		String svgFile = extract((StringValueStyle) v.getNamedStyle(NotationPackage.eINSTANCE.getStringValueStyle(), STYLE_PROPERTY));

+		if (svgFile == null)

+			return listEmptyRendered;

+		SVGDocument svg = getSVGDocument(view, svgFile);

+		RenderedImage img = null;

+		try {

+			img = renderSVGDocument(view, svg);

+		} catch (IOException e) {

+			Activator.log.error("Failed to render the svg file: " + svgFile, e);

+		}

+		listSingletonRendered.set(0, img);

+		return listSingletonRendered;

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.infra.gmfdiag.common.service.shape.IShapeProvider#getSVGDocument(org.eclipse.emf.ecore.EObject)

+	 */

+	@Override

+	public List<SVGDocument> getSVGDocument(EObject view) {

+		if (!(view instanceof View))

+			return listEmptySVG;

+		View v = (View) view;

+		String svgFile = extract((StringValueStyle) v.getNamedStyle(NotationPackage.eINSTANCE.getStringValueStyle(), STYLE_PROPERTY));

+		if (svgFile == null)

+			return listEmptySVG;

+		SVGDocument svg = getSVGDocument(view, svgFile);

+		listSingletonSVG.set(0, svg);

+		return listSingletonSVG;

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.infra.gmfdiag.common.service.shape.IShapeProvider#providesShapes(org.eclipse.emf.ecore.EObject)

+	 */

+	@Override

+	public boolean providesShapes(EObject view) {

+		if (!(view instanceof View))

+			return false;

+		View v = (View) view;

+		String svgFile = extract((StringValueStyle) v.getNamedStyle(NotationPackage.eINSTANCE.getStringValueStyle(), STYLE_PROPERTY));

+		return (svgFile != null);

+	}

+

+	/**

+	 * Extracts the primitive value from the given style

+	 * 

+	 * @param style

+	 *            The style

+	 * @return The primitive value

+	 */

+	private String extract(StringValueStyle style) {

+		if (style == null || style.getStringValue() == null || style.getStringValue().isEmpty()) {

+			return null;

+		}

+		return style.getStringValue();

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.infra.gmfdiag.common.service.shape.IShapeProvider#createProviderNotificationManager(org.eclipse.gmf.runtime.diagram.core.listener.DiagramEventBroker, org.eclipse.emf.ecore.EObject,

+	 *      org.eclipse.gmf.runtime.diagram.core.listener.NotificationListener)

+	 */

+	@Override

+	public ProviderNotificationManager createProviderNotificationManager(DiagramEventBroker diagramEventBroker, EObject view, NotificationListener notificationListener) {

+		if (manager != null)

+			return manager;

+		manager = new ProviderNotificationManager(diagramEventBroker, view, notificationListener) {

+			@Override

+			protected void registerListeners() {

+

+			}

+		};

+		return manager;

+	}

+}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/UnitsLabelProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/UnitsLabelProvider.java
new file mode 100644
index 00000000000..e2357c150a2
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/providers/UnitsLabelProvider.java
@@ -0,0 +1,106 @@
+/*****************************************************************************

+ * 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:

+ *		

+ *		CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.gmfdiag.common.providers;

+

+import org.eclipse.gef.rulers.RulerProvider;

+import org.eclipse.jface.viewers.ILabelProvider;

+import org.eclipse.jface.viewers.ILabelProviderListener;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.UnitsConstants;

+import org.eclipse.swt.graphics.Image;

+

+/**

+ * 

+ * Label provider for Units

+ * 

+ */

+public class UnitsLabelProvider implements ILabelProvider {

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)

+	 * 

+	 * @param listener

+	 */

+	public void addListener(ILabelProviderListener listener) {

+		//not used

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()

+	 * 

+	 */

+	public void dispose() {

+		//not used

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)

+	 * 

+	 * @param element

+	 * @param property

+	 * @return

+	 */

+	public boolean isLabelProperty(Object element, String property) {

+		return false;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)

+	 * 

+	 * @param listener

+	 */

+	public void removeListener(ILabelProviderListener listener) {

+		//not used

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+	public Image getImage(Object element) {

+		//not used

+		return null;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)

+	 * 

+	 * @param element

+	 * @return

+	 */

+	public String getText(Object element) {

+		if(element instanceof Integer) {

+			final int unit = (Integer)element;

+			switch(unit) {

+			case RulerProvider.UNIT_INCHES:

+				return UnitsConstants.INCHES;

+			case RulerProvider.UNIT_CENTIMETERS:

+				return UnitsConstants.CENTIMETERS;

+			case RulerProvider.UNIT_PIXELS:

+				return UnitsConstants.PIXELS;

+			default:

+				break;

+			}

+		}

+		return "";

+	}

+

+}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/AbstractShapeProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/AbstractShapeProvider.java
index 555f81d48a7..09d2f5d1511 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/AbstractShapeProvider.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/AbstractShapeProvider.java
@@ -15,22 +15,30 @@ package org.eclipse.papyrus.infra.gmfdiag.common.service.shape;
 

 import java.io.IOException;

 import java.io.StringWriter;

+import java.util.HashMap;

+import java.util.Map;

+import java.util.WeakHashMap;

 

 import org.apache.batik.dom.svg.SAXSVGDocumentFactory;

 import org.apache.batik.dom.util.DOMUtilities;

 import org.eclipse.core.runtime.IConfigurationElement;

+import org.eclipse.emf.common.util.URI;

 import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.resource.Resource;

 import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;

 import org.eclipse.gmf.runtime.common.core.service.IOperation;

 import org.eclipse.gmf.runtime.draw2d.ui.render.RenderedImage;

 import org.eclipse.gmf.runtime.draw2d.ui.render.factory.RenderedImageFactory;

+import org.eclipse.papyrus.infra.gmfdiag.common.handler.IRefreshHandlerPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.handler.RefreshHandler;

+import org.eclipse.ui.IEditorPart;

 import org.w3c.dom.Document;

 import org.w3c.dom.svg.SVGDocument;

 

 /**

  * Abstract implementation of the shape provider interface.

  */

-public abstract class AbstractShapeProvider extends AbstractProvider implements IShapeProvider {

+public abstract class AbstractShapeProvider extends AbstractProvider implements IShapeProvider, IRefreshHandlerPart {

 

 	/** field for name */

 	protected static final String NAME = "name";

@@ -53,6 +61,21 @@ public abstract class AbstractShapeProvider extends AbstractProvider implements
 	/** description of the factory */

 	protected String description;

 

+	/**

+	 * Maps of URIs for SVG files referred to with relative paths

+	 */

+	private WeakHashMap<Resource, Map<String, String>> relativePaths;

+

+	/** Cache for the loaded SVG document */

+	private Map<String, SVGDocument> cache;

+

+

+	/**

+	 * Initializes this provider

+	 */

+	public AbstractShapeProvider() {

+		RefreshHandler.register(this);

+	}

 

 	/**

 	 * Returns the bundle identifier for this provider

@@ -112,11 +135,50 @@ public abstract class AbstractShapeProvider extends AbstractProvider implements
 	}

 

 	/**

+	 * Loads a SVG document from the given location.

+	 * This method uses a cache so that any given document is only loaded once.

+	 * 

+	 * @param view

+	 *            The view object to retrieve a svg document for

+	 * @param location

+	 *            The location to load the document from

+	 * @return the Document SVG from its location, can return null if this is not a svg

+	 */

+	protected synchronized SVGDocument getSVGDocument(EObject view, String location) {

+		if (relativePaths == null) {

+			relativePaths = new WeakHashMap<Resource, Map<String, String>>();

+		}

+		String canonical = getCanonicalURI(view, location);

+		return getSVGDocument(canonical);

+	}

+

+	/**

+	 * Loads a SVG document from the given location.

+	 * This method uses a cache so that any given document is only loaded once.

 	 * 

 	 * @param location

+	 *            The location to load the document from

 	 * @return the Document SVG from its location, can return null if this is not a svg

 	 */

-	protected SVGDocument getSVGDocument(String location) {

+	protected synchronized SVGDocument getSVGDocument(String location) {

+		if (cache == null) {

+			cache = new HashMap<String, SVGDocument>();

+		}

+		if (cache.containsKey(location))

+			return cache.get(location);

+		SVGDocument doc = doGetSVGDocument(location);

+		cache.put(location, doc);

+		return doc;

+	}

+

+	/**

+	 * Loads a SVG document from the given location

+	 * 

+	 * @param location

+	 *            The location to load the document from

+	 * @return the Document SVG from its location, can return null if this is not a svg

+	 */

+	private SVGDocument doGetSVGDocument(String location) {

 		int extensionIndex = location.lastIndexOf('.');

 		if(extensionIndex == 0) {

 			return null;

@@ -141,6 +203,47 @@ public abstract class AbstractShapeProvider extends AbstractProvider implements
 		return null;

 	}

 

+	/**

+	 * Translates the given uri as a string to a canonical Eclipse URI

+	 * The uri may be relative to the currently edited EMF resource

+	 * 

+	 * @param model

+	 *            The model element used to retrieve the EMF resource that is currently edited

+	 * @param uri

+	 *            The potentially relative URI of a svg file

+	 * @return The canonical URI of the resource

+	 */

+	private String getCanonicalURI(EObject model, String uri) {

+		if (uri.startsWith("platform:/")) {

+			return uri;

+		}

+

+		Map<String, String> resMap = relativePaths.get(model.eResource());

+		if (resMap == null) {

+			resMap = new HashMap<String, String>();

+			relativePaths.put(model.eResource(), resMap);

+		}

+		String canonical = resMap.get(uri);

+		if (canonical != null) {

+			return canonical;

+		}

+

+		URI resURI = model.eResource().getURI();

+		if (!resURI.isPlatform()) {

+			return null;

+		}

+		StringBuilder builder = new StringBuilder("platform:/");

+		String[] segments = resURI.segments();

+		for (int i = 0; i < segments.length - 1; i++) {

+			builder.append(segments[i]);

+			builder.append("/");

+		}

+		builder.append(uri);

+		canonical = builder.toString();

+		resMap.put(uri, canonical);

+		return canonical;

+	}

+

 	protected RenderedImage renderSVGDocument(EObject view, SVGDocument document) throws IOException {

 		postProcess(view, document);

 		String svgAsText = toString(document);

@@ -160,4 +263,18 @@ public abstract class AbstractShapeProvider extends AbstractProvider implements
 

 		return writer.toString();

 	}

+

+	/**

+	 * @see org.eclipse.papyrus.infra.gmfdiag.common.handler.IRefreshHandlerPart#refresh(org.eclipse.ui.IEditorPart)

+	 */

+	public synchronized void refresh(IEditorPart editorPart) {

+		// Clears the cache of loaded SVG documents

+		// This will force their reloading

+		if (cache != null) {

+			cache.clear();

+		}

+		if (relativePaths != null) {

+			relativePaths.clear();

+		}

+	}

 }

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/PapyrusConnectionEndpointHandle.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/PapyrusConnectionEndpointHandle.java
new file mode 100644
index 00000000000..53383c33cd1
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/PapyrusConnectionEndpointHandle.java
@@ -0,0 +1,86 @@
+/*****************************************************************************

+ * 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:

+ *		

+ *		CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+

+package org.eclipse.papyrus.infra.gmfdiag.common.snap;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.gef.ConnectionEditPart;

+import org.eclipse.gef.DragTracker;

+import org.eclipse.gef.RequestConstants;

+import org.eclipse.gef.handles.ConnectionEndpointHandle;

+

+

+/**

+ * 

+ * This class allows us to provide our own

+ * 

+ */

+public class PapyrusConnectionEndpointHandle extends ConnectionEndpointHandle {

+

+	/**

+	 * Creates a new ConnectionStartHandle, sets its owner to <code>owner</code> , and sets its locator to a {@link ConnectionLocator}.

+	 * 

+	 * @param owner

+	 *        the ConnectionEditPart owner

+	 * @param endPoint

+	 *        one of {@link ConnectionLocator#SOURCE} or {@link ConnectionLocator#TARGET}.

+	 */

+	public PapyrusConnectionEndpointHandle(ConnectionEditPart owner, int endPoint) {

+		super(owner, endPoint);

+	}

+

+	/**

+	 * Creates a new ConnectionStartHandle and sets its owner to <code>owner</code>. If the handle is fixed, it cannot be dragged.

+	 * 

+	 * @param owner

+	 *        the ConnectionEditPart owner

+	 * @param fixed

+	 *        if true, handle cannot be dragged.

+	 * @param endPoint

+	 *        one of {@link ConnectionLocator#SOURCE} or {@link ConnectionLocator#TARGET}.

+	 */

+	public PapyrusConnectionEndpointHandle(ConnectionEditPart owner, boolean fixed, int endPoint) {

+		super(owner, fixed, endPoint);

+	}

+

+	/**

+	 * Creates a new ConnectionStartHandle.

+	 * 

+	 * @param endPoint

+	 *        one of {@link ConnectionLocator#SOURCE} or {@link ConnectionLocator#TARGET}.

+	 */

+	public PapyrusConnectionEndpointHandle(int endPoint) {

+		super(endPoint);

+	}

+

+	/**

+	 * Creates and returns a new {@link PapyrusConnectionEndpointTracker}.

+	 * 

+	 * @return the new ConnectionEndpointTracker

+	 */

+	protected DragTracker createDragTracker() {

+		if(isFixed()) {

+			return null;

+		}

+		PapyrusConnectionEndpointTracker tracker = new PapyrusConnectionEndpointTracker((ConnectionEditPart)getOwner());

+		if(getEndPoint() == ConnectionLocator.SOURCE) {

+			tracker.setCommandName(RequestConstants.REQ_RECONNECT_SOURCE);

+		} else {

+			tracker.setCommandName(RequestConstants.REQ_RECONNECT_TARGET);

+		}

+		tracker.setDefaultCursor(getCursor());

+		return tracker;

+	}

+

+}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/PapyrusConnectionEndpointTracker.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/PapyrusConnectionEndpointTracker.java
new file mode 100644
index 00000000000..424706486f5
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/PapyrusConnectionEndpointTracker.java
@@ -0,0 +1,105 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2010 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.papyrus.infra.gmfdiag.common.snap;

+

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.PrecisionPoint;

+import org.eclipse.draw2d.geometry.PrecisionRectangle;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.gef.ConnectionEditPart;

+import org.eclipse.gef.DragTracker;

+import org.eclipse.gef.SnapToHelper;

+import org.eclipse.gef.requests.ReconnectRequest;

+import org.eclipse.papyrus.infra.gmfdiag.common.snap.copy.ConnectionEndpointTracker;

+

+/**

+ * A DragTracker that moves the endpoint of a connection to a grid point

+ */

+public class PapyrusConnectionEndpointTracker extends ConnectionEndpointTracker implements DragTracker {

+

+	/**

+	 * Constructs a new ConnectionEndpointTracker for the given

+	 * ConnectionEditPart.

+	 * 

+	 * @param cep

+	 *        the ConnectionEditPart

+	 */

+	public PapyrusConnectionEndpointTracker(ConnectionEditPart cep) {

+		super(cep);

+	}

+

+

+	/**

+	 * Updates the request location.

+	 * 

+	 * @see org.eclipse.gef.tools.TargetingTool#updateTargetRequest()

+	 */

+	protected void updateTargetRequest() {

+		//adapted code from ConnectionBendpointTrackerEx

+		ReconnectRequest request = (ReconnectRequest)getTargetRequest();

+		//		Request request = getTargetRequest();

+

+		Point originalLocation = null;

+		if(originalLocation == null) {

+			originalLocation = getStartLocation().getCopy();

+		}

+

+		Dimension delta = getDragMoveDelta();

+

+		if(getCurrentInput().isShiftKeyDown()) {

+			float ratio = 0;

+			if(delta.width != 0)

+				ratio = (float)delta.height / (float)delta.width;

+

+			ratio = Math.abs(ratio);

+			if(ratio > 0.5 && ratio < 1.5) {

+				if(Math.abs(delta.height) > Math.abs(delta.width)) {

+					if(delta.height > 0)

+						delta.height = Math.abs(delta.width);

+					else

+						delta.height = -Math.abs(delta.width);

+				} else {

+					if(delta.width > 0)

+						delta.width = Math.abs(delta.height);

+					else

+						delta.width = -Math.abs(delta.height);

+				}

+			} else {

+				if(Math.abs(delta.width) > Math.abs(delta.height))

+					delta.height = 0;

+				else

+					delta.width = 0;

+			}

+		}

+		Point moveDelta = new Point(delta.width, delta.height);

+		SnapToHelper snapToHelper = (SnapToHelper)getConnectionEditPart().getAdapter(SnapToHelper.class);

+

+		Rectangle rect = new Rectangle(originalLocation.x, originalLocation.y, 1, 1);

+		PrecisionRectangle sourceRectangle = null;

+		if(sourceRectangle == null) {

+			sourceRectangle = new PrecisionRectangle(rect);

+		}

+

+		if(snapToHelper != null && !getCurrentInput().isModKeyDown(MODIFIER_NO_SNAPPING)) {

+			PrecisionRectangle baseRect = sourceRectangle.getPreciseCopy();

+			baseRect.translate(moveDelta);

+			PrecisionPoint preciseDelta = new PrecisionPoint(moveDelta);

+			snapToHelper.snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[]{ baseRect }, preciseDelta);

+			Point newLocation = originalLocation.getCopy().translate(preciseDelta);

+			request.setLocation(newLocation);

+		} else {

+			request.setLocation(getLocation());

+		}

+	}

+

+}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/PapyrusDragBorderNodeEditPartTrackerEx.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/PapyrusDragBorderNodeEditPartTrackerEx.java
new file mode 100644
index 00000000000..496e2de73dc
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/PapyrusDragBorderNodeEditPartTrackerEx.java
@@ -0,0 +1,59 @@
+/*****************************************************************************

+ * 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:

+ *		

+ *		CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.gmfdiag.common.snap;

+

+import org.eclipse.gef.EditPart;

+

+/**

+ * 

+ * @author vl222926

+ * 

+ */

+public class PapyrusDragBorderNodeEditPartTrackerEx extends PapyrusDragEditPartsTrackerEx {

+

+	/**

+	 * 

+	 * Constructor.

+	 * 

+	 * @param sourceEditPart

+	 */

+	public PapyrusDragBorderNodeEditPartTrackerEx(EditPart sourceEditPart) {

+		this(sourceEditPart, false, true, true);

+	}

+

+	/**

+	 * 

+	 * Constructor.

+	 * 

+	 * @param sourceEditPart

+	 * @param snapOnCorners

+	 * @param snapOnMiddles

+	 * @param snapOnCenter

+	 */

+	public PapyrusDragBorderNodeEditPartTrackerEx(EditPart sourceEditPart, boolean snapOnCorners, boolean snapOnMiddles, boolean snapOnCenter) {

+		super(sourceEditPart, snapOnCorners, snapOnMiddles, snapOnCenter);

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.papyrus.infra.gmfdiag.common.snap.copy.CustomDragEditPartsTracker#isMove()

+	 * 

+	 * @return

+	 */

+	@Override

+	protected boolean isMove() {

+		return true;//see org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractBorderItemEditPart.getEditPartTracker

+	}

+

+}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/PapyrusDragEditPartsTrackerEx.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/PapyrusDragEditPartsTrackerEx.java
new file mode 100644
index 00000000000..932f42f57d8
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/PapyrusDragEditPartsTrackerEx.java
@@ -0,0 +1,262 @@
+/******************************************************************************

+ * Copyright (c) 2002, 2008 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    IBM Corporation - initial API and implementation 

+ ****************************************************************************/

+

+package org.eclipse.papyrus.infra.gmfdiag.common.snap;

+

+import java.util.ArrayList;

+import java.util.HashMap;

+import java.util.List;

+import java.util.Map;

+

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.PrecisionPoint;

+import org.eclipse.draw2d.geometry.PrecisionRectangle;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.requests.ChangeBoundsRequest;

+import org.eclipse.gmf.runtime.diagram.ui.internal.ruler.SnapToHelperUtil;

+import org.eclipse.papyrus.infra.gmfdiag.common.snap.copy.DragEditPartsTrackerEx;

+

+/**

+ * A dervied DragEditPartsTRacker that sends REQ_DRAG instead of REQ_ORPHAN

+ * and REQ_DROP instead of REQ_ADD

+ * 

+ * @author melaasar

+ */

+//TODO see Bug 424007. CustomDragEditPartsTracker and others classes in package snap.copy will be destroyed when the gef bug 424007 will be resolved.

+@SuppressWarnings("restriction")

+public class PapyrusDragEditPartsTrackerEx extends DragEditPartsTrackerEx {

+

+	/**

+	 * if true, we snap on the four corner of the figures

+	 */

+	protected final boolean snapOnCorners;

+

+	/**

+	 * if true, we snap on the four middle side of the figures

+	 */

+	protected final boolean snapOnMiddles;

+

+	/**

+	 * if true, we snap on the center of the figure

+	 */

+	protected final boolean snapOnCenter;

+

+

+	/**

+	 * @param sourceEditPart

+	 */

+	public PapyrusDragEditPartsTrackerEx(final EditPart sourceEditPart) {

+		this(sourceEditPart, true, false, false);

+	}

+

+	/**

+	 * 

+	 * Constructor.

+	 * 

+	 * @param sourceEditPart

+	 * @param snapOnCorners

+	 * @param snapOnMiddles

+	 * @param snapOnCenter

+	 */

+	public PapyrusDragEditPartsTrackerEx(final EditPart sourceEditPart, final boolean snapOnCorners, final boolean snapOnMiddles, final boolean snapOnCenter) {

+		super(sourceEditPart);

+		this.snapOnCorners = snapOnCorners;

+		this.snapOnMiddles = snapOnMiddles;

+		this.snapOnCenter = snapOnCenter;

+	}

+

+	/**

+	 * This method can be overridden by clients to customize the snapping

+	 * behavior.

+	 * 

+	 * @param request

+	 *        the <code>ChangeBoundsRequest</code> from which the move delta

+	 *        can be extracted and updated

+	 * @since 3.4

+	 */

+	@SuppressWarnings({ "unchecked" })

+	protected void snapPoint(ChangeBoundsRequest request) {

+		if(getSnapToHelper() != null && request.isSnapToEnabled()) {

+			int restrictedDirection = 0;

+			restrictedDirection = restrictedDirection | PositionConstants.EAST;

+			restrictedDirection = restrictedDirection | PositionConstants.WEST;

+			restrictedDirection = restrictedDirection | PositionConstants.SOUTH;

+			restrictedDirection = restrictedDirection | PositionConstants.NORTH;

+			request.getExtendedData().put(SnapToHelperUtil.RESTRICTED_DIRECTIONS, restrictedDirection);

+

+			final Map<Double, PrecisionPoint> distVSPoint = new HashMap<Double, PrecisionPoint>();

+			if(this.snapOnCorners) {

+				distVSPoint.putAll(getCornerDistances(request));

+			}

+

+			if(this.snapOnMiddles) {

+				distVSPoint.putAll(getMiddleDistances(request));

+			}

+

+			if(this.snapOnCenter) {

+				distVSPoint.putAll(getCenterDistances(request));

+			}

+

+			final List<Double> distances = new ArrayList<Double>(distVSPoint.keySet());

+			if(distances.size() > 0) {

+				double min = distances.get(0);

+				for(int i = 1; i < distances.size() - 1; i++) {

+					min = Math.min(min, distances.get(i));

+				}

+				request.setMoveDelta(distVSPoint.get(min));

+			}

+		}

+	}

+

+	/**

+	 * 

+	 * @param request

+	 * @return

+	 *         a map with the couple distance and delta point to anchor by the corner of the figure

+	 */

+	protected Map<Double, PrecisionPoint> getCornerDistances(final ChangeBoundsRequest request) {

+		final Map<Double, PrecisionPoint> distVSPoints = new HashMap<Double, PrecisionPoint>();

+		if(getSnapToHelper() != null && request.isSnapToEnabled()) {

+			final Point moveDelta = request.getMoveDelta();

+			PrecisionRectangle jointRect = getCompoundSourceRectangle();

+			jointRect.translate(moveDelta);

+

+			//calculate the delta to anchor on the top left corner

+			final PrecisionPoint topLeftCornerDelta = new PrecisionPoint(moveDelta);

+			final PrecisionRectangle baseRectTopLeft = getSourceRectangle();

+			baseRectTopLeft.translate(moveDelta);

+			getSnapToHelper().snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[]{ baseRectTopLeft, jointRect }, topLeftCornerDelta);

+

+			//calculate the delta to anchor on the top right corner

+			final PrecisionPoint topRightCornerDelta = new PrecisionPoint(moveDelta);

+			final PrecisionRectangle baseRectTopRight = getSourceRectangle();

+			baseRectTopRight.setX(baseRectTopRight.x + baseRectTopRight.width);

+			baseRectTopRight.translate(moveDelta);

+			getSnapToHelper().snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[]{ baseRectTopRight, jointRect }, topRightCornerDelta);

+

+			//calculate the delta to anchor on the bottom left corner

+			final PrecisionPoint bottomLeftCornerDelta = new PrecisionPoint(moveDelta);

+			final PrecisionRectangle baseRectBottomLeft = getSourceRectangle();

+			baseRectBottomLeft.setY(baseRectBottomLeft.y + baseRectBottomLeft.height);

+			baseRectBottomLeft.translate(moveDelta);

+			getSnapToHelper().snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[]{ baseRectBottomLeft, jointRect }, bottomLeftCornerDelta);

+

+			//calculate the delta to anchor on the bottom right corner

+			final PrecisionPoint bottomRightCornerDelta = new PrecisionPoint(moveDelta);

+			final PrecisionRectangle baseRectBottomRight = getSourceRectangle();

+			baseRectBottomRight.setX(baseRectBottomRight.x + baseRectBottomRight.width);

+			baseRectBottomRight.setY(baseRectBottomRight.y + baseRectBottomRight.height);

+			baseRectBottomRight.translate(moveDelta);

+			getSnapToHelper().snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[]{ baseRectBottomRight, jointRect }, bottomRightCornerDelta);

+

+			final Point ref = baseRectTopLeft.getTopLeft();

+			distVSPoints.put(distance(ref, topLeftCornerDelta), topLeftCornerDelta);

+			distVSPoints.put(distance(ref, topRightCornerDelta), topRightCornerDelta);

+			distVSPoints.put(distance(ref, bottomLeftCornerDelta), bottomLeftCornerDelta);

+			distVSPoints.put(distance(ref, bottomRightCornerDelta), bottomRightCornerDelta);

+		}

+		return distVSPoints;

+	}

+

+	/**

+	 * 

+	 * @param request

+	 * @return

+	 *         a map with the couple distance and delta point to anchor by the middle of each side of the figure

+	 */

+	protected Map<Double, PrecisionPoint> getMiddleDistances(final ChangeBoundsRequest request) {

+		final Map<Double, PrecisionPoint> distVSPoints = new HashMap<Double, PrecisionPoint>();

+		if(getSnapToHelper() != null && request.isSnapToEnabled()) {

+			final Point moveDelta = request.getMoveDelta();

+

+			PrecisionRectangle jointRect = getCompoundSourceRectangle();

+			jointRect.translate(moveDelta);

+			//calculate the delta to anchor on the middle top point

+			final PrecisionPoint middleTopDelta = new PrecisionPoint(moveDelta);

+			final PrecisionRectangle baseRectMiddleTop = getSourceRectangle();

+			baseRectMiddleTop.setPreciseLocation(baseRectMiddleTop.preciseX() + (baseRectMiddleTop.preciseWidth() / 2), baseRectMiddleTop.preciseY());

+			baseRectMiddleTop.translate(moveDelta);

+			getSnapToHelper().snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[]{ baseRectMiddleTop, jointRect }, middleTopDelta);

+

+			//calculate the delta to anchor on the middle left point

+			final PrecisionPoint middleLeftDelta = new PrecisionPoint(moveDelta);

+			final PrecisionRectangle baseRectMiddleLeft = getSourceRectangle();

+			baseRectMiddleLeft.setPreciseLocation(baseRectMiddleLeft.preciseX(), baseRectMiddleLeft.preciseY() + (baseRectMiddleLeft.preciseWidth() / 2));

+			baseRectMiddleLeft.translate(moveDelta);

+			getSnapToHelper().snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[]{ baseRectMiddleLeft, jointRect }, middleLeftDelta);

+

+			//calculate the delta to anchor on the middle right point

+			final PrecisionPoint middleRightDelta = new PrecisionPoint(moveDelta);

+			final PrecisionRectangle baseRectMiddleRight = getSourceRectangle();

+			baseRectMiddleRight.setPreciseLocation(baseRectMiddleRight.preciseX() + baseRectMiddleRight.preciseWidth(), baseRectMiddleRight.preciseY() + (baseRectMiddleRight.preciseHeight() / 2));

+			baseRectMiddleRight.translate(moveDelta);

+			getSnapToHelper().snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[]{ baseRectMiddleRight, jointRect }, middleRightDelta);

+

+			//calculate the delta to anchor on the middle bottom

+			final PrecisionPoint middleBottomDelta = new PrecisionPoint(moveDelta);

+			final PrecisionRectangle baseRectMiddleBottom = getSourceRectangle();

+			baseRectMiddleBottom.setPreciseLocation(baseRectMiddleBottom.preciseX() + (baseRectMiddleBottom.preciseWidth() / 2), baseRectMiddleBottom.preciseY() + baseRectMiddleBottom.preciseHeight());

+			baseRectMiddleBottom.translate(moveDelta);

+			getSnapToHelper().snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[]{ baseRectMiddleBottom, jointRect }, middleBottomDelta);

+

+			final Point ref = baseRectMiddleTop.getTopLeft();

+			distVSPoints.put(distance(ref, middleTopDelta), middleTopDelta);

+			distVSPoints.put(distance(ref, middleLeftDelta), middleLeftDelta);

+			distVSPoints.put(distance(ref, middleRightDelta), middleRightDelta);

+			distVSPoints.put(distance(ref, middleBottomDelta), middleBottomDelta);

+		}

+

+		return distVSPoints;

+	}

+

+	/**

+	 * 

+	 * @param request

+	 * @return

+	 *         a map with the couple distance and delta point to anchor by the center of the figure

+	 */

+	protected Map<Double, PrecisionPoint> getCenterDistances(final ChangeBoundsRequest request) {

+		final Map<Double, PrecisionPoint> distVSPoints = new HashMap<Double, PrecisionPoint>();

+		if(getSnapToHelper() != null && request.isSnapToEnabled()) {

+			final Point moveDelta = request.getMoveDelta();

+

+			PrecisionRectangle jointRect = getCompoundSourceRectangle();

+			jointRect.translate(moveDelta);

+			//calculate the delta to anchor on the middle top point

+			final PrecisionPoint centerDelta = new PrecisionPoint(moveDelta);

+			final PrecisionRectangle baseRectCenter = getSourceRectangle();

+			baseRectCenter.setPreciseLocation(baseRectCenter.preciseX() + (baseRectCenter.preciseWidth() / 2), baseRectCenter.preciseY() + (baseRectCenter.preciseHeight() / 2));

+			baseRectCenter.translate(moveDelta);

+			getSnapToHelper().snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[]{ baseRectCenter, jointRect }, centerDelta);

+

+			final Point ref = baseRectCenter.getTopLeft();

+			distVSPoints.put(distance(ref, centerDelta), centerDelta);

+		}

+

+		return distVSPoints;

+	}

+

+	/**

+	 * 

+	 * @param pt1

+	 *        a first point

+	 * @param pt2

+	 *        the second point

+	 * @return

+	 *         the distance between the two points

+	 */

+	protected final double distance(final Point pt1, final Point pt2) {

+		double deltaX = pt1.preciseX() - pt2.preciseX();

+		double deltaY = pt1.preciseY() - pt2.preciseY();

+		return Math.hypot(deltaX, deltaY);

+	}

+}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/copy/AbstractTool.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/copy/AbstractTool.java
new file mode 100644
index 00000000000..78e1d79ef03
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/copy/AbstractTool.java
@@ -0,0 +1,1755 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2010 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.papyrus.infra.gmfdiag.common.snap.copy;

+

+import java.beans.IntrospectionException;

+import java.beans.Introspector;

+import java.beans.PropertyDescriptor;

+import java.lang.reflect.InvocationTargetException;

+import java.lang.reflect.Method;

+import java.util.ArrayList;

+import java.util.Date;

+import java.util.Iterator;

+import java.util.List;

+import java.util.Map;

+import java.util.Map.Entry;

+

+import org.eclipse.core.runtime.Platform;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.gef.DragTracker;

+import org.eclipse.gef.EditDomain;

+import org.eclipse.gef.EditPartViewer;

+import org.eclipse.gef.LayerConstants;

+import org.eclipse.gef.MouseWheelHandler;

+import org.eclipse.gef.RequestConstants;

+import org.eclipse.gef.Tool;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.CommandStackEvent;

+import org.eclipse.gef.commands.CommandStackEventListener;

+import org.eclipse.gef.editparts.LayerManager;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.dnd.DragSourceEvent;

+import org.eclipse.swt.events.FocusEvent;

+import org.eclipse.swt.events.KeyEvent;

+import org.eclipse.swt.events.MouseEvent;

+import org.eclipse.swt.events.TraverseEvent;

+import org.eclipse.swt.graphics.Cursor;

+import org.eclipse.swt.graphics.Rectangle;

+import org.eclipse.swt.widgets.Control;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.swt.widgets.Event;

+import org.eclipse.swt.widgets.Scrollable;

+

+/**

+ * The base implementation for {@link Tool}s. The base implementation provides a

+ * framework for a <EM>state machine</EM> which processes mouse and keyboard

+ * input. The state machine consists of a series of states identified by

+ * <code>int</code>s. Each mouse or keyboard event results in a transition,

+ * sometimes to the same state in which the input was received. The interesting

+ * transitions have corresponding actions assigned to them, such as

+ * {@link #handleDragStarted()}.

+ * <P>

+ * The base implementation performs <EM>no</em> state transitions by default,

+ * but does route events to different method handlers based on state. It is up

+ * to subclasses to set the appropriate states.

+ * <P>

+ * There are two broad "categories" of methods on AbstractTool. There are the

+ * methods defined on the {@link Tool} interface which handle the job of

+ * receiving raw user input. For example,

+ * {@link #mouseDrag(MouseEvent, EditPartViewer)}. Then, there are the methods

+ * which correspond to higher-level interpretation of these events, such as

+ * {@link #handleDragInProgress()}, which is called from

+ * <code>mouseMove(...)</code>, but <em>only</em> when the drag threshold has

+ * been passed. These methods are generally more subclass-friendly. Subclasses

+ * should <em>not</em> override the methods which receive raw input.

+ */

+public abstract class AbstractTool extends org.eclipse.gef.util.FlagSupport

+		implements Tool, RequestConstants {

+

+	/**

+	 * The property to be used in {@link #setProperties(Map)} for

+	 * {@link #setUnloadWhenFinished(boolean)}

+	 */

+	public static final Object PROPERTY_UNLOAD_WHEN_FINISHED = "unloadWhenFinished"; //$NON-NLS-1$

+

+	private static final int DRAG_THRESHOLD = 5;

+	private static final int FLAG_ACTIVE = 8;

+	private static final int FLAG_HOVER = 2;

+	private static final int FLAG_PAST_THRESHOLD = 1;

+	private static final int FLAG_UNLOAD = 4;

+	{

+		setFlag(FLAG_UNLOAD, true);

+	}

+

+	/**

+	 * The highest-bit flag being used.

+	 */

+	protected static final int MAX_FLAG = 8;

+

+	/**

+	 * The maximum state flag defined by this class

+	 */

+	protected static final int MAX_STATE = 32;

+

+	/**

+	 * constant used for mouse button 1.

+	 * 

+	 * @deprecated Use {@link SWT#BUTTON1} instead.

+	 */

+	protected static final int MOUSE_BUTTON1 = SWT.BUTTON1;

+	/**

+	 * constant used for mouse button 2.

+	 * 

+	 * @deprecated Use {@link SWT#BUTTON2} instead.

+	 */

+	protected static final int MOUSE_BUTTON2 = SWT.BUTTON2;

+	/**

+	 * constant used for mouse button 3.

+	 * 

+	 * @deprecated Use {@link SWT#BUTTON3} instead.

+	 */

+	protected static final int MOUSE_BUTTON3 = SWT.BUTTON3;

+	/**

+	 * constant used to indicate any of the mouse buttons.

+	 * 

+	 * @deprecated Use {@link SWT#BUTTON_MASK} instead.

+	 */

+	protected static final int MOUSE_BUTTON_ANY = SWT.BUTTON_MASK;

+

+	/**

+	 * The state indicating that the keyboard is being used to perform a drag

+	 * that is normally done using the mouse.

+	 */

+	protected static final int STATE_ACCESSIBLE_DRAG = 16;

+

+	/**

+	 * The state indicating that a keyboard drag is in progress. The threshold

+	 * for keyboard drags is non-existent, so this state would be entered very

+	 * quickly.

+	 */

+	protected static final int STATE_ACCESSIBLE_DRAG_IN_PROGRESS = 32;

+

+	/**

+	 * The state indicating that one or more buttons are pressed, but the user

+	 * has not moved past the drag threshold. Many tools will do nothing during

+	 * this state but wait until {@link #STATE_DRAG_IN_PROGRESS} is entered.

+	 */

+	protected static final int STATE_DRAG = 2;

+

+	/**

+	 * The state indicating that the drag detection theshold has been passed,

+	 * and a drag is in progress.

+	 */

+	protected static final int STATE_DRAG_IN_PROGRESS = 4;

+

+	/**

+	 * The first state that a tool is in. The tool will generally be in this

+	 * state immediately following {@link #activate()}.

+	 */

+	protected static final int STATE_INITIAL = 1;

+

+	/**

+	 * The state indicating that an input event has invalidated the interaction.

+	 * For example, during a mouse drag, pressing additional mouse button might

+	 * invalidate the drag.

+	 */

+	protected static final int STATE_INVALID = 8;

+

+	/**

+	 * The final state for a tool to be in. Once a tool reaches this state, it

+	 * will not change states until it is activated() again.

+	 */

+	protected static final int STATE_TERMINAL = 1 << 30;

+

+	/**

+	 * Key modifier for ignoring snap while dragging. It's CTRL on Mac, and ALT

+	 * on all other platforms.

+	 */

+	protected static final int MODIFIER_NO_SNAPPING;

+

+	static {

+		if (Platform.OS_MACOSX.equals(Platform.getOS())) {

+			MODIFIER_NO_SNAPPING = SWT.CTRL;

+		} else {

+			MODIFIER_NO_SNAPPING = SWT.ALT;

+		}

+	}

+

+	private long accessibleBegin;

+

+	private int accessibleStep;

+	private Command command;

+

+	private CommandStackEventListener commandStackListener = new CommandStackEventListener() {

+		public void stackChanged(CommandStackEvent event) {

+			if (event.isPreChangeEvent())

+				handleCommandStackChanged();

+		}

+	};

+	private Input current;

+	private EditPartViewer currentViewer;

+	private Cursor defaultCursor, disabledCursor;

+	private EditDomain domain;

+	private List operationSet;

+	private int startX, startY, state;

+

+	boolean acceptAbort(KeyEvent e) {

+		return e.character == SWT.ESC;

+	}

+

+	/**

+	 * Returns true if the event corresponds to an arrow key with the

+	 * appropriate modifiers and if the system is in a state where the arrow key

+	 * should be accepted.

+	 * 

+	 * @param e

+	 *            the key event

+	 * @return true if the arrow key should be accepted by this tool

+	 * @since 3.4

+	 */

+	protected boolean acceptArrowKey(KeyEvent e) {

+		int key = e.keyCode;

+		if (!(isInState(STATE_INITIAL | STATE_ACCESSIBLE_DRAG

+				| STATE_ACCESSIBLE_DRAG_IN_PROGRESS)))

+			return false;

+		return (key == SWT.ARROW_UP) || (key == SWT.ARROW_RIGHT)

+				|| (key == SWT.ARROW_DOWN) || (key == SWT.ARROW_LEFT);

+	}

+

+	boolean acceptDragCommit(KeyEvent e) {

+		return isInState(STATE_ACCESSIBLE_DRAG_IN_PROGRESS)

+				&& e.character == 13;

+	}

+

+	int accGetStep() {

+		return accessibleStep;

+	}

+

+	void accStepIncrement() {

+		if (accessibleBegin == -1) {

+			accessibleBegin = new Date().getTime();

+			accessibleStep = 1;

+		} else {

+			accessibleStep = 4;

+			long elapsed = new Date().getTime() - accessibleBegin;

+			if (elapsed > 1000)

+				accessibleStep = Math.min(16, (int) (elapsed / 150));

+		}

+	}

+

+	void accStepReset() {

+		accessibleBegin = -1;

+	}

+

+	/**

+	 * Activates the tool. Any initialization should be performed here. This

+	 * method is called when a tool is selected.

+	 * 

+	 * @see #deactivate()

+	 */

+	public void activate() {

+		resetFlags();

+		accessibleBegin = -1;

+		getCurrentInput().verifyMouseButtons = true;

+		setState(STATE_INITIAL);

+		setFlag(FLAG_ACTIVE, true);

+		getDomain().getCommandStack().addCommandStackEventListener(

+				commandStackListener);

+	}

+

+	/**

+	 * Convenience method to add the given figure to the feedback layer.

+	 * 

+	 * @param figure

+	 *            the feedback being added

+	 */

+	protected void addFeedback(IFigure figure) {

+		LayerManager lm = (LayerManager) getCurrentViewer()

+				.getEditPartRegistry().get(LayerManager.ID);

+		if (lm == null)

+			return;

+		lm.getLayer(LayerConstants.FEEDBACK_LAYER).add(figure);

+	}

+

+	/**

+	 * This method is invoked from {@link #setProperties(Map)}. Sub-classes can

+	 * override to add support for more properties. This method should fail

+	 * silently in case of any error.

+	 * <p>

+	 * AbstractTool uses introspection to match any keys with properties. For

+	 * instance, the key "defaultCursor" would lead to the invocation of

+	 * {@link #setDefaultCursor(Cursor)} with the provided value.

+	 * 

+	 * @param key

+	 *            the key; may be <code>null</code>

+	 * @param value

+	 *            the new value

+	 * @since 3.1

+	 * @see #setProperties(Map)

+	 */

+	protected void applyProperty(Object key, Object value) {

+		if (PROPERTY_UNLOAD_WHEN_FINISHED.equals(key)) {

+			if (value instanceof Boolean)

+				setUnloadWhenFinished(((Boolean) value).booleanValue());

+			return;

+		}

+

+		if (!(key instanceof String))

+			return;

+

+		try {

+			PropertyDescriptor[] descriptors = Introspector.getBeanInfo(

+					getClass(), Introspector.IGNORE_ALL_BEANINFO)

+					.getPropertyDescriptors();

+			PropertyDescriptor property = null;

+			for (int i = 0; i < descriptors.length; i++) {

+				if (descriptors[i].getName().equals(key)) {

+					property = descriptors[i];

+					break;

+				}

+			}

+			if (property != null) {

+				Method setter = property.getWriteMethod();

+				// setter.setAccessible(true);

+				setter.invoke(this, new Object[] { value });

+			}

+		} catch (IntrospectionException ie) {

+		} catch (IllegalAccessException iae) {

+		} catch (InvocationTargetException ite) {

+		} catch (SecurityException se) {

+		}

+	}

+

+	/**

+	 * Returns the appropriate cursor for the tools current state. If the tool

+	 * is in its terminal state, <code>null</code> is returned. Otherwise,

+	 * either the default or disabled cursor is returned, based on the existence

+	 * of a current command, and whether that current command is executable.

+	 * <P>

+	 * Subclasses may override or extend this method to calculate the

+	 * appropriate cursor based on other conditions.

+	 * 

+	 * @see #getDefaultCursor()

+	 * @see #getDisabledCursor()

+	 * @see #getCurrentCommand()

+	 * @return <code>null</code> or a cursor to be displayed.

+	 */

+	protected Cursor calculateCursor() {

+		if (isInState(STATE_TERMINAL))

+			return null;

+		Command command = getCurrentCommand();

+		if (command == null || !command.canExecute())

+			return getDisabledCursor();

+		return getDefaultCursor();

+	}

+

+	/**

+	 * Added for compatibility. {@link DragTracker#commitDrag()} was added for

+	 * accessibility reasons. Since all tool implementations must inherit from

+	 * this base class, then implementing this method here avoids breaking

+	 * subclasses that implemented the {@link DragTracker} interface.

+	 */

+	public void commitDrag() {

+	}

+

+	/**

+	 * Returns a new List of editparts that this tool is operating on. This

+	 * method is called once during {@link #getOperationSet()}, and its result

+	 * is cached.

+	 * <P>

+	 * By default, the operations set is the current viewer's entire selection.

+	 * Subclasses may override this method to filter or alter the operation set

+	 * as necessary.

+	 * 

+	 * @return a list of editparts being operated on

+	 */

+	protected List createOperationSet() {

+		return new ArrayList(getCurrentViewer().getSelectedEditParts());

+	}

+

+	/**

+	 * Deactivates the tool. This method is called whenever the user switches to

+	 * another tool. Use this method to do some clean-up when the tool is

+	 * switched. The abstract tool allows cursors for viewers to be changed.

+	 * When the tool is deactivated it must revert to normal the cursor of the

+	 * last tool it changed.

+	 * 

+	 * @see #activate()

+	 */

+	public void deactivate() {

+		setFlag(FLAG_ACTIVE, false);

+		setViewer(null);

+		setCurrentCommand(null);

+		setState(STATE_TERMINAL);

+		operationSet = null;

+		current = null;

+		getDomain().getCommandStack().removeCommandStackEventListener(

+				commandStackListener);

+	}

+

+	/**

+	 * Prints a string in the GEF Debug console if the Tools debug option is

+	 * selected.

+	 * 

+	 * @param message

+	 *            a message for the debug trace tool

+	 * @deprecated

+	 */

+	protected void debug(String message) {

+	}

+

+	/**

+	 * Executes the given command on the command stack.

+	 * 

+	 * @since 3.1

+	 * @param command

+	 *            the command to execute

+	 */

+	protected void executeCommand(Command command) {

+		getDomain().getCommandStack().removeCommandStackEventListener(

+				commandStackListener);

+		try {

+			getDomain().getCommandStack().execute(command);

+		} finally {

+			getDomain().getCommandStack().addCommandStackEventListener(

+					commandStackListener);

+		}

+	}

+

+	/**

+	 * Execute the currently active command.

+	 */

+	protected void executeCurrentCommand() {

+		Command curCommand = getCurrentCommand();

+		if (curCommand != null && curCommand.canExecute())

+			executeCommand(curCommand);

+		setCurrentCommand(null);

+	}

+

+	/**

+	 * Called when a viewer that the editor controls gains focus.

+	 * 

+	 * @param event

+	 *            The SWT focus event

+	 * @param viewer

+	 *            The viewer that the focus event is over.

+	 */

+	public void focusGained(FocusEvent event, EditPartViewer viewer) {

+		setViewer(viewer);

+		handleFocusGained();

+	}

+

+	/**

+	 * Called when a viewer that the editor controls loses focus.

+	 * 

+	 * @param event

+	 *            The SWT focus event

+	 * @param viewer

+	 *            The viewer that the focus event is over.

+	 */

+	public void focusLost(FocusEvent event, EditPartViewer viewer) {

+		setViewer(viewer);

+		handleFocusLost();

+	}

+

+	/**

+	 * Returns a new, updated command based on the tool's current properties.

+	 * The default implementation returns an unexecutable command. Some tools do

+	 * not work commands and the model, but simply change the viewer's state in

+	 * some way.

+	 * 

+	 * @return a newly obtained command

+	 */

+	protected Command getCommand() {

+		return org.eclipse.gef.commands.UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * Returns the identifier of the command that is being sought. This name is

+	 * also the named that will be logged in the debug view.

+	 * 

+	 * @return the identifier for the command

+	 */

+	protected abstract String getCommandName();

+

+	/**

+	 * Returns the currently cached command.

+	 * 

+	 * @return the current command

+	 * @see #setCurrentCommand(Command)

+	 */

+	protected Command getCurrentCommand() {

+		return command;

+	}

+

+	/**

+	 * Returns the input object encapsulating the current mouse and keyboard

+	 * state.

+	 * 

+	 * @return the current input

+	 */

+	protected Input getCurrentInput() {

+		if (current == null)

+			current = new Input();

+		return current;

+	}

+

+	/**

+	 * Return the viewer that the tool is currently receiving input from, or

+	 * <code>null</code>. The last viewer to dispatch an event is defined as the

+	 * current viewer. Current viewer is automatically updated as events are

+	 * received, and is set to <code>null</code> on <code>deactivate()</code>.

+	 * 

+	 * @return the current viewer

+	 */

+	protected EditPartViewer getCurrentViewer() {

+		return currentViewer;

+	}

+

+	/**

+	 * Returns the debug name for this tool.

+	 * 

+	 * @return the debug name

+	 */

+	protected String getDebugName() {

+		return getClass().getName();

+	}

+

+	/**

+	 * Returns a String representation of the given state for debug purposes.

+	 * 

+	 * @param state

+	 *            the state

+	 * @return the string for the given state

+	 */

+	protected String getDebugNameForState(int state) {

+		switch (state) {

+		case STATE_INITIAL:

+			return "Initial State";//$NON-NLS-1$

+		case STATE_DRAG:

+			return "Drag State";//$NON-NLS-1$

+		case STATE_DRAG_IN_PROGRESS:

+			return "Drag In Progress State";//$NON-NLS-1$

+		case STATE_INVALID:

+			return "Invalid State"; //$NON-NLS-1$

+		case STATE_TERMINAL:

+			return "Terminal State"; //$NON-NLS-1$

+		case STATE_ACCESSIBLE_DRAG:

+			return "Accessible Drag"; //$NON-NLS-1$

+		case STATE_ACCESSIBLE_DRAG_IN_PROGRESS:

+			return "Accessible Drag In Progress"; //$NON-NLS-1$

+		}

+		return "Unknown state:";//$NON-NLS-1$

+	}

+

+	/**

+	 * Returns the cursor used under normal conditions.

+	 * 

+	 * @see #setDefaultCursor(Cursor)

+	 * @return the default cursor

+	 */

+	protected Cursor getDefaultCursor() {

+		return defaultCursor;

+	}

+

+	/**

+	 * Returns the cursor used under abnormal conditions.

+	 * 

+	 * @see #calculateCursor()

+	 * @see #setDisabledCursor(Cursor)

+	 * @return the disabled cursor

+	 */

+	protected Cursor getDisabledCursor() {

+		if (disabledCursor != null)

+			return disabledCursor;

+		return getDefaultCursor();

+	}

+

+	/**

+	 * Returns the EditDomain. A tool is told its EditDomain when it becomes

+	 * active. A tool may need to know its edit domain prior to receiving any

+	 * events from any of that domain's viewers.

+	 * 

+	 * @return the editdomain

+	 */

+	protected EditDomain getDomain() {

+		return domain;

+	}

+

+	/**

+	 * Return the number of pixels that the mouse has been moved since that drag

+	 * was started. The drag start is determined by where the mouse button was

+	 * first pressed.

+	 * 

+	 * @see #getStartLocation()

+	 * @return the drag delta

+	 */

+	protected Dimension getDragMoveDelta() {

+		return getLocation().getDifference(getStartLocation());

+	}

+

+	/**

+	 * Returns the current x, y position of the mouse cursor.

+	 * 

+	 * @return the mouse location

+	 */

+	protected Point getLocation() {

+		return new Point(getCurrentInput().getMouseLocation());

+	}

+

+	/**

+	 * Lazily creates and returns the list of editparts on which the tool

+	 * operates. The list is initially <code>null</code>, in which case

+	 * {@link #createOperationSet()} is called, and its results cached until the

+	 * tool is deactivated.

+	 * 

+	 * @return the operation set.

+	 */

+	protected List getOperationSet() {

+		if (operationSet == null)

+			operationSet = createOperationSet();

+		return operationSet;

+	}

+

+	/**

+	 * Returns the starting mouse location for the current tool operation. This

+	 * is typically the mouse location where the user first pressed a mouse

+	 * button. This is important for tools that interpret mouse drags.

+	 * 

+	 * @return the start location

+	 */

+	protected Point getStartLocation() {

+		return new Point(startX, startY);

+	}

+

+	/**

+	 * Returns the tool's current state.

+	 * 

+	 * @return the current state

+	 */

+	protected int getState() {

+		return state;

+	}

+

+	/**

+	 * Called when the mouse button has been pressed. By default, nothing

+	 * happens and <code>false</code> is returned. Subclasses may override this

+	 * method to interpret the meaning of a mouse down. Returning

+	 * <code>true</code> indicates that the button down was handled in some way.

+	 * 

+	 * @param button

+	 *            which button went down

+	 * @return <code>true</code> if the buttonDown was handled

+	 */

+	protected boolean handleButtonDown(int button) {

+		return false;

+	}

+

+	/**

+	 * Called when the mouse button has been released. By default, nothing

+	 * happens and <code>false</code> is returned. Subclasses may override this

+	 * method to interpret the mouse up. Returning <code>true</code> indicates

+	 * that the mouse up was handled in some way.

+	 * 

+	 * @see #mouseUp(MouseEvent, EditPartViewer)

+	 * @param button

+	 *            the button being released

+	 * @return <code>true</code> if the button up was handled

+	 */

+	protected boolean handleButtonUp(int button) {

+		return false;

+	}

+

+	/**

+	 * Called when the command stack has changed, for instance, when a delete or

+	 * undo command has been executed. By default, state is set to

+	 * <code>STATE_INVALID</code> and handleInvalidInput is called. Subclasses

+	 * may override this method to change what happens when the command stack

+	 * changes. Returning <code>true</code> indicates that the change was

+	 * handled in some way.

+	 * 

+	 * @return <code>true</code> if the change was handled in some way

+	 */

+	protected boolean handleCommandStackChanged() {

+		if (!isInState(STATE_INITIAL | STATE_INVALID)) {

+			setState(STATE_INVALID);

+			handleInvalidInput();

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * Called when a mouse double-click occurs. By default, nothing happens and

+	 * <code>false</code> is returned. Subclasses may override this method to

+	 * interpret double-clicks. Returning <code>true</code> indicates that the

+	 * event was handled in some way.

+	 * 

+	 * @param button

+	 *            which button was double-clicked

+	 * @return <code>true</code> if the event was handled

+	 * @see #mouseDoubleClick(MouseEvent, EditPartViewer)

+	 */

+	protected boolean handleDoubleClick(int button) {

+		return false;

+	}

+

+	/**

+	 * Called whenever the mouse is being dragged. This method continues to be

+	 * called even once {@link #handleDragInProgress()} starts getting called.

+	 * By default, nothing happens, and <code>false</code> is returned.

+	 * Subclasses may override this method to interpret a drag. Returning

+	 * <code>true</code> indicates that the drag was handled in some way.

+	 * 

+	 * @return <code>true</code> if the drag is handled

+	 * @see #mouseDrag(MouseEvent, EditPartViewer)

+	 */

+	protected boolean handleDrag() {

+		return false;

+	}

+

+	/**

+	 * Called whenever a mouse is being dragged and the drag threshold has been

+	 * exceeded. Prior to the drag threshold being exceeded, only

+	 * {@link #handleDrag()} is called. This method gets called repeatedly for

+	 * every mouse move during the drag. By default, nothing happens and

+	 * <code>false</code> is returned. Subclasses may override this method to

+	 * interpret the drag. Returning <code>true</code> indicates that the drag

+	 * was handled.

+	 * 

+	 * @see #movedPastThreshold()

+	 * @see #mouseDrag(MouseEvent, EditPartViewer)

+	 * @return <code>true</code> if the drag was handled

+	 */

+	protected boolean handleDragInProgress() {

+		return false;

+	}

+

+	/**

+	 * Called only one time during a drag when the drag threshold has been

+	 * exceeded. By default, nothing happens and <code>false</code> is returned.

+	 * Subclasses may override to interpret the drag starting. Returning

+	 * <code>true</code> indicates that the event was handled.

+	 * 

+	 * @see #movedPastThreshold()

+	 * @see #mouseDrag(MouseEvent, EditPartViewer)

+	 * @return true if the drag starting was handled

+	 */

+	protected boolean handleDragStarted() {

+		return false;

+	}

+

+	/**

+	 * Called when the current tool operation is to be completed. In other

+	 * words, the "state machine" and has accepted the sequence of input (i.e.

+	 * the mouse gesture). By default, the tool will either reactivate itself,

+	 * or ask the edit domain to load the default tool.

+	 * <P>

+	 * Subclasses should extend this method to first do whatever it is that the

+	 * tool does, and then call <code>super</code>.

+	 * 

+	 * @see #unloadWhenFinished()

+	 */

+	protected void handleFinished() {

+		if (unloadWhenFinished())

+			getDomain().loadDefaultTool();

+		else

+			reactivate();

+	}

+

+	/**

+	 * Handles high-level processing of a focus gained event. By default,

+	 * nothing happens and <code>false</code> is returned. Subclasses may

+	 * override this method to interpret the focus gained event. Return

+	 * <code>true</code> to indicate that the event was processed.

+	 * 

+	 * @see #focusGained(FocusEvent, EditPartViewer)

+	 * @return <code>true</code> if the event was handled

+	 */

+	protected boolean handleFocusGained() {

+		return false;

+	}

+

+	/**

+	 * Handles high-level processing of a focus lost event. By default, nothing

+	 * happens and <code>false</code> is returned. Subclasses may override this

+	 * method to interpret the focus lost event. Return <code>true</code> to

+	 * indicate that the event was processed.

+	 * 

+	 * @see #focusLost(FocusEvent, EditPartViewer)

+	 * @return <code>true</code> if the event was handled

+	 */

+	protected boolean handleFocusLost() {

+		return false;

+	}

+

+	/**

+	 * Handles high-level processing of a mouse hover event. By default, nothing

+	 * happens and <code>false</code> is returned. Subclasses may override this

+	 * method to interpret the hover. Return <code>true</code> to indicate that

+	 * the hover was handled.

+	 * 

+	 * @see #mouseHover(MouseEvent, EditPartViewer)

+	 * @return <code>true</code> if the hover was handled

+	 */

+	protected boolean handleHover() {

+		return false;

+	}

+

+	/**

+	 * Called when invalid input is encountered. The state does not change, so

+	 * the caller must set the state to {@link AbstractTool#STATE_INVALID}.

+	 * 

+	 * @return <code>true</code>

+	 */

+	protected boolean handleInvalidInput() {

+		return false;

+	}

+

+	/**

+	 * Handles high-level processing of a key down event. By default, the

+	 * KeyEvent is checked to see if it is the ESCAPE key. If so, the domain's

+	 * default tool is reloaded, and <code>true</code> is returned. Subclasses

+	 * may extend this method to interpret additional key down events. Returns

+	 * <code>true</code> if the given key down was handled.

+	 * 

+	 * @see #keyDown(KeyEvent, EditPartViewer)

+	 * @param e

+	 *            the key event

+	 * @return <code>true</code> if the key down was handled.

+	 */

+	protected boolean handleKeyDown(KeyEvent e) {

+		if (acceptAbort(e)) {

+			getDomain().loadDefaultTool();

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * Override to process a traverse event. If the event's

+	 * {@link KeyEvent#doit doit} field is set to <code>false</code>, the

+	 * traversal will be prevented from occurring. Otherwise, a traverse will

+	 * occur.

+	 * 

+	 * @param event

+	 *            the SWT traverse event

+	 * @since 3.1

+	 */

+	protected void handleKeyTraversed(TraverseEvent event) {

+	}

+

+	/**

+	 * Handles high-level processing of a key up event. By default, does nothing

+	 * and returns <code>false</code>. Subclasses may extend this method to

+	 * process key up events. Returns <code>true</code> if the key up was

+	 * processed in some way.

+	 * 

+	 * @see #keyUp(KeyEvent, EditPartViewer)

+	 * @param e

+	 *            the key event

+	 * @return <code>true</code> if the event was handled

+	 */

+	protected boolean handleKeyUp(KeyEvent e) {

+		return false;

+	}

+

+	/**

+	 * Handles high-level processing of a mouse move. By default, does nothing

+	 * and returns <code>false</code>. Subclasses may extend this method to

+	 * process mouse moves. Returns <code>true</code> if the mouse move was

+	 * processed.

+	 * 

+	 * @see #mouseMove(MouseEvent, EditPartViewer)

+	 * @return <code>true</code> if the mouse move was handled

+	 */

+	protected boolean handleMove() {

+		return false;

+	}

+

+	/**

+	 * Handles when a native drag has ended. By default, does nothing and

+	 * returns <code>false</code>. Subclasses may extend this method to process

+	 * native drags ending.

+	 * 

+	 * @param event

+	 *            the drag event

+	 * @return <code>true</code> if the native drag finished was handled

+	 */

+	protected boolean handleNativeDragFinished(DragSourceEvent event) {

+		return false;

+	}

+

+	/**

+	 * Handles when a native drag has started. By default, does nothing and

+	 * returns <code>false</code>. Subclasses may extend this method to process

+	 * native drag starts.

+	 * <P>

+	 * When a native drag starts, all subsequent mouse events will not be

+	 * received, including the mouseUp event. The only event that will be

+	 * received is the drag finished event.

+	 * 

+	 * @param event

+	 *            the drag event

+	 * @return <code>true</code> if the native drag start was handled

+	 */

+	protected boolean handleNativeDragStarted(DragSourceEvent event) {

+		return false;

+	}

+

+	/**

+	 * Called when the mouse enters an EditPartViewer. By default, does nothing

+	 * and returns <code>false</code>. Subclasses may extend this method to

+	 * process the viewer enter. Returns <code>true</code> to indicate if the

+	 * viewer entered was process in some way.

+	 * 

+	 * @return <code>true</code> if the viewer entered was handled

+	 */

+	protected boolean handleViewerEntered() {

+		return false;

+	}

+

+	/**

+	 * Called when the mouse exits an EditPartViewer. By default, does nothing

+	 * and returns <code>false</code>. Subclasses may extend this method to

+	 * process viewer exits. Returns <code>true</code> to indicate if the viewer

+	 * exited was process in some way.

+	 * 

+	 * @return <code>true</code> if the viewer exited was handled

+	 */

+	protected boolean handleViewerExited() {

+		return false;

+	}

+

+	/**

+	 * Returns <code>true</code> if the tool is active.

+	 * 

+	 * @return <code>true</code> if active

+	 */

+	protected boolean isActive() {

+		return getFlag(FLAG_ACTIVE);

+	}

+

+	private boolean isCurrentViewerMirrored() {

+		return (getCurrentViewer().getControl().getStyle() & SWT.MIRRORED) != 0;

+	}

+

+	/**

+	 * Returns <code>true</code> if the tool is hovering.

+	 * 

+	 * @return <code>true</code> if hovering

+	 */

+	protected boolean isHoverActive() {

+		return getFlag(FLAG_HOVER);

+	}

+

+	boolean isInDragInProgress() {

+		return isInState(STATE_DRAG_IN_PROGRESS

+				| STATE_ACCESSIBLE_DRAG_IN_PROGRESS);

+	}

+

+	/*

+	 * Returns <code>true</code> if the current {@link Input} is synchronized

+	 * with the current MouseEvent.

+	 */

+	private boolean isInputSynched(MouseEvent event) {

+		Input input = getCurrentInput();

+		return input.isMouseButtonDown(1) == ((event.stateMask & SWT.BUTTON1) != 0)

+				&& input.isMouseButtonDown(2) == ((event.stateMask & SWT.BUTTON2) != 0)

+				&& input.isMouseButtonDown(3) == ((event.stateMask & SWT.BUTTON3) != 0)

+				&& input.isMouseButtonDown(4) == ((event.stateMask & SWT.BUTTON4) != 0)

+				&& input.isMouseButtonDown(5) == ((event.stateMask & SWT.BUTTON5) != 0);

+	}

+

+	/**

+	 * Returns <code>true</code> if the tool is in the given state.

+	 * 

+	 * @param state

+	 *            the state being queried

+	 * @return <code>true</code> if the tool is in the given state

+	 */

+	protected boolean isInState(int state) {

+		return ((getState() & state) != 0);

+	}

+

+	/**

+	 * Default implementation always returns <code>true</code>. Sub-classes may

+	 * override.

+	 * 

+	 * @param viewer

+	 *            the viewer where the event occured

+	 * @return <code>true</code> if this tool is interested in events occuring

+	 *         in the given viewer; <code>false</code> otherwise

+	 * @since 3.1

+	 */

+	protected boolean isViewerImportant(EditPartViewer viewer) {

+		return true;

+	}

+

+	/**

+	 * Receives a KeyDown event for the given viewer. Subclasses wanting to

+	 * handle this event should override {@link #handleKeyDown(KeyEvent)}.

+	 * 

+	 * @param evt

+	 *            the key event

+	 * @param viewer

+	 *            the originating viewer

+	 */

+	public void keyDown(KeyEvent evt, EditPartViewer viewer) {

+		if (!isViewerImportant(viewer))

+			return;

+		setViewer(viewer);

+		getCurrentInput().setInput(evt);

+		handleKeyDown(evt);

+	}

+

+	/**

+	 * Receives a traversal event for the given viewer. Subclasses wanting to

+	 * handle this event should override

+	 * {@link #handleKeyTraversed(TraverseEvent)}.

+	 * 

+	 * @param event

+	 *            the traverse event

+	 * @param viewer

+	 *            the originating viewer

+	 */

+	public void keyTraversed(TraverseEvent event, EditPartViewer viewer) {

+		if (!isViewerImportant(viewer))

+			return;

+		setViewer(viewer);

+		getCurrentInput().setInput(event);

+		handleKeyTraversed(event);

+	}

+

+	/**

+	 * Receives a KeyUp event for the given viewer. Subclasses wanting to handle

+	 * this event should override {@link #handleKeyUp(KeyEvent)}.

+	 * 

+	 * @param evt

+	 *            the key event

+	 * @param viewer

+	 *            the originating viewer

+	 */

+	public void keyUp(KeyEvent evt, EditPartViewer viewer) {

+		if (!isViewerImportant(viewer))

+			return;

+		setViewer(viewer);

+		getCurrentInput().setInput(evt);

+		handleKeyUp(evt);

+	}

+

+	/**

+	 * Handles mouse double click events within a viewer. Subclasses wanting to

+	 * handle this event should override {@link #handleDoubleClick(int)}.

+	 * 

+	 * @param me

+	 *            the mouse event

+	 * @param viewer

+	 *            the originating viewer

+	 */

+	public void mouseDoubleClick(MouseEvent me, EditPartViewer viewer) {

+		if (me.button > 5 || !isViewerImportant(viewer))

+			return;

+		setViewer(viewer);

+		getCurrentInput().setInput(me);

+

+		handleDoubleClick(me.button);

+	}

+

+	/**

+	 * Handles mouse down events within a viewer. Subclasses wanting to handle

+	 * this event should override {@link #handleButtonDown(int)}.

+	 * 

+	 * @param me

+	 *            the mouse event

+	 * @param viewer

+	 *            the originating viewer

+	 */

+	public void mouseDown(MouseEvent me, EditPartViewer viewer) {

+		if (!isViewerImportant(viewer))

+			return;

+		setViewer(viewer);

+

+		getCurrentInput().setInput(me);

+		getCurrentInput().setMouseButton(me.button, true);

+

+		setStartLocation(new Point(me.x, me.y));

+

+		handleButtonDown(me.button);

+	}

+

+	/**

+	 * Handles mouse drag events within a viewer. Subclasses wanting to handle

+	 * this event should override {@link #handleDrag()} and/or

+	 * {@link #handleDragInProgress()}.

+	 * 

+	 * @param me

+	 *            the mouse event

+	 * @param viewer

+	 *            the originating viewer

+	 */

+	public void mouseDrag(MouseEvent me, EditPartViewer viewer) {

+		if (!isViewerImportant(viewer))

+			return;

+		setViewer(viewer);

+		boolean wasDragging = movedPastThreshold();

+		getCurrentInput().setInput(me);

+		handleDrag();

+		if (movedPastThreshold()) {

+			if (!wasDragging)

+				handleDragStarted();

+			handleDragInProgress();

+		}

+	}

+

+	/**

+	 * Handles mouse hover event. within a viewer. Subclasses wanting to handle

+	 * this event should override {@link #handleHover()}.

+	 * 

+	 * @param me

+	 *            the mouse event

+	 * @param viewer

+	 *            the originating viewer

+	 * 

+	 */

+	public void mouseHover(MouseEvent me, EditPartViewer viewer) {

+		if (!isViewerImportant(viewer))

+			return;

+		setViewer(viewer);

+		getCurrentInput().setInput(me);

+		handleHover();

+	}

+

+	/**

+	 * Handles mouse moves (if the mouse button is up) within a viewer.

+	 * Subclasses wanting to handle this event should override

+	 * {@link #handleMove()}.

+	 * 

+	 * @param me

+	 *            the mouse event

+	 * @param viewer

+	 *            the originating viewer

+	 */

+	public void mouseMove(MouseEvent me, EditPartViewer viewer) {

+		if (!isViewerImportant(viewer))

+			return;

+		setViewer(viewer);

+		if (!isInputSynched(me)) {

+			boolean b1 = getCurrentInput().isMouseButtonDown(1);

+			boolean b2 = getCurrentInput().isMouseButtonDown(2);

+			boolean b3 = getCurrentInput().isMouseButtonDown(3);

+			boolean b4 = getCurrentInput().isMouseButtonDown(4);

+			boolean b5 = getCurrentInput().isMouseButtonDown(5);

+			getCurrentInput().verifyMouseButtons = true;

+			getCurrentInput().setInput(me);

+			if (b1)

+				handleButtonUp(1);

+			if (b2)

+				handleButtonUp(2);

+			if (b3)

+				handleButtonUp(3);

+			if (b4)

+				handleButtonUp(4);

+			if (b5)

+				handleButtonUp(5);

+			if (getDomain().getActiveTool() != this)

+				return;

+			/*

+			 * processing one of the buttonUps may have caused the tool to

+			 * reactivate itself, which causes the viewer to get nulled-out. If

+			 * we are going to call another handleXxx method below, we must set

+			 * the viewer again to be paranoid.

+			 */

+			setViewer(viewer);

+		} else

+			getCurrentInput().setInput(me);

+		if (isInState(STATE_ACCESSIBLE_DRAG_IN_PROGRESS))

+			handleDragInProgress();

+		else

+			handleMove();

+	}

+

+	/**

+	 * Handles mouse up within a viewer. Subclasses wanting to handle this event

+	 * should override {@link #handleButtonUp(int)}.

+	 * 

+	 * @param me

+	 *            the mouse event

+	 * @param viewer

+	 *            the originating viewer

+	 */

+	public void mouseUp(MouseEvent me, EditPartViewer viewer) {

+		if (!isViewerImportant(viewer))

+			return;

+		setViewer(viewer);

+		getCurrentInput().setInput(me);

+		getCurrentInput().setMouseButton(me.button, false);

+		handleButtonUp(me.button);

+	}

+

+	/**

+	 * Handles mouse-wheel scrolling for a viewer. Sub-classes may override as

+	 * needed. The default implementation delegates to

+	 * {@link #performViewerMouseWheel(Event, EditPartViewer)} IFF the tool is

+	 * in the initial state. Mouse-wheel events generated at other times are

+	 * ignored.

+	 * 

+	 * @param event

+	 *            the SWT scroll event

+	 * @param viewer

+	 *            the originating viewer

+	 * @see #performViewerMouseWheel(Event, EditPartViewer)

+	 */

+	public void mouseWheelScrolled(Event event, EditPartViewer viewer) {

+		if (isInState(STATE_INITIAL))

+			performViewerMouseWheel(event, viewer);

+	}

+

+	/**

+	 * Returns <code>true</code> if the threshold has been exceeded during a

+	 * mouse drag.

+	 * 

+	 * @return <code>true</code> if the threshold has been exceeded

+	 */

+	protected boolean movedPastThreshold() {

+		if (getFlag(FLAG_PAST_THRESHOLD))

+			return true;

+		Point start = getStartLocation(), end = getLocation();

+		if (Math.abs(start.x - end.x) > DRAG_THRESHOLD

+				|| Math.abs(start.y - end.y) > DRAG_THRESHOLD) {

+			setFlag(FLAG_PAST_THRESHOLD, true);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @see org.eclipse.gef.Tool#nativeDragFinished(DragSourceEvent,

+	 *      EditPartViewer)

+	 */

+	public void nativeDragFinished(DragSourceEvent event, EditPartViewer viewer) {

+		if (!isViewerImportant(viewer))

+			return;

+		setViewer(viewer);

+		handleNativeDragFinished(event);

+	}

+

+	/**

+	 * @see org.eclipse.gef.Tool#nativeDragStarted(DragSourceEvent,

+	 *      EditPartViewer)

+	 */

+	public void nativeDragStarted(DragSourceEvent event, EditPartViewer viewer) {

+		if (!isViewerImportant(viewer))

+			return;

+		setViewer(viewer);

+		handleNativeDragStarted(event);

+	}

+

+	/**

+	 * Delegates mouse-wheel event handling to registered

+	 * {@link MouseWheelHandler MouseWheelHandlers} based on the given Event's

+	 * statemask. Does nothing if there are no matching handlers found.

+	 * 

+	 * @param event

+	 *            the SWT scroll event

+	 * @param viewer

+	 *            the originating viewer

+	 * @since 3.1

+	 */

+	protected void performViewerMouseWheel(Event event, EditPartViewer viewer) {

+		MouseWheelHandler handler = (MouseWheelHandler) viewer

+				.getProperty(MouseWheelHandler.KeyGenerator

+						.getKey(event.stateMask));

+		if (handler != null)

+			handler.handleMouseWheel(event, viewer);

+	}

+

+	/**

+	 * Places the mouse in the viewer based on the point given. If the point

+	 * given is outside the viewer, then the mouse is placed in the location

+	 * nearest the given point but within the viewer.

+	 * 

+	 * @param p

+	 *            the point

+	 * @since 3.4

+	 */

+	protected void placeMouseInViewer(Point p) {

+		if (getCurrentViewer() == null)

+			return;

+		Control c = getCurrentViewer().getControl();

+		Rectangle rect;

+		if (c instanceof Scrollable)

+			rect = ((Scrollable) c).getClientArea();

+		else

+			rect = c.getBounds();

+		if (p.x > rect.x + rect.width - 1)

+			p.x = rect.x + rect.width - 1;

+		else if (p.x < rect.x)

+			p.x = rect.x;

+		if (p.y > rect.y + rect.height - 1)

+			p.y = rect.y + rect.height - 1;

+		else if (p.y < rect.y)

+			p.y = rect.y;

+

+		// place the mouse cursor at the calculated position within the viewer

+		org.eclipse.swt.graphics.Point cursorLocation = new org.eclipse.swt.graphics.Point(

+				p.x, p.y);

+		cursorLocation = c.toDisplay(cursorLocation);

+		// calling Display#setCursorLocation(Point) will cause an SWT.MouseMove

+		// event to be dispatched as a result, so that mouseMove(MouseEvent,

+		// EditPartViewer) will be triggered as a result, which will react to

+		// the movement by delegating to handleMove() or handleDragInProgress().

+		c.getDisplay().setCursorLocation(cursorLocation);

+	}

+

+	/**

+	 * Calls <code>deactivate()</code> and then <code>activate()</code>.

+	 */

+	protected void reactivate() {

+		// Fix for Bug# 91448

+		EditPartViewer viewer = getCurrentViewer();

+		deactivate();

+		activate();

+		if (viewer != null) {

+			Control c = viewer.getControl();

+			if (c != null && !c.isDisposed() && c.isFocusControl())

+				setViewer(viewer);

+		}

+	}

+

+	/**

+	 * Sets the cursor being displayed to the appropriate cursor. If the tool is

+	 * active, the current cursor being displayed is updated by calling

+	 * {@link #calculateCursor()}.

+	 */

+	protected void refreshCursor() {

+		if (isActive())

+			setCursor(calculateCursor());

+	}

+

+	/**

+	 * Releases tool capture.

+	 * 

+	 * @see #setToolCapture()

+	 */

+	protected void releaseToolCapture() {

+		getCurrentViewer().setRouteEventsToEditDomain(false);

+	}

+

+	/**

+	 * Convenience method to removes a figure from the feedback layer.

+	 * 

+	 * @param figure

+	 *            the figure being removed

+	 */

+	protected void removeFeedback(IFigure figure) {

+		LayerManager lm = (LayerManager) getCurrentViewer()

+				.getEditPartRegistry().get(LayerManager.ID);

+		if (lm == null)

+			return;

+		lm.getLayer(LayerConstants.FEEDBACK_LAYER).remove(figure);

+	}

+

+	/**

+	 * Resets all stateful flags to their initial values. Subclasses should

+	 * extend this method to reset their own custom flags.

+	 */

+	protected void resetFlags() {

+		setFlag(FLAG_PAST_THRESHOLD, false);

+		setFlag(FLAG_HOVER, false);

+	}

+

+	/**

+	 * Used to cache a command obtained from {@link #getCommand()}.

+	 * 

+	 * @param c

+	 *            the command

+	 * @see #getCurrentCommand()

+	 */

+	protected void setCurrentCommand(Command c) {

+		command = c;

+		refreshCursor();

+	}

+

+	/**

+	 * Shows the given cursor on the current viewer.

+	 * 

+	 * @param cursor

+	 *            the cursor to display

+	 */

+	protected void setCursor(Cursor cursor) {

+		if (getCurrentViewer() != null)

+			getCurrentViewer().setCursor(cursor);

+	}

+

+	/**

+	 * Sets the default cursor.

+	 * 

+	 * @param cursor

+	 *            the cursor

+	 * @see #getDefaultCursor()

+	 */

+	public void setDefaultCursor(Cursor cursor) {

+		if (defaultCursor == cursor)

+			return;

+		defaultCursor = cursor;

+		refreshCursor();

+	}

+

+	/**

+	 * Sets the disabled cursor.

+	 * 

+	 * @param cursor

+	 *            the cursor

+	 * @see #getDisabledCursor()

+	 */

+	public void setDisabledCursor(Cursor cursor) {

+		if (disabledCursor == cursor)

+			return;

+		disabledCursor = cursor;

+		refreshCursor();

+	}

+

+	/**

+	 * Sets the EditDomain.

+	 * 

+	 * @param domain

+	 *            the edit domain

+	 * @see #getDomain()

+	 */

+	public void setEditDomain(EditDomain domain) {

+		this.domain = domain;

+	}

+

+	/**

+	 * Sets whether the hover flag is true or false. Subclasses which do

+	 * something on hover can use this flag to track whether they have received

+	 * a hover or not.

+	 * 

+	 * @param value

+	 *            whether hover is active

+	 */

+	protected void setHoverActive(boolean value) {

+		setFlag(FLAG_HOVER, value);

+	}

+

+	void setMouseCapture(boolean value) {

+		if (getCurrentViewer() != null

+				&& getCurrentViewer().getControl() != null

+				&& !getCurrentViewer().getControl().isDisposed())

+			getCurrentViewer().getControl().setCapture(value);

+	}

+

+	/**

+	 * An example is {@link #PROPERTY_UNLOAD_WHEN_FINISHED} -> Boolean.

+	 * AbstractTool uses introspection to set properties that are not explicitly

+	 * specified. For instance, the key "defaultCursor" will cause

+	 * {@link #setDefaultCursor(Cursor)} to be invoked with the given value.

+	 * 

+	 * @see org.eclipse.gef.Tool#setProperties(java.util.Map)

+	 */

+	public void setProperties(Map properties) {

+		if (properties == null)

+			return;

+		Iterator entries = properties.entrySet().iterator();

+		while (entries.hasNext()) {

+			Entry entry = (Entry) entries.next();

+			applyProperty(entry.getKey(), entry.getValue());

+		}

+	}

+

+	/**

+	 * Sets the start mouse location, typically for a drag operation.

+	 * 

+	 * @param p

+	 *            the start location

+	 */

+	protected void setStartLocation(Point p) {

+		startX = p.x;

+		startY = p.y;

+	}

+

+	/**

+	 * Sets the tools state.

+	 * 

+	 * @param state

+	 *            the new state

+	 */

+	protected void setState(int state) {

+		this.state = state;

+	}

+

+	/**

+	 * Sets tool capture. When a tool has capture, viewers will make every

+	 * effort to send events through the editdomain to the tool. Therefore, the

+	 * default handling of some events is bypassed.

+	 */

+	protected void setToolCapture() {

+		getCurrentViewer().setRouteEventsToEditDomain(true);

+	}

+

+	/**

+	 * Setting this to <code>true</code> will cause the tool to be unloaded

+	 * after one operation has completed. The default value is <code>true</code>

+	 * . The tool is unloaded, and the edit domains default tool will be

+	 * activated.

+	 * 

+	 * @param value

+	 *            whether the tool should be unloaded on completion

+	 */

+	public void setUnloadWhenFinished(boolean value) {

+		setFlag(FLAG_UNLOAD, value);

+	}

+

+	/**

+	 * Sets the active EditPartViewer. The active viewer is the viewer from

+	 * which the last event was received.

+	 * 

+	 * @param viewer

+	 *            the viewer

+	 */

+	public void setViewer(EditPartViewer viewer) {

+		if (viewer == currentViewer)

+			return;

+

+		setCursor(null);

+		currentViewer = viewer;

+		if (currentViewer != null) {

+			org.eclipse.swt.graphics.Point p = currentViewer.getControl()

+					.toControl(Display.getCurrent().getCursorLocation());

+			getCurrentInput().setMouseLocation(p.x, p.y);

+		}

+		refreshCursor();

+	}

+

+	/**

+	 * Returns <code>true</code> if the give state transition succeeds. This is

+	 * a "test and set" operation, where the tool is tested to be in the

+	 * specified start state, and if so, is set to the given end state. The

+	 * method returns the result of the first test.

+	 * 

+	 * @param start

+	 *            the start state being tested

+	 * @param end

+	 *            the end state

+	 * @return <code>true</code> if the state transition is successful

+	 */

+	protected boolean stateTransition(int start, int end) {

+		if ((getState() & start) != 0) {

+			setState(end);

+			return true;

+		} else

+			return false;

+	}

+

+	/**

+	 * Returns <code>true</code> if the tool is set to unload when its current

+	 * operation is complete.

+	 * 

+	 * @return <code>true</code> if the tool should be unloaded when finished

+	 */

+	protected final boolean unloadWhenFinished() {

+		return getFlag(FLAG_UNLOAD);

+	}

+

+	/**

+	 * Receives the mouse entered event. Subclasses wanting to handle this event

+	 * should override {@link #handleViewerEntered()}.

+	 * <p>

+	 * FEATURE in SWT: mouseExit comes after mouseEntered on the new control.

+	 * Therefore, if the current viewer is not <code>null</code>, it means the

+	 * exit has not been sent yet by SWT. To maintain proper ordering, GEF fakes

+	 * the exit and calls {@link #handleViewerExited()}. The real exit will then

+	 * be ignored.

+	 * 

+	 * @param me

+	 *            the mouse event

+	 * @param viewer

+	 *            the originating viewer

+	 */

+	public void viewerEntered(MouseEvent me, EditPartViewer viewer) {

+		if (!isViewerImportant(viewer))

+			return;

+		getCurrentInput().setInput(me);

+		if (getCurrentViewer() != null && getCurrentViewer() != viewer)

+			handleViewerExited();

+		setViewer(viewer);

+		handleViewerEntered();

+	}

+

+	/**

+	 * Handles the mouse exited event. Subclasses wanting to handle this event

+	 * should override {@link #handleViewerExited()}.

+	 * 

+	 * @param me

+	 *            the mouse event

+	 * @param viewer

+	 *            the originating viewer

+	 */

+	public void viewerExited(MouseEvent me, EditPartViewer viewer) {

+		/*

+		 * FEATURE in SWT. mouseExited comes after mouseEntered. So only call

+		 * handle exit if we didn't previously fake it on viewer entered.

+		 */

+		if (viewer == getCurrentViewer()) {

+			getCurrentInput().setInput(me);

+			handleViewerExited();

+			setViewer(null);

+		}

+	}

+

+	/**

+	 * Allows the user to access mouse and keyboard input.

+	 */

+	public static class Input extends org.eclipse.gef.util.FlagSupport {

+		int modifiers;

+		Point mouse = new Point();

+		boolean verifyMouseButtons;

+

+		/**

+		 * Returns the event modifiers. Modifiers are defined in

+		 * {@link MouseEvent#stateMask}, and include things like the mouse

+		 * buttons and keyboard modifier keys.

+		 * 

+		 * @return the event modifiers

+		 */

+		protected int getModifiers() {

+			return modifiers;

+		}

+

+		/**

+		 * Returns the current location of the mouse.

+		 * 

+		 * @return the mouse location

+		 */

+		public Point getMouseLocation() {

+			return mouse;

+		}

+

+		/**

+		 * Returns <code>true</code> if the ALT key is pressed.

+		 * 

+		 * @return <code>true</code> if the ALT key is pressed

+		 */

+		public boolean isAltKeyDown() {

+			return (modifiers & SWT.ALT) != 0;

+		}

+

+		/**

+		 * Returns <code>true</code> if any of the mouse buttons are pressed.

+		 * 

+		 * @return <code>true</code> if any of the mouse buttons are pressed

+		 */

+		public boolean isAnyButtonDown() {

+			return getFlag(2 | 4 | 8 | 16 | 32);

+		}

+

+		/**

+		 * Returns <code>true</code> if the CTRL key is pressed.

+		 * 

+		 * @return <code>true</code> of CTRL pressed

+		 */

+		public boolean isControlKeyDown() {

+			return (modifiers & SWT.CONTROL) != 0;

+		}

+

+		/**

+		 * Returns <code>true</code> if any of the given mod keys are pressed.

+		 * 

+		 * @param mod

+		 *            SWT.MOD1, SWT.MOD2, SWT.MOD3, SWT.MOD4 or any combination

+		 *            thereof

+		 * @return <code>true</code> if the given mod key is pressed

+		 * @since 3.1

+		 */

+		public boolean isModKeyDown(int mod) {

+			return (modifiers & mod) != 0;

+		}

+

+		/**

+		 * Returns <code>true</code> if the specified button is down.

+		 * 

+		 * @param which

+		 *            which button

+		 * @return <code>true</code> if the button is down

+		 */

+		public boolean isMouseButtonDown(int which) {

+			return getFlag(1 << which);

+		}

+

+		/**

+		 * Returns <code>true</code> if the SHIFT key is pressed.

+		 * 

+		 * @return <code>true</code> if SHIFT pressed

+		 */

+		public boolean isShiftKeyDown() {

+			return (modifiers & SWT.SHIFT) != 0;

+		}

+

+		/**

+		 * Sets the keyboard input based on the KeyEvent.

+		 * 

+		 * @param ke

+		 *            the key event providing the input

+		 */

+		public void setInput(KeyEvent ke) {

+			modifiers = ke.stateMask;

+		}

+

+		/**

+		 * Sets the mouse and keyboard input based on the MouseEvent.

+		 * 

+		 * @param me

+		 *            the mouse event providing the input

+		 */

+		public void setInput(MouseEvent me) {

+			setMouseLocation(me.x, me.y);

+			modifiers = me.stateMask;

+			if (verifyMouseButtons) {

+				setMouseButton(1, (modifiers & SWT.BUTTON1) != 0);

+				setMouseButton(2, (modifiers & SWT.BUTTON2) != 0);

+				setMouseButton(3, (modifiers & SWT.BUTTON3) != 0);

+				setMouseButton(4, (modifiers & SWT.BUTTON4) != 0);

+				setMouseButton(5, (modifiers & SWT.BUTTON5) != 0);

+				verifyMouseButtons = false;

+			}

+		}

+

+		/**

+		 * Sets mouse button # <code>which</code> to be pressed if

+		 * <code>state</code> is true.

+		 * 

+		 * @param which

+		 *            which button

+		 * @param state

+		 *            <code>true</code> if button down

+		 */

+		public void setMouseButton(int which, boolean state) {

+			setFlag(1 << which, state);

+		}

+

+		/**

+		 * Sets the current location of the mouse

+		 * 

+		 * @param x

+		 *            x location

+		 * @param y

+		 *            y location

+		 * @since 3.4

+		 */

+		public void setMouseLocation(int x, int y) {

+			mouse.setLocation(x, y);

+		}

+	}

+

+}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/copy/ConnectionEndpointTracker.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/copy/ConnectionEndpointTracker.java
new file mode 100644
index 00000000000..ff2c99b22d0
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/copy/ConnectionEndpointTracker.java
@@ -0,0 +1,340 @@
+package org.eclipse.papyrus.infra.gmfdiag.common.snap.copy;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.draw2d.Connection;
+import org.eclipse.draw2d.PositionConstants;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.gef.AccessibleAnchorProvider;
+import org.eclipse.gef.ConnectionEditPart;
+import org.eclipse.gef.DragTracker;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.RequestConstants;
+import org.eclipse.gef.SharedCursors;
+import org.eclipse.gef.Tool;
+import org.eclipse.gef.requests.ReconnectRequest;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.graphics.Cursor;
+
+/**
+ * A DragTracker that moves the endpoint of a connection to another location.
+ */
+public class ConnectionEndpointTracker extends TargetingTool implements DragTracker {
+
+	private static final int FLAG_SOURCE_FEEBBACK = TargetingTool.MAX_FLAG << 1;
+
+	/** The max flag */
+	protected static final int MAX_FLAG = FLAG_SOURCE_FEEBBACK;
+
+	private String commandName;
+
+	private List exclusionSet;
+
+	private ConnectionEditPart connectionEditPart;
+
+	/**
+	 * Constructs a new ConnectionEndpointTracker for the given
+	 * ConnectionEditPart.
+	 * 
+	 * @param cep
+	 *        the ConnectionEditPart
+	 */
+	public ConnectionEndpointTracker(ConnectionEditPart cep) {
+		setConnectionEditPart(cep);
+		setDisabledCursor(SharedCursors.NO);
+	}
+
+	/**
+	 * Returns a custom "plug" cursor if this tool is in the initial, drag or
+	 * accessible drag state. Otherwise defers to <code>super</code>.
+	 * 
+	 * @return the cursor
+	 */
+	protected Cursor calculateCursor() {
+		if(isInState(STATE_INITIAL | STATE_DRAG | STATE_ACCESSIBLE_DRAG))
+			return getDefaultCursor();
+		return super.calculateCursor();
+	}
+
+	/**
+	 * Erases source and target feedback and executes the current command.
+	 * 
+	 * @see DragTracker#commitDrag()
+	 */
+	public void commitDrag() {
+		eraseSourceFeedback();
+		eraseTargetFeedback();
+		executeCurrentCommand();
+	}
+
+	/**
+	 * Creates the target request, a {@link ReconnectRequest}.
+	 * 
+	 * @return the target request
+	 */
+	protected Request createTargetRequest() {
+		ReconnectRequest request = new ReconnectRequest(getCommandName());
+		request.setConnectionEditPart(getConnectionEditPart());
+		return request;
+	}
+
+	/**
+	 * Erases feedback and sets the viewer's focus to <code>null</code>. This
+	 * will remove any focus rectangles that were painted to show the new target
+	 * or source edit part.
+	 * 
+	 * @see Tool#deactivate()
+	 */
+	public void deactivate() {
+		eraseSourceFeedback();
+		getCurrentViewer().setFocus(null);
+		super.deactivate();
+	}
+
+	/**
+	 * Erases the source feedback.
+	 */
+	protected void eraseSourceFeedback() {
+		if(!getFlag(FLAG_SOURCE_FEEBBACK))
+			return;
+		setFlag(FLAG_SOURCE_FEEBBACK, false);
+		getConnectionEditPart().eraseSourceFeedback(getTargetRequest());
+	}
+
+	/**
+	 * @see AbstractTool#getCommandName()
+	 */
+	protected String getCommandName() {
+		return commandName;
+	}
+
+	/**
+	 * Returns the ConnectionEditPart's figure.
+	 * 
+	 * @return the connection
+	 */
+	protected Connection getConnection() {
+		return (Connection)getConnectionEditPart().getFigure();
+	}
+
+	/**
+	 * Returns the ConnectionEditPart.
+	 * 
+	 * @return the ConnectionEditPart
+	 */
+	protected ConnectionEditPart getConnectionEditPart() {
+		return connectionEditPart;
+	}
+
+	/**
+	 * @see AbstractTool#getDebugName()
+	 */
+	protected String getDebugName() {
+		return "Connection Endpoint Tool";//$NON-NLS-1$
+	}
+
+	/**
+	 * @see org.eclipse.gef.tools.TargetingTool#getExclusionSet()
+	 */
+	protected Collection getExclusionSet() {
+		if(exclusionSet == null) {
+			exclusionSet = new ArrayList();
+			exclusionSet.add(getConnection());
+		}
+		return exclusionSet;
+	}
+
+	/**
+	 * If currently in the drag-in-progress state, it goes into the terminal
+	 * state erases feedback and executes the current command.
+	 * 
+	 * @see org.eclipse.gef.tools.AbstractTool#handleButtonUp(int)
+	 */
+	protected boolean handleButtonUp(int button) {
+		if(stateTransition(STATE_DRAG_IN_PROGRESS, STATE_TERMINAL)) {
+			eraseSourceFeedback();
+			eraseTargetFeedback();
+			executeCurrentCommand();
+		}
+		return true;
+	}
+
+	/**
+	 * Updates the request and the mouse target, asks to show feedback, and gets
+	 * the current command.
+	 * 
+	 * @return <code>true</code>
+	 */
+	protected boolean handleDragInProgress() {
+		updateTargetRequest();
+		updateTargetUnderMouse();
+		showSourceFeedback();
+		showTargetFeedback();
+		setCurrentCommand(getCommand());
+		return true;
+	}
+
+	/**
+	 * @see org.eclipse.gef.tools.AbstractTool#handleDragStarted()
+	 */
+	protected boolean handleDragStarted() {
+		stateTransition(STATE_INITIAL, STATE_DRAG_IN_PROGRESS);
+		return false;
+	}
+
+	/**
+	 * @see org.eclipse.gef.tools.TargetingTool#handleHover()
+	 */
+	protected boolean handleHover() {
+		if(isInDragInProgress())
+			updateAutoexposeHelper();
+		return true;
+	}
+
+	/**
+	 * Processes the arrow keys (to choose a different source or target edit
+	 * part) and forwardslash and backslash keys (to try to connect to another
+	 * connection).
+	 * 
+	 * @see org.eclipse.gef.tools.AbstractTool#handleKeyDown(org.eclipse.swt.events.KeyEvent)
+	 */
+	protected boolean handleKeyDown(KeyEvent e) {
+		if(acceptArrowKey(e)) {
+			if(stateTransition(STATE_INITIAL, STATE_ACCESSIBLE_DRAG_IN_PROGRESS)) {
+				// When the drag first starts, set the focus Part to be one end
+				// of the connection
+				if(isTarget()) {
+					getCurrentViewer().setFocus(getConnectionEditPart().getTarget());
+					getCurrentViewer().reveal(getConnectionEditPart().getTarget());
+				} else {
+					getCurrentViewer().setFocus(getConnectionEditPart().getSource());
+					getCurrentViewer().reveal(getConnectionEditPart().getSource());
+				}
+			}
+			int direction = 0;
+			switch(e.keyCode) {
+			case SWT.ARROW_DOWN:
+				direction = PositionConstants.SOUTH;
+				break;
+			case SWT.ARROW_UP:
+				direction = PositionConstants.NORTH;
+				break;
+			case SWT.ARROW_RIGHT:
+				direction = isCurrentViewerMirrored() ? PositionConstants.WEST : PositionConstants.EAST;
+				break;
+			case SWT.ARROW_LEFT:
+				direction = isCurrentViewerMirrored() ? PositionConstants.EAST : PositionConstants.WEST;
+				break;
+			}
+
+			boolean consumed = false;
+			if(direction != 0 && e.stateMask == 0)
+				consumed = navigateNextAnchor(direction);
+			if(!consumed) {
+				e.stateMask |= SWT.CONTROL;
+				e.stateMask &= ~SWT.SHIFT;
+				if(getCurrentViewer().getKeyHandler().keyPressed(e)) {
+					navigateNextAnchor(0);
+					return true;
+				}
+			}
+		}
+		if(e.character == '/' || e.character == '\\') {
+			e.stateMask |= SWT.CONTROL;
+			if(getCurrentViewer().getKeyHandler().keyPressed(e)) {
+				// Do not try to connect to the same connection being dragged.
+				if(getCurrentViewer().getFocusEditPart() != getConnectionEditPart())
+					navigateNextAnchor(0);
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	private boolean isCurrentViewerMirrored() {
+		return (getCurrentViewer().getControl().getStyle() & SWT.MIRRORED) != 0;
+	}
+
+	private boolean isTarget() {
+		return getCommandName() == RequestConstants.REQ_RECONNECT_TARGET;
+	}
+
+	boolean navigateNextAnchor(int direction) {
+		EditPart focus = getCurrentViewer().getFocusEditPart();
+		AccessibleAnchorProvider provider;
+		provider = (AccessibleAnchorProvider)focus.getAdapter(AccessibleAnchorProvider.class);
+		if(provider == null)
+			return false;
+
+		List list;
+		if(isTarget())
+			list = provider.getTargetAnchorLocations();
+		else
+			list = provider.getSourceAnchorLocations();
+
+		Point start = getLocation();
+		int distance = Integer.MAX_VALUE;
+		Point next = null;
+		for(int i = 0; i < list.size(); i++) {
+			Point p = (Point)list.get(i);
+			if(p.equals(start) || (direction != 0 && (start.getPosition(p) != direction)))
+				continue;
+			int d = p.getDistanceOrthogonal(start);
+			if(d < distance) {
+				distance = d;
+				next = p;
+			}
+		}
+
+		if(next != null) {
+			placeMouseInViewer(next);
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Sets the command name.
+	 * 
+	 * @param newCommandName
+	 *        the new command name
+	 */
+	public void setCommandName(String newCommandName) {
+		commandName = newCommandName;
+	}
+
+	/**
+	 * Sets the connection edit part that is being reconnected.
+	 * 
+	 * @param cep
+	 *        the connection edit part
+	 */
+	public void setConnectionEditPart(ConnectionEditPart cep) {
+		this.connectionEditPart = cep;
+	}
+
+	/**
+	 * Asks the ConnectionEditPart to show source feedback.
+	 */
+	protected void showSourceFeedback() {
+		getConnectionEditPart().showSourceFeedback(getTargetRequest());
+		setFlag(FLAG_SOURCE_FEEBBACK, true);
+	}
+
+	/**
+	 * Updates the request location.
+	 * 
+	 * @see org.eclipse.gef.tools.TargetingTool#updateTargetRequest()
+	 */
+	protected void updateTargetRequest() {
+		ReconnectRequest request = (ReconnectRequest)getTargetRequest();
+		Point p = getLocation();
+		request.setLocation(p);
+	}
+
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/copy/CustomDragEditPartsTracker.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/copy/CustomDragEditPartsTracker.java
new file mode 100644
index 00000000000..78441ec36fc
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/copy/CustomDragEditPartsTracker.java
@@ -0,0 +1,671 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2010 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *     Adapted Code from gef.tools.DragEditPartTracker by Vicnent Lorenzo CEA-LIST, some method have been added as the end of this class

+ *******************************************************************************/

+package org.eclipse.papyrus.infra.gmfdiag.common.snap.copy;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.List;

+

+import org.eclipse.core.runtime.Platform;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.PrecisionPoint;

+import org.eclipse.draw2d.geometry.PrecisionRectangle;

+import org.eclipse.gef.AutoexposeHelper;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPartViewer;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.LayerConstants;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.RequestConstants;

+import org.eclipse.gef.SharedCursors;

+import org.eclipse.gef.SnapToHelper;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.CompoundCommand;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gef.editparts.LayerManager;

+import org.eclipse.gef.handles.HandleBounds;

+import org.eclipse.gef.requests.ChangeBoundsRequest;

+import org.eclipse.gef.tools.ToolUtilities;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.events.KeyEvent;

+import org.eclipse.swt.graphics.Cursor;

+

+/**

+ * A DragTracker that moves {@link org.eclipse.gef.EditPart EditParts}.

+ */

+public class CustomDragEditPartsTracker extends SelectEditPartTracker {

+

+	/**

+	 * Key modifier for cloning. It's ALT on Mac, and CTRL on all other

+	 * platforms.

+	 */

+	static final int MODIFIER_CLONE;

+

+	static {

+		if(Platform.OS_MACOSX.equals(Platform.getOS()))

+			MODIFIER_CLONE = SWT.ALT;

+		else

+			MODIFIER_CLONE = SWT.CTRL;

+	}

+

+	/**

+	 * Key modifier for constrained move. It's SHIFT on all platforms.

+	 */

+	static final int MODIFIER_CONSTRAINED_MOVE = SWT.SHIFT;

+

+	private static final int FLAG_SOURCE_FEEDBACK = SelectEditPartTracker.MAX_FLAG << 1;

+

+	/** Max flag */

+	protected static final int MAX_FLAG = FLAG_SOURCE_FEEDBACK;

+

+	private List exclusionSet;

+

+	private PrecisionPoint sourceRelativeStartPoint;

+

+	private SnapToHelper snapToHelper;

+

+	private PrecisionRectangle sourceRectangle, compoundSrcRect;

+

+	private boolean cloneActive;

+

+	/**

+	 * Constructs a new DragEditPartsTracker with the given source edit part.

+	 * 

+	 * @param sourceEditPart

+	 *        the source edit part

+	 */

+	public CustomDragEditPartsTracker(EditPart sourceEditPart) {

+		super(sourceEditPart);

+

+		cloneActive = false;

+		setDisabledCursor(SharedCursors.NO);

+	}

+

+	/**

+	 * Returns true if the control key was the key in the key event and the tool

+	 * is in an acceptable state for this event.

+	 * 

+	 * @param e

+	 *        the key event

+	 * @return true if the key was control and can be accepted.

+	 */

+	private boolean acceptClone(KeyEvent e) {

+		int key = e.keyCode;

+		if(!(isInState(STATE_DRAG_IN_PROGRESS | STATE_ACCESSIBLE_DRAG | STATE_ACCESSIBLE_DRAG_IN_PROGRESS)))

+			return false;

+		return (key == MODIFIER_CLONE);

+	}

+

+	private boolean acceptSHIFT(KeyEvent e) {

+		return isInState(STATE_DRAG_IN_PROGRESS | STATE_ACCESSIBLE_DRAG | STATE_ACCESSIBLE_DRAG_IN_PROGRESS) && e.keyCode == SWT.SHIFT;

+	}

+

+	/**

+	 * Returns the cursor used under normal conditions.

+	 * 

+	 * @see #setDefaultCursor(Cursor)

+	 * @return the default cursor

+	 */

+	protected Cursor getDefaultCursor() {

+		if(isCloneActive())

+			return SharedCursors.CURSOR_TREE_ADD;

+		return super.getDefaultCursor();

+	}

+

+	/**

+	 * Erases feedback and calls {@link #performDrag()}. Sets the state to

+	 * terminal.

+	 * 

+	 * @see org.eclipse.gef.tools.AbstractTool#commitDrag()

+	 */

+	public void commitDrag() {

+		eraseSourceFeedback();

+		eraseTargetFeedback();

+		performDrag();

+		setState(STATE_TERMINAL);

+	}

+

+	/**

+	 * Captures the bounds of the source being dragged, and the unioned bounds

+	 * of all figures being dragged. These bounds are used for snapping by the

+	 * snap strategies in <code>updateTargetRequest()</code>.

+	 */

+	private void captureSourceDimensions() {

+		List editparts = getOperationSet();

+		for(int i = 0; i < editparts.size(); i++) {

+			GraphicalEditPart child = (GraphicalEditPart)editparts.get(i);

+			IFigure figure = child.getFigure();

+			PrecisionRectangle bounds = null;

+			if(figure instanceof HandleBounds)

+				bounds = new PrecisionRectangle(((HandleBounds)figure).getHandleBounds());

+			else

+				bounds = new PrecisionRectangle(figure.getBounds());

+			figure.translateToAbsolute(bounds);

+

+			if(compoundSrcRect == null)

+				compoundSrcRect = new PrecisionRectangle(bounds);

+			else

+				compoundSrcRect = compoundSrcRect.union(bounds);

+			if(child == getSourceEditPart())

+				sourceRectangle = bounds;

+		}

+		if(sourceRectangle == null) {

+			IFigure figure = ((GraphicalEditPart)getSourceEditPart()).getFigure();

+			if(figure instanceof HandleBounds)

+				sourceRectangle = new PrecisionRectangle(((HandleBounds)figure).getHandleBounds());

+			else

+				sourceRectangle = new PrecisionRectangle(figure.getBounds());

+			figure.translateToAbsolute(sourceRectangle);

+		}

+	}

+

+	/**

+	 * Returns a List of top-level edit parts excluding dependants (by calling {@link ToolUtilities#getSelectionWithoutDependants(EditPartViewer)}

+	 * that

+	 * understand the current target request (by calling {@link ToolUtilities#filterEditPartsUnderstanding(List, Request)}.

+	 * 

+	 * @see org.eclipse.gef.tools.AbstractTool#createOperationSet()

+	 */

+	protected List createOperationSet() {

+		if(getCurrentViewer() != null) {

+			List list = ToolUtilities.getSelectionWithoutDependants(getCurrentViewer());

+			ToolUtilities.filterEditPartsUnderstanding(list, getTargetRequest());

+			return list;

+		}

+

+		return new ArrayList();

+	}

+

+	/**

+	 * Creates a {@link ChangeBoundsRequest}. By default, the type is {@link RequestConstants#REQ_MOVE}. Later on when the edit parts are asked

+	 * to contribute to the overall command, the request type will be either {@link RequestConstants#REQ_MOVE} or {@link RequestConstants#REQ_ORPHAN},

+	 * depending on the result of {@link #isMove()}.

+	 * 

+	 * @see org.eclipse.gef.tools.TargetingTool#createTargetRequest()

+	 */

+	protected Request createTargetRequest() {

+		if(isCloneActive())

+			return new ChangeBoundsRequest(REQ_CLONE);

+		else

+			return new ChangeBoundsRequest(REQ_MOVE);

+	}

+

+	/**

+	 * Erases source feedback and sets the autoexpose helper to <code>null</code>.

+	 * 

+	 * @see org.eclipse.gef.Tool#deactivate()

+	 */

+	public void deactivate() {

+		eraseSourceFeedback();

+		super.deactivate();

+		exclusionSet = null;

+		sourceRelativeStartPoint = null;

+		sourceRectangle = null;

+		compoundSrcRect = null;

+		snapToHelper = null;

+	}

+

+	/**

+	 * Asks the edit parts in the {@link AbstractTool#getOperationSet()

+	 * operation set} to erase their source feedback.

+	 */

+	protected void eraseSourceFeedback() {

+		if(!getFlag(FLAG_SOURCE_FEEDBACK))

+			return;

+		setFlag(FLAG_SOURCE_FEEDBACK, false);

+		List editParts = getOperationSet();

+		for(int i = 0; i < editParts.size(); i++) {

+			EditPart editPart = (EditPart)editParts.get(i);

+			editPart.eraseSourceFeedback(getTargetRequest());

+		}

+	}

+

+	/**

+	 * Asks each edit part in the {@link AbstractTool#getOperationSet()

+	 * operation set} to contribute to a {@link CompoundCommand} after first

+	 * setting the request type to either {@link RequestConstants#REQ_MOVE} or {@link RequestConstants#REQ_ORPHAN}, depending on the result of

+	 * {@link #isMove()}.

+	 * 

+	 * @see org.eclipse.gef.tools.AbstractTool#getCommand()

+	 */

+	protected Command getCommand() {

+		CompoundCommand command = new CompoundCommand();

+		command.setDebugLabel("Drag Object Tracker");//$NON-NLS-1$

+

+		Iterator iter = getOperationSet().iterator();

+

+		Request request = getTargetRequest();

+

+		if(isCloneActive())

+			request.setType(REQ_CLONE);

+		else if(isMove())

+			request.setType(REQ_MOVE);

+		else

+			request.setType(REQ_ORPHAN);

+

+		if(!isCloneActive()) {

+			while(iter.hasNext()) {

+				EditPart editPart = (EditPart)iter.next();

+				command.add(editPart.getCommand(request));

+			}

+		}

+

+		if(!isMove() || isCloneActive()) {

+			if(!isCloneActive())

+				request.setType(REQ_ADD);

+

+			if(getTargetEditPart() == null)

+				command.add(UnexecutableCommand.INSTANCE);

+			else

+				command.add(getTargetEditPart().getCommand(getTargetRequest()));

+		}

+

+		return command.unwrap();

+	}

+

+	/**

+	 * @see org.eclipse.gef.tools.AbstractTool#getCommandName()

+	 */

+	protected String getCommandName() {

+		if(isCloneActive())

+			return REQ_CLONE;

+		else if(isMove())

+			return REQ_MOVE;

+		else

+			return REQ_ADD;

+	}

+

+	/**

+	 * @see org.eclipse.gef.tools.AbstractTool#getDebugName()

+	 */

+	protected String getDebugName() {

+		return "DragEditPartsTracker:" + getCommandName();//$NON-NLS-1$

+	}

+

+	/**

+	 * Returns a list of all the edit parts in the {@link AbstractTool#getOperationSet() operation set}, plus the

+	 * {@link org.eclipse.draw2d.ConnectionLayer}.

+	 * 

+	 * @see org.eclipse.gef.tools.TargetingTool#getExclusionSet()

+	 */

+	protected Collection getExclusionSet() {

+		if(exclusionSet == null) {

+			List set = getOperationSet();

+			exclusionSet = new ArrayList(set.size() + 1);

+			for(int i = 0; i < set.size(); i++) {

+				GraphicalEditPart editpart = (GraphicalEditPart)set.get(i);

+				exclusionSet.add(editpart.getFigure());

+			}

+			LayerManager layerManager = (LayerManager)getCurrentViewer().getEditPartRegistry().get(LayerManager.ID);

+			if(layerManager != null) {

+				exclusionSet.add(layerManager.getLayer(LayerConstants.CONNECTION_LAYER));

+			}

+		}

+		return exclusionSet;

+	}

+

+	/**

+	 * @see org.eclipse.gef.tools.TargetingTool#handleAutoexpose()

+	 */

+	protected void handleAutoexpose() {

+		updateTargetRequest();

+		updateTargetUnderMouse();

+		showTargetFeedback();

+		showSourceFeedback();

+		setCurrentCommand(getCommand());

+	}

+

+	/**

+	 * Erases feedback and calls {@link #performDrag()}.

+	 * 

+	 * @see org.eclipse.gef.tools.AbstractTool#handleButtonUp(int)

+	 */

+	protected boolean handleButtonUp(int button) {

+		if(stateTransition(STATE_DRAG_IN_PROGRESS, STATE_TERMINAL)) {

+			eraseSourceFeedback();

+			eraseTargetFeedback();

+			performDrag();

+			return true;

+		}

+		return super.handleButtonUp(button);

+	}

+

+	/**

+	 * Updates the target request and mouse target, asks to show feedback, and

+	 * sets the current command.

+	 * 

+	 * @see org.eclipse.gef.tools.AbstractTool#handleDragInProgress()

+	 */

+	protected boolean handleDragInProgress() {

+		if(isInDragInProgress()) {

+			updateTargetRequest();

+			if(updateTargetUnderMouse())

+				updateTargetRequest();

+			showTargetFeedback();

+			showSourceFeedback();

+			setCurrentCommand(getCommand());

+		}

+		return true;

+	}

+

+	/**

+	 * Calls {@link TargetingTool#updateAutoexposeHelper()} if a drag is in

+	 * progress.

+	 * 

+	 * @see org.eclipse.gef.tools.TargetingTool#handleHover()

+	 */

+	protected boolean handleHover() {

+		if(isInDragInProgress())

+			updateAutoexposeHelper();

+		return true;

+	}

+

+	/**

+	 * Erases source feedback.

+	 * 

+	 * @see org.eclipse.gef.tools.TargetingTool#handleInvalidInput()

+	 */

+	protected boolean handleInvalidInput() {

+		super.handleInvalidInput();

+		eraseSourceFeedback();

+		return true;

+	}

+

+	/**

+	 * Processes arrow keys used to move edit parts.

+	 * 

+	 * @see org.eclipse.gef.tools.AbstractTool#handleKeyDown(org.eclipse.swt.events.KeyEvent)

+	 */

+	protected boolean handleKeyDown(KeyEvent e) {

+		setAutoexposeHelper(null);

+		if(acceptArrowKey(e)) {

+			accStepIncrement();

+			if(stateTransition(STATE_INITIAL, STATE_ACCESSIBLE_DRAG_IN_PROGRESS))

+				setStartLocation(getLocation());

+			switch(e.keyCode) {

+			case SWT.ARROW_DOWN:

+				placeMouseInViewer(getLocation().getTranslated(0, accGetStep()));

+				break;

+			case SWT.ARROW_UP:

+				placeMouseInViewer(getLocation().getTranslated(0, -accGetStep()));

+				break;

+			case SWT.ARROW_RIGHT:

+				int stepping = accGetStep();

+				if(isCurrentViewerMirrored())

+					stepping = -stepping;

+				placeMouseInViewer(getLocation().getTranslated(stepping, 0));

+				break;

+			case SWT.ARROW_LEFT:

+				int step = -accGetStep();

+				if(isCurrentViewerMirrored())

+					step = -step;

+				placeMouseInViewer(getLocation().getTranslated(step, 0));

+				break;

+			}

+			return true;

+		} else if(acceptClone(e)) {

+			setCloneActive(true);

+			handleDragInProgress();

+			return true;

+		} else if(acceptSHIFT(e)) {

+			handleDragInProgress();

+			return true;

+		}

+

+		return false;

+	}

+

+	private boolean isCurrentViewerMirrored() {

+		return (getCurrentViewer().getControl().getStyle() & SWT.MIRRORED) != 0;

+	}

+	/**

+	 * Interprets and processes clone deactivation, constrained move

+	 * deactivation, and accessibility navigation reset.

+	 * 

+	 * @see org.eclipse.gef.tools.AbstractTool#handleKeyUp(org.eclipse.swt.events.KeyEvent)

+	 */

+	protected boolean handleKeyUp(KeyEvent e) {

+		if(acceptArrowKey(e)) {

+			accStepReset();

+			return true;

+		} else if(acceptClone(e)) {

+			setCloneActive(false);

+			handleDragInProgress();

+			return true;

+		} else if(acceptSHIFT(e)) {

+			handleDragInProgress();

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * Returns true if the current drag is a clone operation.

+	 * 

+	 * @return true if cloning is enabled and is currently active.

+	 */

+	protected boolean isCloneActive() {

+		return cloneActive;

+	}

+

+	/**

+	 * Returns <code>true</code> if the source edit part is being moved within

+	 * its parent. If the source edit part is being moved to another parent,

+	 * this returns <code>false</code>.

+	 * 

+	 * @return <code>true</code> if the source edit part is not being reparented

+	 */

+	protected boolean isMove() {

+		EditPart part = getSourceEditPart();

+		while(part != getTargetEditPart() && part != null) {

+			if(part.getParent() == getTargetEditPart() && part.getSelected() != EditPart.SELECTED_NONE)

+				return true;

+			part = part.getParent();

+		}

+		return false;

+	}

+

+	/**

+	 * Calls {@link AbstractTool#executeCurrentCommand()}.

+	 */

+	protected void performDrag() {

+		executeCurrentCommand();

+	}

+

+	/**

+	 * If auto scroll (also called auto expose) is being performed, the start

+	 * location moves during the scroll. This method updates that location.

+	 */

+	protected void repairStartLocation() {

+		if(sourceRelativeStartPoint == null)

+			return;

+		IFigure figure = ((GraphicalEditPart)getSourceEditPart()).getFigure();

+		PrecisionPoint newStart = (PrecisionPoint)sourceRelativeStartPoint.getCopy();

+		figure.translateToAbsolute(newStart);

+		Point delta = new Point(newStart.x - getStartLocation().x, newStart.y - getStartLocation().y);

+		setStartLocation(newStart);

+		// sourceRectangle and compoundSrcRect need to be updated as well when

+		// auto-scrolling

+		if(sourceRectangle != null)

+			sourceRectangle.translate(delta);

+		if(compoundSrcRect != null)

+			compoundSrcRect.translate(delta);

+	}

+

+	/**

+	 * @see org.eclipse.gef.tools.TargetingTool#setAutoexposeHelper(org.eclipse.gef.AutoexposeHelper)

+	 */

+	protected void setAutoexposeHelper(AutoexposeHelper helper) {

+		super.setAutoexposeHelper(helper);

+		if(helper != null && sourceRelativeStartPoint == null && isInDragInProgress()) {

+			IFigure figure = ((GraphicalEditPart)getSourceEditPart()).getFigure();

+			sourceRelativeStartPoint = new PrecisionPoint(getStartLocation());

+			figure.translateToRelative(sourceRelativeStartPoint);

+		}

+	}

+

+	/**

+	 * Enables cloning if the value is true.

+	 * 

+	 * @param cloneActive

+	 *        <code>true</code> if cloning should be active

+	 */

+	protected void setCloneActive(boolean cloneActive) {

+		if(this.cloneActive == cloneActive)

+			return;

+		eraseSourceFeedback();

+		eraseTargetFeedback();

+		this.cloneActive = cloneActive;

+	}

+

+	/**

+	 * Extended to update the current snap-to strategy.

+	 * 

+	 * @see org.eclipse.gef.tools.TargetingTool#setTargetEditPart(org.eclipse.gef.EditPart)

+	 */

+	protected void setTargetEditPart(EditPart editpart) {

+		if(getTargetEditPart() == editpart)

+			return;

+		super.setTargetEditPart(editpart);

+		snapToHelper = null;

+		if(getTargetEditPart() != null && getOperationSet().size() > 0)

+			snapToHelper = (SnapToHelper)getTargetEditPart().getAdapter(SnapToHelper.class);

+	}

+

+	/**

+	 * Asks the edit parts in the {@link AbstractTool#getOperationSet()

+	 * operation set} to show source feedback.

+	 */

+	protected void showSourceFeedback() {

+		List editParts = getOperationSet();

+		for(int i = 0; i < editParts.size(); i++) {

+			EditPart editPart = (EditPart)editParts.get(i);

+			editPart.showSourceFeedback(getTargetRequest());

+		}

+		setFlag(FLAG_SOURCE_FEEDBACK, true);

+	}

+

+	/**

+	 * Extended to activate cloning and to update the captured source dimensions

+	 * when applicable.

+	 * 

+	 * @see org.eclipse.gef.tools.AbstractTool#setState(int)

+	 */

+	protected void setState(int state) {

+		boolean check = isInState(STATE_INITIAL);

+		super.setState(state);

+

+		if(isInState(STATE_ACCESSIBLE_DRAG | STATE_DRAG_IN_PROGRESS | STATE_ACCESSIBLE_DRAG_IN_PROGRESS)) {

+			if(getCurrentInput().isModKeyDown(MODIFIER_CLONE)) {

+				setCloneActive(true);

+				handleDragInProgress();

+			}

+		}

+

+		if(check && isInState(STATE_DRAG | STATE_ACCESSIBLE_DRAG | STATE_ACCESSIBLE_DRAG_IN_PROGRESS))

+			captureSourceDimensions();

+	}

+

+	/**

+	 * Calls {@link #repairStartLocation()} in case auto scroll is being

+	 * performed. Updates the request with the current {@link AbstractTool#getOperationSet() operation set}, move delta,

+	 * location and type.

+	 * 

+	 * @see org.eclipse.gef.tools.TargetingTool#updateTargetRequest()

+	 */

+	protected void updateTargetRequest() {

+		repairStartLocation();

+		ChangeBoundsRequest request = (ChangeBoundsRequest)getTargetRequest();

+		request.setEditParts(getOperationSet());

+		Dimension delta = getDragMoveDelta();

+

+		request.setConstrainedMove(getCurrentInput().isModKeyDown(MODIFIER_CONSTRAINED_MOVE));

+		request.setSnapToEnabled(!getCurrentInput().isModKeyDown(MODIFIER_NO_SNAPPING));

+

+		// constrains the move to dx=0, dy=0, or dx=dy if shift is depressed

+		if(request.isConstrainedMove()) {

+			float ratio = 0;

+

+			if(delta.width != 0)

+				ratio = (float)delta.height / (float)delta.width;

+

+			ratio = Math.abs(ratio);

+			if(ratio > 0.5 && ratio < 1.5) {

+				if(Math.abs(delta.height) > Math.abs(delta.width)) {

+					if(delta.height > 0)

+						delta.height = Math.abs(delta.width);

+					else

+						delta.height = -Math.abs(delta.width);

+				} else {

+					if(delta.width > 0)

+						delta.width = Math.abs(delta.height);

+					else

+						delta.width = -Math.abs(delta.height);

+				}

+			} else {

+				if(Math.abs(delta.width) > Math.abs(delta.height))

+					delta.height = 0;

+				else

+					delta.width = 0;

+			}

+		}

+

+		Point moveDelta = new Point(delta.width, delta.height);

+		request.getExtendedData().clear();

+		request.setMoveDelta(moveDelta);

+		snapPoint(request);

+

+		request.setLocation(getLocation());

+		request.setType(getCommandName());

+	}

+

+	/**

+	 * This method can be overridden by clients to customize the snapping

+	 * behavior.

+	 * 

+	 * @param request

+	 *        the <code>ChangeBoundsRequest</code> from which the move delta

+	 *        can be extracted and updated

+	 * @since 3.4

+	 */

+	protected void snapPoint(ChangeBoundsRequest request) {

+		Point moveDelta = request.getMoveDelta();

+		if(snapToHelper != null && request.isSnapToEnabled()) {

+			PrecisionRectangle baseRect = sourceRectangle.getPreciseCopy();

+			PrecisionRectangle jointRect = compoundSrcRect.getPreciseCopy();

+			baseRect.translate(moveDelta);

+			jointRect.translate(moveDelta);

+

+			PrecisionPoint preciseDelta = new PrecisionPoint(moveDelta);

+			snapToHelper.snapPoint(request, PositionConstants.HORIZONTAL | PositionConstants.VERTICAL, new PrecisionRectangle[]{ baseRect, jointRect }, preciseDelta);

+			request.setMoveDelta(preciseDelta);

+		}

+	}

+

+

+	//-----------------------------added methods for Papyrus

+	protected PrecisionRectangle getSourceRectangle() {

+		return this.sourceRectangle.getPreciseCopy();

+	}

+

+	protected SnapToHelper getSnapToHelper() {

+		return this.snapToHelper;

+	}

+

+	protected PrecisionRectangle getCompoundSourceRectangle() {

+		return this.compoundSrcRect.getPreciseCopy();

+	}

+}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/copy/DelayedDirectEditHelper.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/copy/DelayedDirectEditHelper.java
new file mode 100644
index 00000000000..9ec5e33b764
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/copy/DelayedDirectEditHelper.java
@@ -0,0 +1,123 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2010 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.papyrus.infra.gmfdiag.common.snap.copy;

+

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPartViewer;

+import org.eclipse.gef.Request;

+import org.eclipse.swt.events.FocusAdapter;

+import org.eclipse.swt.events.FocusEvent;

+import org.eclipse.swt.events.FocusListener;

+import org.eclipse.swt.events.KeyEvent;

+import org.eclipse.swt.events.KeyListener;

+import org.eclipse.swt.events.MouseAdapter;

+import org.eclipse.swt.events.MouseEvent;

+import org.eclipse.swt.events.MouseListener;

+import org.eclipse.swt.widgets.Control;

+import org.eclipse.swt.widgets.Display;

+

+/**

+ * @author hudsonr Created on Mar 6, 2003

+ */

+class DelayedDirectEditHelper implements Runnable {

+

+	private EditPartViewer viewer;

+

+	private EditPart part;

+

+	private Request req;

+

+	private FocusListener focus;

+

+	private MouseListener mouse;

+

+	private KeyListener key;

+

+	private static DelayedDirectEditHelper activeHelper;

+

+	/**

+	 * Constructs a new helper and starts it immediately. If another helper is

+	 * active, it is aborted and neither helper will run.

+	 * 

+	 * @param viewer

+	 *        the viewer on which the direct-edit is supposed to happen

+	 * @param request

+	 *        the request that triggered the direct-edit

+	 * @param receiver

+	 *        the EditPart that received the request

+	 */

+	public DelayedDirectEditHelper(EditPartViewer viewer, Request request, EditPart receiver) {

+		this.req = request;

+		this.viewer = viewer;

+		this.part = receiver;

+		if(activeHelper != null)

+			activeHelper = null;

+		else {

+			hookControl(viewer.getControl());

+			activeHelper = this;

+			Display.getCurrent().timerExec(400, this);

+		}

+	}

+

+	/**

+	 * The edit is canceled by setting the active helper to <code>null</code>.

+	 */

+	void abort() {

+		activeHelper = null;

+	}

+

+	void hookControl(Control control) {

+		control.addFocusListener(focus = new FocusAdapter() {

+

+			public void focusLost(FocusEvent e) {

+				abort();

+			}

+		});

+		control.addKeyListener(key = new KeyListener() {

+

+			public void keyPressed(KeyEvent e) {

+				abort();

+			}

+

+			public void keyReleased(KeyEvent e) {

+				abort();

+			}

+		});

+

+		control.addMouseListener(mouse = new MouseAdapter() {

+

+			public void mouseDoubleClick(MouseEvent e) {

+				abort();

+			}

+

+			public void mouseDown(MouseEvent e) {

+				abort();

+			}

+		});

+	}

+

+	/**

+	 * If this helper has not been aborted, the target editpart will be sent the

+	 * request.

+	 */

+	public void run() {

+		if(activeHelper == this && part.isActive() && viewer.getControl() != null && !viewer.getControl().isDisposed()) {

+			part.performRequest(req);

+		}

+		if(viewer.getControl() != null && !viewer.getControl().isDisposed()) {

+			viewer.getControl().removeFocusListener(focus);

+			viewer.getControl().removeMouseListener(mouse);

+			viewer.getControl().removeKeyListener(key);

+		}

+		activeHelper = null;

+	}

+

+}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/copy/DragEditPartsTrackerEx.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/copy/DragEditPartsTrackerEx.java
new file mode 100644
index 00000000000..26f358ef1f6
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/copy/DragEditPartsTrackerEx.java
@@ -0,0 +1,303 @@
+/******************************************************************************

+ * Copyright (c) 2002, 2008 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *    IBM Corporation - initial API and implementation 

+ ****************************************************************************/

+

+package org.eclipse.papyrus.infra.gmfdiag.common.snap.copy;

+

+import java.util.Iterator;

+import java.util.List;

+

+import org.eclipse.draw2d.FigureCanvas;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.Viewport;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.SharedCursors;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.CompoundCommand;

+import org.eclipse.gef.requests.ChangeBoundsRequest;

+import org.eclipse.gef.tools.ToolUtilities;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.GroupEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.internal.ruler.SnapToHelperUtil;

+import org.eclipse.gmf.runtime.diagram.ui.requests.DuplicateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil;

+import org.eclipse.swt.events.KeyEvent;

+import org.eclipse.swt.graphics.Cursor;

+import org.eclipse.swt.widgets.Control;

+

+/**

+ * A dervied DragEditPartsTRacker that sends REQ_DRAG instead of REQ_ORPHAN

+ * and REQ_DROP instead of REQ_ADD

+ * 

+ * @author melaasar

+ */

+@SuppressWarnings("restriction")

+public class DragEditPartsTrackerEx extends CustomDragEditPartsTracker {

+

+    /**

+	 * @param sourceEditPart

+	 */

+	public DragEditPartsTrackerEx(EditPart sourceEditPart) {

+		super(sourceEditPart);

+	}

+

+	/**

+	 * @see org.eclipse.gef.tools.AbstractTool#getCommand()

+	 */

+	protected Command getCommand() {

+		if (!isMove()) {

+			CompoundCommand command = new CompoundCommand();

+			addSourceCommands(false, command); 

+			if (getTargetEditPart()!=null){

+				command.add(getTargetEditPart().getCommand(getTargetRequest()));

+				if (command.canExecute())

+					return command;

+			} 

+			

+			

+		}

+		CompoundCommand command = new CompoundCommand();

+		addSourceCommands(true, command);

+		return command;

+	}

+

+	/**

+	 * Collects the move/drag commands from the operation set

+	 * @param isMove

+	 * @param command

+	 */

+	protected void addSourceCommands(boolean isMove, CompoundCommand command) {

+        Request request = getTargetRequest();

+

+        if (isCloneActive()) {

+

+            // do not use operation set in this case as connections will get

+            // filtered out

+            List editparts = ToolUtilities

+                .getSelectionWithoutDependants(getCurrentViewer());

+

+            DuplicateRequest duplicateRequest = new DuplicateRequest();

+            duplicateRequest.setEditParts(editparts);

+            duplicateRequest.setExtendedData(request.getExtendedData());

+            if (request instanceof ChangeBoundsRequest) {

+                Point delta = ((ChangeBoundsRequest) request).getMoveDelta();

+                MapModeUtil.getMapMode(

+                    ((IGraphicalEditPart) getTargetEditPart()).getFigure())

+                    .DPtoLP(delta);

+

+                duplicateRequest.setOffset(delta);

+            }

+            command.add(getTargetEditPart().getCommand(duplicateRequest));

+        } else {

+            request.setType(isMove ? REQ_MOVE

+                : RequestConstants.REQ_DRAG);

+            Iterator iter = getOperationSet().iterator();

+            while (iter.hasNext()) {

+                EditPart editPart = (EditPart) iter.next();

+                command.add(editPart.getCommand(request));

+            }

+        }

+

+        request.setType(RequestConstants.REQ_DROP);

+    }

+

+	/**

+	 * @see org.eclipse.gef.tools.AbstractTool#getCommandName()

+	 */

+	protected String getCommandName() {

+		if (!isMove())

+			return RequestConstants.REQ_DROP;

+		return super.getCommandName();

+	}

+

+	/**

+	 * If the source is not in the operation set, it is not a move

+	 * @see org.eclipse.gef.tool s.DragEditPartsTracker#isMove()

+	 */

+	protected boolean isMove() {		

+		for (int i = 0 ; i < getOperationSet().size(); i++){

+			if (getOperationSet().get(i).equals(getSourceEditPart())){

+				return super.isMove();

+			}

+			//additional case for GroupEditPart, check the children

+			//this is for snap to geometry			

+			if (getOperationSet().get(i) instanceof GroupEditPart){

+				GroupEditPart currPart = (GroupEditPart)getOperationSet().get(i);

+				for (int j = 0 ; j < currPart.getChildren().size() ; j++){

+					if (currPart.getChildren().get(j).equals(getSourceEditPart())){

+						return super.isMove();

+					}

+				}

+			}

+		}

+		return false;

+	}

+	

+	/* (non-Javadoc)

+	 * @see org.eclipse.gef.tools.AbstractTool#executeCurrentCommand()

+	 */

+	protected void executeCurrentCommand() {

+		super.executeCurrentCommand();

+		if (isActive()) {

+			if (getOperationSet().size() > 0) {

+				if (getOperationSet().get(0) instanceof IGraphicalEditPart) {

+					IGraphicalEditPart editpart = (IGraphicalEditPart) getOperationSet()

+						.get(0);

+					if ((editpart.getFigure() == null)

+						|| (editpart.getFigure().getParent() == null)

+						|| (editpart.getFigure().getParent().getLayoutManager() == null))

+						return;

+					editpart.getFigure().getParent().getLayoutManager().layout(

+						editpart.getFigure().getParent());

+					reveal(editpart);

+				}

+			}

+		}

+	}

+	

+	/**

+	 * @param editpart

+	 */

+	protected void reveal(EditPart editpart){

+		editpart.getViewer().reveal(editpart);

+	}

+   

+    protected boolean handleDragInProgress() {

+        boolean returnValue = super.handleDragInProgress();

+        if (isInState(STATE_DRAG_IN_PROGRESS)

+            || isInState(STATE_ACCESSIBLE_DRAG_IN_PROGRESS)) {

+            

+            // Expose the diagram as the user scrolls in the area handled by the

+            // autoexpose helper.

+            updateAutoexposeHelper();

+        }

+        return returnValue;

+    }

+

+    protected Cursor calculateCursor() {

+        if (isInState(STATE_DRAG_IN_PROGRESS)

+            || isInState(STATE_ACCESSIBLE_DRAG_IN_PROGRESS)) {

+

+            // Give some feedback so the user knows the area where autoscrolling

+            // will occur.

+            if (getAutoexposeHelper() != null) {

+                return SharedCursors.HAND;

+            } else {

+

+                // Give some feedback so the user knows that they can't drag

+                // outside the viewport.

+                Control control = getCurrentViewer().getControl();

+                if (control instanceof FigureCanvas) {

+                    Viewport viewport = ((FigureCanvas) control).getViewport();

+                    Rectangle rect = Rectangle.SINGLETON;

+                    viewport.getClientArea(rect);

+                    viewport.translateToParent(rect);

+                    viewport.translateToAbsolute(rect);

+

+                    if (!rect.contains(getLocation())) {

+                        return getDisabledCursor();

+                    }

+                }

+            }

+        }

+        return super.calculateCursor();

+    }

+    

+    protected boolean handleButtonDown(int button) {

+

+        // If the group is selected, and the user clicks on a shape, defer the

+        // selection of the shape until the mouse button is released instead of

+        // selecting on mouse down because if the user does a drag they will

+        // move the entire group and not the shape.

+        if (button == 1

+            && getSourceEditPart().getParent() instanceof GroupEditPart

+            && getSourceEditPart().getParent().getSelected() != EditPart.SELECTED_NONE) {

+

+            stateTransition(STATE_INITIAL, STATE_DRAG);

+            return true;

+        }

+

+        return super.handleButtonDown(button);

+    }

+

+    protected boolean handleDoubleClick(int button) {

+        // If the user double-clicks a shape in a group and the shape is not

+        // selected, select the shape.

+        if (getSourceEditPart().getParent() instanceof GroupEditPart

+            && getSourceEditPart().getSelected() == EditPart.SELECTED_NONE) {

+            performSelection();

+            return true;

+        } else {

+            return super.handleDoubleClick(button);

+        }

+    }

+

+    protected void performSelection() {

+        super.performSelection();

+

+        // If the new selection is a child of a group, we want to deselect the group.

+        if (getSourceEditPart().getParent() instanceof GroupEditPart

+            && getSourceEditPart().getParent().getSelected() != EditPart.SELECTED_NONE) {

+            getCurrentViewer().deselect(getSourceEditPart().getParent());

+        }

+    }

+    

+    /**

+     * Overridden to add extended data to the request to restrict snapping to

+     * specific directions based on the move delta.

+     */

+    protected void snapPoint(ChangeBoundsRequest request) {

+        Point moveDelta = request.getMoveDelta();

+        if (getState() == STATE_ACCESSIBLE_DRAG_IN_PROGRESS) {

+            int restrictedDirection = 0;

+

+            if (moveDelta.x > 0) {

+                restrictedDirection = restrictedDirection

+                    | PositionConstants.EAST;

+            } else if (moveDelta.x < 0) {

+                restrictedDirection = restrictedDirection

+                    | PositionConstants.WEST;

+            }

+

+            if (moveDelta.y > 0) {

+                restrictedDirection = restrictedDirection

+                    | PositionConstants.SOUTH;

+            } else if (moveDelta.y < 0) {

+                restrictedDirection = restrictedDirection

+                    | PositionConstants.NORTH;

+            }

+

+            request.getExtendedData().put(SnapToHelperUtil.RESTRICTED_DIRECTIONS,

+                restrictedDirection);

+        }

+

+        super.snapPoint(request);

+    }

+    

+    protected boolean handleKeyDown(KeyEvent e) {

+        if (acceptArrowKey(e)) {

+            if (isInState(STATE_INITIAL)) {

+                IGraphicalEditPart ep = (IGraphicalEditPart) getSourceEditPart();

+                if (ep != null) {

+                    Point location = ep.getFigure().getBounds().getCenter();

+                    ep.getFigure().translateToAbsolute(location);

+                    placeMouseInViewer(location);       

+                    getCurrentInput().setMouseLocation(location.x, location.y);

+                }

+            }

+        }

+        return super.handleKeyDown(e);

+    }

+

+}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/copy/SelectEditPartTracker.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/copy/SelectEditPartTracker.java
new file mode 100644
index 00000000000..25666e27ddf
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/copy/SelectEditPartTracker.java
@@ -0,0 +1,241 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2010 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.papyrus.infra.gmfdiag.common.snap.copy;

+

+import java.util.List;

+

+import org.eclipse.gef.DragTracker;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPartViewer;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.RequestConstants;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.requests.SelectionRequest;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.graphics.Cursor;

+

+/**

+ * DragTracker used to select, edit, and open {@link org.eclipse.gef.EditPart

+ * EditParts}.

+ */

+public class SelectEditPartTracker extends TargetingTool implements DragTracker {

+

+	/** Flag to indicate selection has been performed. */

+	protected static final int FLAG_SELECTION_PERFORMED = TargetingTool.MAX_FLAG << 1;

+

+	private static final int FLAG_ENABLE_DIRECT_EDIT = TargetingTool.MAX_FLAG << 2;

+

+	/** Max flag */

+	protected static final int MAX_FLAG = FLAG_ENABLE_DIRECT_EDIT;

+

+	private EditPart editpart;

+

+	/**

+	 * Constructs a new SelectEditPartTracker with the given edit part as the

+	 * source.

+	 * 

+	 * @param owner

+	 *        the source edit part

+	 */

+	public SelectEditPartTracker(EditPart owner) {

+		setSourceEditPart(owner);

+	}

+

+	/**

+	 * @see org.eclipse.gef.tools.AbstractTool#calculateCursor()

+	 */

+	protected Cursor calculateCursor() {

+		if(isInState(STATE_INITIAL | STATE_DRAG | STATE_ACCESSIBLE_DRAG))

+			return getDefaultCursor();

+		return super.calculateCursor();

+	}

+

+	/**

+	 * @see org.eclipse.gef.tools.AbstractTool#getCommandName()

+	 */

+	protected String getCommandName() {

+		return "Select Tracker";//$NON-NLS-1$

+	}

+

+	/**

+	 * @see org.eclipse.gef.tools.AbstractTool#getDebugName()

+	 */

+	protected String getDebugName() {

+		return "Select Tracker";//$NON-NLS-1$

+	}

+

+	/**

+	 * Returns the source edit part.

+	 * 

+	 * @return the source edit part

+	 */

+	protected EditPart getSourceEditPart() {

+		return editpart;

+	}

+

+	/**

+	 * Performs a conditional selection if needed (if right or left mouse button

+	 * have been pressed) and goes into the drag state. If any other button has

+	 * been pressed, the tool goes into the invalid state.

+	 * 

+	 * @see org.eclipse.gef.tools.AbstractTool#handleButtonDown(int)

+	 */

+	protected boolean handleButtonDown(int button) {

+		if((button == 3 || button == 1) && isInState(STATE_INITIAL))

+			performConditionalSelection();

+

+		if(button != 1) {

+			setState(STATE_INVALID);

+			if(button == 3)

+				setState(STATE_TERMINAL);

+			handleInvalidInput();

+		} else

+			stateTransition(STATE_INITIAL, STATE_DRAG);

+		return true;

+	}

+

+	/**

+	 * If in the drag state, the tool selects the source edit part. If the edit

+	 * part was already selected, {@link #performDirectEdit()} is called. If the

+	 * edit part is newly selected and not completely visible, {@link EditPartViewer#reveal(EditPart)} is called to show the selected

+	 * edit part.

+	 * 

+	 * @see org.eclipse.gef.tools.AbstractTool#handleButtonUp(int)

+	 */

+	protected boolean handleButtonUp(int button) {

+		if(isInState(STATE_DRAG)) {

+			performSelection();

+			if(getFlag(FLAG_ENABLE_DIRECT_EDIT))

+				performDirectEdit();

+			if(button == 1 && getSourceEditPart().getSelected() != EditPart.SELECTED_NONE)

+				getCurrentViewer().reveal(getSourceEditPart());

+			setState(STATE_TERMINAL);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * Calls {@link #performOpen()} if the double click was with mouse button 1.

+	 * 

+	 * @see org.eclipse.gef.tools.AbstractTool#handleDoubleClick(int)

+	 */

+	protected boolean handleDoubleClick(int button) {

+		setFlag(FLAG_ENABLE_DIRECT_EDIT, false);

+		if(button == 1) {

+			// Prevent selection from happening later on mouse up

+			setFlag(FLAG_SELECTION_PERFORMED, true);

+			performOpen();

+		}

+		return true;

+	}

+

+	/**

+	 * @see org.eclipse.gef.tools.AbstractTool#handleDragStarted()

+	 */

+	protected boolean handleDragStarted() {

+		return stateTransition(STATE_DRAG, STATE_DRAG_IN_PROGRESS);

+	}

+

+	/**

+	 * Returns <code>true</code> if selection has already occured.

+	 * 

+	 * @return <code>true</code> if selection has occured

+	 */

+	protected boolean hasSelectionOccurred() {

+		return getFlag(FLAG_SELECTION_PERFORMED);

+	}

+

+	/**

+	 * Calls {@link #performSelection()} if the source is not selected. If the

+	 * source is selected and there are no modifier keys pressed (i.e. the user

+	 * isn't selecting multiple edit parts or deselecting edit parts), sets the

+	 * direct edit flag so that when the mouse is released, a direct edit will

+	 * be performed.

+	 */

+	protected void performConditionalSelection() {

+		if(getSourceEditPart().getSelected() == EditPart.SELECTED_NONE)

+			performSelection();

+		else if(getCurrentInput().getModifiers() == 0)

+			setFlag(FLAG_ENABLE_DIRECT_EDIT, true);

+	}

+

+	/**

+	 * Creates a {@link DirectEditRequest} and sends it to a

+	 * DelayedDirectEditHelper to allow the user to directly edit the edit part.

+	 */

+	protected void performDirectEdit() {

+		DirectEditRequest req = new DirectEditRequest();

+		req.setLocation(getCurrentInput().getMouseLocation());

+		new DelayedDirectEditHelper(getSourceEditPart().getViewer(), req, getSourceEditPart());

+	}

+

+	/**

+	 * Creates a {@link SelectionRequest} and sends it to the source edit part

+	 * via {@link EditPart#performRequest(Request)}. Possible uses are to open

+	 * the selected item in another editor or replace the current editor's

+	 * contents based on the selected item.

+	 */

+	protected void performOpen() {

+		SelectionRequest request = new SelectionRequest();

+		request.setLocation(getLocation());

+		request.setModifiers(getCurrentInput().getModifiers());

+		request.setType(RequestConstants.REQ_OPEN);

+		getSourceEditPart().performRequest(request);

+	}

+

+	/**

+	 * Performs the appropriate selection action based on the selection state of

+	 * the source and the modifiers (CTRL and SHIFT). If no modifier key is

+	 * pressed, the source will be set as the only selection. If the CTRL key is

+	 * pressed and the edit part is already selected, it will be deselected. If

+	 * the CTRL key is pressed and the edit part is not selected, it will be

+	 * appended to the selection set. If the SHIFT key is pressed, the source

+	 * will be appended to the selection.

+	 */

+	protected void performSelection() {

+		if(hasSelectionOccurred())

+			return;

+		setFlag(FLAG_SELECTION_PERFORMED, true);

+		EditPartViewer viewer = getCurrentViewer();

+		List selectedObjects = viewer.getSelectedEditParts();

+

+		if(getCurrentInput().isModKeyDown(SWT.MOD1)) {

+			if(selectedObjects.contains(getSourceEditPart()))

+				viewer.deselect(getSourceEditPart());

+			else

+				viewer.appendSelection(getSourceEditPart());

+		} else if(getCurrentInput().isShiftKeyDown())

+			viewer.appendSelection(getSourceEditPart());

+		else

+			viewer.select(getSourceEditPart());

+	}

+

+	/**

+	 * @see org.eclipse.gef.tools.AbstractTool#resetFlags()

+	 */

+	protected void resetFlags() {

+		super.resetFlags();

+		setFlag(FLAG_SELECTION_PERFORMED, false);

+		setFlag(FLAG_ENABLE_DIRECT_EDIT, false);

+	}

+

+	/**

+	 * Sets the source edit part.

+	 * 

+	 * @param part

+	 *        the source edit part

+	 */

+	protected void setSourceEditPart(EditPart part) {

+		this.editpart = part;

+	}

+

+}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/copy/TargetingTool.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/copy/TargetingTool.java
new file mode 100644
index 00000000000..8de2cabe6f0
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/snap/copy/TargetingTool.java
@@ -0,0 +1,436 @@
+/*******************************************************************************

+ * Copyright (c) 2000, 2010 IBM Corporation and others.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *     IBM Corporation - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.papyrus.infra.gmfdiag.common.snap.copy;

+

+import java.util.Collection;

+import java.util.Collections;

+

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.gef.AutoexposeHelper;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPartViewer;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gef.requests.TargetRequest;

+import org.eclipse.swt.widgets.Display;

+

+/**

+ * The base implementation for tools which perform targeting of editparts.

+ * Targeting tools may operate using either mouse drags or just mouse moves.

+ * Targeting tools work with a <i>target</i> request. This request is used along

+ * with the mouse location to obtain an active target from the current

+ * EditPartViewer. This target is then asked for the <code>Command</code> that

+ * performs the given request. The target is also asked to show target feedback.

+ * <P>

+ * TargetingTool also provides support for auto-expose (a.k.a. auto-scrolling). Subclasses that wish to commence auto-expose can do so by calling

+ * {@link #updateAutoexposeHelper()}. An an AutoExposeHelper is found, auto-scrolling begins. Whenever that helper scrolls the diagram of performs any

+ * other change, <code>handleMove</code> will be called as if the mouse had moved. This is because the target has probably moved, but there is no

+ * input event to trigger an update of the operation.

+ */

+public abstract class TargetingTool extends AbstractTool {

+

+	private static final int FLAG_LOCK_TARGET = AbstractTool.MAX_FLAG << 1;

+

+	private static final int FLAG_TARGET_FEEDBACK = AbstractTool.MAX_FLAG << 2;

+

+	/**

+	 * The max flag.

+	 */

+	protected static final int MAX_FLAG = FLAG_TARGET_FEEDBACK;

+

+	private Request targetRequest;

+

+	private EditPart targetEditPart;

+

+	private AutoexposeHelper exposeHelper;

+

+	/**

+	 * Creates the target request that will be used with the target editpart.

+	 * This request will be cached and updated as needed.

+	 * 

+	 * @see #getTargetRequest()

+	 * @return the new target request

+	 */

+	protected Request createTargetRequest() {

+		Request request = new Request();

+		request.setType(getCommandName());

+		return request;

+	}

+

+	/**

+	 * @see org.eclipse.gef.Tool#deactivate()

+	 */

+	public void deactivate() {

+		if(isHoverActive())

+			resetHover();

+		eraseTargetFeedback();

+		targetEditPart = null;

+		targetRequest = null;

+		setAutoexposeHelper(null);

+		super.deactivate();

+	}

+

+	/**

+	 * Called to perform an iteration of the autoexpose process. If the expose

+	 * helper is set, it will be asked to step at the current mouse location. If

+	 * it returns true, another expose iteration will be queued. There is no

+	 * delay between autoexpose events, other than the time required to perform

+	 * the step().

+	 */

+	protected void doAutoexpose() {

+		if(exposeHelper == null)

+			return;

+		if(exposeHelper.step(getLocation())) {

+			handleAutoexpose();

+			Display.getCurrent().asyncExec(new QueuedAutoexpose());

+		} else

+			setAutoexposeHelper(null);

+	}

+

+	/**

+	 * Asks the current target editpart to erase target feedback using the

+	 * target request. If target feedback is not being shown, this method does

+	 * nothing and returns. Otherwise, the target feedback flag is reset to

+	 * false, and the target editpart is asked to erase target feedback. This

+	 * methods should rarely be overridden.

+	 */

+	protected void eraseTargetFeedback() {

+		if(!isShowingTargetFeedback())

+			return;

+		setFlag(FLAG_TARGET_FEEDBACK, false);

+		if(getTargetEditPart() != null)

+			getTargetEditPart().eraseTargetFeedback(getTargetRequest());

+	}

+

+	/**

+	 * Queries the target editpart for a command.

+	 * 

+	 * @see org.eclipse.gef.tools.AbstractTool#getCommand()

+	 */

+	protected Command getCommand() {

+		if(getTargetEditPart() == null)

+			return null;

+		return getTargetEditPart().getCommand(getTargetRequest());

+	}

+

+	/**

+	 * Returns a List of objects that should be excluded as potential targets

+	 * for the operation.

+	 * 

+	 * @return the list of objects to be excluded as targets

+	 */

+	protected Collection getExclusionSet() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * Returns the conditional object used for obtaining the target editpart

+	 * from the current viewer. By default, a conditional is returned that tests

+	 * whether an editpart at the current mouse location indicates a target for

+	 * the operation's request, using {@link EditPart#getTargetEditPart(Request)}. If <code>null</code> is

+	 * returned, then the conditional fails, and the search continues.

+	 * 

+	 * @see EditPartViewer#findObjectAtExcluding(Point, Collection, EditPartViewer.Conditional)

+	 * @return the targeting conditional

+	 */

+	protected EditPartViewer.Conditional getTargetingConditional() {

+		return new EditPartViewer.Conditional() {

+

+			public boolean evaluate(EditPart editpart) {

+				return editpart.getTargetEditPart(getTargetRequest()) != null;

+			}

+		};

+	}

+

+	/**

+	 * Returns <code>null</code> or the current target editpart.

+	 * 

+	 * @return <code>null</code> or a target part

+	 */

+	protected EditPart getTargetEditPart() {

+		return targetEditPart;

+	}

+

+	/**

+	 * Lazily creates and returns the request used when communicating with the

+	 * target editpart.

+	 * 

+	 * @return the target request

+	 */

+	protected Request getTargetRequest() {

+		if(targetRequest == null)

+			setTargetRequest(createTargetRequest());

+		return targetRequest;

+	}

+

+	/**

+	 * This method is called whenever an autoexpose occurs. When an autoexpose

+	 * occurs, it is possible that everything in the viewer has moved a little.

+	 * Therefore, by default, {@link AbstractTool#handleMove() handleMove()} is

+	 * called to simulate the mouse moving even though it didn't.

+	 */

+	protected void handleAutoexpose() {

+		handleMove();

+	}

+

+	/**

+	 * Called whenever the target editpart has changed. By default, the target

+	 * request is updated, and the new target is asked to show feedback.

+	 * Subclasses may extend this method if needed.

+	 * 

+	 * @return <code>true</code>

+	 */

+	protected boolean handleEnteredEditPart() {

+		updateTargetRequest();

+		showTargetFeedback();

+		return true;

+	}

+

+	/**

+	 * Called whenever the target editpart is about to change. By default, hover

+	 * is reset, in the case that a hover was showing something, and the target

+	 * being exited is asked to erase its feedback.

+	 * 

+	 * @return <code>true</code>

+	 */

+	protected boolean handleExitingEditPart() {

+		resetHover();

+		eraseTargetFeedback();

+		return true;

+	}

+

+	/**

+	 * Called from resetHover() iff hover is active. Subclasses may extend this

+	 * method to handle the hover stop event. Returns <code>true</code> if

+	 * something was done in response to the call.

+	 * 

+	 * @see AbstractTool#isHoverActive()

+	 * @return <code>true</code> if the hover stop is processed in some way

+	 */

+	protected boolean handleHoverStop() {

+		return false;

+	}

+

+	/**

+	 * Called when invalid input is encountered. By default, feedback is erased,

+	 * and the current command is set to the unexecutable command. The state

+	 * does not change, so the caller must set the state to {@link AbstractTool#STATE_INVALID}.

+	 * 

+	 * @return <code>true</code>

+	 */

+	protected boolean handleInvalidInput() {

+		eraseTargetFeedback();

+		setCurrentCommand(UnexecutableCommand.INSTANCE);

+		return true;

+	}

+

+	/**

+	 * An archaic method name that has been left here to force use of the new

+	 * name.

+	 * 

+	 * @throws Exception

+	 *         exc

+	 */

+	protected final void handleLeavingEditPart() throws Exception {

+	}

+

+	/**

+	 * Sets the target to <code>null</code>.

+	 * 

+	 * @see org.eclipse.gef.tools.AbstractTool#handleViewerExited()

+	 */

+	protected boolean handleViewerExited() {

+		setTargetEditPart(null);

+		return true;

+	}

+

+	/**

+	 * Returns <code>true</code> if target feedback is being shown.

+	 * 

+	 * @return <code>true</code> if showing target feedback

+	 */

+	protected boolean isShowingTargetFeedback() {

+		return getFlag(FLAG_TARGET_FEEDBACK);

+	}

+

+	/**

+	 * Return <code>true</code> if the current target is locked.

+	 * 

+	 * @see #lockTargetEditPart(EditPart)

+	 * @return <code>true</code> if the target is locked

+	 */

+	protected boolean isTargetLocked() {

+		return getFlag(FLAG_LOCK_TARGET);

+	}

+

+	/**

+	 * Locks-in the given editpart as the target. Updating of the target will

+	 * not occur until {@link #unlockTargetEditPart()} is called.

+	 * 

+	 * @param editpart

+	 *        the target to be locked-in

+	 */

+	protected void lockTargetEditPart(EditPart editpart) {

+		if(editpart == null) {

+			unlockTargetEditPart();

+			return;

+		}

+		setFlag(FLAG_LOCK_TARGET, true);

+		setTargetEditPart(editpart);

+	}

+

+	/**

+	 * Extended to reset the target lock flag.

+	 * 

+	 * @see org.eclipse.gef.tools.AbstractTool#resetFlags()

+	 * @see #lockTargetEditPart(EditPart)

+	 */

+	protected void resetFlags() {

+		setFlag(FLAG_LOCK_TARGET, false);

+		super.resetFlags();

+	}

+

+	/**

+	 * Resets hovering to inactive.

+	 * 

+	 * @since 3.4

+	 */

+	protected void resetHover() {

+		if(isHoverActive())

+			handleHoverStop();

+		setHoverActive(false);

+	}

+

+	class QueuedAutoexpose implements Runnable {

+

+		public void run() {

+			if(exposeHelper != null)

+				doAutoexpose();

+		}

+	}

+

+	/**

+	 * Sets the active autoexpose helper to the given helper, or <code>null</code>. If the helper is not <code>null</code>, a runnable is

+	 * queued on the event thread that will trigger a subsequent {@link #doAutoexpose()}. The helper is typically updated only on a hover

+	 * event.

+	 * 

+	 * @param helper

+	 *        the new autoexpose helper or <code>null</code>

+	 */

+	protected void setAutoexposeHelper(AutoexposeHelper helper) {

+		exposeHelper = helper;

+		if(exposeHelper == null)

+			return;

+		Display.getCurrent().asyncExec(new QueuedAutoexpose());

+	}

+

+	/**

+	 * Sets the target editpart. If the target editpart is changing, this method

+	 * will call {@link #handleExitingEditPart()} for the previous target if not <code>null</code>, and {@link #handleEnteredEditPart()} for the new

+	 * target, if not <code>null</code>.

+	 * 

+	 * @param editpart

+	 *        the new target

+	 */

+	protected void setTargetEditPart(EditPart editpart) {

+		if(editpart != targetEditPart) {

+			if(targetEditPart != null)

+				handleExitingEditPart();

+			targetEditPart = editpart;

+			if(getTargetRequest() instanceof TargetRequest)

+				((TargetRequest)getTargetRequest()).setTargetEditPart(targetEditPart);

+			handleEnteredEditPart();

+		}

+	}

+

+	/**

+	 * Sets the target request. This method is typically not called; subclasses

+	 * normally override {@link #createTargetRequest()}.

+	 * 

+	 * @param req

+	 *        the target request

+	 */

+	protected void setTargetRequest(Request req) {

+		targetRequest = req;

+	}

+

+	/**

+	 * Asks the target editpart to show target feedback and sets the target

+	 * feedback flag.

+	 */

+	protected void showTargetFeedback() {

+		if(getTargetEditPart() != null)

+			getTargetEditPart().showTargetFeedback(getTargetRequest());

+		setFlag(FLAG_TARGET_FEEDBACK, true);

+	}

+

+	/**

+	 * Releases the targeting lock, and updates the target in case the mouse is

+	 * already over a new target.

+	 */

+	protected void unlockTargetEditPart() {

+		setFlag(FLAG_LOCK_TARGET, false);

+		updateTargetUnderMouse();

+	}

+

+	/**

+	 * Updates the active {@link AutoexposeHelper}. Does nothing if there is

+	 * still an active helper. Otherwise, obtains a new helper (possible <code>null</code>) at the current mouse location and calls

+	 * {@link #setAutoexposeHelper(AutoexposeHelper)}.

+	 */

+	protected void updateAutoexposeHelper() {

+		if(exposeHelper != null)

+			return;

+		AutoexposeHelper.Search search;

+		search = new AutoexposeHelper.Search(getLocation());

+		getCurrentViewer().findObjectAtExcluding(getLocation(), Collections.EMPTY_LIST, search);

+		setAutoexposeHelper(search.result);

+	}

+

+	/**

+	 * Subclasses should override to update the target request.

+	 */

+	protected void updateTargetRequest() {

+	}

+

+	/**

+	 * Updates the target editpart and returns <code>true</code> if the target

+	 * changes. The target is updated by using the target conditional and the

+	 * target request. If the target has been locked, this method does nothing

+	 * and returns <code>false</code>.

+	 * 

+	 * @return <code>true</code> if the target was changed

+	 */

+	protected boolean updateTargetUnderMouse() {

+		if(!isTargetLocked()) {

+			EditPart editPart = null;

+			if(getCurrentViewer() != null)

+				editPart = getCurrentViewer().findObjectAtExcluding(getLocation(), getExclusionSet(), getTargetingConditional());

+			if(editPart != null)

+				editPart = editPart.getTargetEditPart(getTargetRequest());

+			boolean changed = getTargetEditPart() != editPart;

+			setTargetEditPart(editPart);

+			return changed;

+		} else

+			return false;

+	}

+

+	/**

+	 * Returns <code>null</code> or the current autoexpose helper.

+	 * 

+	 * @return null or a helper

+	 */

+	protected AutoexposeHelper getAutoexposeHelper() {

+		return exposeHelper;

+	}

+

+}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/CommandIds.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/CommandIds.java
new file mode 100644
index 00000000000..d5817c13ede
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/CommandIds.java
@@ -0,0 +1,32 @@
+/*****************************************************************************

+ * 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:

+ *		

+ *		CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.gmfdiag.common.utils;

+

+

+public class CommandIds {

+

+	private CommandIds() {

+		//to prevent instanciation

+	}

+

+	public static final String VIEW_GRID_COMMAND = "org.eclipse.papyrus.infra.gmfdiag.menu.ViewGridCommand"; //$NON-NLS-1$

+

+	public static final String VIEW_RULER_COMMAND = "org.eclipse.papyrus.infra.gmfdiag.menu.ViewRulersCommand"; //$NON-NLS-1$

+

+	public static final String VIEW_PAGE_BREAK_COMMAND = "org.eclipse.papyrus.infra.gmfdiag.menu.ViewPageBreaksCommand"; //$NON-NLS-1$

+

+	public static final String SNAP_TO_GRID_COMMAND = "org.eclipse.papyrus.infra.gmfdiag.menu.SnapToGridCommand"; //$NON-NLS-1$

+

+

+}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/DiagramEditPartsUtil.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/DiagramEditPartsUtil.java
index 5cfb8066367..8bb8d38c5f9 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/DiagramEditPartsUtil.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/DiagramEditPartsUtil.java
@@ -18,16 +18,27 @@ import java.util.HashSet;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gef.EditPart;
+import org.eclipse.gef.EditPartViewer;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramGraphicalViewer;
+import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer;
+import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
 import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.tools.util.EditorHelper;
+import org.eclipse.ui.IWorkbenchPart;
 
 /**
  * Different utility methods to manage and manipulate edit parts in diagrams.
  */
 public class DiagramEditPartsUtil {
 
+	private DiagramEditPartsUtil() {
+		//to prevent instanciation
+	}
+
 	/**
 	 * Returns the edit part that controls the given view.
 	 * 
@@ -129,4 +140,53 @@ public class DiagramEditPartsUtil {
 		}
 		return null;
 	}
+
+
+	/**
+	 * A utility method to return the active <code>DiagramEditPart</code> if
+	 * the current part implements <code>IDiagramWorkbenchPart</code>
+	 * 
+	 * @return The current diagram if the parts implements <code>IDiagramWorkbenchPart</code>; <code>null</code> otherwise
+	 */
+	public static final IDiagramGraphicalViewer getActiveDiagramGraphicalViewer() {
+		IDiagramWorkbenchPart part = getActiveDiagramWorkbenchPart();
+		return part != null ? part.getDiagramGraphicalViewer() : null;
+	}
+
+	/**
+	 * A utility method to return the active part if it implements
+	 * or adapts to the <code>IDiagramWorkbenchPart</code> interface
+	 * 
+	 * @return The current part if it implements or adapts to <code>IDiagramWorkbenchPart</code>; <code>null</code> otherwise
+	 */
+	public static final IDiagramWorkbenchPart getActiveDiagramWorkbenchPart() {
+		IDiagramWorkbenchPart diagramPart = null;
+
+		IWorkbenchPart part = EditorHelper.getActivePart();
+
+		if(part instanceof IDiagramWorkbenchPart) {
+			diagramPart = (IDiagramWorkbenchPart)part;
+
+		} else if(part != null) {
+			diagramPart = (IDiagramWorkbenchPart)part.getAdapter(IDiagramWorkbenchPart.class);
+		}
+
+		return diagramPart;
+	}
+
+	/**
+	 * 
+	 * @param anEditPart
+	 *        an edit part
+	 * @return
+	 *         the preference store for the diagram owning this edit part or <code>null</code> if not found
+	 * 
+	 */
+	public static final IPreferenceStore getDiagramWorkspacePreferenceStore(final EditPart anEditPart) {
+		final EditPartViewer viewer = anEditPart.getViewer();
+		if(viewer instanceof DiagramGraphicalViewer) {
+			return ((DiagramGraphicalViewer)viewer).getWorkspaceViewerPreferenceStore();
+		}
+		return null;
+	}
 }
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/UnitsConstants.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/UnitsConstants.java
new file mode 100644
index 00000000000..3e1b8b7efa0
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/UnitsConstants.java
@@ -0,0 +1,48 @@
+/*****************************************************************************

+ * 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:

+ *		

+ *		CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.gmfdiag.common.utils;

+

+import org.eclipse.papyrus.infra.gmfdiag.common.messages.Messages;

+

+/**

+ * 

+ * This class provides useful constants for Units

+ * 

+ */

+public class UnitsConstants {

+

+	private UnitsConstants() {

+		//to prevent instanciation

+	}

+

+	/**

+	 * 1 inch is equivalent to 2.54 centimeters

+	 */

+	public static final double INCH2CM = 2.54;

+

+	/**

+	 * the string Inches

+	 */

+	public static final String INCHES = Messages.UnitsUtils_Inches;

+

+	/**

+	 * the string millimeters

+	 */

+	public static final String CENTIMETERS = Messages.UnitsUtils_Centimeters;

+

+	/**

+	 * the string pixels

+	 */

+	public static final String PIXELS = Messages.UnitsUtils_Pixels;

+}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/UnitsConverterUtils.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/UnitsConverterUtils.java
new file mode 100644
index 00000000000..3471b80cfd7
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/UnitsConverterUtils.java
@@ -0,0 +1,108 @@
+/*****************************************************************************

+ * 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:

+ *		

+ *		CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.gmfdiag.common.utils;

+

+import java.text.ParseException;

+

+import org.eclipse.gef.rulers.RulerProvider;

+import org.eclipse.swt.widgets.Display;

+

+import com.ibm.icu.text.NumberFormat;

+

+/**

+ * 

+ * This class allows to convert easily units (Centimeters, Pixels and Inches)

+ * 

+ */

+public class UnitsConverterUtils {

+

+	private UnitsConverterUtils() {

+		//to avoid instanciation

+	}

+

+	/**

+	 * 

+	 * @param fromUnits

+	 *        the initial unity

+	 * @param toUnits

+	 *        the new unity

+	 * @param valueStr

+	 *        the value to convert

+	 * @return

+	 *         the new String

+	 */

+	public static final String convertUnits(final int fromUnits, final int toUnits, final String valueStr) {

+		//		String valueStr = gridSpacing.getStringValue();

+		if(fromUnits == toUnits) {

+			return valueStr;

+		}

+

+		//Double value = Double.valueOf( valueStr );

+		NumberFormat numberFormatter = NumberFormat.getInstance();

+		Double value = new Double(0.125);

+		try {

+			value = forceDouble(numberFormatter.parse(valueStr));

+		} catch (ParseException e) {

+			// Use the default

+		}

+		double pixelValue = 0;

+

+		Display display = Display.getDefault();

+

+		switch(fromUnits) {

+		case RulerProvider.UNIT_INCHES:

+			pixelValue = value.doubleValue() * display.getDPI().x;

+			break;

+		case RulerProvider.UNIT_CENTIMETERS:

+			pixelValue = value.doubleValue() * display.getDPI().x / UnitsConstants.INCH2CM;

+			break;

+		case RulerProvider.UNIT_PIXELS:

+			pixelValue = value.intValue();

+			break;

+		default:

+			break;

+		}

+

+		double returnValue = 0;

+		switch(toUnits) {

+		case RulerProvider.UNIT_INCHES:

+			returnValue = pixelValue / display.getDPI().x;

+			break;

+		case RulerProvider.UNIT_CENTIMETERS:

+			returnValue = pixelValue * UnitsConstants.INCH2CM / display.getDPI().x;

+			break;

+		case RulerProvider.UNIT_PIXELS:

+			returnValue = pixelValue;

+			break;

+		default:

+			break;

+		}

+

+		return numberFormatter.format(returnValue);

+	}

+

+	/**

+	 * 

+	 * @param number

+	 *        a number

+	 * @return

+	 *         a double

+	 */

+	private static final Double forceDouble(final Number number) {

+		if(!(number instanceof Double)) {

+			return new Double(number.doubleValue());

+		}

+		return (Double)number;

+	}

+}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/META-INF/MANIFEST.MF
index 1ddbc413576..ef692dd6a9f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.css.model/META-INF/MANIFEST.MF
@@ -9,9 +9,6 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0",

  org.eclipse.emf.facet.infra.query;bundle-version="0.1.1",

  org.eclipse.emf.facet.infra.query.core;bundle-version="0.1.1",

- org.eclipse.emf.facet.infra.facet;bundle-version="0.1.1",

- org.eclipse.emf.facet.infra.facet.core;bundle-version="0.1.1",

- org.eclipse.emf.facet.infra.browser.custom.core;bundle-version="0.1.2",

  org.eclipse.uml2.uml;bundle-version="4.0.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/editpolicies/HyperLinkPopupBarEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/editpolicies/HyperLinkPopupBarEditPolicy.java
index 5a45a2f0bce..d527a750e3e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/editpolicies/HyperLinkPopupBarEditPolicy.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/editpolicies/HyperLinkPopupBarEditPolicy.java
@@ -62,6 +62,7 @@ import org.eclipse.papyrus.infra.hyperlink.util.HyperLinkException;
 import org.eclipse.papyrus.infra.hyperlink.util.HyperLinkHelpersRegistrationUtil;

 import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

 import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Control;

 import org.eclipse.ui.IWorkbenchPage;

 import org.eclipse.ui.IWorkbenchPart;

 import org.eclipse.ui.IWorkbenchWindow;

@@ -95,9 +96,9 @@ public class HyperLinkPopupBarEditPolicy extends DiagramAssistantEditPolicy {
 		 * constructor.

 		 * 

 		 * @param theImage

-		 *        the image to display

+		 *            the image to display

 		 * @param anObject

-		 *        the an object

+		 *            the an object

 		 */

 		public PopupBarLabelHandle(Object anObject, Image theImage) {

 			super(theImage);

@@ -110,11 +111,11 @@ public class HyperLinkPopupBarEditPolicy extends DiagramAssistantEditPolicy {
 		 * Dispose.

 		 */

 		public void dispose() {

-			//Nothing. Do not dispose the Image, as it may be shared

+			// Nothing. Do not dispose the Image, as it may be shared

 

-			//			if(this.getIcon() != null && (!this.getIcon().isDisposed())) {

-			//				this.getIcon().dispose();

-			//			}

+			// if(this.getIcon() != null && (!this.getIcon().isDisposed())) {

+			// this.getIcon().dispose();

+			// }

 		}

 

 		/**

@@ -151,7 +152,7 @@ public class HyperLinkPopupBarEditPolicy extends DiagramAssistantEditPolicy {
 		 * Handle mouse entered.

 		 * 

 		 * @param event

-		 *        the event

+		 *            the event

 		 * 

 		 * @see org.eclipse.draw2d.IFigure#handleMouseEntered(org.eclipse.draw2d.MouseEvent)

 		 *      flip myMouseOver bit and repaint

@@ -169,7 +170,7 @@ public class HyperLinkPopupBarEditPolicy extends DiagramAssistantEditPolicy {
 		 * Handle mouse exited.

 		 * 

 		 * @param event

-		 *        the event

+		 *            the event

 		 * 

 		 * @see org.eclipse.draw2d.IFigure#handleMouseExited(org.eclipse.draw2d.MouseEvent)

 		 *      flip myMouseOver bit and repaint

@@ -187,7 +188,7 @@ public class HyperLinkPopupBarEditPolicy extends DiagramAssistantEditPolicy {
 		 * Handle mouse pressed.

 		 * 

 		 * @param event

-		 *        the event

+		 *            the event

 		 * 

 		 * @see org.eclipse.draw2d.IFigure#handleMousePressed(org.eclipse.draw2d.MouseEvent)

 		 *      set PopupBarEditPolicy.myActionMoveFigure bit so the popup bar

@@ -195,7 +196,7 @@ public class HyperLinkPopupBarEditPolicy extends DiagramAssistantEditPolicy {
 		 */

 		@Override

 		public void handleMousePressed(MouseEvent event) {

-			if(1 == event.button) {

+			if (1 == event.button) {

 			}

 			super.handleMousePressed(event);

 		}

@@ -204,7 +205,7 @@ public class HyperLinkPopupBarEditPolicy extends DiagramAssistantEditPolicy {
 		 * Paint border.

 		 * 

 		 * @param graphics

-		 *        the graphics

+		 *            the graphics

 		 * 

 		 * @see org.eclipse.draw2d.Figure#paintBorder(org.eclipse.draw2d.Graphics)

 		 *      paint a focus rectangle for the label if the mouse is inside the

@@ -214,13 +215,14 @@ public class HyperLinkPopupBarEditPolicy extends DiagramAssistantEditPolicy {
 		protected void paintBorder(Graphics graphics) {

 			super.paintBorder(graphics);

 

-			if(myMouseOver) {

+			if (myMouseOver) {

 

 				Rectangle area = getClientArea();

 				graphics.setForegroundColor(ColorConstants.black);

 				graphics.setBackgroundColor(ColorConstants.white);

 

-				graphics.drawFocus(area.x, area.y, area.width - 1, area.height - 1);

+				graphics.drawFocus(area.x, area.y, area.width - 1,

+						area.height - 1);

 

 			}

 

@@ -230,15 +232,15 @@ public class HyperLinkPopupBarEditPolicy extends DiagramAssistantEditPolicy {
 		 * Paint figure.

 		 * 

 		 * @param graphics

-		 *        the graphics

+		 *            the graphics

 		 * 

 		 * @see org.eclipse.draw2d.Figure#paintFigure(org.eclipse.draw2d.Graphics)

 		 */

 		@Override

 		protected void paintFigure(Graphics graphics) {

-			if(!isEnabled()) {

+			if (!isEnabled()) {

 				Image theImage = this.getIcon();

-				if(theImage != null) {

+				if (theImage != null) {

 					graphics.translate(bounds.x, bounds.y);

 					graphics.drawImage(theImage, getIconLocation());

 					graphics.translate(-bounds.x, -bounds.y);

@@ -260,7 +262,9 @@ public class HyperLinkPopupBarEditPolicy extends DiagramAssistantEditPolicy {
 		 * Instantiates a new popup bar label plus handle.

 		 */

 		public PopupBarLabelPlusHandle() {

-			super(null, AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.papyrus.uml.diagram.common", "/icons/obj16/Plus.gif").createImage());

+			super(null, AbstractUIPlugin.imageDescriptorFromPlugin(

+					"org.eclipse.papyrus.uml.diagram.common",

+					"/icons/obj16/Plus.gif").createImage());

 			// TODO Auto-generated constructor stub

 		}

 	}

@@ -277,47 +281,65 @@ public class HyperLinkPopupBarEditPolicy extends DiagramAssistantEditPolicy {
 		 * Mouse pressed.

 		 * 

 		 * @param me

-		 *        the me

+		 *            the me

 		 * 

 		 * @see org.eclipse.draw2d.MouseListener#mousePressed(org.eclipse.draw2d.MouseEvent)

 		 */

 		@Override

 		public void mouseReleased(MouseEvent me) {

-			//FIXME: We should use mouseReleased instead of mousePressed, 

-			//but it seems the mouseReleased event is consumed before we receive it

+			// FIXME: We should use mouseReleased instead of mousePressed,

+			// but it seems the mouseReleased event is consumed before we

+			// receive it

 			super.mouseReleased(me);

 			// setPopupBarOnDiagramActivated(true);

 		}

 

 		@Override

 		public void mousePressed(MouseEvent me) {

-			if(3 == me.button) // context menu, hide the popup bar

+			if (3 == me.button) // context menu, hide the popup bar

 			{

 				hideDiagramAssistant();

 			}

-			if(1 == me.button) // context menu, hide the popup bar

+			if (1 == me.button) // context menu, hide the popup bar

 			{

-				if(me.getSource() instanceof PopupBarLabelPlusHandle) {

-					hyperLinkManagerShell = new AdvancedHLManager(getEditorRegistry(), ((IGraphicalEditPart)getHost()).getEditingDomain(), (EModelElement)((IGraphicalEditPart)getHost()).getNotationView().getElement(), ((IGraphicalEditPart)getHost()).getNotationView(), hyperlinkHelperFactory);

+				if (me.getSource() instanceof PopupBarLabelPlusHandle) {

+					hyperLinkManagerShell = new AdvancedHLManager(

+							getEditorRegistry(),

+							((IGraphicalEditPart) getHost()).getEditingDomain(),

+							(EModelElement) ((IGraphicalEditPart) getHost())

+									.getNotationView().getElement(),

+							((IGraphicalEditPart) getHost()).getNotationView(),

+							hyperlinkHelperFactory);

 					hyperLinkManagerShell.setInput(hyperLinkObjectList);

 					hideDiagramAssistant();

 					hyperLinkManagerShell.open();

 					me.consume();

-				} else if(me.getSource() instanceof PopupBarLabelHandle) {

-					if((((PopupBarLabelHandle)me.getSource()).getReferencedObject()) instanceof HyperLinkObject) {

-						final HyperLinkObject hyperLinkObject = (HyperLinkObject)(((PopupBarLabelHandle)me.getSource()).getReferencedObject());

-						if(hyperLinkObject.needsOpenCommand()) {

+				} else if (me.getSource() instanceof PopupBarLabelHandle) {

+					if ((((PopupBarLabelHandle) me.getSource())

+							.getReferencedObject()) instanceof HyperLinkObject) {

+						final HyperLinkObject hyperLinkObject = (HyperLinkObject) (((PopupBarLabelHandle) me

+								.getSource()).getReferencedObject());

+						if (hyperLinkObject.needsOpenCommand()) {

 							try {

-								//FIXME: Sometimes, it is possible to automatically determine whether the editing domain should be dirty or not

-								//We should use standard GMF/GEF commands with the DiagramCommandStack to have the same behavior than NavigationEditPolicy

-								TransactionalEditingDomain editingDomain = ServiceUtilsForEditPart.getInstance().getTransactionalEditingDomain(getHost());

-								editingDomain.getCommandStack().execute(new RecordingCommand(editingDomain, "Open hyperlink") {

-

-									@Override

-									protected void doExecute() {

-										hyperLinkObject.openLink();

-									}

-								});

+								// FIXME: Sometimes, it is possible to

+								// automatically determine whether the editing

+								// domain should be dirty or not

+								// We should use standard GMF/GEF commands with

+								// the DiagramCommandStack to have the same

+								// behavior than NavigationEditPolicy

+								TransactionalEditingDomain editingDomain = ServiceUtilsForEditPart

+										.getInstance()

+										.getTransactionalEditingDomain(

+												getHost());

+								editingDomain.getCommandStack().execute(

+										new RecordingCommand(editingDomain,

+												"Open hyperlink") {

+

+											@Override

+											protected void doExecute() {

+												hyperLinkObject.openLink();

+											}

+										});

 							} catch (ServiceException ex) {

 

 							}

@@ -389,11 +411,12 @@ public class HyperLinkPopupBarEditPolicy extends DiagramAssistantEditPolicy {
 	public HyperLinkPopupBarEditPolicy() {

 		super();

 		ArrayList<AbstractHyperLinkHelper> hyperLinkHelpers = new ArrayList<AbstractHyperLinkHelper>();

-		//TODO 

-		//		hyperLinkHelpers.add(new DiagramHyperLinkHelper());

-		//		hyperLinkHelpers.add(new DocumentHyperLinkHelper());

-		//		hyperLinkHelpers.add(new WebHyperLinkHelper());

-		hyperLinkHelpers.addAll(HyperLinkHelpersRegistrationUtil.INSTANCE.getAllRegisteredHyperLinkHelper());

+		// TODO

+		// hyperLinkHelpers.add(new DiagramHyperLinkHelper());

+		// hyperLinkHelpers.add(new DocumentHyperLinkHelper());

+		// hyperLinkHelpers.add(new WebHyperLinkHelper());

+		hyperLinkHelpers.addAll(HyperLinkHelpersRegistrationUtil.INSTANCE

+				.getAllRegisteredHyperLinkHelper());

 		hyperlinkHelperFactory = new HyperLinkHelperFactory(hyperLinkHelpers);

 	}

 

@@ -401,31 +424,34 @@ public class HyperLinkPopupBarEditPolicy extends DiagramAssistantEditPolicy {
 	 * Adds the object list in the popup bar.

 	 * 

 	 * @param imageLocation

-	 *        the image location that will represent the object

+	 *            the image location that will represent the object

 	 * @param positonwidth

-	 *        the positonwidth to display the icon into the popup

+	 *            the positonwidth to display the icon into the popup

 	 * @param objectList

-	 *        the object list to add

+	 *            the object list to add

 	 * 

 	 * @return the int the new position after adding all objects in the list

 	 */

 	public int addObjectList(int positonwidth, List<?> objectList) {

-		for(int i = 0; i < objectList.size(); i++) {

+		for (int i = 0; i < objectList.size(); i++) {

 			PopupBarLabelHandle handle = null;

 

 			ILabelProvider labelProvider = null;

 			try {

 				EObject contextElement = EMFHelper.getEObject(getHost());

-				labelProvider = ServiceUtilsForEObject.getInstance().getService(LabelProviderService.class, contextElement).getLabelProvider();

+				labelProvider = ServiceUtilsForEObject.getInstance()

+						.getService(LabelProviderService.class, contextElement)

+						.getLabelProvider();

 			} catch (ServiceException ex) {

 				Activator.log.error(ex);

 			}

 

-			if(labelProvider == null) {

+			if (labelProvider == null) {

 				labelProvider = new LabelProvider();

 			}

 

-			handle = new PopupBarLabelHandle(hyperLinkObjectList.get(i), labelProvider.getImage(objectList.get(i)));

+			handle = new PopupBarLabelHandle(hyperLinkObjectList.get(i),

+					labelProvider.getImage(objectList.get(i)));

 

 			Rectangle r1 = new Rectangle();

 			r1.setLocation(positonwidth, 5);

@@ -433,8 +459,9 @@ public class HyperLinkPopupBarEditPolicy extends DiagramAssistantEditPolicy {
 			r1.setSize(16, 16);

 

 			Label l = new Label();

-			if(labelProvider instanceof CellLabelProvider) {

-				l.setText(((CellLabelProvider)labelProvider).getToolTipText(hyperLinkObjectList.get(i)));

+			if (labelProvider instanceof CellLabelProvider) {

+				l.setText(((CellLabelProvider) labelProvider)

+						.getToolTipText(hyperLinkObjectList.get(i)));

 			} else {

 				l.setText(labelProvider.getText(hyperLinkObjectList.get(i)));

 			}

@@ -463,7 +490,8 @@ public class HyperLinkPopupBarEditPolicy extends DiagramAssistantEditPolicy {
 	 */

 	protected IPageIconsRegistry createEditorRegistry() {

 		try {

-			return ServiceUtilsForEditPart.getInstance().getService(IPageIconsRegistry.class, getHost());

+			return ServiceUtilsForEditPart.getInstance().getService(

+					IPageIconsRegistry.class, getHost());

 		} catch (ServiceException e) {

 			// Return an empty registry always providing null;

 			return new PageIconsRegistry();

@@ -490,7 +518,7 @@ public class HyperLinkPopupBarEditPolicy extends DiagramAssistantEditPolicy {
 	 *            This method can be subclassed to return another registry.

 	 */

 	protected IPageIconsRegistry getEditorRegistry() {

-		if(editorRegistry == null) {

+		if (editorRegistry == null) {

 			editorRegistry = createEditorRegistry();

 		}

 		return editorRegistry;

@@ -511,19 +539,20 @@ public class HyperLinkPopupBarEditPolicy extends DiagramAssistantEditPolicy {
 	 */

 	@Override

 	protected void hideDiagramAssistant() {

-		if(getFigureBar() != null) {

+		if (getFigureBar() != null) {

 			getFigureBar().removeMouseMotionListener(this);

 			getFigureBar().removeMouseListener(myMouseKeyListener);

 			IFigure layer = getLayer(LayerConstants.HANDLE_LAYER);

-			if(getFigureBar().getParent() != null) {

+			if (getFigureBar().getParent() != null) {

 				layer.remove(getFigureBar());

 			}

 

-			if(imagesToBeDisposed != null) {

-				for(Iterator iter = figureBar.getChildren().iterator(); iter.hasNext();) {

+			if (imagesToBeDisposed != null) {

+				for (Iterator iter = figureBar.getChildren().iterator(); iter

+						.hasNext();) {

 					Object current = iter.next();

-					if(current instanceof PopupBarLabelHandle) {

-						((PopupBarLabelHandle)current).dispose();

+					if (current instanceof PopupBarLabelHandle) {

+						((PopupBarLabelHandle) current).dispose();

 					}

 				}

 				imagesToBeDisposed.clear();

@@ -537,7 +566,8 @@ public class HyperLinkPopupBarEditPolicy extends DiagramAssistantEditPolicy {
 	 */

 	@Override

 	protected boolean isDiagramAssistant(Object object) {

-		return object instanceof RoundedRectangleWithTail || object instanceof PopupBarLabelHandle;

+		return object instanceof RoundedRectangleWithTail

+				|| object instanceof PopupBarLabelHandle;

 	}

 

 	/**

@@ -566,11 +596,13 @@ public class HyperLinkPopupBarEditPolicy extends DiagramAssistantEditPolicy {
 	 */

 	protected int populatePopup() {

 		int xLoc = 5;

-		if(getFigureBar() != null) {

+		if (getFigureBar() != null) {

 			// add all subdiagrams

 

 			try {

-				hyperLinkObjectList = (ArrayList<HyperLinkObject>)hyperlinkHelperFactory.getAllreferenced(((IGraphicalEditPart)getHost()).getNotationView());

+				hyperLinkObjectList = (ArrayList<HyperLinkObject>) hyperlinkHelperFactory

+						.getAllreferenced(((IGraphicalEditPart) getHost())

+								.getNotationView());

 			} catch (HyperLinkException e) {

 				e.printStackTrace();

 			}

@@ -598,54 +630,77 @@ public class HyperLinkPopupBarEditPolicy extends DiagramAssistantEditPolicy {
 

 	@Override

 	protected int getAppearanceDelay() {

-		// 420201: [All diagrams - Hyperlinks] The Hyperlinks button (green +) pops up too early

+		// 420201: [All diagrams - Hyperlinks] The Hyperlinks button (green +)

+		// pops up too early

 		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=420201

 

-		return 1000; //In milliseconds (Default is 200). Do not popup hyperlinks too quickly

+		return 1000; // In milliseconds (Default is 200). Do not popup

+						// hyperlinks too quickly

 	}

 

 	/**

 	 * {@inheritedDoc}.

 	 * 

 	 * @param referencePoint

-	 *        the reference point

+	 *            the reference point

 	 */

 	@Override

 	protected void showDiagramAssistant(Point referencePoint) {

-		if(getFigureBar() == null) {

+		if (getFigureBar() == null) {

+			Point position = new Point(referencePoint);

 			createPopupBarFigure();

 			int width = populatePopup();

 			IFigure layer = getLayer(LayerConstants.HANDLE_LAYER);

 			layer.add(getFigureBar());

-			if(referencePoint == null) {

+			if (referencePoint == null) {

 				referencePoint = getHostFigure().getBounds().getCenter();

 			}

-			Point position = getHostFigure().getBounds().getBottomLeft();

+

 			getHostFigure().translateToAbsolute(position);

-			EditPartViewer viewer = getHost().getRoot().getViewer();

-			Viewport viewport = null;

-			if(viewer instanceof DiagramGraphicalViewer) {

-				viewport = ((FigureCanvas)((DiagramGraphicalViewer)viewer).getControl()).getViewport();

-			}

-			if(viewport != null) {

-				position.x = position.x + viewport.getClientArea().x;

-				position.y = position.y + viewport.getClientArea().y;

-			}

+			getFigureBar().translateToRelative(position);

+			

 			getFigureBar().setSize(width, 30);

+			

+			position.x += 15;

+			

+			adjustToFitInViewport(position);

+

 			getFigureBar().setLocation(position);

 			getFigureBar().setBackgroundColor(ColorConstants.white);

 			getFigureBar().setForegroundColor(ColorConstants.orange);

 

 			// dismiss the popup bar after a delay

-			if(!shouldAvoidHidingDiagramAssistant()) {

+			if (!shouldAvoidHidingDiagramAssistant()) {

 				hideDiagramAssistantAfterDelay(getDisappearanceDelay());

 			}

 		}

 	}

 

+	private void adjustToFitInViewport(Point position) {

+		Control control = getHost().getViewer().getControl();

+		if (control instanceof FigureCanvas) {

+			Rectangle viewportRect = ((FigureCanvas) control).getViewport()

+					.getClientArea();

+			Rectangle balloonRect = new Rectangle(position, getFigureBar()

+					.getSize());

+

+			int yDiff = viewportRect.y - balloonRect.y;

+			if (yDiff > 0) {

+				// balloon is above the viewport, shift down

+				position.translate(0, yDiff);

+			}

+			int xDiff = balloonRect.right() - viewportRect.right();

+			if (xDiff > 0) {

+				// balloon is to the right of the viewport, shift left

+				position.translate(-xDiff, 0);

+			}

+		}

+	}

+

 	@Override

 	protected boolean shouldShowDiagramAssistant() {

-		return getHost().isActive() && isPreferenceOn() && isHostEditable() && isHostResolvable() && isDiagramPartActive();

+		return getHost().isActive() && isPreferenceOn() && isHostEditable()

+				&& isHostResolvable() && isDiagramPartActive();

 	}

 

 	/**

@@ -654,26 +709,29 @@ public class HyperLinkPopupBarEditPolicy extends DiagramAssistantEditPolicy {
 	 * @return True if the diagram part is active; false otherwise.

 	 */

 	private boolean isDiagramPartActive() {

-		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();

+		IWorkbenchWindow window = PlatformUI.getWorkbench()

+				.getActiveWorkbenchWindow();

 

-		if(window != null) {

+		if (window != null) {

 			IWorkbenchPage page = window.getActivePage();

-			if(page != null) {

+			if (page != null) {

 				IWorkbenchPart activePart = page.getActivePart();

 

 				IDiagramWorkbenchPart editorPart = null;

 

-				if(activePart instanceof IDiagramWorkbenchPart) {

-					editorPart = (IDiagramWorkbenchPart)activePart;

-				} else if(activePart instanceof IAdaptable) {

-					editorPart = (IDiagramWorkbenchPart)((IAdaptable)activePart).getAdapter(IDiagramWorkbenchPart.class);

+				if (activePart instanceof IDiagramWorkbenchPart) {

+					editorPart = (IDiagramWorkbenchPart) activePart;

+				} else if (activePart instanceof IAdaptable) {

+					editorPart = (IDiagramWorkbenchPart) ((IAdaptable) activePart)

+							.getAdapter(IDiagramWorkbenchPart.class);

 				}

 

-				if(editorPart == null) {

+				if (editorPart == null) {

 					return false;

 				}

 

-				return editorPart.getDiagramEditPart().getRoot().equals(((IGraphicalEditPart)getHost()).getRoot());

+				return editorPart.getDiagramEditPart().getRoot()

+						.equals(((IGraphicalEditPart) getHost()).getRoot());

 			}

 		}

 		return false;

@@ -685,8 +743,8 @@ public class HyperLinkPopupBarEditPolicy extends DiagramAssistantEditPolicy {
 	 * @return True if the host is editable; false otherwise.

 	 */

 	private boolean isHostEditable() {

-		if(getHost() instanceof GraphicalEditPart) {

-			return ((GraphicalEditPart)getHost()).isEditModeEnabled();

+		if (getHost() instanceof GraphicalEditPart) {

+			return ((GraphicalEditPart) getHost()).isEditModeEnabled();

 		}

 		return true;

 	}

@@ -698,9 +756,9 @@ public class HyperLinkPopupBarEditPolicy extends DiagramAssistantEditPolicy {
 	 *         semantic reference, and false otherwise

 	 */

 	private boolean isHostResolvable() {

-		final View view = (View)getHost().getModel();

+		final View view = (View) getHost().getModel();

 		EObject element = view.getElement();

-		if(element != null) {

+		if (element != null) {

 			return !element.eIsProxy();

 		}

 		return true;

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/build.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/build.properties
index 33bbfa24829..3b1a0489a19 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/build.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/build.properties
@@ -5,5 +5,6 @@ bin.includes = META-INF/,\
                plugin.xml,\

                OSGI-INF/,\

                about.html,\

-               icons/

+               icons/,\

+               plugin.pdoc

 src.includes = about.html

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/plugin.pdoc b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/plugin.pdoc
new file mode 100644
index 00000000000..80c51623b33
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/plugin.pdoc
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides handlers for actions done on GMF Diagram (without dependencies on UML)">

+  <referent firstName="vincent" lastName="lorenzo" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA-LIST"/>

+</doc:Documentation>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF
index ba7ca0d1c43..f10847acb64 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF
@@ -1,11 +1,9 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

- com.google.guava;bundle-version="10.0.1",

+ com.google.guava;bundle-version="11.0.0",

  org.eclipse.papyrus.views.modelexplorer;bundle-version="1.0.0",

  org.eclipse.emf.facet.infra.query.core,

- org.eclipse.emf.facet.infra.browser.custom.core,

- org.eclipse.emf.facet.infra.facet.core,

  org.eclipse.gmf.runtime.notation,

  org.eclipse.emf.transaction,

  org.eclipse.gmf.runtime.common.core,

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/META-INF/MANIFEST.MF
index 0c51d06a057..f0102ff4fbd 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/META-INF/MANIFEST.MF
@@ -1,6 +1,9 @@
 Manifest-Version: 1.0

 Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.properties,

- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0"

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.0",

+ com.ibm.icu,

+ org.eclipse.papyrus.infra.tools;bundle-version="1.0.0"

 Export-Package: org.eclipse.papyrus.infra.gmfdiag.preferences,

  org.eclipse.papyrus.infra.gmfdiag.preferences.initializer,

  org.eclipse.papyrus.infra.gmfdiag.preferences.jface.preference;x-internal:=true,

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/plugin.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/plugin.xml
index 65c0af373e8..d9d530745f0 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/plugin.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/plugin.xml
@@ -16,12 +16,6 @@
       </page>

       <page

             category="org.eclipse.papyrus.infra.core.sasheditor.preferences.generalcategory"

-            class="org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal.PapyrusRulersAndGridPreferencePage"

-            id="org.eclipse.papyrus.infra.gmfdiag.preferences.rulersandgrid"

-            name="Rulers And Grid">

-      </page>

-      <page

-            category="org.eclipse.papyrus.infra.core.sasheditor.preferences.generalcategory"

             class="org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal.PapyrusPrintingPreferencePage"

             id="org.eclipse.papyrus.infra.gmfdiag.preferences.printing"

             name="Printing">

@@ -58,17 +52,6 @@
       </page>

       <page

             category="org.eclipse.papyrus.infra.gmfdiag.preferences.properties.generalcategory"

-            class="org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal.PapyrusRulersAndGridPreferencePage"

-            id="org.eclipse.papyrus.infra.gmfdiag.preferences.properties.rulersandgrid"

-            name="Rulers And Grid">

-         <enabledWhen>

-            <adapt

-                  type="org.eclipse.core.resources.IProject">

-            </adapt>

-         </enabledWhen>

-      </page>

-      <page

-            category="org.eclipse.papyrus.infra.gmfdiag.preferences.properties.generalcategory"

             class="org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal.PapyrusPrintingPreferencePage"

             id="org.eclipse.papyrus.infra.gmfdiag.preferences.properties.printing"

             name="Printing">

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/PapyrusPreferenceInitializer.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/PapyrusPreferenceInitializer.java
index b55ecc29363..7ed0f90ecd5 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/PapyrusPreferenceInitializer.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/PapyrusPreferenceInitializer.java
@@ -17,7 +17,6 @@ import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.PapyrusAllDiagramsPreferencePage;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal.PapyrusPrintingPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal.PapyrusRulersAndGridPreferencePage;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal.PapyrusUML2PreferencePage;

 

 /**

@@ -39,7 +38,7 @@ public class PapyrusPreferenceInitializer extends AbstractPreferenceInitializer
 	@Override

 	public void initializeDefaultPreferences() {

 		PapyrusAllDiagramsPreferencePage.initDefaults(store);

-		PapyrusRulersAndGridPreferencePage.initDefaults(store);

+		//		PapyrusRulersAndGridPreferencePage.initDefaults(store);

 		PapyrusPrintingPreferencePage.initDefaults(store);

 		PapyrusUML2PreferencePage.initDefaults(store);

 

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/PapyrusPreferenceStore.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/PapyrusPreferenceStore.java
index eb8a48bf6a8..4b982b4cf8d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/PapyrusPreferenceStore.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/PapyrusPreferenceStore.java
@@ -13,239 +13,58 @@
  *****************************************************************************/

 package org.eclipse.papyrus.infra.gmfdiag.preferences;

 

-import java.util.ArrayList;

-import java.util.Iterator;

-

-import org.eclipse.core.runtime.Platform;

 import org.eclipse.core.runtime.preferences.IScopeContext;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.dialog.ApplyValueOnPreferenceKeyDialog;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.tools.preferences.AbstractPapyrusPreferenceStore;

+import org.eclipse.papyrus.infra.tools.preferences.ui.dialog.AbstractApplyValueOnPreferenceKeyDialog;

 

 /**

  * this class is a specific store that is used to look for value of element

  * by taking account the structure of preferences : papyrus editor-> Diagram -> Elements of Diagram

  * 

  */

-public class PapyrusPreferenceStore extends PapyrusScopedPreferenceStore {

+public class PapyrusPreferenceStore extends AbstractPapyrusPreferenceStore {

 

 	/**

-	 * this method is used to overload all value under a level of preferences.

-	 * In order to overload a pop-up is opened, and the user can choose value to overload

 	 * 

-	 * @param level

-	 *        of preference: Editor or diagram

-	 */

-

-	public void deleteAllSubPreference(String level) {

-		//remove all sub value diagram+ element

-		ArrayList<String> keytoRemove = new ArrayList<String>();

-		//key to collect

-		ArrayList<String> elementKey = new ArrayList<String>();

-		try {

-			for(int i = 0; i < getStorePreferences().keys().length; i++) {

-				//level diagram collect only element

-				if(level.startsWith(PreferenceConstantHelper.DIAGRAM_PREFERENCE_PREFIX)) {

-					if(getStorePreferences().keys()[i].startsWith(PreferenceConstantHelper.DIAGRAM_ELEMENT)) {

-						elementKey.add(getStorePreferences().keys()[i]);

-					}

-				}

-				//editor level, collect all element+diagram

-				else if(level.startsWith(PreferenceConstantHelper.PAPYRUS_EDITOR_PREFERENCE_PREFIX)) {

-					if((getStorePreferences().keys()[i].startsWith(PreferenceConstantHelper.DIAGRAM_ELEMENT)) || (getStorePreferences().keys()[i].startsWith(PreferenceConstantHelper.DIAGRAM_PREFERENCE_PREFIX))) {

-						elementKey.add(getStorePreferences().keys()[i]);

-					}

-				}

-

-			}

-

-		} catch (Exception e) {

-			Activator.log.error(e);

-		}

-		if(elementKey.size() > 0) {

-			String[] keyRoconsult = new String[elementKey.size()];

-			ApplyValueOnPreferenceKeyDialog dialog = new ApplyValueOnPreferenceKeyDialog(elementKey.toArray(keyRoconsult));

-			dialog.open();

-			keytoRemove = dialog.getKeyToRemove();

-

-			//remove key

-			Iterator<String> iterator = keytoRemove.iterator();

-			while(iterator.hasNext()) {

-				String key = (String)iterator.next();

-				getStorePreferences().remove(key);

-			}

-		}

-	}

-

-

-	/**

-	 * constructor

+	 * Constructor.

 	 * 

 	 * @param context

-	 *        the scope to store to

 	 * @param qualifier

-	 *        the qualifier used to look up the preference node

-	 */

-	public PapyrusPreferenceStore(IScopeContext context, String qualifier) {

-		super(context, qualifier);

-	}

-

-	/**

-	 * constructor

-	 * 

-	 * @param context

-	 *        the scope to store to

-	 * @param qualifier

-	 *        the qualifier used to look up the preference node

 	 * @param defaultQualifierPath

-	 *        the qualifier used when looking up the defaults

 	 */

 	public PapyrusPreferenceStore(IScopeContext context, String qualifier, String defaultQualifierPath) {

-		super(context, qualifier, defaultQualifierPath);

+		super(context, qualifier, defaultQualifierPath, PreferencesConstantsHelper.PAPYRUS_EDITOR_PREFERENCE_PREFIX, PreferencesConstantsHelper.DIAGRAM_PREFERENCE_PREFIX, PreferencesConstantsHelper.DIAGRAM_ELEMENT);

 	}

 

-	// each get value will be overloaded

-	//if not value is found for an element, a value is look for in DIAGRAM

-	// if a the value is not find for Diagram a value is find for Papyrus editor

-

 

 	/**

-	 * this method is used to find a key that a got a value:

-	 * if the key is an element. The method look for if this key exist. If no value exists, it look for the key for diagram

-	 * if the key for diagram do not exist it look for key for papyrus Editor

-	 * the structure of Key is:

-	 * element : ELEMENT_DiagramKind_ElementKind.preferenceKind

-	 * Diagram : DIAGRAM_DiagramKind.preferenceKind

-	 * Editor: PAPYRUS_EDITOR.preferenceKind

 	 * 

-	 */

-	protected String findKeyWithAValue(String initialKey) {

-		String foundedKey = null;

-		//first look for in value stack

-		foundedKey = findKeyAStoreValue(initialKey);

-		//then look for in default stack

-		if(foundedKey == null) {

-			foundedKey = findKeyWithADefaultValue(initialKey);

-		}

-		if(foundedKey == null) {

-			foundedKey = initialKey;

-		}

-		return foundedKey;

-

-	}

-

-	/**

-	 * look for a key with a value in the store stack

+	 * Constructor.

 	 * 

-	 * @param initialKey

-	 *        element : ELEMENT_DiagramKind_ElementKind.preferenceKind

-	 *        Diagram : DIAGRAM_DiagramKind.preferenceKind

-	 *        Editor: PAPYRUS_EDITOR.preferenceKind

-	 * @return the key that returns a value or null if there is no value

+	 * @param context

+	 * @param qualifier

 	 */

-	protected String findKeyAStoreValue(String initialKey) {

-		String foundedKey = null;

-		if(getStorePreferences().get(initialKey, null) != null) {

-			foundedKey = initialKey;

-		}

-

-		if(foundedKey == null && hasPrefix(initialKey)) {

-			foundedKey = findKeyAStoreValue(getUpperKey(initialKey));

-		}

-		return foundedKey;

+	public PapyrusPreferenceStore(IScopeContext context, String qualifier) {

+		super(context, qualifier, PreferencesConstantsHelper.PAPYRUS_EDITOR_PREFERENCE_PREFIX, PreferencesConstantsHelper.DIAGRAM_PREFERENCE_PREFIX, PreferencesConstantsHelper.DIAGRAM_ELEMENT);

 	}

 

-	/**

-	 * this method is used to find a key that a got a value:

-	 * if the key is an element. The method look for if this key exist. If no value exists, it look for the key for diagram

-	 * if the key for diagram do not exist it look for key for papyrus Editor

-	 * the structure of Key is:

-	 * element : ELEMENT_DiagramKind_ElementKind.preferenceKind

-	 * Diagram : DIAGRAM_DiagramKind.preferenceKind

-	 * Editor: PAPYRUS_EDITOR.preferenceKind

-	 * 

-	 */

-	protected String findKeyWithADefaultValue(String initialKey) {

-		String foundedKey = null;

-

-		if(getDefaultPreferences().get(initialKey, null) != null) {

-			foundedKey = initialKey;

-		}

-

-		if(foundedKey == null && hasPrefix(initialKey)) {

-			return findKeyWithADefaultValue(getUpperKey(initialKey));

-		} else {

-			foundedKey = initialKey;

-		}

-		return foundedKey;

-

-	}

 

 	/**

-	 * get the upper Key from the initial Key

-	 * * the structure of Key is:

-	 * element : ELEMENT_DiagramKind_ElementKind.preferenceKind

-	 * Diagram : DIAGRAM_DiagramKind.preferenceKind

-	 * Editor: PAPYRUS_EDITOR.preferenceKind

 	 * 

-	 * @param initialKey

-	 * @return the upperKey

+	 * @see org.eclipse.papyrus.infra.tools.preferences.AbstractPapyrusPreferenceStore#createPreferenceKeyDialog(java.lang.String[])

 	 * 

+	 * @param keys

+	 * @return

 	 */

-	protected String getUpperKey(String initialKey) {

-

-		String out = initialKey.toString();

-		if(initialKey.startsWith(PreferenceConstantHelper.DIAGRAM_ELEMENT)) {

-			out = initialKey.toString().replaceAll(PreferenceConstantHelper.DIAGRAM_ELEMENT, PreferenceConstantHelper.DIAGRAM_PREFERENCE_PREFIX);

-			out = out.substring(0, out.lastIndexOf("_")) + out.substring(out.indexOf("."), out.length());

-		}

-		if(initialKey.startsWith(PreferenceConstantHelper.DIAGRAM_PREFERENCE_PREFIX)) {

-			//	out=initialKey.toString().replaceAll(PreferenceConstantHelper.DIAGRAM_PREFERENCE_PREFIX, PreferenceConstantHelper.PAPYRUS_EDITOR_PREFERENCE_PREFIX);

-			out = PreferenceConstantHelper.PAPYRUS_EDITOR_PREFERENCE_PREFIX + out.substring(out.indexOf("."), out.length());

-		}

-		return out;

+	@Override

+	protected AbstractApplyValueOnPreferenceKeyDialog createPreferenceKeyDialog(String[] keys) {

+		return new ApplyValueOnPreferenceKeyDialog(keys);

 	}

 

-	protected boolean hasPrefix(String key) {

-		if(key.startsWith(PreferenceConstantHelper.DIAGRAM_ELEMENT) || key.startsWith(PreferenceConstantHelper.DIAGRAM_PREFERENCE_PREFIX)) {

-			return true;

-		}

-		return false;

-	}

 

-	/**

-	 * get the value from a key

-	 * 

-	 * @param key

-	 * @return the value

-	 */

-	protected String internalGet(String key) {

-		String newKey = findKeyWithAValue(key);

-		//System.err.println("-->Initial Key "+key+"--> "+ newKey);

-		return Platform.getPreferencesService().get(newKey, null, getPreferenceNodes(true));

-	}

-

-	public boolean getDefaultBoolean(String name) {

-

-		return super.getDefaultBoolean(findKeyWithADefaultValue(name));

-	}

 

-	public double getDefaultDouble(String name) {

-		return super.getDefaultDouble(findKeyWithADefaultValue(name));

-	}

-

-	public float getDefaultFloat(String name) {

-		return super.getDefaultFloat(findKeyWithADefaultValue(name));

-	};

-

-	public int getDefaultInt(String name) {

-		return super.getDefaultInt(findKeyWithADefaultValue(name));

-	}

 

-	public long getDefaultLong(String name) {

-		return super.getDefaultLong(findKeyWithADefaultValue(name));

-	}

 

-	public String getDefaultString(String name) {

-		return super.getDefaultString(findKeyWithADefaultValue(name));

-	}

 }

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/messages/Messages.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/messages/Messages.java
index a405f7779b5..181355afe8a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/messages/Messages.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/messages/Messages.java
@@ -1,3 +1,16 @@
+/*****************************************************************************

+ * 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:

+ *		

+ *		CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

 package org.eclipse.papyrus.infra.gmfdiag.preferences.messages;

 

 import org.eclipse.osgi.util.NLS;

@@ -6,7 +19,20 @@ public class Messages extends NLS {
 

 	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.gmfdiag.preferences.messages.messages"; //$NON-NLS-1$

 

+	public static String ApplyValueOnPreferenceKeyDialog_DIAGRAM;

+

+	public static String ApplyValueOnPreferenceKeyDialog_ELEMENT;

+

 	public static String LabelGroup_Labels_To_Display;

+

+	public static String RulersAndGridGroup_GridColor;

+

+	public static String RulersAndGridGroup_GridInFront;

+

+	public static String RulersAndGridGroup_GridStyle;

+	

+	

+

 	static {

 		// initialize resource bundle

 		NLS.initializeMessages(BUNDLE_NAME, Messages.class);

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/messages/messages.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/messages/messages.properties
index bb2c968ed60..f84dfb59fe8 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/messages/messages.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/messages/messages.properties
@@ -1 +1,9 @@
 LabelGroup_Labels_To_Display=Labels to display

+RulersAndGridGroup_GridColor=Grid Color

+RulersAndGridGroup_GridInFront=Grid In Front

+RulersAndGridGroup_GridStyle=Grid Style

+ApplyValueOnPreferenceKeyDialog_DIAGRAM=DIAGRAM

+ApplyValueOnPreferenceKeyDialog_ELEMENT=ELEMENT

+RulersAndGridGroup_GridColor=Grid Color

+RulersAndGridGroup_GridInFront=Grid In Front

+RulersAndGridGroup_GridStyle=Grid Style

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/AbstractPapyrusElementPreferencePage.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/AbstractPapyrusElementPreferencePage.java
index 377c04373b5..0a4f2b5d5b5 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/AbstractPapyrusElementPreferencePage.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/AbstractPapyrusElementPreferencePage.java
@@ -12,8 +12,8 @@
  *****************************************************************************/

 package org.eclipse.papyrus.infra.gmfdiag.preferences.pages;

 

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.FontGroup;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.layout.GridLayout;

 import org.eclipse.swt.widgets.Composite;

@@ -68,11 +68,11 @@ public abstract class AbstractPapyrusElementPreferencePage extends AbstractPapyr
 	 * Get the specified preference type associated with this preference page.

 	 * 

 	 * @param preferenceType

-	 *        an int representing the preference type to retrieve. It must be a value defined in {@link PreferenceConstantHelper}

+	 *        an int representing the preference type to retrieve. It must be a value defined in {@link PreferencesConstantsHelper}

 	 * @return the preference constant used to store the given prefence type.

 	 */

 	protected String getPreferenceConstant(int preferenceType) {

-		return PreferenceConstantHelper.getElementConstant(getTitle(), preferenceType);

+		return PreferencesConstantsHelper.getElementConstant(getTitle(), preferenceType);

 	}

 

 }

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/DiagramPreferencePage.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/DiagramPreferencePage.java
index 1be6ca17808..3df83f43f5b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/DiagramPreferencePage.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/DiagramPreferencePage.java
@@ -25,12 +25,14 @@ import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.ConnectionGroup;
 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.NodeColorGroup;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.RulersAndGridGroup;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.diagram.DiagramBackgroundColor;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.diagram.DiagramConnectionGroup;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.diagram.DiagramDecorationGroup;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.diagram.DiagramFontGroup;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.diagram.DiagramNodeColorGroup;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.diagram.DiagramRulersAndGridGroup;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.swt.layout.GridLayout;

 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.swt.widgets.Control;

@@ -73,6 +75,9 @@ public class DiagramPreferencePage extends DiagramsPreferencePage {
 

 		DecorationGroup decorationGroupComposite = new DiagramDecorationGroup(contentGroup, getPreferenceKey(), this);

 		addAbstractGroup(decorationGroupComposite);

+

+		RulersAndGridGroup viewGroupComposite = new DiagramRulersAndGridGroup(parent, getPreferenceKey(), this);

+		addAbstractGroup(viewGroupComposite);

 		return super.createContents(parent);

 	}

 

@@ -114,7 +119,7 @@ public class DiagramPreferencePage extends DiagramsPreferencePage {
 	 */

 	public void storeAllPreferences() {

 		storePreferences();

-		((PapyrusPreferenceStore)getPreferenceStore()).deleteAllSubPreference(PreferenceConstantHelper.DIAGRAM_PREFERENCE_PREFIX);

+		((PapyrusPreferenceStore)getPreferenceStore()).deleteAllSubPreference(PreferencesConstantsHelper.DIAGRAM_PREFERENCE_PREFIX);

 

 	}

 

@@ -168,7 +173,6 @@ public class DiagramPreferencePage extends DiagramsPreferencePage {
 

 	@Override

 	public void setVisible(boolean visible) {

-		// TODO Auto-generated method stub

 		if(visible == true) {

 			VisiblePageSingleton.getInstance().setVisiblePage(this);

 			initGroup();

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/PapyrusAllDiagramsPreferencePage.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/PapyrusAllDiagramsPreferencePage.java
index dc27266b937..a545c8fcb02 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/PapyrusAllDiagramsPreferencePage.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/PapyrusAllDiagramsPreferencePage.java
@@ -18,6 +18,7 @@ import org.eclipse.gmf.runtime.notation.Routing;
 import org.eclipse.gmf.runtime.notation.Smoothness;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.Activator;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.PapyrusPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.BackgroundColor;

@@ -26,16 +27,18 @@ import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.DecorationGroup;
 import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.DimensionGroup;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.FontGroup;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.NodeColorGroup;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.RulersAndGridGroup;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor.EditorBackgroundColor;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor.EditorConnectionGroup;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor.EditorDecorationGroup;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor.EditorDimensionGroup;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor.EditorFontGroup;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor.EditorNodeColorGroup;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor.EditorRulersAndGridGroup;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.layout.GridLayout;

 import org.eclipse.swt.widgets.Composite;

+import org.eclipse.swt.widgets.Display;

 import org.eclipse.swt.widgets.Group;

 

 /**

@@ -70,6 +73,9 @@ public class PapyrusAllDiagramsPreferencePage extends AbstractPapyrusPreferenceP
 

 		DimensionGroup dimensionGroup = new EditorDimensionGroup(contentGroup, getTitle(), this);

 		addAbstractGroup(dimensionGroup);

+

+		RulersAndGridGroup viewGroupComposite = new EditorRulersAndGridGroup(parent, getTitle(), this);

+		addAbstractGroup(viewGroupComposite);

 	}

 

 

@@ -84,34 +90,42 @@ public class PapyrusAllDiagramsPreferencePage extends AbstractPapyrusPreferenceP
 	 * @param store

 	 *        the preference store

 	 */

-	public static void initDefaults(IPreferenceStore store) {

-

-		//Nodes

-		PreferenceConverter.setDefault(store, PreferenceConstantHelper.getPapyrusEditorConstant(PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		PreferenceConverter.setDefault(store, PreferenceConstantHelper.getPapyrusEditorConstant(PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

-

-		// Set the default for the gradient

-		store.setDefault(PreferenceConstantHelper.getPapyrusEditorConstant(PreferenceConstantHelper.GRADIENT_POLICY), false);

-		GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(new org.eclipse.swt.graphics.RGB(255, 255, 255), new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);

-		store.setDefault(PreferenceConstantHelper.getPapyrusEditorConstant(PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

-

-		// Links

-		store.setDefault(PreferenceConstantHelper.getPapyrusEditorConstant(PreferenceConstantHelper.SMOOTHNESS), Smoothness.NONE);

-		store.setDefault(PreferenceConstantHelper.getPapyrusEditorConstant(PreferenceConstantHelper.JUMPLINK_STATUS), JumpLinkStatus.NONE);

-		store.setDefault(PreferenceConstantHelper.getPapyrusEditorConstant(PreferenceConstantHelper.JUMPLINK_TYPE), JumpLinkStatus.NONE);

-		store.setDefault(PreferenceConstantHelper.getPapyrusEditorConstant(PreferenceConstantHelper.JUMPLINK_REVERSE), false);

-

-		store.setDefault(PreferenceConstantHelper.getPapyrusEditorConstant(PreferenceConstantHelper.ROUTING_STYLE), Routing.MANUAL);

-		store.setDefault(PreferenceConstantHelper.getPapyrusEditorConstant(PreferenceConstantHelper.ROUTING_POLICY_OBSTRUCTION), false);

-		store.setDefault(PreferenceConstantHelper.getPapyrusEditorConstant(PreferenceConstantHelper.ROUTING_POLICY_DISTANCE), false);

-

-		//decoration

-		store.setDefault(PreferenceConstantHelper.getPapyrusEditorConstant(PreferenceConstantHelper.SHADOW), false);

-		store.setDefault(PreferenceConstantHelper.getPapyrusEditorConstant(PreferenceConstantHelper.ELEMENTICON), false);

-		store.setDefault(PreferenceConstantHelper.getPapyrusEditorConstant(PreferenceConstantHelper.QUALIFIEDNAME), false);

-		//dimension

-		store.setDefault(PreferenceConstantHelper.getPapyrusEditorConstant(PreferenceConstantHelper.WIDTH), 100);

-		store.setDefault(PreferenceConstantHelper.getPapyrusEditorConstant(PreferenceConstantHelper.HEIGHT), 100);

+	public static void initDefaults(final IPreferenceStore store) {

+		Display.getDefault().syncExec(new Runnable() { //to be in the thread ui

+

+			public void run() {

+

+				//Nodes

+				PreferenceConverter.setDefault(store, PreferencesConstantsHelper.getPapyrusEditorConstant(PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

+				PreferenceConverter.setDefault(store, PreferencesConstantsHelper.getPapyrusEditorConstant(PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+

+				// Set the default for the gradient

+				store.setDefault(PreferencesConstantsHelper.getPapyrusEditorConstant(PreferencesConstantsHelper.GRADIENT_POLICY), false);

+				GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(new org.eclipse.swt.graphics.RGB(255, 255, 255), new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);

+				store.setDefault(PreferencesConstantsHelper.getPapyrusEditorConstant(PreferencesConstantsHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+

+				// Links

+				store.setDefault(PreferencesConstantsHelper.getPapyrusEditorConstant(PreferencesConstantsHelper.SMOOTHNESS), Smoothness.NONE);

+				store.setDefault(PreferencesConstantsHelper.getPapyrusEditorConstant(PreferencesConstantsHelper.JUMPLINK_STATUS), JumpLinkStatus.NONE);

+				store.setDefault(PreferencesConstantsHelper.getPapyrusEditorConstant(PreferencesConstantsHelper.JUMPLINK_TYPE), JumpLinkStatus.NONE);

+				store.setDefault(PreferencesConstantsHelper.getPapyrusEditorConstant(PreferencesConstantsHelper.JUMPLINK_REVERSE), false);

+

+				store.setDefault(PreferencesConstantsHelper.getPapyrusEditorConstant(PreferencesConstantsHelper.ROUTING_STYLE), Routing.MANUAL);

+				store.setDefault(PreferencesConstantsHelper.getPapyrusEditorConstant(PreferencesConstantsHelper.ROUTING_POLICY_OBSTRUCTION), false);

+				store.setDefault(PreferencesConstantsHelper.getPapyrusEditorConstant(PreferencesConstantsHelper.ROUTING_POLICY_DISTANCE), false);

+

+				//decoration

+				store.setDefault(PreferencesConstantsHelper.getPapyrusEditorConstant(PreferencesConstantsHelper.SHADOW), false);

+				store.setDefault(PreferencesConstantsHelper.getPapyrusEditorConstant(PreferencesConstantsHelper.ELEMENTICON), false);

+				store.setDefault(PreferencesConstantsHelper.getPapyrusEditorConstant(PreferencesConstantsHelper.QUALIFIEDNAME), false);

+				//dimension

+				store.setDefault(PreferencesConstantsHelper.getPapyrusEditorConstant(PreferencesConstantsHelper.WIDTH), 100);

+				store.setDefault(PreferencesConstantsHelper.getPapyrusEditorConstant(PreferencesConstantsHelper.HEIGHT), 100);

+

+				//Rulers and grid group

+				RulersAndGridGroup.initDefaults(store);

+			}

+		});

 

 	}

 

@@ -120,7 +134,7 @@ public class PapyrusAllDiagramsPreferencePage extends AbstractPapyrusPreferenceP
 	 */

 	public void storeAllPreferences() {

 		super.storeAllPreferences();

-		((PapyrusPreferenceStore)getPreferenceStore()).deleteAllSubPreference(PreferenceConstantHelper.PAPYRUS_EDITOR_PREFERENCE_PREFIX);

+		((PapyrusPreferenceStore)getPreferenceStore()).deleteAllSubPreference(PreferencesConstantsHelper.PAPYRUS_EDITOR_PREFERENCE_PREFIX);

 

 	}

 }

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/internal/PapyrusRulersAndGridPreferencePage.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/internal/PapyrusRulersAndGridPreferencePage.java
deleted file mode 100644
index 9b60f04eb2f..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/pages/internal/PapyrusRulersAndGridPreferencePage.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/****************************************************************************

- * Copyright (c) 2008 Atos Origin.

- *  

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *		Thibault Landre (Atos Origin) - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.preferences.pages.internal;

-

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.ProjectScope;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.preferences.InstanceScope;

-import org.eclipse.gmf.runtime.diagram.ui.preferences.RulerGridPreferencePage;

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.Activator;

-import org.eclipse.ui.IWorkbenchPropertyPage;

-import org.eclipse.ui.preferences.ScopedPreferenceStore;

-

-/**

- * The preference page for the rulers and grid

- * 

- * @author tlandre

- */

-public class PapyrusRulersAndGridPreferencePage extends RulerGridPreferencePage implements IWorkbenchPropertyPage {

-

-	private IProject project;

-

-	public PapyrusRulersAndGridPreferencePage() {

-		setPreferenceStore(null);

-	}

-

-	/**

-	 * @see org.eclipse.ui.IWorkbenchPropertyPage#getElement()

-	 */

-	public IAdaptable getElement() {

-		return project;

-	}

-

-	/**

-	 * @see org.eclipse.ui.IWorkbenchPropertyPage#setElement(org.eclipse.core.runtime.IAdaptable)

-	 */

-	public void setElement(IAdaptable element) {

-		project = (IProject)element.getAdapter(IResource.class);

-	}

-

-	/**

-	 * @see org.eclipse.jface.preference.PreferencePage#doGetPreferenceStore()

-	 */

-	protected IPreferenceStore doGetPreferenceStore() {

-		IPreferenceStore store;

-		if(project != null) {

-			store = new ScopedPreferenceStore(new ProjectScope(project), getBundleId());

-		} else {

-			store = new ScopedPreferenceStore(new InstanceScope(), getBundleId());

-		}

-		return store;

-	}

-

-	/**

-	 * @return this bundle ID.

-	 */

-	private String getBundleId() {

-		return Activator.PLUGIN_ID;

-	}

-}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/AbstractGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/AbstractGroup.java
index 0a6ac336c04..dfbfe516602 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/AbstractGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/AbstractGroup.java
@@ -19,7 +19,7 @@ import java.util.Set;
 import org.eclipse.jface.dialogs.DialogPage;

 import org.eclipse.jface.preference.FieldEditor;

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.layout.GridLayout;

 import org.eclipse.swt.widgets.Composite;

@@ -92,12 +92,12 @@ public abstract class AbstractGroup extends Composite {
 	 * Get the specified preference type associated with this preference page.

 	 * 

 	 * @param preferenceType

-	 *        an int representing the preference type to retrieve. It must be a value defined in {@link PreferenceConstantHelper}

+	 *        an int representing the preference type to retrieve. It must be a value defined in {@link PreferencesConstantsHelper}

 	 * 

 	 * @return the preference constant used to store the given preference type.

 	 */

 	protected String getPreferenceConstant(int preferenceType) {

-		return PreferenceConstantHelper.getElementConstant(key, preferenceType);

+		return PreferencesConstantsHelper.getElementConstant(key, preferenceType);

 	}

 

 	/**

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/BackgroundColor.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/BackgroundColor.java
index 5310a9612f1..7a622bbc66c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/BackgroundColor.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/BackgroundColor.java
@@ -18,9 +18,9 @@ import org.eclipse.jface.dialogs.DialogPage;
 import org.eclipse.jface.preference.BooleanFieldEditor;

 import org.eclipse.jface.util.IPropertyChangeListener;

 import org.eclipse.jface.util.PropertyChangeEvent;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.Messages;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.jface.preference.GradientFieldEditor;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.layout.GridLayout;

 import org.eclipse.swt.widgets.Composite;

@@ -75,13 +75,13 @@ public class BackgroundColor extends AbstractGroup {
 		Label useGradientLabel = new Label(useGradientCompo, SWT.NULL);

 		useGradientLabel.setText(Messages.AbstractPapyrusNodePreferencePage_Activate);

 		Composite useGradientFillEditorCompo = getEncapsulatedCompo(useGradientCompo);

-		useGradientFillEditor = new BooleanFieldEditor(getPreferenceConstant(PreferenceConstantHelper.GRADIENT_POLICY), "", useGradientFillEditorCompo); //$NON-NLS-1$

+		useGradientFillEditor = new BooleanFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.GRADIENT_POLICY), "", useGradientFillEditorCompo); //$NON-NLS-1$

 		useGradientFillEditor.setPage(dialogPage);

 

 		addFieldEditor(useGradientFillEditor);

 

 		Composite gradientFillEditorCompo = getEncapsulatedCompo(fillColorGroup);

-		gradientFillEditor = new GradientFieldEditor(getPreferenceConstant(PreferenceConstantHelper.COLOR_GRADIENT), gradientFillEditorCompo);

+		gradientFillEditor = new GradientFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.COLOR_GRADIENT), gradientFillEditorCompo);

 		gradientFillEditor.setPage(dialogPage);

 		gradientFillEditor.setEnabled(useGradientFillEditor.getBooleanValue());

 

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/ConnectionGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/ConnectionGroup.java
index 24743f10387..adad25c62b2 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/ConnectionGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/ConnectionGroup.java
@@ -20,8 +20,8 @@ import org.eclipse.gmf.runtime.notation.Smoothness;
 import org.eclipse.jface.dialogs.DialogPage;

 import org.eclipse.jface.preference.BooleanFieldEditor;

 import org.eclipse.jface.preference.ComboFieldEditor;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.Messages;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.layout.GridLayout;

 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.swt.widgets.Group;

@@ -111,7 +111,7 @@ public class ConnectionGroup extends AbstractGroup {
 		connectionGroup.setLayout(new GridLayout());

 		connectionGroup.setText(Messages.AbstractPapyrusLinkPreferencePage_Connection);

 

-		ComboFieldEditor smoothnessComboFieldEditor = new ComboFieldEditor(getPreferenceConstant(PreferenceConstantHelper.SMOOTHNESS), Messages.AbstractPapyrusLinkPreferencePage_Smoothness, SMOOTHNESS_COMBOFIELDEDITOR_NAMES_AND_VALUES, connectionGroup);

+		ComboFieldEditor smoothnessComboFieldEditor = new ComboFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.SMOOTHNESS), Messages.AbstractPapyrusLinkPreferencePage_Smoothness, SMOOTHNESS_COMBOFIELDEDITOR_NAMES_AND_VALUES, connectionGroup);

 

 		addFieldEditor(smoothnessComboFieldEditor);

 

@@ -131,17 +131,17 @@ public class ConnectionGroup extends AbstractGroup {
 		jumpLinkGroup.setLayout(new GridLayout());

 		jumpLinkGroup.setText(Messages.AbstractPapyrusLinkPreferencePage_JUMPLINKS);

 

-		jumpLinkStatusComboFieldEditor = new ComboFieldEditor(getPreferenceConstant(PreferenceConstantHelper.JUMPLINK_STATUS), JUMPLINK_STATUS_COMBOFIELDEDITOR_LABEL, JUMPLINK_STATUS_COMBOFIELDEDITOR_NAMES_AND_VALUES, jumpLinkGroup);

+		jumpLinkStatusComboFieldEditor = new ComboFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.JUMPLINK_STATUS), JUMPLINK_STATUS_COMBOFIELDEDITOR_LABEL, JUMPLINK_STATUS_COMBOFIELDEDITOR_NAMES_AND_VALUES, jumpLinkGroup);

 		jumpLinkStatusComboFieldEditor.setPage(dialogPage);

 

 		addFieldEditor(jumpLinkStatusComboFieldEditor);

 

-		jumpLinkTypeComboFieldEditor = new ComboFieldEditor(getPreferenceConstant(PreferenceConstantHelper.JUMPLINK_TYPE), JUMPLINK_TYPE_COMBOFIELDEDITOR_LABEL, JUMPLINK_TYPE_COMBOFIELDEDITOR_NAMES_AND_VALUES, jumpLinkGroup);

+		jumpLinkTypeComboFieldEditor = new ComboFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.JUMPLINK_TYPE), JUMPLINK_TYPE_COMBOFIELDEDITOR_LABEL, JUMPLINK_TYPE_COMBOFIELDEDITOR_NAMES_AND_VALUES, jumpLinkGroup);

 		jumpLinkTypeComboFieldEditor.setPage(dialogPage);

 

 		addFieldEditor(jumpLinkTypeComboFieldEditor);

 

-		jumpLinkReverseBooleanFieldEditor = new BooleanFieldEditor(getPreferenceConstant(PreferenceConstantHelper.JUMPLINK_REVERSE), JUMPLINK_REVERSE_BOOLEANFIELDEDITOR_LABEL, jumpLinkGroup);

+		jumpLinkReverseBooleanFieldEditor = new BooleanFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.JUMPLINK_REVERSE), JUMPLINK_REVERSE_BOOLEANFIELDEDITOR_LABEL, jumpLinkGroup);

 		jumpLinkReverseBooleanFieldEditor.setPage(dialogPage);

 

 		addFieldEditor(jumpLinkReverseBooleanFieldEditor);

@@ -158,17 +158,17 @@ public class ConnectionGroup extends AbstractGroup {
 		routingGroup.setLayout(new GridLayout());

 		routingGroup.setText(Messages.AbstractPapyrusLinkPreferencePage_Routing);

 

-		routingStylesComboFieldEditor = new ComboFieldEditor(getPreferenceConstant(PreferenceConstantHelper.ROUTING_STYLE), ROUTING_STYLES_COMBOFIELDEDITOR_LABEL, ROUTING_STYLES_COMBOFIELDEDITOR_NAMES_AND_VALUES, routingGroup);

+		routingStylesComboFieldEditor = new ComboFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.ROUTING_STYLE), ROUTING_STYLES_COMBOFIELDEDITOR_LABEL, ROUTING_STYLES_COMBOFIELDEDITOR_NAMES_AND_VALUES, routingGroup);

 		routingStylesComboFieldEditor.setPage(dialogPage);

 

 		addFieldEditor(routingStylesComboFieldEditor);

 

-		routingObstructionPolicyBooleanFieldEditor = new BooleanFieldEditor(getPreferenceConstant(PreferenceConstantHelper.ROUTING_POLICY_OBSTRUCTION), ROUTING_OBSTRUCTION_POLICY_BOOLEANFIELDEDITOR_LABEL, routingGroup);

+		routingObstructionPolicyBooleanFieldEditor = new BooleanFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.ROUTING_POLICY_OBSTRUCTION), ROUTING_OBSTRUCTION_POLICY_BOOLEANFIELDEDITOR_LABEL, routingGroup);

 		routingObstructionPolicyBooleanFieldEditor.setPage(dialogPage);

 

 		addFieldEditor(routingObstructionPolicyBooleanFieldEditor);

 

-		routingDistancePolicyBooleanFieldEditor = new BooleanFieldEditor(getPreferenceConstant(PreferenceConstantHelper.ROUTING_POLICY_DISTANCE), ROUTING_DISTANCE_POLICY_BOOLEANFIELDEDITOR_LABEL, routingGroup);

+		routingDistancePolicyBooleanFieldEditor = new BooleanFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.ROUTING_POLICY_DISTANCE), ROUTING_DISTANCE_POLICY_BOOLEANFIELDEDITOR_LABEL, routingGroup);

 		routingDistancePolicyBooleanFieldEditor.setPage(dialogPage);

 

 		addFieldEditor(routingDistancePolicyBooleanFieldEditor);

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/DecorationGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/DecorationGroup.java
index d593ff9e865..66a965844c8 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/DecorationGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/DecorationGroup.java
@@ -16,7 +16,7 @@ package org.eclipse.papyrus.infra.gmfdiag.preferences.ui;
 import org.eclipse.jface.dialogs.DialogPage;

 import org.eclipse.jface.preference.BooleanFieldEditor;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.Messages;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.swt.layout.GridLayout;

 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.swt.widgets.Group;

@@ -70,18 +70,24 @@ public class DecorationGroup extends AbstractGroup {
 		decorationGroup.setLayout(new GridLayout());

 		decorationGroup.setText(Messages.DecorationGroup_Name);

 

-		shadowFiedEditor = new BooleanFieldEditor(getPreferenceConstant(PreferenceConstantHelper.SHADOW), SHADOW_BOOLEANFIELDEDITOR_LABEL, decorationGroup);

+		shadowFiedEditor = new BooleanFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.SHADOW), SHADOW_BOOLEANFIELDEDITOR_LABEL, decorationGroup);

 		shadowFiedEditor.setPage(dialogPage);

 

 		addFieldEditor(shadowFiedEditor);

 

-		elementIcon = new BooleanFieldEditor(getPreferenceConstant(PreferenceConstantHelper.ELEMENTICON), ELEMENTICON_BOOLEANFIELDEDITOR_LABEL, decorationGroup);

+		elementIcon = new BooleanFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.ELEMENTICON), ELEMENTICON_BOOLEANFIELDEDITOR_LABEL, decorationGroup);

 		elementIcon.setPage(dialogPage);

 		addFieldEditor(elementIcon);

 

-		qualifiedname = new BooleanFieldEditor(getPreferenceConstant(PreferenceConstantHelper.QUALIFIEDNAME), QUALIFIEDNAME_BOOLEANFIELDEDITOR_LABEL, decorationGroup);

+		qualifiedname = new BooleanFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.QUALIFIEDNAME), QUALIFIEDNAME_BOOLEANFIELDEDITOR_LABEL, decorationGroup);

 		qualifiedname.setPage(dialogPage);

 		addFieldEditor(qualifiedname);

 

 	}

+

+	@Override

+	protected String getPreferenceConstant(int preferenceType) {

+		System.out.println(super.getPreferenceConstant(preferenceType));

+		return super.getPreferenceConstant(preferenceType);

+	}

 }

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/DimensionGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/DimensionGroup.java
index 022a0080167..594e44a6334 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/DimensionGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/DimensionGroup.java
@@ -15,8 +15,8 @@ package org.eclipse.papyrus.infra.gmfdiag.preferences.ui;
 

 import org.eclipse.jface.dialogs.DialogPage;

 import org.eclipse.jface.preference.IntegerFieldEditor;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.Messages;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.layout.GridLayout;

 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.swt.widgets.Group;

@@ -65,12 +65,12 @@ public class DimensionGroup extends AbstractGroup {
 		decorationGroup.setLayout(new GridLayout());

 		decorationGroup.setText(Messages.DimensionGroupName);

 

-		widthFiedEditor = new IntegerFieldEditor(getPreferenceConstant(PreferenceConstantHelper.WIDTH), WIDTH_INTFIELDEDITOR_LABEL, decorationGroup);

+		widthFiedEditor = new IntegerFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.WIDTH), WIDTH_INTFIELDEDITOR_LABEL, decorationGroup);

 		widthFiedEditor.setPage(dialogPage);

 

 		addFieldEditor(widthFiedEditor);

 

-		heightFiedEditor = new IntegerFieldEditor(getPreferenceConstant(PreferenceConstantHelper.HEIGHT), HEIGHT_INTFIELDEDITOR_LABEL, decorationGroup);

+		heightFiedEditor = new IntegerFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.HEIGHT), HEIGHT_INTFIELDEDITOR_LABEL, decorationGroup);

 		heightFiedEditor.setPage(dialogPage);

 

 		addFieldEditor(heightFiedEditor);

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/FontGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/FontGroup.java
index 96d018ae320..6bf54fb1f9d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/FontGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/FontGroup.java
@@ -14,9 +14,9 @@
 package org.eclipse.papyrus.infra.gmfdiag.preferences.ui;

 

 import org.eclipse.jface.dialogs.DialogPage;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.Messages;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.jface.preference.FontFieldEditor;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.layout.GridLayout;

 import org.eclipse.swt.widgets.Composite;

@@ -45,6 +45,7 @@ public class FontGroup extends AbstractGroup {
 	 **/

 	public FontGroup(Composite parent, String key, DialogPage dialogPage) {

 		super(parent, key, dialogPage);

+		System.out.println("FONT key = " + key);

 		createContent(parent);

 	}

 

@@ -58,7 +59,7 @@ public class FontGroup extends AbstractGroup {
 		Group fontGroup = new Group(parent, SWT.SHADOW_NONE);

 		fontGroup.setLayout(new GridLayout(1, true));

 		fontGroup.setText(FONT_GROUPBOX_LABEL);

-		fontFieldEditor = new FontFieldEditor(getPreferenceConstant(PreferenceConstantHelper.FONT), fontGroup);

+		fontFieldEditor = new FontFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.FONT), fontGroup);

 

 		addFieldEditor(fontFieldEditor);

 	}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/LabelGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/LabelGroup.java
index 815e3a76b9d..7a39d492129 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/LabelGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/LabelGroup.java
@@ -19,10 +19,10 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.dialogs.DialogPage;

 import org.eclipse.jface.resource.ImageDescriptor;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.Activator;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.messages.Messages;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor.CLabelBooleanFieldEditor;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.swt.layout.GridLayout;

@@ -72,7 +72,7 @@ public class LabelGroup extends AbstractGroup {
 		group.setLayout(new GridLayout());

 		group.setText(Messages.LabelGroup_Labels_To_Display);

 		for(String role : myRoles.keySet()) {

-			String key = PreferenceConstantHelper.getLabelElementConstant(getKey(), role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String key = PreferencesConstantsHelper.getLabelElementConstant(getKey(), role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			Image im = null;

 			String iconPath = myRoles.get(role);

 			if(iconPath != null && iconPath != "") { //$NON-NLS-1$

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/LinkColorGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/LinkColorGroup.java
index e862781d57e..142b71f8bdb 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/LinkColorGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/LinkColorGroup.java
@@ -15,9 +15,9 @@ package org.eclipse.papyrus.infra.gmfdiag.preferences.ui;
 

 import org.eclipse.gmf.runtime.diagram.ui.properties.internal.l10n.DiagramUIPropertiesImages;

 import org.eclipse.jface.dialogs.DialogPage;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.Messages;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.jface.preference.ColorFieldEditor;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.layout.GridLayout;

 import org.eclipse.swt.widgets.Composite;

@@ -74,13 +74,13 @@ public class LinkColorGroup extends AbstractGroup {
 		toolbar.setLayout(new GridLayout(3, false));

 

 		Composite fontColorEditorCompo = getEncapsulatedCompo(toolbar);

-		fontColorEditor = new ColorFieldEditor(getPreferenceConstant(PreferenceConstantHelper.COLOR_FONT), DiagramUIPropertiesImages.get(DiagramUIPropertiesImages.IMG_FONT_COLOR), fontColorEditorCompo);

+		fontColorEditor = new ColorFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.COLOR_FONT), DiagramUIPropertiesImages.get(DiagramUIPropertiesImages.IMG_FONT_COLOR), fontColorEditorCompo);

 		fontColorEditor.setPage(dialogPage);

 

 		addFieldEditor(fontColorEditor);

 

 		Composite lineColorEditorCompo = getEncapsulatedCompo(toolbar);

-		lineColorEditor = new ColorFieldEditor(getPreferenceConstant(PreferenceConstantHelper.COLOR_LINE), DiagramUIPropertiesImages.get(DiagramUIPropertiesImages.IMG_LINE_COLOR), lineColorEditorCompo);

+		lineColorEditor = new ColorFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.COLOR_LINE), DiagramUIPropertiesImages.get(DiagramUIPropertiesImages.IMG_LINE_COLOR), lineColorEditorCompo);

 

 		lineColorEditor.setPage(dialogPage);

 

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/NodeColorGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/NodeColorGroup.java
index 757a57126f5..8773bed4a82 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/NodeColorGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/NodeColorGroup.java
@@ -15,8 +15,8 @@ package org.eclipse.papyrus.infra.gmfdiag.preferences.ui;
 

 import org.eclipse.gmf.runtime.diagram.ui.properties.internal.l10n.DiagramUIPropertiesImages;

 import org.eclipse.jface.dialogs.DialogPage;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.jface.preference.ColorFieldEditor;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.widgets.Composite;

 

 /**

@@ -59,7 +59,7 @@ public class NodeColorGroup extends LinkColorGroup {
 		super.createContent(parent);

 

 		Composite fillColorEditorCompo = getEncapsulatedCompo(getToolbar());

-		fillColorEditor = new ColorFieldEditor(getPreferenceConstant(PreferenceConstantHelper.COLOR_FILL), DiagramUIPropertiesImages.get(DiagramUIPropertiesImages.IMG_FILL_COLOR), fillColorEditorCompo);

+		fillColorEditor = new ColorFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.COLOR_FILL), DiagramUIPropertiesImages.get(DiagramUIPropertiesImages.IMG_FILL_COLOR), fillColorEditorCompo);

 		fillColorEditor.setPage(dialogPage);

 

 		addFieldEditor(fillColorEditor);

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/NodeCompartmentGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/NodeCompartmentGroup.java
index b8c70f9fe09..bac2da99fae 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/NodeCompartmentGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/NodeCompartmentGroup.java
@@ -21,7 +21,7 @@ import java.util.Set;
 import org.eclipse.gmf.runtime.common.ui.preferences.CheckBoxFieldEditor;

 import org.eclipse.jface.dialogs.DialogPage;

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.events.SelectionEvent;

 import org.eclipse.swt.events.SelectionListener;

@@ -84,12 +84,12 @@ public class NodeCompartmentGroup extends AbstractGroup {
 		gridData.horizontalSpan = 2;

 		group.setLayoutData(gridData);

 

-		String compartmentVisibilityPreference = PreferenceConstantHelper.getCompartmentElementConstant(getKey(), compartment, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+		String compartmentVisibilityPreference = PreferencesConstantsHelper.getCompartmentElementConstant(getKey(), compartment, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 		String compartmentVisibilityLabel = "Show compartment";

 		Button showCompartmentButton = addCheckboxField(group, compartmentVisibilityPreference, compartmentVisibilityLabel);

 

 		if(this.compartmentsWithTitle.contains(compartment)) {

-			String compartmentNameVisibilityPreference = PreferenceConstantHelper.getCompartmentElementConstant(getKey(), compartment, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			String compartmentNameVisibilityPreference = PreferencesConstantsHelper.getCompartmentElementConstant(getKey(), compartment, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);

 			String compartmentNameVisibilityLabel = "Show title";

 			Button showNameButton = addCheckboxField(group, compartmentNameVisibilityPreference, compartmentNameVisibilityLabel);

 

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/OrderedCompartmentGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/OrderedCompartmentGroup.java
index c8027053a2d..d7899d772f4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/OrderedCompartmentGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/OrderedCompartmentGroup.java
@@ -20,7 +20,7 @@ import java.util.List;
 import org.eclipse.gmf.runtime.common.ui.preferences.CheckBoxFieldEditor;

 import org.eclipse.jface.dialogs.DialogPage;

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.events.SelectionEvent;

 import org.eclipse.swt.events.SelectionListener;

@@ -83,12 +83,12 @@ public class OrderedCompartmentGroup extends AbstractGroup {
 		gridData.horizontalSpan = 2;

 		group.setLayoutData(gridData);

 

-		String compartmentVisibilityPreference = PreferenceConstantHelper.getCompartmentElementConstant(getKey(), compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+		String compartmentVisibilityPreference = PreferencesConstantsHelper.getCompartmentElementConstant(getKey(), compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 		String compartmentVisibilityLabel = "Show compartment";

 		Button showCompartmentButton = addCheckboxField(group, compartmentVisibilityPreference, compartmentVisibilityLabel);

 

 		if(this.compartmentsWithTitle.contains(compartmentName)) {

-			String compartmentNameVisibilityPreference = PreferenceConstantHelper.getCompartmentElementConstant(getKey(), compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			String compartmentNameVisibilityPreference = PreferencesConstantsHelper.getCompartmentElementConstant(getKey(), compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);

 			String compartmentNameVisibilityLabel = "Show title";

 			Button showNameButton = addCheckboxField(group, compartmentNameVisibilityPreference, compartmentNameVisibilityLabel);

 

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/OrderedLabelGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/OrderedLabelGroup.java
index f5aefe03a64..7f48655ef36 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/OrderedLabelGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/OrderedLabelGroup.java
@@ -21,10 +21,10 @@ import java.util.Map;
 

 import org.eclipse.jface.dialogs.DialogPage;

 import org.eclipse.jface.resource.ImageDescriptor;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.Activator;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.messages.Messages;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor.CLabelBooleanFieldEditor;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.swt.layout.GridLayout;

@@ -92,7 +92,7 @@ public class OrderedLabelGroup extends AbstractGroup {
 		group.setLayout(new GridLayout());

 		group.setText(Messages.LabelGroup_Labels_To_Display);

 		for(String role : myRoles.keySet()) {

-			String key = PreferenceConstantHelper.getLabelElementConstant(getKey(), role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String key = PreferencesConstantsHelper.getLabelElementConstant(getKey(), role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			Image im = null;

 			String iconPath = myRoles.get(role);

 			if(iconPath != null && iconPath != "") { //$NON-NLS-1$

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/RulersAndGridGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/RulersAndGridGroup.java
new file mode 100644
index 00000000000..524d1516087
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/RulersAndGridGroup.java
@@ -0,0 +1,497 @@
+/*****************************************************************************

+ * 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:

+ *		

+ *		CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui;

+

+import java.text.ParseException;

+import java.text.ParsePosition;

+

+import org.eclipse.draw2d.Graphics;

+import org.eclipse.gef.rulers.RulerProvider;

+import org.eclipse.gmf.runtime.common.ui.preferences.ComboFieldEditor;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;

+import org.eclipse.gmf.runtime.diagram.ui.properties.internal.l10n.DiagramUIPropertiesImages;

+import org.eclipse.jface.dialogs.DialogPage;

+import org.eclipse.jface.preference.BooleanFieldEditor;

+import org.eclipse.jface.preference.IPreferenceStore;

+import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.jface.preference.StringFieldEditor;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.providers.LineStyleLabelProvider;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.UnitsConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.UnitsConverterUtils;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.jface.preference.ColorFieldEditor;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.messages.Messages;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.events.SelectionEvent;

+import org.eclipse.swt.events.SelectionListener;

+import org.eclipse.swt.layout.GridData;

+import org.eclipse.swt.layout.GridLayout;

+import org.eclipse.swt.widgets.Combo;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.swt.widgets.Group;

+import org.eclipse.swt.widgets.Label;

+import org.eclipse.swt.widgets.Text;

+

+import com.ibm.icu.text.NumberFormat;

+

+/**

+ * 

+ * This group provides the elements to manage the grid of a diagram

+ * Adapter code from the Preference Page Rulers And Grid

+ */

+@SuppressWarnings("restriction")

+public class RulersAndGridGroup extends AbstractGroup {

+

+	private int oldUnits = -1;

+

+	private String RULER_GROUP_LABEL = DiagramUIMessages.GridRulerPreferencePage_rulerGroup_label;

+

+	private String SHOW_RULERS_LABEL = DiagramUIMessages.GridRulerPreferencePage_showRulers_label;

+

+	private String RULER_UNITS_LABEL = DiagramUIMessages.GridRulerPreferencePage_rulerUnits_label;

+

+	private String RULER_UNITS_IN_LABEL = DiagramUIMessages.GridRulerPreferencePage_rulerUnits_inch_label;

+

+	private String RULER_UNITS_CM_LABEL = DiagramUIMessages.GridRulerPreferencePage_rulerUnits_cm_label;

+

+	private String RULER_UNITS_PIXEL_LABEL = DiagramUIMessages.GridRulerPreferencePage_rulerUnits_pixel_label;

+

+	private String GRID_GROUP_LABEL = DiagramUIMessages.GridRulerPreferencePage_gridGroup_label;

+

+	private String SHOW_GRID_LABEL = DiagramUIMessages.GridRulerPreferencePage_showGrid_label;

+

+	private String SNAP_TO_GRID_LABEL = DiagramUIMessages.GridRulerPreferencePage_snapToGrid_label;

+

+	private String SNAP_TO_GEOMETRY_LABEL = DiagramUIMessages.GridRulerPreferencePage_snapToGeometry_label;

+

+	private String GRID_SPACING_LABEL_INCHES = DiagramUIMessages.GridRulerPreferencePage_gridSpacing_label_inches;

+

+	private String GRID_SPACING_LABEL_CM = DiagramUIMessages.GridRulerPreferencePage_gridSpacing_label_cm;

+

+	private String GRID_SPACING_LABEL_PIXELS = DiagramUIMessages.GridRulerPreferencePage_gridSpacing_label_pixels;

+

+	protected String getPreferenceConstant(int preferenceType) {

+		return PreferencesConstantsHelper.getElementConstant(getKey(), preferenceType);

+	}

+

+	// Ruler Field Editors

+	private BooleanFieldEditor showRulers = null;

+

+	private ComboFieldEditor rulerUnits;

+

+	// Grid Field Editors

+	private BooleanFieldEditor showGrid = null;

+

+	private BooleanFieldEditor snapToGrid = null;

+

+	private BooleanFieldEditor snapToGeometry = null;

+

+	private DoubleFieldEditor gridSpacing = null;

+

+	private BooleanFieldEditor gridInFront = null;

+

+	private ComboFieldEditor gridStyle = null;

+

+	private Composite dblGroup = null;

+

+	private ColorFieldEditor gridColorEditor = null;

+

+	/**

+	 * 

+	 * @param store

+	 *        the preference store to initialize

+	 */

+	public static void initDefaults(IPreferenceStore store) {

+		//rulers and grid

+		//		String defaultCountry = Locale.getDefault().getCountry();

+		//		if(defaultCountry == null || defaultCountry.equals(Locale.US.getCountry()) || defaultCountry.equals(Locale.CANADA.getCountry())) {

+		//			store.setDefault(PreferencesConstantsHelper.getPapyrusEditorConstant(PreferencesConstantsHelper.RULER_UNITS), RulerProvider.UNIT_INCHES);

+		//		} else {

+		//			store.setDefault(PreferencesConstantsHelper.getPapyrusEditorConstant(PreferencesConstantsHelper.RULER_UNITS), RulerProvider.UNIT_CENTIMETERS);

+		//		}

+		store.setDefault(PreferencesConstantsHelper.getPapyrusEditorConstant(PreferencesConstantsHelper.RULER_UNITS), RulerProvider.UNIT_PIXELS);

+		store.setDefault(PreferencesConstantsHelper.getPapyrusEditorConstant(PreferencesConstantsHelper.VIEW_RULER), false);

+		store.setDefault(PreferencesConstantsHelper.getPapyrusEditorConstant(PreferencesConstantsHelper.VIEW_GRID), false);

+		store.setDefault(PreferencesConstantsHelper.getPapyrusEditorConstant(PreferencesConstantsHelper.SNAP_TO_GRID), false);

+		store.setDefault(PreferencesConstantsHelper.getPapyrusEditorConstant(PreferencesConstantsHelper.SNAP_TO_GEOMETRY), false);

+		store.setDefault(PreferencesConstantsHelper.getPapyrusEditorConstant(PreferencesConstantsHelper.GRID_LINE_STYLE), Graphics.LINE_CUSTOM);

+		store.setDefault(PreferencesConstantsHelper.getPapyrusEditorConstant(PreferencesConstantsHelper.GRID_ORDER), false);

+		//to force the refresh of the value

+		PreferenceConverter.setDefault(store, PreferencesConstantsHelper.getPapyrusEditorConstant(PreferencesConstantsHelper.GRID_LINE_COLOR), new org.eclipse.swt.graphics.RGB(250, 0, 0));

+		final int rgbValue = 50;

+		PreferenceConverter.setDefault(store, PreferencesConstantsHelper.getPapyrusEditorConstant(PreferencesConstantsHelper.GRID_LINE_COLOR), new org.eclipse.swt.graphics.RGB(rgbValue, rgbValue, rgbValue));

+

+		store.setDefault(PreferencesConstantsHelper.getPapyrusEditorConstant(PreferencesConstantsHelper.GRID_SPACING), 20);

+	}

+

+	/**

+	 * 

+	 * Constructor.

+	 * 

+	 * @param parent

+	 * @param key

+	 * @param dialogPage

+	 */

+	public RulersAndGridGroup(final Composite parent, final String key, final DialogPage dialogPage) {

+		super(parent, key, dialogPage);

+		createContents(parent);

+	}

+

+	/**

+	 * 

+	 * @param parent

+	 */

+	public void createContents(final Composite parent) {

+		addRulerFields(parent);

+		addGridFields(parent);

+	}

+

+

+	private void addRulerFields(Composite parent) {

+

+		// Create a Group to hold the ruler fields

+		Group group = new Group(parent, SWT.NONE);

+		group.setText(RULER_GROUP_LABEL);

+

+		GridLayout gridLayout = new GridLayout(1, false);

+		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);

+		gridData.grabExcessHorizontalSpace = true;

+		gridData.horizontalSpan = 1;

+

+		// Add the fields to the group

+		showRulers = new BooleanFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.VIEW_RULER), SHOW_RULERS_LABEL, group);

+		addFieldEditor(showRulers);

+

+		rulerUnits = new ComboFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.RULER_UNITS), RULER_UNITS_LABEL, group, ComboFieldEditor.INT_TYPE_INDEXED, false, 0, 0, true);

+		addFieldEditor(rulerUnits);

+		rulerUnits.addIndexedItemToCombo(RULER_UNITS_IN_LABEL, RulerProvider.UNIT_INCHES);

+		rulerUnits.addIndexedItemToCombo(RULER_UNITS_CM_LABEL, RulerProvider.UNIT_CENTIMETERS);

+		rulerUnits.addIndexedItemToCombo(RULER_UNITS_PIXEL_LABEL, RulerProvider.UNIT_PIXELS);

+		final Combo rulerUnitsCombo = rulerUnits.getComboControl();

+		rulerUnitsCombo.addSelectionListener(new SelectionListener() {

+

+			public void widgetDefaultSelected(SelectionEvent e) {

+				//do nothing

+			}

+

+			public void widgetSelected(SelectionEvent e) {

+				updateUnits();

+			}

+		});

+		group.setLayout(gridLayout);

+		group.setLayoutData(gridData);

+

+	}

+

+	private void addGridFields(Composite parent) {

+

+		// Create a Group to hold the grid fields

+		Group group = new Group(parent, SWT.NONE);

+		group.setText(GRID_GROUP_LABEL);

+

+		GridLayout gridLayout = new GridLayout(2, true);

+

+		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);

+		gridData.grabExcessHorizontalSpace = true;

+		gridData.horizontalSpan = 1;

+

+		showGrid = new BooleanFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.VIEW_GRID), SHOW_GRID_LABEL, group);

+		addFieldEditor(showGrid);

+

+		snapToGrid = new BooleanFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.SNAP_TO_GRID), SNAP_TO_GRID_LABEL, group);

+		addFieldEditor(snapToGrid);

+

+		snapToGeometry = new BooleanFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.SNAP_TO_GEOMETRY), SNAP_TO_GEOMETRY_LABEL, group);

+		addFieldEditor(snapToGeometry);

+

+		gridInFront = new BooleanFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.GRID_ORDER), Messages.RulersAndGridGroup_GridInFront, group);

+		addFieldEditor(gridInFront);

+

+		addGridStyle(group);

+

+		addGridColor(group);

+

+		addGridSpacing(group);

+

+		group.setLayoutData(gridData);

+		group.setLayout(gridLayout);

+	}

+

+	private void addGridStyle(final Composite parent) {

+		final Composite composite = new Composite(parent, SWT.NONE);

+		composite.setLayout(new GridLayout(2, true));

+		this.gridStyle = new ComboFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.GRID_LINE_STYLE), Messages.RulersAndGridGroup_GridStyle, composite, ComboFieldEditor.INT_TYPE_INDEXED, false, 0, 0, true);

+		this.gridStyle.addIndexedItemToCombo(LineStyleLabelProvider.LINE_STYLE_SOLID_STRING, Graphics.LINE_SOLID);

+		this.gridStyle.addIndexedItemToCombo(LineStyleLabelProvider.LINE_STYLE_DASH_STRING, Graphics.LINE_DASH);

+		this.gridStyle.addIndexedItemToCombo(LineStyleLabelProvider.LINE_STYLE_DOT_STRING, Graphics.LINE_DOT);

+		this.gridStyle.addIndexedItemToCombo(LineStyleLabelProvider.LINE_STYLE_DASH_DOT_STRING, Graphics.LINE_DASHDOT);

+		this.gridStyle.addIndexedItemToCombo(LineStyleLabelProvider.LINE_STYLE_DASH_DOT_DOT_STRING, Graphics.LINE_DASHDOTDOT);

+		this.gridStyle.addIndexedItemToCombo(LineStyleLabelProvider.LINE_STYLE_CUSTOM, Graphics.LINE_CUSTOM);

+		addFieldEditor(gridStyle);

+	}

+

+	private void addGridColor(final Composite parent) {

+		final Composite composite = new Composite(parent, SWT.NONE);

+		Label label = new Label(composite, SWT.NONE);

+

+		label.setText(Messages.RulersAndGridGroup_GridColor);

+		gridColorEditor = new ColorFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.GRID_LINE_COLOR), DiagramUIPropertiesImages.get(DiagramUIPropertiesImages.IMG_LINE_COLOR), composite);

+		addFieldEditor(gridColorEditor);

+		composite.setLayout(new GridLayout(2, true));

+	}

+

+

+

+	private void addGridSpacing(Composite parent) {

+

+		dblGroup = new Composite(parent, SWT.NONE);

+

+		GridLayout gridLayout = new GridLayout(2, false);

+

+		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);

+		gridData.grabExcessHorizontalSpace = true;

+		gridData.horizontalSpan = 2;

+

+		gridSpacing = new DoubleFieldEditor(getPreferenceConstant(PreferencesConstantsHelper.GRID_SPACING), GRID_SPACING_LABEL_INCHES, dblGroup);

+		gridSpacing.setTextLimit(10);

+		addFieldEditor(gridSpacing);

+

+		updateUnits();

+

+		dblGroup.setLayoutData(gridData);

+		dblGroup.setLayout(gridLayout);

+	}

+

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.gmf.runtime.common.ui.preferences.AbstractPreferencePage#initHelp()

+	 */

+	protected void initHelp() {

+		// TODO: Implement to support context help

+	}

+

+	/**

+	 * The NumberFormatter.parse() could return a Long or Double

+	 * We are storing all values related to the page setup as doubles

+	 * so we call this function when ever we are getting values from

+	 * the dialog.

+	 * 

+	 * @param number

+	 * @return

+	 */

+	private Double forceDouble(Number number) {

+		if(!(number instanceof Double))

+			return new Double(number.doubleValue());

+		return (Double)number;

+	}

+

+	private void updateUnits() {

+

+		int units = getUnits();

+

+		switch(units) {

+		case RulerProvider.UNIT_INCHES:

+			gridSpacing.setLabelText(GRID_SPACING_LABEL_INCHES);

+			break;

+

+		case RulerProvider.UNIT_CENTIMETERS:

+			gridSpacing.setLabelText(GRID_SPACING_LABEL_CM);

+			break;

+

+		case RulerProvider.UNIT_PIXELS:

+			gridSpacing.setLabelText(GRID_SPACING_LABEL_PIXELS);

+			break;

+		}

+

+		gridSpacing.setStringValue(UnitsConverterUtils.convertUnits(oldUnits, units, gridSpacing.getStringValue()));

+		oldUnits = units;

+

+		dblGroup.layout();

+

+	}

+

+	private int getUnits() {

+		int units = rulerUnits.getComboControl().getSelectionIndex();

+

+		// IF no selection has been made

+		if(units == -1) {

+			// Read the preference store

+			units = 1;//FIXME;

+			oldUnits = units;

+		}

+		return units;

+	}

+

+	//	private String convertUnits(int fromUnits, int toUnits) {

+	//		String valueStr = gridSpacing.getStringValue();

+	//		if(fromUnits == toUnits) {

+	//			return valueStr;

+	//		}

+	//

+	//		//Double value = Double.valueOf( valueStr );

+	//		NumberFormat numberFormatter = NumberFormat.getInstance();

+	//		Double value = new Double(0.125);

+	//		try {

+	//			value = forceDouble(numberFormatter.parse(valueStr));

+	//		} catch (ParseException e) {

+	//			// Use the default

+	//		}

+	//		double pixelValue = 0;

+	//

+	//		Display display = getDisplay();

+	//

+	//		switch(fromUnits) {

+	//		case RulerProvider.UNIT_INCHES:

+	//			pixelValue = value.doubleValue() * display.getDPI().x;

+	//			break;

+	//		case RulerProvider.UNIT_CENTIMETERS:

+	//			pixelValue = value.doubleValue() * display.getDPI().x / UnitsUtils.INCH2CM;

+	//			break;

+	//		case RulerProvider.UNIT_PIXELS:

+	//			pixelValue = value.intValue();

+	//		}

+	//

+	//		double returnValue = 0;

+	//

+	//		switch(toUnits) {

+	//		case RulerProvider.UNIT_INCHES:

+	//			returnValue = pixelValue / display.getDPI().x;

+	//			break;

+	//		case RulerProvider.UNIT_CENTIMETERS:

+	//			returnValue = pixelValue * UnitsUtils.INCH2CM / display.getDPI().x;

+	//			break;

+	//		case RulerProvider.UNIT_PIXELS:

+	//			returnValue = pixelValue;

+	//		}

+	//

+	//		return numberFormatter.format(returnValue);

+	//	}

+

+

+	/**

+	 * 

+	 * converts the current units used to a base unit value to be used (e.g. in validation)

+	 * 

+	 * @param number

+	 *        Units to be converted to the base unit

+	 * @return

+	 */

+	private double convertToBase(double number) {

+

+		double returnValue = 0;

+		switch(getUnits()) {

+		case RulerProvider.UNIT_INCHES:

+			returnValue = number;

+			break;

+		case RulerProvider.UNIT_CENTIMETERS:

+			returnValue = number / UnitsConstants.INCH2CM;

+			break;

+		case RulerProvider.UNIT_PIXELS:

+			returnValue = number / getDisplay().getDPI().x;

+		}

+		return returnValue;

+	}

+

+	private class DoubleFieldEditor extends StringFieldEditor {

+

+		private double minValidValue = 00.009;

+

+		private double maxValidValue = 99.999;

+

+		public DoubleFieldEditor(String pref, String label, Composite parent) {

+			super(pref, label, parent);

+		}

+

+		/*

+		 * (non-Javadoc)

+		 * 

+		 * @see org.eclipse.jface.preference.StringFieldEditor#doCheckState()

+		 */

+		protected boolean doCheckState() {

+			Text text = getTextControl();

+

+			if(text == null)

+				return false;

+

+			try {

+				NumberFormat numberFormatter = NumberFormat.getInstance();

+				ParsePosition parsePosition = new ParsePosition(0);

+				Number parsedNumber = numberFormatter.parse(text.getText(), parsePosition);

+

+				if(parsedNumber == null) {

+					showErrorMessage();

+					return false;

+				}

+

+				Double pageHeight = forceDouble(parsedNumber);

+				double number = pageHeight.doubleValue();

+				number = convertToBase(number);

+				if(number >= minValidValue && number <= maxValidValue && parsePosition.getIndex() == text.getText().length()) {

+					clearErrorMessage();

+					return true;

+				} else {

+					showErrorMessage();

+					return false;

+				}

+			} catch (NumberFormatException e1) {

+				showErrorMessage();

+			}

+

+			return false;

+		}

+

+		/*

+		 * (non-Javadoc)

+		 * 

+		 * @see org.eclipse.jface.preference.StringFieldEditor#doLoadDefault()

+		 */

+		protected void doLoadDefault() {

+			Text text = getTextControl();

+			if(text != null) {

+				double value = getPreferenceStore().getDefaultDouble(getPreferenceName());

+				NumberFormat numberFormatter = NumberFormat.getNumberInstance();

+				text.setText(numberFormatter.format(value));

+			}

+			valueChanged();

+		}

+

+		/*

+		 * (non-Javadoc)

+		 * Method declared on FieldEditor.

+		 */

+		protected void doLoad() {

+			Text text = getTextControl();

+			if(text != null) {

+				double value = getPreferenceStore().getDouble(getPreferenceName());

+				NumberFormat numberFormatter = NumberFormat.getNumberInstance();

+				text.setText(numberFormatter.format(value));

+			}

+		}

+

+		protected void doStore() {

+			NumberFormat numberFormatter = NumberFormat.getInstance();

+			Double gridWidth;

+			try {

+				gridWidth = forceDouble(numberFormatter.parse(getTextControl().getText()));

+				getPreferenceStore().setValue(getPreferenceName(), gridWidth.doubleValue());

+			} catch (ParseException e) {

+				showErrorMessage();

+			}

+

+		}

+	}

+

+}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramBackgroundColor.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramBackgroundColor.java
index b1d211866b6..b4ebd32d316 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramBackgroundColor.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramBackgroundColor.java
@@ -14,8 +14,8 @@
 package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.diagram;

 

 import org.eclipse.jface.dialogs.DialogPage;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.BackgroundColor;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.widgets.Composite;

 

 /**

@@ -38,6 +38,6 @@ public class DiagramBackgroundColor extends BackgroundColor {
 	}

 

 	protected String getPreferenceConstant(int preferenceType) {

-		return PreferenceConstantHelper.getDiagramConstant(getKey(), preferenceType);

+		return PreferencesConstantsHelper.getDiagramConstant(getKey(), preferenceType);

 	}

 }

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramConnectionGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramConnectionGroup.java
index 63ecd518ceb..adeea8d27b4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramConnectionGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramConnectionGroup.java
@@ -14,8 +14,8 @@
 package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.diagram;

 

 import org.eclipse.jface.dialogs.DialogPage;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.ConnectionGroup;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.widgets.Composite;

 

 /**

@@ -39,6 +39,6 @@ public class DiagramConnectionGroup extends ConnectionGroup {
 	}

 

 	protected String getPreferenceConstant(int preferenceType) {

-		return PreferenceConstantHelper.getDiagramConstant(getKey(), preferenceType);

+		return PreferencesConstantsHelper.getDiagramConstant(getKey(), preferenceType);

 	}

 }

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramDecorationGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramDecorationGroup.java
index d936311bdeb..ddf17812025 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramDecorationGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramDecorationGroup.java
@@ -15,10 +15,9 @@ package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.diagram;
 

 import org.eclipse.jface.dialogs.DialogPage;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.DecorationGroup;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.swt.widgets.Composite;

 

-// TODO: Auto-generated Javadoc

 /**

  * The Class DiagramDecorationGroupthat specialize Decoration group for the diagram level

  */

@@ -44,6 +43,6 @@ public class DiagramDecorationGroup extends DecorationGroup {
 	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)

 	 */

 	protected String getPreferenceConstant(int preferenceType) {

-		return PreferenceConstantHelper.getDiagramConstant(getKey(), preferenceType);

+		return PreferencesConstantsHelper.getDiagramConstant(getKey(), preferenceType);

 	}

 }

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramDimensionGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramDimensionGroup.java
index de502c5285a..dfe967e49b2 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramDimensionGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramDimensionGroup.java
@@ -14,8 +14,8 @@
 package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.diagram;

 

 import org.eclipse.jface.dialogs.DialogPage;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.DimensionGroup;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.widgets.Composite;

 

 /**

@@ -43,6 +43,6 @@ public class DiagramDimensionGroup extends DimensionGroup {
 	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)

 	 */

 	protected String getPreferenceConstant(int preferenceType) {

-		return PreferenceConstantHelper.getDiagramConstant(getKey(), preferenceType);

+		return PreferencesConstantsHelper.getDiagramConstant(getKey(), preferenceType);

 	}

 }

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramFontGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramFontGroup.java
index c1da2dadbd7..6958bcf7f6e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramFontGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramFontGroup.java
@@ -14,8 +14,8 @@
 package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.diagram;

 

 import org.eclipse.jface.dialogs.DialogPage;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.FontGroup;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.widgets.Composite;

 

 /**

@@ -43,6 +43,6 @@ public class DiagramFontGroup extends FontGroup {
 	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)

 	 */

 	protected String getPreferenceConstant(int preferenceType) {

-		return PreferenceConstantHelper.getDiagramConstant(getKey(), preferenceType);

+		return PreferencesConstantsHelper.getDiagramConstant(getKey(), preferenceType);

 	}

 }

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramLinkColorGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramLinkColorGroup.java
index aa8cc6fd78b..c9f0adadc4f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramLinkColorGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramLinkColorGroup.java
@@ -14,8 +14,8 @@
 package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.diagram;

 

 import org.eclipse.jface.dialogs.DialogPage;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.LinkColorGroup;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.widgets.Composite;

 

 /**

@@ -43,6 +43,6 @@ public class DiagramLinkColorGroup extends LinkColorGroup {
 	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)

 	 */

 	protected String getPreferenceConstant(int preferenceType) {

-		return PreferenceConstantHelper.getDiagramConstant(getKey(), preferenceType);

+		return PreferencesConstantsHelper.getDiagramConstant(getKey(), preferenceType);

 	}

 }

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramNodeColorGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramNodeColorGroup.java
index f4440e4786d..5cd417b0f30 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramNodeColorGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramNodeColorGroup.java
@@ -14,8 +14,8 @@
 package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.diagram;

 

 import org.eclipse.jface.dialogs.DialogPage;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.NodeColorGroup;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.widgets.Composite;

 

 /**

@@ -43,6 +43,6 @@ public class DiagramNodeColorGroup extends NodeColorGroup {
 	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)

 	 */

 	protected String getPreferenceConstant(int preferenceType) {

-		return PreferenceConstantHelper.getDiagramConstant(getKey(), preferenceType);

+		return PreferencesConstantsHelper.getDiagramConstant(getKey(), preferenceType);

 	}

 }

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramRulersAndGridGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramRulersAndGridGroup.java
new file mode 100644
index 00000000000..b4c5a83b9f5
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/diagram/DiagramRulersAndGridGroup.java
@@ -0,0 +1,51 @@
+/*****************************************************************************

+ * 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:

+ *		

+ *		CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.diagram;

+

+import org.eclipse.jface.dialogs.DialogPage;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.RulersAndGridGroup;

+import org.eclipse.swt.widgets.Composite;

+

+/**

+ * 

+ * @author vl222926

+ * 

+ */

+public class DiagramRulersAndGridGroup extends RulersAndGridGroup {

+

+	/**

+	 * 

+	 * Constructor.

+	 * 

+	 * @param parent

+	 * @param key

+	 * @param dialogPage

+	 */

+	public DiagramRulersAndGridGroup(Composite parent, String key, DialogPage dialogPage) {

+		super(parent, key, dialogPage);

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.RulersAndGridGroup#getPreferenceConstant(int)

+	 * 

+	 * @param preferenceType

+	 * @return

+	 */

+	protected String getPreferenceConstant(int preferenceType) {

+		return PreferencesConstantsHelper.getDiagramConstant(getKey(), preferenceType);

+	}

+

+}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/dialog/AbstractPreferenceKeyDialog.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/dialog/AbstractPreferenceKeyDialog.java
deleted file mode 100644
index 1aa79b9fd94..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/dialog/AbstractPreferenceKeyDialog.java
+++ /dev/null
@@ -1,220 +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.infra.gmfdiag.preferences.ui.dialog;

-

-import java.util.ArrayList;

-

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.jface.viewers.IStructuredContentProvider;

-import org.eclipse.jface.viewers.ITableColorProvider;

-import org.eclipse.jface.viewers.ITableLabelProvider;

-import org.eclipse.jface.viewers.LabelProvider;

-import org.eclipse.jface.viewers.TableViewer;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.Activator;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.graphics.Color;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Control;

-import org.eclipse.swt.widgets.Shell;

-import org.eclipse.swt.widgets.Table;

-import org.eclipse.swt.widgets.TableColumn;

-

-/**

- * The Class AbstractPreferenceKeyDialog display all preference key that are given in parameters

- */

-public class AbstractPreferenceKeyDialog extends org.eclipse.jface.dialogs.StatusDialog {

-

-	/** The key table. */

-	protected Table keyTable;

-

-	/** The table viewer. */

-	protected TableViewer tableViewer;

-

-	/** The keys. */

-	protected String[] keys;

-

-	/**

-	 * Instantiates a new abstract preference key dialog.

-	 * 

-	 * @param keys

-	 *        the array of preference jy to display

-	 */

-	public AbstractPreferenceKeyDialog(String[] keys) {

-		super(new Shell());

-		this.keys = keys;

-		setStatusLineAboveButtons(true);

-		updateStatus(new Status(IStatus.INFO, Activator.PLUGIN_ID, "Would you like to overload those preferences?"));

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * 

-	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)

-	 */

-	@Override

-	protected Control createDialogArea(Composite parent) {

-		Composite composite = (Composite)super.createDialogArea(parent);

-		keyTable = new Table(composite, SWT.CHECK | SWT.BORDER);

-		tableViewer = new TableViewer(keyTable);

-		tableViewer.setLabelProvider(new KeyLabelProvider());

-		tableViewer.setContentProvider(new KeyContentProvider());

-

-		TableColumn column = new TableColumn(keyTable, SWT.NONE);

-		column.setWidth(150);

-		column.setText("Pref. kind ");

-

-		column = new TableColumn(keyTable, SWT.NONE);

-		column.setWidth(90);

-		column.setText("Level");

-

-		column = new TableColumn(keyTable, SWT.NONE);

-		column.setWidth(200);

-		column.setText("Localization");

-		tableViewer.setInput(keys);

-		keyTable.setHeaderVisible(true);

-

-

-		return composite;

-

-	}

-

-	/**

-	 * The Class KeyLabelProvider.

-	 */

-	protected class KeyLabelProvider extends LabelProvider implements ITableLabelProvider, ITableColorProvider {

-

-

-		/*

-		 * (non-Javadoc)

-		 * 

-		 * @see org.eclipse.jface.viewers.ITableColorProvider#getForeground(java.lang.Object, int)

-		 */

-		public Color getForeground(Object element, int columnIndex) {

-			// TODO Auto-generated method stub

-			return null;

-		}

-

-		/*

-		 * (non-Javadoc)

-		 * 

-		 * @see org.eclipse.jface.viewers.ITableColorProvider#getBackground(java.lang.Object, int)

-		 */

-		public Color getBackground(Object element, int columnIndex) {

-			// TODO Auto-generated method stub

-			return null;

-		}

-

-		/*

-		 * (non-Javadoc)

-		 * 

-		 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)

-		 */

-		public Image getColumnImage(Object element, int columnIndex) {

-			if(columnIndex == 0) {

-				if(element.toString().startsWith(PreferenceConstantHelper.DIAGRAM_ELEMENT)) {

-					return Activator.getPluginIconImage(Activator.PLUGIN_ID, "/icons/pref.gif");

-				}

-				if(element.toString().startsWith(PreferenceConstantHelper.DIAGRAM_PREFERENCE_PREFIX)) {

-					return Activator.getPluginIconImage(Activator.PLUGIN_ID, "/icons/diag.gif");

-				}

-			}

-			return null;

-		}

-

-		/*

-		 * (non-Javadoc)

-		 * 

-		 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)

-		 */

-		public String getColumnText(Object element, int columnIndex) {

-			String initialKey = element.toString();

-			String out = initialKey.toString();

-			if(columnIndex == 0) {

-				out = out.substring(out.indexOf(".") + 1, out.length()).toUpperCase();

-			}

-			if(columnIndex == 1) {

-				if(element.toString().startsWith(PreferenceConstantHelper.DIAGRAM_ELEMENT)) {

-					return "ELEMENT";

-				}

-				if(element.toString().startsWith(PreferenceConstantHelper.DIAGRAM_PREFERENCE_PREFIX)) {

-					return "DIAGRAM";

-				}

-			}

-			if(columnIndex == 2) {

-				if(initialKey.startsWith(PreferenceConstantHelper.DIAGRAM_ELEMENT)) {

-					out = initialKey.toString().replaceAll(PreferenceConstantHelper.DIAGRAM_ELEMENT, "");

-					// Reorganize display

-					if(out.indexOf(".") > 0) {

-						String beforePoint = out.substring(0, out.indexOf("."));

-						if(beforePoint.lastIndexOf("_") > 0) {

-							out = out.substring(beforePoint.lastIndexOf("_") + 1, out.indexOf(".")) + " (" + beforePoint.substring(0, beforePoint.lastIndexOf("_")) + ")";

-						}

-					}

-				}

-				if(initialKey.startsWith(PreferenceConstantHelper.DIAGRAM_PREFERENCE_PREFIX)) {

-					out = initialKey.toString().replaceAll(PreferenceConstantHelper.DIAGRAM_PREFERENCE_PREFIX, "");

-					out = out.substring(0, out.indexOf("."));

-				}

-			}

-			return out;

-		}

-	}

-

-

-	/**

-	 * The Class KeyContentProvider.

-	 */

-	protected class KeyContentProvider implements IStructuredContentProvider {

-

-		/*

-		 * (non-Javadoc)

-		 * 

-		 * @see org.eclipse.jface.viewers.IContentProvider#dispose()

-		 */

-		public void dispose() {

-		}

-

-		/*

-		 * (non-Javadoc)

-		 * 

-		 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)

-		 */

-		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

-		}

-

-		/*

-		 * (non-Javadoc)

-		 * 

-		 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)

-		 */

-		public Object[] getElements(Object inputElement) {

-			ArrayList<String> result = new ArrayList<String>();

-			for(int i = 0; i < keys.length; i++) {

-				if(keys[i].startsWith(PreferenceConstantHelper.DIAGRAM_PREFERENCE_PREFIX)) {

-					result.add(keys[i]);

-				}

-				if(keys[i].startsWith(PreferenceConstantHelper.DIAGRAM_ELEMENT)) {

-					result.add(keys[i]);

-				}

-			}

-			return result.toArray();

-		}

-

-	}

-

-}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/dialog/ApplyValueOnPreferenceKeyDialog.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/dialog/ApplyValueOnPreferenceKeyDialog.java
index 8587f0f91e5..aadcc60934b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/dialog/ApplyValueOnPreferenceKeyDialog.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/dialog/ApplyValueOnPreferenceKeyDialog.java
@@ -15,61 +15,169 @@ package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.dialog;
 

 import java.util.ArrayList;

 

+import org.eclipse.jface.viewers.IBaseLabelProvider;

+import org.eclipse.jface.viewers.IContentProvider;

+import org.eclipse.jface.viewers.IStructuredContentProvider;

+import org.eclipse.jface.viewers.ITableColorProvider;

+import org.eclipse.jface.viewers.ITableLabelProvider;

+import org.eclipse.jface.viewers.LabelProvider;

+import org.eclipse.jface.viewers.Viewer;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.Activator;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.messages.Messages;

+import org.eclipse.papyrus.infra.tools.preferences.ui.dialog.AbstractApplyValueOnPreferenceKeyDialog;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.Image;

+

 /**

  * The Class ApplyValueOnPreferenceKeyDialog display all the preference key and give all selected keys

  */

-public class ApplyValueOnPreferenceKeyDialog extends AbstractPreferenceKeyDialog {

-

-	/** The checked key. */

-	protected ArrayList<String> checkedKey;

+public class ApplyValueOnPreferenceKeyDialog extends AbstractApplyValueOnPreferenceKeyDialog {

 

-	/**

-	 * Instantiates a new apply value on preference key dialog.

-	 * 

-	 * @param keys

-	 *        the keys

-	 */

 	public ApplyValueOnPreferenceKeyDialog(String[] keys) {

 		super(keys);

-		checkedKey = new ArrayList<String>();

-		// TODO Auto-generated constructor stub

 	}

 

 	/**

-	 * Gets the key to remove.

-	 * 

-	 * @return the key to remove

+	 *

 	 */

-	public ArrayList<String> getKeyToRemove() {

-		return checkedKey;

+	@Override

+	protected IBaseLabelProvider createLabelProvider() {

+		return new KeyLabelProvider();

 	}

 

-	/*

-	 * (non-Javadoc)

+	/**

+	 * 

+	 * @see org.eclipse.papyrus.infra.tools.preferences.ui.dialog.AbstractPreferenceKeyDialog#createContentProvider()

 	 * 

-	 * @see org.eclipse.jface.dialogs.Dialog#okPressed()

+	 * @return

 	 */

 	@Override

-	protected void okPressed() {

+	protected IContentProvider createContentProvider() {

+		return new KeyContentProvider();

+	}

+

+	/**

+	 * The Class KeyLabelProvider.

+	 */

+	protected static class KeyLabelProvider extends LabelProvider implements ITableLabelProvider, ITableColorProvider {

 

 

+		/*

+		 * (non-Javadoc)

+		 * 

+		 * @see org.eclipse.jface.viewers.ITableColorProvider#getForeground(java.lang.Object, int)

+		 */

+		public Color getForeground(Object element, int columnIndex) {

+			//nothing to do

+			return null;

+		}

+

+		/*

+		 * (non-Javadoc)

+		 * 

+		 * @see org.eclipse.jface.viewers.ITableColorProvider#getBackground(java.lang.Object, int)

+		 */

+		public Color getBackground(Object element, int columnIndex) {

+			//nothing to do

+			return null;

+		}

 

-		for(int i = 0; i < keyTable.getItems().length; i++) {

-			if(keyTable.getItems()[i].getChecked()) {

-				checkedKey.add((String)keyTable.getItems()[i].getData());

+		/*

+		 * (non-Javadoc)

+		 * 

+		 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)

+		 */

+		public Image getColumnImage(Object element, int columnIndex) {

+			if(columnIndex == 0) {

+				if(element.toString().startsWith(PreferencesConstantsHelper.DIAGRAM_ELEMENT)) {

+					return Activator.getPluginIconImage(Activator.PLUGIN_ID, "/icons/pref.gif"); //$NON-NLS-1$

+				}

+				if(element.toString().startsWith(PreferencesConstantsHelper.DIAGRAM_PREFERENCE_PREFIX)) {

+					return Activator.getPluginIconImage(Activator.PLUGIN_ID, "/icons/diag.gif"); //$NON-NLS-1$

+				}

 			}

+			return null;

+		}

+

+		/*

+		 * (non-Javadoc)

+		 * 

+		 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)

+		 */

+		public String getColumnText(Object element, int columnIndex) {

+			String initialKey = element.toString();

+			String out = initialKey.toString();

+			if(columnIndex == 0) {

+				out = out.substring(out.indexOf(".") + 1, out.length()).toUpperCase(); //$NON-NLS-1$

+			}

+			if(columnIndex == 1) {

+				if(element.toString().startsWith(PreferencesConstantsHelper.DIAGRAM_ELEMENT)) {

+					return Messages.ApplyValueOnPreferenceKeyDialog_ELEMENT;

+				}

+				if(element.toString().startsWith(PreferencesConstantsHelper.DIAGRAM_PREFERENCE_PREFIX)) {

+					return Messages.ApplyValueOnPreferenceKeyDialog_DIAGRAM;

+				}

+			}

+			if(columnIndex == 2) {

+				if(initialKey.startsWith(PreferencesConstantsHelper.DIAGRAM_ELEMENT)) {

+					out = initialKey.toString().replaceAll(PreferencesConstantsHelper.DIAGRAM_ELEMENT, ""); //$NON-NLS-1$

+					// Reorganize display

+					if(out.indexOf(".") > 0) { //$NON-NLS-1$

+						String beforePoint = out.substring(0, out.indexOf(".")); //$NON-NLS-1$

+						if(beforePoint.lastIndexOf("_") > 0) { //$NON-NLS-1$

+							out = out.substring(beforePoint.lastIndexOf("_") + 1, out.indexOf(".")) + " (" + beforePoint.substring(0, beforePoint.lastIndexOf("_")) + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$

+						}

+					}

+				}

+				if(initialKey.startsWith(PreferencesConstantsHelper.DIAGRAM_PREFERENCE_PREFIX)) {

+					out = initialKey.toString().replaceAll(PreferencesConstantsHelper.DIAGRAM_PREFERENCE_PREFIX, ""); //$NON-NLS-1$

+					out = out.substring(0, out.indexOf(".")); //$NON-NLS-1$

+				}

+			}

+			return out;

 		}

-		super.okPressed();

 	}

 

-	/*

-	 * (non-Javadoc)

-	 * 

-	 * @see org.eclipse.jface.dialogs.Dialog#cancelPressed()

+

+	/**

+	 * The Class KeyContentProvider.

 	 */

-	@Override

-	protected void cancelPressed() {

-		super.cancelPressed();

-		checkedKey = new ArrayList<String>();

+	protected class KeyContentProvider implements IStructuredContentProvider {

+

+		/*

+		 * (non-Javadoc)

+		 * 

+		 * @see org.eclipse.jface.viewers.IContentProvider#dispose()

+		 */

+		public void dispose() {

+		}

+

+		/*

+		 * (non-Javadoc)

+		 * 

+		 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)

+		 */

+		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

+		}

+

+		/*

+		 * (non-Javadoc)

+		 * 

+		 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)

+		 */

+		public Object[] getElements(Object inputElement) {

+			ArrayList<String> result = new ArrayList<String>();

+			for(int i = 0; i < keys.length; i++) {

+				if(keys[i].startsWith(PreferencesConstantsHelper.DIAGRAM_PREFERENCE_PREFIX)) {

+					result.add(keys[i]);

+				}

+				if(keys[i].startsWith(PreferencesConstantsHelper.DIAGRAM_ELEMENT)) {

+					result.add(keys[i]);

+				}

+			}

+			return result.toArray();

+		}

+

 	}

 }

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorBackgroundColor.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorBackgroundColor.java
index 92ad3b765c5..013ef1d6970 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorBackgroundColor.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorBackgroundColor.java
@@ -14,8 +14,8 @@
 package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor;

 

 import org.eclipse.jface.dialogs.DialogPage;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.BackgroundColor;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.widgets.Composite;

 

 /**

@@ -43,6 +43,6 @@ public class EditorBackgroundColor extends BackgroundColor {
 	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)

 	 */

 	protected String getPreferenceConstant(int preferenceType) {

-		return PreferenceConstantHelper.getPapyrusEditorConstant(preferenceType);

+		return PreferencesConstantsHelper.getPapyrusEditorConstant(preferenceType);

 	}

 }

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorConnectionGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorConnectionGroup.java
index efbeed08d6b..a52aab81add 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorConnectionGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorConnectionGroup.java
@@ -14,8 +14,8 @@
 package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor;

 

 import org.eclipse.jface.dialogs.DialogPage;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.ConnectionGroup;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.widgets.Composite;

 

 /**

@@ -43,6 +43,6 @@ public class EditorConnectionGroup extends ConnectionGroup {
 	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)

 	 */

 	protected String getPreferenceConstant(int preferenceType) {

-		return PreferenceConstantHelper.getPapyrusEditorConstant(preferenceType);

+		return PreferencesConstantsHelper.getPapyrusEditorConstant(preferenceType);

 	}

 }

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorDecorationGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorDecorationGroup.java
index 1a2dc982b0a..e789b80b478 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorDecorationGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorDecorationGroup.java
@@ -14,8 +14,8 @@
 package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor;

 

 import org.eclipse.jface.dialogs.DialogPage;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.DecorationGroup;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.widgets.Composite;

 

 /**

@@ -43,6 +43,6 @@ public class EditorDecorationGroup extends DecorationGroup {
 	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)

 	 */

 	protected String getPreferenceConstant(int preferenceType) {

-		return PreferenceConstantHelper.getPapyrusEditorConstant(preferenceType);

+		return PreferencesConstantsHelper.getPapyrusEditorConstant(preferenceType);

 	}

 }

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorDimensionGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorDimensionGroup.java
index f8f2cf92ce7..962d5c9539c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorDimensionGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorDimensionGroup.java
@@ -14,8 +14,8 @@
 package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor;

 

 import org.eclipse.jface.dialogs.DialogPage;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.DimensionGroup;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.widgets.Composite;

 

 /**

@@ -43,6 +43,6 @@ public class EditorDimensionGroup extends DimensionGroup {
 	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)

 	 */

 	protected String getPreferenceConstant(int preferenceType) {

-		return PreferenceConstantHelper.getPapyrusEditorConstant(preferenceType);

+		return PreferencesConstantsHelper.getPapyrusEditorConstant(preferenceType);

 	}

 }

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorFontGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorFontGroup.java
index 5fb9adf3920..87fd235e3ca 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorFontGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorFontGroup.java
@@ -14,8 +14,8 @@
 package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor;

 

 import org.eclipse.jface.dialogs.DialogPage;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.FontGroup;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.widgets.Composite;

 

 /**

@@ -43,6 +43,6 @@ public class EditorFontGroup extends FontGroup {
 	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)

 	 */

 	protected String getPreferenceConstant(int preferenceType) {

-		return PreferenceConstantHelper.getPapyrusEditorConstant(preferenceType);

+		return PreferencesConstantsHelper.getPapyrusEditorConstant(preferenceType);

 	}

 }

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorLinkColorGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorLinkColorGroup.java
index 3066fde767a..5d9e42b413d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorLinkColorGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorLinkColorGroup.java
@@ -14,8 +14,8 @@
 package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor;

 

 import org.eclipse.jface.dialogs.DialogPage;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.LinkColorGroup;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.widgets.Composite;

 

 /**

@@ -43,6 +43,6 @@ public class EditorLinkColorGroup extends LinkColorGroup {
 	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)

 	 */

 	protected String getPreferenceConstant(int preferenceType) {

-		return PreferenceConstantHelper.getPapyrusEditorConstant(preferenceType);

+		return PreferencesConstantsHelper.getPapyrusEditorConstant(preferenceType);

 	}

 }

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorNodeColorGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorNodeColorGroup.java
index c5b51a67abd..0e6326a96fc 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorNodeColorGroup.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorNodeColorGroup.java
@@ -14,8 +14,8 @@
 package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor;

 

 import org.eclipse.jface.dialogs.DialogPage;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.NodeColorGroup;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.swt.widgets.Composite;

 

 /**

@@ -43,6 +43,6 @@ public class EditorNodeColorGroup extends NodeColorGroup {
 	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)

 	 */

 	protected String getPreferenceConstant(int preferenceType) {

-		return PreferenceConstantHelper.getPapyrusEditorConstant(preferenceType);

+		return PreferencesConstantsHelper.getPapyrusEditorConstant(preferenceType);

 	}

 }

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorRulersAndGridGroup.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorRulersAndGridGroup.java
new file mode 100644
index 00000000000..35f0d469373
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/ui/editor/EditorRulersAndGridGroup.java
@@ -0,0 +1,49 @@
+/*****************************************************************************

+ * 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:

+ *		

+ *		CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+

+package org.eclipse.papyrus.infra.gmfdiag.preferences.ui.editor;

+

+import org.eclipse.jface.dialogs.DialogPage;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.RulersAndGridGroup;

+import org.eclipse.swt.widgets.Composite;

+

+/**

+ * The Class EditorRulersAndGridGroup is the rulers and grid group specialized at the papyrus editor level.

+ */

+public class EditorRulersAndGridGroup extends RulersAndGridGroup {

+

+	/**

+	 * Instantiates a new editor background color.

+	 * 

+	 * @param parent

+	 *        the parent composite

+	 * @param key

+	 *        the key of the preference

+	 * @param dialogPage

+	 *        the dialog page

+	 */

+	public EditorRulersAndGridGroup(Composite parent, String key, DialogPage dialogPage) {

+		super(parent, key, dialogPage);

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.papyrus.infra.gmfdiag.preferences.ui.AbstractGroup#getPreferenceConstant(int)

+	 */

+	protected String getPreferenceConstant(int preferenceType) {

+		return PreferencesConstantsHelper.getPapyrusEditorConstant(preferenceType);
+	}

+}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF
index 8c556d1fc6f..d922ee2a532 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF
@@ -18,8 +18,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.core;bundle-version="1.0.0",

  org.eclipse.papyrus.uml.tools;bundle-version="1.0.0",

- org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.2.0",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0"

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.0"

 Export-Package: org.eclipse.papyrus.infra.gmfdiag.properties.extension,

  org.eclipse.papyrus.infra.gmfdiag.properties.modelelement

 Bundle-Vendor: %Bundle-Vendor

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi
index 7c44093d06f..2f94e101562 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi
@@ -1,12 +1,43 @@
 <?xml version="1.0" encoding="ASCII"?>

-<environment:Environment xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:environment="http://www.eclipse.org/papyrus/properties/environment/0.9">

-  <constraintTypes label="GMF Appearance Constraint" constraintClass="org.eclipse.papyrus.infra.gmfdiag.properties.constraint.AppearanceConstraint"/>

-  <constraintTypes label="HasEditPolicy" constraintClass="org.eclipse.papyrus.infra.gmfdiag.properties.constraint.HasEditPolicy"/>

-  <constraintTypes label="isGMFEditPart" constraintClass="org.eclipse.papyrus.infra.gmfdiag.properties.constraint.IsEditPartConstraint"/>

-  <constraintTypes label="GMF Notation Constraint" constraintClass="org.eclipse.papyrus.infra.gmfdiag.properties.constraint.GMFNotationConstraint"/>

-  <constraintTypes label="isDecorableElementConstraint" constraintClass="org.eclipse.papyrus.infra.gmfdiag.properties.constraint.IsDecorableElementConstraint"/>

-  <modelElementFactories name="GMF Appearance Factory" factoryClass="org.eclipse.papyrus.infra.gmfdiag.properties.modelelement.AppearanceModelElementFactory"/>

-  <modelElementFactories name="GMF Custom Style" factoryClass="org.eclipse.papyrus.infra.gmfdiag.properties.modelelement.CustomStyleModelElementFactory"/>

-  <modelElementFactories name="GMF Notation Factory" factoryClass="org.eclipse.papyrus.infra.gmfdiag.properties.modelelement.NotationModelElementFactory"/>

-  <modelElementFactories name="Decorated Element Factory" factoryClass="org.eclipse.papyrus.infra.gmfdiag.properties.modelelement.DecoratedModelElementFactory"/>

+<environment:Environment

+    xmi:version="2.0"

+    xmlns:xmi="http://www.omg.org/XMI"

+    xmlns:environment="http://www.eclipse.org/papyrus/properties/environment/0.9">

+  <constraintTypes

+      label="GMF Appearance Constraint"

+      constraintClass="org.eclipse.papyrus.infra.gmfdiag.properties.constraint.AppearanceConstraint"/>

+  <constraintTypes

+      label="HasEditPolicy"

+      constraintClass="org.eclipse.papyrus.infra.gmfdiag.properties.constraint.HasEditPolicy"/>

+  <constraintTypes

+      label="isGMFEditPart"

+      constraintClass="org.eclipse.papyrus.infra.gmfdiag.properties.constraint.IsEditPartConstraint"/>

+  <constraintTypes

+      label="GMF Notation Constraint"

+      constraintClass="org.eclipse.papyrus.infra.gmfdiag.properties.constraint.GMFNotationConstraint"/>

+  <constraintTypes

+      label="isDecorableElementConstraint"

+      constraintClass="org.eclipse.papyrus.infra.gmfdiag.properties.constraint.IsDecorableElementConstraint"/>

+  <modelElementFactories

+      name="GMF Appearance Factory"

+      factoryClass="org.eclipse.papyrus.infra.gmfdiag.properties.modelelement.AppearanceModelElementFactory"/>

+  <modelElementFactories

+      name="GMF Custom Style"

+      factoryClass="org.eclipse.papyrus.infra.gmfdiag.properties.modelelement.CustomStyleModelElementFactory"/>

+  <modelElementFactories

+      name="GMF Notation Factory"

+      factoryClass="org.eclipse.papyrus.infra.gmfdiag.properties.modelelement.NotationModelElementFactory"/>

+  <modelElementFactories

+      name="Decorated Element Factory"

+      factoryClass="org.eclipse.papyrus.infra.gmfdiag.properties.modelelement.DecoratedModelElementFactory"/>

+  <modelElementFactories

+      name="Rulers And Grid Element Factory"

+      factoryClass="org.eclipse.papyrus.infra.gmfdiag.properties.modelelement.RulersAndGridModelElementFactory"/>

+  <widgetTypes

+      label="DiagramPreferencesDefaultButton"

+      widgetClass="DiagramPreferencesDefaultButton"

+      namespace="//@namespaces.0"/>

+  <namespaces

+      name="ppeg"

+      value="org.eclipse.papyrus.infra.gmfdiag.properties.widget"/>

 </environment:Environment>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/notation.ctx b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/notation.ctx
index 244e96c83c8..530b8df9e75 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/notation.ctx
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/notation.ctx
@@ -179,6 +179,11 @@
       <widget href="ui/SingleDecorableElement.xwt#/"/>

     </sections>

   </tabs>

+  <tabs label="Rulers And Grid" id="rulersAndGrid" category="org.eclipse.papyrus" afterTab="//@tabs.0" priority="75">

+    <sections name="Single RulersAndGrid" sectionFile="ui/SingleRulersAndGrid.xwt">

+      <widget href="ui/SingleRulersAndGrid.xwt#/"/>

+    </sections>

+  </tabs>

   <views name="Single Diagram" sections="//@tabs.0/@sections.12" automaticContext="true" datacontexts="//@dataContexts.0/@elements.12">

     <constraints xsi:type="constraints:SimpleConstraint" name="isSingleDiagram">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

@@ -387,6 +392,12 @@
       <properties xsi:type="constraints:ValueProperty" name="nsUri" value="http://www.eclipse.org/gmf/runtime/1.0.2/notation"/>

     </constraints>

   </views>

+  <views name="Single RulersAndGrid" sections="//@tabs.1/@sections.0" datacontexts="//@dataContexts.2">

+    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleDiagramEditorConstraint" overrideable="false">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.4"/>

+      <properties xsi:type="constraints:ValueProperty" name="className" value="org.eclipse.papyrus.infra.gmfdiag.properties.constraint.IsSingleDiagramEditorConstraint"/>

+    </constraints>

+  </views>

   <views elementMultiplicity="-1" name="Multiple Edge" sections="//@tabs.0/@sections.29" automaticContext="true" datacontexts="//@dataContexts.0/@elements.0">

     <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleEdge">

       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.3"/>

@@ -674,9 +685,25 @@
   </dataContexts>

   <dataContexts name="decoratedElement" label="decoratedElement">

     <elements name="ShapeDecorableElement">

-      <properties name="shape_visibility" label="" type="Boolean" description="Boolean that indicates if the decorations should be visible or not"/>

-      <properties name="shape_direction" type="Reference" description="Direction where the decorations should be placed."/>

+      <properties name="shapeVisibility" label="" type="Boolean" description="Boolean that indicates if the decorations should be visible or not"/>

+      <properties name="shapeDirection" type="Reference" description="Direction where the decorations should be placed."/>

     </elements>

     <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@modelElementFactories.3"/>

   </dataContexts>

+  <dataContexts name="rulersAndGrid" label="rulersAndGrid">

+    <elements name="grid">

+      <properties name="grid.isDisplayingGrid" label="Show Grid" type="Boolean" description=""/>

+      <properties name="grid.isInFront" label="Grid In Front" type="Boolean" description=""/>

+      <properties name="grid.color" label="Color"/>

+      <properties name="grid.style" label="Style" type="Enumeration"/>

+      <properties name="grid.spacing" label="Grid Spacing"/>

+      <properties name="grid.isSnapToGrid" label="Snap To Grid"/>

+      <properties name="grid.isSnapToShapes" label="Snap To Shapes"/>

+    </elements>

+    <elements name="rulers">

+      <properties name="rulers.isDisplayingRulers" label="Show Ruler" type="Boolean"/>

+      <properties name="rulers.units" label="Ruler Units"/>

+    </elements>

+    <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@modelElementFactories.4"/>

+  </dataContexts>

 </contexts:Context>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleDecorableElement.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleDecorableElement.xwt
index bd207f160d5..179acb0555c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleDecorableElement.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleDecorableElement.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

 	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt">

+	xmlns:j="clr-namespace:java.lang">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

@@ -11,10 +11,10 @@
 			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

 		</Group.layout>

 		<ppe:BooleanRadio input="{Binding}"

-			property="decoratedElement:ShapeDecorableElement:shape_visibility"

+			property="decoratedElement:ShapeDecorableElement:shapeVisibility"

 			customLabel="Visible"></ppe:BooleanRadio>

 		<ppe:ReferenceCombo input="{Binding}"

-			property="decoratedElement:ShapeDecorableElement:shape_direction"

+			property="decoratedElement:ShapeDecorableElement:shapeDirection"

 			customLabel="Position"></ppe:ReferenceCombo>

 	</Group>

 </Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleLocation.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleLocation.xwt
index 89517d2ad16..d69369c20ec 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleLocation.xwt
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleLocation.xwt
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite

+<Composite xmlns="http://www.eclipse.org/xwt/presentation"

 	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns="http://www.eclipse.org/xwt/presentation">

+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleRulersAndGrid.xwt b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleRulersAndGrid.xwt
new file mode 100644
index 00000000000..1f133dd89e9
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/model/notation/ui/SingleRulersAndGrid.xwt
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<Composite xmlns:ppeg="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.properties.widget" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns:gmf="clr-namespace:org.eclipse.papyrus.infra.gmfdiag.widgets.editors" xmlns="http://www.eclipse.org/xwt/presentation"><Composite.layout><GridLayout numColumns="1" makeColumnsEqualWidth="true"></GridLayout></Composite.layout><Composite><Composite.layout><FillLayout></FillLayout></Composite.layout><Group text="Display"><Group.layout><GridLayout makeColumnsEqualWidth="false" numColumns="2"></GridLayout></Group.layout><ppe:BooleanCheckbox input="{Binding}" property="rulersAndGrid:grid:grid.isDisplayingGrid"></ppe:BooleanCheckbox><ppe:BooleanCheckbox input="{Binding}" property="rulersAndGrid:rulers:rulers.isDisplayingRulers"></ppe:BooleanCheckbox><ppe:BooleanCheckbox input="{Binding}" property="rulersAndGrid:grid:grid.isInFront"></ppe:BooleanCheckbox></Group><Group text="Snap"><Group.layout><GridLayout numColumns="1"></GridLayout></Group.layout><ppe:BooleanCheckbox input="{Binding}" property="rulersAndGrid:grid:grid.isSnapToGrid"></ppe:BooleanCheckbox><ppe:BooleanCheckbox input="{Binding}" property="rulersAndGrid:grid:grid.isSnapToShapes"></ppe:BooleanCheckbox></Group><Group text="Measurement"><Group.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Group.layout><ppe:EnumCombo input="{Binding}" property="rulersAndGrid:rulers:rulers.units"></ppe:EnumCombo><ppe:FloatEditor input="{Binding}" property="rulersAndGrid:grid:grid.spacing"></ppe:FloatEditor></Group></Composite><Group text="Grid Line"><Group.layout><GridLayout makeColumnsEqualWidth="true" numColumns="1"></GridLayout></Group.layout><gmf:XWTAwareColorPicker input="{Binding}" property="rulersAndGrid:grid:grid.color"></gmf:XWTAwareColorPicker><ppe:EnumCombo input="{Binding}" property="rulersAndGrid:grid:grid.style"></ppe:EnumCombo></Group><ppeg:DiagramPreferencesDefaultButton input="{Binding}"></ppeg:DiagramPreferencesDefaultButton></Composite>
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/constraint/IsSingleDiagramEditorConstraint.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/constraint/IsSingleDiagramEditorConstraint.java
new file mode 100644
index 00000000000..a68337a0f75
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/constraint/IsSingleDiagramEditorConstraint.java
@@ -0,0 +1,42 @@
+/*****************************************************************************

+ * 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:

+ *		

+ *		CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.gmfdiag.properties.constraint;

+

+import org.eclipse.gef.EditPart;

+import org.eclipse.papyrus.infra.constraints.constraints.JavaQuery;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil;

+

+/**

+ * 

+ * A constraint to know if we are able to get a diagram editor from the selection

+ * 

+ */

+public class IsSingleDiagramEditorConstraint implements JavaQuery {

+

+

+	/**

+	 * 

+	 * @see org.eclipse.papyrus.infra.constraints.constraints.JavaQuery#match(java.lang.Object)

+	 * 

+	 * @param selection

+	 * @return

+	 */

+	public boolean match(Object selection) {

+		if(selection instanceof EditPart) {

+			return DiagramEditPartsUtil.getDiagramWorkspacePreferenceStore((EditPart)selection) != null;

+		}

+		return false;

+	}

+

+}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/AbstractDiagramPreferencesObservableValue.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/AbstractDiagramPreferencesObservableValue.java
new file mode 100644
index 00000000000..95ce8f2d3e8
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/AbstractDiagramPreferencesObservableValue.java
@@ -0,0 +1,103 @@
+/*****************************************************************************

+ * 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:

+ *		

+ *		CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.gmfdiag.properties.databinding;

+

+import org.eclipse.core.databinding.observable.value.AbstractObservableValue;

+import org.eclipse.core.databinding.observable.value.ValueDiff;

+import org.eclipse.gmf.runtime.notation.Diagram;

+import org.eclipse.jface.preference.IPreferenceStore;

+import org.eclipse.jface.util.IPropertyChangeListener;

+import org.eclipse.jface.util.PropertyChangeEvent;

+

+/**

+ * 

+ * This observable value listen the preference store to send event and refresh itself when a preferences has changed

+ * 

+ */

+public abstract class AbstractDiagramPreferencesObservableValue extends AbstractObservableValue {

+

+	/**

+	 * the name of the edited preference

+	 */

+	private String preferenceName;

+

+	/**

+	 * the edited preference store

+	 */

+	private IPreferenceStore editedPreferenceStore;

+

+	/**

+	 * the listener on the preference store used to force refresh

+	 */

+	private IPropertyChangeListener listener;

+

+	/**

+	 * 

+	 * Constructor.

+	 * 

+	 * @param diagram

+	 *        the diagram for which we re editing a preference

+	 * @param preferenceName

+	 *        the name of edited the preference

+	 */

+	public AbstractDiagramPreferencesObservableValue(final Diagram diagram, final String preferenceName, final IPreferenceStore editedPreferenceStore) {

+		this.preferenceName = preferenceName;

+		this.editedPreferenceStore = editedPreferenceStore;

+		this.editedPreferenceStore.addPropertyChangeListener(this.listener = new IPropertyChangeListener() {

+

+			public void propertyChange(final PropertyChangeEvent event) {

+				if(getEditedPreference().equals(event.getProperty())) {

+					ValueDiff diff = new ValueDiff() {

+

+						@Override

+						public Object getOldValue() {

+							return event.getOldValue();

+						}

+

+						@Override

+						public Object getNewValue() {

+							return event.getNewValue();

+						}

+					};

+					fireValueChange(diff);

+				}

+			}

+		});

+	}

+

+

+	@Override

+	public synchronized void dispose() {

+		super.dispose();

+		this.editedPreferenceStore.removePropertyChangeListener(this.listener);

+	}

+

+	/**

+	 * 

+	 * @return

+	 *         the edited preferences

+	 */

+	public final String getEditedPreference() {

+		return this.preferenceName;

+	}

+

+	/**

+	 * 

+	 * @return

+	 *         the edited preference store

+	 */

+	public final IPreferenceStore getEditedPreferenceStore() {

+		return this.editedPreferenceStore;

+	}

+}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/BooleanDiagramViewObservableValue.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/BooleanDiagramViewObservableValue.java
new file mode 100644
index 00000000000..fb94fe629e4
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/BooleanDiagramViewObservableValue.java
@@ -0,0 +1,79 @@
+/*****************************************************************************

+ * 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:

+ *		

+ *		CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.gmfdiag.properties.databinding;

+

+import org.eclipse.emf.ecore.EcorePackage;

+import org.eclipse.gmf.runtime.notation.Diagram;

+import org.eclipse.jface.preference.IPreferenceStore;

+

+/**

+ * 

+ * Class used to edit boolean preference

+ * 

+ */

+public class BooleanDiagramViewObservableValue extends AbstractDiagramPreferencesObservableValue {

+

+	/**

+	 * 

+	 * Constructor.

+	 * 

+	 * @param diagram

+	 *        the edited diagram

+	 * @param preferenceName

+	 *        the edited preference

+	 * @param preferenceStore

+	 *        the edited preference store

+	 */

+	public BooleanDiagramViewObservableValue(final Diagram diagram, final String preferenceName, IPreferenceStore preferenceStore) {

+		super(diagram, preferenceName, preferenceStore);

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

+	 * 

+	 * @return

+	 */

+	public final Object getValueType() {

+		return EcorePackage.eINSTANCE.getEBoolean();

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#doGetValue()

+	 * 

+	 * @return

+	 */

+	@Override

+	protected final Object doGetValue() {

+		final IPreferenceStore wsPreferenceStore = getEditedPreferenceStore();

+		return wsPreferenceStore.getBoolean(getEditedPreference());

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#doSetValue(java.lang.Object)

+	 * 

+	 * @param value

+	 */

+	@Override

+	protected void doSetValue(Object value) {

+		if(value instanceof Boolean) {

+			final IPreferenceStore wsPreferenceStore = getEditedPreferenceStore();

+			wsPreferenceStore.setValue(getEditedPreference(), ((Boolean)value).booleanValue());

+		}

+	}

+

+

+}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/DoubleDiagramViewObservaleValue.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/DoubleDiagramViewObservaleValue.java
new file mode 100644
index 00000000000..2702a1cda47
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/DoubleDiagramViewObservaleValue.java
@@ -0,0 +1,83 @@
+package org.eclipse.papyrus.infra.gmfdiag.properties.databinding;

+

+import org.eclipse.core.databinding.observable.value.ValueDiff;

+import org.eclipse.emf.ecore.EcorePackage;

+import org.eclipse.gmf.runtime.notation.Diagram;

+import org.eclipse.jface.preference.IPreferenceStore;

+

+/**

+ * 

+ * Class used to edit double preferences

+ * 

+ */

+public class DoubleDiagramViewObservaleValue extends AbstractDiagramPreferencesObservableValue {

+

+	/**

+	 * 

+	 * Constructor.

+	 * 

+	 * @param diagram

+	 *        the edited diagram

+	 * @param preferenceName

+	 *        the edited preference

+	 * @param store

+	 *        the edited preference store

+	 */

+	public DoubleDiagramViewObservaleValue(final Diagram diagram, final String preferenceName, final IPreferenceStore store) {

+		super(diagram, preferenceName, store);

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

+	 * 

+	 * @return

+	 */

+	public final Object getValueType() {

+		return EcorePackage.eINSTANCE.getEFloat();

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#doGetValue()

+	 * 

+	 * @return

+	 */

+	@Override

+	protected Object doGetValue() {

+		final IPreferenceStore wsPreferenceStore = getEditedPreferenceStore();

+		return wsPreferenceStore.getDouble(getEditedPreference());

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#doSetValue(java.lang.Object)

+	 * 

+	 * @param value

+	 */

+	@Override

+	protected void doSetValue(final Object value) {

+		if(value instanceof Float) {

+			final IPreferenceStore wsPreferenceStore = getEditedPreferenceStore();

+			final double oldValue = (Double)doGetValue();

+			wsPreferenceStore.setValue(getEditedPreference(), ((Float)value).doubleValue());

+			final ValueDiff diff = new ValueDiff() {

+

+				@Override

+				public Object getOldValue() {

+					return oldValue;

+				}

+

+				@Override

+				public Object getNewValue() {

+					return ((Float)value).doubleValue();

+				}

+			};

+			fireValueChange(diff);

+		}

+	}

+

+

+

+

+}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/IntegerDiagramViewObservableValue.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/IntegerDiagramViewObservableValue.java
new file mode 100644
index 00000000000..f89b117504a
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/IntegerDiagramViewObservableValue.java
@@ -0,0 +1,79 @@
+/*****************************************************************************

+ * 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:

+ *		

+ *		CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.gmfdiag.properties.databinding;

+

+import org.eclipse.emf.ecore.EcorePackage;

+import org.eclipse.gmf.runtime.notation.Diagram;

+import org.eclipse.jface.preference.IPreferenceStore;

+

+/**

+ * 

+ * Class used to edit integer preferences

+ * 

+ */

+public class IntegerDiagramViewObservableValue extends AbstractDiagramPreferencesObservableValue {

+

+	/**

+	 * 

+	 * Constructor.

+	 * 

+	 * @param diagram

+	 *        the edited diagram

+	 * @param preferenceName

+	 *        the name of the edited preference

+	 * @param store

+	 *        the edited preference store

+	 */

+	public IntegerDiagramViewObservableValue(final Diagram diagram, final String preferenceName, final IPreferenceStore store) {

+		super(diagram, preferenceName, store);

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()

+	 * 

+	 * @return

+	 */

+	public final Object getValueType() {

+		return EcorePackage.eINSTANCE.getEInt();

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#doGetValue()

+	 * 

+	 * @return

+	 */

+	@Override

+	protected final Object doGetValue() {

+		final IPreferenceStore wsPreferenceStore = getEditedPreferenceStore();

+		return wsPreferenceStore.getInt(getEditedPreference());

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#doSetValue(java.lang.Object)

+	 * 

+	 * @param value

+	 */

+	@Override

+	protected void doSetValue(Object value) {

+		if(value instanceof Integer) {

+			final IPreferenceStore wsPreferenceStore = getEditedPreferenceStore();

+			wsPreferenceStore.setValue(getEditedPreference(), ((Integer)value).intValue());

+		}

+	}

+

+

+}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/RulersUnitObservableValue.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/RulersUnitObservableValue.java
new file mode 100644
index 00000000000..7702194e980
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/databinding/RulersUnitObservableValue.java
@@ -0,0 +1,65 @@
+package org.eclipse.papyrus.infra.gmfdiag.properties.databinding;

+

+import java.text.NumberFormat;

+import java.text.ParseException;

+

+import org.eclipse.gmf.runtime.diagram.ui.internal.properties.WorkspaceViewerProperties;

+import org.eclipse.gmf.runtime.notation.Diagram;

+import org.eclipse.jface.preference.IPreferenceStore;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.UnitsConverterUtils;

+

+

+

+@SuppressWarnings("restriction")

+//suppress warning for WorkspaceViewerProperties

+public class RulersUnitObservableValue extends IntegerDiagramViewObservableValue {

+

+	/**

+	 * 

+	 * Constructor.

+	 * 

+	 * @param view

+	 *        the view

+	 * @param store

+	 *        the edited preference store

+	 */

+	public RulersUnitObservableValue(final Diagram view, final IPreferenceStore store) {

+		super(view, WorkspaceViewerProperties.RULERUNIT, store);

+	}

+

+

+	/**

+	 * 

+	 * @see org.eclipse.papyrus.infra.gmfdiag.properties.databinding.IntegerDiagramViewObservableValue#doSetValue(java.lang.Object)

+	 * 

+	 * @param value

+	 */

+	@Override

+	protected void doSetValue(final Object value) {

+		if(value instanceof Integer) {

+			final Integer oldValue = (Integer)doGetValue();

+			final IPreferenceStore wsPreferenceStore = getEditedPreferenceStore();

+			final Double oldGridSpacing = wsPreferenceStore.getDouble(WorkspaceViewerProperties.GRIDSPACING);

+

+

+			final String newValue = UnitsConverterUtils.convertUnits((Integer)oldValue, (Integer)value, NumberFormat.getInstance().format(oldGridSpacing));

+

+			Number number = null;

+			try {

+				number = NumberFormat.getInstance().parse(newValue);

+			} catch (ParseException e) {

+				//nothing to do

+				number = null;

+				return;

+			}

+

+			//we set the new unit value

+			super.doSetValue(value);

+

+			//we set the new spacing value

+			final double newGridSpacing = number.doubleValue();

+			wsPreferenceStore.setValue(WorkspaceViewerProperties.GRIDSPACING, newGridSpacing);

+		}

+	}

+

+}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/messages/Messages.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/messages/Messages.java
index 6efd7d9683c..88269b2493c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/messages/Messages.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/messages/Messages.java
@@ -35,6 +35,8 @@ public class Messages extends NLS {
 

 	public static String DecoratedModelElement_WEST;

 

+	public static String DiagramPreferencesDefaultButton_ResetDefault;

+

 	public static String GradientDataModelElement_Horizontal;

 

 	public static String GradientDataModelElement_Vertical;

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/messages/messages.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/messages/messages.properties
index 2c1a13cf3d3..7da85c2df8a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/messages/messages.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/messages/messages.properties
@@ -7,5 +7,6 @@ DecoratedModelElement_SOUTH=Bottom
 DecoratedModelElement_SOUTH_EAST=Bottom Right

 DecoratedModelElement_SOUTH_WEST=Bottom Left

 DecoratedModelElement_WEST=Left

+DiagramPreferencesDefaultButton_ResetDefault=Reset Default

 GradientDataModelElement_Horizontal=Horizontal

 GradientDataModelElement_Vertical=Vertical

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/RulerAndGridModelElement.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/RulerAndGridModelElement.java
new file mode 100644
index 00000000000..87f0f8cfd2b
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/RulerAndGridModelElement.java
@@ -0,0 +1,191 @@
+/*****************************************************************************

+ * 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:

+ *		

+ *		CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.gmfdiag.properties.modelelement;

+

+import org.eclipse.core.databinding.observable.IObservable;

+import org.eclipse.draw2d.Graphics;

+import org.eclipse.emf.edit.domain.EditingDomain;

+import org.eclipse.gef.rulers.RulerProvider;

+import org.eclipse.gmf.runtime.diagram.ui.internal.properties.WorkspaceViewerProperties;

+import org.eclipse.gmf.runtime.notation.Diagram;

+import org.eclipse.jface.preference.IPreferenceStore;

+import org.eclipse.jface.viewers.ILabelProvider;

+import org.eclipse.papyrus.infra.gmfdiag.common.providers.LineStyleLabelProvider;

+import org.eclipse.papyrus.infra.gmfdiag.common.providers.UnitsLabelProvider;

+import org.eclipse.papyrus.infra.gmfdiag.properties.databinding.BooleanDiagramViewObservableValue;

+import org.eclipse.papyrus.infra.gmfdiag.properties.databinding.DoubleDiagramViewObservaleValue;

+import org.eclipse.papyrus.infra.gmfdiag.properties.databinding.IntegerDiagramViewObservableValue;

+import org.eclipse.papyrus.infra.gmfdiag.properties.databinding.RulersUnitObservableValue;

+import org.eclipse.papyrus.infra.gmfdiag.properties.util.RulersAndGridPropertyConstants;

+import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;

+import org.eclipse.papyrus.infra.widgets.providers.StaticContentProvider;

+import org.eclipse.papyrus.views.properties.contexts.DataContextElement;

+import org.eclipse.papyrus.views.properties.modelelement.AbstractModelElement;

+

+/**

+ * 

+ * @author vl222926

+ *         This class provides the ModelElement for the property view

+ */

+@SuppressWarnings("restriction")

+//suppress the warning for WorkspaceViewerProperties

+public class RulerAndGridModelElement extends AbstractModelElement {

+

+

+

+	/**

+	 * the diagram for which we are editing preferences

+	 */

+	private Diagram diagram;

+

+	/**

+	 * the edited preference store

+	 */

+	private IPreferenceStore store;

+

+	/**

+	 * 

+	 * Constructor.

+	 * 

+	 * @param view

+	 *        the diagram for which we are editing preferences

+	 * @param domain

+	 *        the editing domain

+	 * @param context

+	 *        the data context

+	 * @param preferenceStore

+	 *        the edited preference store

+	 */

+	public RulerAndGridModelElement(final Diagram view, final EditingDomain domain, final DataContextElement context, final IPreferenceStore preferenceStore) {

+		this.diagram = view;

+		this.store = preferenceStore;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.papyrus.views.properties.modelelement.AbstractModelElement#dispose()

+	 * 

+	 */

+	@Override

+	public void dispose() {

+		super.dispose();

+		this.diagram = null;

+		this.store = null;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.papyrus.views.properties.modelelement.AbstractModelElement#doGetObservable(java.lang.String)

+	 * 

+	 * @param propertyPath

+	 * @return

+	 */

+	@Override

+	protected IObservable doGetObservable(final String propertyPath) {

+		IObservable observable = null;

+		if(RulersAndGridPropertyConstants.GRID_IS_DISPLAYING_GRID.equals(propertyPath)) {

+			observable = new BooleanDiagramViewObservableValue(this.diagram, WorkspaceViewerProperties.VIEWGRID, this.store);

+		}

+		if(RulersAndGridPropertyConstants.RULERS_IS_DISPLAYING_RULER.equals(propertyPath)) {

+			observable = new BooleanDiagramViewObservableValue(this.diagram, WorkspaceViewerProperties.VIEWRULERS, this.store);

+		}

+		if(RulersAndGridPropertyConstants.GRID_IS_IN_FRONT.equals(propertyPath)) {

+			observable = new BooleanDiagramViewObservableValue(diagram, WorkspaceViewerProperties.GRIDORDER, this.store);

+		}

+		if(RulersAndGridPropertyConstants.GRID_COLOR.equals(propertyPath)) {

+			observable = new IntegerDiagramViewObservableValue(diagram, WorkspaceViewerProperties.GRIDLINECOLOR, this.store);

+		}

+		if(RulersAndGridPropertyConstants.GRID_STYLE.equals(propertyPath)) {

+			observable = new IntegerDiagramViewObservableValue(diagram, WorkspaceViewerProperties.GRIDLINESTYLE, this.store);

+		}

+		if(RulersAndGridPropertyConstants.GRID_SPACING.equals(propertyPath)) {

+			observable = new DoubleDiagramViewObservaleValue(diagram, WorkspaceViewerProperties.GRIDSPACING, this.store);

+		}

+		if(RulersAndGridPropertyConstants.GRID_IS_SNAP_TO_GRID.equals(propertyPath)) {

+			observable = new BooleanDiagramViewObservableValue(this.diagram, WorkspaceViewerProperties.SNAPTOGRID, this.store);

+		}

+		if(RulersAndGridPropertyConstants.GRID_IS_SNAP_TO_SHAPE.equals(propertyPath)) {

+			observable = new BooleanDiagramViewObservableValue(this.diagram, WorkspaceViewerProperties.SNAPTOGEOMETRY, this.store);

+		}

+		if(RulersAndGridPropertyConstants.RULERS_UNITS.equals(propertyPath)) {

+			observable = new RulersUnitObservableValue(diagram, this.store);

+		}

+		return observable;

+	}

+

+

+

+	/**

+	 * 

+	 * @see org.eclipse.papyrus.views.properties.modelelement.AbstractModelElement#getContentProvider(java.lang.String)

+	 * 

+	 * @param propertyPath

+	 * @return

+	 */

+	@Override

+	public IStaticContentProvider getContentProvider(String propertyPath) {

+		if(RulersAndGridPropertyConstants.GRID_STYLE.equals(propertyPath)) {

+			return new StaticContentProvider(new Object[]{ Graphics.LINE_DASH, Graphics.LINE_DASHDOT, Graphics.LINE_DASHDOTDOT, Graphics.LINE_DOT, Graphics.LINE_SOLID, Graphics.LINE_CUSTOM });

+		}

+		if(RulersAndGridPropertyConstants.RULERS_UNITS.equals(propertyPath)) {

+			return new StaticContentProvider(new Object[]{ RulerProvider.UNIT_INCHES, RulerProvider.UNIT_CENTIMETERS, RulerProvider.UNIT_PIXELS });

+		}

+		return super.getContentProvider(propertyPath);

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.papyrus.views.properties.modelelement.AbstractModelElement#getLabelProvider(java.lang.String)

+	 * 

+	 * @param propertyPath

+	 * @return

+	 */

+	@Override

+	public ILabelProvider getLabelProvider(final String propertyPath) {

+		if(RulersAndGridPropertyConstants.GRID_STYLE.equals(propertyPath)) {

+			return new LineStyleLabelProvider();

+		}

+		if(RulersAndGridPropertyConstants.RULERS_UNITS.equals(propertyPath)) {

+			return new UnitsLabelProvider();

+		}

+		return null;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.papyrus.views.properties.modelelement.AbstractModelElement#isMandatory(java.lang.String)

+	 * 

+	 * @param propertyPath

+	 * @return

+	 */

+	@Override

+	public boolean isMandatory(final String propertyPath) {

+		if(RulersAndGridPropertyConstants.GRID_STYLE.equals(propertyPath) || RulersAndGridPropertyConstants.RULERS_UNITS.equals(propertyPath)) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.papyrus.views.properties.modelelement.AbstractModelElement#forceRefresh(java.lang.String)

+	 * 

+	 * @param propertyPath

+	 * @return

+	 */

+	@Override

+	public boolean forceRefresh(final String propertyPath) {

+		return true;

+	}

+}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/RulersAndGridModelElementFactory.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/RulersAndGridModelElementFactory.java
new file mode 100644
index 00000000000..0709999a89e
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/RulersAndGridModelElementFactory.java
@@ -0,0 +1,61 @@
+/*****************************************************************************

+ * 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:

+ *		

+ *		CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.gmfdiag.properties.modelelement;

+

+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

+import org.eclipse.emf.edit.domain.EditingDomain;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gmf.runtime.notation.Diagram;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.preference.IPreferenceStore;

+import org.eclipse.papyrus.infra.gmfdiag.common.helper.NotationHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil;

+import org.eclipse.papyrus.infra.gmfdiag.properties.Activator;

+import org.eclipse.papyrus.views.properties.contexts.DataContextElement;

+import org.eclipse.papyrus.views.properties.modelelement.ModelElement;

+import org.eclipse.papyrus.views.properties.modelelement.ModelElementFactory;

+

+/**

+ * 

+ * @author vl222926

+ *         The factory used to edit Rulers and Grid properties

+ */

+public class RulersAndGridModelElementFactory implements ModelElementFactory {

+

+	/**

+	 * 

+	 * @see org.eclipse.papyrus.views.properties.modelelement.ModelElementFactory#createFromSource(java.lang.Object,

+	 *      org.eclipse.papyrus.views.properties.contexts.DataContextElement)

+	 * 

+	 * @param sourceElement

+	 * @param context

+	 * @return

+	 */

+	public ModelElement createFromSource(Object sourceElement, DataContextElement context) {

+		if(sourceElement instanceof EditPart) {

+			final IPreferenceStore preferenceStore = DiagramEditPartsUtil.getDiagramWorkspacePreferenceStore((EditPart)sourceElement);

+			View view = NotationHelper.findView(DiagramEditPartsUtil.getDiagramEditPart((EditPart)sourceElement));

+			if(preferenceStore != null && view instanceof Diagram) {

+				EditingDomain domain = AdapterFactoryEditingDomain.getEditingDomainFor(view);

+				return new RulerAndGridModelElement((Diagram)view, domain, context, preferenceStore);

+			}

+		}

+

+		Activator.log.warn("The selected element cannot be resolved to a Diagram View"); //$NON-NLS-1$

+		return null;

+	}

+

+

+

+}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/util/NotationUtil.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/util/NotationUtil.java
index 18ca429fd7e..1fbdd42e1ac 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/util/NotationUtil.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/util/NotationUtil.java
@@ -1,3 +1,16 @@
+/*****************************************************************************

+ * 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:

+ *		

+ *		CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

 package org.eclipse.papyrus.infra.gmfdiag.properties.util;

 

 import org.eclipse.core.runtime.IAdaptable;

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/util/RulersAndGridPropertyConstants.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/util/RulersAndGridPropertyConstants.java
new file mode 100644
index 00000000000..03ae14a07fe
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/util/RulersAndGridPropertyConstants.java
@@ -0,0 +1,47 @@
+/*****************************************************************************

+ * 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:

+ *		

+ *		CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.gmfdiag.properties.util;

+

+/**

+ * 

+ * 

+ * This class provides the constants used in the declaration of the property view for Rulers and Grid

+ */

+public class RulersAndGridPropertyConstants {

+

+	private RulersAndGridPropertyConstants() {

+		// to prevent instanciation

+	}

+

+	/**

+	 * the edited data

+	 */

+	public static final String GRID_IS_DISPLAYING_GRID = "grid.isDisplayingGrid";

+

+	public static final String RULERS_IS_DISPLAYING_RULER = "rulers.isDisplayingRulers";

+

+	public static final String GRID_IS_IN_FRONT = "grid.isInFront";

+

+	public static final String GRID_COLOR = "grid.color";

+

+	public static final String GRID_STYLE = "grid.style";

+

+	public static final String GRID_SPACING = "grid.spacing";

+

+	public static final String GRID_IS_SNAP_TO_GRID = "grid.isSnapToGrid";

+

+	public static final String GRID_IS_SNAP_TO_SHAPE = "grid.isSnapToShapes";

+

+	public static final String RULERS_UNITS = "rulers.units";

+}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/widget/DiagramPreferencesDefaultButton.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/widget/DiagramPreferencesDefaultButton.java
new file mode 100644
index 00000000000..eda0cb82580
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/widget/DiagramPreferencesDefaultButton.java
@@ -0,0 +1,172 @@
+/*****************************************************************************

+ * 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:

+ *		

+ *		CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.gmfdiag.properties.widget;

+

+import org.eclipse.gef.EditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;

+import org.eclipse.gmf.runtime.notation.Diagram;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.preference.IPreferenceStore;

+import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.Activator;

+import org.eclipse.papyrus.infra.gmfdiag.properties.messages.Messages;

+import org.eclipse.papyrus.views.properties.modelelement.DataSource;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.events.SelectionEvent;

+import org.eclipse.swt.events.SelectionListener;

+import org.eclipse.swt.graphics.RGB;

+import org.eclipse.swt.layout.GridLayout;

+import org.eclipse.swt.widgets.Button;

+import org.eclipse.swt.widgets.Composite;

+

+/**

+ * 

+ * The button used to reset the preference of the diagram to the defaut values

+ * 

+ */

+public class DiagramPreferencesDefaultButton extends Composite {

+

+	private Button button;

+

+	private SelectionListener listener;

+

+	protected DataSource input;

+

+	/**

+	 * 

+	 * Constructor.

+	 * 

+	 * @param parent

+	 * @param style

+	 */

+	public DiagramPreferencesDefaultButton(Composite parent, int style) {

+		super(parent, style);

+		GridLayout layout = new GridLayout(1, false);

+		setLayout(layout);

+		createButton();

+	}

+

+	/**

+	 * create the reset button

+	 */

+	protected void createButton() {

+		button = new Button(this, SWT.NONE);

+		button.setText(Messages.DiagramPreferencesDefaultButton_ResetDefault);

+		this.listener = createListener();

+		button.addSelectionListener(this.listener);

+	}

+

+	/**

+	 * Sets the input DataSource for this Property editor.

+	 * 

+	 * @param input

+	 */

+	public void setInput(DataSource input) {

+		this.input = input;

+	}

+

+	/**

+	 * @return the input DataSource for this Property editor

+	 */

+	public DataSource getInput() {

+		return input;

+	}

+

+	/**

+	 * 

+	 * @return the listener to use for the button

+	 */

+	private SelectionListener createListener() {

+		final SelectionListener listener = new SelectionListener() {

+

+			public void widgetSelected(SelectionEvent e) {

+				resetProperties();

+			}

+

+			public void widgetDefaultSelected(SelectionEvent e) {

+				// nothing to do

+			}

+		};

+		return listener;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.swt.widgets.Widget#dispose()

+	 * 

+	 */

+	@Override

+	public void dispose() {

+		super.dispose();

+		this.button.removeSelectionListener(this.listener);

+		this.input = null;

+	}

+

+	/**

+	 * Reset the properties to their default values

+	 */

+	protected void resetProperties() {

+

+		final IPreferenceStore store = getPreferencesStore();

+		final IPreferenceStore globalPreferenceStore = Activator.getDefault().getPreferenceStore();

+		final String diagramType = getDiagramType();

+		if(store != null && diagramType != null && !diagramType.equals("")) { //$NON-NLS-1$

+			store.setValue(PreferencesConstantsHelper.VIEW_GRID_CONSTANT, globalPreferenceStore.getBoolean(PreferencesConstantsHelper.getDiagramConstant(diagramType, PreferencesConstantsHelper.VIEW_GRID)));

+			store.setValue(PreferencesConstantsHelper.VIEW_RULERS_CONSTANT, globalPreferenceStore.getBoolean(PreferencesConstantsHelper.getDiagramConstant(diagramType, PreferencesConstantsHelper.VIEW_RULER)));

+			store.setValue(PreferencesConstantsHelper.GRID_ORDER_CONSTANT, globalPreferenceStore.getBoolean(PreferencesConstantsHelper.getDiagramConstant(diagramType, PreferencesConstantsHelper.GRID_ORDER)));

+

+			final RGB gridColor = PreferenceConverter.getColor(globalPreferenceStore, PreferencesConstantsHelper.getDiagramConstant(diagramType, PreferencesConstantsHelper.GRID_LINE_COLOR));

+			store.setValue(PreferencesConstantsHelper.GRID_LINE_COLOR_CONSTANT, FigureUtilities.RGBToInteger(gridColor));

+			store.setValue(PreferencesConstantsHelper.GRID_LINE_STYLE_CONSTANT, globalPreferenceStore.getInt(PreferencesConstantsHelper.getDiagramConstant(diagramType, PreferencesConstantsHelper.GRID_LINE_STYLE)));

+			store.setValue(PreferencesConstantsHelper.GRID_SPACING_CONSTANT, globalPreferenceStore.getDouble(PreferencesConstantsHelper.getDiagramConstant(diagramType, PreferencesConstantsHelper.GRID_SPACING)));

+			store.setValue(PreferencesConstantsHelper.SNAP_TO_GRID_CONSTANT, globalPreferenceStore.getBoolean(PreferencesConstantsHelper.getDiagramConstant(diagramType, PreferencesConstantsHelper.SNAP_TO_GRID)));

+			store.setValue(PreferencesConstantsHelper.SNAP_TO_GEOMETRY_CONSTANT, globalPreferenceStore.getBoolean(PreferencesConstantsHelper.getDiagramConstant(diagramType, PreferencesConstantsHelper.SNAP_TO_GEOMETRY)));

+			store.setValue(PreferencesConstantsHelper.RULER_UNITS_CONSTANT, globalPreferenceStore.getInt(PreferencesConstantsHelper.getDiagramConstant(diagramType, PreferencesConstantsHelper.RULER_UNITS)));

+		}

+	}

+

+	/**

+	 * 

+	 * @return the preference store

+	 */

+	protected IPreferenceStore getPreferencesStore() {

+		final IStructuredSelection selection = this.input.getSelection();

+		final Object firstElement = selection.getFirstElement();

+		if(firstElement instanceof EditPart) {

+			return DiagramEditPartsUtil.getDiagramWorkspacePreferenceStore((EditPart)firstElement);

+		}

+		return null;

+	}

+

+	/**

+	 * 

+	 * @return

+	 *         the type of the diagram

+	 */

+	protected String getDiagramType() {

+		final IStructuredSelection selection = this.input.getSelection();

+		final Object firstElement = selection.getFirstElement();

+		if(firstElement instanceof EditPart) {

+			final DiagramEditPart diagramEditPart = DiagramEditPartsUtil.getDiagramEditPart((EditPart)firstElement);

+			final Diagram diagram = (Diagram)diagramEditPart.getAdapter(Diagram.class);

+			return diagram.getType();

+		}

+		return ""; //$NON-NLS-1$

+	}

+

+}

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/editor/AbstractEMFNattableEditor.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/editor/AbstractEMFNattableEditor.java
index 8f301af0ce2..c61647079cf 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/editor/AbstractEMFNattableEditor.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/editor/AbstractEMFNattableEditor.java
@@ -14,11 +14,14 @@
 package org.eclipse.papyrus.infra.nattable.common.editor;

 

 

+import java.io.IOException;

+

 import org.eclipse.core.runtime.IProgressMonitor;

 import org.eclipse.emf.common.notify.Adapter;

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.common.notify.impl.AdapterImpl;

 import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.jface.preference.PreferenceStore;

 import org.eclipse.papyrus.infra.core.services.ServiceException;

 import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

 import org.eclipse.papyrus.infra.core.utils.ServiceUtils;

@@ -58,6 +61,13 @@ public abstract class AbstractEMFNattableEditor extends EditorPart {
 	private PartNameSynchronizer synchronizer;

 

 	/**

+	 * the workspace preference store for this table editor

+	 */

+	@SuppressWarnings("unused")

+	//not yet used in the table

+	private PreferenceStore workspacePreferenceStore;

+

+	/**

 	 * @param servicesRegistry

 	 * @param rawModel

 	 * 

@@ -66,8 +76,69 @@ public abstract class AbstractEMFNattableEditor extends EditorPart {
 		this.servicesRegistry = servicesRegistry;

 		this.tableManager = new NattableModelManager(rawModel);

 		this.synchronizer = new PartNameSynchronizer(rawModel);

+		this.workspacePreferenceStore = getWorkspaceViewerPreferenceStore();

+	}

+

+	/**

+	 * Returns the workspace viewer <code>PreferenceStore</code>

+	 * 

+	 * @return the workspace viewer <code>PreferenceStore</code>

+	 */

+	public PreferenceStore getWorkspaceViewerPreferenceStore() {

+		//not yet used by tables

+		return null;

+

+		//		if(this.workspacePreferenceStore != null) {

+		//			return this.workspacePreferenceStore;

+		//		} else {

+		//			// Try to load it

+		//			IPath path = Activator.getDefault().getStateLocation();

+		//			String id = getIdStr(this.tableManager.getTable());

+		//

+		//			String fileName = path.toString() + "/" + id;//$NON-NLS-1$

+		//			java.io.File file = new File(fileName);

+		//			this.workspacePreferenceStore = new PreferenceStore(fileName);

+		//			if(file.exists()) {

+		//				// Load it

+		//				try {

+		//					this.workspacePreferenceStore.load();

+		//				} catch (Exception e) {

+		//					// Create the default

+		//					addDefaultPreferences();

+		//				}

+		//			} else {

+		//				// Create it

+		//				addDefaultPreferences();

+		//			}

+		//			return this.workspacePreferenceStore;

+		//		}

 	}

 

+	//	/**

+	//	 * returns the unique GUID of the view

+	//	 * 

+	//	 * @param view

+	//	 *        the view

+	//	 * @return String the GUID of a view (constant)

+	//	 */

+	//	private static String getIdStr(Table table) {

+	//		Resource resource = table.eResource();

+	//		if(resource instanceof XMLResource) {

+	//			String id = ((XMLResource)resource).getID(table);

+	//			if(id != null) {

+	//				return id;

+	//			}

+	//		}

+	//

+	//		// Remain compatible with previous behavior.

+	//		return StringStatics.BLANK;

+	//	}

+

+	// not used : add a workspace preference to the table

+	//	private void addDefaultPreferences() {

+	//				final IPreferenceStore globalPreferenceStore = Activator.getDefault().getPreferenceStore();

+	//				String tableKind = this.tableManager.getTable().getTableConfiguration().getType();

+	//	}

 

 	/**

 	 * 

@@ -134,7 +205,7 @@ public abstract class AbstractEMFNattableEditor extends EditorPart {
 	}

 

 	@Override

-	public Object getAdapter(final Class adapter) {

+	public Object getAdapter(@SuppressWarnings("rawtypes") final Class adapter) {

 		if(adapter == INattableModelManager.class) {

 			return this.tableManager;

 		}

@@ -153,11 +224,22 @@ public abstract class AbstractEMFNattableEditor extends EditorPart {
 

 	@Override

 	public void dispose() {

+		saveLocalPreferenceStoreValues();

 		this.tableManager.dispose();

 		this.synchronizer.dispose();

 		super.dispose();

 	}

 

+	protected void saveLocalPreferenceStoreValues() {

+		// Write the settings, if necessary

+		try {

+			if(getWorkspaceViewerPreferenceStore() != null && getWorkspaceViewerPreferenceStore().needsSaving())

+				getWorkspaceViewerPreferenceStore().save();

+		} catch (IOException ioe) {

+			Activator.log.warn("Preferences can' be saved"); //$NON-NLS-1$

+		}

+	}

+

 	/**

 	 * A class taking in charge the synchronization of the partName and the table name.

 	 * When table name change, the other is automatically updated.

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF
index a0c97ec7253..d5de92709d6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF
@@ -5,11 +5,10 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.services.controlmode;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.emf;bundle-version="1.0.0",

  org.eclipse.gmf.runtime.emf.commands.core,

- org.eclipse.emf.facet.widgets.nattable.instance,

  org.eclipse.papyrus.infra.nattable.model;bundle-version="1.0.0",

  org.eclipse.uml2.uml,

  org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.0",

- com.google.guava,

+ com.google.guava;bundle-version="11.0.0",

  org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.nattable.common;bundle-version="1.0.0"

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF
index 8efab98e13b..4d5061bd4b3 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF
@@ -20,7 +20,7 @@ Require-Bundle: org.eclipse.papyrus.infra.widgets;bundle-version="1.0.0",
  org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.0.0",

  org.apache.commons.lang,

- com.google.guava;bundle-version="11.0.2"

+ com.google.guava;bundle-version="11.0.0"

 Export-Package: org.eclipse.papyrus.infra.nattable,

  org.eclipse.papyrus.infra.nattable.celleditor,

  org.eclipse.papyrus.infra.nattable.celleditor.config,

@@ -37,6 +37,7 @@ Export-Package: org.eclipse.papyrus.infra.nattable,
  org.eclipse.papyrus.infra.nattable.nattableconfiguration,

  org.eclipse.papyrus.infra.nattable.painter,

  org.eclipse.papyrus.infra.nattable.paste,

+ org.eclipse.papyrus.infra.nattable.preferences,

  org.eclipse.papyrus.infra.nattable.provider,

  org.eclipse.papyrus.infra.nattable.reorder,

  org.eclipse.papyrus.infra.nattable.tester,

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/icons/importTablePapyrusWizban.png b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/icons/importTablePapyrusWizban.png
new file mode 100644
index 00000000000..2760811cabf
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/icons/importTablePapyrusWizban.png
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/icons/import_wiz_16x16-papyrusColor.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/icons/import_wiz_16x16-papyrusColor.gif
new file mode 100644
index 00000000000..c7be463bcd2
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/icons/import_wiz_16x16-papyrusColor.gif
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/icons/warning.gif b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/icons/warning.gif
new file mode 100644
index 00000000000..2f1c5a8fa7b
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/icons/warning.gif
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/plugin.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/plugin.xml
index eede999b073..cc29f086118 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/plugin.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/plugin.xml
@@ -13,6 +13,10 @@
           allPopups="true"

           locationURI="popup:org.eclipse.ui.popup.any">

        <command

+             commandId="org.eclipse.papyrus.infra.nattable.import.command"

+             style="push">

+       </command>

+       <command

              commandId="org.eclipse.papyrus.infra.nattable.invert.axis"

              style="toggle">

           <visibleWhen>

@@ -628,9 +632,9 @@
    </category>

    <command

          categoryId="org.eclipse.papyrus.editor.category"

-         description="Export Table to XLS"

+         description="Export Table to XLS Command"

          id="org.eclipse.papyrus.infra.nattable.exporttoXLScommand"

-         name="Export Table to XLS Command">

+         name="Export to XLS">

    </command>

 

    <command

@@ -1051,6 +1055,36 @@
             commandId="org.eclipse.papyrus.infra.nattable.autoresize.rows"

             icon="icons/auto_resize_row.png">

       </image>

+   </extension>

+   <extension

+         point="org.eclipse.ui.commands">

+      <command

+            categoryId="org.eclipse.papyrus.infra.nattable.category"

+            defaultHandler="org.eclipse.papyrus.infra.nattable.handler.ImportTableHandler"

+            description="Import a file into a table"

+            id="org.eclipse.papyrus.infra.nattable.import.command"

+            name="Import from file">

+      </command>

+   </extension>

+   <extension

+         point="org.eclipse.ui.commandImages">

+      <image

+            commandId="org.eclipse.papyrus.infra.nattable.import.command"

+            icon="icons/import_wiz_16x16-papyrusColor.gif">

+      </image>

+   </extension>

+   <extension

+         point="org.eclipse.ui.importWizards">

+      <wizard

+            category="org.eclipse.papyrus.infra.core.importcategory"

+            class="org.eclipse.papyrus.infra.nattable.wizard.pages.ImportTableWizard"

+            icon="icons/import_wiz_16x16-papyrusColor.gif"

+            id="org.eclipse.papyrus.infra.nattable.import.category"

+            name="Import In Open Table">

+         <description>

+            This wizard allows to import a table.

+         </description>

+      </wizard>

    </extension>
 </plugin>

 

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/Activator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/Activator.java
index db654b72350..2117b5c6af2 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/Activator.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/Activator.java
@@ -13,7 +13,10 @@
  *****************************************************************************/

 package org.eclipse.papyrus.infra.nattable;

 

+import org.eclipse.core.runtime.preferences.InstanceScope;

+import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.core.log.LogHelper;

+import org.eclipse.papyrus.infra.nattable.preferences.PapyrusTablePreferenceStore;

 import org.eclipse.ui.plugin.AbstractUIPlugin;

 import org.osgi.framework.BundleContext;

 

@@ -31,6 +34,12 @@ public class Activator extends AbstractUIPlugin {
 	public static LogHelper log;

 

 	/**

+	 * Storage for preferences.

+	 */

+	protected IPreferenceStore papyrusPreferenceStore;

+

+

+	/**

 	 * The constructor

 	 */

 	public Activator() {

@@ -66,4 +75,19 @@ public class Activator extends AbstractUIPlugin {
 		return plugin;

 	}

 

+	/**

+	 * 

+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#getPreferenceStore()

+	 * 

+	 * @return

+	 */

+	@Override

+	public IPreferenceStore getPreferenceStore() {

+		// Create the preference store lazily.

+		if(this.papyrusPreferenceStore == null) {

+			this.papyrusPreferenceStore = new PapyrusTablePreferenceStore(new InstanceScope(), getBundle().getSymbolicName());

+		}

+		return this.papyrusPreferenceStore;

+	}

+

 }

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusDefaultEditBindings.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusDefaultEditBindings.java
new file mode 100644
index 00000000000..794cbf5f2e6
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusDefaultEditBindings.java
@@ -0,0 +1,63 @@
+/*****************************************************************************

+ * 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:

+ *		

+ *		 Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.nattable.configuration;

+

+import org.eclipse.nebula.widgets.nattable.config.AbstractUiBindingConfiguration;

+import org.eclipse.nebula.widgets.nattable.edit.action.CellEditDragMode;

+import org.eclipse.nebula.widgets.nattable.edit.action.KeyEditAction;

+import org.eclipse.nebula.widgets.nattable.edit.action.MouseEditAction;

+import org.eclipse.nebula.widgets.nattable.edit.config.DefaultEditBindings;

+import org.eclipse.nebula.widgets.nattable.grid.GridRegion;

+import org.eclipse.nebula.widgets.nattable.painter.cell.CheckBoxPainter;

+import org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry;

+import org.eclipse.nebula.widgets.nattable.ui.matcher.CellEditorMouseEventMatcher;

+import org.eclipse.nebula.widgets.nattable.ui.matcher.CellPainterMouseEventMatcher;

+import org.eclipse.nebula.widgets.nattable.ui.matcher.KeyEventMatcher;

+import org.eclipse.nebula.widgets.nattable.ui.matcher.LetterOrDigitKeyEventMatcher;

+import org.eclipse.nebula.widgets.nattable.ui.matcher.MouseEventMatcher;

+import org.eclipse.swt.SWT;

+

+/**

+ * 

+ * @author VL222926

+ *         Copy of {@link DefaultEditBindings} excepted for edition on double click replacing edition on single click

+ */

+public class PapyrusDefaultEditBindings extends AbstractUiBindingConfiguration {

+

+	/**

+	 * 

+	 * @see org.eclipse.nebula.widgets.nattable.config.IConfiguration#configureUiBindings(org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry)

+	 * 

+	 * @param uiBindingRegistry

+	 */

+	@Override

+	public void configureUiBindings(UiBindingRegistry uiBindingRegistry) {

+		//configure the space key to activate a cell editor via keyboard

+		//this is especially useful for changing the value for a checkbox

+		uiBindingRegistry.registerKeyBinding(new KeyEventMatcher(SWT.NONE, 32), new KeyEditAction());

+		uiBindingRegistry.registerKeyBinding(new KeyEventMatcher(SWT.NONE, SWT.F2), new KeyEditAction());

+		uiBindingRegistry.registerKeyBinding(new LetterOrDigitKeyEventMatcher(), new KeyEditAction());

+		uiBindingRegistry.registerKeyBinding(new LetterOrDigitKeyEventMatcher(SWT.SHIFT), new KeyEditAction());

+

+		uiBindingRegistry.registerDoubleClickBinding(new CellEditorMouseEventMatcher(GridRegion.BODY), new MouseEditAction());

+

+		uiBindingRegistry.registerMouseDragMode(new CellEditorMouseEventMatcher(GridRegion.BODY), new CellEditDragMode());

+

+		uiBindingRegistry.registerFirstSingleClickBinding(new CellPainterMouseEventMatcher(GridRegion.BODY, MouseEventMatcher.LEFT_BUTTON, CheckBoxPainter.class), new MouseEditAction());

+

+		uiBindingRegistry.registerFirstMouseDragMode(new CellPainterMouseEventMatcher(GridRegion.BODY, MouseEventMatcher.LEFT_BUTTON, CheckBoxPainter.class), new CellEditDragMode());

+

+	}

+

+}

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusGridLayerConfiguration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusGridLayerConfiguration.java
index b1ca4412e61..32c99976c25 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusGridLayerConfiguration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/configuration/PapyrusGridLayerConfiguration.java
@@ -15,6 +15,7 @@ package org.eclipse.papyrus.infra.nattable.configuration;
 

 import org.eclipse.nebula.widgets.nattable.grid.layer.config.DefaultGridLayerConfiguration;

 import org.eclipse.nebula.widgets.nattable.layer.CompositeLayer;

+import org.eclipse.papyrus.infra.nattable.export.PapyrusExportBindings;

 

 /**

  * We change the edit configuration

@@ -43,4 +44,24 @@ public class PapyrusGridLayerConfiguration extends DefaultGridLayerConfiguration
 	protected void addEditingHandlerConfig() {

 		addConfiguration(new EditConfiguration());

 	}

+

+	/**

+	 * 

+	 * @see org.eclipse.nebula.widgets.nattable.grid.layer.config.DefaultGridLayerConfiguration#addEditingUIConfig()

+	 * 

+	 */

+	@Override

+	protected void addEditingUIConfig() {

+		addConfiguration(new PapyrusDefaultEditBindings());

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.nebula.widgets.nattable.grid.layer.config.DefaultGridLayerConfiguration#addExcelExportUIBindings()

+	 * 

+	 */

+	@Override

+	protected void addExcelExportUIBindings() {

+		addConfiguration(new PapyrusExportBindings());

+	}

 }

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dialog/PasteImportStatusDialog.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dialog/PasteImportStatusDialog.java
new file mode 100644
index 00000000000..de2bec5c3d0
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/dialog/PasteImportStatusDialog.java
@@ -0,0 +1,97 @@
+/*****************************************************************************

+ * 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:

+ *		

+ *		 Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.nattable.dialog;

+

+import org.eclipse.jface.dialogs.IDialogConstants;

+import org.eclipse.jface.dialogs.MessageDialog;

+import org.eclipse.papyrus.infra.nattable.messages.Messages;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.custom.CLabel;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.swt.widgets.Control;

+import org.eclipse.swt.widgets.Shell;

+

+

+/**

+ * 

+ * @author VL222926

+ *         This dialog is used to display paste error status

+ */

+public class PasteImportStatusDialog extends MessageDialog {

+

+	/**

+	 * Message displayed in the paste dialog

+	 */

+	public static final String HOW_TO_PASTE_MESSAGE = Messages.PasteImportStatusDialog_PasteConfigurationMessage;

+

+	/**

+	 * Title for all dialog used by this class

+	 */

+	public static final String DIALOG_TITLE = Messages.PasteImportStatusDialog_ImportPasteDialogTitle;

+

+	/**

+	 * 

+	 * Constructor.

+	 * 

+	 * @param parentShell

+	 *        the shell parent to use

+	 * @param dialogMessage

+	 *        the message to display

+	 */

+	public PasteImportStatusDialog(final Shell parentShell, final String dialogMessage) {

+		super(parentShell, DIALOG_TITLE, getPapyrusIcon(), dialogMessage, MessageDialog.ERROR, new String[]{ IDialogConstants.OK_LABEL }, 0);

+	}

+

+	/**

+	 * 

+	 * Constructor.

+	 * 

+	 * @param parentShell

+	 *        the shell parent to use

+	 * @param dialogMessage

+	 *        the message to display

+	 * @param dialogImageType

+	 */

+	public PasteImportStatusDialog(final Shell parentShell, final String dialogMessage, final int dialogImageType) {

+		super(parentShell, DIALOG_TITLE, getPapyrusIcon(), dialogMessage, dialogImageType, new String[]{ IDialogConstants.OK_LABEL }, 0);

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.dialogs.MessageDialog#createDialogArea(org.eclipse.swt.widgets.Composite)

+	 * 

+	 * @param parent

+	 * @return

+	 */

+	@Override

+	protected Control createDialogArea(Composite parent) {

+		final Composite comp = (Composite)super.createDialogArea(parent);

+		final CLabel label = new CLabel(comp, SWT.NONE);

+		label.setText(HOW_TO_PASTE_MESSAGE);

+		label.setImage(getInfoImage());

+		return comp;

+	}

+

+

+	/**

+	 * 

+	 * @return

+	 *         the papyrus icon

+	 */

+	private static final Image getPapyrusIcon() {

+		return org.eclipse.papyrus.infra.widgets.Activator.getDefault().getImage("icons/papyrus.png"); //$NON-NLS-1$

+	}

+

+}

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/export/PapyrusExcelExporter.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/export/PapyrusExcelExporter.java
new file mode 100644
index 00000000000..8e272077bad
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/export/PapyrusExcelExporter.java
@@ -0,0 +1,67 @@
+/*****************************************************************************
+ * 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.infra.nattable.export;
+
+import static org.eclipse.nebula.widgets.nattable.util.ObjectUtils.isNotNull;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import org.eclipse.nebula.widgets.nattable.export.FileOutputStreamProvider;
+import org.eclipse.nebula.widgets.nattable.export.IOutputStreamProvider;
+import org.eclipse.nebula.widgets.nattable.export.excel.ExcelExporter;
+import org.eclipse.papyrus.infra.nattable.Activator;
+
+public class PapyrusExcelExporter extends ExcelExporter {
+
+	private static final String EXCEL_HEADER_FILE = "papyrusExcelExportHeader.txt"; //$NON-NLS-1$
+
+	public PapyrusExcelExporter() {
+		this(new FileOutputStreamProvider("table_export.xls", new String[]{ "Excel Workbok (*.xls)" }, new String[]{ "*.xls" })); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+	}
+
+	public PapyrusExcelExporter(IOutputStreamProvider outputStreamProvider) {
+		super(outputStreamProvider);
+	}
+
+	@Override
+	public void exportLayerBegin(OutputStream outputStream, String layerName) throws IOException {
+		writeHeader(outputStream);//no super!
+		outputStream.write(asBytes("<body><table border='1'>")); //$NON-NLS-1$
+	}
+
+	//this method is private is NatTable...
+	private void writeHeader(OutputStream outputStream) throws IOException {
+		InputStream headerStream = null;
+		try {
+			headerStream = this.getClass().getResourceAsStream(EXCEL_HEADER_FILE);
+			int c;
+			while((c = headerStream.read()) != -1) {
+				outputStream.write(c);
+			}
+		} catch (Exception e) {
+			Activator.log.error(e);
+		} finally {
+			if(isNotNull(headerStream)) {
+				headerStream.close();
+			}
+		}
+	}
+
+	private byte[] asBytes(String string) {
+		return string.getBytes();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/export/PapyrusExportBindings.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/export/PapyrusExportBindings.java
new file mode 100644
index 00000000000..553737e0f3a
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/export/PapyrusExportBindings.java
@@ -0,0 +1,36 @@
+/*****************************************************************************
+ * 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.infra.nattable.export;
+
+
+import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
+import org.eclipse.nebula.widgets.nattable.config.IConfiguration;
+import org.eclipse.nebula.widgets.nattable.export.ILayerExporter;
+import org.eclipse.nebula.widgets.nattable.export.action.ExportAction;
+import org.eclipse.nebula.widgets.nattable.export.config.DefaultExportBindings;
+import org.eclipse.nebula.widgets.nattable.export.excel.ExcelExporter;
+import org.eclipse.nebula.widgets.nattable.layer.ILayer;
+import org.eclipse.nebula.widgets.nattable.ui.binding.UiBindingRegistry;
+import org.eclipse.nebula.widgets.nattable.ui.matcher.KeyEventMatcher;
+import org.eclipse.swt.SWT;
+
+public class PapyrusExportBindings extends DefaultExportBindings {
+
+	public void configureRegistry(IConfigRegistry configRegistry) {
+		configRegistry.registerConfigAttribute(ILayerExporter.CONFIG_ATTRIBUTE, new PapyrusExcelExporter());
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/export/papyrusExcelExportHeader.txt b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/export/papyrusExcelExportHeader.txt
new file mode 100644
index 00000000000..4f7b65b9172
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/export/papyrusExcelExportHeader.txt
@@ -0,0 +1,53 @@
+<html xmlns:o="urn:schemas-microsoft-com:office:office"
+xmlns:x="urn:schemas-microsoft-com:office:excel"
+xmlns="http://www.w3.org/TR/REC-html40">
+
+<head>
+<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
+<meta name=ProgId content=Excel.Sheet>
+
+<!--[if gte mso 9]><xml>
+ <x:ExcelWorkbook>
+  <x:ExcelWorksheets>
+   <x:ExcelWorksheet>
+    <x:Name>Sheet1</x:Name>
+    <x:WorksheetOptions>
+     <x:Selected/>
+     <x:Panes>
+      <x:Pane>
+       <x:Number>0</x:Number>
+       <x:ActiveRow>0</x:ActiveRow>
+       <x:ActiveCol>0</x:ActiveCol>
+      </x:Pane>
+     </x:Panes>
+     <x:ProtectContents>False</x:ProtectContents>
+     <x:ProtectObjects>False</x:ProtectObjects>
+     <x:ProtectScenarios>False</x:ProtectScenarios>
+    </x:WorksheetOptions>
+   </x:ExcelWorksheet>
+   <x:ExcelWorksheet>
+    <x:Name>Sheet2</x:Name>
+    <x:WorksheetOptions>
+     <x:ProtectContents>False</x:ProtectContents>
+     <x:ProtectObjects>False</x:ProtectObjects>
+     <x:ProtectScenarios>False</x:ProtectScenarios>
+    </x:WorksheetOptions>
+   </x:ExcelWorksheet>
+   <x:ExcelWorksheet>
+    <x:Name>Sheet3</x:Name>
+    <x:WorksheetOptions>
+     <x:ProtectContents>False</x:ProtectContents>
+     <x:ProtectObjects>False</x:ProtectObjects>
+     <x:ProtectScenarios>False</x:ProtectScenarios>
+    </x:WorksheetOptions>
+   </x:ExcelWorksheet>
+  </x:ExcelWorksheets>
+  <x:WindowHeight>8895</x:WindowHeight>
+  <x:WindowWidth>13980</x:WindowWidth>
+  <x:WindowTopX>480</x:WindowTopX>
+  <x:WindowTopY>270</x:WindowTopY>
+  <x:ProtectStructure>False</x:ProtectStructure>
+  <x:ProtectWindows>False</x:ProtectWindows>
+ </x:ExcelWorkbook>
+</xml><![endif]-->
+</head>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractTableHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractTableHandler.java
index e03aa979278..999546d41aa 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractTableHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/AbstractTableHandler.java
@@ -28,13 +28,13 @@ import org.eclipse.papyrus.infra.nattable.manager.axis.IAxisManager;
 import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

 import org.eclipse.papyrus.infra.nattable.utils.TableEditingDomainUtils;

 import org.eclipse.papyrus.infra.nattable.utils.TableSelectionWrapper;

+import org.eclipse.papyrus.infra.tools.util.WorkbenchPartHelper;

 import org.eclipse.swt.events.MouseEvent;

 import org.eclipse.swt.graphics.Point;

 import org.eclipse.swt.widgets.Control;

 import org.eclipse.swt.widgets.Display;

 import org.eclipse.swt.widgets.Event;

 import org.eclipse.ui.IWorkbenchPart;

-import org.eclipse.ui.PlatformUI;

 import org.eclipse.ui.handlers.HandlerUtil;

 

 /**

@@ -66,7 +66,7 @@ public abstract class AbstractTableHandler extends AbstractHandler {
 	 *         the current active part

 	 */

 	protected IWorkbenchPart getActivePart() {

-		return PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart();

+		return WorkbenchPartHelper.getCurrentActiveWorkbenchPart();

 	}

 

 	/**

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ImportTableHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ImportTableHandler.java
new file mode 100644
index 00000000000..a2079d3a91f
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/ImportTableHandler.java
@@ -0,0 +1,47 @@
+/*****************************************************************************

+ * 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:

+ *		

+ *		 Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.nattable.handler;

+

+import org.eclipse.core.commands.ExecutionEvent;

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.jface.viewers.StructuredSelection;

+import org.eclipse.jface.wizard.WizardDialog;

+import org.eclipse.papyrus.infra.nattable.wizard.ImportTableWizard;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+

+/**

+ * 

+ * This handler allows to import a table using the ImportWizard

+ * 

+ */

+public class ImportTableHandler extends AbstractTableHandler {

+

+	/**

+	 * 

+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

+	 * 

+	 * @param event

+	 * @return

+	 * @throws ExecutionException

+	 */

+	@Override

+	public Object execute(final ExecutionEvent event) throws ExecutionException {

+		final ImportTableWizard wizard = new ImportTableWizard();

+		wizard.init(PlatformUI.getWorkbench(), new StructuredSelection(getCurrentNattableModelManager()));

+		final WizardDialog dialog = new WizardDialog(Display.getDefault().getActiveShell(), wizard);

+		dialog.open();

+		return null;

+	}

+}

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/PasteInTableHandler.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/PasteInTableHandler.java
index 57937edc797..1d4d040c3f7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/PasteInTableHandler.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/handler/PasteInTableHandler.java
@@ -15,9 +15,9 @@ package org.eclipse.papyrus.infra.nattable.handler;
 

 import org.eclipse.core.commands.ExecutionEvent;

 import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.papyrus.infra.nattable.manager.PasteInTableManager;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.utils.PasteModeEnumeration;

+import org.eclipse.papyrus.infra.nattable.manager.PasteAxisInNattableManager;

+import org.eclipse.papyrus.infra.nattable.utils.CSVPasteHelper;

+import org.eclipse.papyrus.infra.nattable.utils.TableClipboardUtils;

 

 /**

  * Paste Handler

@@ -28,11 +28,6 @@ import org.eclipse.papyrus.infra.nattable.utils.PasteModeEnumeration;
 public class PasteInTableHandler extends AbstractTableHandler {

 

 	/**

-	 * the paste manager

-	 */

-	private PasteInTableManager pasteManager;

-

-	/**

 	 * this field is used to determine if we want open a dialog to prevent the user that the command creation and the command execution can take a

 	 * long time

 	 */

@@ -40,25 +35,6 @@ public class PasteInTableHandler extends AbstractTableHandler {
 

 

 	/**

-	 * the paste mode

-	 */

-	private PasteModeEnumeration pasteMode;

-

-	/**

-	 * the current table manager

-	 */

-	private INattableModelManager manager;

-

-	/**

-	 * 

-	 * Constructor.

-	 * 

-	 */

-	public PasteInTableHandler() {

-		this.pasteManager = new PasteInTableManager();

-	}

-

-	/**

 	 * 

 	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)

 	 * 

@@ -68,11 +44,12 @@ public class PasteInTableHandler extends AbstractTableHandler {
 	 */

 	@Override

 	public Object execute(ExecutionEvent event) throws ExecutionException {

-		this.pasteManager.paste(getCurrentNattableModelManager(), pasteMode, useProgressMonitorDialog);

+		CSVPasteHelper pasteHelper = new CSVPasteHelper();

+		PasteAxisInNattableManager pasteManager = new PasteAxisInNattableManager(getCurrentNattableModelManager(), pasteHelper, useProgressMonitorDialog, TableClipboardUtils.getClipboardContentsAsString());

+		pasteManager.doPaste();

 		return null;

 	}

 

-

 	/**

 	 * @Override

 	 * @see org.eclipse.papyrus.infra.nattable.handler.AbstractTableHandler#setEnabled(java.lang.Object)

@@ -80,21 +57,7 @@ public class PasteInTableHandler extends AbstractTableHandler {
 	 * @param evaluationContext

 	 */

 	public void setEnabled(Object evaluationContext) {

-		pasteMode = null;

-		this.manager = getCurrentNattableModelManager();

-		boolean isEnabled = false;

-		if(manager != null) {

-			pasteMode = this.pasteManager.getPasteMode(evaluationContext, manager);

-			switch(pasteMode) {

-			case CANT_PASTE:

-				isEnabled = false;

-				break;

-			default:

-				isEnabled = true;

-			}

-

-		}

-		setBaseEnabled(isEnabled);

+		setBaseEnabled(getCurrentNattableModelManager() != null);

 	}

 

 

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/AbstractPasteImportInNattableManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/AbstractPasteImportInNattableManager.java
new file mode 100644
index 00000000000..13bfe2307be
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/AbstractPasteImportInNattableManager.java
@@ -0,0 +1,367 @@
+/*****************************************************************************

+ * 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:

+ *		

+ *		 Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.nattable.manager;

+

+import java.io.IOException;

+import java.io.Reader;

+

+import org.eclipse.core.runtime.IStatus;

+import org.eclipse.core.runtime.MultiStatus;

+import org.eclipse.core.runtime.Status;

+import org.eclipse.emf.ecore.EStructuralFeature;

+import org.eclipse.jface.dialogs.MessageDialog;

+import org.eclipse.osgi.util.NLS;

+import org.eclipse.papyrus.infra.nattable.Activator;

+import org.eclipse.papyrus.infra.nattable.dialog.PasteImportStatusDialog;

+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

+import org.eclipse.papyrus.infra.nattable.messages.Messages;

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration;

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration;

+import org.eclipse.papyrus.infra.nattable.parsers.CSVParser;

+import org.eclipse.papyrus.infra.nattable.parsers.CellIterator;

+import org.eclipse.papyrus.infra.nattable.parsers.RowIterator;

+import org.eclipse.papyrus.infra.nattable.provider.PasteEObjectAxisInNattableCommandProvider;

+import org.eclipse.papyrus.infra.nattable.utils.AxisConfigurationUtils;

+import org.eclipse.papyrus.infra.nattable.utils.CSVPasteHelper;

+import org.eclipse.papyrus.infra.nattable.utils.CreatableEObjectAxisUtils;

+import org.eclipse.papyrus.infra.nattable.utils.PasteConfigurationUtils;

+import org.eclipse.papyrus.infra.nattable.utils.PasteEnablementStatus;

+import org.eclipse.papyrus.infra.nattable.utils.PasteModeEnumeration;

+import org.eclipse.swt.widgets.Display;

+

+/**

+ * 

+ * Abstract class for the copy/paste and import file in the table

+ * 

+ */

+public abstract class AbstractPasteImportInNattableManager {

+

+	/**

+	 * the helper used to do the paste (help for the split of the string)

+	 */

+	protected final CSVPasteHelper pasteHelper;

+

+	/**

+	 * the table manager

+	 */

+	protected final INattableModelManager tableManager;

+

+	/**

+	 * true if we must use progress monitor

+	 */

+	private boolean useProgressMonitorDialog;

+

+	/**

+	 * message in case of inverted table

+	 */

+	private static final String INVERTED_MESSAGE = Messages.AbstractPasteImportInNattableManager_INVERTED_MESSAGE;

+

+

+	/**

+	 * 

+	 * Constructor.

+	 * 

+	 * @param pasteHelper

+	 *        the helper used to do the paste (help for the split of the string)

+	 */

+	public AbstractPasteImportInNattableManager(final INattableModelManager tableManager, final CSVPasteHelper pasteHelper, final boolean useProgressMonitorDialog) {

+		this.pasteHelper = pasteHelper;

+		this.tableManager = tableManager;

+		this.useProgressMonitorDialog = useProgressMonitorDialog;

+	}

+

+

+

+	/**

+	 * This method manages the paste and the possible error dialog before doing the paste

+	 * 

+	 * @return

+	 *         <code>true</code> if the paste can be done (as it is done in a job, it will be after the return of this method)

+	 */

+	public boolean doPaste() {

+		if(this.tableManager.getTable().isInvertAxis()) {

+			new PasteImportStatusDialog(Display.getDefault().getActiveShell(), INVERTED_MESSAGE).open();

+			return false;

+		}

+		final PasteEnablementStatus pasteStatus = findPasteModeFromTableConfiguration(this.tableManager);

+		if(pasteStatus.getPasteMode() == PasteModeEnumeration.PASTE_EOBJECT_ROW_OR_COLUMN) {

+			boolean value = MessageDialog.openQuestion(Display.getDefault().getActiveShell(), PasteImportStatusDialog.DIALOG_TITLE, Messages.AbstractPasteImportInNattableManager_WhatAreYouPasting);

+			if(value) {

+				pasteStatus.getColumnStatus().add(new Status(IStatus.CANCEL, Activator.PLUGIN_ID, Messages.AbstractPasteImportInNattableManager_TheUserChosesToPasteRows));

+			} else {

+				pasteStatus.getRowStatus().add(new Status(IStatus.CANCEL, Activator.PLUGIN_ID, Messages.AbstractPasteImportInNattableManager_TheUserChosesToPasteColumns));

+			}

+		}

+		PasteModeEnumeration pasteMode = pasteStatus.getPasteMode();

+		switch(pasteMode) {

+		case PASTE_NO_CONFIGURATION:

+			return openPasteWithNoConfigurationDialog();

+		case CANT_PASTE:

+			return openCantPasteDialog(pasteStatus);

+		case PASTE_EOBJECT_ROW:

+			return pasteRow(this.tableManager, pasteStatus, pasteHelper);

+		case PASTE_EOBJECT_COLUMN:

+			return pasteColumn(this.tableManager, pasteStatus, pasteHelper);

+		case PASTE_EOBJECT_ROW_OR_COLUMN:

+			//nothing to do

+			break;

+		default:

+			break;

+		}

+

+		return false;

+	}

+

+

+	/**

+	 * 

+	 * @param pasteStatus

+	 *        the paste status

+	 * @return

+	 */

+	private boolean openCantPasteDialog(final PasteEnablementStatus pasteStatus) {

+		final MultiStatus rowStatus = pasteStatus.getRowStatus();

+		final MultiStatus columnStatus = pasteStatus.getColumnStatus();

+		if(rowStatus == null && columnStatus != null) {

+			new PasteImportStatusDialog(Display.getCurrent().getActiveShell(), getFirstNonOKStatus(columnStatus).getMessage()).open();

+		} else if(columnStatus == null && rowStatus != null) {

+			new PasteImportStatusDialog(Display.getCurrent().getActiveShell(), getFirstNonOKStatus(rowStatus).getMessage()).open();

+		} else if(columnStatus != null && rowStatus != null) {

+			StringBuffer buffer = new StringBuffer(Messages.AbstractPasteImportInNattableManager_NoPasteConfiguration);

+			buffer.append(Messages.AbstractPasteImportInNattableManager_PasteRowsError);

+			buffer.append(getFirstNonOKStatus(rowStatus).getMessage());

+			buffer.append(Messages.AbstractPasteImportInNattableManager_PasteColumnsError);

+			buffer.append(getFirstNonOKStatus(columnStatus).getMessage());

+			new PasteImportStatusDialog(Display.getDefault().getActiveShell(), buffer.toString()).open();

+		} else {

+			//never possible

+			openPasteWithNoConfigurationDialog();

+		}

+		return true;

+	}

+

+	/**

+	 * 

+	 * @param status

+	 *        a status

+	 * @return

+	 *         the first non ok status

+	 */

+	private IStatus getFirstNonOKStatus(final IStatus status) {

+		if(status != null && !status.isOK()) {

+			for(final IStatus current : status.getChildren()) {

+				if(!current.isOK()) {

+					if(current.isMultiStatus()) {

+						return getFirstNonOKStatus(current);

+					} else {

+						return current;

+					}

+				}

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * open the dialog used when the table has no paste configuration

+	 * 

+	 * @return

+	 */

+	private boolean openPasteWithNoConfigurationDialog() {

+		new PasteImportStatusDialog(Display.getDefault().getActiveShell(), Messages.AbstractPasteImportInNattableManager_NoPasteConfiguration2, MessageDialog.INFORMATION).open();

+		return true;

+	}

+

+	/**

+	 * 

+	 * @param manager

+	 *        the table manager

+	 * @param pasteStatus

+	 *        the paste status

+	 * @param pasteHelper

+	 *        the paste helper

+	 * @return

+	 *         <code>true</code> if the paste can be done

+	 */

+	private boolean pasteColumn(final INattableModelManager manager, final PasteEnablementStatus pasteStatus, final CSVPasteHelper pasteHelper) {

+		//TODO

+		return false;

+	}

+

+	/**

+	 * 

+	 * @param manager

+	 *        the table manager

+	 * @param pasteStatus

+	 *        the paste status

+	 * @param pasteHelper

+	 *        the paste helper

+	 * @return

+	 *         <code>true</code> if the paste can be done

+	 */

+	private boolean pasteRow(final INattableModelManager manager, final PasteEnablementStatus pasteStatus, final CSVPasteHelper pasteHelper) {

+		final Reader reader = createReader();

+		final IStatus status = verifyColumnCountOnFirstLine(manager, reader);

+		try {

+			reader.close();

+		} catch (IOException e) {

+			Activator.log.error(e);

+		}

+		if(status.isOK()) {

+			paste(manager, pasteStatus, useProgressMonitorDialog, createReader(), getDataSize());

+		} else {

+			new PasteImportStatusDialog(Display.getDefault().getActiveShell(), status.getMessage()).open();

+			return false;

+		}

+		return true;

+	}

+

+

+	/**

+	 * 

+	 * @param tableManager

+	 *        the table manager

+	 * @param reader

+	 *        the reader to use to do parsing

+	 * @return

+	 *         a status indicating if the first line of the file allows to do the paste

+	 */

+	private IStatus verifyColumnCountOnFirstLine(final INattableModelManager tableManager, final Reader reader) {

+		CSVParser parser = this.pasteHelper.createParser(reader);

+		//we verify the nb of columns

+		final RowIterator rowIter = parser.parse();

+		int nbCell = 0;

+		if(rowIter.hasNext()) {

+			final CellIterator cellIter = rowIter.next();

+			while(cellIter.hasNext()) {

+				cellIter.next();

+				nbCell++;

+			}

+		}

+		final int axisCount = tableManager.getColumnCount();

+		if(axisCount == nbCell) {

+			return new Status(IStatus.OK, Activator.PLUGIN_ID, Messages.AbstractPasteImportInNattableManager_NumberOfColumnsAreEquals);

+		} else {

+			return new Status(IStatus.ERROR, Activator.PLUGIN_ID, NLS.bind(Messages.AbstractPasteImportInNattableManager_NumberOfColumnsAreNotEquals, nbCell, axisCount));

+		}

+	}

+

+

+

+	/**

+	 * 

+	 * @param manager

+	 *        the table manager

+	 * @param status

+	 *        the status

+	 * @param useProgressMonitorDialog

+	 *        if <code>true</code> a progress monitor will be used

+	 * @param reader

+	 *        the reader used to import data in the table.

+	 * @param totalSize

+	 *        the full size of the elements to import

+	 */

+	private void paste(final INattableModelManager manager, final PasteEnablementStatus status, final boolean useProgressMonitorDialog, final Reader reader, final long totalSize) {

+		PasteEObjectAxisInNattableCommandProvider commandProvider = null;

+		switch(status.getPasteMode()) {

+		case PASTE_EOBJECT_ROW:

+			commandProvider = new PasteEObjectAxisInNattableCommandProvider(manager, false, reader, this.pasteHelper, totalSize);

+			break;

+		case PASTE_EOBJECT_COLUMN:

+			commandProvider = new PasteEObjectAxisInNattableCommandProvider(manager, true, reader, this.pasteHelper, totalSize);

+			break;

+		default:

+			break;

+		}

+		//TODO : ask for the element to paste (column or row)!

+		if(commandProvider != null) {

+			commandProvider.executePasteFromStringCommand(useProgressMonitorDialog);

+		}

+	}

+

+	/**

+	 * 

+	 * @param tableManager

+	 *        the table manager used to calculate the enablement of the paste

+	 * @return

+	 *         the status for the paste

+	 */

+	private PasteEnablementStatus findPasteModeFromTableConfiguration(final INattableModelManager tableManager) {

+		final MultiStatus pasteRowsStatus = canPasteAxis_verifyPasteConfiguration(tableManager, false);

+		final MultiStatus pasteColumnsStatus = canPasteAxis_verifyPasteConfiguration(tableManager, true);

+		final PasteEnablementStatus pasteStatus = new PasteEnablementStatus(pasteColumnsStatus, pasteRowsStatus);

+		return pasteStatus;

+	}

+

+	/**

+	 * 

+	 * @param tableManager

+	 *        teh table manager

+	 * @param columnAxis

+	 *        if <code>true</code> this method tests the paste configuration for the columns, if not, it tests the paste configuration for the rows

+	 * @return

+	 *         a multi status with information on all verified point in the table configuration or <code>null</code> when there is no table

+	 *         configuration

+	 */

+	private static MultiStatus canPasteAxis_verifyPasteConfiguration(final INattableModelManager tableManager, final boolean columnAxis) {

+		final IPasteConfiguration conf = (IPasteConfiguration)AxisConfigurationUtils.getIAxisConfigurationUsedInTable(tableManager.getTable(), NattableaxisconfigurationPackage.eINSTANCE.getPasteEObjectConfiguration(), columnAxis);

+		final String pluginId = Activator.PLUGIN_ID;

+		final String axisName = columnAxis ? Messages.AbstractPasteImportInNattableManager_column : Messages.AbstractPasteImportInNattableManager_row;

+		MultiStatus status = null;

+		if(conf instanceof PasteEObjectConfiguration) {

+			status = new MultiStatus(pluginId, IStatus.OK, NLS.bind(Messages.AbstractPasteImportInNattableManager_EnablementStatusForPasteInTheTable, axisName), null);

+			status.add(new Status(IStatus.OK, pluginId, NLS.bind(Messages.AbstractPasteImportInNattableManager_TheTableHasAConfigurationToPaste, axisName)));

+			if(status.isOK()) {

+				final PasteEObjectConfiguration pasteConfiguration = (PasteEObjectConfiguration)conf;

+				status.add(PasteConfigurationUtils.hasConsistentPasteEObjectConfiguration(pasteConfiguration));

+

+				//verify that the table context have the required feature

+				if(status.isOK()) {

+					final EStructuralFeature containmentFeature = pasteConfiguration.getPasteElementContainementFeature();

+					if(tableManager.getTable().getContext().eClass().getEAllStructuralFeatures().contains(containmentFeature)) {

+						status.add(new Status(IStatus.OK, pluginId, Messages.AbstractPasteImportInNattableManager_TheContextOfTheTableHasTheContainmentFeatureDefinedForThePaste));

+					} else {

+						status.add(new Status(IStatus.ERROR, pluginId, Messages.AbstractPasteImportInNattableManager_TheContextOfTheTableHasNotTheContainmentFeatureDefinedForThePaste));

+					}

+

+					//verify that the elements to create are supported by the axis manager

+					if(status.isOK()) {

+						final String elementId = pasteConfiguration.getPastedElementId();

+						if(CreatableEObjectAxisUtils.getCreatableElementIds(tableManager, columnAxis).contains(elementId)) {

+							status.add(new Status(IStatus.OK, pluginId, NLS.bind(Messages.AbstractPasteImportInNattableManager_TheTableCanCreateElement, elementId, axisName)));

+						} else {

+							status.add(new Status(IStatus.OK, pluginId, NLS.bind(Messages.AbstractPasteImportInNattableManager_TheTableCantCreateElement, elementId, axisName)));

+						}

+					}

+				}

+			}

+		}

+		return status;

+	}

+

+	/**

+	 * 

+	 * @return

+	 *         a new reader

+	 */

+	protected abstract Reader createReader();

+

+	/**

+	 * 

+	 * @return

+	 *         the size of the copied data

+	 */

+	protected abstract long getDataSize();

+}

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/ImportAxisInNattableManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/ImportAxisInNattableManager.java
new file mode 100644
index 00000000000..aa65257b2a7
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/ImportAxisInNattableManager.java
@@ -0,0 +1,62 @@
+package org.eclipse.papyrus.infra.nattable.manager;

+

+import java.io.File;

+import java.io.FileNotFoundException;

+import java.io.FileReader;

+import java.io.Reader;

+

+import org.eclipse.papyrus.infra.nattable.Activator;

+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

+import org.eclipse.papyrus.infra.nattable.utils.CSVPasteHelper;

+

+

+public class ImportAxisInNattableManager extends AbstractPasteImportInNattableManager {

+

+	/**

+	 * the file to import

+	 */

+	private File file;

+

+	/**

+	 * 

+	 * Constructor.

+	 * 

+	 * @param tableManager

+	 * @param pasteHelper

+	 * @param fileToImport

+	 * @param useProgressMonitorDialog

+	 */

+	public ImportAxisInNattableManager(INattableModelManager tableManager, CSVPasteHelper pasteHelper, final File fileToImport, boolean useProgressMonitorDialog) {

+		super(tableManager, pasteHelper, useProgressMonitorDialog);

+		this.file = fileToImport;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.papyrus.infra.nattable.manager.AbstractPasteImportInNattableManager#createReader()

+	 * 

+	 * @return

+	 */

+	@Override

+	protected Reader createReader() {

+		FileReader reader = null;

+		try {

+			reader = new FileReader(file);

+		} catch (FileNotFoundException e) {

+			Activator.log.error(e);

+		}

+		return reader;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.papyrus.infra.nattable.manager.AbstractPasteImportInNattableManager#getDataSize()

+	 * 

+	 * @return

+	 */

+	@Override

+	protected long getDataSize() {

+		return this.file.length();

+	}

+

+}

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/PasteAxisInNattableManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/PasteAxisInNattableManager.java
new file mode 100644
index 00000000000..1ceeb35bcbc
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/PasteAxisInNattableManager.java
@@ -0,0 +1,70 @@
+/*****************************************************************************

+ * 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:

+ *		

+ *		 Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.nattable.manager;

+

+import java.io.Reader;

+import java.io.StringReader;

+

+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

+import org.eclipse.papyrus.infra.nattable.utils.CSVPasteHelper;

+

+/**

+ * 

+ * This class allows to paste axis from string

+ * 

+ */

+public class PasteAxisInNattableManager extends AbstractPasteImportInNattableManager {

+

+	/**

+	 * the text to paste

+	 */

+	private final String pastedText;

+

+	/**

+	 * 

+	 * Constructor.

+	 * 

+	 * @param tableManager

+	 * @param pasteHelper

+	 * @param useProgressMonitorDialog

+	 * @param pastedText

+	 */

+	public PasteAxisInNattableManager(final INattableModelManager tableManager, final CSVPasteHelper pasteHelper, final boolean useProgressMonitorDialog, final String pastedText) {

+		super(tableManager, pasteHelper, useProgressMonitorDialog);

+		this.pastedText = pastedText;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.papyrus.infra.nattable.manager.AbstractPasteImportInNattableManager#createReader()

+	 * 

+	 * @return

+	 */

+	@Override

+	protected Reader createReader() {

+		return new StringReader(this.pastedText);

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.papyrus.infra.nattable.manager.AbstractPasteImportInNattableManager#getDataSize()

+	 * 

+	 * @return

+	 */

+	@Override

+	protected long getDataSize() {

+		return this.pastedText.length();

+	}

+

+}

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/PasteInTableManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/PasteInTableManager.java
deleted file mode 100644
index b063d60a3e8..00000000000
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/PasteInTableManager.java
+++ /dev/null
@@ -1,136 +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

- *

- * Contributors:

- *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.infra.nattable.manager;

-

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.IPasteConfiguration;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration;

-import org.eclipse.papyrus.infra.nattable.provider.PasteEObjectAxisInTableCommandProvider;

-import org.eclipse.papyrus.infra.nattable.utils.AxisConfigurationUtils;

-import org.eclipse.papyrus.infra.nattable.utils.CreatableEObjectAxisUtils;

-import org.eclipse.papyrus.infra.nattable.utils.PasteConfigurationUtils;

-import org.eclipse.papyrus.infra.nattable.utils.PasteModeEnumeration;

-import org.eclipse.papyrus.infra.nattable.utils.TableClipboardUtils;

-

-/**

- * 

- * This class manager the paste into the table

- * 

- */

-public class PasteInTableManager {

-

-	/**

-	 * 

-	 * @param evaluationContext

-	 *        the evaluation context

-	 * @param tableManager

-	 *        the table manager

-	 * @return

-	 *         the paste mode

-	 */

-	public PasteModeEnumeration getPasteMode(final Object evaluationContext, final INattableModelManager tableManager) {

-		return getPasteMode(tableManager);

-	}

-

-

-

-	/**

-	 * 

-	 * @param tableManager

-	 *        the table manager

-	 * @param pasteMode

-	 *        the paste mode

-	 * @param useProgressMonitorDialog

-	 *        if <code>true</code> we will use a progress monitor to do the paste

-	 */

-	public void paste(final INattableModelManager tableManager, final PasteModeEnumeration pasteMode, boolean useProgressMonitorDialog) {

-		switch(pasteMode) {

-		case PASTE_EOBJECT_COLUMN:

-		case PASTE_EOBJECT_ROW:

-		case PASTE_EOBJECT_ROW_OR_COLUMN:

-			PasteEObjectAxisInTableCommandProvider commandProvider = new PasteEObjectAxisInTableCommandProvider(tableManager, pasteMode);

-			commandProvider.executePasteFromStringCommand(useProgressMonitorDialog);

-			break;

-		default:

-			break;

-		}

-	}

-

-	/**

-	 * 

-	 * @param tableManager

-	 *        the table manager

-	 * @return

-	 *         a java enumeration literal indicating the way to do the paste

-	 */

-	private static final PasteModeEnumeration getPasteMode(final INattableModelManager tableManager) {

-		PasteModeEnumeration result = PasteModeEnumeration.CANT_PASTE;

-		boolean canPasteColumns = canPasteAxis(tableManager, true);

-		boolean canPasteRows = canPasteAxis(tableManager, false);

-		if(canPasteColumns && canPasteRows) {

-			result = PasteModeEnumeration.PASTE_EOBJECT_ROW_OR_COLUMN;

-		} else if(canPasteColumns) {

-			result = PasteModeEnumeration.PASTE_EOBJECT_COLUMN;

-		} else if(canPasteRows) {

-			result = PasteModeEnumeration.PASTE_EOBJECT_ROW;

-		}

-		return result;

-	}

-

-

-	/**

-	 * 

-	 * @param tableManager

-	 *        the table manager

-	 * @return

-	 *         <code>true</code> if the contents of the clipboard contains the same number of columns than the table manager displays

-	 */

-	private static boolean canPasteAxis(final INattableModelManager tableManager, boolean columnAxis) {

-		final IPasteConfiguration conf = (IPasteConfiguration)AxisConfigurationUtils.getIAxisConfigurationUsedInTable(tableManager.getTable(), NattableaxisconfigurationPackage.eINSTANCE.getPasteEObjectConfiguration(), columnAxis);

-		boolean result = conf instanceof PasteEObjectConfiguration;

-		PasteEObjectConfiguration pasteConfiguration = (PasteEObjectConfiguration)conf;

-		result = result && PasteConfigurationUtils.hasConsistentPasteEObjectConfiguration(pasteConfiguration);

-

-		//verify that the table context have the required feature

-		if(result) {

-			final EStructuralFeature containmentFeature = pasteConfiguration.getPasteElementContainementFeature();

-			result = result && tableManager.getTable().getContext().eClass().getEAllStructuralFeatures().contains(containmentFeature);

-		}

-		//verify that the elements to create are supported by the axis manager

-		if(result) {

-			final String elementId = pasteConfiguration.getPastedElementId();

-			result = result && CreatableEObjectAxisUtils.getCreatableElementIds(tableManager, columnAxis).contains(elementId);

-		}

-		if(result) {

-			final String[] axis;

-			final int axisCount;

-			if(columnAxis) {

-				axis = TableClipboardUtils.getColumnsFromClipboard();

-				axisCount = tableManager.getRowCount();

-			} else {

-				axis = TableClipboardUtils.getRowsFromClipboard();

-				axisCount = tableManager.getColumnCount();

-			}

-

-			if(axis != null && axis.length > 0) {

-				int nbAxis = TableClipboardUtils.getCells(axis[0]).length;

-				result = axisCount == nbAxis;

-			}

-		}

-		return result;

-	}

-

-}

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/AbstractNattableWidgetManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/AbstractNattableWidgetManager.java
index 811fb97a7e0..b4bf438bb2b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/AbstractNattableWidgetManager.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/AbstractNattableWidgetManager.java
@@ -23,7 +23,6 @@ import org.eclipse.jface.action.IContributionItem;
 import org.eclipse.jface.action.MenuManager;

 import org.eclipse.nebula.widgets.nattable.NatTable;

 import org.eclipse.nebula.widgets.nattable.config.AbstractRegistryConfiguration;

-import org.eclipse.nebula.widgets.nattable.config.CellConfigAttributes;

 import org.eclipse.nebula.widgets.nattable.config.ConfigRegistry;

 import org.eclipse.nebula.widgets.nattable.config.EditableRule;

 import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

@@ -61,7 +60,6 @@ import org.eclipse.papyrus.infra.nattable.dataprovider.AbstractDataProvider;
 import org.eclipse.papyrus.infra.nattable.dataprovider.BodyDataProvider;

 import org.eclipse.papyrus.infra.nattable.dataprovider.ColumnHeaderDataProvider;

 import org.eclipse.papyrus.infra.nattable.dataprovider.RowHeaderDataProvider;

-import org.eclipse.papyrus.infra.nattable.formatter.PapyrusExportFormatter;

 import org.eclipse.papyrus.infra.nattable.layer.PapyrusGridLayer;

 import org.eclipse.papyrus.infra.nattable.layerstack.BodyLayerStack;

 import org.eclipse.papyrus.infra.nattable.layerstack.ColumnHeaderLayerStack;

@@ -207,7 +205,7 @@ public abstract class AbstractNattableWidgetManager implements INattableModelMan
 			final Menu menu = menuMgr.createContextMenu(this.natTable);

 			this.natTable.setMenu(menu);

 

-			this.selectionProvider = new TableSelectionProvider(this.bodyLayerStack.getSelectionLayer());

+			this.selectionProvider = new TableSelectionProvider(this, this.bodyLayerStack.getSelectionLayer());

 			site.registerContextMenu(menuMgr, this.selectionProvider);

 			site.setSelectionProvider(this.selectionProvider);

 		}

@@ -222,8 +220,6 @@ public abstract class AbstractNattableWidgetManager implements INattableModelMan
 			configRegistry.registerConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, getLabelProviderService(), DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);

 			//commented because seems generate several bugs with edition

 			//newRegistry.registerConfigAttribute( CellConfigAttributes.DISPLAY_CONVERTER, new GenericDisplayConverter(), DisplayMode.NORMAL,  GridRegion.BODY);

-			configRegistry.registerConfigAttribute(CellConfigAttributes.EXPORT_FORMATTER, new PapyrusExportFormatter());

-

 			this.natTable.setConfigRegistry(configRegistry);

 			this.natTable.setUiBindingRegistry(new UiBindingRegistry(this.natTable));

 			this.natTable.configure();

@@ -425,9 +421,15 @@ public abstract class AbstractNattableWidgetManager implements INattableModelMan
 

 	@Override

 	public void dispose() {

-		this.bodyDataProvider.dispose();

-		this.rowHeaderDataProvider.dispose();

-		this.columnHeaderDataProvider.dispose();

+		if(this.bodyDataProvider != null) {

+			this.bodyDataProvider.dispose();

+		}

+		if(this.rowHeaderDataProvider != null) {

+			this.rowHeaderDataProvider.dispose();

+		}

+		if(this.columnHeaderDataProvider != null) {

+			this.columnHeaderDataProvider.dispose();

+		}

 		this.tableContext = null;

 	}

 

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/INattableModelManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/INattableModelManager.java
index 1245111f82f..7bb978e574f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/INattableModelManager.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/INattableModelManager.java
@@ -16,6 +16,7 @@ package org.eclipse.papyrus.infra.nattable.manager.table;
 import java.util.Collection;

 

 import org.eclipse.emf.common.command.Command;

+import org.eclipse.jface.preference.PreferenceStore;

 import org.eclipse.nebula.widgets.nattable.NatTable;

 import org.eclipse.nebula.widgets.nattable.data.IDataProvider;

 import org.eclipse.nebula.widgets.nattable.ui.NatEventData;

@@ -179,4 +180,17 @@ public interface INattableModelManager extends ITableAxisElementProvider, IDispo
 	 */

 	public IAxisManager getRowAxisManager();

 

+	/**

+	 * 

+	 * @return

+	 *         the local preference store for the table instance or <code>null</code>

+	 */

+	public PreferenceStore getTablePreferenceStore();

+

+	/**

+	 * 

+	 * @param store

+	 *        the table preference store

+	 */

+	public void setWorkspacePreferenceStore(final PreferenceStore store);

 }

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/NattableModelManager.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/NattableModelManager.java
index 7fd56632a9f..b3166a86baa 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/NattableModelManager.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/manager/table/NattableModelManager.java
@@ -42,6 +42,7 @@ import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

 import org.eclipse.jface.dialogs.MessageDialog;

+import org.eclipse.jface.preference.PreferenceStore;

 import org.eclipse.jface.viewers.ILabelProvider;

 import org.eclipse.jface.viewers.ViewerComparator;

 import org.eclipse.jface.window.Window;

@@ -151,6 +152,11 @@ public class NattableModelManager extends AbstractNattableWidgetManager implemen
 	private BiMap<CellMapKey, Cell> cellsMap;

 

 	/**

+    * the local preference store for the table

+    */

+	private PreferenceStore localPreferenceStore;

+

+	/**

 	 * 

 	 * Constructor.

 	 * 

@@ -502,8 +508,12 @@ public class NattableModelManager extends AbstractNattableWidgetManager implemen
 	@Override

 	public void dispose() {

 		if(this.tableEditingDomain != null && this.contextEditingDomain != null) {

-			this.tableEditingDomain.getCommandStack().removeCommandStackListener(this.refreshListener);

-			this.contextEditingDomain.getCommandStack().removeCommandStackListener(this.refreshListener);

+			if(this.tableEditingDomain.getCommandStack() != null) {

+				this.tableEditingDomain.getCommandStack().removeCommandStackListener(this.refreshListener);

+			}

+			if(this.contextEditingDomain.getCommandStack() != null) {

+				this.contextEditingDomain.getCommandStack().removeCommandStackListener(this.refreshListener);

+			}

 			this.columnManager.dispose();

 			this.rowManager.dispose();

 			Table table = getTable();

@@ -1329,4 +1339,26 @@ public class NattableModelManager extends AbstractNattableWidgetManager implemen
 		return new CellMapKey(cell.getColumnWrapper().getElement(), cell.getRowWrapper().getElement());

 	}

 

+	/**

+	 * 

+	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#getTablePreferenceStore()

+	 * 

+	 * @return

+	 */

+	@Override

+	public PreferenceStore getTablePreferenceStore() {

+		return this.localPreferenceStore;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager#setWorkspacePreferenceStore(org.eclipse.jface.preference.PreferenceStore)

+	 * 

+	 * @param store

+	 */

+	@Override

+	public void setWorkspacePreferenceStore(final PreferenceStore store) {

+		this.localPreferenceStore = store;

+	}

+

 }

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/Messages.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/Messages.java
index d532d8149ad..2ee63196322 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/Messages.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/Messages.java
@@ -31,6 +31,42 @@ public class Messages extends NLS {
 

 	public static String AbstractCreateNattableEditorHandler_PapyrusTableCreation;

 

+	public static String AbstractPasteImportInNattableManager_column;

+

+	public static String AbstractPasteImportInNattableManager_EnablementStatusForPasteInTheTable;

+

+	public static String AbstractPasteImportInNattableManager_INVERTED_MESSAGE;

+

+	public static String AbstractPasteImportInNattableManager_NoPasteConfiguration;

+

+	public static String AbstractPasteImportInNattableManager_NoPasteConfiguration2;

+

+	public static String AbstractPasteImportInNattableManager_NumberOfColumnsAreEquals;

+

+	public static String AbstractPasteImportInNattableManager_NumberOfColumnsAreNotEquals;

+

+	public static String AbstractPasteImportInNattableManager_PasteColumnsError;

+

+	public static String AbstractPasteImportInNattableManager_PasteRowsError;

+

+	public static String AbstractPasteImportInNattableManager_row;

+

+	public static String AbstractPasteImportInNattableManager_TheContextOfTheTableHasNotTheContainmentFeatureDefinedForThePaste;

+

+	public static String AbstractPasteImportInNattableManager_TheContextOfTheTableHasTheContainmentFeatureDefinedForThePaste;

+

+	public static String AbstractPasteImportInNattableManager_TheTableCanCreateElement;

+

+	public static String AbstractPasteImportInNattableManager_TheTableCantCreateElement;

+

+	public static String AbstractPasteImportInNattableManager_TheTableHasAConfigurationToPaste;

+

+	public static String AbstractPasteImportInNattableManager_TheUserChosesToPasteColumns;

+

+	public static String AbstractPasteImportInNattableManager_TheUserChosesToPasteRows;

+

+	public static String AbstractPasteImportInNattableManager_WhatAreYouPasting;

+

 	public static String AbstractSaveCurrentAxisProvidersHandler_0;

 

 	public static String AbstractSaveCurrentAxisProvidersHandler_1;

@@ -131,8 +167,38 @@ public class Messages extends NLS {
 

 	public static String TableTesterRegistry_TheClassCantBeLoaded;

 

+	public static String TextDelimiter_DoubleQuote;

+

+	public static String TextDelimiter_Quote;

+

 	public static String ICellManager_NotAvailable;

 

+	public static String ImportCSVConfigurationPage_SelectTheTextDelimiter;

+

+	public static String ImportCSVConfigurationPage_Separators;

+

+	public static String ImportCSVConfigurationPage_TheCellSeparatorIsNotDefined;

+

+	public static String ImportCSVConfigurationPage_TheCellSeparatorMustBeExcatlyOneChar;

+

+	public static String ImportFilePage_BeSureThatYourImportFileHasTheSameNumberOfColumns;

+

+	public static String ImportFilePage_SelectTheFileToImport;

+

+	public static String ImportFilePage_TheImportedElementWillBeAddedTo;

+

+	public static String ImportFilePage_YourFileWillBeImported;

+

+	public static String ImportTableErrorPage_PleaseOpenAPapyrusEditor;

+

+	public static String ImportTableWizard_ConfigureImport;

+

+	public static String ImportTableWizard_ImportTable;

+

+	public static String ImportTableWizard_ImportTableError;

+

+	public static String ImportTableWizard_ImportTableFromFileInPapyrusModel;

+

 	public static String AbstractUMLTableEFacetEditor_UMLTableCreationErrorMessage;

 

 	public static String ColumnsToShowDialog_AdditionalFeatures;

@@ -169,6 +235,20 @@ public class Messages extends NLS {
 

 	public static String LoadCurrentAxisProvidersDialog_3;

 

+	public static String PasteConfigurationUtils_ContainementFeatureIsNotAReference;

+

+	public static String PasteConfigurationUtils_ContainmentFeatureIsNotAReferenceContainment;

+

+	public static String PasteConfigurationUtils_ContainmentFeatureIsNull;

+

+	public static String PasteConfigurationUtils_CreatesElementsAreNotCompatibleWithContainmentFeature;

+

+	public static String PasteConfigurationUtils_ElementIdNotDefined;

+

+	public static String PasteConfigurationUtils_ElementTypeCantBeFound;

+

+	public static String PasteConfigurationUtils_PasteConfigurationIsConsistent;

+

 	public static String PasteEObjectAxisInTableCommandProvider_AddingElementToTheTable;

 

 	public static String PasteEObjectAxisInTableCommandProvider_CommandCreationHasBeenCancelled;

@@ -189,6 +269,10 @@ public class Messages extends NLS {
 

 	public static String PasteEObjectAxisInTableCommandProvider_PasteRows;

 

+	public static String PasteImportStatusDialog_ImportPasteDialogTitle;

+

+	public static String PasteImportStatusDialog_PasteConfigurationMessage;

+

 	public static String PasteInPapyrusTableCommandProvider_0;

 

 	public static String PasteInPapyrusTableCommandProvider_1;

@@ -224,6 +308,15 @@ public class Messages extends NLS {
 	public static String PasteInTableHandler_PasteCreation;

 

 	public static String PasteInTableHandler_ThePasteCommandCantBeExecuted;

+	public static String PasteSeparator_Comma;

+

+	public static String PasteSeparator_Other;

+

+	public static String PasteSeparator_Semicolon;

+

+	public static String PasteSeparator_Space;

+

+	public static String PasteSeparator_Tabulation;

 	static {

 		// initialize resource bundle

 		NLS.initializeMessages(BUNDLE_NAME, Messages.class);

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/messages.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/messages.properties
index 44cadf7b763..4c646b3cda0 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/messages.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/messages.properties
@@ -2,6 +2,24 @@ AbstractAxisManager_InputDialogMessage=The real name for the header is: \n\t %s
 AbstractAxisManager_InputDialogTitle=Edit Header Alias Dialog

 AbstractCreateNattableEditorHandler_EnterTheNameForTheNewTable=Enter the name for the new table

 AbstractCreateNattableEditorHandler_PapyrusTableCreation=Papyrus Table Creation

+AbstractPasteImportInNattableManager_column=column

+AbstractPasteImportInNattableManager_EnablementStatusForPasteInTheTable=Enablement status for paste {0} in the table

+AbstractPasteImportInNattableManager_INVERTED_MESSAGE=The axis of your table are inverted. This case is not yet managed. You must have elements as rows and features as columns.

+AbstractPasteImportInNattableManager_NoPasteConfiguration=Neither of the row paste configuration and column paste configuration allows to create elements in the table\n.

+AbstractPasteImportInNattableManager_NoPasteConfiguration2=Your table has no paste configuration

+AbstractPasteImportInNattableManager_NumberOfColumnsAreEquals=The number of columns by rows is the same as the number of columns in the table

+AbstractPasteImportInNattableManager_NumberOfColumnsAreNotEquals=The number of columns by rows is not the same as the number of columns in the table.\n You are trying to paste {0} columns in a table which has {1} columns

+AbstractPasteImportInNattableManager_PasteColumnsError=\n Paste column error:\n\t

+AbstractPasteImportInNattableManager_PasteRowsError=\n Paste row error:\n\t

+AbstractPasteImportInNattableManager_row=row

+AbstractPasteImportInNattableManager_TheContextOfTheTableHasNotTheContainmentFeatureDefinedForThePaste=The context of the table doesn't have the containment feature defined for the paste

+AbstractPasteImportInNattableManager_TheContextOfTheTableHasTheContainmentFeatureDefinedForThePaste=The context of the table has the containment feature defined for the paste

+AbstractPasteImportInNattableManager_TheTableCanCreateElement=The table can create {0} as {1}

+AbstractPasteImportInNattableManager_TheTableCantCreateElement=The table can't create {0} as {1}

+AbstractPasteImportInNattableManager_TheTableHasAConfigurationToPaste=The table has a configuration to paste {0}.

+AbstractPasteImportInNattableManager_TheUserChosesToPasteColumns=The user has chosen to paste columns.

+AbstractPasteImportInNattableManager_TheUserChosesToPasteRows=The user has chosen to paste rows.

+AbstractPasteImportInNattableManager_WhatAreYouPasting=I can't find if you are pasting rows elements or columns elements.\n Press "Yes" to paste rows and "No" to paste columns.

 AbstractSaveCurrentAxisProvidersHandler_0=Enter name and description

 AbstractSaveCurrentAxisProvidersHandler_1=Name:

 AbstractSaveCurrentAxisProvidersHandler_2=Description:

@@ -54,7 +72,22 @@ ProblemLabelProvider_StringsValuesCanBeResolved={0} string(s) values can't be re
 TableLabelProvider_ErrorGettingIconForTable=Error getting icon image for tables: 

 TableTesterRegistry_SeveralTesterAreRegisteredWithTheSameId=Several classes are registered for the id {0}

 TableTesterRegistry_TheClassCantBeLoaded=Class registrered with id {0} can't be loaded

+TextDelimiter_DoubleQuote=double quote

+TextDelimiter_Quote=quote

 ICellManager_NotAvailable=N/A

+ImportCSVConfigurationPage_SelectTheTextDelimiter=Select the text delimiter used in your file.

+ImportCSVConfigurationPage_Separators=Separators

+ImportCSVConfigurationPage_TheCellSeparatorIsNotDefined=The cell separator is not defined.

+ImportCSVConfigurationPage_TheCellSeparatorMustBeExcatlyOneChar=The cell separator must be exactly 1 character.

+ImportFilePage_BeSureThatYourImportFileHasTheSameNumberOfColumns=Be sure that your imported file has the same number of columns than the current table

+ImportFilePage_SelectTheFileToImport=Select the file to import

+ImportFilePage_TheImportedElementWillBeAddedTo=The imported element will be added to:

+ImportFilePage_YourFileWillBeImported=Your import will be done in the table:

+ImportTableErrorPage_PleaseOpenAPapyrusEditor=Please open a Papyrus table editor before to do the import.

+ImportTableWizard_ConfigureImport=Configure Import

+ImportTableWizard_ImportTable=Import Table

+ImportTableWizard_ImportTableError=Import Table Error

+ImportTableWizard_ImportTableFromFileInPapyrusModel=Import Table From File In Papyrus Model

 AbstractUMLTableEFacetEditor_UMLTableCreationErrorMessage=A UML Table can't be created with a non-UML element as context ({0})

 ColumnsToShowDialog_AdditionalFeatures=Additional Features

 ColumnsToShowDialog_AdvancedMode=Advanced Mode

@@ -73,6 +106,13 @@ LoadCurrentAxisProvidersDialog_0=Name
 LoadCurrentAxisProvidersDialog_1=Description

 LoadCurrentAxisProvidersDialog_2=Columns

 LoadCurrentAxisProvidersDialog_3=\ (current)

+PasteConfigurationUtils_ContainementFeatureIsNotAReference=The containment feature for the pasted elements is not a reference.

+PasteConfigurationUtils_ContainmentFeatureIsNotAReferenceContainment=The containement feature is not a reference in containment.

+PasteConfigurationUtils_ContainmentFeatureIsNull=The containment feature for the pasted elements is null.

+PasteConfigurationUtils_CreatesElementsAreNotCompatibleWithContainmentFeature=The created elements ({0}) are not compatible with the containmment feature {1}.

+PasteConfigurationUtils_ElementIdNotDefined=The element id describing the kind of pasted element is not defined.

+PasteConfigurationUtils_ElementTypeCantBeFound=The element type for {0} can be found.

+PasteConfigurationUtils_PasteConfigurationIsConsistent=The paste configuration is consistent.

 PasteEObjectAxisInTableCommandProvider_AddingElementToTheTable=Adding Elements To The table

 PasteEObjectAxisInTableCommandProvider_CommandCreationHasBeenCancelled=Command creation has been cancelled

 PasteEObjectAxisInTableCommandProvider_CreatingAnumberXonY=\ Creating {0} number {1}/{2}

@@ -83,6 +123,8 @@ PasteEObjectAxisInTableCommandProvider_PasteAction=Paste Action
 PasteEObjectAxisInTableCommandProvider_PasteColumns=Paste Columns

 PasteEObjectAxisInTableCommandProvider_PasteFromStringCommand=Paste from String Command

 PasteEObjectAxisInTableCommandProvider_PasteRows=Paste Rows

+PasteImportStatusDialog_ImportPasteDialogTitle=Import/Paste In Table

+PasteImportStatusDialog_PasteConfigurationMessage=You can configure the Paste/Import using the Property View of the table.

 PasteInPapyrusTableCommandProvider_0=The String {0} is not valid to create a {1}.

 PasteInPapyrusTableCommandProvider_1=Paste Command In FlowPort Table

 PasteInPapyrusTableCommandProvider_2=Create Paste Action

@@ -101,3 +143,8 @@ PasteInPapyrusTableCommandProvider_TheTextCantBeMappedOnAnExistingElement=The te
 PasteInTableHandler_PasteCancelled=Paste Action Canceled

 PasteInTableHandler_PasteCreation=Paste creation...

 PasteInTableHandler_ThePasteCommandCantBeExecuted=The paste command can't be executed

+PasteSeparator_Comma=Comma

+PasteSeparator_Other=Other

+PasteSeparator_Semicolon=Semicolon

+PasteSeparator_Space=Space

+PasteSeparator_Tabulation=Tabulation

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/parsers/CSVLexer.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/parsers/CSVLexer.java
new file mode 100644
index 00000000000..77a12273808
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/parsers/CSVLexer.java
@@ -0,0 +1,281 @@
+/**
+ * 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:
+ * Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *
+ */
+package org.eclipse.papyrus.infra.nattable.parsers;
+
+import java.io.Reader;
+
+/**
+ * Represents a lexer for a CSV document
+ * 
+ * Lexing rules are:
+ * LineEnding -> '\n' | '\r' | '\r\n'
+ * Separator -> what is given in parameter
+ * TextMarker -> what is given in parameter
+ * Whitespace -> (Unicode IsWhitespace character class) - (Separator | TextMarker | '\n' | '\r')
+ * Cell -> (. - Whitespace)*
+ * Cell -> TextMarker ( (.-TextMarker) | (TextMarker TextMarker)* ) TextMarker
+ * 
+ * In these rules . represents any character and - represents the language difference operator.
+ * The last rule means that inside a quoted cell value the content can be anything except the quote character, in which case it must be doubled.
+ * 
+ * @author Laurent Wouters
+ */
+public class CSVLexer {
+	/**
+	 * Represents an error in this lexer
+	 */
+	public static final int TOKEN_ERROR = -1;
+	/**
+	 * Token type of cells' value in a CSV
+	 */
+	public static final int TOKEN_VALUE = 0;
+	/**
+	 * Token type of cells' separator
+	 */
+	public static final int TOKEN_SEPARATOR = 1;
+	/**
+	 * Token type of new line markers
+	 */
+	public static final int TOKEN_NEW_ROW = 2;
+	/**
+	 * Token type for the end of input marker
+	 */
+	public static final int TOKEN_EOF = 3;
+
+	/**
+	 * Size of the buffer used to build the tokens
+	 */
+	private static final int BUFFER_SIZE = 1024;
+
+	private RewindableTextStream input; // the input stream
+	private char separator; // The cell separator character
+	private char textMarker; // The raw text beginning and end character
+	private char[] builder; // The buffer used to build the tokens
+	private int lastTokenType; // The type of the last matched token
+	private String lastTokenValue; // The value of the last matched token
+
+	/**
+	 * Initializes this lexer
+	 * 
+	 * @param input
+	 *            The input text reader
+	 * @param valueSeparator
+	 *            The character that separates values in rows
+	 * @param textMarker
+	 *            The character that marks the beginning and end of raw text
+	 */
+	public CSVLexer(Reader input, char valueSeparator, char textMarker) {
+		this.input = new RewindableTextStream(input);
+		this.separator = valueSeparator;
+		this.textMarker = textMarker;
+		this.builder = new char[BUFFER_SIZE];
+		this.lastTokenType = TOKEN_ERROR;
+		this.lastTokenValue = null;
+	}
+
+	/**
+	 * Gets the type of the last matched token
+	 * 
+	 * @return The type of the last matched token
+	 */
+	public int getTokenType() {
+		return lastTokenType;
+	}
+
+	/**
+	 * Gets the value of the last matched token
+	 * 
+	 * @return The value of the last matched token
+	 */
+	public String getTokenValue() {
+		return lastTokenValue;
+	}
+
+	/**
+	 * Gets the next token in the input
+	 * 
+	 * @return The next token
+	 */
+	public String next() {
+		// ignore all whitespaces
+		char c = input.read();
+		if (input.isAtEnd())
+			return getTokenEOF();
+		while (isWhitespace(c)) {
+			c = input.read();
+			if (input.isAtEnd())
+				return getTokenEOF();
+		}
+
+		// Here c is not whitespace and we are not at the end
+		if (c == separator)
+			return getTokenSeparator();
+		if (c == textMarker)
+			return onTextMarkerChar();
+		if (c == '\r' || c == '\n')
+			return onLineEndingChar(c);
+
+		// Here we are on normal data
+		int length = 1;
+		builder[0] = c;
+		while (true) {
+			c = input.read();
+			if (input.isAtEnd())
+				break;
+			if (c == separator || c == '\r' || c == '\n') {
+				input.rewind(1);
+				break;
+			}
+			builder[length] = c;
+			length++;
+		}
+
+		// we matched the data
+		// Now, trim the trailing white spaces
+		while (length > 0 && isWhitespace(builder[length - 1])) {
+			length--;
+		}
+
+		return getTokenValue(length);
+	}
+
+	/**
+	 * Determines whether the given character is a white space that can be skipped
+	 * 
+	 * @param c
+	 *            The character
+	 * @return <code>true</code> if the character can be skipped
+	 */
+	private boolean isWhitespace(char c) {
+		if (c == separator || c == textMarker || c == '\n' || c == '\r')
+			return false;
+		return Character.isWhitespace(c);
+	}
+
+	/**
+	 * Lexes the line ending token beginning with the given character
+	 * 
+	 * @param c
+	 *            The beginning character
+	 * @return The matched token
+	 */
+	private String onLineEndingChar(char c) {
+		if (c == '\n')
+			return getTokenNewRow();
+		// This was a '\r' character
+		// Check for windows line ending style
+		char n = input.read();
+		if (input.isAtEnd())
+			return getTokenNewRow();
+		if (n != '\n')
+			input.rewind(1);
+		return getTokenNewRow();
+	}
+
+	/**
+	 * Lexes the raw text between marks
+	 * 
+	 * @return The matched token
+	 */
+	private String onTextMarkerChar() {
+		int length = 0;
+		while (true) {
+			char c = input.read();
+			if (input.isAtEnd())
+				return getTokenError();
+			if (c != textMarker) {
+				builder[length] = c;
+				length++;
+			} else {
+				// get the following char
+				c = input.read();
+				if (c == textMarker) {
+					// This is a double marker
+					builder[length] = c;
+					length++;
+				} else {
+					// This was the end of the quoted text
+					if (!input.isAtEnd())
+						input.rewind(1);
+					return getTokenValue(length);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Gets an error token
+	 * 
+	 * @return An error token
+	 */
+	private String getTokenError() {
+		lastTokenType = TOKEN_ERROR;
+		lastTokenValue = null;
+		return null;
+	}
+
+	/**
+	 * Gets an end of input marker token
+	 * 
+	 * @return An end of input marker token
+	 */
+	private String getTokenEOF() {
+		lastTokenType = TOKEN_EOF;
+		lastTokenValue = null;
+		return null;
+	}
+
+	/**
+	 * Gets a cell separator token
+	 * 
+	 * @return A cell separator token
+	 */
+	private String getTokenSeparator() {
+		lastTokenType = TOKEN_SEPARATOR;
+		lastTokenValue = null;
+		return null;
+	}
+
+	/**
+	 * Gets a new row token
+	 * 
+	 * @return A new row token
+	 */
+	private String getTokenNewRow() {
+		lastTokenType = TOKEN_NEW_ROW;
+		lastTokenValue = null;
+		return null;
+	}
+
+	/**
+	 * Gets a token representing a cell's value
+	 * 
+	 * @param length
+	 *            Length of the value
+	 * @return A token
+	 */
+	private String getTokenValue(int length) {
+		lastTokenType = TOKEN_VALUE;
+		lastTokenValue = new String(builder, 0, length);
+		return lastTokenValue;
+	}
+
+	/**
+	 * 
+	 * @return
+	 *         the number of read characters
+	 */
+	public long getReadCharacters() {
+		return this.input.getReadCharacters();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/parsers/CSVParser.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/parsers/CSVParser.java
new file mode 100644
index 00000000000..80ac5876d9e
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/parsers/CSVParser.java
@@ -0,0 +1,219 @@
+/**
+ * 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:
+ * Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *
+ */
+package org.eclipse.papyrus.infra.nattable.parsers;
+
+import java.io.Reader;
+
+/**
+ * Represents a parser of CSV document
+ * This parser implements the following grammar:
+ * Document -> Row (LineEnding Row)* EOF
+ * Row -> ( Cell (Separator Cell)* )?
+ * 
+ * An empty document is matched as having a single row with no cell.
+ * A line ending just before the EOF also represents an empty row.
+ * 
+ * @author Laurent Wouters
+ */
+public class CSVParser {
+	private CSVLexer lexer; // the input lexer
+	private RowIterator output; // the ouput iterators
+
+	/**
+	 * Initializes this parser
+	 * 
+	 * @param input
+	 *            The input to parse
+	 * @param valueSeparator
+	 *            The character that separates values in rows
+	 * @param textMarker
+	 *            The character that marks the beginning and end of raw text
+	 */
+	public CSVParser(Reader input, char valueSeparator, char textMarker) {
+		this.lexer = new CSVLexer(input, valueSeparator, textMarker);
+		this.output = new Document();
+	}
+
+	/**
+	 * Parses the input and gets an iterator over the rows
+	 * 
+	 * @return An iterator over the document's rows
+	 */
+	public RowIterator parse() {
+		return output;
+	}
+
+	/**
+	 * 
+	 * @return
+	 *         the number of read characters
+	 */
+	public long getReadCharacters() {
+		return this.lexer.getReadCharacters();
+	}
+
+	/**
+	 * Represents a row in a CSV document as an iterator over the value of its cells
+	 * This class uses a small state machine to matches the tokens against the following regular expression:
+	 * Row -> (Cell (Separator Cell)* )? End
+	 * Cell is a cell's value token in the lexer
+	 * Separator is a separator token in the lexer
+	 * End can be either the Error, EOF, or Line ending tokens
+	 * 
+	 * @author Laurent Wouters
+	 */
+	private class Row extends CellIterator {
+		private static final int STATE_INIT = 0;
+		private static final int STATE_CELL = 1;
+		private static final int STATE_SEPARATOR = 2;
+		private static final int STATE_END = 3;
+
+		private String next; // value of the next cell in this row
+		private int state; // current state in the state machine
+
+		/**
+		 * Initializes this row
+		 */
+		public Row() {
+			state = 0;
+			findNext();
+		}
+
+		/**
+		 * Executes the transitions on the initial state
+		 */
+		public void onStateInit() {
+			next = lexer.next();
+			int type = lexer.getTokenType();
+			if (type == CSVLexer.TOKEN_VALUE) {
+				state = STATE_CELL;
+			} else if (type == CSVLexer.TOKEN_SEPARATOR) {
+				next = ""; //$NON-NLS-1$
+				state = STATE_SEPARATOR;
+			} else {
+				next = null;
+				state = STATE_END;
+			}
+		}
+
+		/**
+		 * Executes the transitions on the OnCell state
+		 */
+		private void onStateCell() {
+			next = lexer.next();
+			int type = lexer.getTokenType();
+			if (type == CSVLexer.TOKEN_SEPARATOR) {
+				onStateSeparator();
+			} else {
+				next = null;
+				state = STATE_END;
+			}
+		}
+
+		/**
+		 * Executes the transitions on the OnSeparator state
+		 */
+		private void onStateSeparator() {
+			next = lexer.next();
+			int type = lexer.getTokenType();
+			if (type == CSVLexer.TOKEN_VALUE) {
+				state = STATE_CELL;
+			} else if (type == CSVLexer.TOKEN_SEPARATOR) {
+				next = ""; //$NON-NLS-1$
+				state = STATE_SEPARATOR;
+			} else {
+				next = ""; //$NON-NLS-1$
+				state = STATE_END;
+			}
+		}
+
+		/**
+		 * Executes the transitions on the final state
+		 */
+		private void onStateEnd() {
+			next = null;
+		}
+
+		/**
+		 * Executes the state machine
+		 */
+		private void findNext() {
+			switch (state) {
+			case STATE_INIT:
+				onStateInit();
+				break;
+			case STATE_CELL:
+				onStateCell();
+				break;
+			case STATE_SEPARATOR:
+				onStateSeparator();
+				break;
+			default:
+				onStateEnd();
+				break;
+			}
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * 
+		 * @see java.util.Iterator#hasNext()
+		 */
+		@Override
+		public boolean hasNext() {
+			return (next != null);
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * 
+		 * @see java.util.Iterator#next()
+		 */
+		@Override
+		public String next() {
+			String value = next;
+			findNext();
+			return value;
+		}
+	}
+
+	/**
+	 * Represents a CSV document as an iterator over its rows
+	 * 
+	 * @author Laurent Wouters
+	 * 
+	 */
+	private class Document extends RowIterator {
+		/*
+		 * (non-Javadoc)
+		 * 
+		 * @see java.util.Iterator#hasNext()
+		 */
+		@Override
+		public boolean hasNext() {
+			return (lexer.getTokenType() != CSVLexer.TOKEN_EOF);
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * 
+		 * @see java.util.Iterator#next()
+		 */
+		@Override
+		public CellIterator next() {
+			return new Row();
+		}
+	}
+
+
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/parsers/CellIterator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/parsers/CellIterator.java
new file mode 100644
index 00000000000..ac3c920c24d
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/parsers/CellIterator.java
@@ -0,0 +1,32 @@
+/**
+ * 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:
+ * Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *
+ */
+package org.eclipse.papyrus.infra.nattable.parsers;
+
+import java.util.Iterator;
+
+/**
+ * Represents an iterator over cells in a single row in a CSV document
+ * 
+ * @author Laurent Wouters
+ */
+public abstract class CellIterator implements Iterator<String> {
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.util.Iterator#remove()
+	 */
+	public void remove() {
+		throw new UnsupportedOperationException();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/parsers/RewindableTextStream.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/parsers/RewindableTextStream.java
new file mode 100644
index 00000000000..defc90eb9fd
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/parsers/RewindableTextStream.java
@@ -0,0 +1,145 @@
+/**
+ * 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:
+ * Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *
+ */
+package org.eclipse.papyrus.infra.nattable.parsers;
+
+import java.io.IOException;
+import java.io.Reader;
+
+/**
+ * Represents a stream of characters that can be rewound
+ * 
+ * @author Laurent Wouters
+ */
+public class RewindableTextStream {
+
+	private static final int BUFFER_SIZE = 1024; // Size of the buffer used to read from the input
+
+	private static final int RING_SIZE = 1024; // Size of the ring storing read characters that can be rewound
+
+	private Reader reader; // Encapsulated text reader
+
+	private char[] buffer; // First stage buffer for batch reading of the stream
+
+	private int bufferStart; // Index where the next character shall be read in the buffer
+
+	private int bufferLength; // Current length of the buffer
+
+	private boolean atEnd; // Marker of the end of input
+
+	private char[] ring; // Ring memory of this reader storing the already read characters
+
+	private int ringStart; // Start index of the ring where to read characters
+
+	private int ringNextEntry; // Index for inserting new characters in the ring
+
+	private long counter;
+
+	/**
+	 * Initializes this stream
+	 * 
+	 * @param reader
+	 *        The underlying text reader
+	 */
+	public RewindableTextStream(Reader reader) {
+		this.reader = reader;
+		this.buffer = new char[BUFFER_SIZE];
+		this.bufferStart = 0;
+		this.bufferLength = 0;
+		this.ring = new char[RING_SIZE];
+		this.ringStart = 0;
+		this.ringNextEntry = 0;
+		this.counter = 0;
+	}
+
+	/**
+	 * Determines whether the end of the input has been reached
+	 * 
+	 * @return <code>true</code> if the end of the input has been reached
+	 */
+	public boolean isAtEnd() {
+		return atEnd;
+	}
+
+	/**
+	 * Goes back into the stream of the given number of characters
+	 * 
+	 * @param count
+	 *        The number of characters to rewind
+	 */
+	public void rewind(int count) {
+		ringStart -= count;
+		counter -= count;
+		if(ringStart < 0) {
+			ringStart += RING_SIZE;
+		}
+	}
+
+	/**
+	 * Reads the next character in the stream
+	 * 
+	 * @return The next character
+	 */
+	public char read() {
+		if(atEnd) {
+			return 0;
+		}
+		counter++;
+		if(ringStart != ringNextEntry) {
+			atEnd = false;
+			char value = ring[ringStart++];
+			if(ringStart == RING_SIZE) {
+				ringStart = 0;
+			}
+			return value;
+		}
+		return readBuffer();
+	}
+
+	/**
+	 * Reads the next character from the input
+	 * 
+	 * @return The next character in the stream
+	 */
+	private char readBuffer() {
+		if(bufferStart == bufferLength) {
+			bufferLength = -1;
+			try {
+				bufferLength = reader.read(buffer, 0, BUFFER_SIZE);
+			} catch (IOException e) {
+				//nothing to report
+			}
+			bufferStart = 0;
+			if(bufferLength <= 0) {
+				atEnd = true;
+				return 0;
+			}
+		}
+		atEnd = false;
+		char c = buffer[bufferStart++];
+		ring[ringNextEntry++] = c;
+		if(ringNextEntry == RING_SIZE) {
+			ringNextEntry = 0;
+		}
+		ringStart = ringNextEntry;
+		return c;
+	}
+
+	/**
+	 * 
+	 * @return
+	 *         the number of read characters
+	 */
+	public long getReadCharacters() {
+		return this.counter;
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/parsers/RowIterator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/parsers/RowIterator.java
new file mode 100644
index 00000000000..13f4e24c591
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/parsers/RowIterator.java
@@ -0,0 +1,32 @@
+/**
+ * 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:
+ * Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *
+ */
+package org.eclipse.papyrus.infra.nattable.parsers;
+
+import java.util.Iterator;
+
+/**
+ * Represents an iterator over rows in a CSV document
+ * 
+ * @author Laurent Wouters
+ */
+public abstract class RowIterator implements Iterator<CellIterator> {
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see java.util.Iterator#remove()
+	 */
+	public void remove() {
+		throw new UnsupportedOperationException();
+	}
+}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/PasteSeparator.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/PasteSeparator.java
new file mode 100644
index 00000000000..ccae0c0bbae
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/PasteSeparator.java
@@ -0,0 +1,101 @@
+/*****************************************************************************

+ * 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:

+ *		

+ *		 Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.nattable.paste;

+

+import org.eclipse.papyrus.infra.nattable.messages.Messages;

+

+

+/**

+ * 

+ * Enumeration for cell delimiters in CSV files

+ * 

+ */

+public enum PasteSeparator {

+	/**

+	 * tabulation value

+	 */

+	TABULATION('\t', Messages.PasteSeparator_Tabulation),

+

+	/**

+	 * semicolon value

+	 */

+	SEMICOLON(';', Messages.PasteSeparator_Semicolon),

+

+	/**

+	 * Comma value

+	 */

+	COMMA(',', Messages.PasteSeparator_Comma),

+	/**

+	 * space value

+	 */

+	SPACE(' ', Messages.PasteSeparator_Space),

+

+	/**

+	 * other value

+	 */

+	OTHER(Messages.PasteSeparator_Other);

+

+	/**

+	 * the separator itself

+	 */

+	private final char separator;

+

+	/**

+	 * the name of the separator

+	 */

+	private final String name;

+

+	/**

+	 * 

+	 * Constructor.

+	 * 

+	 * @param name

+	 */

+	private PasteSeparator(final String name) {

+		this(Character.MIN_VALUE, name);//MIN_VALUE is a value as other one!

+	}

+

+	/**

+	 * 

+	 * Constructor.

+	 * 

+	 * @param separator

+	 * @param name

+	 */

+	private PasteSeparator(char separator, String name) {

+		this.separator = separator;

+		this.name = name;

+	}

+

+	/**

+	 * 

+	 * @return

+	 *         the separator to use

+	 */

+	public char getSeparator() {

+		if(this == OTHER) {

+			throw new UnsupportedOperationException();

+		}

+		return separator;

+	}

+

+	/**

+	 * 

+	 * @return

+	 *         the name of the separator

+	 */

+	public String getName() {

+		return name;

+	}

+}

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/TextDelimiter.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/TextDelimiter.java
new file mode 100644
index 00000000000..f284171fbc0
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/paste/TextDelimiter.java
@@ -0,0 +1,74 @@
+/*****************************************************************************

+ * 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:

+ *		

+ *		 Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.nattable.paste;

+

+import org.eclipse.papyrus.infra.nattable.messages.Messages;

+

+/**

+ * 

+ * Enumeration for text delimiters

+ *

+ */

+public enum TextDelimiter {

+

+	/**

+	 * the single quote

+	 */

+	SINGLE_QUOTE('\'', Messages.TextDelimiter_Quote),

+		

+	/**

+	 * the double quote

+	 */

+	DOUBLE_QUOTE('"', Messages.TextDelimiter_DoubleQuote);

+	

+	/**

+	 * the delimiter itself

+	 */

+	private final char delimiter;

+

+	/**

+	 * the name of the delimiter

+	 */

+	private final String name;

+

+	/**

+	 * 

+	 * Constructor.

+	 *

+	 * @param delimiter

+	 * @param name

+	 */

+	private TextDelimiter(char delimiter, String name) {

+		this.delimiter = delimiter;

+		this.name = name;

+	}

+

+	/**

+	 * 

+	 * @return

+	 *         the separator to use

+	 */

+	public char getDelimiter() {

+		return delimiter;

+	}

+

+	/**

+	 * 

+	 * @return

+	 *         the name of the separator

+	 */

+	public String getName() {

+		return name;

+	}

+}

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/preferences/PapyrusTablePreferenceStore.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/preferences/PapyrusTablePreferenceStore.java
new file mode 100644
index 00000000000..867d19b639f
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/preferences/PapyrusTablePreferenceStore.java
@@ -0,0 +1,68 @@
+/*****************************************************************************

+ * Copyright (c) 2010 CEA LIST.

+ *

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.nattable.preferences;

+

+import org.eclipse.core.runtime.preferences.IScopeContext;

+import org.eclipse.papyrus.infra.tools.preferences.AbstractPapyrusPreferenceStore;

+import org.eclipse.papyrus.infra.tools.preferences.ui.dialog.AbstractApplyValueOnPreferenceKeyDialog;

+

+/**

+ * this class is a specific store that is used to look for value of element

+ * by taking account the structure of preferences : papyrus editor-> Diagram -> Elements of Diagram

+ * 

+ */

+public class PapyrusTablePreferenceStore extends AbstractPapyrusPreferenceStore {

+

+	/**

+	 * 

+	 * Constructor.

+	 * 

+	 * @param context

+	 * @param qualifier

+	 * @param defaultQualifierPath

+	 */

+	public PapyrusTablePreferenceStore(IScopeContext context, String qualifier, String defaultQualifierPath) {

+		super(context, qualifier, defaultQualifierPath, TablePreferencesConstantsHelper.PAPYRUS_TABLE_EDITOR_PREFERENCE_PREFIX, TablePreferencesConstantsHelper.TABLE_PREFERENCE_PREFIX, TablePreferencesConstantsHelper.TABLE_ELEMENT);

+	}

+

+

+	/**

+	 * 

+	 * Constructor.

+	 * 

+	 * @param context

+	 * @param qualifier

+	 */

+	public PapyrusTablePreferenceStore(IScopeContext context, String qualifier) {

+		super(context, qualifier, TablePreferencesConstantsHelper.PAPYRUS_TABLE_EDITOR_PREFERENCE_PREFIX, TablePreferencesConstantsHelper.TABLE_PREFERENCE_PREFIX, TablePreferencesConstantsHelper.TABLE_ELEMENT);

+	}

+

+

+	/**

+	 * 

+	 * @see org.eclipse.papyrus.infra.tools.preferences.AbstractPapyrusPreferenceStore#createPreferenceKeyDialog(java.lang.String[])

+	 * 

+	 * @param keys

+	 * @return

+	 */

+	@Override

+	protected AbstractApplyValueOnPreferenceKeyDialog createPreferenceKeyDialog(String[] keys) {

+		throw new UnsupportedOperationException("not yet implemented"); //$NON-NLS-1$

+	}

+

+

+

+

+

+}

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/preferences/TablePreferencesConstantsHelper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/preferences/TablePreferencesConstantsHelper.java
new file mode 100644
index 00000000000..18d18a94ae2
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/preferences/TablePreferencesConstantsHelper.java
@@ -0,0 +1,87 @@
+/*****************************************************************************

+ * 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:

+ *		

+ *		 Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.nattable.preferences;

+

+

+/**

+ * 

+ * @author VL222926

+ * 

+ */

+public class TablePreferencesConstantsHelper {

+

+	private TablePreferencesConstantsHelper() {

+		//to prevent instanciation

+	}

+

+	/**

+	 * Prefix for preference for Papyrus nattable Level editor

+	 */

+	public final static String PAPYRUS_TABLE_EDITOR_PREFERENCE_PREFIX = "PAPYRUS_TABLE_EDITOR"; //$NON-NLS-1$

+

+	/**

+	 * Prefix for preference for Diagram Level

+	 */

+	public final static String TABLE_PREFERENCE_PREFIX = "NATTABLE_"; //$NON-NLS-1$

+

+	/**

+	 * Prefix for preference for element Level

+	 */

+	public final static String TABLE_ELEMENT = "TABLE_ELEMENT_"; //$NON-NLS-1$

+

+

+	/**

+	 * Get the preference constant used to store the preference of an element.

+	 * 

+	 * @param elementName

+	 *        the name of the element

+	 * @param preferenceType

+	 *        the type of preference to store. It must be a value defined in {@link TablePreferencesConstantsHelper}

+	 * @return the constant used.

+	 */

+	public static String getConstant(String elementName, int preferenceType) {

+		throw new UnsupportedOperationException("Not yet implemented");//$NON-NLS-1$

+		//		StringBuffer sb = new StringBuffer();

+		//		sb.append(elementName);

+		//		sb.append("."); //$NON-NLS-1$

+		//		switch(preferenceType) {

+		//

+		//		default:

+		//			break;

+		//		}

+		//		return sb.toString();

+	}

+

+	/**

+	 * 

+	 * @param preferenceType

+	 *        the type of preference to store. It must be a value defined in {@link TablePreferencesConstantsHelper}

+	 * @return get the preference key at the papyrus editor level

+	 */

+	public static String getPapyrusEditorConstant(int preferenceType) {

+		return getConstant(PAPYRUS_TABLE_EDITOR_PREFERENCE_PREFIX, preferenceType);

+	}

+

+	/**

+	 * 

+	 * @param diagramKind

+	 *        the kind of diagram.

+	 * @param preferenceType

+	 *        the type of preference to store. It must be a value defined in {@link PreferenceConstantHelper}

+	 * @return the preference key at the diagram level

+	 */

+	public static String getNatTableConstant(String tableKind, int preferenceType) {

+		return TABLE_PREFERENCE_PREFIX + getConstant(tableKind, preferenceType);

+	}

+}

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/PasteEObjectAxisInNattableCommandProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/PasteEObjectAxisInNattableCommandProvider.java
new file mode 100644
index 00000000000..6dc82b8469e
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/PasteEObjectAxisInNattableCommandProvider.java
@@ -0,0 +1,840 @@
+package org.eclipse.papyrus.infra.nattable.provider;

+

+/*****************************************************************************

+ * 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

+ *

+ *****************************************************************************/

+import java.io.IOException;

+import java.io.Reader;

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Collections;

+import java.util.HashMap;

+import java.util.Iterator;

+import java.util.List;

+import java.util.Map;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.core.runtime.IStatus;

+import org.eclipse.core.runtime.NullProgressMonitor;

+import org.eclipse.core.runtime.Status;

+import org.eclipse.core.runtime.jobs.Job;

+import org.eclipse.emf.common.command.Command;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EFactory;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EReference;

+import org.eclipse.emf.ecore.EStructuralFeature;

+import org.eclipse.emf.edit.command.AddCommand;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.osgi.util.NLS;

+import org.eclipse.papyrus.commands.CheckedOperationHistory;

+import org.eclipse.papyrus.infra.nattable.Activator;

+import org.eclipse.papyrus.infra.nattable.manager.cell.CellManagerFactory;

+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

+import org.eclipse.papyrus.infra.nattable.messages.Messages;

+import org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage;

+import org.eclipse.papyrus.infra.nattable.model.nattable.Table;

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.NattableaxisconfigurationPackage;

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration;

+import org.eclipse.papyrus.infra.nattable.model.nattable.nattablecell.Cell;

+import org.eclipse.papyrus.infra.nattable.parsers.CSVParser;

+import org.eclipse.papyrus.infra.nattable.parsers.CellIterator;

+import org.eclipse.papyrus.infra.nattable.parsers.RowIterator;

+import org.eclipse.papyrus.infra.nattable.paste.IValueSetter;

+import org.eclipse.papyrus.infra.nattable.paste.PastePostActionRegistry;

+import org.eclipse.papyrus.infra.nattable.utils.AxisConfigurationUtils;

+import org.eclipse.papyrus.infra.nattable.utils.CSVPasteHelper;

+import org.eclipse.papyrus.infra.nattable.utils.Constants;

+import org.eclipse.papyrus.infra.nattable.utils.TableEditingDomainUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.infra.tools.converter.AbstractStringValueConverter;

+

+/**

+ * Paste command manager for the paste in the table

+ * 

+ * @author VL222926

+ * 

+ */

+

+public class PasteEObjectAxisInNattableCommandProvider {

+

+	private static final int MIN_AXIS_FOR_PROGRESS_MONITOR = 5;

+

+	/**

+	 * the containment feature to use

+	 */

+	private EStructuralFeature containmentFeature;

+

+	/**

+	 * the type to create

+	 */

+	private IElementType typeToCreate;

+

+	/**

+	 * the table manager

+	 */

+	private INattableModelManager tableManager;

+

+	/**

+	 * the paste mode

+	 */

+	//	private PasteEnablementStatus pasteMode;

+

+	/**

+	 * if true, we are pasting in detached mode

+	 */

+	private boolean detachedMode;

+

+	/**

+	 * the list of the post actions do do

+	 */

+	private List<String> postActions;

+

+	/**

+	 * the list of the axis to paste

+	 */

+	//	private final String[] axisToPaste;

+

+	/**

+	 * the paste helper

+	 */

+	private final CSVPasteHelper pasteHelper;

+

+	/**

+	 * the converter map

+	 */

+	private Map<Class<? extends AbstractStringValueConverter>, AbstractStringValueConverter> existingConverters;

+

+	private static final String PASTE_ACTION_TASK_NAME = Messages.PasteEObjectAxisInTableCommandProvider_PasteAction;

+

+	private static final String PASTE_ROWS_JOB_NAME = Messages.PasteEObjectAxisInTableCommandProvider_PasteRows;

+

+	private static final String PASTE_COLUMNS_JOB_NAME = Messages.PasteEObjectAxisInTableCommandProvider_PasteColumns;

+

+	private static final String PASTE_COMMAND_HAS_BEEN_CANCELLED = Messages.PasteEObjectAxisInTableCommandProvider_CommandCreationHasBeenCancelled;

+

+	private static final String PASTE_COMMAND_CANT_BE_EXECUTED = "The Paste command can't be executed"; //$NON-NLS-1$

+

+	private static final String PASTE_COMMAND_NAME = Messages.PasteEObjectAxisInTableCommandProvider_PasteFromStringCommand;

+

+	private static final String CREATING_ELEMENT_A_NUMBER_X_Y = Messages.PasteEObjectAxisInTableCommandProvider_CreatingAnumberXonY;

+

+	protected final boolean pasteColumn;

+

+	private final int nbOperationsToDo;

+

+

+	//we refresh the dialog each X read char 

+	private int refreshEachReadChar = 1000;

+

+	/**

+	 * if <code>true</code> the command can't be created and executed

+	 */

+	private boolean isDisposed = false;

+

+	/**

+	 * the reader to parse

+	 */

+	private final Reader reader;

+

+	/**

+	 * the parser to use

+	 */

+	private CSVParser parser;

+

+	int factor;

+

+	private Table table;

+

+	final TransactionalEditingDomain tableEditingDomain;

+

+	final TransactionalEditingDomain contextEditingDomain;

+

+	final EObject tableContext;

+

+	List<Object> secondAxis;

+

+	public PasteEObjectAxisInNattableCommandProvider(INattableModelManager tableManager, boolean pasteColumn, Reader reader, CSVPasteHelper pasteHelper2, long totalSize) {

+		this.tableManager = tableManager;

+		//		this.pasteMode = status;

+		this.existingConverters = new HashMap<Class<? extends AbstractStringValueConverter>, AbstractStringValueConverter>();

+		this.pasteHelper = pasteHelper2;

+		this.reader = reader;

+		this.pasteColumn = pasteColumn;

+		this.table = tableManager.getTable();

+		this.tableContext = table.getContext();

+		tableEditingDomain = TableEditingDomainUtils.getTableEditingDomain(table);

+		contextEditingDomain = TableEditingDomainUtils.getTableContextEditingDomain(table);

+		//TODO improve refresh and progress monitor...

+		long div = -1;

+		if(totalSize > Integer.MAX_VALUE) {

+			div = totalSize / Integer.MAX_VALUE;

+			if(div > Integer.MAX_VALUE) {

+				div = 2 * div;

+			}

+			this.factor = (int)div;

+			this.nbOperationsToDo = (int)(totalSize / div);

+		} else {

+			this.factor = 1;

+			this.nbOperationsToDo = (int)totalSize;

+		}

+		parser = this.pasteHelper.createParser(reader);

+		init();

+	}

+

+	/**

+	 * inits the field of this class

+	 */

+	private void init() {

+		PasteEObjectConfiguration configuration = null;

+		if(this.pasteColumn) {

+			configuration = (PasteEObjectConfiguration)AxisConfigurationUtils.getIAxisConfigurationUsedInTable(this.table, NattableaxisconfigurationPackage.eINSTANCE.getPasteEObjectConfiguration(), true);

+			this.secondAxis = tableManager.getRowElementsList();

+		} else {

+

+			configuration = (PasteEObjectConfiguration)AxisConfigurationUtils.getIAxisConfigurationUsedInTable(this.table, NattableaxisconfigurationPackage.eINSTANCE.getPasteEObjectConfiguration(), false);

+			this.secondAxis = tableManager.getColumnElementsList();

+		}

+		if(configuration != null) {

+			this.containmentFeature = configuration.getPasteElementContainementFeature();

+			this.typeToCreate = ElementTypeRegistry.getInstance().getType(configuration.getPastedElementId());

+			this.postActions = configuration.getPostActions();

+			this.detachedMode = configuration.isDetachedMode();

+		}

+	}

+

+	/**

+	 * 

+	 * @param useProgressMonitor

+	 *        boolean indicating that we must do the paste with a progress monitor

+	 *        TODO : post actions are not yet supported in the in the detached mode

+	 */

+	public void executePasteFromStringCommand(final boolean useProgressMonitor) {

+		if(this.pasteColumn) {//not yet supported

+			return;

+		}

+		if(this.isDisposed) {

+			throw new RuntimeException("The command provider is disposed");

+		}

+		final String pasteJobName;

+		if(this.pasteColumn) {

+			pasteJobName = PASTE_COLUMNS_JOB_NAME;

+		} else {

+			pasteJobName = PASTE_ROWS_JOB_NAME;

+		}

+		if(this.detachedMode) {

+			executePasteFromStringCommandInDetachedMode(useProgressMonitor, pasteJobName);

+		} else {

+			executePasteFromStringCommandInAttachedMode(useProgressMonitor, pasteJobName);

+		}

+	}

+

+

+	/**

+	 * 

+	 * @param useProgressMonitor

+	 *        boolean indicating that we must do the paste with a progress monitor

+	 */

+	private void executePasteFromStringCommandInDetachedMode(final boolean useProgressMonitor, final String pasteJobName) {

+		//the map used to share objects between the paste action and the cell value managers

+		final Map<Object, Object> sharedMap = new HashMap<Object, Object>();

+		//the map used to store useful information for the paste

+		sharedMap.put(Constants.PASTED_ELEMENT_CONTAINER_KEY, tableContext);

+		sharedMap.put(Constants.REFERENCES_TO_SET_KEY, new ArrayList<IValueSetter>());

+		sharedMap.put(Constants.CELLS_TO_ADD_KEY, new ArrayList<Cell>());

+

+		if(!useProgressMonitor) {

+			final ICommand pasteCommand = getPasteFromStringCommandInDetachedMode(contextEditingDomain, tableEditingDomain, new NullProgressMonitor(), sharedMap);

+			try {

+				CheckedOperationHistory.getInstance().execute(pasteCommand, new NullProgressMonitor(), null);

+			} catch (ExecutionException e) {

+				Activator.log.error(e);

+			}

+			sharedMap.clear();

+		} else {

+			//we create a job in order to don't freeze the UI

+			final Job job = new Job(pasteJobName) {

+

+				@Override

+				protected IStatus run(IProgressMonitor monitor) {

+

+					final ICommand pasteCommand = getPasteFromStringCommandInDetachedMode(contextEditingDomain, tableEditingDomain, monitor, sharedMap);

+					if(pasteCommand == null) {

+						return new Status(IStatus.CANCEL, Activator.PLUGIN_ID, PASTE_COMMAND_HAS_BEEN_CANCELLED);

+					}

+					//we execute the paste command

+					if(pasteCommand.canExecute()) {

+						try {

+							CheckedOperationHistory.getInstance().execute(pasteCommand, monitor, null);

+						} catch (ExecutionException e) {

+							return new Status(IStatus.ERROR, Activator.PLUGIN_ID, "An exception occured during the paste", e); //$NON-NLS-1$

+						} finally {

+							sharedMap.clear();

+						}

+						monitor.done();

+						return Status.OK_STATUS;

+					} else {

+						sharedMap.clear();

+						return new Status(IStatus.ERROR, Activator.PLUGIN_ID, PASTE_COMMAND_CANT_BE_EXECUTED);

+					}

+				}

+			};

+			job.setUser(true);

+			job.schedule();

+		}

+	}

+

+	/**

+	 * 

+	 * @param useProgressMonitor

+	 *        boolean indicating that we must do the paste with a progress monitor

+	 */

+	private void executePasteFromStringCommandInAttachedMode(final boolean useProgressMonitor, final String pasteJobName) {

+		if(!useProgressMonitor) {

+			final ICommand pasteCommand = getPasteFromStringCommandInAttachedMode(contextEditingDomain, tableEditingDomain, new NullProgressMonitor());

+			try {

+				CheckedOperationHistory.getInstance().execute(pasteCommand, new NullProgressMonitor(), null);

+			} catch (ExecutionException e) {

+				Activator.log.error(e);

+			}

+		} else {

+			//we create a job in order to don't freeze the UI

+			final Job job = new Job(pasteJobName) {

+

+				@Override

+				protected IStatus run(IProgressMonitor monitor) {

+

+					final ICommand pasteCommand = getPasteFromStringCommandInAttachedMode(contextEditingDomain, tableEditingDomain, monitor);

+					if(pasteCommand == null) {

+						return new Status(IStatus.CANCEL, Activator.PLUGIN_ID, PASTE_COMMAND_HAS_BEEN_CANCELLED);

+					}

+					//we execute the paste command

+					if(pasteCommand.canExecute()) {

+						try {

+							CheckedOperationHistory.getInstance().execute(pasteCommand, monitor, null);

+						} catch (ExecutionException e) {

+							return new Status(IStatus.ERROR, Activator.PLUGIN_ID, "An exception occured during the paste", e); //$NON-NLS-1$

+						}

+						monitor.done();

+						return Status.OK_STATUS;

+					} else {

+						return new Status(IStatus.ERROR, Activator.PLUGIN_ID, PASTE_COMMAND_CANT_BE_EXECUTED);

+					}

+				}

+			};

+			job.setUser(true);

+			job.schedule();

+		}

+	}

+

+	private ICommand getPasteRowFromStringCommandInDetachedMode(final TransactionalEditingDomain contextEditingDomain, final TransactionalEditingDomain tableEditingDomain, final IProgressMonitor progressMonitor, final Map<Object, Object> sharedMap) {

+		if(progressMonitor != null) {

+			progressMonitor.beginTask(PASTE_ACTION_TASK_NAME, this.nbOperationsToDo);//+1 to add the created elements to the table

+		}

+		//the list of the created elements

+		final List<Object> createdElements = new ArrayList<Object>();

+

+		//2.2 create the creation request and find the command provider

+		final EClass eClassToCreate = this.typeToCreate.getEClass();

+		final EFactory eFactory = eClassToCreate.getEPackage().getEFactoryInstance();

+

+		//2.3 create the axis

+		int nbCreatedElements = 0;

+

+		//we refresh the dialog each X read char 

+		long readChar = 0;

+		long previousreadChar = 0;

+		final RowIterator rowIter = this.parser.parse();

+		while(rowIter.hasNext()) {

+			final CellIterator cellIter = rowIter.next();

+			if(!cellIter.hasNext()) {

+				continue;//to avoid blank line

+			}

+			if((progressMonitor != null) && progressMonitor.isCanceled()) {

+				//the user click on the cancel button

+				return null;

+			}

+

+			readChar = readChar + (parser.getReadCharacters() - previousreadChar);

+			previousreadChar = parser.getReadCharacters();

+

+

+			if(progressMonitor != null && readChar > refreshEachReadChar) {

+				readChar = 0;

+				progressMonitor.subTask(NLS.bind("{0} {1} have been created.", new Object[]{ nbCreatedElements, typeToCreate.getEClass().getName() }));

+				progressMonitor.worked(refreshEachReadChar);

+			}

+			nbCreatedElements++;

+

+			//2.3.3 we create the element itself

+			final EObject createdElement = eFactory.create(eClassToCreate);

+

+			createdElements.add(createdElement);

+			nbCreatedElements++;

+			for(final String currentPostActions : this.postActions) {

+				PastePostActionRegistry.INSTANCE.doPostAction(this.tableManager, currentPostActions, tableContext, createdElement, sharedMap, null);//TODO : remove this parameter

+			}

+

+			//2.3.4 we set these properties values

+			final Iterator<Object> secondAxisIterator = secondAxis.iterator();

+			while(secondAxisIterator.hasNext() && cellIter.hasNext()) {

+				final Object currentAxis = secondAxisIterator.next();

+				final String valueAsString = cellIter.next();

+				final Object columnObject;

+				final Object rowObject;

+				if(this.pasteColumn) {

+					columnObject = createdElement;

+					rowObject = currentAxis;

+				} else {

+					columnObject = currentAxis;

+					rowObject = createdElement;

+				}

+

+

+				boolean isEditable = CellManagerFactory.INSTANCE.isCellEditable(columnObject, rowObject, sharedMap);

+				if(isEditable) {

+					final AbstractStringValueConverter converter = CellManagerFactory.INSTANCE.getOrCreateStringValueConverterClass(columnObject, rowObject, tableManager, existingConverters, this.pasteHelper.getMultiValueSeparator());

+					CellManagerFactory.INSTANCE.setStringValue(columnObject, rowObject, valueAsString, converter, tableManager, sharedMap);

+				}

+			}

+

+			//TODO : do something to say that the number of cell is not correct!

+			while(cellIter.hasNext()) {

+				cellIter.next();//required!

+			}

+		}

+

+		//2.4 we add the created elements to the table

+		final AbstractTransactionalCommand pasteCommand = new AbstractTransactionalCommand(tableEditingDomain, PASTE_COMMAND_NAME, null) {

+

+			@Override

+			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+				//initialize lists

+				final Collection<String> postActions = getPostActions();

+				@SuppressWarnings("unchecked")

+				final List<Cell> cells = (List<Cell>)sharedMap.get(Constants.CELLS_TO_ADD_KEY);

+				@SuppressWarnings("unchecked")

+				final List<IValueSetter> valueToSet = (List<IValueSetter>)sharedMap.get(Constants.REFERENCES_TO_SET_KEY);

+

+				int nbTasks = 1; //to add created elements to the model

+				nbTasks = nbTasks + 1; //to add createds elements to the table

+				nbTasks = nbTasks + postActions.size();//to do post actions after the attachment to the model

+				nbTasks = nbTasks + 1; //to attach the cells to the model

+				nbTasks = nbTasks + valueToSet.size(); //to set the references values

+

+				if(progressMonitor != null) {

+					if(progressMonitor.isCanceled()) {

+						localDispose();

+						return CommandResult.newCancelledCommandResult();

+					}

+					progressMonitor.beginTask(Messages.PasteEObjectAxisInTableCommandProvider_FinishingThePaste, nbTasks);

+				}

+

+				//1. Add the elements to the context

+				AddCommand.create(contextEditingDomain, tableContext, containmentFeature, createdElements).execute();

+

+				if(progressMonitor != null) {

+					if(progressMonitor.isCanceled()) {

+						return CommandResult.newCancelledCommandResult();

+					}

+					progressMonitor.worked(1);

+					progressMonitor.subTask(Messages.PasteEObjectAxisInTableCommandProvider_AddingElementToTheTable);

+				}

+

+				Command cmd = null;

+				if(pasteColumn) {

+					cmd = tableManager.getAddColumnElementCommand(createdElements); //TODO remove one of these 2 lines

+				} else {

+					cmd = tableManager.getAddRowElementCommand(createdElements);

+				}

+				if(cmd != null) {//could be null

+					cmd.execute();

+				}

+

+				if(progressMonitor != null) {

+					if(progressMonitor.isCanceled()) {

+						return CommandResult.newCancelledCommandResult();

+					}

+					progressMonitor.worked(1);

+					progressMonitor.subTask(Messages.PasteEObjectAxisInTableCommandProvider_DoingAdditionalActions);

+				}

+

+

+				for(final String currentPostActions : postActions) {

+					PastePostActionRegistry.INSTANCE.concludePostAction(tableManager, currentPostActions, sharedMap);

+					progressMonitor.worked(1);

+				}

+

+

+				if(progressMonitor != null) {

+					if(progressMonitor.isCanceled()) {

+						return CommandResult.newCancelledCommandResult();

+					}

+					progressMonitor.worked(1);

+					progressMonitor.subTask(Messages.PasteEObjectAxisInTableCommandProvider_LinkingReferencesToTheModel);

+				}

+

+				//we set the references

+

+				if(valueToSet.size() > 0) {

+					for(final IValueSetter current : valueToSet) {

+						current.doSetValue(contextEditingDomain);

+						if(progressMonitor != null) {

+							if(progressMonitor.isCanceled()) {

+								return CommandResult.newCancelledCommandResult();

+							}

+							progressMonitor.worked(1);

+						}

+					}

+				}

+

+				//the cells must be attached at the end (in order to update properly the cell map in the table manager

+				if(progressMonitor != null) {

+					if(progressMonitor.isCanceled()) {

+						return CommandResult.newCancelledCommandResult();

+					}

+					progressMonitor.worked(1);

+				}

+

+				//add the created cells to the table

+				AddCommand.create(tableEditingDomain, table, NattablePackage.eINSTANCE.getTable_Cells(), cells).execute();

+

+				if(progressMonitor != null) {

+					progressMonitor.done();

+				}

+				localDispose();

+				return CommandResult.newOKCommandResult();

+			}

+		};

+

+		return pasteCommand;

+	}

+

+

+	/**

+	 * 

+	 * 

+	 * @param sharedMap

+	 *        a map used to share objects and informations during the paste between this class and the cell value manager

+	 * @param commandCreationCancelProvider

+	 *        the creation command progress monitor

+	 * @param commandExecutionProgressMonitor

+	 *        the command execution progress monitor

+	 * @return

+	 *         the command to use to finish the paste (the main part of the paste is directly done here)

+	 */

+	private ICommand getPasteFromStringCommandInDetachedMode(final TransactionalEditingDomain contextEditingDomain, final TransactionalEditingDomain tableEditingDomain, final IProgressMonitor progressMonitor, final Map<Object, Object> sharedMap) {

+		if(!this.pasteColumn) {

+			return getPasteRowFromStringCommandInDetachedMode(contextEditingDomain, tableEditingDomain, progressMonitor, sharedMap);

+		} else {

+			//			return getPasteColumnFromStringCommandInDetachedMode(contextEditingDomain, tableEditingDomain, progressMonitor, sharedMap);

+		}

+		return null;

+	}

+

+

+

+	/**

+	 * 

+	 * @param commandCreationCancelProvider

+	 *        the creation command progress monitor

+	 * @param commandExecutionProgressMonitor

+	 *        the command execution progress monitor

+	 * @return

+	 */

+	private ICommand getPasteColumnFromStringInAttachedModeCommand(final TransactionalEditingDomain contextEditingDomain, final TransactionalEditingDomain tableEditingDomain, final IProgressMonitor progressMonitor) {

+		//initialize the progress monitor

+		if(progressMonitor != null) {

+			progressMonitor.beginTask(PASTE_ACTION_TASK_NAME, this.nbOperationsToDo);

+		}

+

+		//2.2 create the creation request and find the command provider

+		final CreateElementRequest createRequest = new CreateElementRequest(contextEditingDomain, this.tableContext, this.typeToCreate, (EReference)this.containmentFeature);

+		final IElementEditService tableContextCommandProvider = ElementEditServiceUtils.getCommandProvider(tableContext);

+

+		final ICommand pasteAllCommand = new AbstractTransactionalCommand(contextEditingDomain, PASTE_COMMAND_NAME, null) {

+

+

+			/**

+			 * 

+			 * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#doExecuteWithResult(org.eclipse.core.runtime.IProgressMonitor,

+			 *      org.eclipse.core.runtime.IAdaptable)

+			 * 

+			 * @param monitor

+			 * @param info

+			 * @return

+			 * @throws ExecutionException

+			 */

+			@Override

+			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+				long readChar = 0;

+				long previousreadChar = 0;

+

+				final RowIterator rowIter = parser.parse();

+				int nbCreatedElements = 0;

+				while(rowIter.hasNext()) {

+					final CellIterator cellIter = rowIter.next();

+					if(!cellIter.hasNext()) {

+						continue;//to avoid blank line

+					}

+					if(progressMonitor != null && progressMonitor.isCanceled()) {

+						progressMonitor.done();

+						localDispose();

+						return CommandResult.newCancelledCommandResult();

+					}

+					readChar = readChar + (parser.getReadCharacters() - previousreadChar);

+					previousreadChar = parser.getReadCharacters();

+					if(progressMonitor != null && readChar > refreshEachReadChar) {

+						readChar = 0;

+						progressMonitor.subTask(NLS.bind("{0} {1} have been created.", new Object[]{ typeToCreate.getEClass().getName(), nbCreatedElements }));

+						progressMonitor.worked(refreshEachReadChar);

+					}

+					nbCreatedElements++;

+					final ICommand commandCreation = tableContextCommandProvider.getEditCommand(createRequest);

+					if(commandCreation.canExecute()) {

+						//1. we create the element

+						commandCreation.execute(monitor, info);

+						//we execute the creation command

+

+						//2. we add it to the table

+						final CommandResult res = commandCreation.getCommandResult();

+						commandCreation.dispose();

+

+						final Object createdElement = (EObject)res.getReturnValue();

+						final Command addCommand;

+						if(pasteColumn) {

+							addCommand = tableManager.getAddColumnElementCommand(Collections.singleton(createdElement));

+						} else {

+							addCommand = tableManager.getAddRowElementCommand(Collections.singleton(createdElement));

+						}

+						if(addCommand != null) {//can be null

+							addCommand.execute();

+							addCommand.dispose();

+						}

+

+						//3. we set the values

+						final Iterator<?> secondAxisIterator = secondAxis.iterator();

+						while(secondAxisIterator.hasNext() && cellIter.hasNext()) {

+							final Object currentAxis = secondAxisIterator.next();

+							final String valueAsString = cellIter.next();

+							final Object columnObject;

+							final Object rowObject;

+							if(pasteColumn) {

+								columnObject = createdElement;

+								rowObject = currentAxis;

+							} else {

+								columnObject = currentAxis;

+								rowObject = createdElement;

+							}

+

+

+							boolean isEditable = CellManagerFactory.INSTANCE.isCellEditable(columnObject, rowObject);

+

+							if(isEditable) {

+								final AbstractStringValueConverter converter = CellManagerFactory.INSTANCE.getOrCreateStringValueConverterClass(columnObject, rowObject, tableManager, existingConverters, pasteHelper.getMultiValueSeparator());

+								final Command setValueCommand = CellManagerFactory.INSTANCE.getSetStringValueCommand(contextEditingDomain, columnObject, rowObject, valueAsString, converter, tableManager);

+								if(setValueCommand != null && setValueCommand.canExecute()) {

+									setValueCommand.execute();

+									setValueCommand.dispose();

+								}

+							}

+						}

+						//TODO inform the user

+						while(cellIter.hasNext()) {

+							cellIter.next();//required

+						}

+					}

+				}

+				progressMonitor.done();

+				localDispose();

+				return CommandResult.newOKCommandResult();

+			}

+		};

+		return pasteAllCommand;

+	}

+

+

+	/**

+	 * 

+	 * @param commandCreationCancelProvider

+	 *        the creation command progress monitor

+	 * @param commandExecutionProgressMonitor

+	 *        the command execution progress monitor

+	 * @return

+	 */

+	private ICommand getPasteRowFromStringInAttachedModeCommand(final TransactionalEditingDomain contextEditingDomain, final TransactionalEditingDomain tableEditingDomain, final IProgressMonitor progressMonitor) {

+		//initialize the progress monitor

+		if(progressMonitor != null) {

+			progressMonitor.beginTask(PASTE_ACTION_TASK_NAME, this.nbOperationsToDo);

+		}

+

+		//2.2 create the creation request and find the command provider

+		final CreateElementRequest createRequest = new CreateElementRequest(contextEditingDomain, this.tableContext, this.typeToCreate, (EReference)this.containmentFeature);

+		final IElementEditService tableContextCommandProvider = ElementEditServiceUtils.getCommandProvider(tableContext);

+

+		final ICommand pasteAllCommand = new AbstractTransactionalCommand(contextEditingDomain, PASTE_COMMAND_NAME, null) {

+

+

+			/**

+			 * 

+			 * @see org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand#doExecuteWithResult(org.eclipse.core.runtime.IProgressMonitor,

+			 *      org.eclipse.core.runtime.IAdaptable)

+			 * 

+			 * @param monitor

+			 * @param info

+			 * @return

+			 * @throws ExecutionException

+			 */

+			@Override

+			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+				long readChar = 0;

+				long previousreadChar = 0;

+

+				final RowIterator rowIter = parser.parse();

+				int nbCreatedElements = 0;

+				while(rowIter.hasNext()) {

+					final CellIterator cellIter = rowIter.next();

+					if(!cellIter.hasNext()) {

+						continue;//to avoid blank line

+					}

+					if(progressMonitor != null && progressMonitor.isCanceled()) {

+						progressMonitor.done();

+						localDispose();

+						return CommandResult.newCancelledCommandResult();

+					}

+					readChar = readChar + (parser.getReadCharacters() - previousreadChar);

+					previousreadChar = parser.getReadCharacters();

+					if(progressMonitor != null && readChar > refreshEachReadChar) {

+						readChar = 0;

+						progressMonitor.subTask(NLS.bind("{0} {1} have been created.", new Object[]{ typeToCreate.getEClass().getName(), nbCreatedElements }));

+						progressMonitor.worked(refreshEachReadChar);

+					}

+					nbCreatedElements++;

+					final ICommand commandCreation = tableContextCommandProvider.getEditCommand(createRequest);

+					if(commandCreation.canExecute()) {

+						//1. we create the element

+						commandCreation.execute(monitor, info);

+						//we execute the creation command

+

+						//2. we add it to the table

+						final CommandResult res = commandCreation.getCommandResult();

+						commandCreation.dispose();

+

+						final Object createdElement = (EObject)res.getReturnValue();

+						final Command addCommand;

+						if(pasteColumn) {

+							addCommand = tableManager.getAddColumnElementCommand(Collections.singleton(createdElement));

+						} else {

+							addCommand = tableManager.getAddRowElementCommand(Collections.singleton(createdElement));

+						}

+						if(addCommand != null) {//can be null

+							addCommand.execute();

+							addCommand.dispose();

+						}

+

+						//3. we set the values

+						final Iterator<?> secondAxisIterator = secondAxis.iterator();

+						while(secondAxisIterator.hasNext() && cellIter.hasNext()) {

+							final Object currentAxis = secondAxisIterator.next();

+							final String valueAsString = cellIter.next();

+							final Object columnObject;

+							final Object rowObject;

+							if(pasteColumn) {

+								columnObject = createdElement;

+								rowObject = currentAxis;

+							} else {

+								columnObject = currentAxis;

+								rowObject = createdElement;

+							}

+

+

+							boolean isEditable = CellManagerFactory.INSTANCE.isCellEditable(columnObject, rowObject);

+

+							if(isEditable) {

+								final AbstractStringValueConverter converter = CellManagerFactory.INSTANCE.getOrCreateStringValueConverterClass(columnObject, rowObject, tableManager, existingConverters, pasteHelper.getMultiValueSeparator());

+								final Command setValueCommand = CellManagerFactory.INSTANCE.getSetStringValueCommand(contextEditingDomain, columnObject, rowObject, valueAsString, converter, tableManager);

+								if(setValueCommand != null && setValueCommand.canExecute()) {

+									setValueCommand.execute();

+									setValueCommand.dispose();

+								}

+							}

+						}

+						//TODO inform the user

+						while(cellIter.hasNext()) {

+							cellIter.next();//required

+						}

+					}

+				}

+				progressMonitor.done();

+				localDispose();

+				return CommandResult.newOKCommandResult();

+			}

+		};

+		return pasteAllCommand;

+	}

+

+	/**

+	 * 

+	 * @param commandCreationCancelProvider

+	 *        the creation command progress monitor

+	 * @param commandExecutionProgressMonitor

+	 *        the command execution progress monitor

+	 * @return

+	 */

+	private ICommand getPasteFromStringCommandInAttachedMode(final TransactionalEditingDomain contextEditingDomain, final TransactionalEditingDomain tableEditingDomain, final IProgressMonitor progressMonitor) {

+		if(this.pasteColumn) {

+			//			return getPasteCFromStringInAttachedModeCommand(contextEditingDomain, tableEditingDomain, progressMonitor);

+		} else {

+			return getPasteRowFromStringInAttachedModeCommand(contextEditingDomain, tableEditingDomain, progressMonitor);

+		}

+		return null;

+	}

+

+	/**

+	 * 

+	 * @return

+	 *         the list of the post actions to do

+	 */

+	private Collection<String> getPostActions() {

+		return this.postActions;

+	}

+

+	/**

+	 * dispose fields of the class

+	 */

+	private void localDispose() {

+		this.isDisposed = true;

+		this.tableManager = null;

+		this.typeToCreate = null;

+		this.containmentFeature = null;

+		for(final AbstractStringValueConverter current : existingConverters.values()) {

+			current.dispose();

+		}

+		this.existingConverters.clear();

+		try {

+			this.reader.close();

+		} catch (IOException e) {

+			Activator.log.error(e);

+		}

+	}

+

+}

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/PasteEObjectAxisInTableCommandProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/PasteEObjectAxisInTableCommandProvider.java
index 1b0f206265f..c77750fe4bb 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/PasteEObjectAxisInTableCommandProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/PasteEObjectAxisInTableCommandProvider.java
@@ -72,7 +72,7 @@ import org.eclipse.papyrus.infra.tools.converter.AbstractStringValueConverter;
  * @author VL222926

  * 

  */

-

+@Deprecated //use PasteEObjectAxisInNattableCommandProvider, will be removed when the new paste api will allows to paste columns

 public class PasteEObjectAxisInTableCommandProvider {

 

 	private static final int MIN_AXIS_FOR_PROGRESS_MONITOR = 5;

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/TableSelectionProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/TableSelectionProvider.java
index 87f00f096ff..1b7aef2f42d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/TableSelectionProvider.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/TableSelectionProvider.java
@@ -30,22 +30,56 @@ import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;
 import org.eclipse.nebula.widgets.nattable.layer.event.ILayerEvent;

 import org.eclipse.nebula.widgets.nattable.selection.SelectionLayer;

 import org.eclipse.nebula.widgets.nattable.selection.event.CellSelectionEvent;

+import org.eclipse.nebula.widgets.nattable.selection.event.ColumnSelectionEvent;

 import org.eclipse.nebula.widgets.nattable.selection.event.ISelectionEvent;

+import org.eclipse.nebula.widgets.nattable.selection.event.RowSelectionEvent;

+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

+import org.eclipse.papyrus.infra.nattable.utils.AxisUtils;

 import org.eclipse.papyrus.infra.nattable.utils.TableSelectionWrapper;

 import org.eclipse.ui.services.IDisposable;

 

-

+/**

+ * 

+ * The selection provider used by the table. The returned selection is used to display property views or to do the synchronization in the

+ * ModelExplorer

+ * 

+ */

 public class TableSelectionProvider implements ISelectionProvider, IDisposable {

 

+	/**

+	 * the selection layer used in the table

+	 */

 	private SelectionLayer selectionLayer;

 

+	/**

+	 * the selection listener

+	 */

 	private final ILayerListener selectionListener;

 

+	/**

+	 * the current selection in the table

+	 */

 	private ISelection currentSelection;

 

+	/**

+	 * the list of listener on the selections

+	 */

 	private final List<ISelectionChangedListener> listeners;

 

-	public TableSelectionProvider(final SelectionLayer selectionLayer) {

+	/**

+	 * the table model manager to use to find selected elements

+	 */

+	private INattableModelManager manager;

+

+	/**

+	 * 

+	 * Constructor.

+	 * 

+	 * @param manager

+	 *        the table model manager to use to find selected elements

+	 * @param selectionLayer

+	 */

+	public TableSelectionProvider(final INattableModelManager manager, final SelectionLayer selectionLayer) {

 		this.selectionLayer = selectionLayer;

 		this.selectionListener = new ILayerListener() {

 

@@ -56,22 +90,45 @@ public class TableSelectionProvider implements ISelectionProvider, IDisposable {
 		this.selectionLayer.addLayerListener(this.selectionListener);

 		this.currentSelection = new StructuredSelection();

 		this.listeners = new ArrayList<ISelectionChangedListener>();

+		this.manager = manager;

 	}

 

-

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)

+	 * 

+	 * @param listener

+	 */

 	public void addSelectionChangedListener(final ISelectionChangedListener listener) {

 		this.listeners.add(listener);

-

 	}

 

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection()

+	 * 

+	 * @return

+	 */

 	public synchronized ISelection getSelection() {

 		return this.currentSelection;

 	}

 

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.ISelectionProvider#removeSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)

+	 * 

+	 * @param listener

+	 */

 	public void removeSelectionChangedListener(final ISelectionChangedListener listener) {

 		this.listeners.remove(listener);

 	}

 

+	/**

+	 * 

+	 * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection)

+	 * 

+	 * @param selection

+	 */

 	public synchronized void setSelection(final ISelection selection) {

 		if(this.currentSelection.equals(selection)) {

 			return;

@@ -91,29 +148,48 @@ public class TableSelectionProvider implements ISelectionProvider, IDisposable {
 			//add the cell selection

 			final Collection<PositionCoordinate> selectedCells = Arrays.asList(this.selectionLayer.getSelectedCellPositions());

 			final TableSelectionWrapper wrapper = new TableSelectionWrapper(selectedCells);

-			//			selection.add(0, wrapper);

 

 			//we returns the contents of the last selected cell

 			//we could returns the contents of all selected cells if its required

 			if(event instanceof CellSelectionEvent) {

-				final CellSelectionEvent e = (CellSelectionEvent)event;

-				final int colPos = e.getColumnPosition();

-				final int rowPos = e.getRowPosition();

-				final ILayerCell cell = this.selectionLayer.getCellByPosition(colPos, rowPos);

-				if(cell != null) {

-					final Object value = cell.getDataValue();

-

-					if(value != null) {

-						if(value instanceof Collection<?>) {

-							final Iterator<?> iter = ((Collection<?>)value).iterator();

-							while(iter.hasNext()) {

-								final Object current = iter.next();

-								selection.add(current);

+				for(final PositionCoordinate current1 : this.selectionLayer.getSelectedCellPositions()) {

+					final int colPos = current1.getColumnPosition();

+					final int rowPos = current1.getRowPosition();

+					final ILayerCell cell = this.selectionLayer.getCellByPosition(colPos, rowPos);

+					if(cell != null) {

+						final Object value = cell.getDataValue();

+						if(value != null) {

+							if(value instanceof Collection<?>) {

+								final Iterator<?> iter = ((Collection<?>)value).iterator();

+								while(iter.hasNext()) {

+									final Object current = iter.next();

+									selection.add(current);

+								}

+							} else {

+								selection.add(value);

 							}

-						} else {

-							selection.add(value);

 						}

+					}

+				}

 

+			} else if(event instanceof RowSelectionEvent) {

+				this.selectionLayer.getFullySelectedRowPositions();

+				int[] rows = this.selectionLayer.getFullySelectedRowPositions();

+				for(int i : rows) {

+					Object el = this.manager.getRowElement(i);

+					if(el != null) {

+						el = AxisUtils.getRepresentedElement(el);

+						selection.add(el);

+					}

+				}

+

+			} else if(event instanceof ColumnSelectionEvent) {

+				int[] selectedColumn = this.selectionLayer.getFullySelectedColumnPositions();

+				for(int i : selectedColumn) {

+					Object el = this.manager.getColumnElement(i);

+					if(el != null) {

+						el = AxisUtils.getRepresentedElement(el);

+						selection.add(el);

 					}

 				}

 			}

@@ -124,6 +200,13 @@ public class TableSelectionProvider implements ISelectionProvider, IDisposable {
 		setSelection(newSelection);

 	}

 

+

+

+	/**

+	 * 

+	 * @see org.eclipse.ui.services.IDisposable#dispose()

+	 * 

+	 */

 	public void dispose() {

 		this.selectionLayer.removeLayerListener(this.selectionListener);

 		this.selectionLayer = null;

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/CSVPasteHelper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/CSVPasteHelper.java
new file mode 100644
index 00000000000..94c18dc8408
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/CSVPasteHelper.java
@@ -0,0 +1,97 @@
+/*****************************************************************************

+ * 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:

+ *		

+ *		 Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.nattable.utils;

+

+import java.io.Reader;

+

+import org.eclipse.papyrus.infra.nattable.parsers.CSVParser;

+import org.eclipse.papyrus.infra.nattable.paste.PasteSeparator;

+import org.eclipse.papyrus.infra.nattable.paste.TextDelimiter;

+

+/**

+ * 

+ * This class provides utils method to split a string to do a paste in the table

+ * 

+ */

+public class CSVPasteHelper {

+

+	/**

+	 * the default separator used for columns

+	 */

+	public static final char DEFAULT_CLIPBOARD_COLUMN_SEPARATOR = PasteSeparator.TABULATION.getSeparator();

+

+	/**

+	 * the default separator used for multivalue

+	 */

+	public static final String DEFAULT_MULTI_VALUE_SEPARATOR = ","; //$NON-NLS-1$

+

+	public static final char DEFAULT_TEXT_MARKER = TextDelimiter.DOUBLE_QUOTE.getDelimiter();

+

+	private final char textMarker;

+

+	private final char cellSeparator;

+

+	private final String multiValueSeparator;

+

+

+	/**

+	 * 

+	 * Constructor.

+	 * The default constructor initialize the class with {@value #DEFAULT_CLIPBOARD_COLUMN_SEPARATOR}, {@value #DEFAULT_TEXT_MARKER},

+	 * {@value #DEFAULT_MULTI_VALUE_SEPARATOR}

+	 */

+	public CSVPasteHelper() {

+		this(DEFAULT_CLIPBOARD_COLUMN_SEPARATOR, DEFAULT_TEXT_MARKER, DEFAULT_MULTI_VALUE_SEPARATOR);

+	}

+

+	/**

+	 * 

+	 * Constructor.

+	 * 

+	 * @param cellSeparator

+	 *        the column separator to use

+	 * @param textMarked

+	 *        the row separator to use

+	 * @param textMarker

+	 *        the multi value separator to use

+	 */

+	public CSVPasteHelper(final char cellSeparator, final char textMarker, final String multiValueSeparator) {

+		this.cellSeparator = cellSeparator;

+		this.textMarker = textMarker;

+		this.multiValueSeparator = multiValueSeparator;

+	}

+

+	/**

+	 * 

+	 * @param reader

+	 *        a reader

+	 * @return

+	 *         create a parser from the reader

+	 */

+	public CSVParser createParser(final Reader reader) {

+		return new CSVParser(reader, this.cellSeparator, textMarker);

+	}

+

+

+	/**

+	 * 

+	 * @return

+	 *         the separator used for multivalue

+	 */

+	public String getMultiValueSeparator() {

+		return multiValueSeparator;

+	}

+

+

+}

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/CellHelper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/CellHelper.java
index 92f4533e536..0e94f8de916 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/CellHelper.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/CellHelper.java
@@ -1,3 +1,16 @@
+/*****************************************************************************

+ * 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:

+ *		

+ *		 Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

 package org.eclipse.papyrus.infra.nattable.utils;

 

 import java.util.Collections;

@@ -39,14 +52,20 @@ public class CellHelper {
 	}

 

 	/**

-	 * Create the string problems if required

+	 * Create the string problems if required.

 	 * 

 	 * @param tableManager

+	 *        the table manager

 	 * @param columnElement

+	 *        the column element

 	 * @param rowElement

+	 *        the row element

 	 * @param pastedText

+	 *        the pasted text

 	 * @param valueContainer

+	 *        the value container

 	 * @param sharedMap

+	 *        the shared map

 	 */

 	public static final void createStringResolutionProblem(final INattableModelManager tableManager, final Object columnElement, final Object rowElement, final String pastedText, final ConvertedValueContainer<?> valueContainer, final Map<?, ?> sharedMap) {

 		final IStatus status = valueContainer.getStatus();

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteConfigurationUtils.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteConfigurationUtils.java
index bbd3d6aeae1..1b7a086cf0f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteConfigurationUtils.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteConfigurationUtils.java
@@ -13,11 +13,17 @@
  *****************************************************************************/

 package org.eclipse.papyrus.infra.nattable.utils;

 

+import org.eclipse.core.runtime.Assert;

+import org.eclipse.core.runtime.IStatus;

+import org.eclipse.core.runtime.Status;

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EReference;

 import org.eclipse.emf.ecore.EStructuralFeature;

 import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.osgi.util.NLS;

+import org.eclipse.papyrus.infra.nattable.Activator;

+import org.eclipse.papyrus.infra.nattable.messages.Messages;

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxisconfiguration.PasteEObjectConfiguration;

 

 

@@ -39,26 +45,38 @@ public class PasteConfigurationUtils {
 	 * @param pasteConfiguration

 	 *        a paste configuration

 	 * @return

-	 *         <code>true</code> if the paste configuration is consistent

+	 *         a status describing the consistence of the paste configuration

 	 */

-	public static boolean hasConsistentPasteEObjectConfiguration(final PasteEObjectConfiguration pasteConfiguration) {

-		boolean result = false;

-		if(pasteConfiguration != null) {

-			final EStructuralFeature feature = pasteConfiguration.getPasteElementContainementFeature();

-			if(feature instanceof EReference) {

-				final String elementId = pasteConfiguration.getPastedElementId();

-				if(elementId != null && !elementId.equals("")) { //$NON-NLS-1$

-					final IElementType elementType = ElementTypeRegistry.getInstance().getType(elementId);

-					if(elementType != null) {

-						final EClass elementTypeMetaclass = elementType.getEClass();

-						final EClass containmentFeatureEClass = (EClass)feature.getEType();

-						result = elementTypeMetaclass == containmentFeatureEClass || containmentFeatureEClass.isSuperTypeOf(elementTypeMetaclass);

+	public static IStatus hasConsistentPasteEObjectConfiguration(final PasteEObjectConfiguration pasteConfiguration) {

+		Assert.isNotNull(pasteConfiguration);

+		final String pluginId = Activator.PLUGIN_ID;

+		final EStructuralFeature feature = pasteConfiguration.getPasteElementContainementFeature();

+		if(feature == null) {

+			return new Status(IStatus.ERROR, pluginId, Messages.PasteConfigurationUtils_ContainmentFeatureIsNull);

+		} else if(feature instanceof EReference) {

+			if(!((EReference)feature).isContainment()) {

+				return new Status(IStatus.ERROR, pluginId, Messages.PasteConfigurationUtils_ContainmentFeatureIsNotAReferenceContainment);

+			}

+			final String elementId = pasteConfiguration.getPastedElementId();

+			if(elementId != null && !elementId.equals("")) { //$NON-NLS-1$

+				final IElementType elementType = ElementTypeRegistry.getInstance().getType(elementId);

+				if(elementType != null) {

+					final EClass elementTypeMetaclass = elementType.getEClass();

+					final EClass containmentFeatureEClass = (EClass)feature.getEType();

+					boolean knownFeature = elementTypeMetaclass == containmentFeatureEClass || containmentFeatureEClass.isSuperTypeOf(elementTypeMetaclass);

+					if(knownFeature) {

+						return new Status(IStatus.OK, pluginId, Messages.PasteConfigurationUtils_PasteConfigurationIsConsistent);

+					} else {

+						return new Status(IStatus.ERROR, pluginId, NLS.bind(Messages.PasteConfigurationUtils_CreatesElementsAreNotCompatibleWithContainmentFeature, elementId, containmentFeatureEClass.getName()));

 					}

+				} else {

+					return new Status(IStatus.ERROR, pluginId, NLS.bind(Messages.PasteConfigurationUtils_ElementTypeCantBeFound, elementId));

 				}

+			} else {

+				return new Status(IStatus.ERROR, pluginId, Messages.PasteConfigurationUtils_ElementIdNotDefined);

 			}

+		} else {

+			return new Status(IStatus.ERROR, pluginId, Messages.PasteConfigurationUtils_ContainementFeatureIsNotAReference);

 		}

-		return result;

 	}

-

-

 }

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteEnablementStatus.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteEnablementStatus.java
new file mode 100644
index 00000000000..e3cd487c2cd
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteEnablementStatus.java
@@ -0,0 +1,98 @@
+/*****************************************************************************

+ * 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:

+ *		

+ *		 Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.nattable.utils;

+

+import org.eclipse.core.runtime.MultiStatus;

+

+/**

+ * 

+ * This class is used to store the tests about the paste capability of the table

+ * 

+ */

+public class PasteEnablementStatus {

+

+	/**

+	 * the result of the tests to paste rows in the table

+	 */

+	private MultiStatus rowStatus;

+

+	/**

+	 * the result of the test to paste columns in the table

+	 */

+	private MultiStatus columnStatus;

+

+

+	/**

+	 * 

+	 * Constructor.

+	 * 

+	 * @param columnStatus

+	 *        the paste column status

+	 * @param rowStatus

+	 *        the paste row status

+	 */

+	public PasteEnablementStatus(final MultiStatus columnStatus, final MultiStatus rowStatus) {

+		this.rowStatus = rowStatus;

+		this.columnStatus = columnStatus;

+	}

+

+	/**

+	 * 

+	 * @return

+	 *         the paste mode according to the row and column status

+	 */

+	public PasteModeEnumeration getPasteMode() {

+		if(this.rowStatus == null && this.columnStatus == null) {

+			return PasteModeEnumeration.PASTE_NO_CONFIGURATION;

+		}

+		if(this.rowStatus != null && this.columnStatus != null) {

+			if(this.columnStatus.isOK() && this.rowStatus.isOK()) {

+				return PasteModeEnumeration.PASTE_EOBJECT_ROW_OR_COLUMN;

+			}

+			if(this.columnStatus.isOK() && !this.rowStatus.isOK()) {

+				return PasteModeEnumeration.PASTE_EOBJECT_COLUMN;

+			}

+			if(!this.columnStatus.isOK() && this.rowStatus.isOK()) {

+				return PasteModeEnumeration.PASTE_EOBJECT_ROW;

+			}

+		}

+		if(this.rowStatus != null && this.rowStatus.isOK() && this.columnStatus == null) {

+			return PasteModeEnumeration.PASTE_EOBJECT_ROW;

+		}

+		if(this.columnStatus != null && this.rowStatus == null && this.columnStatus.isOK()) {

+			return PasteModeEnumeration.PASTE_EOBJECT_COLUMN;

+		}

+		return PasteModeEnumeration.CANT_PASTE;

+	}

+

+	/**

+	 * 

+	 * @return

+	 *         the column status

+	 */

+	public MultiStatus getColumnStatus() {

+		return this.columnStatus;

+	}

+

+	/**

+	 * 

+	 * @return

+	 *         the row status

+	 */

+	public MultiStatus getRowStatus() {

+		return this.rowStatus;

+	}

+

+

+}

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteHelper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteHelper.java
new file mode 100644
index 00000000000..7b817be03e4
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteHelper.java
@@ -0,0 +1,154 @@
+/*****************************************************************************

+ * 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:

+ *		

+ *		 Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.nattable.utils;

+

+/**

+ * 

+ * This class provides utils method to split a string to do a paste in the table

+ * 

+ */

+public class PasteHelper {

+

+	/**

+	 * the default separator used for row

+	 */

+	public static final String DEFAULT_ROW_SEPARATOR = "\n"; //$NON-NLS-1"

+

+	/**

+	 * the default separator used for columns

+	 */

+	public static final String DEFAULT_COLUMN_SEPARATOR = "\t";//$NON-NLS-1"

+

+	/**

+	 * the default separator used for multivalue

+	 */

+	public static final String DEFAULT_MULTI_VALUE_SEPARATOR = ","; //$NON-NLS-1$

+

+

+	private final String rowSeparator;

+

+	private final String columnSeparator;

+

+	private final String multiValueSeparator;

+

+	/**

+	 * 

+	 * Constructor.

+	 * 

+	 */

+	public PasteHelper() {

+		this(DEFAULT_COLUMN_SEPARATOR, DEFAULT_ROW_SEPARATOR, DEFAULT_MULTI_VALUE_SEPARATOR);

+	}

+

+	/**

+	 * 

+	 * Constructor.

+	 * 

+	 * @param columnSeparator

+	 *        the column separator to use

+	 * @param rowSeparator

+	 *        the row separator to use

+	 * @param multiValueSeparator

+	 *        the multi value separator to use

+	 */

+	public PasteHelper(final String columnSeparator, final String rowSeparator, final String multiValueSeparator) {

+		this.columnSeparator = columnSeparator;

+		this.rowSeparator = rowSeparator;

+		this.multiValueSeparator = multiValueSeparator;

+	}

+

+	/**

+	 * 

+	 * @param axisAsString

+	 *        an full axis represented by a String

+	 * 

+	 * 

+	 * @return

+	 *         the cells using the specified cell separator

+	 */

+

+	public String[] getCellsAsStringFromAxis(final String axisAsString) {

+		return axisAsString.split(this.columnSeparator);

+	}

+

+	/**

+	 * 

+	 * @param fullContents

+	 *        the string to split

+	 * 

+	 * @return

+	 *         the rows

+	 */

+	public final String[] getRows(final String fullContents) {

+		final String[] rows = fullContents.split(this.rowSeparator);

+		return rows;

+	}

+

+	/**

+	 * 

+	 * @param fullContents

+	 * @param rowSeparator

+	 * @param columnSeparator

+	 * @return

+	 *         an array of the pasted columns

+	 */

+	//TODO refactor me the paste in column should be the same as the paste in row!

+	public final String[] getColumns(final String fullContents) {

+		final String[] rows = fullContents.split(rowSeparator);

+		if(rows.length > 0) {

+			int nbColumn = rows[0].split(columnSeparator).length;

+			String[] columns = new String[nbColumn];

+			for(int columnIndex = 0; columnIndex < nbColumn; columnIndex++) {

+				columns[columnIndex] = "";

+			}

+

+			for(int rowIndex = 0; rowIndex < rows.length; rowIndex++) {

+				String row = rows[rowIndex];

+				String[] currentColumns = row.split(columnSeparator);

+				for(int columnIndex = 0; columnIndex < nbColumn; columnIndex++) {

+					if(currentColumns.length != 0) {

+						columns[columnIndex] += currentColumns[columnIndex];

+					} else {

+						columns[columnIndex] += ""; //$NON-NLS-1$

+					}

+					if(rowIndex < rows.length + 1) {

+						columns[columnIndex] += columnSeparator;

+					} else {

+						columns[columnIndex] += rowSeparator;

+					}

+				}

+			}

+			return columns;

+

+		}

+		return null;

+	}

+

+

+	public String getRowSeparator() {

+		return rowSeparator;

+	}

+

+

+	public String getColumnSeparator() {

+		return columnSeparator;

+	}

+

+

+	public String getMultiValueSeparator() {

+		return multiValueSeparator;

+	}

+

+

+}

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteModeEnumeration.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteModeEnumeration.java
index 9e125d6f200..0de03bab0e8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteModeEnumeration.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/PasteModeEnumeration.java
@@ -34,10 +34,13 @@ public enum PasteModeEnumeration {
 	 */

 	PASTE_EOBJECT_ROW_OR_COLUMN,

 	/**

-	 * paste is not possible

+	 * configuration exist but the configuration is not valid

 	 */

-	CANT_PASTE;

-

+	CANT_PASTE,

 

+	/**

+	 * the table have any configuration for paste

+	 */

+	PASTE_NO_CONFIGURATION;

 

 }

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableClipboardUtils.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableClipboardUtils.java
index ab07cdb6f56..9405967efa9 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableClipboardUtils.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/utils/TableClipboardUtils.java
@@ -33,16 +33,22 @@ public class TableClipboardUtils {
 	/**

 	 * row separator in the clipboard contents

 	 */

+	@Deprecated

+	//use the value defined in PasteHelpers

 	public static final String AXIS_SEPARATOR = "\n"; //$NON-NLS-1$

 

 	/**

 	 * column separator in the clipboard contents

 	 */

+	@Deprecated

+	//use the value defined into PasteHelper

 	public static final String CELL_SEPARATOR = "\t"; //$NON-NLS-1$

 

 	/**

 	 * the separator used for multivalue

 	 */

+	@Deprecated

+	//use the value defined into PasteHelper

 	public static final String MULTI_VALUE_SEPARATOR = ","; //$NON-NLS-1$

 

 	private TableClipboardUtils() {

@@ -55,6 +61,8 @@ public class TableClipboardUtils {
 	 *        a table represented by a String

 	 * @return the rows for this table

 	 */

+	@Deprecated

+	//use PasteHelper

 	public static final String[] getRows(final String fullContents) {

 		final String[] rows = fullContents.split(AXIS_SEPARATOR);

 		return rows;

@@ -65,6 +73,8 @@ public class TableClipboardUtils {
 	 * @return

 	 *         the rows as string extractzed from the clipboad

 	 */

+	@Deprecated

+	//use PasteHelper

 	public static final String[] getRowsFromClipboard() {

 		final String clipboardContent = getClipboardContents();

 		if(clipboardContent != null && !clipboardContent.isEmpty()) {

@@ -78,6 +88,8 @@ public class TableClipboardUtils {
 	 * @return

 	 *         the columns as string extractzed from the clipboad

 	 */

+	@Deprecated

+	//use PasteHelper

 	public static final String[] getColumnsFromClipboard() {

 		final String clipboardContent = getClipboardContents();

 		if(clipboardContent != null && !clipboardContent.isEmpty()) {

@@ -123,10 +135,21 @@ public class TableClipboardUtils {
 

 	/**

 	 * 

+	 * @return

+	 *         the contents of the clipboard

+	 */

+	public static final String getClipboardContentsAsString() {

+		return getClipboardContents();

+	}

+

+	/**

+	 * 

 	 * @param row

 	 *        a row represented by a String

 	 * @return the cells for this row

 	 */

+	@Deprecated

+	//Use PasteHelpers#getCellsAsStringFromAxis

 	public static final String[] getCells(final String row) {

 		return row.split(CELL_SEPARATOR);

 	}

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/ImportTableWizard.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/ImportTableWizard.java
new file mode 100644
index 00000000000..d84a8e4a7b1
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/ImportTableWizard.java
@@ -0,0 +1,142 @@
+/*****************************************************************************

+ * 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:

+ *		

+ *		 Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.nattable.wizard;

+

+import java.io.File;

+

+import org.eclipse.jface.resource.ImageDescriptor;

+import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.jface.wizard.Wizard;

+import org.eclipse.papyrus.infra.nattable.Activator;

+import org.eclipse.papyrus.infra.nattable.manager.ImportAxisInNattableManager;

+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

+import org.eclipse.papyrus.infra.nattable.messages.Messages;

+import org.eclipse.papyrus.infra.nattable.paste.PasteSeparator;

+import org.eclipse.papyrus.infra.nattable.paste.TextDelimiter;

+import org.eclipse.papyrus.infra.nattable.utils.CSVPasteHelper;

+import org.eclipse.papyrus.infra.nattable.wizard.pages.ImportCSVConfigurationPage;

+import org.eclipse.papyrus.infra.nattable.wizard.pages.ImportFilePage;

+import org.eclipse.papyrus.infra.nattable.wizard.pages.ImportInvertedTableErrorPage;

+import org.eclipse.papyrus.infra.nattable.wizard.pages.ImportTableErrorPage;

+import org.eclipse.papyrus.infra.widgets.util.FileUtil;

+import org.eclipse.ui.IEditorPart;

+import org.eclipse.ui.IImportWizard;

+import org.eclipse.ui.IWorkbench;

+

+/**

+ * 

+ * This wizard allows to import a table in the Papyrus nattable editor

+ * 

+ */

+public class ImportTableWizard extends Wizard implements IImportWizard {

+

+	/**

+	 * the import page

+	 */

+	private ImportFilePage importPage;

+

+	/**

+	 * the page used to configure the CSV import

+	 */

+	private ImportCSVConfigurationPage csvConfigurationPage;

+

+	/**

+	 * the nattable model manager to use for the import

+	 */

+	private INattableModelManager manager;

+

+

+	/**

+	 * 

+	 * Constructor.

+	 * 

+	 */

+	public ImportTableWizard() {

+		setWindowTitle(Messages.ImportTableWizard_ImportTableFromFileInPapyrusModel);

+		String pluginId = Activator.PLUGIN_ID;

+		String path = "icons/importTablePapyrusWizban.png"; //$NON-NLS-1$

+		ImageDescriptor desc = org.eclipse.papyrus.infra.widgets.Activator.getDefault().getImageDescriptor(pluginId, path);

+		setDefaultPageImageDescriptor(desc);

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection)

+	 * 

+	 * @param workbench

+	 * @param selection

+	 */

+	@Override

+	public void init(final IWorkbench workbench, final IStructuredSelection selection) {

+		this.manager = getNattableModelManager(workbench, selection);

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.wizard.Wizard#addPages()

+	 * 

+	 */

+	@Override

+	public void addPages() {

+		final String pageTitle = Messages.ImportTableWizard_ImportTable;

+		final ImageDescriptor desc = null;

+		if(manager != null) {

+			if(manager.getTable().isInvertAxis()) {

+				addPage(new ImportInvertedTableErrorPage(Messages.ImportTableWizard_ImportTableError, pageTitle, desc));

+			} else {

+				this.importPage = new ImportFilePage(pageTitle, pageTitle, desc, this.manager);

+				addPage(this.importPage);

+				this.csvConfigurationPage = new ImportCSVConfigurationPage(pageTitle, Messages.ImportTableWizard_ConfigureImport, desc, PasteSeparator.SEMICOLON, TextDelimiter.DOUBLE_QUOTE);

+				addPage(this.csvConfigurationPage);

+			}

+		} else {

+			addPage(new ImportTableErrorPage(Messages.ImportTableWizard_ImportTableError, pageTitle, desc));

+		}

+	}

+

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.wizard.Wizard#performFinish()

+	 * 

+	 * @return

+	 */

+	@Override

+	public boolean performFinish() {

+		//the import file

+		final File file = FileUtil.getFile(this.importPage.getFilePath());

+		final CSVPasteHelper pasteHelper = new CSVPasteHelper(this.csvConfigurationPage.getSeparator(), this.csvConfigurationPage.getTextDelimiter(), ","); //$NON-NLS-1$

+		final ImportAxisInNattableManager pasteManager = new ImportAxisInNattableManager(this.manager, pasteHelper, file, true);

+		return pasteManager.doPaste();

+	}

+

+	/**

+	 * 

+	 * @param workbench

+	 *        the current workbench

+	 * @param selection

+	 *        the current selection

+	 * @return

+	 *         the nattable manager to use to do the import

+	 */

+	private INattableModelManager getNattableModelManager(final IWorkbench workbench, final IStructuredSelection selection) {

+		final IEditorPart editorPart = workbench.getActiveWorkbenchWindow().getActivePage().getActiveEditor();

+		if(editorPart != null) {

+			return (INattableModelManager)editorPart.getAdapter(INattableModelManager.class);

+		}

+		return null;

+	}

+

+

+}

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ImportCSVConfigurationPage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ImportCSVConfigurationPage.java
new file mode 100644
index 00000000000..67edaefecd7
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ImportCSVConfigurationPage.java
@@ -0,0 +1,218 @@
+/*****************************************************************************

+ * 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:

+ *		

+ *		 Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.nattable.wizard.pages;

+

+import org.eclipse.jface.resource.ImageDescriptor;

+import org.eclipse.jface.wizard.WizardPage;

+import org.eclipse.papyrus.infra.nattable.messages.Messages;

+import org.eclipse.papyrus.infra.nattable.paste.PasteSeparator;

+import org.eclipse.papyrus.infra.nattable.paste.TextDelimiter;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.events.KeyEvent;

+import org.eclipse.swt.events.SelectionEvent;

+import org.eclipse.swt.events.SelectionListener;

+import org.eclipse.swt.layout.GridData;

+import org.eclipse.swt.layout.GridLayout;

+import org.eclipse.swt.widgets.Button;

+import org.eclipse.swt.widgets.Combo;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.swt.widgets.Group;

+import org.eclipse.swt.widgets.Label;

+import org.eclipse.swt.widgets.Text;

+

+/**

+ * The page to configure the separator used in the CSV file

+ * 

+ * @author VL222926

+ * 

+ */

+public class ImportCSVConfigurationPage extends WizardPage {

+

+	/**

+	 * the paste separator

+	 */

+	private PasteSeparator separator;

+

+	/**

+	 * the text delimiter

+	 */

+	private TextDelimiter textDelimiter;

+

+	/**

+	 * the specific seaprator

+	 */

+	private char[] textChar = null;

+

+	/**

+	 * 

+	 * Constructor.

+	 * 

+	 * @param pageName

+	 *        the name of the import page

+	 * @param title

+	 *        the title of the page

+	 * @param titleImage

+	 *        the image for this page

+	 * @param tableManager

+	 *        the table manager where the import will be done

+	 */

+	public ImportCSVConfigurationPage(final String pageName, final String title, final ImageDescriptor titleImage, final PasteSeparator defaultSeparator, final TextDelimiter defaultDelimiter) {

+		super(pageName, title, titleImage);

+		setDescription(Messages.ImportFilePage_SelectTheFileToImport);

+		this.separator = defaultSeparator;

+		this.textDelimiter = defaultDelimiter;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)

+	 * 

+	 * @param parent

+	 */

+	@Override

+	public void createControl(final Composite parent1) {

+		final Composite pageComposite = new Composite(parent1, SWT.NONE);

+		setControl(pageComposite);

+		pageComposite.setLayout(new GridLayout(2, true));

+		final Group separatorGroup = new Group(pageComposite, SWT.NONE);

+		separatorGroup.setText(Messages.ImportCSVConfigurationPage_Separators);

+		separatorGroup.setLayout(new GridLayout(2, false));

+

+		for(final PasteSeparator current : PasteSeparator.values()) {

+			final Button button = new Button(separatorGroup, SWT.RADIO);

+			button.setText(current.getName());

+			button.addSelectionListener(new SelectionListener() {

+

+				@Override

+				public void widgetSelected(SelectionEvent e) {

+					if(button.isEnabled()) {

+						separator = current;

+					}

+					setPageComplete(validate());

+				}

+

+				@Override

+				public void widgetDefaultSelected(SelectionEvent e) {

+					//nothing to do

+				}

+			});

+			button.setSelection(current == separator);

+			final GridData data = new GridData();

+			if(current == PasteSeparator.OTHER) {

+				final Text text = new Text(separatorGroup, SWT.BORDER);

+				text.addKeyListener(new org.eclipse.swt.events.KeyListener() {

+

+					@Override

+					public void keyReleased(KeyEvent e) {

+						textChar = text.getTextChars();

+						setPageComplete(validate());

+					}

+

+					@Override

+					public void keyPressed(KeyEvent e) {

+						//nothing to do

+					}

+				});

+				button.addSelectionListener(new SelectionListener() {

+

+					@Override

+					public void widgetSelected(SelectionEvent e) {

+						text.setEnabled(button.getSelection());

+						setPageComplete(validate());

+					}

+

+					@Override

+					public void widgetDefaultSelected(SelectionEvent e) {

+					}

+				});

+				text.setEnabled(this.separator == PasteSeparator.OTHER);

+			} else {

+				data.horizontalSpan = 2;

+			}

+			button.setLayoutData(data);

+		}

+

+		final Composite textDelimiterComp = new Composite(pageComposite, SWT.NONE);

+		textDelimiterComp.setLayout(new GridLayout(2, false));

+		textDelimiterComp.setLayoutData(new GridData());

+		final Label label2 = new Label(textDelimiterComp, SWT.NONE);

+		label2.setText(Messages.ImportCSVConfigurationPage_SelectTheTextDelimiter);

+		final Combo combo = new Combo(textDelimiterComp, SWT.DROP_DOWN | SWT.READ_ONLY);

+

+		for(int i = 0; i < TextDelimiter.values().length; i++) {

+			final TextDelimiter current = TextDelimiter.values()[i];

+			combo.add(String.valueOf(current.getDelimiter()), i);

+			if(this.textDelimiter == current) {

+				combo.select(i);

+			}

+		}

+		combo.addSelectionListener(new SelectionListener() {

+

+			@Override

+			public void widgetSelected(SelectionEvent e) {

+				textDelimiter = TextDelimiter.values()[combo.getSelectionIndex()];

+				setPageComplete(validate());

+			}

+

+			@Override

+			public void widgetDefaultSelected(SelectionEvent e) {

+				//nothing to do

+			}

+		});

+

+		setPageComplete(validate());

+	}

+

+	/**

+	 * 

+	 * @return

+	 */

+	private boolean validate() {

+		if(this.separator == PasteSeparator.OTHER) {

+			if(this.textChar == null || this.textChar.length == 0) {

+				setErrorMessage(Messages.ImportCSVConfigurationPage_TheCellSeparatorIsNotDefined);

+				return false;

+			} else if(this.textChar.length > 1) {

+				setErrorMessage(Messages.ImportCSVConfigurationPage_TheCellSeparatorMustBeExcatlyOneChar);

+				return false;

+			}

+		}

+		setErrorMessage(null);

+		return true;

+	}

+

+	/**

+	 * 

+	 * @return

+	 *         the selected separator

+	 */

+	public char getSeparator() {

+		if(this.separator == PasteSeparator.OTHER) {

+			return textChar[0];

+		}

+		return this.separator.getSeparator();

+	}

+

+	/**

+	 * 

+	 * @return

+	 *         the selected text delimiter

+	 */

+	public char getTextDelimiter() {

+		return this.textDelimiter.getDelimiter();

+	}

+

+

+

+}

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ImportFilePage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ImportFilePage.java
new file mode 100644
index 00000000000..a4fe02f4c67
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ImportFilePage.java
@@ -0,0 +1,184 @@
+/*****************************************************************************

+ * 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:

+ *		

+ *		 Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.nattable.wizard.pages;

+

+import org.eclipse.jface.resource.ImageDescriptor;

+import org.eclipse.jface.viewers.ILabelProvider;

+import org.eclipse.jface.wizard.WizardPage;

+import org.eclipse.papyrus.infra.core.services.ServiceException;

+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;

+import org.eclipse.papyrus.infra.nattable.Activator;

+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;

+import org.eclipse.papyrus.infra.nattable.messages.Messages;

+import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

+import org.eclipse.papyrus.infra.widgets.editors.AbstractEditor;

+import org.eclipse.papyrus.infra.widgets.editors.ICommitListener;

+import org.eclipse.papyrus.infra.widgets.editors.StringFileSelector;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.custom.CLabel;

+import org.eclipse.swt.layout.GridData;

+import org.eclipse.swt.layout.GridLayout;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.swt.widgets.Label;

+

+/**

+ * 

+ * Import page

+ * 

+ */

+public class ImportFilePage extends WizardPage {

+

+	/**

+	 * allowed file to import table

+	 */

+	private static final String[] allowedFiles = new String[]{ "*.csv" }; //$NON-NLS-1$

+

+	/**

+	 * the selected file path

+	 */

+	private String selectedFilePath;

+

+	/**

+	 * the table manager where the import will be done

+	 */

+	private final INattableModelManager tableManager;

+

+	/**

+	 * 

+	 * Constructor.

+	 * 

+	 * @param pageName

+	 *        the name of the import page

+	 * @param title

+	 *        the title of the page

+	 * @param titleImage

+	 *        the image for this page

+	 * @param tableManager

+	 *        the table manager where the import will be done

+	 */

+	public ImportFilePage(final String pageName, final String title, final ImageDescriptor titleImage, final INattableModelManager tableManager) {

+		super(pageName, title, titleImage);

+		setDescription(Messages.ImportFilePage_SelectTheFileToImport);

+		this.tableManager = tableManager;

+		this.selectedFilePath = null;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)

+	 * 

+	 * @param parent

+	 */

+	@Override

+	public void createControl(final Composite parent) {

+		final Composite localComposite = new Composite(parent, SWT.NONE);

+		setControl(localComposite);

+		final ILabelProvider labelProvider = getLabelProvider();

+		Composite localParent = new Composite(localComposite, SWT.NONE);

+		final Label label = new Label(localParent, SWT.NONE);

+		label.setText(Messages.ImportFilePage_YourFileWillBeImported);

+		final CLabel cLabel = new CLabel(localParent, SWT.NONE);

+		cLabel.setText(tableManager.getTableName());

+

+		final Label label2 = new Label(localParent, SWT.NONE);

+		label2.setText(Messages.ImportFilePage_TheImportedElementWillBeAddedTo);

+		final CLabel cLabel2 = new CLabel(localParent, SWT.NONE);

+		cLabel2.setText(labelProvider.getText(tableManager.getTable().getContext()));

+		cLabel2.setImage(labelProvider.getImage(tableManager.getTable().getContext()));

+

+

+		cLabel.setImage(labelProvider.getImage(this.tableManager.getTable()));

+

+		localParent.setLayout(new GridLayout(2, true));

+		final StringFileSelector selector = new StringFileSelector(localComposite, SWT.NONE);

+		selector.setAllowFileSystem(true);

+		selector.setAllowWorkspace(true);

+		selector.setFilterExtensions(allowedFiles);

+

+		localComposite.setLayout(new GridLayout(1, true));

+		selector.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));

+		selector.getText().setEditable(false);

+		selector.addCommitListener(new ICommitListener() {

+

+			@Override

+			public void commit(final AbstractEditor editor) {

+				final Object value = selector.getValue();

+				if(value instanceof String && ((String)value).length() > 0) {

+					setFilePath((String)value);

+					setPageComplete(isPageComplete());

+				}

+			}

+		});

+

+		final CLabel warningLabel = new CLabel(localComposite, SWT.NONE);

+		warningLabel.setText(Messages.ImportFilePage_BeSureThatYourImportFileHasTheSameNumberOfColumns);

+		warningLabel.setImage(org.eclipse.papyrus.infra.widgets.Activator.getDefault().getImage(Activator.PLUGIN_ID, "/icons/warning.gif")); //$NON-NLS-1$

+	}

+

+	/**

+	 * 

+	 * @return

+	 *         the label provider to use or <code>null</code> if not found

+	 */

+	protected ILabelProvider getLabelProvider() {

+		LabelProviderService labelService = null;

+		try {

+			labelService = ServiceUtilsForEObject.getInstance().getService(LabelProviderService.class, tableManager.getTable());

+

+		} catch (ServiceException e) {

+			Activator.log.error("Label Provider Service Not Found", e); //$NON-NLS-1$

+		}

+		if(labelService != null) {

+			return labelService.getLabelProvider();

+		}

+		return null;

+

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.wizard.WizardPage#isPageComplete()

+	 * 

+	 * @return

+	 */

+	@Override

+	public boolean isPageComplete() {

+		return getFilePath() != null;

+	}

+

+

+	/**

+	 * 

+	 * @return

+	 *         the selected file

+	 */

+	public String getFilePath() {

+		return this.selectedFilePath;

+	}

+

+	/**

+	 * 

+	 * @param filePath

+	 *        find the file from the filePath and set it

+	 */

+	protected void setFilePath(final String filePath) {

+		if(filePath == null || filePath.length() == 0) {

+			this.selectedFilePath = null;

+		} else {

+			this.selectedFilePath = filePath;

+		}

+

+	}

+

+}

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ImportInvertedTableErrorPage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ImportInvertedTableErrorPage.java
new file mode 100644
index 00000000000..94b5c759cf3
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ImportInvertedTableErrorPage.java
@@ -0,0 +1,66 @@
+/*****************************************************************************

+ * 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:

+ *		

+ *		 Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.nattable.wizard.pages;

+

+import org.eclipse.jface.resource.ImageDescriptor;

+import org.eclipse.jface.wizard.WizardPage;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.swt.widgets.Label;

+

+/**

+ * 

+ * @author VL222926

+ * 

+ */

+public class ImportInvertedTableErrorPage extends WizardPage {

+

+	/**

+	 * 

+	 * Constructor.

+	 * 

+	 * @param pageName

+	 *        the page name

+	 * @param title

+	 *        the title of the page

+	 * @param titleImage

+	 *        the image of the page

+	 */

+	public ImportInvertedTableErrorPage(final String pageName, final String title, final ImageDescriptor titleImage) {

+		super(pageName, title, titleImage);

+	}

+

+	/**

+	 * Create contents of the wizard.

+	 * 

+	 * @param parent

+	 */

+	public void createControl(final Composite parent) {

+		Label label = new Label(parent, SWT.NONE);

+		label.setText("Inverted Table are not yet managed"); //$NON-NLS-1$

+		setControl(label);

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.wizard.WizardPage#isPageComplete()

+	 * 

+	 * @return

+	 */

+	@Override

+	public boolean isPageComplete() {

+		return false;

+	}

+

+}

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ImportTableErrorPage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ImportTableErrorPage.java
new file mode 100644
index 00000000000..ca968688449
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/pages/ImportTableErrorPage.java
@@ -0,0 +1,67 @@
+/*****************************************************************************

+ * 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:

+ *		

+ *		 Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.nattable.wizard.pages;

+

+import org.eclipse.jface.resource.ImageDescriptor;

+import org.eclipse.jface.wizard.WizardPage;

+import org.eclipse.papyrus.infra.nattable.messages.Messages;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.swt.widgets.Label;

+

+/**

+ * 

+ * @author VL222926

+ * 

+ */

+public class ImportTableErrorPage extends WizardPage {

+

+	/**

+	 * 

+	 * Constructor.

+	 * 

+	 * @param pageName

+	 *        the page name

+	 * @param title

+	 *        the title of the page

+	 * @param titleImage

+	 *        the image of the page

+	 */

+	public ImportTableErrorPage(final String pageName, final String title, final ImageDescriptor titleImage) {

+		super(pageName, title, titleImage);

+	}

+

+	/**

+	 * Create contents of the wizard.

+	 * 

+	 * @param parent

+	 */

+	public void createControl(final Composite parent) {

+		Label label = new Label(parent, SWT.NONE);

+		label.setText(Messages.ImportTableErrorPage_PleaseOpenAPapyrusEditor);

+		setControl(label);

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.jface.wizard.WizardPage#isPageComplete()

+	 * 

+	 * @return

+	 */

+	@Override

+	public boolean isPageComplete() {

+		return super.isPageComplete();

+	}

+

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/DefaultConstraintEngine.java b/plugins/infra/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/DefaultConstraintEngine.java
index 88a93060f14..e81eeafcb40 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/DefaultConstraintEngine.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.constraints/src/org/eclipse/papyrus/infra/constraints/runtime/DefaultConstraintEngine.java
@@ -38,14 +38,14 @@ public abstract class DefaultConstraintEngine<E extends DisplayUnit> implements
 

 	public abstract void refresh();

 

-	public void addConstraint(ConstraintDescriptor descriptor) {

+	public synchronized void addConstraint(ConstraintDescriptor descriptor) {

 		Constraint constraint = ConstraintFactory.getInstance().createFromModel(descriptor);

 		if(constraint != null) {

 			constraints.add(constraint);

 		}

 	}

 

-	public Set<E> getDisplayUnits(final ISelection forSelection) {

+	public synchronized Set<E> getDisplayUnits(final ISelection forSelection) {

 		Set<E> result = new HashSet<E>();

 

 		IStructuredSelection selection;

diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/.classpath b/plugins/infra/org.eclipse.papyrus.infra.newchild/.classpath
new file mode 100644
index 00000000000..2d1a4302f04
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<classpath>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

+	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="output" path="bin"/>

+</classpath>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/.project b/plugins/infra/org.eclipse.papyrus.infra.newchild/.project
new file mode 100644
index 00000000000..d8cf9d53eac
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.papyrus.infra.newchild</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.jdt.core.javabuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.ManifestBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.SchemaBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.pde.PluginNature</nature>

+		<nature>org.eclipse.jdt.core.javanature</nature>

+	</natures>

+</projectDescription>

diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/.settings/org.eclipse.jdt.core.prefs b/plugins/infra/org.eclipse.papyrus.infra.newchild/.settings/org.eclipse.jdt.core.prefs
index af0f20f97a5..44217f8c068 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+eclipse.preferences.version=1

+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

+org.eclipse.jdt.core.compiler.compliance=1.5

+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

+org.eclipse.jdt.core.compiler.source=1.5

diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.newchild/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..079af80d234
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/META-INF/MANIFEST.MF
@@ -0,0 +1,28 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.infra.newchild;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: .
+Bundle-Activator: org.eclipse.papyrus.infra.newchild.Activator
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.emf;bundle-version="2.6.0",
+ org.eclipse.emf.ecore,
+ org.eclipse.osgi,
+ org.eclipse.emf.ecore.xmi,
+ org.eclipse.papyrus.infra.queries.core.configuration;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.services.resourceloading;bundle-version="1.0.0",
+ org.eclipse.emf.transaction,
+ org.eclipse.gmf.runtime.emf.type.core,
+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.0"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Export-Package: org.eclipse.papyrus.infra.newchild,
+ org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel,
+ org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl,
+ org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.util
+Bundle-ActivationPolicy: lazy
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/about.html b/plugins/infra/org.eclipse.papyrus.infra.newchild/about.html
new file mode 100644
index 00000000000..82d49bf5f81
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

+<title>About</title>

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>June 5, 2007</p>	

+<h3>License</h3>

+

+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

+indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

+apply to your use of any object code in the Content.  Check the Redistributor's license that was 

+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

+indicated below, the terms and conditions of the EPL still apply to any source code in the Content

+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

+

+</body>

+</html>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/build.properties b/plugins/infra/org.eclipse.papyrus.infra.newchild/build.properties
new file mode 100644
index 00000000000..4a099f04813
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/build.properties
@@ -0,0 +1,11 @@
+source.. = src/

+output.. = bin/

+bin.includes = META-INF/,\

+               .,\

+               plugin.xml,\

+               plugin.properties,\

+               about.html,\

+               schema/

+src.includes = about.html,\

+               schema/

+jre.compilation.profile = J2SE-1.5

diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/plugin.properties b/plugins/infra/org.eclipse.papyrus.infra.newchild/plugin.properties
new file mode 100644
index 00000000000..cd4b48f6a7c
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################

+# 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:

+#     Patrick Tessier (CEA LIST) - Initial API and implementation

+##################################################################################

+pluginName=Papyrus infra new child (Incubation)

+providerName=Eclipse Modeling Project

diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/plugin.xml b/plugins/infra/org.eclipse.papyrus.infra.newchild/plugin.xml
new file mode 100644
index 00000000000..b23f29f88bf
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/plugin.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<?eclipse version="3.4"?>

+<plugin>

+   <extension-point id="org.eclipse.papyrus.infra.newchild" name="ElementCreationMenuModel" schema="schema/org.eclipse.papyrus.infra.newchild.exsd"/>

+

+   <extension point="org.eclipse.emf.ecore.generated_package">

+      <!-- @generated elementCreationMenuModel -->

+      <package

+            uri="http://ElementCreationMenuModel"

+            class="org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.ElementCreationMenuModelPackage"

+            genModel="resource/elementCreationMenuModel.genmodel"/>

+   </extension>

+

+   <extension point="org.eclipse.emf.ecore.extension_parser">

+      <!-- @generated elementCreationMenuModel -->

+      <parser

+            type="elementcreationmenumodel"

+            class="org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.util.ElementCreationMenuModelResourceFactoryImpl"/>

+   </extension>

+</plugin>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/ElementCreationMenuModel.di b/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/ElementCreationMenuModel.di
new file mode 100644
index 00000000000..5b79c6a5609
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/ElementCreationMenuModel.di
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

+  <pageList>

+    <availablePage>

+      <emfPageIdentifier href="ElementCreationMenuModel.notation#_VJWf0FXPEeOhVe6k7yzS3A"/>

+    </availablePage>

+  </pageList>

+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

+    <windows>

+      <children xsi:type="di:TabFolder">

+        <children>

+          <emfPageIdentifier href="ElementCreationMenuModel.notation#_VJWf0FXPEeOhVe6k7yzS3A"/>

+        </children>

+      </children>

+    </windows>

+  </sashModel>

+</di:SashWindowsMngr>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/ElementCreationMenuModel.notation b/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/ElementCreationMenuModel.notation
new file mode 100644
index 00000000000..aafcf18df9f
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/ElementCreationMenuModel.notation
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_VJWf0FXPEeOhVe6k7yzS3A" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

+  <children xmi:type="notation:Shape" xmi:id="_mxFLgVXPEeOhVe6k7yzS3A" type="2008" fontName="Segoe UI" gradient="8905185, 16777215, 0" lineColor="255">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_mxFLg1XPEeOhVe6k7yzS3A" source="ShadowFigure">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mxFLhFXPEeOhVe6k7yzS3A" key="ShadowFigure_Value" value="false"/>

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_mxFLhVXPEeOhVe6k7yzS3A" source="displayNameLabelIcon">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mxFLhlXPEeOhVe6k7yzS3A" key="displayNameLabelIcon_value" value="false"/>

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_mxFLh1XPEeOhVe6k7yzS3A" source="QualifiedName">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mxFLiFXPEeOhVe6k7yzS3A" key="QualifiedNameDepth" value="1000"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_mxFLiVXPEeOhVe6k7yzS3A" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_mxFLilXPEeOhVe6k7yzS3A" type="7017">

+      <children xmi:type="notation:Shape" xmi:id="_bHiDkVXREeOhVe6k7yzS3A" type="3012" fontName="Segoe UI" lineColor="0">

+        <element xmi:type="uml:Property" href="ElementCreationMenuModel.uml#_bHiDkFXREeOhVe6k7yzS3A"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_bHiDklXREeOhVe6k7yzS3A"/>

+      </children>

+      <children xmi:type="notation:Shape" xmi:id="__7ilcFgXEeOKQOyOw2l5lw" type="3012" fontName="Segoe UI" lineColor="0">

+        <element xmi:type="uml:Property" href="ElementCreationMenuModel.uml#_8Pa5AFgXEeOKQOyOw2l5lw"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="__7ilcVgXEeOKQOyOw2l5lw" x="74" y="24"/>

+      </children>

+      <children xmi:type="notation:Shape" xmi:id="_I8zKkFgYEeOKQOyOw2l5lw" type="3012" fontName="Segoe UI" lineColor="0">

+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Q36nAFgYEeOKQOyOw2l5lw" source="CustomAppearance_Annotation">

+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Q36nAVgYEeOKQOyOw2l5lw" key="CustomAppearance_MaskValue" value="126"/>

+        </eAnnotations>

+        <element xmi:type="uml:Property" href="ElementCreationMenuModel.uml#_G2lsAFgYEeOKQOyOw2l5lw"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_I8zKkVgYEeOKQOyOw2l5lw" x="154" y="28"/>

+      </children>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_mxFLi1XPEeOhVe6k7yzS3A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_mxFLjFXPEeOhVe6k7yzS3A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_mxFLjVXPEeOhVe6k7yzS3A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mxFLjlXPEeOhVe6k7yzS3A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_mxFLj1XPEeOhVe6k7yzS3A" type="7018">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_mxFLkFXPEeOhVe6k7yzS3A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_mxFLkVXPEeOhVe6k7yzS3A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_mxFLklXPEeOhVe6k7yzS3A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mxFLk1XPEeOhVe6k7yzS3A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_mxFLlFXPEeOhVe6k7yzS3A" type="7019">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_mxFLlVXPEeOhVe6k7yzS3A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_mxFLllXPEeOhVe6k7yzS3A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_mxFLl1XPEeOhVe6k7yzS3A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mxFLmFXPEeOhVe6k7yzS3A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_mxO8gFXPEeOhVe6k7yzS3A" visible="false" type="compartment_shape_display">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_mxO8gVXPEeOhVe6k7yzS3A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mxO8glXPEeOhVe6k7yzS3A"/>

+    </children>

+    <element xmi:type="uml:Class" href="ElementCreationMenuModel.uml#_mxFLgFXPEeOhVe6k7yzS3A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mxFLglXPEeOhVe6k7yzS3A" x="435" y="205"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_z-H0kVXPEeOhVe6k7yzS3A" type="2008" fontName="Segoe UI" gradient="8905185, 16777215, 0" lineColor="255">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_z-H0k1XPEeOhVe6k7yzS3A" source="ShadowFigure">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_z-H0lFXPEeOhVe6k7yzS3A" key="ShadowFigure_Value" value="false"/>

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_z-H0lVXPEeOhVe6k7yzS3A" source="displayNameLabelIcon">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_z-H0llXPEeOhVe6k7yzS3A" key="displayNameLabelIcon_value" value="false"/>

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_z-H0l1XPEeOhVe6k7yzS3A" source="QualifiedName">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_z-H0mFXPEeOhVe6k7yzS3A" key="QualifiedNameDepth" value="1000"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_z-H0mVXPEeOhVe6k7yzS3A" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_z-H0mlXPEeOhVe6k7yzS3A" type="7017">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_z-H0m1XPEeOhVe6k7yzS3A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_z-H0nFXPEeOhVe6k7yzS3A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_z-H0nVXPEeOhVe6k7yzS3A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z-H0nlXPEeOhVe6k7yzS3A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_z-H0n1XPEeOhVe6k7yzS3A" type="7018">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_z-H0oFXPEeOhVe6k7yzS3A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_z-H0oVXPEeOhVe6k7yzS3A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_z-H0olXPEeOhVe6k7yzS3A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z-H0o1XPEeOhVe6k7yzS3A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_z-H0pFXPEeOhVe6k7yzS3A" type="7019">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_z-H0pVXPEeOhVe6k7yzS3A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_z-H0plXPEeOhVe6k7yzS3A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_z-H0p1XPEeOhVe6k7yzS3A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z-H0qFXPEeOhVe6k7yzS3A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_z-RlkFXPEeOhVe6k7yzS3A" visible="false" type="compartment_shape_display">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_z-RlkVXPEeOhVe6k7yzS3A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z-RlklXPEeOhVe6k7yzS3A"/>

+    </children>

+    <element xmi:type="uml:Class" href="ElementCreationMenuModel.uml#_z-H0kFXPEeOhVe6k7yzS3A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z-H0klXPEeOhVe6k7yzS3A" x="135" y="210"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_97LTkVXPEeOhVe6k7yzS3A" type="2008" fontName="Segoe UI" gradient="8905185, 16777215, 0" lineColor="255">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_97LTk1XPEeOhVe6k7yzS3A" source="ShadowFigure">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_97LTlFXPEeOhVe6k7yzS3A" key="ShadowFigure_Value" value="false"/>

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_97LTlVXPEeOhVe6k7yzS3A" source="displayNameLabelIcon">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_97LTllXPEeOhVe6k7yzS3A" key="displayNameLabelIcon_value" value="false"/>

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_97LTl1XPEeOhVe6k7yzS3A" source="QualifiedName">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_97LTmFXPEeOhVe6k7yzS3A" key="QualifiedNameDepth" value="1000"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_97LTmVXPEeOhVe6k7yzS3A" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_97LTmlXPEeOhVe6k7yzS3A" type="7017">

+      <children xmi:type="notation:Shape" xmi:id="_HvDL8VXREeOhVe6k7yzS3A" type="3012" fontName="Segoe UI" lineColor="0">

+        <element xmi:type="uml:Property" href="ElementCreationMenuModel.uml#_HvDL8FXREeOhVe6k7yzS3A"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_HvDL8lXREeOhVe6k7yzS3A"/>

+      </children>

+      <children xmi:type="notation:Shape" xmi:id="_rF1woVgREeOKQOyOw2l5lw" type="3012" fontName="Segoe UI" lineColor="0">

+        <element xmi:type="uml:Property" href="ElementCreationMenuModel.uml#_rF1woFgREeOKQOyOw2l5lw"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_rF1wolgREeOKQOyOw2l5lw"/>

+      </children>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_97LTm1XPEeOhVe6k7yzS3A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_97LTnFXPEeOhVe6k7yzS3A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_97LTnVXPEeOhVe6k7yzS3A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_97LTnlXPEeOhVe6k7yzS3A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_97LTn1XPEeOhVe6k7yzS3A" type="7018">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_97LToFXPEeOhVe6k7yzS3A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_97LToVXPEeOhVe6k7yzS3A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_97LTolXPEeOhVe6k7yzS3A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_97LTo1XPEeOhVe6k7yzS3A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_97LTpFXPEeOhVe6k7yzS3A" type="7019">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_97LTpVXPEeOhVe6k7yzS3A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_97LTplXPEeOhVe6k7yzS3A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_97LTp1XPEeOhVe6k7yzS3A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_97LTqFXPEeOhVe6k7yzS3A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_97UdgFXPEeOhVe6k7yzS3A" visible="false" type="compartment_shape_display">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_97UdgVXPEeOhVe6k7yzS3A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_97UdglXPEeOhVe6k7yzS3A"/>

+    </children>

+    <element xmi:type="uml:Class" href="ElementCreationMenuModel.uml#_97LTkFXPEeOhVe6k7yzS3A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_97LTklXPEeOhVe6k7yzS3A" x="285" y="35"/>

+  </children>

+  <styles xmi:type="notation:DiagramStyle" xmi:id="_VJWf0VXPEeOhVe6k7yzS3A"/>

+  <element xmi:type="uml:Model" href="ElementCreationMenuModel.uml#_VJPLEFXPEeOhVe6k7yzS3A"/>

+  <edges xmi:type="notation:Connector" xmi:id="_y1uMoFXQEeOhVe6k7yzS3A" type="4002" source="_z-H0kVXPEeOhVe6k7yzS3A" target="_97LTkVXPEeOhVe6k7yzS3A" lineColor="0">

+    <children xmi:type="notation:DecorationNode" xmi:id="_y1uMo1XQEeOhVe6k7yzS3A" type="6007">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_y1uMpFXQEeOhVe6k7yzS3A" y="40"/>

+    </children>

+    <styles xmi:type="notation:FontStyle" xmi:id="_y1uMoVXQEeOhVe6k7yzS3A" fontName="Segoe UI"/>

+    <element xmi:type="uml:Generalization" href="ElementCreationMenuModel.uml#_y1kboFXQEeOhVe6k7yzS3A"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_y1uMolXQEeOhVe6k7yzS3A" points="[16, -12, -122, 86]$[136, -87, -2, 11]"/>

+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_y13WkFXQEeOhVe6k7yzS3A" id="(0.55,0.12)"/>

+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_y13WkVXQEeOhVe6k7yzS3A" id="(0.43,0.89)"/>

+  </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_0fDh8VXQEeOhVe6k7yzS3A" type="4002" source="_mxFLgVXPEeOhVe6k7yzS3A" target="_97LTkVXPEeOhVe6k7yzS3A" lineColor="0">

+    <children xmi:type="notation:DecorationNode" xmi:id="_0fDh9FXQEeOhVe6k7yzS3A" type="6007">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_0fDh9VXQEeOhVe6k7yzS3A" y="40"/>

+    </children>

+    <styles xmi:type="notation:FontStyle" xmi:id="_0fDh8lXQEeOhVe6k7yzS3A" fontName="Segoe UI"/>

+    <element xmi:type="uml:Generalization" href="ElementCreationMenuModel.uml#_0fDh8FXQEeOhVe6k7yzS3A"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0fDh81XQEeOhVe6k7yzS3A" points="[-20, -12, 132, 83]$[-153, -82, -1, 13]"/>

+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0fMr4FXQEeOhVe6k7yzS3A" id="(0.51,0.12)"/>

+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0fMr4VXQEeOhVe6k7yzS3A" id="(0.49,0.87)"/>

+  </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_8fSH51XQEeOhVe6k7yzS3A" type="4001" source="_z-H0kVXPEeOhVe6k7yzS3A" target="_97LTkVXPEeOhVe6k7yzS3A" routing="Rectilinear" lineColor="0">

+    <children xmi:type="notation:DecorationNode" xmi:id="_8fSH6lXQEeOhVe6k7yzS3A" type="6001">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_8fSH61XQEeOhVe6k7yzS3A" y="-20"/>

+    </children>

+    <children xmi:type="notation:DecorationNode" xmi:id="_8fSH7FXQEeOhVe6k7yzS3A" type="6002">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_8fSH7VXQEeOhVe6k7yzS3A" x="-34" y="24"/>

+    </children>

+    <children xmi:type="notation:DecorationNode" xmi:id="_8fSH7lXQEeOhVe6k7yzS3A" type="6003">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_8fSH71XQEeOhVe6k7yzS3A" y="-20"/>

+    </children>

+    <children xmi:type="notation:DecorationNode" xmi:id="_8fSH8FXQEeOhVe6k7yzS3A" type="6005">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_8fSH8VXQEeOhVe6k7yzS3A" y="20"/>

+    </children>

+    <children xmi:type="notation:DecorationNode" xmi:id="_8fSH8lXQEeOhVe6k7yzS3A" type="6033">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_8fSH81XQEeOhVe6k7yzS3A" y="20"/>

+    </children>

+    <children xmi:type="notation:DecorationNode" xmi:id="_8fSH9FXQEeOhVe6k7yzS3A" type="6034">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_8fSH9VXQEeOhVe6k7yzS3A" y="-20"/>

+    </children>

+    <styles xmi:type="notation:FontStyle" xmi:id="_8fSH6FXQEeOhVe6k7yzS3A" fontName="Segoe UI"/>

+    <element xmi:type="uml:Association" href="ElementCreationMenuModel.uml#_8fSH41XQEeOhVe6k7yzS3A"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8fSH6VXQEeOhVe6k7yzS3A" points="[21, 0, -95, 145]$[116, 0, 0, 145]$[116, -131, 0, 14]"/>

+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8flC0FXQEeOhVe6k7yzS3A" id="(0.79,0.56)"/>

+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8flC0VXQEeOhVe6k7yzS3A" id="(0.45,0.86)"/>

+  </edges>

+</notation:Diagram>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/ElementCreationMenuModel.uml b/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/ElementCreationMenuModel.uml
new file mode 100644
index 00000000000..3c900ef4d8c
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/ElementCreationMenuModel.uml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<xmi:XMI xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ActionLanguage="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.omg.org/spec/ALF/20120827/ActionLanguage-Profile pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_sYse0YZLEeKyw49uR6nx3g">

+  <uml:Model xmi:id="_VJPLEFXPEeOhVe6k7yzS3A" name="ElementCreationMenuModel">

+    <packageImport xmi:type="uml:PackageImport" xmi:id="_VJPLEVXPEeOhVe6k7yzS3A">

+      <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>

+    </packageImport>

+    <packagedElement xmi:type="uml:Class" xmi:id="_mxFLgFXPEeOhVe6k7yzS3A" name="CreationMenu">

+      <generalization xmi:type="uml:Generalization" xmi:id="_0fDh8FXQEeOhVe6k7yzS3A" general="_97LTkFXPEeOhVe6k7yzS3A"/>

+      <ownedAttribute xmi:type="uml:Property" xmi:id="_bHiDkFXREeOhVe6k7yzS3A" name="elementTypeIDRef">

+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_fUXQYFXREeOhVe6k7yzS3A"/>

+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fUXQYVXREeOhVe6k7yzS3A" value="1"/>

+      </ownedAttribute>

+      <ownedAttribute xmi:type="uml:Property" xmi:id="_8Pa5AFgXEeOKQOyOw2l5lw" name="role">

+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8Pa5AVgXEeOKQOyOw2l5lw"/>

+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8Pa5AlgXEeOKQOyOw2l5lw" value="1"/>

+      </ownedAttribute>

+      <ownedAttribute xmi:type="uml:Property" xmi:id="_G2lsAFgYEeOKQOyOw2l5lw" name="displayAllRoles">

+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_G2lsAVgYEeOKQOyOw2l5lw" value="1"/>

+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_G2lsAlgYEeOKQOyOw2l5lw" value="1"/>

+        <defaultValue xmi:type="uml:LiteralBoolean" xmi:id="_Pb58AFgYEeOKQOyOw2l5lw" name="defaultValue" value="true"/>

+      </ownedAttribute>

+    </packagedElement>

+    <packagedElement xmi:type="uml:Class" xmi:id="_z-H0kFXPEeOhVe6k7yzS3A" name="Folder">

+      <generalization xmi:type="uml:Generalization" xmi:id="_y1kboFXQEeOhVe6k7yzS3A" general="_97LTkFXPEeOhVe6k7yzS3A"/>

+      <ownedAttribute xmi:type="uml:Property" xmi:id="_8fSH4FXQEeOhVe6k7yzS3A" name="menu" type="_97LTkFXPEeOhVe6k7yzS3A" isOrdered="true" aggregation="composite" association="_8fSH41XQEeOhVe6k7yzS3A">

+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8fSH4VXQEeOhVe6k7yzS3A"/>

+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8fSH4lXQEeOhVe6k7yzS3A" value="*"/>

+      </ownedAttribute>

+    </packagedElement>

+    <packagedElement xmi:type="uml:Class" xmi:id="_97LTkFXPEeOhVe6k7yzS3A" name="Menu" isAbstract="true">

+      <ownedAttribute xmi:type="uml:Property" xmi:id="_HvDL8FXREeOhVe6k7yzS3A" name="label">

+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

+      </ownedAttribute>

+      <ownedAttribute xmi:type="uml:Property" xmi:id="_rF1woFgREeOKQOyOw2l5lw" name="icon">

+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wcwyAFgREeOKQOyOw2l5lw"/>

+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wcwyAVgREeOKQOyOw2l5lw" value="1"/>

+      </ownedAttribute>

+    </packagedElement>

+    <packagedElement xmi:type="uml:Association" xmi:id="_8fSH41XQEeOhVe6k7yzS3A" name="folder_menu_1" memberEnd="_8fSH5FXQEeOhVe6k7yzS3A _8fSH4FXQEeOhVe6k7yzS3A">

+      <ownedEnd xmi:type="uml:Property" xmi:id="_8fSH5FXQEeOhVe6k7yzS3A" name="folder" type="_z-H0kFXPEeOhVe6k7yzS3A" association="_8fSH41XQEeOhVe6k7yzS3A">

+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8fSH5VXQEeOhVe6k7yzS3A" value="1"/>

+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8fSH5lXQEeOhVe6k7yzS3A" value="1"/>

+      </ownedEnd>

+    </packagedElement>

+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_sUiYYlgREeOKQOyOw2l5lw">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sU1TUFgREeOKQOyOw2l5lw" source="http://www.eclipse.org/uml2/2.0.0/UML">

+        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#_sYse0YZLEeKyw49uR6nx3g"/>

+      </eAnnotations>

+      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_ACTIONLANGUAGE_PROFILE/ActionLanguage-Profile.profile.uml#ActionLanguage"/>

+    </profileApplication>

+  </uml:Model>

+  <ActionLanguage:TextualRepresentation xmi:id="_sU1TUVgREeOKQOyOw2l5lw" language="org.eclipse.papyrus.uml.textedit.property.xtext.UmlProperty"/>

+</xmi:XMI>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/NewChildDevelopperDoc.docx b/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/NewChildDevelopperDoc.docx
new file mode 100644
index 00000000000..c0b87219f18
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/NewChildDevelopperDoc.docx
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/elementCreationMenuModel.ecore b/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/elementCreationMenuModel.ecore
new file mode 100644
index 00000000000..744464c368c
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/elementCreationMenuModel.ecore
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="ElementCreationMenuModel" nsURI="http://ElementCreationMenuModel"

+    nsPrefix="ElementCreationMenuModel">

+  <eClassifiers xsi:type="ecore:EClass" name="Folder" eSuperTypes="#//Menu">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="menu" upperBound="-1" eType="#//Menu"

+        containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="Menu" abstract="true">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="label" ordered="false"

+        lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="icon" ordered="false" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="CreationMenu" eSuperTypes="#//Menu">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="elementTypeIdRef" ordered="false"

+        lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="role" ordered="false" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayAllRoles" ordered="false"

+        lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"

+        defaultValueLiteral="true"/>

+  </eClassifiers>

+</ecore:EPackage>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/elementCreationMenuModel.genmodel b/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/elementCreationMenuModel.genmodel
new file mode 100644
index 00000000000..95e33c24450
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/elementCreationMenuModel.genmodel
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2013 CEA LIST.&#xD;&#xA; &#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA; &#xD;&#xA;Contributors:&#xD;&#xA;&#x9;CEA LIST - Initial API and implementation&#xD;&#xA;"

+    modelDirectory="/org.eclipse.papyrus.infra.newchild/src" modelPluginID="org.eclipse.papyrus.infra.newchild"

+    modelName="ElementCreationMenuModel" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"

+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="6.0" copyrightFields="false"

+    usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore" operationReflection="true"

+    importOrganizing="true">

+  <foreignModel>elementCreationMenuModel.ecore</foreignModel>

+  <genPackages prefix="ElementCreationMenuModel" basePackage="org.eclipse.papyrus.infra.newchild"

+      resource="XML" disposableProviderFactory="true" ecorePackage="elementCreationMenuModel.ecore#/">

+    <genClasses ecoreClass="elementCreationMenuModel.ecore#//Folder">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference elementCreationMenuModel.ecore#//Folder/menu"/>

+    </genClasses>

+    <genClasses image="false" ecoreClass="elementCreationMenuModel.ecore#//Menu">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute elementCreationMenuModel.ecore#//Menu/label"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute elementCreationMenuModel.ecore#//Menu/icon"/>

+    </genClasses>

+    <genClasses ecoreClass="elementCreationMenuModel.ecore#//CreationMenu">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute elementCreationMenuModel.ecore#//CreationMenu/elementTypeIdRef"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute elementCreationMenuModel.ecore#//CreationMenu/role"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute elementCreationMenuModel.ecore#//CreationMenu/displayAllRoles"/>

+    </genClasses>

+  </genPackages>

+</genmodel:GenModel>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/papyrusNewChild.di b/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/papyrusNewChild.di
new file mode 100644
index 00000000000..1980c8e603f
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/papyrusNewChild.di
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

+  <pageList>

+    <availablePage>

+      <emfPageIdentifier href="papyrusNewChild.notation#_Py2DcFOFEeOuspyO4PzXCg"/>

+    </availablePage>

+    <availablePage>

+      <emfPageIdentifier href="papyrusNewChild.notation#_hb3voFOFEeOuspyO4PzXCg"/>

+    </availablePage>

+    <availablePage>

+      <emfPageIdentifier href="papyrusNewChild.notation#_swsygFOIEeOuspyO4PzXCg"/>

+    </availablePage>

+    <availablePage>

+      <emfPageIdentifier href="papyrusNewChild.notation#_uB23AFW6EeOhVe6k7yzS3A"/>

+    </availablePage>

+    <availablePage>

+      <emfPageIdentifier href="papyrusNewChild.notation#_o5dr8FXdEeOW-JPqZK_EZg"/>

+    </availablePage>

+    <availablePage>

+      <emfPageIdentifier href="papyrusNewChild.notation#_Fo2BgFXeEeOW-JPqZK_EZg"/>

+    </availablePage>

+    <availablePage>

+      <emfPageIdentifier href="papyrusNewChild.notation#_uhdN0FgPEeOKQOyOw2l5lw"/>

+    </availablePage>

+  </pageList>

+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

+    <windows>

+      <children xsi:type="di:TabFolder">

+        <children>

+          <emfPageIdentifier href="papyrusNewChild.notation#_Py2DcFOFEeOuspyO4PzXCg"/>

+        </children>

+        <children>

+          <emfPageIdentifier href="papyrusNewChild.notation#_hb3voFOFEeOuspyO4PzXCg"/>

+        </children>

+        <children>

+          <emfPageIdentifier href="papyrusNewChild.notation#_swsygFOIEeOuspyO4PzXCg"/>

+        </children>

+        <children>

+          <emfPageIdentifier href="papyrusNewChild.notation#_uB23AFW6EeOhVe6k7yzS3A"/>

+        </children>

+        <children>

+          <emfPageIdentifier href="papyrusNewChild.notation#_uhdN0FgPEeOKQOyOw2l5lw"/>

+        </children>

+        <children>

+          <emfPageIdentifier href="papyrusNewChild.notation#_Fo2BgFXeEeOW-JPqZK_EZg"/>

+        </children>

+      </children>

+    </windows>

+  </sashModel>

+</di:SashWindowsMngr>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/papyrusNewChild.notation b/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/papyrusNewChild.notation
new file mode 100644
index 00000000000..e30ab615d61
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/papyrusNewChild.notation
@@ -0,0 +1,1103 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements http://www.eclipse.org/papyrus/0.7.0/SysML#//requirements http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration">

+  <notation:Diagram xmi:id="_Py2DcFOFEeOuspyO4PzXCg" type="Package" name="PackageDiagram" measurementUnit="Pixel">

+    <children xmi:type="notation:Shape" xmi:id="_QS7RsFOFEeOuspyO4PzXCg" type="2007" fontName="Segoe UI" lineColor="0">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QS-VAFOFEeOuspyO4PzXCg" source="ShadowFigure">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QS-8EFOFEeOuspyO4PzXCg" key="ShadowFigure_Value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QS-8EVOFEeOuspyO4PzXCg" source="displayNameLabelIcon">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QS-8ElOFEeOuspyO4PzXCg" key="displayNameLabelIcon_value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QS-8E1OFEeOuspyO4PzXCg" source="QualifiedName">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QS-8FFOFEeOuspyO4PzXCg" key="QualifiedNameDepth" value="1000"/>

+      </eAnnotations>

+      <children xmi:type="notation:DecorationNode" xmi:id="_QS-8FVOFEeOuspyO4PzXCg" type="5026"/>

+      <children xmi:type="notation:DecorationNode" xmi:id="_QS_jIFOFEeOuspyO4PzXCg" type="7016">

+        <styles xmi:type="notation:TitleStyle" xmi:id="_QS_jIVOFEeOuspyO4PzXCg"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QS_jIlOFEeOuspyO4PzXCg"/>

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_QTWIcFOFEeOuspyO4PzXCg" visible="false" type="compartment_shape_display">

+        <styles xmi:type="notation:TitleStyle" xmi:id="_QTWIcVOFEeOuspyO4PzXCg"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QTWIclOFEeOuspyO4PzXCg"/>

+      </children>

+      <element xmi:type="uml:Package" href="papyrusNewChild.uml#_IqDb0FOFEeOuspyO4PzXCg"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QS7RsVOFEeOuspyO4PzXCg" x="480" y="50"/>

+    </children>

+    <children xmi:type="notation:Shape" xmi:id="_Qoi8YFOFEeOuspyO4PzXCg" type="2007" fontName="Segoe UI" lineColor="0">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QokKgFOFEeOuspyO4PzXCg" source="ShadowFigure">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QokKgVOFEeOuspyO4PzXCg" key="ShadowFigure_Value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QokKglOFEeOuspyO4PzXCg" source="displayNameLabelIcon">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QokKg1OFEeOuspyO4PzXCg" key="displayNameLabelIcon_value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QokKhFOFEeOuspyO4PzXCg" source="QualifiedName">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QokKhVOFEeOuspyO4PzXCg" key="QualifiedNameDepth" value="1000"/>

+      </eAnnotations>

+      <children xmi:type="notation:DecorationNode" xmi:id="_QokxkFOFEeOuspyO4PzXCg" type="5026"/>

+      <children xmi:type="notation:DecorationNode" xmi:id="_QokxkVOFEeOuspyO4PzXCg" type="7016">

+        <styles xmi:type="notation:TitleStyle" xmi:id="_QokxklOFEeOuspyO4PzXCg"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qokxk1OFEeOuspyO4PzXCg"/>

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_QopqEFOFEeOuspyO4PzXCg" visible="false" type="compartment_shape_display">

+        <styles xmi:type="notation:TitleStyle" xmi:id="_QopqEVOFEeOuspyO4PzXCg"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QopqElOFEeOuspyO4PzXCg"/>

+      </children>

+      <element xmi:type="uml:Package" href="papyrusNewChild.uml#_JXz5sFOFEeOuspyO4PzXCg"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qoi8YVOFEeOuspyO4PzXCg" x="480" y="210"/>

+    </children>

+    <children xmi:type="notation:Shape" xmi:id="_Q8z8MFOFEeOuspyO4PzXCg" type="2007" fontName="Segoe UI" lineColor="0">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Q80jQFOFEeOuspyO4PzXCg" source="ShadowFigure">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Q80jQVOFEeOuspyO4PzXCg" key="ShadowFigure_Value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Q81KUFOFEeOuspyO4PzXCg" source="displayNameLabelIcon">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Q81KUVOFEeOuspyO4PzXCg" key="displayNameLabelIcon_value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Q81KUlOFEeOuspyO4PzXCg" source="QualifiedName">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Q81KU1OFEeOuspyO4PzXCg" key="QualifiedNameDepth" value="1000"/>

+      </eAnnotations>

+      <children xmi:type="notation:DecorationNode" xmi:id="_Q81KVFOFEeOuspyO4PzXCg" type="5026"/>

+      <children xmi:type="notation:DecorationNode" xmi:id="_Q81KVVOFEeOuspyO4PzXCg" type="7016">

+        <styles xmi:type="notation:TitleStyle" xmi:id="_Q81KVlOFEeOuspyO4PzXCg"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Q81KV1OFEeOuspyO4PzXCg"/>

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_Q88fEFOFEeOuspyO4PzXCg" visible="false" type="compartment_shape_display">

+        <styles xmi:type="notation:TitleStyle" xmi:id="_Q88fEVOFEeOuspyO4PzXCg"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Q88fElOFEeOuspyO4PzXCg"/>

+      </children>

+      <element xmi:type="uml:Package" href="papyrusNewChild.uml#_JnbDAFOFEeOuspyO4PzXCg"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Q8z8MVOFEeOuspyO4PzXCg" x="730" y="415"/>

+    </children>

+    <children xmi:type="notation:Shape" xmi:id="_RZtTkFOFEeOuspyO4PzXCg" type="2007" fontName="Segoe UI" lineColor="0">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RZt6oFOFEeOuspyO4PzXCg" source="ShadowFigure">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RZt6oVOFEeOuspyO4PzXCg" key="ShadowFigure_Value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RZt6olOFEeOuspyO4PzXCg" source="displayNameLabelIcon">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RZt6o1OFEeOuspyO4PzXCg" key="displayNameLabelIcon_value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RZuhsFOFEeOuspyO4PzXCg" source="QualifiedName">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RZuhsVOFEeOuspyO4PzXCg" key="QualifiedNameDepth" value="1000"/>

+      </eAnnotations>

+      <children xmi:type="notation:DecorationNode" xmi:id="_RZuhslOFEeOuspyO4PzXCg" type="5026"/>

+      <children xmi:type="notation:DecorationNode" xmi:id="_RZuhs1OFEeOuspyO4PzXCg" type="7016">

+        <styles xmi:type="notation:TitleStyle" xmi:id="_RZuhtFOFEeOuspyO4PzXCg"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RZuhtVOFEeOuspyO4PzXCg"/>

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_RZ12cFOFEeOuspyO4PzXCg" visible="false" type="compartment_shape_display">

+        <styles xmi:type="notation:TitleStyle" xmi:id="_RZ12cVOFEeOuspyO4PzXCg"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RZ12clOFEeOuspyO4PzXCg"/>

+      </children>

+      <element xmi:type="uml:Package" href="papyrusNewChild.uml#_Nc3DgFOFEeOuspyO4PzXCg"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RZtTkVOFEeOuspyO4PzXCg" x="255" y="415"/>

+    </children>

+    <styles xmi:type="notation:DiagramStyle" xmi:id="_Py2DcVOFEeOuspyO4PzXCg"/>

+    <element xmi:type="uml:Model" href="papyrusNewChild.uml#_a0QCwFOCEeOE6bh9v5dYKg"/>

+    <edges xmi:type="notation:Connector" xmi:id="_T6YgkFOFEeOuspyO4PzXCg" type="4006" source="_Qoi8YFOFEeOuspyO4PzXCg" target="_QS7RsFOFEeOuspyO4PzXCg" lineColor="0">

+      <children xmi:type="notation:DecorationNode" xmi:id="_T6aVwFOFEeOuspyO4PzXCg" type="6014">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_T6aVwVOFEeOuspyO4PzXCg" x="-14" y="54"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_T6aVwlOFEeOuspyO4PzXCg" type="6015">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_T6aVw1OFEeOuspyO4PzXCg" y="60"/>

+      </children>

+      <styles xmi:type="notation:FontStyle" xmi:id="_T6YgkVOFEeOuspyO4PzXCg" fontName="Segoe UI"/>

+      <element xmi:type="uml:Abstraction" href="papyrusNewChild.uml#_T6P9sFOFEeOuspyO4PzXCg"/>

+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_T6YgklOFEeOuspyO4PzXCg" points="[-6, -11, -45, 115]$[-61, -89, -100, 37]"/>

+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_T6o_QFOFEeOuspyO4PzXCg" id="(0.5,0.2)"/>

+    </edges>

+    <edges xmi:type="notation:Connector" xmi:id="_UqWk8FOFEeOuspyO4PzXCg" type="4006" source="_Q8z8MFOFEeOuspyO4PzXCg" target="_Qoi8YFOFEeOuspyO4PzXCg" lineColor="0">

+      <children xmi:type="notation:DecorationNode" xmi:id="_UqXzEFOFEeOuspyO4PzXCg" type="6014">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UqXzEVOFEeOuspyO4PzXCg" y="40"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_UqXzElOFEeOuspyO4PzXCg" type="6015">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UqYaIFOFEeOuspyO4PzXCg" y="60"/>

+      </children>

+      <styles xmi:type="notation:FontStyle" xmi:id="_UqXMAFOFEeOuspyO4PzXCg" fontName="Segoe UI"/>

+      <element xmi:type="uml:Abstraction" href="papyrusNewChild.uml#_UqVW0FOFEeOuspyO4PzXCg"/>

+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UqXMAVOFEeOuspyO4PzXCg" points="[-16, -13, 168, 155]$[-157, -118, 27, 50]"/>

+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Uqg9AFOFEeOuspyO4PzXCg" id="(0.17,0.13)"/>

+    </edges>

+    <edges xmi:type="notation:Connector" xmi:id="_Vk_oQFOFEeOuspyO4PzXCg" type="4008" source="_RZtTkFOFEeOuspyO4PzXCg" target="_Qoi8YFOFEeOuspyO4PzXCg" lineColor="0">

+      <children xmi:type="notation:DecorationNode" xmi:id="_VlAPUFOFEeOuspyO4PzXCg" type="6026">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_VlAPUVOFEeOuspyO4PzXCg" y="40"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_VlAPUlOFEeOuspyO4PzXCg" type="6027">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_VlAPU1OFEeOuspyO4PzXCg" y="60"/>

+      </children>

+      <styles xmi:type="notation:FontStyle" xmi:id="_Vk_oQVOFEeOuspyO4PzXCg" fontName="Segoe UI"/>

+      <element xmi:type="uml:Dependency" href="papyrusNewChild.uml#_VkwXsFOFEeOuspyO4PzXCg"/>

+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Vk_oQlOFEeOuspyO4PzXCg" points="[24, -29, -141, 169]$[125, -194, -40, 4]"/>

+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VlKAUFOFEeOuspyO4PzXCg" id="(0.2,0.57)"/>

+    </edges>

+  </notation:Diagram>

+  <nattable:Table xmi:id="_hb3voFOFEeOuspyO4PzXCg" name="Requirements" currentRowAxisProvider="_hb3vpVOFEeOuspyO4PzXCg" currentColumnAxisProvider="_hb3voVOFEeOuspyO4PzXCg">

+    <context xmi:type="uml:Package" href="papyrusNewChild.uml#_IqDb0FOFEeOuspyO4PzXCg"/>

+    <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.nattable.requirement.config/configs/requirement.nattableconfiguration#/"/>

+    <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_hb3voVOFEeOuspyO4PzXCg" description="Provides the columns of the tables with a default configuration" name="Requirements Feature Columns Provider">

+      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_hb3volOFEeOuspyO4PzXCg" element="property_of_stereotype:/SysML::Requirements::Requirement::id">

+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.sysml.nattable.requirement.config/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

+      </axis>

+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_hb3vo1OFEeOuspyO4PzXCg">

+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.sysml.nattable.requirement.config/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>

+      </axis>

+      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_hb3vpFOFEeOuspyO4PzXCg" element="property_of_stereotype:/SysML::Requirements::Requirement::text">

+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.sysml.nattable.requirement.config/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

+      </axis>

+      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_OKhiwFgPEeOKQOyOw2l5lw" element="property_of_stereotype:/SysML::Requirements::Requirement::refinedBy">

+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.sysml.nattable.requirement.config/configs/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.1"/>

+      </axis>

+    </columnAxisProvidersHistory>

+    <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_hb3vpVOFEeOuspyO4PzXCg" description="Provides the requirements directly owned by the context of the table" name="Requirement Axis Provider" disconnectSlave="true"/>

+  </nattable:Table>

+  <notation:Diagram xmi:id="_swsygFOIEeOuspyO4PzXCg" type="UseCase" name="UseCaseDiagram" measurementUnit="Pixel">

+    <children xmi:type="notation:Shape" xmi:id="_uxPt8FOIEeOuspyO4PzXCg" type="2015" fontName="Segoe UI" lineColor="0">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uxPt8lOIEeOuspyO4PzXCg" source="ShadowFigure">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uxPt81OIEeOuspyO4PzXCg" key="ShadowFigure_Value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uxPt9FOIEeOuspyO4PzXCg" source="displayNameLabelIcon">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uxPt9VOIEeOuspyO4PzXCg" key="displayNameLabelIcon_value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uxPt9lOIEeOuspyO4PzXCg" source="QualifiedName">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uxPt91OIEeOuspyO4PzXCg" key="QualifiedNameDepth" value="1000"/>

+      </eAnnotations>

+      <children xmi:type="notation:DecorationNode" xmi:id="_uxPt-FOIEeOuspyO4PzXCg" type="5019"/>

+      <children xmi:type="notation:DecorationNode" xmi:id="_uxPt-VOIEeOuspyO4PzXCg" type="7011">

+        <children xmi:type="notation:Shape" xmi:id="_-b1XgFOIEeOuspyO4PzXCg" type="3009" fontName="Segoe UI" fillColor="8905185" lineColor="0">

+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-b1XglOIEeOuspyO4PzXCg" source="ShadowFigure">

+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-b1Xg1OIEeOuspyO4PzXCg" key="ShadowFigure_Value" value="false"/>

+          </eAnnotations>

+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-b1XhFOIEeOuspyO4PzXCg" source="displayNameLabelIcon">

+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-b1XhVOIEeOuspyO4PzXCg" key="displayNameLabelIcon_value" value="false"/>

+          </eAnnotations>

+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-b1XhlOIEeOuspyO4PzXCg" source="QualifiedName">

+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-b1Xh1OIEeOuspyO4PzXCg" key="QualifiedNameDepth" value="1000"/>

+          </eAnnotations>

+          <children xmi:type="notation:DecorationNode" xmi:id="_-b1XiFOIEeOuspyO4PzXCg" type="5018"/>

+          <children xmi:type="notation:DecorationNode" xmi:id="_-b1XiVOIEeOuspyO4PzXCg" type="7012">

+            <styles xmi:type="notation:SortingStyle" xmi:id="_-b1XilOIEeOuspyO4PzXCg"/>

+            <styles xmi:type="notation:FilteringStyle" xmi:id="_-b1Xi1OIEeOuspyO4PzXCg"/>

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-b1XjFOIEeOuspyO4PzXCg"/>

+          </children>

+          <children xmi:type="notation:BasicCompartment" xmi:id="_-b-hcFOIEeOuspyO4PzXCg" visible="false" type="compartment_shape_display">

+            <styles xmi:type="notation:TitleStyle" xmi:id="_-b-hcVOIEeOuspyO4PzXCg"/>

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-b-hclOIEeOuspyO4PzXCg"/>

+          </children>

+          <element xmi:type="uml:UseCase" href="papyrusNewChild.uml#_-bickFOIEeOuspyO4PzXCg"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-b1XgVOIEeOuspyO4PzXCg" x="220" y="13"/>

+        </children>

+        <children xmi:type="notation:Shape" xmi:id="_EPnUAVOJEeOuspyO4PzXCg" type="3009" fontName="Segoe UI" fillColor="8905185" lineColor="0">

+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EPnUA1OJEeOuspyO4PzXCg" source="ShadowFigure">

+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EPnUBFOJEeOuspyO4PzXCg" key="ShadowFigure_Value" value="false"/>

+          </eAnnotations>

+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EPnUBVOJEeOuspyO4PzXCg" source="displayNameLabelIcon">

+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EPnUBlOJEeOuspyO4PzXCg" key="displayNameLabelIcon_value" value="false"/>

+          </eAnnotations>

+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EPnUB1OJEeOuspyO4PzXCg" source="QualifiedName">

+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EPnUCFOJEeOuspyO4PzXCg" key="QualifiedNameDepth" value="1000"/>

+          </eAnnotations>

+          <children xmi:type="notation:DecorationNode" xmi:id="_EPnUCVOJEeOuspyO4PzXCg" type="5018"/>

+          <children xmi:type="notation:DecorationNode" xmi:id="_EPnUClOJEeOuspyO4PzXCg" type="7012">

+            <children xmi:type="notation:Shape" xmi:id="_lYtP4FW6EeOhVe6k7yzS3A" type="3007" fontName="Segoe UI" lineColor="0">

+              <element xmi:type="uml:ExtensionPoint" href="papyrusNewChild.uml#_lYRLAVW6EeOhVe6k7yzS3A"/>

+              <layoutConstraint xmi:type="notation:Location" xmi:id="_lYtP4VW6EeOhVe6k7yzS3A"/>

+            </children>

+            <styles xmi:type="notation:SortingStyle" xmi:id="_EPnUC1OJEeOuspyO4PzXCg"/>

+            <styles xmi:type="notation:FilteringStyle" xmi:id="_EPnUDFOJEeOuspyO4PzXCg"/>

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EPnUDVOJEeOuspyO4PzXCg"/>

+          </children>

+          <children xmi:type="notation:BasicCompartment" xmi:id="_EPxFAFOJEeOuspyO4PzXCg" visible="false" type="compartment_shape_display">

+            <styles xmi:type="notation:TitleStyle" xmi:id="_EPxFAVOJEeOuspyO4PzXCg"/>

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EPxFAlOJEeOuspyO4PzXCg"/>

+          </children>

+          <element xmi:type="uml:UseCase" href="papyrusNewChild.uml#_EPnUAFOJEeOuspyO4PzXCg"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EPnUAlOJEeOuspyO4PzXCg" x="115" y="253"/>

+        </children>

+        <children xmi:type="notation:Shape" xmi:id="_WZ_ZwVOJEeOuspyO4PzXCg" type="3009" fontName="Segoe UI" fillColor="8905185" lineColor="0">

+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WZ_Zw1OJEeOuspyO4PzXCg" source="ShadowFigure">

+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WZ_ZxFOJEeOuspyO4PzXCg" key="ShadowFigure_Value" value="false"/>

+          </eAnnotations>

+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WZ_ZxVOJEeOuspyO4PzXCg" source="displayNameLabelIcon">

+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WZ_ZxlOJEeOuspyO4PzXCg" key="displayNameLabelIcon_value" value="false"/>

+          </eAnnotations>

+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WZ_Zx1OJEeOuspyO4PzXCg" source="QualifiedName">

+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WZ_ZyFOJEeOuspyO4PzXCg" key="QualifiedNameDepth" value="1000"/>

+          </eAnnotations>

+          <children xmi:type="notation:DecorationNode" xmi:id="_WZ_ZyVOJEeOuspyO4PzXCg" type="5018"/>

+          <children xmi:type="notation:DecorationNode" xmi:id="_WaJKwFOJEeOuspyO4PzXCg" type="7012">

+            <styles xmi:type="notation:SortingStyle" xmi:id="_WaJKwVOJEeOuspyO4PzXCg"/>

+            <styles xmi:type="notation:FilteringStyle" xmi:id="_WaJKwlOJEeOuspyO4PzXCg"/>

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WaJKw1OJEeOuspyO4PzXCg"/>

+          </children>

+          <children xmi:type="notation:BasicCompartment" xmi:id="_WaJKxFOJEeOuspyO4PzXCg" visible="false" type="compartment_shape_display">

+            <styles xmi:type="notation:TitleStyle" xmi:id="_WaJKxVOJEeOuspyO4PzXCg"/>

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WaJKxlOJEeOuspyO4PzXCg"/>

+          </children>

+          <element xmi:type="uml:UseCase" href="papyrusNewChild.uml#_WZ_ZwFOJEeOuspyO4PzXCg"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WZ_ZwlOJEeOuspyO4PzXCg" x="170" y="118"/>

+        </children>

+        <children xmi:type="notation:Shape" xmi:id="_uSWWAFOJEeOuspyO4PzXCg" type="3009" fontName="Segoe UI" fillColor="8905185" lineColor="0">

+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uSWWAlOJEeOuspyO4PzXCg" source="ShadowFigure">

+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uSWWA1OJEeOuspyO4PzXCg" key="ShadowFigure_Value" value="false"/>

+          </eAnnotations>

+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uSWWBFOJEeOuspyO4PzXCg" source="displayNameLabelIcon">

+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uSWWBVOJEeOuspyO4PzXCg" key="displayNameLabelIcon_value" value="false"/>

+          </eAnnotations>

+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uSWWBlOJEeOuspyO4PzXCg" source="QualifiedName">

+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uSWWB1OJEeOuspyO4PzXCg" key="QualifiedNameDepth" value="1000"/>

+          </eAnnotations>

+          <children xmi:type="notation:DecorationNode" xmi:id="_uSWWCFOJEeOuspyO4PzXCg" type="5018"/>

+          <children xmi:type="notation:DecorationNode" xmi:id="_uSWWCVOJEeOuspyO4PzXCg" type="7012">

+            <styles xmi:type="notation:SortingStyle" xmi:id="_uSWWClOJEeOuspyO4PzXCg"/>

+            <styles xmi:type="notation:FilteringStyle" xmi:id="_uSWWC1OJEeOuspyO4PzXCg"/>

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uSWWDFOJEeOuspyO4PzXCg"/>

+          </children>

+          <children xmi:type="notation:BasicCompartment" xmi:id="_uSff8FOJEeOuspyO4PzXCg" visible="false" type="compartment_shape_display">

+            <styles xmi:type="notation:TitleStyle" xmi:id="_uSff8VOJEeOuspyO4PzXCg"/>

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uSff8lOJEeOuspyO4PzXCg"/>

+          </children>

+          <element xmi:type="uml:UseCase" href="papyrusNewChild.uml#_uSMlAFOJEeOuspyO4PzXCg"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uSWWAVOJEeOuspyO4PzXCg" x="115" y="353"/>

+        </children>

+        <children xmi:type="notation:Shape" xmi:id="_cXd44FW6EeOhVe6k7yzS3A" type="3009" fontName="Segoe UI" fillColor="8047085" lineColor="0">

+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_cXnp4FW6EeOhVe6k7yzS3A" source="ShadowFigure">

+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cXnp4VW6EeOhVe6k7yzS3A" key="ShadowFigure_Value" value="false"/>

+          </eAnnotations>

+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_cXnp4lW6EeOhVe6k7yzS3A" source="displayNameLabelIcon">

+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cXnp41W6EeOhVe6k7yzS3A" key="displayNameLabelIcon_value" value="false"/>

+          </eAnnotations>

+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_cXnp5FW6EeOhVe6k7yzS3A" source="QualifiedName">

+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cXnp5VW6EeOhVe6k7yzS3A" key="QualifiedNameDepth" value="1000"/>

+          </eAnnotations>

+          <children xmi:type="notation:DecorationNode" xmi:id="_cXnp5lW6EeOhVe6k7yzS3A" type="5018"/>

+          <children xmi:type="notation:DecorationNode" xmi:id="_cXnp51W6EeOhVe6k7yzS3A" type="7012">

+            <styles xmi:type="notation:SortingStyle" xmi:id="_cXnp6FW6EeOhVe6k7yzS3A"/>

+            <styles xmi:type="notation:FilteringStyle" xmi:id="_cXnp6VW6EeOhVe6k7yzS3A"/>

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cXnp6lW6EeOhVe6k7yzS3A"/>

+          </children>

+          <children xmi:type="notation:BasicCompartment" xmi:id="_cXnp61W6EeOhVe6k7yzS3A" visible="false" type="compartment_shape_display">

+            <styles xmi:type="notation:TitleStyle" xmi:id="_cXnp7FW6EeOhVe6k7yzS3A"/>

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cXnp7VW6EeOhVe6k7yzS3A"/>

+          </children>

+          <element xmi:type="uml:UseCase" href="papyrusNewChild.uml#_cXBM8FW6EeOhVe6k7yzS3A"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cXd44VW6EeOhVe6k7yzS3A" x="400" y="198"/>

+        </children>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uxPt-lOIEeOuspyO4PzXCg"/>

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_uxPt-1OIEeOuspyO4PzXCg" visible="false" type="compartment_shape_display">

+        <styles xmi:type="notation:TitleStyle" xmi:id="_uxPt_FOIEeOuspyO4PzXCg"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uxPt_VOIEeOuspyO4PzXCg"/>

+      </children>

+      <element xmi:type="uml:Component" href="papyrusNewChild.uml#_uxF88FOIEeOuspyO4PzXCg"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uxPt8VOIEeOuspyO4PzXCg" x="225" y="5" width="941" height="456"/>

+    </children>

+    <children xmi:type="notation:Shape" xmi:id="_zZTeMFOIEeOuspyO4PzXCg" type="2011" fontName="Segoe UI" lineColor="0">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zZTeMlOIEeOuspyO4PzXCg" source="ShadowFigure">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zZTeM1OIEeOuspyO4PzXCg" key="ShadowFigure_Value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zZTeNFOIEeOuspyO4PzXCg" source="displayNameLabelIcon">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zZTeNVOIEeOuspyO4PzXCg" key="displayNameLabelIcon_value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zZTeNlOIEeOuspyO4PzXCg" source="QualifiedName">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zZTeN1OIEeOuspyO4PzXCg" key="QualifiedNameDepth" value="1000"/>

+      </eAnnotations>

+      <children xmi:type="notation:DecorationNode" xmi:id="_zZTeOFOIEeOuspyO4PzXCg" type="5014">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_zZTeOVOIEeOuspyO4PzXCg" x="4" y="70"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_zZTeOlOIEeOuspyO4PzXCg" type="6029">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_zZTeO1OIEeOuspyO4PzXCg" x="20" y="100"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_zZTePFOIEeOuspyO4PzXCg" type="6037">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_zZTePVOIEeOuspyO4PzXCg" x="20" y="80"/>

+      </children>

+      <element xmi:type="uml:Actor" href="papyrusNewChild.uml#_zYtoUFOIEeOuspyO4PzXCg"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zZTeMVOIEeOuspyO4PzXCg" x="60" y="45"/>

+    </children>

+    <children xmi:type="notation:Shape" xmi:id="_3P0cwVOIEeOuspyO4PzXCg" type="2011" fontName="Segoe UI" lineColor="0">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3P0cw1OIEeOuspyO4PzXCg" source="ShadowFigure">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3P0cxFOIEeOuspyO4PzXCg" key="ShadowFigure_Value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3P0cxVOIEeOuspyO4PzXCg" source="displayNameLabelIcon">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3P0cxlOIEeOuspyO4PzXCg" key="displayNameLabelIcon_value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3P0cx1OIEeOuspyO4PzXCg" source="QualifiedName">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3P0cyFOIEeOuspyO4PzXCg" key="QualifiedNameDepth" value="1000"/>

+      </eAnnotations>

+      <children xmi:type="notation:DecorationNode" xmi:id="_3P0cyVOIEeOuspyO4PzXCg" type="5014">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_3P0cylOIEeOuspyO4PzXCg" x="-14" y="70"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_3P0cy1OIEeOuspyO4PzXCg" type="6029">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_3P0czFOIEeOuspyO4PzXCg" x="20" y="100"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_3P0czVOIEeOuspyO4PzXCg" type="6037">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_3P0czlOIEeOuspyO4PzXCg" x="20" y="80"/>

+      </children>

+      <element xmi:type="uml:Actor" href="papyrusNewChild.uml#_3P0cwFOIEeOuspyO4PzXCg"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3P0cwlOIEeOuspyO4PzXCg" x="50" y="330"/>

+    </children>

+    <styles xmi:type="notation:DiagramStyle" xmi:id="_swsygVOIEeOuspyO4PzXCg"/>

+    <element xmi:type="uml:Package" href="papyrusNewChild.uml#_JXz5sFOFEeOuspyO4PzXCg"/>

+    <edges xmi:type="notation:Connector" xmi:id="_DTqpIFOJEeOuspyO4PzXCg" type="4011" source="_zZTeMFOIEeOuspyO4PzXCg" target="_-b1XgFOIEeOuspyO4PzXCg" lineColor="0">

+      <children xmi:type="notation:DecorationNode" xmi:id="_DTqpI1OJEeOuspyO4PzXCg" visible="false" type="6008">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_DTqpJFOJEeOuspyO4PzXCg" y="40"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_DTqpJVOJEeOuspyO4PzXCg" type="6033">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_DTqpJlOJEeOuspyO4PzXCg" y="-20"/>

+      </children>

+      <styles xmi:type="notation:FontStyle" xmi:id="_DTqpIVOJEeOuspyO4PzXCg" fontName="Segoe UI"/>

+      <element xmi:type="uml:Association" href="papyrusNewChild.uml#_DTg4IFOJEeOuspyO4PzXCg"/>

+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DTqpIlOJEeOuspyO4PzXCg" points="[40, 6, -298, 0]$[320, 1, -18, -5]"/>

+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DTzzEFOJEeOuspyO4PzXCg" id="(0.2,0.31666666666666665)"/>

+    </edges>

+    <edges xmi:type="notation:Connector" xmi:id="_PBVKJ1OJEeOuspyO4PzXCg" type="4011" source="_3P0cwVOIEeOuspyO4PzXCg" target="_EPnUAVOJEeOuspyO4PzXCg" lineColor="0">

+      <children xmi:type="notation:DecorationNode" xmi:id="_PBVKKlOJEeOuspyO4PzXCg" visible="false" type="6008">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_PBVKK1OJEeOuspyO4PzXCg" y="40"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_PBVKLFOJEeOuspyO4PzXCg" type="6033">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_PBVKLVOJEeOuspyO4PzXCg" y="-20"/>

+      </children>

+      <styles xmi:type="notation:FontStyle" xmi:id="_PBVKKFOJEeOuspyO4PzXCg" fontName="Segoe UI"/>

+      <element xmi:type="uml:Association" href="papyrusNewChild.uml#_PBVKIFOJEeOuspyO4PzXCg"/>

+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PBVKKVOJEeOuspyO4PzXCg" points="[40, 1, -320, -13]$[304, 16, -56, 2]"/>

+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PBe7IFOJEeOuspyO4PzXCg" id="(0.19666666666666666,0.5666666666666667)"/>

+    </edges>

+    <edges xmi:type="notation:Connector" xmi:id="_gmg4J1OJEeOuspyO4PzXCg" type="4011" source="_zZTeMFOIEeOuspyO4PzXCg" target="_WZ_ZwVOJEeOuspyO4PzXCg" lineColor="0">

+      <children xmi:type="notation:DecorationNode" xmi:id="_gmg4KlOJEeOuspyO4PzXCg" visible="false" type="6008">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_gmg4K1OJEeOuspyO4PzXCg" y="40"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_gmg4LFOJEeOuspyO4PzXCg" type="6033">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_gmg4LVOJEeOuspyO4PzXCg" y="-20"/>

+      </children>

+      <styles xmi:type="notation:FontStyle" xmi:id="_gmg4KFOJEeOuspyO4PzXCg" fontName="Segoe UI"/>

+      <element xmi:type="uml:Association" href="papyrusNewChild.uml#_gmg4IFOJEeOuspyO4PzXCg"/>

+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_gmg4KVOJEeOuspyO4PzXCg" points="[40, 18, -340, -154]$[350, 174, -30, 2]"/>

+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gmqpIFOJEeOuspyO4PzXCg" id="(0.1469387755102041,0.6166666666666667)"/>

+    </edges>

+    <edges xmi:type="notation:Edge" xmi:id="_aEVYoFW6EeOhVe6k7yzS3A" type="4008" source="_EPnUAVOJEeOuspyO4PzXCg" target="_uSWWAFOJEeOuspyO4PzXCg">

+      <children xmi:type="notation:DecorationNode" xmi:id="_aEeikFW6EeOhVe6k7yzS3A" type="6006">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_aEeikVW6EeOhVe6k7yzS3A" y="20"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_aEeiklW6EeOhVe6k7yzS3A" type="6030">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_aEeik1W6EeOhVe6k7yzS3A" y="-20"/>

+      </children>

+      <styles xmi:type="notation:RoutingStyle" xmi:id="_aEVYoVW6EeOhVe6k7yzS3A"/>

+      <styles xmi:type="notation:FontStyle" xmi:id="_aEVYolW6EeOhVe6k7yzS3A" fontName="Segoe UI"/>

+      <element xmi:type="uml:Include" href="papyrusNewChild.uml#_aEB2oFW6EeOhVe6k7yzS3A"/>

+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_aEVYo1W6EeOhVe6k7yzS3A" points="[-27, 29, 82, -106]$[-110, 105, -1, -30]"/>

+    </edges>

+    <edges xmi:type="notation:Edge" xmi:id="_lYHaAFW6EeOhVe6k7yzS3A" type="4009" source="_cXd44FW6EeOhVe6k7yzS3A" target="_EPnUAVOJEeOuspyO4PzXCg">

+      <children xmi:type="notation:DecorationNode" xmi:id="_lYHaBFW6EeOhVe6k7yzS3A" type="6007">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_lYHaBVW6EeOhVe6k7yzS3A" y="20"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_lYHaBlW6EeOhVe6k7yzS3A" type="6031">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_lYHaB1W6EeOhVe6k7yzS3A" y="-20"/>

+      </children>

+      <styles xmi:type="notation:RoutingStyle" xmi:id="_lYHaAVW6EeOhVe6k7yzS3A"/>

+      <styles xmi:type="notation:FontStyle" xmi:id="_lYHaAlW6EeOhVe6k7yzS3A" fontName="Segoe UI"/>

+      <element xmi:type="uml:Extend" href="papyrusNewChild.uml#_lX9pAFW6EeOhVe6k7yzS3A"/>

+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lYHaA1W6EeOhVe6k7yzS3A" points="[0, 30, 264, -28]$[0, 58, 264, 0]$[-237, 58, 27, 0]"/>

+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lYRLAFW6EeOhVe6k7yzS3A" id="(0.9066666666666666,0.55)"/>

+    </edges>

+  </notation:Diagram>

+  <nattable:Table xmi:id="_uB23AFW6EeOhVe6k7yzS3A" name="UseCase" currentRowAxisProvider="_uB23AlW6EeOhVe6k7yzS3A" currentColumnAxisProvider="_uB23AVW6EeOhVe6k7yzS3A">

+    <context xmi:type="uml:Component" href="papyrusNewChild.uml#_uxF88FOIEeOuspyO4PzXCg"/>

+    <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#/"/>

+    <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_uB23AVW6EeOhVe6k7yzS3A" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">

+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_DtL7DlW7EeOhVe6k7yzS3A">

+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>

+      </axis>

+    </columnAxisProvidersHistory>

+    <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_uB23AlW6EeOhVe6k7yzS3A" description="This axis provider contains the object dropped by the user into the table" name="DroppedElementAxisProvider">

+      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_usGt4FW6EeOhVe6k7yzS3A">

+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>

+        <element xmi:type="uml:UseCase" href="papyrusNewChild.uml#_-bickFOIEeOuspyO4PzXCg"/>

+      </axis>

+      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_3uPcwFW6EeOhVe6k7yzS3A">

+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>

+        <element xmi:type="uml:UseCase" href="papyrusNewChild.uml#_EPnUAFOJEeOuspyO4PzXCg"/>

+      </axis>

+      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_3uPcwVW6EeOhVe6k7yzS3A">

+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>

+        <element xmi:type="uml:UseCase" href="papyrusNewChild.uml#_WZ_ZwFOJEeOuspyO4PzXCg"/>

+      </axis>

+      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_3uPcwlW6EeOhVe6k7yzS3A">

+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>

+        <element xmi:type="uml:UseCase" href="papyrusNewChild.uml#_uSMlAFOJEeOuspyO4PzXCg"/>

+      </axis>

+      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_3uPcw1W6EeOhVe6k7yzS3A">

+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>

+        <element xmi:type="uml:UseCase" href="papyrusNewChild.uml#_cXBM8FW6EeOhVe6k7yzS3A"/>

+      </axis>

+    </rowAxisProvidersHistory>

+  </nattable:Table>

+  <notation:Diagram xmi:id="_o5dr8FXdEeOW-JPqZK_EZg" type="UseCase" name="Test about UseCreateMenu" measurementUnit="Pixel">

+    <children xmi:type="notation:Shape" xmi:id="_pfAB8FXdEeOW-JPqZK_EZg" type="2013" fontName="Segoe UI" lineColor="0">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pfApAFXdEeOW-JPqZK_EZg" source="ShadowFigure">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pfBQEFXdEeOW-JPqZK_EZg" key="ShadowFigure_Value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pfBQEVXdEeOW-JPqZK_EZg" source="displayNameLabelIcon">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pfBQElXdEeOW-JPqZK_EZg" key="displayNameLabelIcon_value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pfBQE1XdEeOW-JPqZK_EZg" source="QualifiedName">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pfBQFFXdEeOW-JPqZK_EZg" key="QualifiedNameDepth" value="1000"/>

+      </eAnnotations>

+      <children xmi:type="notation:DecorationNode" xmi:id="_pfBQFVXdEeOW-JPqZK_EZg" type="5016"/>

+      <children xmi:type="notation:DecorationNode" xmi:id="_pfBQFlXdEeOW-JPqZK_EZg" type="7009">

+        <styles xmi:type="notation:SortingStyle" xmi:id="_pfBQF1XdEeOW-JPqZK_EZg"/>

+        <styles xmi:type="notation:FilteringStyle" xmi:id="_pfBQGFXdEeOW-JPqZK_EZg"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pfBQGVXdEeOW-JPqZK_EZg"/>

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_pfP5kFXdEeOW-JPqZK_EZg" visible="false" type="compartment_shape_display">

+        <styles xmi:type="notation:TitleStyle" xmi:id="_pfQgoFXdEeOW-JPqZK_EZg"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pfQgoVXdEeOW-JPqZK_EZg"/>

+      </children>

+      <element xmi:type="uml:UseCase" href="papyrusNewChild.uml#_-bickFOIEeOuspyO4PzXCg"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pfAB8VXdEeOW-JPqZK_EZg" x="270" y="35"/>

+    </children>

+    <children xmi:type="notation:Shape" xmi:id="_rxzyEFXdEeOW-JPqZK_EZg" type="2013" fontName="Segoe UI" lineColor="0">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rx0ZIFXdEeOW-JPqZK_EZg" source="ShadowFigure">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rx0ZIVXdEeOW-JPqZK_EZg" key="ShadowFigure_Value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rx0ZIlXdEeOW-JPqZK_EZg" source="displayNameLabelIcon">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rx0ZI1XdEeOW-JPqZK_EZg" key="displayNameLabelIcon_value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rx0ZJFXdEeOW-JPqZK_EZg" source="QualifiedName">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rx0ZJVXdEeOW-JPqZK_EZg" key="QualifiedNameDepth" value="1000"/>

+      </eAnnotations>

+      <children xmi:type="notation:DecorationNode" xmi:id="_rx0ZJlXdEeOW-JPqZK_EZg" type="5016"/>

+      <children xmi:type="notation:DecorationNode" xmi:id="_rx0ZJ1XdEeOW-JPqZK_EZg" type="7009">

+        <styles xmi:type="notation:SortingStyle" xmi:id="_rx0ZKFXdEeOW-JPqZK_EZg"/>

+        <styles xmi:type="notation:FilteringStyle" xmi:id="_rx0ZKVXdEeOW-JPqZK_EZg"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rx0ZKlXdEeOW-JPqZK_EZg"/>

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_rx6fwFXdEeOW-JPqZK_EZg" visible="false" type="compartment_shape_display">

+        <styles xmi:type="notation:TitleStyle" xmi:id="_rx6fwVXdEeOW-JPqZK_EZg"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rx6fwlXdEeOW-JPqZK_EZg"/>

+      </children>

+      <element xmi:type="uml:UseCase" href="papyrusNewChild.uml#_rxKR0FXdEeOW-JPqZK_EZg"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rxzyEVXdEeOW-JPqZK_EZg" x="40" y="260" width="346"/>

+    </children>

+    <children xmi:type="notation:Shape" xmi:id="_1v06YFXdEeOW-JPqZK_EZg" type="2013" fontName="Segoe UI" lineColor="0">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1v06YlXdEeOW-JPqZK_EZg" source="ShadowFigure">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1v06Y1XdEeOW-JPqZK_EZg" key="ShadowFigure_Value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1v06ZFXdEeOW-JPqZK_EZg" source="displayNameLabelIcon">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1v06ZVXdEeOW-JPqZK_EZg" key="displayNameLabelIcon_value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1v06ZlXdEeOW-JPqZK_EZg" source="QualifiedName">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1v06Z1XdEeOW-JPqZK_EZg" key="QualifiedNameDepth" value="1000"/>

+      </eAnnotations>

+      <children xmi:type="notation:DecorationNode" xmi:id="_1v06aFXdEeOW-JPqZK_EZg" type="5016"/>

+      <children xmi:type="notation:DecorationNode" xmi:id="_1v06aVXdEeOW-JPqZK_EZg" type="7009">

+        <styles xmi:type="notation:SortingStyle" xmi:id="_1v06alXdEeOW-JPqZK_EZg"/>

+        <styles xmi:type="notation:FilteringStyle" xmi:id="_1v06a1XdEeOW-JPqZK_EZg"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1v06bFXdEeOW-JPqZK_EZg"/>

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_1v-EUFXdEeOW-JPqZK_EZg" visible="false" type="compartment_shape_display">

+        <styles xmi:type="notation:TitleStyle" xmi:id="_1v-EUVXdEeOW-JPqZK_EZg"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1v-EUlXdEeOW-JPqZK_EZg"/>

+      </children>

+      <element xmi:type="uml:UseCase" href="papyrusNewChild.uml#_1vrJYFXdEeOW-JPqZK_EZg"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1v06YVXdEeOW-JPqZK_EZg" x="425" y="255"/>

+    </children>

+    <children xmi:type="notation:Shape" xmi:id="_4naLgFXdEeOW-JPqZK_EZg" type="2013" fontName="Segoe UI" lineColor="0">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4naLglXdEeOW-JPqZK_EZg" source="ShadowFigure">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4naLg1XdEeOW-JPqZK_EZg" key="ShadowFigure_Value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4naLhFXdEeOW-JPqZK_EZg" source="displayNameLabelIcon">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4naLhVXdEeOW-JPqZK_EZg" key="displayNameLabelIcon_value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4naLhlXdEeOW-JPqZK_EZg" source="QualifiedName">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4naLh1XdEeOW-JPqZK_EZg" key="QualifiedNameDepth" value="1000"/>

+      </eAnnotations>

+      <children xmi:type="notation:DecorationNode" xmi:id="_4naLiFXdEeOW-JPqZK_EZg" type="5016"/>

+      <children xmi:type="notation:DecorationNode" xmi:id="_4naLiVXdEeOW-JPqZK_EZg" type="7009">

+        <styles xmi:type="notation:SortingStyle" xmi:id="_4naLilXdEeOW-JPqZK_EZg"/>

+        <styles xmi:type="notation:FilteringStyle" xmi:id="_4naLi1XdEeOW-JPqZK_EZg"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4naLjFXdEeOW-JPqZK_EZg"/>

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_4nj8gFXdEeOW-JPqZK_EZg" visible="false" type="compartment_shape_display">

+        <styles xmi:type="notation:TitleStyle" xmi:id="_4nj8gVXdEeOW-JPqZK_EZg"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4nj8glXdEeOW-JPqZK_EZg"/>

+      </children>

+      <element xmi:type="uml:UseCase" href="papyrusNewChild.uml#_4nRBkFXdEeOW-JPqZK_EZg"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4naLgVXdEeOW-JPqZK_EZg" x="680" y="190"/>

+    </children>

+    <styles xmi:type="notation:DiagramStyle" xmi:id="_o5dr8VXdEeOW-JPqZK_EZg"/>

+    <element xmi:type="uml:Package" href="papyrusNewChild.uml#_lII58FXeEeOW-JPqZK_EZg"/>

+    <edges xmi:type="notation:Connector" xmi:id="_xp1VYFXdEeOW-JPqZK_EZg" type="4016" source="_rxzyEFXdEeOW-JPqZK_EZg" target="_pfAB8FXdEeOW-JPqZK_EZg" lineColor="0">

+      <children xmi:type="notation:DecorationNode" xmi:id="_xp1VY1XdEeOW-JPqZK_EZg" type="6012">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xp1VZFXdEeOW-JPqZK_EZg" y="40"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_xp1VZVXdEeOW-JPqZK_EZg" type="6013">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xp1VZlXdEeOW-JPqZK_EZg" y="-20"/>

+      </children>

+      <styles xmi:type="notation:FontStyle" xmi:id="_xp1VYVXdEeOW-JPqZK_EZg" fontName="Segoe UI"/>

+      <element xmi:type="uml:Usage" href="papyrusNewChild.uml#_xpiacFXdEeOW-JPqZK_EZg"/>

+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xp1VYlXdEeOW-JPqZK_EZg" points="[11, -30, -84, 195]$[54, -201, -41, 24]"/>

+    </edges>

+    <edges xmi:type="notation:Connector" xmi:id="_9Yi_QVXdEeOW-JPqZK_EZg" type="4016" source="_4naLgFXdEeOW-JPqZK_EZg" target="_pfAB8FXdEeOW-JPqZK_EZg" lineColor="0">

+      <children xmi:type="notation:DecorationNode" xmi:id="_9Yi_RFXdEeOW-JPqZK_EZg" type="6012">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_9Yi_RVXdEeOW-JPqZK_EZg" y="40"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_9Yi_RlXdEeOW-JPqZK_EZg" type="6013">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_9Yi_R1XdEeOW-JPqZK_EZg" y="-20"/>

+      </children>

+      <styles xmi:type="notation:FontStyle" xmi:id="_9Yi_QlXdEeOW-JPqZK_EZg" fontName="Segoe UI"/>

+      <element xmi:type="uml:Usage" href="papyrusNewChild.uml#_9Yi_QFXdEeOW-JPqZK_EZg"/>

+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9Yi_Q1XdEeOW-JPqZK_EZg" points="[-75, -26, 406, 129]$[-413, -161, 68, -6]"/>

+    </edges>

+    <edges xmi:type="notation:Connector" xmi:id="_-0Vn0VXdEeOW-JPqZK_EZg" type="4016" source="_1v06YFXdEeOW-JPqZK_EZg" target="_pfAB8FXdEeOW-JPqZK_EZg" lineColor="0">

+      <children xmi:type="notation:DecorationNode" xmi:id="_-0Vn1FXdEeOW-JPqZK_EZg" type="6012">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_-0Vn1VXdEeOW-JPqZK_EZg" y="40"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_-0Vn1lXdEeOW-JPqZK_EZg" type="6013">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_-0Vn11XdEeOW-JPqZK_EZg" y="-20"/>

+      </children>

+      <styles xmi:type="notation:FontStyle" xmi:id="_-0Vn0lXdEeOW-JPqZK_EZg" fontName="Segoe UI"/>

+      <element xmi:type="uml:Usage" href="papyrusNewChild.uml#_-0Vn0FXdEeOW-JPqZK_EZg"/>

+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-0Vn01XdEeOW-JPqZK_EZg" points="[-31, -30, 192, 190]$[-229, -191, -6, 29]"/>

+    </edges>

+  </notation:Diagram>

+  <notation:Diagram xmi:id="_Fo2BgFXeEeOW-JPqZK_EZg" type="UseCase" name="Test about Create or Modify Element CreationModel" measurementUnit="Pixel">

+    <children xmi:type="notation:Shape" xmi:id="_GxJtYFXeEeOW-JPqZK_EZg" type="2013" fontName="Segoe UI" lineColor="0">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GxJtYlXeEeOW-JPqZK_EZg" source="ShadowFigure">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GxJtY1XeEeOW-JPqZK_EZg" key="ShadowFigure_Value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GxJtZFXeEeOW-JPqZK_EZg" source="displayNameLabelIcon">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GxJtZVXeEeOW-JPqZK_EZg" key="displayNameLabelIcon_value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GxJtZlXeEeOW-JPqZK_EZg" source="QualifiedName">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GxJtZ1XeEeOW-JPqZK_EZg" key="QualifiedNameDepth" value="1000"/>

+      </eAnnotations>

+      <children xmi:type="notation:DecorationNode" xmi:id="_GxJtaFXeEeOW-JPqZK_EZg" type="5016"/>

+      <children xmi:type="notation:DecorationNode" xmi:id="_GxJtaVXeEeOW-JPqZK_EZg" type="7009">

+        <styles xmi:type="notation:SortingStyle" xmi:id="_GxJtalXeEeOW-JPqZK_EZg"/>

+        <styles xmi:type="notation:FilteringStyle" xmi:id="_GxJta1XeEeOW-JPqZK_EZg"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GxJtbFXeEeOW-JPqZK_EZg"/>

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_GxS3UFXeEeOW-JPqZK_EZg" visible="false" type="compartment_shape_display">

+        <styles xmi:type="notation:TitleStyle" xmi:id="_GxS3UVXeEeOW-JPqZK_EZg"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GxS3UlXeEeOW-JPqZK_EZg"/>

+      </children>

+      <element xmi:type="uml:UseCase" href="papyrusNewChild.uml#_EPnUAFOJEeOuspyO4PzXCg"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GxJtYVXeEeOW-JPqZK_EZg" x="336" y="102"/>

+    </children>

+    <children xmi:type="notation:Shape" xmi:id="_HTqkkFXeEeOW-JPqZK_EZg" type="2013" fontName="Segoe UI" lineColor="0">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HTqkklXeEeOW-JPqZK_EZg" source="ShadowFigure">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HTqkk1XeEeOW-JPqZK_EZg" key="ShadowFigure_Value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HTqklFXeEeOW-JPqZK_EZg" source="displayNameLabelIcon">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HTqklVXeEeOW-JPqZK_EZg" key="displayNameLabelIcon_value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_HTqkllXeEeOW-JPqZK_EZg" source="QualifiedName">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_HTqkl1XeEeOW-JPqZK_EZg" key="QualifiedNameDepth" value="1000"/>

+      </eAnnotations>

+      <children xmi:type="notation:DecorationNode" xmi:id="_HTqkmFXeEeOW-JPqZK_EZg" type="5016"/>

+      <children xmi:type="notation:DecorationNode" xmi:id="_HTqkmVXeEeOW-JPqZK_EZg" type="7009">

+        <styles xmi:type="notation:SortingStyle" xmi:id="_HTqkmlXeEeOW-JPqZK_EZg"/>

+        <styles xmi:type="notation:FilteringStyle" xmi:id="_HTqkm1XeEeOW-JPqZK_EZg"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HTqknFXeEeOW-JPqZK_EZg"/>

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_HT0VkFXeEeOW-JPqZK_EZg" visible="false" type="compartment_shape_display">

+        <styles xmi:type="notation:TitleStyle" xmi:id="_HT0VkVXeEeOW-JPqZK_EZg"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HT0VklXeEeOW-JPqZK_EZg"/>

+      </children>

+      <element xmi:type="uml:UseCase" href="papyrusNewChild.uml#_HTgzkFXeEeOW-JPqZK_EZg"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HTqkkVXeEeOW-JPqZK_EZg" x="185" y="310"/>

+    </children>

+    <children xmi:type="notation:Shape" xmi:id="_KdZ8sVXeEeOW-JPqZK_EZg" type="2013" fontName="Segoe UI" lineColor="0">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_KdZ8s1XeEeOW-JPqZK_EZg" source="ShadowFigure">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_KdZ8tFXeEeOW-JPqZK_EZg" key="ShadowFigure_Value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_KdZ8tVXeEeOW-JPqZK_EZg" source="displayNameLabelIcon">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_KdZ8tlXeEeOW-JPqZK_EZg" key="displayNameLabelIcon_value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_KdZ8t1XeEeOW-JPqZK_EZg" source="QualifiedName">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_KdZ8uFXeEeOW-JPqZK_EZg" key="QualifiedNameDepth" value="1000"/>

+      </eAnnotations>

+      <children xmi:type="notation:DecorationNode" xmi:id="_KdZ8uVXeEeOW-JPqZK_EZg" type="5016"/>

+      <children xmi:type="notation:DecorationNode" xmi:id="_KdZ8ulXeEeOW-JPqZK_EZg" type="7009">

+        <styles xmi:type="notation:SortingStyle" xmi:id="_KdZ8u1XeEeOW-JPqZK_EZg"/>

+        <styles xmi:type="notation:FilteringStyle" xmi:id="_KdZ8vFXeEeOW-JPqZK_EZg"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KdZ8vVXeEeOW-JPqZK_EZg"/>

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_KdjGoFXeEeOW-JPqZK_EZg" visible="false" type="compartment_shape_display">

+        <styles xmi:type="notation:TitleStyle" xmi:id="_KdjGoVXeEeOW-JPqZK_EZg"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KdjGolXeEeOW-JPqZK_EZg"/>

+      </children>

+      <element xmi:type="uml:UseCase" href="papyrusNewChild.uml#_KdZ8sFXeEeOW-JPqZK_EZg"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KdZ8slXeEeOW-JPqZK_EZg" x="480" y="315"/>

+    </children>

+    <children xmi:type="notation:Shape" xmi:id="_M6gRQVXeEeOW-JPqZK_EZg" type="2013" fontName="Segoe UI" lineColor="0">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_M6gRQ1XeEeOW-JPqZK_EZg" source="ShadowFigure">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_M6gRRFXeEeOW-JPqZK_EZg" key="ShadowFigure_Value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_M6gRRVXeEeOW-JPqZK_EZg" source="displayNameLabelIcon">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_M6qCQFXeEeOW-JPqZK_EZg" key="displayNameLabelIcon_value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_M6qCQVXeEeOW-JPqZK_EZg" source="QualifiedName">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_M6qCQlXeEeOW-JPqZK_EZg" key="QualifiedNameDepth" value="1000"/>

+      </eAnnotations>

+      <children xmi:type="notation:DecorationNode" xmi:id="_M6qCQ1XeEeOW-JPqZK_EZg" type="5016"/>

+      <children xmi:type="notation:DecorationNode" xmi:id="_M6qCRFXeEeOW-JPqZK_EZg" type="7009">

+        <styles xmi:type="notation:SortingStyle" xmi:id="_M6qCRVXeEeOW-JPqZK_EZg"/>

+        <styles xmi:type="notation:FilteringStyle" xmi:id="_M6qCRlXeEeOW-JPqZK_EZg"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_M6qCR1XeEeOW-JPqZK_EZg"/>

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_M6qCSFXeEeOW-JPqZK_EZg" visible="false" type="compartment_shape_display">

+        <styles xmi:type="notation:TitleStyle" xmi:id="_M6qCSVXeEeOW-JPqZK_EZg"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_M6qCSlXeEeOW-JPqZK_EZg"/>

+      </children>

+      <element xmi:type="uml:UseCase" href="papyrusNewChild.uml#_M6gRQFXeEeOW-JPqZK_EZg"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_M6gRQlXeEeOW-JPqZK_EZg" x="803" y="87"/>

+    </children>

+    <styles xmi:type="notation:DiagramStyle" xmi:id="_Fo2BgVXeEeOW-JPqZK_EZg"/>

+    <element xmi:type="uml:Package" href="papyrusNewChild.uml#_fMeMwFXeEeOW-JPqZK_EZg"/>

+    <edges xmi:type="notation:Connector" xmi:id="_TYirsVXeEeOW-JPqZK_EZg" type="4016" source="_M6gRQVXeEeOW-JPqZK_EZg" target="_GxJtYFXeEeOW-JPqZK_EZg" lineColor="0">

+      <children xmi:type="notation:DecorationNode" xmi:id="_TYirtFXeEeOW-JPqZK_EZg" type="6012">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_TYirtVXeEeOW-JPqZK_EZg" y="40"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_TYirtlXeEeOW-JPqZK_EZg" type="6013">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_TYirt1XeEeOW-JPqZK_EZg" y="-20"/>

+      </children>

+      <styles xmi:type="notation:FontStyle" xmi:id="_TYirslXeEeOW-JPqZK_EZg" fontName="Segoe UI"/>

+      <element xmi:type="uml:Usage" href="papyrusNewChild.uml#_TYirsFXeEeOW-JPqZK_EZg"/>

+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TYirs1XeEeOW-JPqZK_EZg" points="[-155, 4, 218, -8]$[-326, 10, 47, -2]"/>

+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TYscsFXeEeOW-JPqZK_EZg" id="(0.8366666666666667,0.45)"/>

+    </edges>

+    <edges xmi:type="notation:Connector" xmi:id="_VIIaAVXeEeOW-JPqZK_EZg" type="4016" source="_KdZ8sVXeEeOW-JPqZK_EZg" target="_GxJtYFXeEeOW-JPqZK_EZg" lineColor="0">

+      <children xmi:type="notation:DecorationNode" xmi:id="_VIIaBFXeEeOW-JPqZK_EZg" type="6012">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_VIIaBVXeEeOW-JPqZK_EZg" y="40"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_VIIaBlXeEeOW-JPqZK_EZg" type="6013">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_VIIaB1XeEeOW-JPqZK_EZg" y="-20"/>

+      </children>

+      <styles xmi:type="notation:FontStyle" xmi:id="_VIIaAlXeEeOW-JPqZK_EZg" fontName="Segoe UI"/>

+      <element xmi:type="uml:Usage" href="papyrusNewChild.uml#_VIIaAFXeEeOW-JPqZK_EZg"/>

+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_VIIaA1XeEeOW-JPqZK_EZg" points="[-14, -30, 94, 183]$[41, -210, 149, 3]"/>

+    </edges>

+    <edges xmi:type="notation:Connector" xmi:id="_VqMlQVXeEeOW-JPqZK_EZg" type="4016" source="_HTqkkFXeEeOW-JPqZK_EZg" target="_GxJtYFXeEeOW-JPqZK_EZg" lineColor="0">

+      <children xmi:type="notation:DecorationNode" xmi:id="_VqWWQFXeEeOW-JPqZK_EZg" type="6012">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_VqWWQVXeEeOW-JPqZK_EZg" y="40"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_VqWWQlXeEeOW-JPqZK_EZg" type="6013">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_VqWWQ1XeEeOW-JPqZK_EZg" y="-20"/>

+      </children>

+      <styles xmi:type="notation:FontStyle" xmi:id="_VqMlQlXeEeOW-JPqZK_EZg" fontName="Segoe UI"/>

+      <element xmi:type="uml:Usage" href="papyrusNewChild.uml#_VqMlQFXeEeOW-JPqZK_EZg"/>

+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_VqMlQ1XeEeOW-JPqZK_EZg" points="[19, -30, -163, 178]$[32, -209, -150, -1]"/>

+    </edges>

+  </notation:Diagram>

+  <notation:Diagram xmi:id="_uhdN0FgPEeOKQOyOw2l5lw" type="PapyrusUMLClassDiagram" name="RefineElement" measurementUnit="Pixel">

+    <children xmi:type="notation:Shape" xmi:id="_1n0zkFgPEeOKQOyOw2l5lw" type="2097" fontName="Segoe UI" lineColor="0">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1n0zklgPEeOKQOyOw2l5lw" source="ShadowFigure">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1n0zk1gPEeOKQOyOw2l5lw" key="ShadowFigure_Value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1n0zlFgPEeOKQOyOw2l5lw" source="displayNameLabelIcon">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1n0zlVgPEeOKQOyOw2l5lw" key="displayNameLabelIcon_value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1n0zllgPEeOKQOyOw2l5lw" source="QualifiedName">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1n0zl1gPEeOKQOyOw2l5lw" key="QualifiedNameDepth" value="1000"/>

+      </eAnnotations>

+      <children xmi:type="notation:DecorationNode" xmi:id="_1n0zmFgPEeOKQOyOw2l5lw" type="5157"/>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_1n99gFgPEeOKQOyOw2l5lw" visible="false" type="compartment_shape_display">

+        <styles xmi:type="notation:TitleStyle" xmi:id="_1n99gVgPEeOKQOyOw2l5lw"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1n99glgPEeOKQOyOw2l5lw"/>

+      </children>

+      <element xmi:type="uml:UseCase" href="papyrusNewChild.uml#_-bickFOIEeOuspyO4PzXCg"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1n0zkVgPEeOKQOyOw2l5lw" x="90" y="435" width="141"/>

+    </children>

+    <children xmi:type="notation:Shape" xmi:id="_2CmrEFgPEeOKQOyOw2l5lw" type="2097" fontName="Segoe UI" lineColor="0">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2CmrElgPEeOKQOyOw2l5lw" source="ShadowFigure">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2CmrE1gPEeOKQOyOw2l5lw" key="ShadowFigure_Value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2CmrFFgPEeOKQOyOw2l5lw" source="displayNameLabelIcon">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2CmrFVgPEeOKQOyOw2l5lw" key="displayNameLabelIcon_value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2CmrFlgPEeOKQOyOw2l5lw" source="QualifiedName">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2CmrF1gPEeOKQOyOw2l5lw" key="QualifiedNameDepth" value="1000"/>

+      </eAnnotations>

+      <children xmi:type="notation:DecorationNode" xmi:id="_2CmrGFgPEeOKQOyOw2l5lw" type="5157"/>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_2CmrGVgPEeOKQOyOw2l5lw" visible="false" type="compartment_shape_display">

+        <styles xmi:type="notation:TitleStyle" xmi:id="_2CmrGlgPEeOKQOyOw2l5lw"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2CmrG1gPEeOKQOyOw2l5lw"/>

+      </children>

+      <element xmi:type="uml:UseCase" href="papyrusNewChild.uml#_EPnUAFOJEeOuspyO4PzXCg"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2CmrEVgPEeOKQOyOw2l5lw" x="370" y="435" width="141"/>

+    </children>

+    <children xmi:type="notation:Shape" xmi:id="_2XR6kFgPEeOKQOyOw2l5lw" type="2097" fontName="Segoe UI" lineColor="0">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2XR6klgPEeOKQOyOw2l5lw" source="ShadowFigure">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2XR6k1gPEeOKQOyOw2l5lw" key="ShadowFigure_Value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2XR6lFgPEeOKQOyOw2l5lw" source="displayNameLabelIcon">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2XR6lVgPEeOKQOyOw2l5lw" key="displayNameLabelIcon_value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2XR6llgPEeOKQOyOw2l5lw" source="QualifiedName">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2XR6l1gPEeOKQOyOw2l5lw" key="QualifiedNameDepth" value="1000"/>

+      </eAnnotations>

+      <children xmi:type="notation:DecorationNode" xmi:id="_2XR6mFgPEeOKQOyOw2l5lw" type="5157"/>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_2XbrkFgPEeOKQOyOw2l5lw" visible="false" type="compartment_shape_display">

+        <styles xmi:type="notation:TitleStyle" xmi:id="_2XbrkVgPEeOKQOyOw2l5lw"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2XbrklgPEeOKQOyOw2l5lw"/>

+      </children>

+      <element xmi:type="uml:UseCase" href="papyrusNewChild.uml#_WZ_ZwFOJEeOuspyO4PzXCg"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2XR6kVgPEeOKQOyOw2l5lw" x="1050" y="430" width="141"/>

+    </children>

+    <children xmi:type="notation:Shape" xmi:id="_3CIOYFgPEeOKQOyOw2l5lw" type="2097" fontName="Segoe UI" lineColor="0">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3CIOYlgPEeOKQOyOw2l5lw" source="ShadowFigure">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3CIOY1gPEeOKQOyOw2l5lw" key="ShadowFigure_Value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3CIOZFgPEeOKQOyOw2l5lw" source="displayNameLabelIcon">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3CIOZVgPEeOKQOyOw2l5lw" key="displayNameLabelIcon_value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3CIOZlgPEeOKQOyOw2l5lw" source="QualifiedName">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3CIOZ1gPEeOKQOyOw2l5lw" key="QualifiedNameDepth" value="1000"/>

+      </eAnnotations>

+      <children xmi:type="notation:DecorationNode" xmi:id="_3CIOaFgPEeOKQOyOw2l5lw" type="5157"/>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_3CR_YFgPEeOKQOyOw2l5lw" visible="false" type="compartment_shape_display">

+        <styles xmi:type="notation:TitleStyle" xmi:id="_3CR_YVgPEeOKQOyOw2l5lw"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3CR_YlgPEeOKQOyOw2l5lw"/>

+      </children>

+      <element xmi:type="uml:UseCase" href="papyrusNewChild.uml#_uSMlAFOJEeOuspyO4PzXCg"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3CIOYVgPEeOKQOyOw2l5lw" x="655" y="435" width="141"/>

+    </children>

+    <children xmi:type="notation:Shape" xmi:id="_3j5esFgPEeOKQOyOw2l5lw" type="2097" fontName="Segoe UI" lineColor="0">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3j5eslgPEeOKQOyOw2l5lw" source="ShadowFigure">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3j5es1gPEeOKQOyOw2l5lw" key="ShadowFigure_Value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3j5etFgPEeOKQOyOw2l5lw" source="displayNameLabelIcon">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3j5etVgPEeOKQOyOw2l5lw" key="displayNameLabelIcon_value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3j5etlgPEeOKQOyOw2l5lw" source="QualifiedName">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3j5et1gPEeOKQOyOw2l5lw" key="QualifiedNameDepth" value="1000"/>

+      </eAnnotations>

+      <children xmi:type="notation:DecorationNode" xmi:id="_3j5euFgPEeOKQOyOw2l5lw" type="5157"/>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_3j5euVgPEeOKQOyOw2l5lw" visible="false" type="compartment_shape_display">

+        <styles xmi:type="notation:TitleStyle" xmi:id="_3j5eulgPEeOKQOyOw2l5lw"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3j5eu1gPEeOKQOyOw2l5lw"/>

+      </children>

+      <element xmi:type="uml:UseCase" href="papyrusNewChild.uml#_cXBM8FW6EeOhVe6k7yzS3A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3j5esVgPEeOKQOyOw2l5lw" x="855" y="435" width="141"/>

+    </children>

+    <children xmi:type="notation:Shape" xmi:id="__KF0AFgPEeOKQOyOw2l5lw" type="2008" fontName="Segoe UI" lineColor="0">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__KF0AlgPEeOKQOyOw2l5lw" source="ShadowFigure">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__KF0A1gPEeOKQOyOw2l5lw" key="ShadowFigure_Value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__KF0BFgPEeOKQOyOw2l5lw" source="displayNameLabelIcon">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__KF0BVgPEeOKQOyOw2l5lw" key="displayNameLabelIcon_value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__KF0BlgPEeOKQOyOw2l5lw" source="QualifiedName">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__KF0B1gPEeOKQOyOw2l5lw" key="QualifiedNameDepth" value="1000"/>

+      </eAnnotations>

+      <children xmi:type="notation:DecorationNode" xmi:id="__KF0CFgPEeOKQOyOw2l5lw" type="5029"/>

+      <children xmi:type="notation:BasicCompartment" xmi:id="__KF0CVgPEeOKQOyOw2l5lw" visible="false" type="7017">

+        <styles xmi:type="notation:TitleStyle" xmi:id="__KF0ClgPEeOKQOyOw2l5lw"/>

+        <styles xmi:type="notation:SortingStyle" xmi:id="__KF0C1gPEeOKQOyOw2l5lw"/>

+        <styles xmi:type="notation:FilteringStyle" xmi:id="__KF0DFgPEeOKQOyOw2l5lw"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__KF0DVgPEeOKQOyOw2l5lw"/>

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="__KF0DlgPEeOKQOyOw2l5lw" visible="false" type="7018">

+        <styles xmi:type="notation:TitleStyle" xmi:id="__KF0D1gPEeOKQOyOw2l5lw"/>

+        <styles xmi:type="notation:SortingStyle" xmi:id="__KF0EFgPEeOKQOyOw2l5lw"/>

+        <styles xmi:type="notation:FilteringStyle" xmi:id="__KF0EVgPEeOKQOyOw2l5lw"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__KF0ElgPEeOKQOyOw2l5lw"/>

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="__KF0E1gPEeOKQOyOw2l5lw" visible="false" type="7019">

+        <styles xmi:type="notation:TitleStyle" xmi:id="__KF0FFgPEeOKQOyOw2l5lw"/>

+        <styles xmi:type="notation:SortingStyle" xmi:id="__KF0FVgPEeOKQOyOw2l5lw"/>

+        <styles xmi:type="notation:FilteringStyle" xmi:id="__KF0FlgPEeOKQOyOw2l5lw"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__KF0F1gPEeOKQOyOw2l5lw"/>

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="__KPlAFgPEeOKQOyOw2l5lw" visible="false" type="AppliedStereotypeCompartement">

+        <styles xmi:type="notation:TitleStyle" xmi:id="__KPlAVgPEeOKQOyOw2l5lw" showTitle="true"/>

+        <element xmi:type="Requirements:Requirement" href="papyrusNewChild.uml#_6Pfk0VOGEeOuspyO4PzXCg"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__KPlAlgPEeOKQOyOw2l5lw"/>

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="__KPlA1gPEeOKQOyOw2l5lw" visible="false" type="compartment_shape_display">

+        <styles xmi:type="notation:TitleStyle" xmi:id="__KPlBFgPEeOKQOyOw2l5lw"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__KPlBVgPEeOKQOyOw2l5lw"/>

+      </children>

+      <element xmi:type="uml:Class" href="papyrusNewChild.uml#_6Pfk0FOGEeOuspyO4PzXCg"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__KF0AVgPEeOKQOyOw2l5lw" x="270" y="80" width="146" height="66"/>

+    </children>

+    <children xmi:type="notation:Shape" xmi:id="__KYu8FgPEeOKQOyOw2l5lw" type="2008" fontName="Segoe UI" lineColor="0">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__KYu8lgPEeOKQOyOw2l5lw" source="ShadowFigure">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__KYu81gPEeOKQOyOw2l5lw" key="ShadowFigure_Value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__KYu9FgPEeOKQOyOw2l5lw" source="displayNameLabelIcon">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__KYu9VgPEeOKQOyOw2l5lw" key="displayNameLabelIcon_value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__KYu9lgPEeOKQOyOw2l5lw" source="QualifiedName">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__KYu91gPEeOKQOyOw2l5lw" key="QualifiedNameDepth" value="1000"/>

+      </eAnnotations>

+      <children xmi:type="notation:DecorationNode" xmi:id="__KYu-FgPEeOKQOyOw2l5lw" type="5029"/>

+      <children xmi:type="notation:BasicCompartment" xmi:id="__KYu-VgPEeOKQOyOw2l5lw" visible="false" type="7017">

+        <styles xmi:type="notation:TitleStyle" xmi:id="__KYu-lgPEeOKQOyOw2l5lw"/>

+        <styles xmi:type="notation:SortingStyle" xmi:id="__KYu-1gPEeOKQOyOw2l5lw"/>

+        <styles xmi:type="notation:FilteringStyle" xmi:id="__KYu_FgPEeOKQOyOw2l5lw"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__KYu_VgPEeOKQOyOw2l5lw"/>

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="__KYu_lgPEeOKQOyOw2l5lw" visible="false" type="7018">

+        <styles xmi:type="notation:TitleStyle" xmi:id="__KYu_1gPEeOKQOyOw2l5lw"/>

+        <styles xmi:type="notation:SortingStyle" xmi:id="__KYvAFgPEeOKQOyOw2l5lw"/>

+        <styles xmi:type="notation:FilteringStyle" xmi:id="__KYvAVgPEeOKQOyOw2l5lw"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__KYvAlgPEeOKQOyOw2l5lw"/>

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="__KYvA1gPEeOKQOyOw2l5lw" visible="false" type="7019">

+        <styles xmi:type="notation:TitleStyle" xmi:id="__KYvBFgPEeOKQOyOw2l5lw"/>

+        <styles xmi:type="notation:SortingStyle" xmi:id="__KYvBVgPEeOKQOyOw2l5lw"/>

+        <styles xmi:type="notation:FilteringStyle" xmi:id="__KYvBlgPEeOKQOyOw2l5lw"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__KYvB1gPEeOKQOyOw2l5lw"/>

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="__Kif8FgPEeOKQOyOw2l5lw" visible="false" type="AppliedStereotypeCompartement">

+        <styles xmi:type="notation:TitleStyle" xmi:id="__Kif8VgPEeOKQOyOw2l5lw" showTitle="true"/>

+        <element xmi:type="Requirements:Requirement" href="papyrusNewChild.uml#_FQleQVOIEeOuspyO4PzXCg"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__Kif8lgPEeOKQOyOw2l5lw"/>

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="__Kif81gPEeOKQOyOw2l5lw" visible="false" type="compartment_shape_display">

+        <styles xmi:type="notation:TitleStyle" xmi:id="__Kif9FgPEeOKQOyOw2l5lw"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__Kif9VgPEeOKQOyOw2l5lw"/>

+      </children>

+      <element xmi:type="uml:Class" href="papyrusNewChild.uml#_FQleQFOIEeOuspyO4PzXCg"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__KYu8VgPEeOKQOyOw2l5lw" x="640" y="80" width="146" height="66"/>

+    </children>

+    <children xmi:type="notation:Shape" xmi:id="__Kif9lgPEeOKQOyOw2l5lw" type="2008" fontName="Segoe UI" lineColor="0">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__Kif-FgPEeOKQOyOw2l5lw" source="ShadowFigure">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__Kif-VgPEeOKQOyOw2l5lw" key="ShadowFigure_Value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__Kif-lgPEeOKQOyOw2l5lw" source="displayNameLabelIcon">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__Kif-1gPEeOKQOyOw2l5lw" key="displayNameLabelIcon_value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__Kif_FgPEeOKQOyOw2l5lw" source="QualifiedName">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__Kif_VgPEeOKQOyOw2l5lw" key="QualifiedNameDepth" value="1000"/>

+      </eAnnotations>

+      <children xmi:type="notation:DecorationNode" xmi:id="__Kif_lgPEeOKQOyOw2l5lw" type="5029"/>

+      <children xmi:type="notation:BasicCompartment" xmi:id="__Kif_1gPEeOKQOyOw2l5lw" visible="false" type="7017">

+        <styles xmi:type="notation:TitleStyle" xmi:id="__KigAFgPEeOKQOyOw2l5lw"/>

+        <styles xmi:type="notation:SortingStyle" xmi:id="__KigAVgPEeOKQOyOw2l5lw"/>

+        <styles xmi:type="notation:FilteringStyle" xmi:id="__KigAlgPEeOKQOyOw2l5lw"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__KigA1gPEeOKQOyOw2l5lw"/>

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="__KigBFgPEeOKQOyOw2l5lw" visible="false" type="7018">

+        <styles xmi:type="notation:TitleStyle" xmi:id="__KigBVgPEeOKQOyOw2l5lw"/>

+        <styles xmi:type="notation:SortingStyle" xmi:id="__KigBlgPEeOKQOyOw2l5lw"/>

+        <styles xmi:type="notation:FilteringStyle" xmi:id="__KigB1gPEeOKQOyOw2l5lw"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__KigCFgPEeOKQOyOw2l5lw"/>

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="__KigCVgPEeOKQOyOw2l5lw" visible="false" type="7019">

+        <styles xmi:type="notation:TitleStyle" xmi:id="__KigClgPEeOKQOyOw2l5lw"/>

+        <styles xmi:type="notation:SortingStyle" xmi:id="__KigC1gPEeOKQOyOw2l5lw"/>

+        <styles xmi:type="notation:FilteringStyle" xmi:id="__KigDFgPEeOKQOyOw2l5lw"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__KigDVgPEeOKQOyOw2l5lw"/>

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="__KsQ8FgPEeOKQOyOw2l5lw" visible="false" type="AppliedStereotypeCompartement">

+        <styles xmi:type="notation:TitleStyle" xmi:id="__KsQ8VgPEeOKQOyOw2l5lw" showTitle="true"/>

+        <element xmi:type="Requirements:Requirement" href="papyrusNewChild.uml#_cj5MsVOIEeOuspyO4PzXCg"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__KsQ8lgPEeOKQOyOw2l5lw"/>

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="__KsQ81gPEeOKQOyOw2l5lw" visible="false" type="compartment_shape_display">

+        <styles xmi:type="notation:TitleStyle" xmi:id="__KsQ9FgPEeOKQOyOw2l5lw"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__KsQ9VgPEeOKQOyOw2l5lw"/>

+      </children>

+      <element xmi:type="uml:Class" href="papyrusNewChild.uml#_cj5MsFOIEeOuspyO4PzXCg"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__Kif91gPEeOKQOyOw2l5lw" x="995" y="80" width="146" height="66"/>

+    </children>

+    <children xmi:type="notation:Shape" xmi:id="__K1a4FgPEeOKQOyOw2l5lw" type="2008" fontName="Segoe UI" lineColor="0">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__K1a4lgPEeOKQOyOw2l5lw" source="ShadowFigure">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__K1a41gPEeOKQOyOw2l5lw" key="ShadowFigure_Value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__K1a5FgPEeOKQOyOw2l5lw" source="displayNameLabelIcon">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__K1a5VgPEeOKQOyOw2l5lw" key="displayNameLabelIcon_value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__K1a5lgPEeOKQOyOw2l5lw" source="QualifiedName">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__K1a51gPEeOKQOyOw2l5lw" key="QualifiedNameDepth" value="1000"/>

+      </eAnnotations>

+      <children xmi:type="notation:DecorationNode" xmi:id="__K1a6FgPEeOKQOyOw2l5lw" type="5029"/>

+      <children xmi:type="notation:BasicCompartment" xmi:id="__K1a6VgPEeOKQOyOw2l5lw" visible="false" type="7017">

+        <styles xmi:type="notation:TitleStyle" xmi:id="__K1a6lgPEeOKQOyOw2l5lw"/>

+        <styles xmi:type="notation:SortingStyle" xmi:id="__K1a61gPEeOKQOyOw2l5lw"/>

+        <styles xmi:type="notation:FilteringStyle" xmi:id="__K1a7FgPEeOKQOyOw2l5lw"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__K1a7VgPEeOKQOyOw2l5lw"/>

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="__K1a7lgPEeOKQOyOw2l5lw" visible="false" type="7018">

+        <styles xmi:type="notation:TitleStyle" xmi:id="__K1a71gPEeOKQOyOw2l5lw"/>

+        <styles xmi:type="notation:SortingStyle" xmi:id="__K1a8FgPEeOKQOyOw2l5lw"/>

+        <styles xmi:type="notation:FilteringStyle" xmi:id="__K1a8VgPEeOKQOyOw2l5lw"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__K1a8lgPEeOKQOyOw2l5lw"/>

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="__K1a81gPEeOKQOyOw2l5lw" visible="false" type="7019">

+        <styles xmi:type="notation:TitleStyle" xmi:id="__K1a9FgPEeOKQOyOw2l5lw"/>

+        <styles xmi:type="notation:SortingStyle" xmi:id="__K1a9VgPEeOKQOyOw2l5lw"/>

+        <styles xmi:type="notation:FilteringStyle" xmi:id="__K1a9lgPEeOKQOyOw2l5lw"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__K1a91gPEeOKQOyOw2l5lw"/>

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="__K_L4FgPEeOKQOyOw2l5lw" visible="false" type="AppliedStereotypeCompartement">

+        <styles xmi:type="notation:TitleStyle" xmi:id="__K_L4VgPEeOKQOyOw2l5lw" showTitle="true"/>

+        <element xmi:type="Requirements:Requirement" href="papyrusNewChild.uml#_1s7A4FgNEeOKQOyOw2l5lw"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__K_L4lgPEeOKQOyOw2l5lw"/>

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="__K_L41gPEeOKQOyOw2l5lw" visible="false" type="compartment_shape_display">

+        <styles xmi:type="notation:TitleStyle" xmi:id="__K_L5FgPEeOKQOyOw2l5lw"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__K_L5VgPEeOKQOyOw2l5lw"/>

+      </children>

+      <element xmi:type="uml:Class" href="papyrusNewChild.uml#_1sxP4FgNEeOKQOyOw2l5lw"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__K1a4VgPEeOKQOyOw2l5lw" x="60" y="80" width="146" height="66"/>

+    </children>

+    <children xmi:type="notation:Shape" xmi:id="__K_L5lgPEeOKQOyOw2l5lw" type="2008" fontName="Segoe UI" lineColor="0">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__K_L6FgPEeOKQOyOw2l5lw" source="ShadowFigure">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__K_L6VgPEeOKQOyOw2l5lw" key="ShadowFigure_Value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__K_L6lgPEeOKQOyOw2l5lw" source="displayNameLabelIcon">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__K_L61gPEeOKQOyOw2l5lw" key="displayNameLabelIcon_value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__K_L7FgPEeOKQOyOw2l5lw" source="QualifiedName">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__K_L7VgPEeOKQOyOw2l5lw" key="QualifiedNameDepth" value="1000"/>

+      </eAnnotations>

+      <children xmi:type="notation:DecorationNode" xmi:id="__K_L7lgPEeOKQOyOw2l5lw" type="5029"/>

+      <children xmi:type="notation:BasicCompartment" xmi:id="__K_L71gPEeOKQOyOw2l5lw" visible="false" type="7017">

+        <styles xmi:type="notation:TitleStyle" xmi:id="__K_L8FgPEeOKQOyOw2l5lw"/>

+        <styles xmi:type="notation:SortingStyle" xmi:id="__K_L8VgPEeOKQOyOw2l5lw"/>

+        <styles xmi:type="notation:FilteringStyle" xmi:id="__K_L8lgPEeOKQOyOw2l5lw"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__K_L81gPEeOKQOyOw2l5lw"/>

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="__K_L9FgPEeOKQOyOw2l5lw" visible="false" type="7018">

+        <styles xmi:type="notation:TitleStyle" xmi:id="__K_L9VgPEeOKQOyOw2l5lw"/>

+        <styles xmi:type="notation:SortingStyle" xmi:id="__K_L9lgPEeOKQOyOw2l5lw"/>

+        <styles xmi:type="notation:FilteringStyle" xmi:id="__K_L91gPEeOKQOyOw2l5lw"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__K_L-FgPEeOKQOyOw2l5lw"/>

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="__K_L-VgPEeOKQOyOw2l5lw" visible="false" type="7019">

+        <styles xmi:type="notation:TitleStyle" xmi:id="__K_L-lgPEeOKQOyOw2l5lw"/>

+        <styles xmi:type="notation:SortingStyle" xmi:id="__K_L-1gPEeOKQOyOw2l5lw"/>

+        <styles xmi:type="notation:FilteringStyle" xmi:id="__K_L_FgPEeOKQOyOw2l5lw"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__K_L_VgPEeOKQOyOw2l5lw"/>

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="__LIV0FgPEeOKQOyOw2l5lw" visible="false" type="AppliedStereotypeCompartement">

+        <styles xmi:type="notation:TitleStyle" xmi:id="__LIV0VgPEeOKQOyOw2l5lw" showTitle="true"/>

+        <element xmi:type="Requirements:Requirement" href="papyrusNewChild.uml#_Dm5BYVgOEeOKQOyOw2l5lw"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__LIV0lgPEeOKQOyOw2l5lw"/>

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="__LIV01gPEeOKQOyOw2l5lw" visible="false" type="compartment_shape_display">

+        <styles xmi:type="notation:TitleStyle" xmi:id="__LIV1FgPEeOKQOyOw2l5lw"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__LIV1VgPEeOKQOyOw2l5lw"/>

+      </children>

+      <element xmi:type="uml:Class" href="papyrusNewChild.uml#_Dm5BYFgOEeOKQOyOw2l5lw"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__K_L51gPEeOKQOyOw2l5lw" x="460" y="80" width="146" height="66"/>

+    </children>

+    <styles xmi:type="notation:DiagramStyle" xmi:id="_uhdN0VgPEeOKQOyOw2l5lw"/>

+    <element xmi:type="uml:Package" href="papyrusNewChild.uml#_JXz5sFOFEeOuspyO4PzXCg"/>

+    <edges xmi:type="notation:Connector" xmi:id="_MEiRMFgQEeOKQOyOw2l5lw" type="4006" source="_2CmrEFgPEeOKQOyOw2l5lw" target="__KF0AFgPEeOKQOyOw2l5lw" routing="Rectilinear" lineColor="0">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ME-9IFgQEeOKQOyOw2l5lw" source="Stereotype_Annotation">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ME-9IVgQEeOKQOyOw2l5lw" key="StereotypeWithQualifiedNameList" value=""/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ME-9IlgQEeOKQOyOw2l5lw" key="StereotypeList" value="StandardProfileL2::Refine"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ME-9I1gQEeOKQOyOw2l5lw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ME-9JFgQEeOKQOyOw2l5lw" key="PropStereoDisplay" value=""/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ME-9JVgQEeOKQOyOw2l5lw" key="StereotypePropertyLocation" value="Compartment"/>

+      </eAnnotations>

+      <children xmi:type="notation:DecorationNode" xmi:id="_MErbIlgQEeOKQOyOw2l5lw" visible="false" type="6014">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_MErbI1gQEeOKQOyOw2l5lw" y="40"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_MErbJFgQEeOKQOyOw2l5lw" visible="false" type="6015">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_MErbJVgQEeOKQOyOw2l5lw" y="60"/>

+      </children>

+      <styles xmi:type="notation:FontStyle" xmi:id="_MErbIFgQEeOKQOyOw2l5lw" fontName="Segoe UI"/>

+      <element xmi:type="uml:Abstraction" href="papyrusNewChild.uml#_MEYgMFgQEeOKQOyOw2l5lw"/>

+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MErbIVgQEeOKQOyOw2l5lw" points="[-5, -25, 78, 329]$[-10, -352, 73, 2]"/>

+    </edges>

+    <edges xmi:type="notation:Connector" xmi:id="_NJ26gFgQEeOKQOyOw2l5lw" type="4006" source="_2CmrEFgPEeOKQOyOw2l5lw" target="__KYu8FgPEeOKQOyOw2l5lw" routing="Rectilinear" lineColor="0">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NKArgVgQEeOKQOyOw2l5lw" source="Stereotype_Annotation">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NKArglgQEeOKQOyOw2l5lw" key="StereotypeWithQualifiedNameList" value=""/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NKArg1gQEeOKQOyOw2l5lw" key="StereotypeList" value="StandardProfileL2::Refine"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NKArhFgQEeOKQOyOw2l5lw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NKArhVgQEeOKQOyOw2l5lw" key="PropStereoDisplay" value=""/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NKArhlgQEeOKQOyOw2l5lw" key="StereotypePropertyLocation" value="Compartment"/>

+      </eAnnotations>

+      <children xmi:type="notation:DecorationNode" xmi:id="_NJ26g1gQEeOKQOyOw2l5lw" visible="false" type="6014">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_NJ26hFgQEeOKQOyOw2l5lw" y="40"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_NJ26hVgQEeOKQOyOw2l5lw" visible="false" type="6015">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_NJ26hlgQEeOKQOyOw2l5lw" y="60"/>

+      </children>

+      <styles xmi:type="notation:FontStyle" xmi:id="_NJ26gVgQEeOKQOyOw2l5lw" fontName="Segoe UI"/>

+      <element xmi:type="uml:Abstraction" href="papyrusNewChild.uml#_NJtwkFgQEeOKQOyOw2l5lw"/>

+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_NJ26glgQEeOKQOyOw2l5lw" points="[14, -1, -208, 322]$[14, -146, -208, 177]$[199, -146, -23, 177]$[199, -290, -23, 33]"/>

+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_euAGsFgQEeOKQOyOw2l5lw" id="(0.8648648648648649,0.02)"/>

+    </edges>

+    <edges xmi:type="notation:Connector" xmi:id="_OCZsEVgQEeOKQOyOw2l5lw" type="4006" source="_2XR6kFgPEeOKQOyOw2l5lw" target="__Kif9lgPEeOKQOyOw2l5lw" routing="Rectilinear" lineColor="0">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OCsnAFgQEeOKQOyOw2l5lw" source="Stereotype_Annotation">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_OCsnAVgQEeOKQOyOw2l5lw" key="StereotypeWithQualifiedNameList" value=""/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_OCsnAlgQEeOKQOyOw2l5lw" key="StereotypeList" value="StandardProfileL2::Refine"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_OCsnA1gQEeOKQOyOw2l5lw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_OCsnBFgQEeOKQOyOw2l5lw" key="PropStereoDisplay" value=""/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_OCsnBVgQEeOKQOyOw2l5lw" key="StereotypePropertyLocation" value="Compartment"/>

+      </eAnnotations>

+      <children xmi:type="notation:DecorationNode" xmi:id="_OCZsFFgQEeOKQOyOw2l5lw" visible="false" type="6014">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_OCZsFVgQEeOKQOyOw2l5lw" y="40"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_OCZsFlgQEeOKQOyOw2l5lw" visible="false" type="6015">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_OCZsF1gQEeOKQOyOw2l5lw" y="60"/>

+      </children>

+      <styles xmi:type="notation:FontStyle" xmi:id="_OCZsElgQEeOKQOyOw2l5lw" fontName="Segoe UI"/>

+      <element xmi:type="uml:Abstraction" href="papyrusNewChild.uml#_OCZsEFgQEeOKQOyOw2l5lw"/>

+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OCZsE1gQEeOKQOyOw2l5lw" points="[16, -25, -188, 334]$[283, -358, 79, 1]"/>

+    </edges>

+    <edges xmi:type="notation:Connector" xmi:id="_PEmv8VgQEeOKQOyOw2l5lw" type="4006" source="_2CmrEFgPEeOKQOyOw2l5lw" target="__K_L5lgPEeOKQOyOw2l5lw" routing="Rectilinear" lineColor="0">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PEv541gQEeOKQOyOw2l5lw" source="Stereotype_Annotation">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PEv55FgQEeOKQOyOw2l5lw" key="StereotypeWithQualifiedNameList" value=""/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PEv55VgQEeOKQOyOw2l5lw" key="StereotypeList" value="StandardProfileL2::Refine"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PEv55lgQEeOKQOyOw2l5lw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PEv551gQEeOKQOyOw2l5lw" key="PropStereoDisplay" value=""/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PEv56FgQEeOKQOyOw2l5lw" key="StereotypePropertyLocation" value="Compartment"/>

+      </eAnnotations>

+      <children xmi:type="notation:DecorationNode" xmi:id="_PEmv9FgQEeOKQOyOw2l5lw" visible="false" type="6014">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_PEmv9VgQEeOKQOyOw2l5lw" y="40"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_PEmv9lgQEeOKQOyOw2l5lw" visible="false" type="6015">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_PEmv91gQEeOKQOyOw2l5lw" y="60"/>

+      </children>

+      <styles xmi:type="notation:FontStyle" xmi:id="_PEmv8lgQEeOKQOyOw2l5lw" fontName="Segoe UI"/>

+      <element xmi:type="uml:Abstraction" href="papyrusNewChild.uml#_PEmv8FgQEeOKQOyOw2l5lw"/>

+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PEmv81gQEeOKQOyOw2l5lw" points="[17, -13, -462, 334]$[448, -348, -31, -1]"/>

+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PEv54FgQEeOKQOyOw2l5lw" id="(0.7837837837837838,0.26)"/>

+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_PEv54VgQEeOKQOyOw2l5lw" id="(0.17415730337078653,0.49056603773584906)"/>

+    </edges>

+    <edges xmi:type="notation:Connector" xmi:id="_RArbEFgQEeOKQOyOw2l5lw" type="4006" source="_2CmrEFgPEeOKQOyOw2l5lw" target="__K1a4FgPEeOKQOyOw2l5lw" routing="Rectilinear" lineColor="0">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RA1MEVgQEeOKQOyOw2l5lw" source="Stereotype_Annotation">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RA1MElgQEeOKQOyOw2l5lw" key="StereotypeWithQualifiedNameList" value=""/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RA1ME1gQEeOKQOyOw2l5lw" key="StereotypeList" value="StandardProfileL2::Refine"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RA1MFFgQEeOKQOyOw2l5lw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RA1MFVgQEeOKQOyOw2l5lw" key="PropStereoDisplay" value=""/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RA1MFlgQEeOKQOyOw2l5lw" key="StereotypePropertyLocation" value="Compartment"/>

+      </eAnnotations>

+      <children xmi:type="notation:DecorationNode" xmi:id="_RArbE1gQEeOKQOyOw2l5lw" visible="false" type="6014">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_RArbFFgQEeOKQOyOw2l5lw" y="40"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_RArbFVgQEeOKQOyOw2l5lw" visible="false" type="6015">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_RArbFlgQEeOKQOyOw2l5lw" y="60"/>

+      </children>

+      <styles xmi:type="notation:FontStyle" xmi:id="_RArbEVgQEeOKQOyOw2l5lw" fontName="Segoe UI"/>

+      <element xmi:type="uml:Abstraction" href="papyrusNewChild.uml#_RAhqEFgQEeOKQOyOw2l5lw"/>

+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_RArbElgQEeOKQOyOw2l5lw" points="[-16, -25, 291, 322]$[-16, -140, 291, 207]$[-270, -140, 37, 207]$[-270, -314, 37, 33]"/>

+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qOIiAFgQEeOKQOyOw2l5lw" id="(0.15602836879432624,0.0)"/>

+    </edges>

+    <edges xmi:type="notation:Connector" xmi:id="_VQC-gVgQEeOKQOyOw2l5lw" type="4006" source="_3CIOYFgPEeOKQOyOw2l5lw" target="__KYu8FgPEeOKQOyOw2l5lw" routing="Rectilinear" lineColor="0">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_VQV5cFgQEeOKQOyOw2l5lw" source="Stereotype_Annotation">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VQV5cVgQEeOKQOyOw2l5lw" key="StereotypeWithQualifiedNameList" value=""/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VQV5clgQEeOKQOyOw2l5lw" key="StereotypeList" value="StandardProfileL2::Refine"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VQV5c1gQEeOKQOyOw2l5lw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VQV5dFgQEeOKQOyOw2l5lw" key="PropStereoDisplay" value=""/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VQV5dVgQEeOKQOyOw2l5lw" key="StereotypePropertyLocation" value="Compartment"/>

+      </eAnnotations>

+      <children xmi:type="notation:DecorationNode" xmi:id="_VQC-hFgQEeOKQOyOw2l5lw" visible="false" type="6014">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_VQC-hVgQEeOKQOyOw2l5lw" y="40"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_VQC-hlgQEeOKQOyOw2l5lw" visible="false" type="6015">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_VQC-h1gQEeOKQOyOw2l5lw" y="60"/>

+      </children>

+      <styles xmi:type="notation:FontStyle" xmi:id="_VQC-glgQEeOKQOyOw2l5lw" fontName="Segoe UI"/>

+      <element xmi:type="uml:Abstraction" href="papyrusNewChild.uml#_VQC-gFgQEeOKQOyOw2l5lw"/>

+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_VQC-g1gQEeOKQOyOw2l5lw" points="[0, -25, -15, 306]$[0, -314, -15, 17]"/>

+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VQMIcFgQEeOKQOyOw2l5lw" id="(0.6896551724137931,0.7547169811320755)"/>

+    </edges>

+  </notation:Diagram>

+</xmi:XMI>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/papyrusNewChild.uml b/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/papyrusNewChild.uml
new file mode 100644
index 00000000000..291c949fabb
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/resource/papyrusNewChild.uml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<xmi:XMI xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Requirements="http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:l2="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/0.7.0/SysML/Requirements http://www.eclipse.org/papyrus/0.7.0/SysML#//requirements">

+  <uml:Model xmi:id="_a0QCwFOCEeOE6bh9v5dYKg" name="PapyrusNewChild">

+    <packagedElement xmi:type="uml:Package" xmi:id="_IqDb0FOFEeOuspyO4PzXCg" name="Requirements">

+      <packagedElement xmi:type="uml:Class" xmi:id="_6Pfk0FOGEeOuspyO4PzXCg" name="AddNewChild"/>

+      <packagedElement xmi:type="uml:Class" xmi:id="_FQleQFOIEeOuspyO4PzXCg" name="HideElement"/>

+      <packagedElement xmi:type="uml:Class" xmi:id="_cj5MsFOIEeOuspyO4PzXCg" name="newChildFromProfile"/>

+      <packagedElement xmi:type="uml:Class" xmi:id="_1sxP4FgNEeOKQOyOw2l5lw" name="newChildMenuDisplay"/>

+      <packagedElement xmi:type="uml:Class" xmi:id="_Dm5BYFgOEeOKQOyOw2l5lw" name="RoleAndElementCreation"/>

+    </packagedElement>

+    <packagedElement xmi:type="uml:Package" xmi:id="_JXz5sFOFEeOuspyO4PzXCg" clientDependency="_T6P9sFOFEeOuspyO4PzXCg" name="UseCases">

+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_T6P9sFOFEeOuspyO4PzXCg" name="Abstraction1" client="_JXz5sFOFEeOuspyO4PzXCg" supplier="_IqDb0FOFEeOuspyO4PzXCg"/>

+      <packagedElement xmi:type="uml:Component" xmi:id="_uxF88FOIEeOuspyO4PzXCg" name="AddNewChild" useCase="_-bickFOIEeOuspyO4PzXCg _EPnUAFOJEeOuspyO4PzXCg _WZ_ZwFOJEeOuspyO4PzXCg _uSMlAFOJEeOuspyO4PzXCg _cXBM8FW6EeOhVe6k7yzS3A">

+        <ownedUseCase xmi:type="uml:UseCase" xmi:id="_-bickFOIEeOuspyO4PzXCg" name="UseCreateMenu" subject="_uxF88FOIEeOuspyO4PzXCg"/>

+        <ownedUseCase xmi:type="uml:UseCase" xmi:id="_EPnUAFOJEeOuspyO4PzXCg" clientDependency="_MEYgMFgQEeOKQOyOw2l5lw _NJtwkFgQEeOKQOyOw2l5lw _PEmv8FgQEeOKQOyOw2l5lw _RAhqEFgQEeOKQOyOw2l5lw" name="Create or modify ElementCreationModel" subject="_uxF88FOIEeOuspyO4PzXCg">

+          <extensionPoint xmi:type="uml:ExtensionPoint" xmi:id="_lYRLAVW6EeOhVe6k7yzS3A" name="point"/>

+          <include xmi:type="uml:Include" xmi:id="_aEB2oFW6EeOhVe6k7yzS3A" addition="_uSMlAFOJEeOuspyO4PzXCg"/>

+        </ownedUseCase>

+        <ownedUseCase xmi:type="uml:UseCase" xmi:id="_WZ_ZwFOJEeOuspyO4PzXCg" clientDependency="_OCZsEFgQEeOKQOyOw2l5lw" name="Generate &quot;ElementCreationModel&quot; from a profile" subject="_uxF88FOIEeOuspyO4PzXCg"/>

+        <ownedUseCase xmi:type="uml:UseCase" xmi:id="_uSMlAFOJEeOuspyO4PzXCg" clientDependency="_VQC-gFgQEeOKQOyOw2l5lw" name="Hide, change order or add submenus" subject="_uxF88FOIEeOuspyO4PzXCg"/>

+        <ownedUseCase xmi:type="uml:UseCase" xmi:id="_cXBM8FW6EeOhVe6k7yzS3A" name="Create or modify ElementCreationModel at runtime thanks to a GUI" subject="_uxF88FOIEeOuspyO4PzXCg">

+          <extend xmi:type="uml:Extend" xmi:id="_lX9pAFW6EeOhVe6k7yzS3A" extendedCase="_EPnUAFOJEeOuspyO4PzXCg" extensionLocation="_lYRLAVW6EeOhVe6k7yzS3A"/>

+        </ownedUseCase>

+      </packagedElement>

+      <packagedElement xmi:type="uml:Actor" xmi:id="_zYtoUFOIEeOuspyO4PzXCg" name="ModelDesigner"/>

+      <packagedElement xmi:type="uml:Actor" xmi:id="_3P0cwFOIEeOuspyO4PzXCg" name="PapyrusCustomizer"/>

+      <packagedElement xmi:type="uml:Association" xmi:id="_DTg4IFOJEeOuspyO4PzXCg" name="A_modeldesigner_usecreatemenu" memberEnd="_DTg4IVOJEeOuspyO4PzXCg _DTg4JFOJEeOuspyO4PzXCg">

+        <ownedEnd xmi:type="uml:Property" xmi:id="_DTg4IVOJEeOuspyO4PzXCg" name="modeldesigner" type="_zYtoUFOIEeOuspyO4PzXCg" association="_DTg4IFOJEeOuspyO4PzXCg">

+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DTg4IlOJEeOuspyO4PzXCg" value="1"/>

+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DTg4I1OJEeOuspyO4PzXCg" value="1"/>

+        </ownedEnd>

+        <ownedEnd xmi:type="uml:Property" xmi:id="_DTg4JFOJEeOuspyO4PzXCg" name="usecreatemenu" type="_-bickFOIEeOuspyO4PzXCg" association="_DTg4IFOJEeOuspyO4PzXCg">

+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DTg4JVOJEeOuspyO4PzXCg" value="1"/>

+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DTg4JlOJEeOuspyO4PzXCg" value="1"/>

+        </ownedEnd>

+      </packagedElement>

+      <packagedElement xmi:type="uml:Association" xmi:id="_PBVKIFOJEeOuspyO4PzXCg" name="A_papyruscustomizer_create or modify elementcreationmodel" memberEnd="_PBVKIVOJEeOuspyO4PzXCg _PBVKJFOJEeOuspyO4PzXCg">

+        <ownedEnd xmi:type="uml:Property" xmi:id="_PBVKIVOJEeOuspyO4PzXCg" name="papyruscustomizer" type="_3P0cwFOIEeOuspyO4PzXCg" association="_PBVKIFOJEeOuspyO4PzXCg">

+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_PBVKIlOJEeOuspyO4PzXCg" value="1"/>

+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PBVKI1OJEeOuspyO4PzXCg" value="1"/>

+        </ownedEnd>

+        <ownedEnd xmi:type="uml:Property" xmi:id="_PBVKJFOJEeOuspyO4PzXCg" name="create or modify elementcreationmodel" type="_EPnUAFOJEeOuspyO4PzXCg" association="_PBVKIFOJEeOuspyO4PzXCg">

+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_PBVKJVOJEeOuspyO4PzXCg" value="1"/>

+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PBVKJlOJEeOuspyO4PzXCg" value="1"/>

+        </ownedEnd>

+      </packagedElement>

+      <packagedElement xmi:type="uml:Association" xmi:id="_gmg4IFOJEeOuspyO4PzXCg" name="A_modeldesigner_generate element creation model" memberEnd="_gmg4IVOJEeOuspyO4PzXCg _gmg4JFOJEeOuspyO4PzXCg">

+        <ownedEnd xmi:type="uml:Property" xmi:id="_gmg4IVOJEeOuspyO4PzXCg" name="modeldesigner" type="_zYtoUFOIEeOuspyO4PzXCg" association="_gmg4IFOJEeOuspyO4PzXCg">

+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gmg4IlOJEeOuspyO4PzXCg" value="1"/>

+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gmg4I1OJEeOuspyO4PzXCg" value="1"/>

+        </ownedEnd>

+        <ownedEnd xmi:type="uml:Property" xmi:id="_gmg4JFOJEeOuspyO4PzXCg" name="generate element creation model" type="_WZ_ZwFOJEeOuspyO4PzXCg" association="_gmg4IFOJEeOuspyO4PzXCg">

+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gmg4JVOJEeOuspyO4PzXCg" value="1"/>

+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gmg4JlOJEeOuspyO4PzXCg" value="1"/>

+        </ownedEnd>

+      </packagedElement>

+      <packagedElement xmi:type="uml:DataType" xmi:id="_kkQk4FgPEeOKQOyOw2l5lw" name="DataType"/>

+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_MEYgMFgQEeOKQOyOw2l5lw" name="Refine1" client="_EPnUAFOJEeOuspyO4PzXCg" supplier="_6Pfk0FOGEeOuspyO4PzXCg"/>

+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_NJtwkFgQEeOKQOyOw2l5lw" name="Refine2" client="_EPnUAFOJEeOuspyO4PzXCg" supplier="_FQleQFOIEeOuspyO4PzXCg"/>

+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_OCZsEFgQEeOKQOyOw2l5lw" name="Refine3" client="_WZ_ZwFOJEeOuspyO4PzXCg" supplier="_cj5MsFOIEeOuspyO4PzXCg"/>

+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_PEmv8FgQEeOKQOyOw2l5lw" name="Refine4" client="_EPnUAFOJEeOuspyO4PzXCg" supplier="_Dm5BYFgOEeOKQOyOw2l5lw"/>

+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_RAhqEFgQEeOKQOyOw2l5lw" name="Refine5" client="_EPnUAFOJEeOuspyO4PzXCg" supplier="_1sxP4FgNEeOKQOyOw2l5lw"/>

+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_VQC-gFgQEeOKQOyOw2l5lw" name="Refine6" client="_uSMlAFOJEeOuspyO4PzXCg" supplier="_FQleQFOIEeOuspyO4PzXCg"/>

+    </packagedElement>

+    <packagedElement xmi:type="uml:Package" xmi:id="_JnbDAFOFEeOuspyO4PzXCg" clientDependency="_UqVW0FOFEeOuspyO4PzXCg" name="Design">

+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_UqVW0FOFEeOuspyO4PzXCg" name="Abstraction1" client="_JnbDAFOFEeOuspyO4PzXCg" supplier="_JXz5sFOFEeOuspyO4PzXCg"/>

+    </packagedElement>

+    <packagedElement xmi:type="uml:Package" xmi:id="_Nc3DgFOFEeOuspyO4PzXCg" clientDependency="_VkwXsFOFEeOuspyO4PzXCg" name="Tests">

+      <packagedElement xmi:type="uml:Dependency" xmi:id="_VkwXsFOFEeOuspyO4PzXCg" name="Dependency1" client="_Nc3DgFOFEeOuspyO4PzXCg" supplier="_JXz5sFOFEeOuspyO4PzXCg"/>

+      <packagedElement xmi:type="uml:Package" xmi:id="_fMeMwFXeEeOW-JPqZK_EZg" name="Test AboutCreateModifyElementCreationModel">

+        <packagedElement xmi:type="uml:UseCase" xmi:id="_HTgzkFXeEeOW-JPqZK_EZg" clientDependency="_VqMlQFXeEeOW-JPqZK_EZg" name="Create a model without nothing"/>

+        <packagedElement xmi:type="uml:UseCase" xmi:id="_KdZ8sFXeEeOW-JPqZK_EZg" clientDependency="_VIIaAFXeEeOW-JPqZK_EZg" name="createa model with only a root"/>

+        <packagedElement xmi:type="uml:UseCase" xmi:id="_M6gRQFXeEeOW-JPqZK_EZg" clientDependency="_TYirsFXeEeOW-JPqZK_EZg" name="create a model with elementType as String"/>

+        <packagedElement xmi:type="uml:Usage" xmi:id="_TYirsFXeEeOW-JPqZK_EZg" name="Usage4" client="_M6gRQFXeEeOW-JPqZK_EZg" supplier="_EPnUAFOJEeOuspyO4PzXCg"/>

+        <packagedElement xmi:type="uml:Usage" xmi:id="_VIIaAFXeEeOW-JPqZK_EZg" name="Usage5" client="_KdZ8sFXeEeOW-JPqZK_EZg" supplier="_EPnUAFOJEeOuspyO4PzXCg"/>

+        <packagedElement xmi:type="uml:Usage" xmi:id="_VqMlQFXeEeOW-JPqZK_EZg" name="Usage6" client="_HTgzkFXeEeOW-JPqZK_EZg" supplier="_EPnUAFOJEeOuspyO4PzXCg"/>

+      </packagedElement>

+      <packagedElement xmi:type="uml:Package" xmi:id="_lII58FXeEeOW-JPqZK_EZg" name="TestUseCreateMenu">

+        <packagedElement xmi:type="uml:UseCase" xmi:id="_rxKR0FXdEeOW-JPqZK_EZg" clientDependency="_xpiacFXdEeOW-JPqZK_EZg" name="Use a menu from a model without ElementType model"/>

+        <packagedElement xmi:type="uml:Usage" xmi:id="_xpiacFXdEeOW-JPqZK_EZg" name="Usage1" client="_rxKR0FXdEeOW-JPqZK_EZg" supplier="_-bickFOIEeOuspyO4PzXCg"/>

+        <packagedElement xmi:type="uml:UseCase" xmi:id="_1vrJYFXdEeOW-JPqZK_EZg" clientDependency="_-0Vn0FXdEeOW-JPqZK_EZg" name="Use a menu with elementType model"/>

+        <packagedElement xmi:type="uml:UseCase" xmi:id="_4nRBkFXdEeOW-JPqZK_EZg" clientDependency="_9Yi_QFXdEeOW-JPqZK_EZg" name="Use a menu with stereotyped element"/>

+        <packagedElement xmi:type="uml:Usage" xmi:id="_9Yi_QFXdEeOW-JPqZK_EZg" name="Usage2" client="_4nRBkFXdEeOW-JPqZK_EZg" supplier="_-bickFOIEeOuspyO4PzXCg"/>

+        <packagedElement xmi:type="uml:Usage" xmi:id="_-0Vn0FXdEeOW-JPqZK_EZg" name="Usage3" client="_1vrJYFXdEeOW-JPqZK_EZg" supplier="_-bickFOIEeOuspyO4PzXCg"/>

+      </packagedElement>

+    </packagedElement>

+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_d8uIMFOFEeOuspyO4PzXCg">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_d9I-8FOFEeOuspyO4PzXCg" source="http://www.eclipse.org/uml2/2.0.0/UML">

+        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//requirements"/>

+      </eAnnotations>

+      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

+    </profileApplication>

+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_e5iVwFOFEeOuspyO4PzXCg">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_e53s8FOFEeOuspyO4PzXCg" source="http://www.eclipse.org/uml2/2.0.0/UML">

+        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2#/"/>

+      </eAnnotations>

+      <appliedProfile xmi:type="uml:Profile" href="pathmap://UML_PROFILES/StandardL2.profile.uml#_0"/>

+    </profileApplication>

+  </uml:Model>

+  <Requirements:Requirement xmi:id="_6Pfk0VOGEeOuspyO4PzXCg" text="Papyrus shall add in the menu new child for new customized elements by using extended type" id="newChild001" base_Class="_6Pfk0FOGEeOuspyO4PzXCg"/>

+  <Requirements:Requirement xmi:id="_FQleQVOIEeOuspyO4PzXCg" text="Papyrus shall not display all UML or SysML element creation" id="newChild002" base_Class="_FQleQFOIEeOuspyO4PzXCg"/>

+  <Requirements:Requirement xmi:id="_cj5MsVOIEeOuspyO4PzXCg" text="Papyrus shall add the creation of new element from a subset of profile" id="newChild003" base_Class="_cj5MsFOIEeOuspyO4PzXCg"/>

+  <Requirements:Requirement xmi:id="_1s7A4FgNEeOKQOyOw2l5lw" text="Papyrus shall be able to associated icons to folder or creation menu" id="newChild004" base_Class="_1sxP4FgNEeOKQOyOw2l5lw"/>

+  <Requirements:Requirement xmi:id="_Dm5BYVgOEeOKQOyOw2l5lw" text="When an element can created from several  roles for a container, Papyrus shall let the possibility to choose the role or to let to the possibility to be created from all role." id="newChild005" base_Class="_Dm5BYFgOEeOKQOyOw2l5lw"/>

+  <l2:Refine xmi:id="_ME1MIFgQEeOKQOyOw2l5lw" base_Abstraction="_MEYgMFgQEeOKQOyOw2l5lw"/>

+  <l2:Refine xmi:id="_NKArgFgQEeOKQOyOw2l5lw" base_Abstraction="_NJtwkFgQEeOKQOyOw2l5lw"/>

+  <l2:Refine xmi:id="_OCi2AFgQEeOKQOyOw2l5lw" base_Abstraction="_OCZsEFgQEeOKQOyOw2l5lw"/>

+  <l2:Refine xmi:id="_PEv54lgQEeOKQOyOw2l5lw" base_Abstraction="_PEmv8FgQEeOKQOyOw2l5lw"/>

+  <l2:Refine xmi:id="_RA1MEFgQEeOKQOyOw2l5lw" base_Abstraction="_RAhqEFgQEeOKQOyOw2l5lw"/>

+  <l2:Refine xmi:id="_VQMIcVgQEeOKQOyOw2l5lw" base_Abstraction="_VQC-gFgQEeOKQOyOw2l5lw"/>

+</xmi:XMI>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/schema/org.eclipse.papyrus.infra.newchild.exsd b/plugins/infra/org.eclipse.papyrus.infra.newchild/schema/org.eclipse.papyrus.infra.newchild.exsd
new file mode 100644
index 00000000000..6771f72a294
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/schema/org.eclipse.papyrus.infra.newchild.exsd
@@ -0,0 +1,107 @@
+<?xml version='1.0' encoding='UTF-8'?>

+<!-- Schema file written by PDE -->

+<schema targetNamespace="org.eclipse.papyrus.infra.newchild" xmlns="http://www.w3.org/2001/XMLSchema">

+<annotation>

+      <appinfo>

+         <meta.schema plugin="org.eclipse.papyrus.infra.newchild" id="org.eclipse.papyrus.infra.newchild" name="ElementCreationMenuModel"/>

+      </appinfo>

+      <documentation>

+         [Enter description of this extension point.]

+      </documentation>

+   </annotation>

+

+   <element name="extension">

+      <annotation>

+         <appinfo>

+            <meta.element />

+         </appinfo>

+      </annotation>

+      <complexType>

+         <sequence>

+            <element ref="menuCreationModel" minOccurs="1" maxOccurs="unbounded"/>

+         </sequence>

+         <attribute name="point" type="string" use="required">

+            <annotation>

+               <documentation>

+                  

+               </documentation>

+            </annotation>

+         </attribute>

+         <attribute name="id" type="string">

+            <annotation>

+               <documentation>

+                  

+               </documentation>

+            </annotation>

+         </attribute>

+         <attribute name="name" type="string">

+            <annotation>

+               <documentation>

+                  

+               </documentation>

+               <appinfo>

+                  <meta.attribute translatable="true"/>

+               </appinfo>

+            </annotation>

+         </attribute>

+      </complexType>

+   </element>

+

+   <element name="menuCreationModel">

+      <annotation>

+         <documentation>

+            this extension point is the wapper to reference a creation element model

+         </documentation>

+      </annotation>

+      <complexType>

+         <attribute name="model" type="string" use="required">

+            <annotation>

+               <documentation>

+                  Add a model that represents the creation menu of elements

+               </documentation>

+               <appinfo>

+                  <meta.attribute kind="resource"/>

+               </appinfo>

+            </annotation>

+         </attribute>

+      </complexType>

+   </element>

+

+   <annotation>

+      <appinfo>

+         <meta.section type="since"/>

+      </appinfo>

+      <documentation>

+         [Enter the first release in which this extension point appears.]

+      </documentation>

+   </annotation>

+

+   <annotation>

+      <appinfo>

+         <meta.section type="examples"/>

+      </appinfo>

+      <documentation>

+         [Enter extension point usage example here.]

+      </documentation>

+   </annotation>

+

+   <annotation>

+      <appinfo>

+         <meta.section type="apiinfo"/>

+      </appinfo>

+      <documentation>

+         [Enter API information here.]

+      </documentation>

+   </annotation>

+

+   <annotation>

+      <appinfo>

+         <meta.section type="implementation"/>

+      </appinfo>

+      <documentation>

+         [Enter information about supplied implementation of this extension point.]

+      </documentation>

+   </annotation>

+

+

+</schema>

diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/Activator.java b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/Activator.java
new file mode 100644
index 00000000000..beaed0e6d7e
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/Activator.java
@@ -0,0 +1,63 @@
+/*****************************************************************************

+ * Copyright (c) 2011 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *		

+ *		CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.newchild;

+

+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.infra.newchild"; //$NON-NLS-1$

+

+	// The shared instance

+	private static Activator plugin;

+	

+	/**

+	 * The constructor

+	 */

+	public Activator() {

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

+	 */

+	public void start(BundleContext context) throws Exception {

+		super.start(context);

+		plugin = this;

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

+	 */

+	public void stop(BundleContext context) throws Exception {

+		plugin = null;

+		super.stop(context);

+	}

+

+	/**

+	 * Returns the shared instance

+	 *

+	 * @return the shared instance

+	 */

+	public static Activator getDefault() {

+		return plugin;

+	}

+

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/CreationMenuFactory.java b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/CreationMenuFactory.java
new file mode 100644
index 00000000000..8ed37a10f26
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/CreationMenuFactory.java
@@ -0,0 +1,323 @@
+/*****************************************************************************

+ * Copyright (c) 2011 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *		

+ *		CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.newchild;

+

+import java.net.MalformedURLException;

+import java.net.URL;

+import java.util.ArrayList;

+import java.util.Iterator;

+

+import org.eclipse.emf.common.command.Command;

+import org.eclipse.emf.common.command.UnexecutableCommand;

+import org.eclipse.emf.common.util.EList;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EClassifier;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EReference;

+import org.eclipse.emf.ecore.EStructuralFeature;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.jface.resource.ImageDescriptor;

+import org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.CreationMenu;

+import org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Folder;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.widgets.Menu;

+import org.eclipse.swt.widgets.MenuItem;

+

+/**

+ * this class contains code to construct menu from a Menu and a selected object

+ *

+ */

+public class CreationMenuFactory {

+	private TransactionalEditingDomain editingDomain;

+

+	/**

+	 * 

+	 * Constructor.

+	 *

+	 * @param editingDomain

+	 */

+	public CreationMenuFactory(TransactionalEditingDomain editingDomain) {

+		super();

+		this.editingDomain = editingDomain;

+	}

+

+	/**

+	 * construct a menu from a folder, this is a recursion

+	 * @param menu the current menu

+	 * @param folder the folder

+	 * @param selectedObject the current selection

+	 * @return true if sub-menu has been added

+	 */

+	public boolean populateMenu(Menu menu, Folder folder, EObject selectedObject){

+		if(selectedObject!=null){

+			org.eclipse.swt.widgets.MenuItem topMenuItem = new MenuItem(menu,SWT.CASCADE );

+			topMenuItem.setText(folder.getLabel());

+			if(folder.getIcon()!=null){

+				URL url;

+				try {

+					url = new URL(folder.getIcon());

+					ImageDescriptor imgDesc=ImageDescriptor.createFromURL(url);

+					topMenuItem.setImage(imgDesc.createImage());

+				} catch (MalformedURLException e) {

+					e.printStackTrace();

+				}

+			}

+			Menu topMenu=new Menu(menu);

+			topMenuItem.setMenu(topMenu);

+			boolean oneDisplayedMenu=false;

+			for(org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Menu currentMenu : folder.getMenu()) {

+				boolean result=false;

+				if( currentMenu instanceof Folder){

+					 result=populateMenu(topMenu, (Folder) currentMenu, selectedObject);

+					

+

+				}

+

+				if( currentMenu instanceof CreationMenu){

+					CreationMenu currentCreationMenu=(CreationMenu)currentMenu;

+					EReference reference=null;

+					String role=currentCreationMenu.getRole();

+					//the role is precised

+					if( role!=null){

+						EStructuralFeature feature= selectedObject.eClass().getEStructuralFeature(role);

+						if( feature instanceof EReference){

+							reference=(EReference)feature;

+							 result =constructMenu(selectedObject, topMenu, currentCreationMenu, reference);

+						}

+					}

+					else{//no precisison

+						//test if all roles must be displayed

+						if(currentCreationMenu.isDisplayAllRoles()){

+							 result  = constructMenu(selectedObject, topMenu, currentCreationMenu);

+						}

+						else{

+

+							result  = constructMenu(selectedObject, topMenu, currentCreationMenu, reference);

+						}

+					}

+				}

+				if(result){

+					oneDisplayedMenu=true;

+				}

+			}

+			if(!oneDisplayedMenu){

+				topMenuItem.dispose();

+			}

+			return oneDisplayedMenu;

+

+		}

+		return false;

+

+	}

+

+

+	/**

+	 * create menu by displaying if possible different roles

+	 * @param selectedObject the current object

+	 * @param menu the current menu in creation

+	 * @param currentCreationMenu 

+	 * @return true if sub-menu has been created

+	 */

+	protected boolean constructMenu(EObject selectedObject, Menu menu, CreationMenu currentCreationMenu) {

+		//find the feature between children and owner

+		ArrayList<EStructuralFeature> possibleEFeatures = getEreferences(selectedObject, currentCreationMenu);

+

+		if(possibleEFeatures.size()==1){

+			Command cmd=buildCommand(null, selectedObject, currentCreationMenu.getElementTypeIdRef());

+			if( cmd.canExecute()){

+				MenuItem item = new MenuItem(menu, SWT.NONE);

+				fillIcon(currentCreationMenu, item);

+				item.setEnabled(true);

+				item.setText(currentCreationMenu.getLabel());

+				item.addSelectionListener(new CreationMenuListener(cmd, editingDomain));

+				return true;

+			}

+			return false;

+		}

+		else if(possibleEFeatures.size()>1){

+			org.eclipse.swt.widgets.MenuItem topMenuItem = new MenuItem(menu,SWT.CASCADE );

+			topMenuItem.setText(currentCreationMenu.getLabel());

+			Menu topMenu=new Menu(menu);

+			topMenuItem.setMenu(topMenu);

+			for(EStructuralFeature eStructuralFeature : possibleEFeatures) {

+

+				Command cmd=buildCommand((EReference)eStructuralFeature, selectedObject, currentCreationMenu.getElementTypeIdRef());

+				if( cmd.canExecute()){

+					MenuItem item = new MenuItem(topMenu, SWT.NONE);

+					fillIcon(currentCreationMenu, item);

+					item.setEnabled(true);

+					item.setText("As "+eStructuralFeature.getName());

+					item.addSelectionListener(new CreationMenuListener(cmd, editingDomain));

+				}

+

+			}

+			if(topMenu.getItemCount()==0){

+				topMenu.dispose();

+				return false;

+			}

+			else{

+				return true;

+			}

+		}

+		else{

+			return false;

+		}

+	}

+	/**

+	 * display an icon from a specified url or from Element type

+	 * @param currentCreationMenu

+	 * @param item

+	 */

+	protected void fillIcon(CreationMenu currentCreationMenu, MenuItem item) {

+		if(currentCreationMenu.getIcon()!=null){

+			URL url;

+			try {

+				url = new URL(currentCreationMenu.getIcon());

+				ImageDescriptor imgDesc=ImageDescriptor.createFromURL(url);

+				item.setImage(imgDesc.createImage());

+			} catch (MalformedURLException e) {

+				e.printStackTrace();

+			}

+		}else{

+			createIconFromElementType(currentCreationMenu, item);

+		}

+	}

+	/**

+	 * it is used in order calculate all roles that can play an element to another

+	 * @param selectedObject 

+	 * @param currentCreationMenu

+	 * @return return the list of Ereference that can be calculated

+	 */

+	protected ArrayList<EStructuralFeature> getEreferences(EObject selectedObject, CreationMenu currentCreationMenu) {

+		ArrayList<EStructuralFeature> possibleEFeatures = new ArrayList<EStructuralFeature>();

+		EList<EStructuralFeature> featureList = selectedObject.eClass().getEAllStructuralFeatures();

+		Iterator<EStructuralFeature> iterator = featureList.iterator();

+		while(iterator.hasNext()) {

+			EStructuralFeature eStructuralFeature = iterator.next();

+			if(eStructuralFeature instanceof EReference) {

+				EReference ref = (EReference)eStructuralFeature;

+				if(ref.isContainment()) {

+					if(isSubClass(ref.getEType(), getElementType(currentCreationMenu.getElementTypeIdRef()).getEClass())) {

+						possibleEFeatures.add(eStructuralFeature);

+					}

+				}

+			}

+		}

+		return possibleEFeatures;

+	}

+

+	/**

+	 * Test if a possibleSub eclass is a sub eclass

+	 * 

+	 * @param aclass

+	 *        , cannot be null

+	 * @param possibleSubClasse

+	 *        , cannot be null

+	 * @return true if possible eclass is a subtype of a eclass or false

+	 */

+	protected boolean isSubClass(EClassifier aclass, EClass possibleSubClasse) {

+		if(aclass.equals(possibleSubClasse)) {

+			return true;

+		}

+		EList<EClass> superTypeList = possibleSubClasse.getEAllSuperTypes();

+		if(superTypeList.contains(aclass)) {

+			return true;

+		}

+		return false;

+	}

+

+

+	/**

+	 * associate the icon from the element type

+	 * @param currentCreationMenu 

+	 * @param item the current menu

+	 */

+	protected void createIconFromElementType(CreationMenu currentCreationMenu, MenuItem item) {

+		if(getElementType(currentCreationMenu.getElementTypeIdRef()).getIconURL()!=null){

+			ImageDescriptor imgDesc=ImageDescriptor.createFromURL(getElementType(currentCreationMenu.getElementTypeIdRef()).getIconURL());

+			item.setImage(imgDesc.createImage());

+		}

+	}

+

+	/**

+	 * create a submenu 

+	 * @param selectedObject the selected object

+	 * @param topMenu the menu when will add menus

+	 * @param currentCreationMenu

+	 * @param reference the role of the new element

+	 * @return true if the menu can be created

+	 */

+	protected boolean constructMenu(EObject selectedObject, Menu topMenu,  CreationMenu currentCreationMenu, EReference reference) {

+		boolean oneDisplayedMenu=false;

+		Command cmd=buildCommand(reference, selectedObject, currentCreationMenu.getElementTypeIdRef());

+		if( cmd.canExecute()){

+			oneDisplayedMenu=true;

+			MenuItem item = new MenuItem(topMenu, SWT.NONE);

+			fillIcon(currentCreationMenu, item);

+			item.setEnabled(true);

+			item.setText(currentCreationMenu.getLabel());

+			item.addSelectionListener(new CreationMenuListener(cmd, editingDomain));

+		}

+		return oneDisplayedMenu;

+	}

+

+	/**

+	 * get the IelementType from a string

+	 * @param extendedType the string that represents the element type

+	 * @return the element type or null

+	 */

+	protected IElementType getElementType(String extendedType){

+		return  ElementTypeRegistry.getInstance().getType(extendedType);

+	}

+	/**

+	 * Construct a command of creation

+	 * @param reference the role of the element that will be created (maybe null)

+	 * @param container the container of the created elements

+	 * @param extendedType the extended type of the created element 

+	 * @return a command that can be executed by the domain

+	 */

+	protected Command buildCommand(EReference reference, EObject container, String extendedType) {

+

+

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(container);

+		if(provider == null) {

+			return UnexecutableCommand.INSTANCE;

+		}

+

+		ICommand createGMFCommand = provider.getEditCommand(buildRequest(reference, container, extendedType));

+		if(createGMFCommand != null) {

+			Command emfCommand = new org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper(createGMFCommand);

+			return emfCommand;

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+	/**

+	 * 

+	 * @return

+	 *         the creation request to use in this handler

+	 */

+	protected CreateElementRequest buildRequest(EReference reference, EObject container, String extendedType) {

+		if(reference==null){

+			return new CreateElementRequest(editingDomain, container,  getElementType(extendedType)) ;

+		}

+		return new CreateElementRequest(editingDomain, container,  getElementType(extendedType), reference);

+	}

+}

+

diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/CreationMenuListener.java b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/CreationMenuListener.java
new file mode 100644
index 00000000000..5ce0c2270d7
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/CreationMenuListener.java
@@ -0,0 +1,61 @@
+/*****************************************************************************

+ * Copyright (c) 2011 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *		

+ *		CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.newchild;

+

+import org.eclipse.emf.common.command.Command;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.swt.events.SelectionEvent;

+import org.eclipse.swt.events.SelectionListener;

+

+/**

+ * This listener is used to launch the command associated to a menu

+ *

+ */

+class CreationMenuListener implements SelectionListener {

+	protected TransactionalEditingDomain	editingDomain;

+	protected Command cmd;

+	

+	/**

+	 * 

+	 * Constructor.

+	 *

+	 * @param cmd the command associated to the menu

+	 * @param editingDomain the editing domain needed to execute the command

+	 */

+	public CreationMenuListener(Command cmd ,TransactionalEditingDomain	editingDomain) {

+		this.cmd= cmd;

+		this.editingDomain=editingDomain;

+	}

+	/**

+	 * 

+	 * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)

+	 *

+	 * @param e

+	 */

+	public void widgetSelected(SelectionEvent e) {

+		editingDomain.getCommandStack().execute(cmd);

+	}

+	/**

+	 * 

+	 * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent)

+	 *

+	 * @param e

+	 */

+	public void widgetDefaultSelected(SelectionEvent e) {

+		editingDomain.getCommandStack().execute(cmd);

+	}

+

+

+

+}
\ No newline at end of file
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/CreationMenuRegistry.java b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/CreationMenuRegistry.java
new file mode 100644
index 00000000000..8e1fe3802dc
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/CreationMenuRegistry.java
@@ -0,0 +1,122 @@
+/*****************************************************************************

+ * Copyright (c) 2011 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *		

+ *		CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.newchild;

+

+import java.net.URL;

+import java.util.ArrayList;

+

+import org.eclipse.core.runtime.IConfigurationElement;

+import org.eclipse.core.runtime.Platform;

+import org.eclipse.emf.common.util.URI;

+import org.eclipse.emf.ecore.resource.Resource;

+import org.eclipse.emf.ecore.resource.ResourceSet;

+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

+import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;

+import org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.ElementCreationMenuModelPackage;

+import org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Folder;

+import org.osgi.framework.Bundle;

+/**

+ * This class is used to load all extension point call org.eclipse.papyrus.infra.newchild

+ * It gives the set of all Folder that has to be displayed

+ */

+public class CreationMenuRegistry {

+

+	private final String MENU_CREATION_MODEL_EXTENSION_ID = "org.eclipse.papyrus.infra.newchild"; //$NON-NLS-1$

+	private final String MODEL_ID = "model"; //$NON-NLS-1$

+	private  ArrayList<Folder> rootFolders= new ArrayList<Folder>();

+

+

+	/**

+	 * 

+	 * Constructor.

+	 *

+	 */

+	public CreationMenuRegistry(){

+		init();

+	}

+	/**

+	 * this method load the extension points

+	 */

+	public void init(){

+		// Reading data from plugins

+		IConfigurationElement[] configElements = Platform.getExtensionRegistry().getConfigurationElementsFor(MENU_CREATION_MODEL_EXTENSION_ID);

+		for(int i = 0; i < configElements.length; i++) {

+			rootFolders.add(inializeOneModel(configElements[i]));

+		}

+

+	}

+

+	/**

+	 * 

+	 * @return the set of root folders

+	 */

+	public  ArrayList<Folder> getRootFolder(){

+		return rootFolders;

+	}

+

+

+

+	/**

+	 * Load one model

+	 * 

+	 * @param element

+	 *        the extension point

+	 */

+	private Folder inializeOneModel(IConfigurationElement element) {

+		try {

+			return (Folder)createExtension(element, element.getAttribute(MODEL_ID));

+

+		} catch (Exception e) {

+			System.err.println("model of new child can not be loaded: " + e); //$NON-NLS-1$

+		}

+		return null;

+	}

+

+	/**

+	 * Load a resource instanceof  ElementCreationMenuModel

+	 * 

+	 * @param element

+	 *        the extension point

+	 * @param classAttribute

+	 *        the name of the resource to load

+	 * @return the loaded Folder

+	 * @throws Exception

+	 *         if the resource is not loaded

+	 */

+	private static Folder createExtension(final IConfigurationElement element, final String classAttribute) throws Exception {

+		try {

+			Bundle extensionBundle = Platform.getBundle(element.getDeclaringExtension().getNamespaceIdentifier());

+			URL url = extensionBundle.getResource(classAttribute);

+

+			Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put(	Resource.Factory.Registry.DEFAULT_EXTENSION,new XMIResourceFactoryImpl()); 

+			if(url!=null){

+				URI uri=URI.createURI(url.toURI().toASCIIString());

+

+				// Obtain a new resource set

+				ResourceSet resourceSet = new ResourceSetImpl();

+				resourceSet.getPackageRegistry().put(ElementCreationMenuModelPackage.eINSTANCE.getNsURI(), ElementCreationMenuModelPackage.eINSTANCE);

+				// Get the resource

+				Resource resource = resourceSet.getResource(uri, true);

+				if(resource.getContents().get(0) instanceof Folder ){

+					return 	(Folder)resource.getContents().get(0);

+				}

+			}

+			return null;

+		} catch (Exception e) {

+			throw new Exception("unable to create Extension" + e); //$NON-NLS-1$

+		}

+	}

+

+

+}
\ No newline at end of file
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/CreationMenu.java b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/CreationMenu.java
new file mode 100644
index 00000000000..8ef1807833d
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/CreationMenu.java
@@ -0,0 +1,114 @@
+/**

+ * 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:

+ * 	CEA LIST - Initial API and implementation

+ * 

+ */

+package org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel;

+

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Creation Menu</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.CreationMenu#getElementTypeIdRef <em>Element Type Id Ref</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.CreationMenu#getRole <em>Role</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.CreationMenu#isDisplayAllRoles <em>Display All Roles</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.ElementCreationMenuModelPackage#getCreationMenu()

+ * @model

+ * @generated

+ */

+public interface CreationMenu extends Menu {

+	/**

+	 * Returns the value of the '<em><b>Element Type Id Ref</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Element Type Id Ref</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Element Type Id Ref</em>' attribute.

+	 * @see #setElementTypeIdRef(String)

+	 * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.ElementCreationMenuModelPackage#getCreationMenu_ElementTypeIdRef()

+	 * @model required="true" ordered="false"

+	 * @generated

+	 */

+	String getElementTypeIdRef();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.CreationMenu#getElementTypeIdRef <em>Element Type Id Ref</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Element Type Id Ref</em>' attribute.

+	 * @see #getElementTypeIdRef()

+	 * @generated

+	 */

+	void setElementTypeIdRef(String value);

+

+	/**

+	 * Returns the value of the '<em><b>Role</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Role</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Role</em>' attribute.

+	 * @see #setRole(String)

+	 * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.ElementCreationMenuModelPackage#getCreationMenu_Role()

+	 * @model ordered="false"

+	 * @generated

+	 */

+	String getRole();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.CreationMenu#getRole <em>Role</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Role</em>' attribute.

+	 * @see #getRole()

+	 * @generated

+	 */

+	void setRole(String value);

+

+	/**

+	 * Returns the value of the '<em><b>Display All Roles</b></em>' attribute.

+	 * The default value is <code>"true"</code>.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Display All Roles</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Display All Roles</em>' attribute.

+	 * @see #setDisplayAllRoles(boolean)

+	 * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.ElementCreationMenuModelPackage#getCreationMenu_DisplayAllRoles()

+	 * @model default="true" required="true" ordered="false"

+	 * @generated

+	 */

+	boolean isDisplayAllRoles();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.CreationMenu#isDisplayAllRoles <em>Display All Roles</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Display All Roles</em>' attribute.

+	 * @see #isDisplayAllRoles()

+	 * @generated

+	 */

+	void setDisplayAllRoles(boolean value);

+

+} // CreationMenu

diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/ElementCreationMenuModelFactory.java b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/ElementCreationMenuModelFactory.java
new file mode 100644
index 00000000000..7f3aa48cd40
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/ElementCreationMenuModelFactory.java
@@ -0,0 +1,61 @@
+/**

+ * 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:

+ * 	CEA LIST - Initial API and implementation

+ * 

+ */

+package org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel;

+

+import org.eclipse.emf.ecore.EFactory;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Factory</b> for the model.

+ * It provides a create method for each non-abstract class of the model.

+ * <!-- end-user-doc -->

+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.ElementCreationMenuModelPackage

+ * @generated

+ */

+public interface ElementCreationMenuModelFactory extends EFactory {

+	/**

+	 * The singleton instance of the factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	ElementCreationMenuModelFactory eINSTANCE = org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.ElementCreationMenuModelFactoryImpl.init();

+

+	/**

+	 * Returns a new object of class '<em>Folder</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return a new object of class '<em>Folder</em>'.

+	 * @generated

+	 */

+	Folder createFolder();

+

+	/**

+	 * Returns a new object of class '<em>Creation Menu</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return a new object of class '<em>Creation Menu</em>'.

+	 * @generated

+	 */

+	CreationMenu createCreationMenu();

+

+	/**

+	 * Returns the package supported by this factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the package supported by this factory.

+	 * @generated

+	 */

+	ElementCreationMenuModelPackage getElementCreationMenuModelPackage();

+

+} //ElementCreationMenuModelFactory

diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/ElementCreationMenuModelPackage.java b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/ElementCreationMenuModelPackage.java
new file mode 100644
index 00000000000..a6055983799
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/ElementCreationMenuModelPackage.java
@@ -0,0 +1,443 @@
+/**

+ * 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:

+ * 	CEA LIST - Initial API and implementation

+ * 

+ */

+package org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel;

+

+import org.eclipse.emf.ecore.EAttribute;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EPackage;

+import org.eclipse.emf.ecore.EReference;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Package</b> for the model.

+ * It contains accessors for the meta objects to represent

+ * <ul>

+ *   <li>each class,</li>

+ *   <li>each feature of each class,</li>

+ *   <li>each operation of each class,</li>

+ *   <li>each enum,</li>

+ *   <li>and each data type</li>

+ * </ul>

+ * <!-- end-user-doc -->

+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.ElementCreationMenuModelFactory

+ * @model kind="package"

+ * @generated

+ */

+public interface ElementCreationMenuModelPackage extends EPackage {

+	/**

+	 * The package name.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	String eNAME = "ElementCreationMenuModel";

+

+	/**

+	 * The package namespace URI.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	String eNS_URI = "http://ElementCreationMenuModel";

+

+	/**

+	 * The package namespace name.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	String eNS_PREFIX = "ElementCreationMenuModel";

+

+	/**

+	 * The singleton instance of the package.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	ElementCreationMenuModelPackage eINSTANCE = org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.ElementCreationMenuModelPackageImpl.init();

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.MenuImpl <em>Menu</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.MenuImpl

+	 * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.ElementCreationMenuModelPackageImpl#getMenu()

+	 * @generated

+	 */

+	int MENU = 1;

+

+	/**

+	 * The feature id for the '<em><b>Label</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int MENU__LABEL = 0;

+

+	/**

+	 * The feature id for the '<em><b>Icon</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int MENU__ICON = 1;

+

+	/**

+	 * The number of structural features of the '<em>Menu</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int MENU_FEATURE_COUNT = 2;

+

+	/**

+	 * The number of operations of the '<em>Menu</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int MENU_OPERATION_COUNT = 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.FolderImpl <em>Folder</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.FolderImpl

+	 * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.ElementCreationMenuModelPackageImpl#getFolder()

+	 * @generated

+	 */

+	int FOLDER = 0;

+

+	/**

+	 * The feature id for the '<em><b>Label</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int FOLDER__LABEL = MENU__LABEL;

+

+	/**

+	 * The feature id for the '<em><b>Icon</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int FOLDER__ICON = MENU__ICON;

+

+	/**

+	 * The feature id for the '<em><b>Menu</b></em>' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int FOLDER__MENU = MENU_FEATURE_COUNT + 0;

+

+	/**

+	 * The number of structural features of the '<em>Folder</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int FOLDER_FEATURE_COUNT = MENU_FEATURE_COUNT + 1;

+

+	/**

+	 * The number of operations of the '<em>Folder</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int FOLDER_OPERATION_COUNT = MENU_OPERATION_COUNT + 0;

+

+	/**

+	 * The meta object id for the '{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.CreationMenuImpl <em>Creation Menu</em>}' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.CreationMenuImpl

+	 * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.ElementCreationMenuModelPackageImpl#getCreationMenu()

+	 * @generated

+	 */

+	int CREATION_MENU = 2;

+

+	/**

+	 * The feature id for the '<em><b>Label</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int CREATION_MENU__LABEL = MENU__LABEL;

+

+	/**

+	 * The feature id for the '<em><b>Icon</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int CREATION_MENU__ICON = MENU__ICON;

+

+	/**

+	 * The feature id for the '<em><b>Element Type Id Ref</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int CREATION_MENU__ELEMENT_TYPE_ID_REF = MENU_FEATURE_COUNT + 0;

+

+	/**

+	 * The feature id for the '<em><b>Role</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int CREATION_MENU__ROLE = MENU_FEATURE_COUNT + 1;

+

+	/**

+	 * The feature id for the '<em><b>Display All Roles</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int CREATION_MENU__DISPLAY_ALL_ROLES = MENU_FEATURE_COUNT + 2;

+

+	/**

+	 * The number of structural features of the '<em>Creation Menu</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int CREATION_MENU_FEATURE_COUNT = MENU_FEATURE_COUNT + 3;

+

+	/**

+	 * The number of operations of the '<em>Creation Menu</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int CREATION_MENU_OPERATION_COUNT = MENU_OPERATION_COUNT + 0;

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Folder <em>Folder</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>Folder</em>'.

+	 * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Folder

+	 * @generated

+	 */

+	EClass getFolder();

+

+	/**

+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Folder#getMenu <em>Menu</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the containment reference list '<em>Menu</em>'.

+	 * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Folder#getMenu()

+	 * @see #getFolder()

+	 * @generated

+	 */

+	EReference getFolder_Menu();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Menu <em>Menu</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>Menu</em>'.

+	 * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Menu

+	 * @generated

+	 */

+	EClass getMenu();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Menu#getLabel <em>Label</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Label</em>'.

+	 * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Menu#getLabel()

+	 * @see #getMenu()

+	 * @generated

+	 */

+	EAttribute getMenu_Label();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Menu#getIcon <em>Icon</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Icon</em>'.

+	 * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Menu#getIcon()

+	 * @see #getMenu()

+	 * @generated

+	 */

+	EAttribute getMenu_Icon();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.CreationMenu <em>Creation Menu</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>Creation Menu</em>'.

+	 * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.CreationMenu

+	 * @generated

+	 */

+	EClass getCreationMenu();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.CreationMenu#getElementTypeIdRef <em>Element Type Id Ref</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Element Type Id Ref</em>'.

+	 * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.CreationMenu#getElementTypeIdRef()

+	 * @see #getCreationMenu()

+	 * @generated

+	 */

+	EAttribute getCreationMenu_ElementTypeIdRef();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.CreationMenu#getRole <em>Role</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Role</em>'.

+	 * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.CreationMenu#getRole()

+	 * @see #getCreationMenu()

+	 * @generated

+	 */

+	EAttribute getCreationMenu_Role();

+

+	/**

+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.CreationMenu#isDisplayAllRoles <em>Display All Roles</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for the attribute '<em>Display All Roles</em>'.

+	 * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.CreationMenu#isDisplayAllRoles()

+	 * @see #getCreationMenu()

+	 * @generated

+	 */

+	EAttribute getCreationMenu_DisplayAllRoles();

+

+	/**

+	 * Returns the factory that creates the instances of the model.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the factory that creates the instances of the model.

+	 * @generated

+	 */

+	ElementCreationMenuModelFactory getElementCreationMenuModelFactory();

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * Defines literals for the meta objects that represent

+	 * <ul>

+	 *   <li>each class,</li>

+	 *   <li>each feature of each class,</li>

+	 *   <li>each operation of each class,</li>

+	 *   <li>each enum,</li>

+	 *   <li>and each data type</li>

+	 * </ul>

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	interface Literals {

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.FolderImpl <em>Folder</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.FolderImpl

+		 * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.ElementCreationMenuModelPackageImpl#getFolder()

+		 * @generated

+		 */

+		EClass FOLDER = eINSTANCE.getFolder();

+

+		/**

+		 * The meta object literal for the '<em><b>Menu</b></em>' containment reference list feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EReference FOLDER__MENU = eINSTANCE.getFolder_Menu();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.MenuImpl <em>Menu</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.MenuImpl

+		 * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.ElementCreationMenuModelPackageImpl#getMenu()

+		 * @generated

+		 */

+		EClass MENU = eINSTANCE.getMenu();

+

+		/**

+		 * The meta object literal for the '<em><b>Label</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EAttribute MENU__LABEL = eINSTANCE.getMenu_Label();

+

+		/**

+		 * The meta object literal for the '<em><b>Icon</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EAttribute MENU__ICON = eINSTANCE.getMenu_Icon();

+

+		/**

+		 * The meta object literal for the '{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.CreationMenuImpl <em>Creation Menu</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.CreationMenuImpl

+		 * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.ElementCreationMenuModelPackageImpl#getCreationMenu()

+		 * @generated

+		 */

+		EClass CREATION_MENU = eINSTANCE.getCreationMenu();

+

+		/**

+		 * The meta object literal for the '<em><b>Element Type Id Ref</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EAttribute CREATION_MENU__ELEMENT_TYPE_ID_REF = eINSTANCE.getCreationMenu_ElementTypeIdRef();

+

+		/**

+		 * The meta object literal for the '<em><b>Role</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EAttribute CREATION_MENU__ROLE = eINSTANCE.getCreationMenu_Role();

+

+		/**

+		 * The meta object literal for the '<em><b>Display All Roles</b></em>' attribute feature.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @generated

+		 */

+		EAttribute CREATION_MENU__DISPLAY_ALL_ROLES = eINSTANCE.getCreationMenu_DisplayAllRoles();

+

+	}

+

+} //ElementCreationMenuModelPackage

diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/Folder.java b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/Folder.java
new file mode 100644
index 00000000000..65f88d84fa9
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/Folder.java
@@ -0,0 +1,50 @@
+/**

+ * 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:

+ * 	CEA LIST - Initial API and implementation

+ * 

+ */

+package org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel;

+

+import org.eclipse.emf.common.util.EList;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Folder</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Folder#getMenu <em>Menu</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.ElementCreationMenuModelPackage#getFolder()

+ * @model

+ * @generated

+ */

+public interface Folder extends Menu {

+	/**

+	 * Returns the value of the '<em><b>Menu</b></em>' containment reference list.

+	 * The list contents are of type {@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Menu}.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Menu</em>' containment reference list isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Menu</em>' containment reference list.

+	 * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.ElementCreationMenuModelPackage#getFolder_Menu()

+	 * @model containment="true"

+	 * @generated

+	 */

+	EList<Menu> getMenu();

+

+} // Folder

diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/Menu.java b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/Menu.java
new file mode 100644
index 00000000000..8c1f000ee27
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/Menu.java
@@ -0,0 +1,87 @@
+/**

+ * 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:

+ * 	CEA LIST - Initial API and implementation

+ * 

+ */

+package org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel;

+

+import org.eclipse.emf.ecore.EObject;

+

+/**

+ * <!-- begin-user-doc -->

+ * A representation of the model object '<em><b>Menu</b></em>'.

+ * <!-- end-user-doc -->

+ *

+ * <p>

+ * The following features are supported:

+ * <ul>

+ *   <li>{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Menu#getLabel <em>Label</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Menu#getIcon <em>Icon</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.ElementCreationMenuModelPackage#getMenu()

+ * @model abstract="true"

+ * @generated

+ */

+public interface Menu extends EObject {

+	/**

+	 * Returns the value of the '<em><b>Label</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Label</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Label</em>' attribute.

+	 * @see #setLabel(String)

+	 * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.ElementCreationMenuModelPackage#getMenu_Label()

+	 * @model required="true" ordered="false"

+	 * @generated

+	 */

+	String getLabel();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Menu#getLabel <em>Label</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Label</em>' attribute.

+	 * @see #getLabel()

+	 * @generated

+	 */

+	void setLabel(String value);

+

+	/**

+	 * Returns the value of the '<em><b>Icon</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <p>

+	 * If the meaning of the '<em>Icon</em>' attribute isn't clear,

+	 * there really should be more of a description here...

+	 * </p>

+	 * <!-- end-user-doc -->

+	 * @return the value of the '<em>Icon</em>' attribute.

+	 * @see #setIcon(String)

+	 * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.ElementCreationMenuModelPackage#getMenu_Icon()

+	 * @model ordered="false"

+	 * @generated

+	 */

+	String getIcon();

+

+	/**

+	 * Sets the value of the '{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Menu#getIcon <em>Icon</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param value the new value of the '<em>Icon</em>' attribute.

+	 * @see #getIcon()

+	 * @generated

+	 */

+	void setIcon(String value);

+

+} // Menu

diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/impl/CreationMenuImpl.java b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/impl/CreationMenuImpl.java
new file mode 100644
index 00000000000..567f56c0cbc
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/impl/CreationMenuImpl.java
@@ -0,0 +1,280 @@
+/**

+ * 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:

+ * 	CEA LIST - Initial API and implementation

+ * 

+ */

+package org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl;

+

+import org.eclipse.emf.common.notify.Notification;

+

+import org.eclipse.emf.ecore.EClass;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+

+import org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.CreationMenu;

+import org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.ElementCreationMenuModelPackage;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Creation Menu</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ *   <li>{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.CreationMenuImpl#getElementTypeIdRef <em>Element Type Id Ref</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.CreationMenuImpl#getRole <em>Role</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.CreationMenuImpl#isDisplayAllRoles <em>Display All Roles</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @generated

+ */

+public class CreationMenuImpl extends MenuImpl implements CreationMenu {

+	/**

+	 * The default value of the '{@link #getElementTypeIdRef() <em>Element Type Id Ref</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getElementTypeIdRef()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String ELEMENT_TYPE_ID_REF_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getElementTypeIdRef() <em>Element Type Id Ref</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getElementTypeIdRef()

+	 * @generated

+	 * @ordered

+	 */

+	protected String elementTypeIdRef = ELEMENT_TYPE_ID_REF_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #getRole() <em>Role</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getRole()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String ROLE_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getRole() <em>Role</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getRole()

+	 * @generated

+	 * @ordered

+	 */

+	protected String role = ROLE_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #isDisplayAllRoles() <em>Display All Roles</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isDisplayAllRoles()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final boolean DISPLAY_ALL_ROLES_EDEFAULT = true;

+

+	/**

+	 * The cached value of the '{@link #isDisplayAllRoles() <em>Display All Roles</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #isDisplayAllRoles()

+	 * @generated

+	 * @ordered

+	 */

+	protected boolean displayAllRoles = DISPLAY_ALL_ROLES_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected CreationMenuImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return ElementCreationMenuModelPackage.Literals.CREATION_MENU;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public String getElementTypeIdRef() {

+		return elementTypeIdRef;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setElementTypeIdRef(String newElementTypeIdRef) {

+		String oldElementTypeIdRef = elementTypeIdRef;

+		elementTypeIdRef = newElementTypeIdRef;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, ElementCreationMenuModelPackage.CREATION_MENU__ELEMENT_TYPE_ID_REF, oldElementTypeIdRef, elementTypeIdRef));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public String getRole() {

+		return role;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setRole(String newRole) {

+		String oldRole = role;

+		role = newRole;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, ElementCreationMenuModelPackage.CREATION_MENU__ROLE, oldRole, role));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public boolean isDisplayAllRoles() {

+		return displayAllRoles;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setDisplayAllRoles(boolean newDisplayAllRoles) {

+		boolean oldDisplayAllRoles = displayAllRoles;

+		displayAllRoles = newDisplayAllRoles;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, ElementCreationMenuModelPackage.CREATION_MENU__DISPLAY_ALL_ROLES, oldDisplayAllRoles, displayAllRoles));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch (featureID) {

+			case ElementCreationMenuModelPackage.CREATION_MENU__ELEMENT_TYPE_ID_REF:

+				return getElementTypeIdRef();

+			case ElementCreationMenuModelPackage.CREATION_MENU__ROLE:

+				return getRole();

+			case ElementCreationMenuModelPackage.CREATION_MENU__DISPLAY_ALL_ROLES:

+				return isDisplayAllRoles();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch (featureID) {

+			case ElementCreationMenuModelPackage.CREATION_MENU__ELEMENT_TYPE_ID_REF:

+				setElementTypeIdRef((String)newValue);

+				return;

+			case ElementCreationMenuModelPackage.CREATION_MENU__ROLE:

+				setRole((String)newValue);

+				return;

+			case ElementCreationMenuModelPackage.CREATION_MENU__DISPLAY_ALL_ROLES:

+				setDisplayAllRoles((Boolean)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch (featureID) {

+			case ElementCreationMenuModelPackage.CREATION_MENU__ELEMENT_TYPE_ID_REF:

+				setElementTypeIdRef(ELEMENT_TYPE_ID_REF_EDEFAULT);

+				return;

+			case ElementCreationMenuModelPackage.CREATION_MENU__ROLE:

+				setRole(ROLE_EDEFAULT);

+				return;

+			case ElementCreationMenuModelPackage.CREATION_MENU__DISPLAY_ALL_ROLES:

+				setDisplayAllRoles(DISPLAY_ALL_ROLES_EDEFAULT);

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch (featureID) {

+			case ElementCreationMenuModelPackage.CREATION_MENU__ELEMENT_TYPE_ID_REF:

+				return ELEMENT_TYPE_ID_REF_EDEFAULT == null ? elementTypeIdRef != null : !ELEMENT_TYPE_ID_REF_EDEFAULT.equals(elementTypeIdRef);

+			case ElementCreationMenuModelPackage.CREATION_MENU__ROLE:

+				return ROLE_EDEFAULT == null ? role != null : !ROLE_EDEFAULT.equals(role);

+			case ElementCreationMenuModelPackage.CREATION_MENU__DISPLAY_ALL_ROLES:

+				return displayAllRoles != DISPLAY_ALL_ROLES_EDEFAULT;

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String toString() {

+		if (eIsProxy()) return super.toString();

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (elementTypeIdRef: ");

+		result.append(elementTypeIdRef);

+		result.append(", role: ");

+		result.append(role);

+		result.append(", displayAllRoles: ");

+		result.append(displayAllRoles);

+		result.append(')');

+		return result.toString();

+	}

+

+} //CreationMenuImpl

diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/impl/ElementCreationMenuModelFactoryImpl.java b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/impl/ElementCreationMenuModelFactoryImpl.java
new file mode 100644
index 00000000000..c5f07f5c07a
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/impl/ElementCreationMenuModelFactoryImpl.java
@@ -0,0 +1,115 @@
+/**

+ * 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:

+ * 	CEA LIST - Initial API and implementation

+ * 

+ */

+package org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl;

+

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EPackage;

+import org.eclipse.emf.ecore.impl.EFactoryImpl;

+import org.eclipse.emf.ecore.plugin.EcorePlugin;

+import org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.*;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model <b>Factory</b>.

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class ElementCreationMenuModelFactoryImpl extends EFactoryImpl implements ElementCreationMenuModelFactory {

+	/**

+	 * Creates the default factory implementation.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@SuppressWarnings("javadoc")

+	public static ElementCreationMenuModelFactory init() {

+		try {

+			ElementCreationMenuModelFactory theElementCreationMenuModelFactory = (ElementCreationMenuModelFactory)EPackage.Registry.INSTANCE.getEFactory(ElementCreationMenuModelPackage.eNS_URI);

+			if (theElementCreationMenuModelFactory != null) {

+				return theElementCreationMenuModelFactory;

+			}

+		}

+		catch (Exception exception) {

+			EcorePlugin.INSTANCE.log(exception);

+		}

+		return new ElementCreationMenuModelFactoryImpl();

+	}

+

+	/**

+	 * Creates an instance of the factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public ElementCreationMenuModelFactoryImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public EObject create(EClass eClass) {

+		switch (eClass.getClassifierID()) {

+			case ElementCreationMenuModelPackage.FOLDER: return createFolder();

+			case ElementCreationMenuModelPackage.CREATION_MENU: return createCreationMenu();

+			default:

+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

+		}

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public Folder createFolder() {

+		FolderImpl folder = new FolderImpl();

+		return folder;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public CreationMenu createCreationMenu() {

+		CreationMenuImpl creationMenu = new CreationMenuImpl();

+		return creationMenu;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public ElementCreationMenuModelPackage getElementCreationMenuModelPackage() {

+		return (ElementCreationMenuModelPackage)getEPackage();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @deprecated

+	 * @generated

+	 */

+	@SuppressWarnings("javadoc")

+	@Deprecated

+	public static ElementCreationMenuModelPackage getPackage() {

+		return ElementCreationMenuModelPackage.eINSTANCE;

+	}

+

+} //ElementCreationMenuModelFactoryImpl

diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/impl/ElementCreationMenuModelPackageImpl.java b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/impl/ElementCreationMenuModelPackageImpl.java
new file mode 100644
index 00000000000..b05c066088e
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/impl/ElementCreationMenuModelPackageImpl.java
@@ -0,0 +1,293 @@
+/**

+ * 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:

+ * 	CEA LIST - Initial API and implementation

+ * 

+ */

+package org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl;

+

+import org.eclipse.emf.ecore.EAttribute;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EPackage;

+import org.eclipse.emf.ecore.EReference;

+import org.eclipse.emf.ecore.EcorePackage;

+import org.eclipse.emf.ecore.impl.EPackageImpl;

+import org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.CreationMenu;

+import org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.ElementCreationMenuModelFactory;

+import org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.ElementCreationMenuModelPackage;

+import org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Folder;

+import org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Menu;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model <b>Package</b>.

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class ElementCreationMenuModelPackageImpl extends EPackageImpl implements ElementCreationMenuModelPackage {

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass folderEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass menuEClass = null;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private EClass creationMenuEClass = null;

+

+	/**

+	 * Creates an instance of the model <b>Package</b>, registered with

+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

+	 * package URI value.

+	 * <p>Note: the correct way to create the package is via the static

+	 * factory method {@link #init init()}, which also performs

+	 * initialization of the package, or returns the registered package,

+	 * if one already exists.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see org.eclipse.emf.ecore.EPackage.Registry

+	 * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.ElementCreationMenuModelPackage#eNS_URI

+	 * @see #init()

+	 * @generated

+	 */

+	private ElementCreationMenuModelPackageImpl() {

+		super(eNS_URI, ElementCreationMenuModelFactory.eINSTANCE);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private static boolean isInited = false;

+

+	/**

+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

+	 * 

+	 * <p>This method is used to initialize {@link ElementCreationMenuModelPackage#eINSTANCE} when that field is accessed.

+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #eNS_URI

+	 * @see #createPackageContents()

+	 * @see #initializePackageContents()

+	 * @generated

+	 */

+	@SuppressWarnings("javadoc")

+	public static ElementCreationMenuModelPackage init() {

+		if (isInited) return (ElementCreationMenuModelPackage)EPackage.Registry.INSTANCE.getEPackage(ElementCreationMenuModelPackage.eNS_URI);

+

+		// Obtain or create and register package

+		ElementCreationMenuModelPackageImpl theElementCreationMenuModelPackage = (ElementCreationMenuModelPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ElementCreationMenuModelPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ElementCreationMenuModelPackageImpl());

+

+		isInited = true;

+

+		// Initialize simple dependencies

+		EcorePackage.eINSTANCE.eClass();

+

+		// Create package meta-data objects

+		theElementCreationMenuModelPackage.createPackageContents();

+

+		// Initialize created meta-data

+		theElementCreationMenuModelPackage.initializePackageContents();

+

+		// Mark meta-data to indicate it can't be changed

+		theElementCreationMenuModelPackage.freeze();

+

+  

+		// Update the registry and return the package

+		EPackage.Registry.INSTANCE.put(ElementCreationMenuModelPackage.eNS_URI, theElementCreationMenuModelPackage);

+		return theElementCreationMenuModelPackage;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EClass getFolder() {

+		return folderEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EReference getFolder_Menu() {

+		return (EReference)folderEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EClass getMenu() {

+		return menuEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EAttribute getMenu_Label() {

+		return (EAttribute)menuEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EAttribute getMenu_Icon() {

+		return (EAttribute)menuEClass.getEStructuralFeatures().get(1);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EClass getCreationMenu() {

+		return creationMenuEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EAttribute getCreationMenu_ElementTypeIdRef() {

+		return (EAttribute)creationMenuEClass.getEStructuralFeatures().get(0);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EAttribute getCreationMenu_Role() {

+		return (EAttribute)creationMenuEClass.getEStructuralFeatures().get(1);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EAttribute getCreationMenu_DisplayAllRoles() {

+		return (EAttribute)creationMenuEClass.getEStructuralFeatures().get(2);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public ElementCreationMenuModelFactory getElementCreationMenuModelFactory() {

+		return (ElementCreationMenuModelFactory)getEFactoryInstance();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private boolean isCreated = false;

+

+	/**

+	 * Creates the meta-model objects for the package.  This method is

+	 * guarded to have no affect on any invocation but its first.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void createPackageContents() {

+		if (isCreated) return;

+		isCreated = true;

+

+		// Create classes and their features

+		folderEClass = createEClass(FOLDER);

+		createEReference(folderEClass, FOLDER__MENU);

+

+		menuEClass = createEClass(MENU);

+		createEAttribute(menuEClass, MENU__LABEL);

+		createEAttribute(menuEClass, MENU__ICON);

+

+		creationMenuEClass = createEClass(CREATION_MENU);

+		createEAttribute(creationMenuEClass, CREATION_MENU__ELEMENT_TYPE_ID_REF);

+		createEAttribute(creationMenuEClass, CREATION_MENU__ROLE);

+		createEAttribute(creationMenuEClass, CREATION_MENU__DISPLAY_ALL_ROLES);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	private boolean isInitialized = false;

+

+	/**

+	 * Complete the initialization of the package and its meta-model.  This

+	 * method is guarded to have no affect on any invocation but its first.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void initializePackageContents() {

+		if (isInitialized) return;

+		isInitialized = true;

+

+		// Initialize package

+		setName(eNAME);

+		setNsPrefix(eNS_PREFIX);

+		setNsURI(eNS_URI);

+

+		// Obtain other dependent packages

+		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);

+

+		// Create type parameters

+

+		// Set bounds for type parameters

+

+		// Add supertypes to classes

+		folderEClass.getESuperTypes().add(this.getMenu());

+		creationMenuEClass.getESuperTypes().add(this.getMenu());

+

+		// Initialize classes, features, and operations; add parameters

+		initEClass(folderEClass, Folder.class, "Folder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEReference(getFolder_Menu(), this.getMenu(), null, "menu", null, 0, -1, Folder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+

+		initEClass(menuEClass, Menu.class, "Menu", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getMenu_Label(), theEcorePackage.getEString(), "label", null, 1, 1, Menu.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEAttribute(getMenu_Icon(), theEcorePackage.getEString(), "icon", null, 0, 1, Menu.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+

+		initEClass(creationMenuEClass, CreationMenu.class, "CreationMenu", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+		initEAttribute(getCreationMenu_ElementTypeIdRef(), theEcorePackage.getEString(), "elementTypeIdRef", null, 1, 1, CreationMenu.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEAttribute(getCreationMenu_Role(), theEcorePackage.getEString(), "role", null, 0, 1, CreationMenu.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+		initEAttribute(getCreationMenu_DisplayAllRoles(), theEcorePackage.getEBoolean(), "displayAllRoles", "true", 1, 1, CreationMenu.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);

+

+		// Create resource

+		createResource(eNS_URI);

+	}

+

+} //ElementCreationMenuModelPackageImpl

diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/impl/FolderImpl.java b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/impl/FolderImpl.java
new file mode 100644
index 00000000000..44d526eb922
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/impl/FolderImpl.java
@@ -0,0 +1,160 @@
+/**

+ * 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:

+ * 	CEA LIST - Initial API and implementation

+ * 

+ */

+package org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl;

+

+import java.util.Collection;

+

+import org.eclipse.emf.common.notify.NotificationChain;

+

+import org.eclipse.emf.common.util.EList;

+

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.InternalEObject;

+

+import org.eclipse.emf.ecore.util.EObjectContainmentEList;

+import org.eclipse.emf.ecore.util.InternalEList;

+

+import org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.ElementCreationMenuModelPackage;

+import org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Folder;

+import org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Menu;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Folder</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ *   <li>{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.FolderImpl#getMenu <em>Menu</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @generated

+ */

+public class FolderImpl extends MenuImpl implements Folder {

+	/**

+	 * The cached value of the '{@link #getMenu() <em>Menu</em>}' containment reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getMenu()

+	 * @generated

+	 * @ordered

+	 */

+	protected EList<Menu> menu;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected FolderImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return ElementCreationMenuModelPackage.Literals.FOLDER;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public EList<Menu> getMenu() {

+		if (menu == null) {

+			menu = new EObjectContainmentEList<Menu>(Menu.class, this, ElementCreationMenuModelPackage.FOLDER__MENU);

+		}

+		return menu;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

+		switch (featureID) {

+			case ElementCreationMenuModelPackage.FOLDER__MENU:

+				return ((InternalEList<?>)getMenu()).basicRemove(otherEnd, msgs);

+		}

+		return super.eInverseRemove(otherEnd, featureID, msgs);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch (featureID) {

+			case ElementCreationMenuModelPackage.FOLDER__MENU:

+				return getMenu();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch (featureID) {

+			case ElementCreationMenuModelPackage.FOLDER__MENU:

+				getMenu().clear();

+				getMenu().addAll((Collection<? extends Menu>)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch (featureID) {

+			case ElementCreationMenuModelPackage.FOLDER__MENU:

+				getMenu().clear();

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch (featureID) {

+			case ElementCreationMenuModelPackage.FOLDER__MENU:

+				return menu != null && !menu.isEmpty();

+		}

+		return super.eIsSet(featureID);

+	}

+

+} //FolderImpl

diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/impl/MenuImpl.java b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/impl/MenuImpl.java
new file mode 100644
index 00000000000..621786d120f
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/impl/MenuImpl.java
@@ -0,0 +1,227 @@
+/**

+ * 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:

+ * 	CEA LIST - Initial API and implementation

+ * 

+ */

+package org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl;

+

+import org.eclipse.emf.common.notify.Notification;

+

+import org.eclipse.emf.ecore.EClass;

+

+import org.eclipse.emf.ecore.impl.ENotificationImpl;

+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+

+import org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.ElementCreationMenuModelPackage;

+import org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Menu;

+

+/**

+ * <!-- begin-user-doc -->

+ * An implementation of the model object '<em><b>Menu</b></em>'.

+ * <!-- end-user-doc -->

+ * <p>

+ * The following features are implemented:

+ * <ul>

+ *   <li>{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.MenuImpl#getLabel <em>Label</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.impl.MenuImpl#getIcon <em>Icon</em>}</li>

+ * </ul>

+ * </p>

+ *

+ * @generated

+ */

+public abstract class MenuImpl extends MinimalEObjectImpl.Container implements Menu {

+	/**

+	 * The default value of the '{@link #getLabel() <em>Label</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getLabel()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String LABEL_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getLabel() <em>Label</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getLabel()

+	 * @generated

+	 * @ordered

+	 */

+	protected String label = LABEL_EDEFAULT;

+

+	/**

+	 * The default value of the '{@link #getIcon() <em>Icon</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getIcon()

+	 * @generated

+	 * @ordered

+	 */

+	protected static final String ICON_EDEFAULT = null;

+

+	/**

+	 * The cached value of the '{@link #getIcon() <em>Icon</em>}' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @see #getIcon()

+	 * @generated

+	 * @ordered

+	 */

+	protected String icon = ICON_EDEFAULT;

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected MenuImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return ElementCreationMenuModelPackage.Literals.MENU;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public String getLabel() {

+		return label;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setLabel(String newLabel) {

+		String oldLabel = label;

+		label = newLabel;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, ElementCreationMenuModelPackage.MENU__LABEL, oldLabel, label));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public String getIcon() {

+		return icon;

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public void setIcon(String newIcon) {

+		String oldIcon = icon;

+		icon = newIcon;

+		if (eNotificationRequired())

+			eNotify(new ENotificationImpl(this, Notification.SET, ElementCreationMenuModelPackage.MENU__ICON, oldIcon, icon));

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Object eGet(int featureID, boolean resolve, boolean coreType) {

+		switch (featureID) {

+			case ElementCreationMenuModelPackage.MENU__LABEL:

+				return getLabel();

+			case ElementCreationMenuModelPackage.MENU__ICON:

+				return getIcon();

+		}

+		return super.eGet(featureID, resolve, coreType);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eSet(int featureID, Object newValue) {

+		switch (featureID) {

+			case ElementCreationMenuModelPackage.MENU__LABEL:

+				setLabel((String)newValue);

+				return;

+			case ElementCreationMenuModelPackage.MENU__ICON:

+				setIcon((String)newValue);

+				return;

+		}

+		super.eSet(featureID, newValue);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public void eUnset(int featureID) {

+		switch (featureID) {

+			case ElementCreationMenuModelPackage.MENU__LABEL:

+				setLabel(LABEL_EDEFAULT);

+				return;

+			case ElementCreationMenuModelPackage.MENU__ICON:

+				setIcon(ICON_EDEFAULT);

+				return;

+		}

+		super.eUnset(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public boolean eIsSet(int featureID) {

+		switch (featureID) {

+			case ElementCreationMenuModelPackage.MENU__LABEL:

+				return LABEL_EDEFAULT == null ? label != null : !LABEL_EDEFAULT.equals(label);

+			case ElementCreationMenuModelPackage.MENU__ICON:

+				return ICON_EDEFAULT == null ? icon != null : !ICON_EDEFAULT.equals(icon);

+		}

+		return super.eIsSet(featureID);

+	}

+

+	/**

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public String toString() {

+		if (eIsProxy()) return super.toString();

+

+		StringBuffer result = new StringBuffer(super.toString());

+		result.append(" (label: ");

+		result.append(label);

+		result.append(", icon: ");

+		result.append(icon);

+		result.append(')');

+		return result.toString();

+	}

+

+} //MenuImpl

diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/util/ElementCreationMenuModelAdapterFactory.java b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/util/ElementCreationMenuModelAdapterFactory.java
new file mode 100644
index 00000000000..00e13badb97
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/util/ElementCreationMenuModelAdapterFactory.java
@@ -0,0 +1,166 @@
+/**

+ * 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:

+ * 	CEA LIST - Initial API and implementation

+ * 

+ */

+package org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.util;

+

+import org.eclipse.emf.common.notify.Adapter;

+import org.eclipse.emf.common.notify.Notifier;

+

+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

+

+import org.eclipse.emf.ecore.EObject;

+

+import org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.*;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Adapter Factory</b> for the model.

+ * It provides an adapter <code>createXXX</code> method for each class of the model.

+ * <!-- end-user-doc -->

+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.ElementCreationMenuModelPackage

+ * @generated

+ */

+public class ElementCreationMenuModelAdapterFactory extends AdapterFactoryImpl {

+	/**

+	 * The cached model package.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected static ElementCreationMenuModelPackage modelPackage;

+

+	/**

+	 * Creates an instance of the adapter factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public ElementCreationMenuModelAdapterFactory() {

+		if (modelPackage == null) {

+			modelPackage = ElementCreationMenuModelPackage.eINSTANCE;

+		}

+	}

+

+	/**

+	 * Returns whether this factory is applicable for the type of the object.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

+	 * <!-- end-user-doc -->

+	 * @return whether this factory is applicable for the type of the object.

+	 * @generated

+	 */

+	@Override

+	public boolean isFactoryForType(Object object) {

+		if (object == modelPackage) {

+			return true;

+		}

+		if (object instanceof EObject) {

+			return ((EObject)object).eClass().getEPackage() == modelPackage;

+		}

+		return false;

+	}

+

+	/**

+	 * The switch that delegates to the <code>createXXX</code> methods.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected ElementCreationMenuModelSwitch<Adapter> modelSwitch =

+		new ElementCreationMenuModelSwitch<Adapter>() {

+			@Override

+			public Adapter caseFolder(Folder object) {

+				return createFolderAdapter();

+			}

+			@Override

+			public Adapter caseMenu(Menu object) {

+				return createMenuAdapter();

+			}

+			@Override

+			public Adapter caseCreationMenu(CreationMenu object) {

+				return createCreationMenuAdapter();

+			}

+			@Override

+			public Adapter defaultCase(EObject object) {

+				return createEObjectAdapter();

+			}

+		};

+

+	/**

+	 * Creates an adapter for the <code>target</code>.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param target the object to adapt.

+	 * @return the adapter for the <code>target</code>.

+	 * @generated

+	 */

+	@Override

+	public Adapter createAdapter(Notifier target) {

+		return modelSwitch.doSwitch((EObject)target);

+	}

+

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Folder <em>Folder</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Folder

+	 * @generated

+	 */

+	public Adapter createFolderAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Menu <em>Menu</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Menu

+	 * @generated

+	 */

+	public Adapter createMenuAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.CreationMenu <em>Creation Menu</em>}'.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null so that we can easily ignore cases;

+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * <!-- end-user-doc -->

+	 * @return the new adapter.

+	 * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.CreationMenu

+	 * @generated

+	 */

+	public Adapter createCreationMenuAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for the default case.

+	 * <!-- begin-user-doc -->

+	 * This default implementation returns null.

+	 * <!-- end-user-doc -->

+	 * @return the new adapter.

+	 * @generated

+	 */

+	public Adapter createEObjectAdapter() {

+		return null;

+	}

+

+} //ElementCreationMenuModelAdapterFactory

diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/util/ElementCreationMenuModelResourceFactoryImpl.java b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/util/ElementCreationMenuModelResourceFactoryImpl.java
new file mode 100644
index 00000000000..07104b50248
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/util/ElementCreationMenuModelResourceFactoryImpl.java
@@ -0,0 +1,51 @@
+/**

+ * 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:

+ * 	CEA LIST - Initial API and implementation

+ * 

+ */

+package org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.util;

+

+import org.eclipse.emf.common.util.URI;

+

+import org.eclipse.emf.ecore.resource.Resource;

+

+import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Resource Factory</b> associated with the package.

+ * <!-- end-user-doc -->

+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.util.ElementCreationMenuModelResourceImpl

+ * @generated

+ */

+public class ElementCreationMenuModelResourceFactoryImpl extends ResourceFactoryImpl {

+	/**

+	 * Creates an instance of the resource factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public ElementCreationMenuModelResourceFactoryImpl() {

+		super();

+	}

+

+	/**

+	 * Creates an instance of the resource.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	public Resource createResource(URI uri) {

+		Resource result = new ElementCreationMenuModelResourceImpl(uri);

+		return result;

+	}

+

+} //ElementCreationMenuModelResourceFactoryImpl

diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/util/ElementCreationMenuModelResourceImpl.java b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/util/ElementCreationMenuModelResourceImpl.java
new file mode 100644
index 00000000000..f2ae3dfb0f1
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/util/ElementCreationMenuModelResourceImpl.java
@@ -0,0 +1,38 @@
+/**

+ * 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:

+ * 	CEA LIST - Initial API and implementation

+ * 

+ */

+package org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.util;

+

+import org.eclipse.emf.common.util.URI;

+

+import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Resource </b> associated with the package.

+ * <!-- end-user-doc -->

+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.util.ElementCreationMenuModelResourceFactoryImpl

+ * @generated

+ */

+public class ElementCreationMenuModelResourceImpl extends XMLResourceImpl {

+	/**

+	 * Creates an instance of the resource.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @param uri the URI of the new resource.

+	 * @generated

+	 */

+	public ElementCreationMenuModelResourceImpl(URI uri) {

+		super(uri);

+	}

+

+} //ElementCreationMenuModelResourceImpl

diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/util/ElementCreationMenuModelSwitch.java b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/util/ElementCreationMenuModelSwitch.java
new file mode 100644
index 00000000000..93af0b3b286
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/util/ElementCreationMenuModelSwitch.java
@@ -0,0 +1,163 @@
+/**

+ * 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:

+ * 	CEA LIST - Initial API and implementation

+ * 

+ */

+package org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.util;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EPackage;

+import org.eclipse.emf.ecore.util.Switch;

+import org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.*;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Switch</b> for the model's inheritance hierarchy.

+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)}

+ * to invoke the <code>caseXXX</code> method for each class of the model,

+ * starting with the actual class of the object

+ * and proceeding up the inheritance hierarchy

+ * until a non-null result is returned,

+ * which is the result of the switch.

+ * <!-- end-user-doc -->

+ * @see org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.ElementCreationMenuModelPackage

+ * @generated

+ */

+@SuppressWarnings("javadoc")

+public class ElementCreationMenuModelSwitch<T> extends Switch<T> {

+	/**

+	 * The cached model package

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	protected static ElementCreationMenuModelPackage modelPackage;

+

+	/**

+	 * Creates an instance of the switch.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public ElementCreationMenuModelSwitch() {

+		if (modelPackage == null) {

+			modelPackage = ElementCreationMenuModelPackage.eINSTANCE;

+		}

+	}

+

+	/**

+	 * Checks whether this is a switch for the given package.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @parameter ePackage the package in question.

+	 * @return whether this is a switch for the given package.

+	 * @generated

+	 */

+	@Override

+	protected boolean isSwitchFor(EPackage ePackage) {

+		return ePackage == modelPackage;

+	}

+

+	/**

+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the first non-null result returned by a <code>caseXXX</code> call.

+	 * @generated

+	 */

+	@Override

+	protected T doSwitch(int classifierID, EObject theEObject) {

+		switch (classifierID) {

+			case ElementCreationMenuModelPackage.FOLDER: {

+				Folder folder = (Folder)theEObject;

+				T result = caseFolder(folder);

+				if (result == null) result = caseMenu(folder);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case ElementCreationMenuModelPackage.MENU: {

+				Menu menu = (Menu)theEObject;

+				T result = caseMenu(menu);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case ElementCreationMenuModelPackage.CREATION_MENU: {

+				CreationMenu creationMenu = (CreationMenu)theEObject;

+				T result = caseCreationMenu(creationMenu);

+				if (result == null) result = caseMenu(creationMenu);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			default: return defaultCase(theEObject);

+		}

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Folder</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 * @param object the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Folder</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseFolder(Folder object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Menu</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 * @param object the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Menu</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseMenu(Menu object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>Creation Menu</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch.

+	 * <!-- end-user-doc -->

+	 * @param object the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Creation Menu</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseCreationMenu(CreationMenu object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.

+	 * <!-- begin-user-doc -->

+	 * This implementation returns null;

+	 * returning a non-null result will terminate the switch, but this is the last case anyway.

+	 * <!-- end-user-doc -->

+	 * @param object the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

+	 * @generated

+	 */

+	@Override

+	public T defaultCase(EObject object) {

+		return null;

+	}

+

+} //ElementCreationMenuModelSwitch

diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/util/ElementCreationMenuModelXMLProcessor.java b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/util/ElementCreationMenuModelXMLProcessor.java
new file mode 100644
index 00000000000..6fe2215d46f
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/src/org/eclipse/papyrus/infra/newchild/ElementCreationMenuModel/util/ElementCreationMenuModelXMLProcessor.java
@@ -0,0 +1,60 @@
+/**

+ * 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:

+ * 	CEA LIST - Initial API and implementation

+ * 

+ */

+package org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.util;

+

+import java.util.Map;

+

+import org.eclipse.emf.ecore.EPackage;

+

+import org.eclipse.emf.ecore.resource.Resource;

+

+import org.eclipse.emf.ecore.xmi.util.XMLProcessor;

+

+import org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.ElementCreationMenuModelPackage;

+

+/**

+ * This class contains helper methods to serialize and deserialize XML documents

+ * <!-- begin-user-doc -->

+ * <!-- end-user-doc -->

+ * @generated

+ */

+public class ElementCreationMenuModelXMLProcessor extends XMLProcessor {

+

+	/**

+	 * Public constructor to instantiate the helper.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	public ElementCreationMenuModelXMLProcessor() {

+		super((EPackage.Registry.INSTANCE));

+		ElementCreationMenuModelPackage.eINSTANCE.eClass();

+	}

+	

+	/**

+	 * Register for "*" and "xml" file extensions the ElementCreationMenuModelResourceFactoryImpl factory.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 */

+	@Override

+	protected Map<String, Resource.Factory> getRegistrations() {

+		if (registrations == null) {

+			super.getRegistrations();

+			registrations.put(XML_EXTENSION, new ElementCreationMenuModelResourceFactoryImpl());

+			registrations.put(STAR_EXTENSION, new ElementCreationMenuModelResourceFactoryImpl());

+		}

+		return registrations;

+	}

+

+} //ElementCreationMenuModelXMLProcessor

diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/plugin.xml b/plugins/infra/org.eclipse.papyrus.infra.onefile/plugin.xml
index f8857bdf597..85297aee69e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/plugin.xml
+++ b/plugins/infra/org.eclipse.papyrus.infra.onefile/plugin.xml
@@ -12,6 +12,12 @@
          <adapter

                type="org.eclipse.ui.ide.IContributorResourceAdapter2">

          </adapter>

+         <adapter

+               type="org.eclipse.core.resources.IFile">

+         </adapter>

+         <adapter

+               type="org.eclipse.core.resources.IResource">

+         </adapter>

       </factory>

       <factory

             adaptableType="org.eclipse.papyrus.infra.onefile.model.ISubResourceFile"

diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/adapters/ModelAdapterFactory.java b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/adapters/ModelAdapterFactory.java
index da1a6bb6d2c..61de0bd0700 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/adapters/ModelAdapterFactory.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/model/adapters/ModelAdapterFactory.java
@@ -14,6 +14,8 @@ package org.eclipse.papyrus.infra.onefile.model.adapters;
 import java.util.Arrays;

 import java.util.Collection;

 

+import org.eclipse.core.resources.IFile;

+import org.eclipse.core.resources.IResource;

 import org.eclipse.core.resources.mapping.ResourceMapping;

 import org.eclipse.core.runtime.IAdapterFactory;

 import org.eclipse.papyrus.infra.onefile.model.IPapyrusFile;

@@ -42,6 +44,9 @@ public class ModelAdapterFactory implements IAdapterFactory {
 				return new PapyrusResourceMapping((IPapyrusFile)adaptableObject);

 			}

 		}

+		if(adapterType == IFile.class || adapterType == IResource.class) {

+			return ((IPapyrusFile)adaptableObject).getMainFile();

+		}

 		if(IContributorResourceAdapter.class.equals(adapterType)) {

 			return new PapyrusModelContributorResourceAdapter();

 		}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF
index e30edd30a7d..b340145fdce 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF
+++ b/plugins/infra/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF
@@ -11,6 +11,8 @@ Require-Bundle: org.eclipse.ui,
 Export-Package: org.eclipse.papyrus.infra.tools.comparator,

  org.eclipse.papyrus.infra.tools.converter,

  org.eclipse.papyrus.infra.tools.databinding,

+ org.eclipse.papyrus.infra.tools.preferences,

+ org.eclipse.papyrus.infra.tools.preferences.ui.dialog,

  org.eclipse.papyrus.infra.tools.util

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/MultipleObservableList.java b/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/MultipleObservableList.java
index c44970aca08..ddf8af2e3a8 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/MultipleObservableList.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/databinding/MultipleObservableList.java
@@ -17,9 +17,6 @@ import java.util.List;
 

 import org.eclipse.core.databinding.observable.list.IObservableList;

 import org.eclipse.core.databinding.observable.list.ObservableList;

-import org.eclipse.papyrus.infra.widgets.databinding.AggregatedObservable;

-import org.eclipse.papyrus.infra.widgets.editors.AbstractEditor;

-import org.eclipse.papyrus.infra.widgets.editors.ICommitListener;

 

 //TODO : Implement the getters

 //The list may be either the union or the intersection of all sublists

diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/messages/Messages.java b/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/messages/Messages.java
index 77a155d1a10..79e543913ce 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/messages/Messages.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/messages/Messages.java
@@ -19,6 +19,14 @@ public class Messages extends NLS {
 

 	private static final String BUNDLE_NAME = "org.eclipse.papyrus.infra.tools.messages.messages"; //$NON-NLS-1$

 

+	public static String AbstractPreferenceKeyDialog_Level;

+

+	public static String AbstractPreferenceKeyDialog_Localization;

+

+	public static String AbstractPreferenceKeyDialog_Pref_Kind;

+

+	public static String AbstractPreferenceKeyDialog_WouldYouLikeOverloadPreferences;

+

 	public static String AbstractStringValueConverter_NoXReprensentedByYHaveBeenFound;

 

 	public static String AbstractStringValueConverter_SomeStringsAreNotValidToCreateY;

diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/messages/messages.properties b/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/messages/messages.properties
index dea12a89919..aae5ef667df 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/messages/messages.properties
+++ b/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/messages/messages.properties
@@ -1,3 +1,7 @@
+AbstractPreferenceKeyDialog_Level=Level

+AbstractPreferenceKeyDialog_Localization=Localization

+AbstractPreferenceKeyDialog_Pref_Kind=Pref. kind 

+AbstractPreferenceKeyDialog_WouldYouLikeOverloadPreferences=Would you like to overload those preferences?

 AbstractStringValueConverter_NoXReprensentedByYHaveBeenFound=No {0} represented by {1} have been found

 AbstractStringValueConverter_SomeStringsAreNotValidToCreateY=Some Strings are not valid to create {0}

 AbstractStringValueConverter_SomeStringsCantBeResolvedToFindY=Some Strings can't be resolved to find {0}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/preferences/AbstractPapyrusPreferenceStore.java b/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/preferences/AbstractPapyrusPreferenceStore.java
new file mode 100644
index 00000000000..8abda344be2
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/preferences/AbstractPapyrusPreferenceStore.java
@@ -0,0 +1,293 @@
+/*****************************************************************************

+ * 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:

+ *		

+ *		 Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.tools.preferences;

+

+import java.util.ArrayList;

+import java.util.Iterator;

+import java.util.List;

+

+import org.eclipse.core.runtime.Platform;

+import org.eclipse.core.runtime.preferences.IScopeContext;

+import org.eclipse.papyrus.infra.tools.Activator;

+import org.eclipse.papyrus.infra.tools.preferences.ui.dialog.AbstractApplyValueOnPreferenceKeyDialog;

+

+public abstract class AbstractPapyrusPreferenceStore extends PapyrusScopedPreferenceStore {

+

+	/**

+	 * key for element level

+	 */

+	private final String elementLevelPrefix;

+

+	/**

+	 * key for editor level

+	 */

+	private final String instanceEditorLevelPrefix;

+

+	/**

+	 * key for all editor of the same kind

+	 */

+	private final String editorLevelPrefix;

+

+	/**

+	 * constructor

+	 * 

+	 * @param context

+	 *        the scope to store to

+	 * @param qualifier

+	 *        the qualifier used to look up the preference node

+	 * @param key

+	 *        for all editor of the same kind (all diagrams, all tables, ...)

+	 * @param key

+	 *        for an instance of this editor

+	 * @param key

+	 *        for an element

+	 */

+	public AbstractPapyrusPreferenceStore(IScopeContext context, String qualifier, String editorLevelPrefix, String instanceEditorLevelPrefix, String elementLevelPrefix) {

+		super(context, qualifier);

+		this.editorLevelPrefix = editorLevelPrefix;

+		this.instanceEditorLevelPrefix = instanceEditorLevelPrefix;

+		this.elementLevelPrefix = elementLevelPrefix;

+	}

+

+	/**

+	 * constructor

+	 * 

+	 * @param context

+	 *        the scope to store to

+	 * @param qualifier

+	 *        the qualifier used to look up the preference node

+	 * @param defaultQualifierPath

+	 *        the qualifier used when looking up the defaults

+	 * @param key

+	 *        for all editor of the same kind (all diagrams, all tables, ...)

+	 * @param key

+	 *        for an instance of this editor

+	 * @param key

+	 *        for an element

+	 */

+	public AbstractPapyrusPreferenceStore(IScopeContext context, String qualifier, String defaultQualifierPath, String editorLevelPrefix, String instanceEditorLevelPrefix, String elementLevelPrefix) {

+		super(context, qualifier, defaultQualifierPath);

+		this.editorLevelPrefix = editorLevelPrefix;

+		this.instanceEditorLevelPrefix = instanceEditorLevelPrefix;

+		this.elementLevelPrefix = elementLevelPrefix;

+	}

+

+

+

+

+	/**

+	 * this method is used to overload all value under a level of preferences.

+	 * In order to overload a pop-up is opened, and the user can choose value to overload

+	 * 

+	 * @param level

+	 *        of preference: Editor or diagram

+	 */

+

+	public void deleteAllSubPreference(String level) {

+		//remove all sub value diagram+ element

+

+		//key to collect

+		List<String> elementKey = new ArrayList<String>();

+		try {

+			for(int i = 0; i < getStorePreferences().keys().length; i++) {

+				//level diagram collect only element

+				if(level.startsWith(instanceEditorLevelPrefix)) {

+					if(getStorePreferences().keys()[i].startsWith(elementLevelPrefix)) {

+						elementKey.add(getStorePreferences().keys()[i]);

+					}

+				}

+				//editor level, collect all element+diagram

+				else if(level.startsWith(editorLevelPrefix)) {

+					if((getStorePreferences().keys()[i].startsWith(elementLevelPrefix)) || (getStorePreferences().keys()[i].startsWith(instanceEditorLevelPrefix))) {

+						elementKey.add(getStorePreferences().keys()[i]);

+					}

+				}

+

+			}

+

+		} catch (Exception e) {

+			Activator.log.error(e);

+		}

+		if(elementKey.size() > 0) {

+			List<String> keytoRemove = new ArrayList<String>();

+			String[] keyRoconsult = new String[elementKey.size()];

+			AbstractApplyValueOnPreferenceKeyDialog dialog = createPreferenceKeyDialog(elementKey.toArray(keyRoconsult));

+			dialog.open();

+			keytoRemove = dialog.getKeyToRemove();

+

+			//remove key

+			Iterator<String> iterator = keytoRemove.iterator();

+			while(iterator.hasNext()) {

+				String key = (String)iterator.next();

+				getStorePreferences().remove(key);

+			}

+		}

+	}

+

+	/**

+	 * 

+	 * @param keys

+	 * @return

+	 *         the dialog to apply values

+	 */

+	protected abstract AbstractApplyValueOnPreferenceKeyDialog createPreferenceKeyDialog(String[] keys);

+

+

+

+	// each get value will be overloaded

+	//if not value is found for an element, a value is look for in DIAGRAM

+	// if a the value is not find for Diagram a value is find for Papyrus editor

+

+

+	/**

+	 * this method is used to find a key that a got a value:

+	 * if the key is an element. The method look for if this key exist. If no value exists, it look for the key for diagram

+	 * if the key for diagram do not exist it look for key for papyrus Editor

+	 * the structure of Key is:

+	 * element : ELEMENT_DiagramKind_ElementKind.preferenceKind

+	 * Diagram : DIAGRAM_DiagramKind.preferenceKind

+	 * Editor: PAPYRUS_EDITOR.preferenceKind

+	 * 

+	 */

+	protected String findKeyWithAValue(String initialKey) {

+		String foundedKey = null;

+		//first look for in value stack

+		foundedKey = findKeyAStoreValue(initialKey);

+		//then look for in default stack

+		if(foundedKey == null) {

+			foundedKey = findKeyWithADefaultValue(initialKey);

+		}

+		if(foundedKey == null) {

+			foundedKey = initialKey;

+		}

+		return foundedKey;

+

+	}

+

+	/**

+	 * look for a key with a value in the store stack

+	 * 

+	 * @param initialKey

+	 *        element : ELEMENT_DiagramKind_ElementKind.preferenceKind

+	 *        Diagram : DIAGRAM_DiagramKind.preferenceKind

+	 *        Editor: PAPYRUS_EDITOR.preferenceKind

+	 * @return the key that returns a value or null if there is no value

+	 */

+	protected String findKeyAStoreValue(String initialKey) {

+		String foundedKey = null;

+		if(getStorePreferences().get(initialKey, null) != null) {

+			foundedKey = initialKey;

+		}

+

+		if(foundedKey == null && hasPrefix(initialKey)) {

+			foundedKey = findKeyAStoreValue(getUpperKey(initialKey));

+		}

+		return foundedKey;

+	}

+

+	/**

+	 * this method is used to find a key that a got a value:

+	 * if the key is an element. The method look for if this key exist. If no value exists, it look for the key for diagram

+	 * if the key for diagram do not exist it look for key for papyrus Editor

+	 * the structure of Key is:

+	 * element : ELEMENT_DiagramKind_ElementKind.preferenceKind

+	 * Diagram : DIAGRAM_DiagramKind.preferenceKind

+	 * Editor: PAPYRUS_EDITOR.preferenceKind

+	 * 

+	 */

+	protected String findKeyWithADefaultValue(String initialKey) {

+		String foundedKey = null;

+

+		if(getDefaultPreferences().get(initialKey, null) != null) {

+			foundedKey = initialKey;

+		}

+

+		if(foundedKey == null && hasPrefix(initialKey)) {

+			return findKeyWithADefaultValue(getUpperKey(initialKey));

+		} else {

+			foundedKey = initialKey;

+		}

+		return foundedKey;

+

+	}

+

+	/**

+	 * get the upper Key from the initial Key

+	 * * the structure of Key is:

+	 * element : ELEMENT_DiagramKind_ElementKind.preferenceKind

+	 * Diagram : DIAGRAM_DiagramKind.preferenceKind

+	 * Editor: PAPYRUS_EDITOR.preferenceKind

+	 * 

+	 * @param initialKey

+	 * @return the upperKey

+	 * 

+	 */

+	protected String getUpperKey(String initialKey) {

+

+		String out = initialKey.toString();

+		if(initialKey.startsWith(elementLevelPrefix)) {

+			out = initialKey.toString().replaceAll(elementLevelPrefix, instanceEditorLevelPrefix);

+			out = out.substring(0, out.lastIndexOf("_")) + out.substring(out.indexOf("."), out.length());

+		}

+		if(initialKey.startsWith(instanceEditorLevelPrefix)) {

+			//	out=initialKey.toString().replaceAll(instanceEditorLevelPrefix, editorLevelPrefix);

+			out = editorLevelPrefix + out.substring(out.indexOf("."), out.length());

+		}

+		return out;

+	}

+

+	protected boolean hasPrefix(String key) {

+		if(key.startsWith(elementLevelPrefix) || key.startsWith(instanceEditorLevelPrefix)) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * get the value from a key

+	 * 

+	 * @param key

+	 * @return the value

+	 */

+	protected String internalGet(String key) {

+		String newKey = findKeyWithAValue(key);

+		//System.err.println("-->Initial Key "+key+"--> "+ newKey);

+		return Platform.getPreferencesService().get(newKey, null, getPreferenceNodes(true));

+	}

+

+	public boolean getDefaultBoolean(String name) {

+

+		return super.getDefaultBoolean(findKeyWithADefaultValue(name));

+	}

+

+	public double getDefaultDouble(String name) {

+		return super.getDefaultDouble(findKeyWithADefaultValue(name));

+	}

+

+	public float getDefaultFloat(String name) {

+		return super.getDefaultFloat(findKeyWithADefaultValue(name));

+	};

+

+	public int getDefaultInt(String name) {

+		return super.getDefaultInt(findKeyWithADefaultValue(name));

+	}

+

+	public long getDefaultLong(String name) {

+		return super.getDefaultLong(findKeyWithADefaultValue(name));

+	}

+

+	public String getDefaultString(String name) {

+		return super.getDefaultString(findKeyWithADefaultValue(name));

+	}

+}

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/PapyrusScopedPreferenceStore.java b/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/preferences/PapyrusScopedPreferenceStore.java
index f64d6a84c30..59a3595cfc2 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/infra/gmfdiag/preferences/PapyrusScopedPreferenceStore.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/preferences/PapyrusScopedPreferenceStore.java
@@ -11,7 +11,7 @@
  *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.infra.gmfdiag.preferences;

+package org.eclipse.papyrus.infra.tools.preferences;

 

 /***************************************************************************

  Copyright (c) 2010 CEA LIST.

@@ -235,13 +235,13 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe
 		if(obj instanceof String) {

 			return defaults.get(key, STRING_DEFAULT_DEFAULT);

 		} else if(obj instanceof Integer) {

-			return new Integer(defaults.getInt(key, INT_DEFAULT_DEFAULT));

+			return Integer.valueOf(defaults.getInt(key, INT_DEFAULT_DEFAULT));

 		} else if(obj instanceof Double) {

 			return new Double(defaults.getDouble(key, DOUBLE_DEFAULT_DEFAULT));

 		} else if(obj instanceof Float) {

 			return new Float(defaults.getFloat(key, FLOAT_DEFAULT_DEFAULT));

 		} else if(obj instanceof Long) {

-			return new Long(defaults.getLong(key, LONG_DEFAULT_DEFAULT));

+			return Long.valueOf(defaults.getLong(key, LONG_DEFAULT_DEFAULT));

 		} else if(obj instanceof Boolean) {

 			return defaults.getBoolean(key, BOOLEAN_DEFAULT_DEFAULT) ? Boolean.TRUE : Boolean.FALSE;

 		} else {

@@ -664,7 +664,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe
 			// removing a non-existing preference is a no-op so call the Core

 			// API directly

 			getStorePreferences().remove(name);

-			if(oldValue != defaultValue) {

+			if(!oldValue.equals(defaultValue)) {

 				dirty = true;

 				firePropertyChangeEvent(name, oldValue, defaultValue);

 			}

@@ -744,7 +744,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe
 				getStorePreferences().putInt(name, value);

 			}

 			dirty = true;

-			firePropertyChangeEvent(name, new Integer(oldValue), new Integer(value));

+			firePropertyChangeEvent(name, Integer.valueOf(oldValue), Integer.valueOf(value));

 		} finally {

 			silentRunning = false;// Restart listening to preferences

 		}

@@ -769,7 +769,7 @@ public class PapyrusScopedPreferenceStore extends EventManager implements IPrefe
 				getStorePreferences().putLong(name, value);

 			}

 			dirty = true;

-			firePropertyChangeEvent(name, new Long(oldValue), new Long(value));

+			firePropertyChangeEvent(name, Long.valueOf(oldValue), Long.valueOf(value));

 		} finally {

 			silentRunning = false;// Restart listening to preferences

 		}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/preferences/ui/dialog/AbstractApplyValueOnPreferenceKeyDialog.java b/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/preferences/ui/dialog/AbstractApplyValueOnPreferenceKeyDialog.java
new file mode 100644
index 00000000000..ea08721e158
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/preferences/ui/dialog/AbstractApplyValueOnPreferenceKeyDialog.java
@@ -0,0 +1,71 @@
+/*****************************************************************************

+ * Copyright (c) 2010 CEA LIST.

+ *

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.tools.preferences.ui.dialog;

+

+import java.util.ArrayList;

+

+/**

+ * The Class ApplyValueOnPreferenceKeyDialog display all the preference key and give all selected keys

+ */

+public abstract class AbstractApplyValueOnPreferenceKeyDialog extends AbstractPreferenceKeyDialog {

+

+	/** The checked key. */

+	protected ArrayList<String> checkedKey;

+

+	/**

+	 * Instantiates a new apply value on preference key dialog.

+	 * 

+	 * @param keys

+	 *        the keys

+	 */

+	public AbstractApplyValueOnPreferenceKeyDialog(String[] keys) {

+		super(keys);

+		checkedKey = new ArrayList<String>();

+	}

+

+	/**

+	 * Gets the key to remove.

+	 * 

+	 * @return the key to remove

+	 */

+	public ArrayList<String> getKeyToRemove() {

+		return checkedKey;

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.jface.dialogs.Dialog#okPressed()

+	 */

+	@Override

+	protected void okPressed() {

+		for(int i = 0; i < keyTable.getItems().length; i++) {

+			if(keyTable.getItems()[i].getChecked()) {

+				checkedKey.add((String)keyTable.getItems()[i].getData());

+			}

+		}

+		super.okPressed();

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.jface.dialogs.Dialog#cancelPressed()

+	 */

+	@Override

+	protected void cancelPressed() {

+		super.cancelPressed();

+		checkedKey = new ArrayList<String>();

+	}

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/preferences/ui/dialog/AbstractPreferenceKeyDialog.java b/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/preferences/ui/dialog/AbstractPreferenceKeyDialog.java
new file mode 100644
index 00000000000..127e87a3f15
--- /dev/null
+++ b/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/preferences/ui/dialog/AbstractPreferenceKeyDialog.java
@@ -0,0 +1,105 @@
+/*****************************************************************************

+ * Copyright (c) 2010 CEA LIST.

+ *

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.infra.tools.preferences.ui.dialog;

+

+import java.util.Arrays;

+

+import org.eclipse.core.runtime.IStatus;

+import org.eclipse.core.runtime.Status;

+import org.eclipse.jface.viewers.IBaseLabelProvider;

+import org.eclipse.jface.viewers.IContentProvider;

+import org.eclipse.jface.viewers.TableViewer;

+import org.eclipse.papyrus.infra.tools.Activator;

+import org.eclipse.papyrus.infra.tools.messages.Messages;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.swt.widgets.Control;

+import org.eclipse.swt.widgets.Shell;

+import org.eclipse.swt.widgets.Table;

+import org.eclipse.swt.widgets.TableColumn;

+

+/**

+ * The Class AbstractPreferenceKeyDialog display all preference key that are given in parameters

+ */

+public abstract class AbstractPreferenceKeyDialog extends org.eclipse.jface.dialogs.StatusDialog {

+

+	/** The key table. */

+	protected Table keyTable;

+

+	/** The table viewer. */

+	protected TableViewer tableViewer;

+

+	/** The keys. */

+	protected String[] keys;

+

+	/**

+	 * Instantiates a new abstract preference key dialog.

+	 * 

+	 * @param keys

+	 *        the array of preference jy to display

+	 */

+	public AbstractPreferenceKeyDialog(String[] keys) {

+		super(new Shell());

+		this.keys = Arrays.copyOf(keys, keys.length);

+		setStatusLineAboveButtons(true);

+		updateStatus(new Status(IStatus.INFO, Activator.PLUGIN_ID, Messages.AbstractPreferenceKeyDialog_WouldYouLikeOverloadPreferences));

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)

+	 */

+	@Override

+	protected Control createDialogArea(Composite parent) {

+		Composite composite = (Composite)super.createDialogArea(parent);

+		keyTable = new Table(composite, SWT.CHECK | SWT.BORDER);

+		tableViewer = new TableViewer(keyTable);

+		tableViewer.setLabelProvider(createLabelProvider());

+		tableViewer.setContentProvider(createContentProvider());

+

+		TableColumn column = new TableColumn(keyTable, SWT.NONE);

+		column.setWidth(150);

+		column.setText(Messages.AbstractPreferenceKeyDialog_Pref_Kind);

+

+		column = new TableColumn(keyTable, SWT.NONE);

+		column.setWidth(90);

+		column.setText(Messages.AbstractPreferenceKeyDialog_Level);

+

+		column = new TableColumn(keyTable, SWT.NONE);

+		column.setWidth(200);

+		column.setText(Messages.AbstractPreferenceKeyDialog_Localization);

+		tableViewer.setInput(keys);

+		keyTable.setHeaderVisible(true);

+

+

+		return composite;

+

+	}

+

+	/**

+	 * 

+	 * @return

+	 *         the label provider for the table viewer

+	 */

+	protected abstract IBaseLabelProvider createLabelProvider();

+

+	/**

+	 * 

+	 * @return

+	 *         the content provider for the table viewer

+	 */

+	protected abstract IContentProvider createContentProvider();

+

+}

diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/ClassLoaderHelper.java b/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/ClassLoaderHelper.java
index da6ae044f7d..650e6851631 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/ClassLoaderHelper.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/ClassLoaderHelper.java
@@ -11,6 +11,9 @@
  *****************************************************************************/

 package org.eclipse.papyrus.infra.tools.util;

 

+import java.util.HashMap;

+import java.util.Map;

+

 import org.eclipse.papyrus.infra.tools.Activator;

 

 /**

@@ -29,6 +32,12 @@ import org.eclipse.papyrus.infra.tools.Activator;
 public class ClassLoaderHelper {

 

 	/**

+	 * Usually, there are few classes with many different accesses. Using a cache, we can improve

+	 * the performances between 10 and 20 times, with really few memory consumption

+	 */

+	private static final Map<String, Class<?>> classes = new HashMap<String, Class<?>>();

+

+	/**

 	 * Loads the class matching the given className. Exceptions are caught and sent

 	 * to the Logger.

 	 * 

@@ -39,8 +48,12 @@ public class ClassLoaderHelper {
 	 */

 	public static Class<?> loadClass(String className) {

 		try {

-			Class<?> clazz = Activator.getDefault().getBundle().loadClass(className);

-			return clazz;

+			Class<?> result = classes.get(className);

+			if(result == null) {

+				result = Activator.getDefault().getBundle().loadClass(className);

+				classes.put(className, result);

+			}

+			return result;

 		} catch (ClassNotFoundException ex) {

 			Activator.log.error(String.format("The class %s doesn't exist", className), ex); //$NON-NLS-1$ 

 		} catch (NullPointerException ex) {

diff --git a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/EclipseCommandUtils.java b/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/EclipseCommandUtils.java
index 28eed32b17c..89358f2a396 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/EclipseCommandUtils.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.tools/src/org/eclipse/papyrus/infra/tools/util/EclipseCommandUtils.java
@@ -19,6 +19,7 @@ import java.util.TreeSet;
 

 import org.eclipse.core.commands.Category;

 import org.eclipse.core.commands.Command;

+import org.eclipse.core.commands.State;

 import org.eclipse.core.commands.common.NotDefinedException;

 import org.eclipse.jface.resource.ImageDescriptor;

 import org.eclipse.papyrus.infra.tools.Activator;

@@ -39,6 +40,11 @@ public class EclipseCommandUtils {
 		//to prevent instanciation

 	}

 

+	public static final String TOGGLE_STATE = "org.eclipse.ui.commands.toggleState"; //$NON-NLS-1$

+

+	public static final String RADIO_STATE = "org.eclipse.ui.commands.radioState"; //$NON-NLS-1$

+

+

 	/**

 	 * 

 	 * @param categoryId

@@ -78,4 +84,38 @@ public class EclipseCommandUtils {
 		final ImageDescriptor imageDescriptor = service.getImageDescriptor(command.getId());

 		return imageDescriptor;

 	}

+

+	/**

+	 * 

+	 * @param command

+	 *        an eclipse command

+	 * @param newValue

+	 *        the new boolean value to set to the state of this command

+	 */

+	//TODO : the nattable integration must use me

+	public static final void updateToggleCommandState(final org.eclipse.core.commands.Command command, final boolean newValue) {

+		if(command != null) {

+			final State state = command.getState(TOGGLE_STATE);

+			if(state != null) {

+				state.setValue(newValue);

+			}

+		}

+	}

+

+	/**

+	 * 

+	 * @param command

+	 *        an eclipse command

+	 * @param newValue

+	 *        the new value to set to the state of this command

+	 */

+	//TODO : the nattable integration must use me

+	public static final void updateRadioCommandState(final org.eclipse.core.commands.Command command, final Object newValue) {

+		if(command != null) {

+			final State state = command.getState(RADIO_STATE);

+			if(state != null) {

+				state.setValue(newValue);

+			}

+		}

+	}

 }

diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF
index ec12cbd9715..62afa8475fc 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Require-Bundle: org.eclipse.emf.edit.ui,
  org.eclipse.papyrus.infra.core;bundle-version="1.0.0",

  org.eclipse.core.expressions;bundle-version="3.4.400",

  org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0",

- com.google.guava;bundle-version="10.0.1",

+ com.google.guava;bundle-version="11.0.0",

  org.eclipse.equinox.registry,

  org.eclipse.emf.workspace,

  org.eclipse.gmf.runtime.common.core,

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/model/SysML.BlockDefinition.idgen b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/model/SysML.BlockDefinition.idgen
index a1f9e94377b..128b77ac755 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/model/SysML.BlockDefinition.idgen
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/model/SysML.BlockDefinition.idgen
@@ -3,6 +3,7 @@
   <diagramEditPart name="Diagram edit part">

     <behaviors javaClassQualifiedName="org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy" key="DuplicatePasteEditPolicy.PASTE_ROLE"/>

     <behaviors javaClassQualifiedName="org.eclipse.papyrus.sysml.diagram.blockdefinition.edit.policy.CustomDiagramDragDropEditPolicy" key="EditPolicyRoles.DRAG_DROP_ROLE"/>

+    <behaviors name="" javaClassQualifiedName="org.eclipse.papyrus.sysml.diagram.blockdefinition.edit.policy.ShowHideRelatedLinkEditPolicy" key="ShowHideRelatedLinkEditPolicy"/>

   </diagramEditPart>

   <inheritedDiagrams name="ClassDiagram" viewProviderClassQualifiedName="" editPartProviderClassQualifiedName="" dndEditPolicyClassQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy">

     <genInheritedEditor href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#PapyrusUMLClassDiagram"/>

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/part/BlockDefinitionDiagramEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/part/BlockDefinitionDiagramEditPart.java
index 65e48d25068..2ac420eba31 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/part/BlockDefinitionDiagramEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/part/BlockDefinitionDiagramEditPart.java
@@ -18,11 +18,12 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.gmf.diagram.common.edit.policy.DefaultContainerNodeEditPolicy;
-import org.eclipse.papyrus.gmf.diagram.common.edit.policy.DefaultCreationEditPolicy;
 import org.eclipse.papyrus.gmf.diagram.common.edit.policy.DefaultXYLayoutEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.AbstractShowHideRelatedLinkEditPolicy;
 import org.eclipse.papyrus.sysml.diagram.blockdefinition.edit.policy.CustomDiagramDragDropEditPolicy;
 import org.eclipse.papyrus.sysml.diagram.blockdefinition.edit.policy.DiagramSemanticEditPolicy;
 import org.eclipse.papyrus.sysml.diagram.blockdefinition.edit.policy.PackageCreationEditPolicy;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.edit.policy.ShowHideRelatedLinkEditPolicy;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;
 
 public class BlockDefinitionDiagramEditPart extends DiagramEditPart {
@@ -39,6 +40,6 @@ public class BlockDefinitionDiagramEditPart extends DiagramEditPart {
 		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());
 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new DefaultXYLayoutEditPolicy());
-
+		installEditPolicy(AbstractShowHideRelatedLinkEditPolicy.SHOW_HIDE_RELATED_LINK_ROLE, new ShowHideRelatedLinkEditPolicy(this));
 	}
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ActorPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ActorPreferencePage.java
index 0cadef971bc..a7db23f1ac2 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ActorPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ActorPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
 import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
 
@@ -60,19 +60,19 @@ public class ActorPreferencePage extends BlockDefinitionDiagramNodePreferencePag
 	/** Default preferences initializer */
 	public static void initDefaults(IPreferenceStore store) {
 		// Start of user code custom default initializations
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 100);
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 60);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 100);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 60);
 		// End of user code
 
 		// Initialize default visibility for compartments in preference page.
 		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
+			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(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			String showCompartmentTitleKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);
+			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/AssociationPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/AssociationPreferencePage.java
index 15be26b2fdc..0a3dcbbbbb3 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/AssociationPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/AssociationPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
 import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
 
@@ -59,7 +59,7 @@ public class AssociationPreferencePage extends BlockDefinitionDiagramLinkPrefere
 
 		// Initialize default visibility for labels in preference page.
 		for(String labelName : labelDefaultVisibilityMap.keySet()) {
-			String showLabelKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, labelName, PreferenceConstantHelper.LABEL_VISIBILITY);
+			String showLabelKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, labelName, PreferencesConstantsHelper.LABEL_VISIBILITY);
 			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/BlockDefinitionDiagramGeneralPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/BlockDefinitionDiagramGeneralPreferencePage.java
index 871bdd8ca3d..2a5d3a84639 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/BlockDefinitionDiagramGeneralPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/BlockDefinitionDiagramGeneralPreferencePage.java
@@ -15,10 +15,12 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences;
 
 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.DiagramPreferencePage;
 import org.eclipse.papyrus.sysml.diagram.blockdefinition.Activator;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
 
 public class BlockDefinitionDiagramGeneralPreferencePage extends DiagramPreferencePage {
 
 	public BlockDefinitionDiagramGeneralPreferencePage() {
 		setPreferenceStore(Activator.getInstance().getPreferenceStore());
+		setPreferenceKey(ElementTypes.DIAGRAM_ID);
 	}
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/BlockPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/BlockPreferencePage.java
index 5015cce7a76..df6bf1babd1 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/BlockPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/BlockPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
 import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
 
@@ -72,19 +72,19 @@ public class BlockPreferencePage extends BlockDefinitionDiagramNodePreferencePag
 	/** Default preferences initializer */
 	public static void initDefaults(IPreferenceStore store) {
 		// Start of user code custom default initializations
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 100);
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 150);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 100);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 150);
 		// End of user code
 
 		// Initialize default visibility for compartments in preference page.
 		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
+			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(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			String showCompartmentTitleKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);
+			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ConstraintBlockPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ConstraintBlockPreferencePage.java
index e82bb9c9d3b..6fef8a064bd 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ConstraintBlockPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ConstraintBlockPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
 import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
 
@@ -64,13 +64,13 @@ public class ConstraintBlockPreferencePage extends BlockDefinitionDiagramNodePre
 
 		// Initialize default visibility for compartments in preference page.
 		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
+			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(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			String showCompartmentTitleKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);
+			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/DataTypePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/DataTypePreferencePage.java
index b1b1c231f2d..53b24f96de9 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/DataTypePreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/DataTypePreferencePage.java
@@ -18,7 +18,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
 import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
 
@@ -64,13 +64,13 @@ public class DataTypePreferencePage extends BlockDefinitionDiagramNodePreference
 
 		// Initialize default visibility for compartments in preference page.
 		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
+			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(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			String showCompartmentTitleKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);
+			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/DependencyPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/DependencyPreferencePage.java
index 9c3a2ea3e2b..c592c2ebcd3 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/DependencyPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/DependencyPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
 import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
 
@@ -55,7 +55,7 @@ public class DependencyPreferencePage extends BlockDefinitionDiagramLinkPreferen
 
 		// Initialize default visibility for labels in preference page.
 		for(String labelName : labelDefaultVisibilityMap.keySet()) {
-			String showLabelKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, labelName, PreferenceConstantHelper.LABEL_VISIBILITY);
+			String showLabelKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, labelName, PreferencesConstantsHelper.LABEL_VISIBILITY);
 			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/DimensionPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/DimensionPreferencePage.java
index ddbe6993a99..31c646f6eb1 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/DimensionPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/DimensionPreferencePage.java
@@ -14,7 +14,7 @@
 package org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
 import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
 
@@ -33,8 +33,8 @@ public class DimensionPreferencePage extends BlockDefinitionDiagramNodePreferenc
 	/** Default preferences initializer */
 	public static void initDefaults(IPreferenceStore store) {
 		// Start of user code custom default initializations
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 100);
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 60);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 100);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 60);
 		// End of user code
 
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/EnumerationPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/EnumerationPreferencePage.java
index ea2df390779..77904019255 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/EnumerationPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/EnumerationPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
 import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
 
@@ -62,13 +62,13 @@ public class EnumerationPreferencePage extends BlockDefinitionDiagramNodePrefere
 
 		// Initialize default visibility for compartments in preference page.
 		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
+			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(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			String showCompartmentTitleKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);
+			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/FlowSpecificationPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/FlowSpecificationPreferencePage.java
index b77363f7e30..b3a91452eb1 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/FlowSpecificationPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/FlowSpecificationPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
 import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
 
@@ -62,13 +62,13 @@ public class FlowSpecificationPreferencePage extends BlockDefinitionDiagramNodeP
 
 		// Initialize default visibility for compartments in preference page.
 		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
+			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(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			String showCompartmentTitleKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);
+			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/GeneralizationPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/GeneralizationPreferencePage.java
index e177a5882d7..4fb026e73a7 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/GeneralizationPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/GeneralizationPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
 import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
 
@@ -54,7 +54,7 @@ public class GeneralizationPreferencePage extends BlockDefinitionDiagramLinkPref
 
 		// Initialize default visibility for labels in preference page.
 		for(String labelName : labelDefaultVisibilityMap.keySet()) {
-			String showLabelKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, labelName, PreferenceConstantHelper.LABEL_VISIBILITY);
+			String showLabelKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, labelName, PreferencesConstantsHelper.LABEL_VISIBILITY);
 			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/InstanceSpecificationPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/InstanceSpecificationPreferencePage.java
index 438f1cbd2f6..b9680b35a97 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/InstanceSpecificationPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/InstanceSpecificationPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
 
 public class InstanceSpecificationPreferencePage extends BlockDefinitionDiagramNodePreferencePage {
@@ -64,17 +64,17 @@ public class InstanceSpecificationPreferencePage extends BlockDefinitionDiagramN
 		// Start of user code custom default initializations
 		// End of user code
 
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 100);
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 100);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 100);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100);
 		// Initialize default visibility for compartments in preference page.
 		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
+			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(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			String showCompartmentTitleKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);
+			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/InterfacePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/InterfacePreferencePage.java
index 9a3a27c8043..4e9c28b0ca3 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/InterfacePreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/InterfacePreferencePage.java
@@ -18,7 +18,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
 import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
 
@@ -64,13 +64,13 @@ public class InterfacePreferencePage extends BlockDefinitionDiagramNodePreferenc
 
 		// Initialize default visibility for compartments in preference page.
 		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
+			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(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			String showCompartmentTitleKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);
+			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/InterfaceRealizationPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/InterfaceRealizationPreferencePage.java
index 440323e39df..fd544641d0e 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/InterfaceRealizationPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/InterfaceRealizationPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
 import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
 
@@ -55,7 +55,7 @@ public class InterfaceRealizationPreferencePage extends BlockDefinitionDiagramLi
 
 		// Initialize default visibility for labels in preference page.
 		for(String labelName : labelDefaultVisibilityMap.keySet()) {
-			String showLabelKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, labelName, PreferenceConstantHelper.LABEL_VISIBILITY);
+			String showLabelKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, labelName, PreferencesConstantsHelper.LABEL_VISIBILITY);
 			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ModelPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ModelPreferencePage.java
index 18b6bbbef89..e15be09d2e1 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ModelPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ModelPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
 
 public class ModelPreferencePage extends BlockDefinitionDiagramNodePreferencePage {
@@ -64,17 +64,17 @@ public class ModelPreferencePage extends BlockDefinitionDiagramNodePreferencePag
 		// Start of user code custom default initializations
 		// End of user code
 
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 200);
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 100);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 200);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100);
 		// Initialize default visibility for compartments in preference page.
 		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
+			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(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			String showCompartmentTitleKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);
+			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PackagePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PackagePreferencePage.java
index 704eb5e30b4..59322e80ba5 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PackagePreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PackagePreferencePage.java
@@ -18,7 +18,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
 
 public class PackagePreferencePage extends BlockDefinitionDiagramNodePreferencePage {
@@ -64,17 +64,17 @@ public class PackagePreferencePage extends BlockDefinitionDiagramNodePreferenceP
 		// Start of user code custom default initializations
 		// End of user code
 
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 200);
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 100);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 200);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100);
 		// Initialize default visibility for compartments in preference page.
 		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
+			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(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			String showCompartmentTitleKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);
+			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PropertyPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PropertyPreferencePage.java
index 036a96d4a59..1dda34dd2fb 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PropertyPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PropertyPreferencePage.java
@@ -54,13 +54,13 @@ public class PropertyPreferencePage extends BlockDefinitionDiagramNodePreference
 	public static void initDefaults(IPreferenceStore store) {
 		// Start of user code custom default initializations
 
-		//		PreferenceConverter.setDefault(store, PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
-		//		PreferenceConverter.setDefault(store, PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(177, 207, 229));
+		//		PreferenceConverter.setDefault(store, PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
+		//		PreferenceConverter.setDefault(store, PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(177, 207, 229));
 
 		// Set the default for the gradient
-		//		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.GRADIENT_POLICY), false);
+		//		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.GRADIENT_POLICY), false);
 		//		GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(new org.eclipse.swt.graphics.RGB(255, 255, 255), new org.eclipse.swt.graphics.RGB(177, 207, 229), 0, 0);
-		//		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());
+		//		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());
 
 		// custom code
 		store.setDefault(LabelPreferenceHelper.getPreferenceConstant(prefKey, ILabelPreferenceConstants.LABEL_DISPLAY_PREFERENCE), DISP_NAME | DISP_TYPE | DISP_MULTIPLICITY | DISP_UNDEFINED_TYPE);
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/SignalPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/SignalPreferencePage.java
index c58ab432c17..62b50121670 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/SignalPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/SignalPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
 import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
 
@@ -60,19 +60,19 @@ public class SignalPreferencePage extends BlockDefinitionDiagramNodePreferencePa
 	/** Default preferences initializer */
 	public static void initDefaults(IPreferenceStore store) {
 		// Start of user code custom default initializations
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 100);
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 60);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 100);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 60);
 		// End of user code
 
 		// Initialize default visibility for compartments in preference page.
 		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
+			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(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			String showCompartmentTitleKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);
+			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/UnitPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/UnitPreferencePage.java
index 45535b1ebe8..f9c29ae6d3e 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/UnitPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/UnitPreferencePage.java
@@ -17,7 +17,7 @@ import static org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPrefere
 import static org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants.DISP_NAME;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
 import org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants;
 import org.eclipse.papyrus.sysml.diagram.common.preferences.LabelPreferenceHelper;
@@ -47,8 +47,8 @@ public class UnitPreferencePage extends BlockDefinitionDiagramNodePreferencePage
 	/** Default preferences initializer */
 	public static void initDefaults(IPreferenceStore store) {
 		// Start of user code custom default initializations
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 100);
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 60);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 100);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 60);
 
 		store.setDefault(LabelPreferenceHelper.getPreferenceConstant(prefLabelKey, ILabelPreferenceConstants.LABEL_DISPLAY_PREFERENCE), DISP_NAME | DISP_DIMENSION);
 		// End of user code
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/UsagePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/UsagePreferencePage.java
index b3d3cb5d995..8234a8e7259 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/UsagePreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/UsagePreferencePage.java
@@ -18,7 +18,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
 import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
 
@@ -55,7 +55,7 @@ public class UsagePreferencePage extends BlockDefinitionDiagramLinkPreferencePag
 
 		// Initialize default visibility for labels in preference page.
 		for(String labelName : labelDefaultVisibilityMap.keySet()) {
-			String showLabelKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, labelName, PreferenceConstantHelper.LABEL_VISIBILITY);
+			String showLabelKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, labelName, PreferencesConstantsHelper.LABEL_VISIBILITY);
 			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ValueTypePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ValueTypePreferencePage.java
index cbc93b36e44..ce7a0463130 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ValueTypePreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/ValueTypePreferencePage.java
@@ -18,7 +18,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
 import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
 
@@ -64,13 +64,13 @@ public class ValueTypePreferencePage extends BlockDefinitionDiagramNodePreferenc
 
 		// Initialize default visibility for compartments in preference page.
 		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
+			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(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			String showCompartmentTitleKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);
+			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/ShowHideRelatedLinkEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/ShowHideRelatedLinkEditPolicy.java
new file mode 100644
index 00000000000..c0ed490f10b
--- /dev/null
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/edit/policy/ShowHideRelatedLinkEditPolicy.java
@@ -0,0 +1,291 @@
+/*****************************************************************************

+ * 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:

+ *		

+ *		CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.sysml.diagram.blockdefinition.edit.policy;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;

+import org.eclipse.gmf.tooling.runtime.structure.DiagramStructure;

+import org.eclipse.gmf.tooling.runtime.update.DiagramUpdater;

+import org.eclipse.papyrus.sysml.diagram.blockdefinition.part.SysMLDiagramUpdater;

+import org.eclipse.papyrus.sysml.diagram.blockdefinition.part.SysMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractUMLShowHideRelatedLinkEditPolicy;

+

+/**

+ * 

+ * The edit policy to use in the IBD diagram to restore existing links

+ * 

+ */

+public class ShowHideRelatedLinkEditPolicy extends AbstractUMLShowHideRelatedLinkEditPolicy {

+

+	/**

+	 * 

+	 * Constructor.

+	 * 

+	 * @param host

+	 */

+	public ShowHideRelatedLinkEditPolicy(DiagramEditPart host) {

+		super(host);

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IDiagramInformationProviderEditPolicy#getDiagramUpdater()

+	 * 

+	 * @return

+	 */

+	public DiagramUpdater getDiagramUpdater() {

+		return SysMLDiagramUpdater.TYPED_INSTANCE;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IDiagramInformationProviderEditPolicy#getDiagramStructure()

+	 * 

+	 * @return

+	 */

+	public DiagramStructure getDiagramStructure() {

+		return SysMLVisualIDRegistry.TYPED_INSTANCE;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.AbstractShowHideRelatedLinkEditPolicy#getSemanticHint(org.eclipse.emf.ecore.EObject)

+	 * 

+	 * @param eobject

+	 * @return

+	 */

+	@Override

+	protected String getSemanticHint(final EObject eobject) {

+		return SysMLVisualIDRegistry.getLinkWithClassVisualID(eobject);

+	}

+

+	//	/**

+	//	 * 

+	//	 * @see org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.AbstractShowHideRelatedLinkEditPolicy#cleanAdd(java.util.Collection,

+	//	 *      org.eclipse.gmf.runtime.notation.View, java.util.List, java.util.Map)

+	//	 * 

+	//	 * @param result

+	//	 * @param view

+	//	 * @param descriptors

+	//	 * @param domain2NotationMap

+	//	 */

+	//	@Override

+	//	protected void cleanAdd(final Collection<UpdaterLinkDescriptor> result, final View view, final List<?> descriptors, final Map<EObject, View> domain2NotationMap) {

+	//		cleanAddForConnector(result, view, descriptors, domain2NotationMap);

+	//		super.cleanAdd(result, view, descriptors, domain2NotationMap);

+	//	}

+	//

+	//	/**

+	//	 * This method manages descriptors representing Connector to verify that it

+	//	 * can be displayed according to the nestedPath of the {@link ConnectorEnd} If the connector can be displayed :

+	//	 * <ul>

+	//	 * <li>

+	//	 * the link descriptor is removed from descriptors and added to result</li>

+	//	 * <li>

+	//	 * the view associated to the role of the connector are added to domain2NotationMap (using the ConnectorEnd as key)</li>

+	//	 * </ul>

+	//	 * 

+	//	 * 

+	//	 * 

+	//	 * @param result

+	//	 *        the result of the method

+	//	 * @param view

+	//	 *        a view

+	//	 * @param descriptors

+	//	 *        the link descriptors

+	//	 * @param domain2NotationMap

+	//	 *        the map between model element and views

+	//	 * 

+	//	 * 

+	//	 */

+	//	protected void cleanAddForConnector(final Collection<UpdaterLinkDescriptor> result, final View view, final List<?> descriptors, final Map<EObject, View> domain2NotationMap) {

+	//		final List<UpdaterLinkDescriptor> toRemove = new ArrayList<UpdaterLinkDescriptor>();

+	//		for(final Object current : descriptors) {

+	//			if(current instanceof UpdaterLinkDescriptor) {

+	//				final UpdaterLinkDescriptor descriptor = (UpdaterLinkDescriptor)current;

+	//				final EObject element = descriptor.getModelElement();

+	//				if(element instanceof Connector) {

+	//					if(canBeDisplayed((Connector)element, view, domain2NotationMap)) {

+	//						result.add((UpdaterLinkDescriptor)current);

+	//					}

+	//					toRemove.add((UpdaterLinkDescriptor)current);

+	//				}

+	//			}

+	//		}

+	//		descriptors.removeAll(toRemove);

+	//	}

+

+	//	/**

+	//	 * 

+	//	 * @param end

+	//	 *        a connector end

+	//	 * @param view

+	//	 *        a view

+	//	 * @return <code>true</code> if the view represents the role of the

+	//	 *         connector AND if the view is encapsulated as required by the

+	//	 *         nested path of the connector end

+	//	 */

+	//	protected boolean isCorrectGraphicalView(final ConnectorEnd end, final View view) {

+	//		final NestedConnectorEnd nestedConnectorEnd = org.eclipse.uml2.uml.util.UMLUtil.getStereotypeApplication(end, NestedConnectorEnd.class);

+	//		final Property partWithPort = end.getPartWithPort();

+	//		// final ConnectableElement role = end.getRole();

+	//		// 1. we get the top view of this view with the same semantic element

+	//		View localView = getTopViewWithSameSemanticElement(view);

+	//

+	//		// 2. we verify the part with port

+	//		if(partWithPort != null) {

+	//			View parent = getTopViewWithSameSemanticElement(ViewUtil.getViewContainer(localView));

+	//			if(parent.getElement() != partWithPort) {

+	//				return false;

+	//			}

+	//		}

+	//

+	//		// 3. we verify the nested path

+	//		if(nestedConnectorEnd != null && nestedConnectorEnd.getPropertyPath().size() > 0) {

+	//			View parent = view;

+	//			final List<Property> paths = nestedConnectorEnd.getPropertyPath();

+	//			for(int i = paths.size() - 1; i >= 0; i--) {

+	//				final Property currentProperty = paths.get(i);

+	//				parent = getTopViewWithSameSemanticElement(ViewUtil.getViewContainer(parent));

+	//				if(parent.getElement() != currentProperty) {

+	//					return false;

+	//				}

+	//			}

+	//		}

+	//		return true;

+	//	}

+

+	//	/**

+	//	 * 

+	//	 * @param connector

+	//	 *        a connector

+	//	 * @param selectedView

+	//	 *        a view used as source or target for the connector to display

+	//	 * @param domain2NotationMap

+	//	 *        the map to complete if we found source and target View on the

+	//	 *        diagram to diplsay the connector

+	//	 * @return <code>true</code> if the view can be used as source/target for

+	//	 *         the connector according to the nested path AND if we found a

+	//	 *         second view for the 2nd connector end according to the nested

+	//	 *         path

+	//	 */

+	//	protected boolean canBeDisplayed(final Connector connector, final View selectedView, final Map<EObject, View> domain2NotationMap) {

+	//		// we need to verify the selected view

+	//		final EObject semanticElement = selectedView.getElement();

+	//		ConnectorEnd endForView = null;

+	//

+	//		// 1. look for the connector end represented by the selected view

+	//		for(final ConnectorEnd current : connector.getEnds()) {

+	//			if(current.getRole() == semanticElement) {

+	//				endForView = current;

+	//				break;

+	//			}

+	//		}

+	//		Assert.isNotNull(endForView);

+	//		// 2. verify the view of the selected connector end

+	//		if(!isCorrectGraphicalView(endForView, selectedView)) {

+	//			return false;

+	//		}

+	//

+	//		// 3. try to find a view for the second connector end

+	//		View secondView = null;

+	//		for(final ConnectorEnd end : connector.getEnds()) {

+	//			final ConnectableElement role = end.getRole();

+	//			if(role==null){

+	//				return false;

+	//			}

+	//			if(end == endForView) {

+	//				continue;

+	//			}

+	//

+	//			final Set<View> views = CrossReferencerUtil.getCrossReferencingViewsInDiagram(role, getCurrentDiagram());

+	//			final Iterator<View> iterOnView = views.iterator();

+	//			while(secondView == null && iterOnView.hasNext()) {

+	//				final View currentView = iterOnView.next();

+	//				if(isCorrectGraphicalView(end, currentView)) {

+	//					domain2NotationMap.put(endForView, selectedView);

+	//					domain2NotationMap.put(end, currentView);

+	//					secondView = currentView;

+	//				}

+	//			}

+	//		}

+	//		return secondView != null;

+	//	}

+

+	//	/**

+	//	 * 

+	//	 * @param domain

+	//	 *        the editing domain to use for this command

+	//	 * @param linkToShow

+	//	 *        a link to show

+	//	 * @param domain2NotationMap

+	//	 * @param linkDescriptors

+	//	 * @return the command to display the link on the diagram

+	//	 */

+	//	protected ICommand getShowLinkCommand(final TransactionalEditingDomain domain, final EObject linkToShow, final Map<EObject, View> domain2NotationMap, final Collection<? extends UpdaterLinkDescriptor> linkDescriptors) {

+	//		if(!(linkToShow instanceof Connector)) {

+	//			return super.getShowLinkCommand(domain, linkToShow, domain2NotationMap, linkDescriptors);

+	//		}

+	//		mapModel((View)getHost().getAdapter(View.class), domain2NotationMap);

+	//		final View view = domain2NotationMap.get(linkToShow);

+	//		if(view != null) {

+	//			return new SetPropertyCommand(domain, "Restore related linksCommand show view", new EObjectAdapter(view), Properties.ID_ISVISIBLE, Boolean.TRUE);//$NON-NLS-1$

+	//		} else {// we need to recreate the view

+	//

+	//			// we look for the link descriptor

+	//			UpdaterLinkDescriptor descriptor = getLinkDescriptor(linkToShow, linkDescriptors);

+	//

+	//			if(descriptor != null) {

+	//				// we override the way to find the source and the target edit

+	//				// part

+	//				EditPart sourceEditPart = getEditPart(((Connector)linkToShow).getEnds().get(0), domain2NotationMap);

+	//				EditPart targetEditPart = getEditPart(((Connector)linkToShow).getEnds().get(1), domain2NotationMap);

+	//

+	//				// If the parts are still null...

+	//				if(sourceEditPart == null || targetEditPart == null) {

+	//					return null;

+	//				}

+	//				String semanticHint = getSemanticHint(linkToShow);

+	//				CreateConnectionViewRequest.ConnectionViewDescriptor viewDescriptor = new CreateConnectionViewRequest.ConnectionViewDescriptor(descriptor.getSemanticAdapter(), semanticHint, ViewUtil.APPEND, false, ((GraphicalEditPart)getHost()).getDiagramPreferencesHint());

+	//				CreateConnectionViewRequest ccr = new CreateConnectionViewRequest(viewDescriptor);

+	//				ccr.setType(RequestConstants.REQ_CONNECTION_START);

+	//				ccr.setSourceEditPart(sourceEditPart);

+	//				sourceEditPart.getCommand(ccr);

+	//				ccr.setTargetEditPart(targetEditPart);

+	//				ccr.setType(RequestConstants.REQ_CONNECTION_END);

+	//				return new CommandProxy(targetEditPart.getCommand(ccr));

+	//			}

+	//		}

+	//		return null;

+	//	}

+

+	//	/**

+	//	 * 

+	//	 * @param view

+	//	 *        a view

+	//	 * @return the last parent of this view referencing the same semantic

+	//	 *         element

+	//	 */

+	//	protected View getTopViewWithSameSemanticElement(final View view) {

+	//		final EObject semanticElement = view.getElement();

+	//		View parent = view;

+	//		View lastParent = view;

+	//		while(parent.getElement() == semanticElement) {

+	//			lastParent = parent;

+	//			parent = (View)parent.eContainer();

+	//		}

+	//		return lastParent;

+	//	}

+

+}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/part/SysMLDiagramUpdater.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/part/SysMLDiagramUpdater.java
new file mode 100644
index 00000000000..790d93bc142
--- /dev/null
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/part/SysMLDiagramUpdater.java
@@ -0,0 +1,1270 @@
+/*****************************************************************************

+ * 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:

+ *		

+ *		CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.sysml.diagram.blockdefinition.part;

+

+import java.util.Collection;

+import java.util.Collections;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Map;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+import org.eclipse.emf.ecore.EStructuralFeature.Setting;

+import org.eclipse.emf.ecore.util.EcoreUtil;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.update.DiagramUpdater;

+import org.eclipse.gmf.tooling.runtime.update.UpdaterLinkDescriptor;

+import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;

+import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InstanceSpecificationEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPartCN;

+import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.SlotEditPart;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLLinkDescriptor;

+import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;

+import org.eclipse.uml2.uml.Actor;

+import org.eclipse.uml2.uml.Association;

+import org.eclipse.uml2.uml.BehavioredClassifier;

+import org.eclipse.uml2.uml.Class;

+import org.eclipse.uml2.uml.Classifier;

+import org.eclipse.uml2.uml.Comment;

+import org.eclipse.uml2.uml.Constraint;

+import org.eclipse.uml2.uml.DataType;

+import org.eclipse.uml2.uml.Dependency;

+import org.eclipse.uml2.uml.Element;

+import org.eclipse.uml2.uml.Enumeration;

+import org.eclipse.uml2.uml.EnumerationLiteral;

+import org.eclipse.uml2.uml.Generalization;

+import org.eclipse.uml2.uml.InstanceSpecification;

+import org.eclipse.uml2.uml.Interface;

+import org.eclipse.uml2.uml.InterfaceRealization;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.Operation;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.PackageableElement;

+import org.eclipse.uml2.uml.PrimitiveType;

+import org.eclipse.uml2.uml.Property;

+import org.eclipse.uml2.uml.Reception;

+import org.eclipse.uml2.uml.Signal;

+import org.eclipse.uml2.uml.Slot;

+import org.eclipse.uml2.uml.Type;

+import org.eclipse.uml2.uml.UMLPackage;

+import org.eclipse.uml2.uml.Usage;

+

+

+/**

+ * 

+ * @author vl222926

+ *         Adapted code from generated code for UML Diagram

+ *         The name of the methods are not java compliant, but it is done to be consistent with the generated classes which use the id of the elements

+ */

+public class SysMLDiagramUpdater {

+

+	/**

+	 * @generated

+	 */

+	public static final DiagramUpdater TYPED_INSTANCE = new DiagramUpdater() {

+

+		/**

+		 * 

+		 * @see org.eclipse.gmf.tooling.runtime.update.DiagramUpdater#getSemanticChildren(org.eclipse.gmf.runtime.notation.View)

+		 * 

+		 * @param view

+		 * @return

+		 */

+		public List<UpdaterLinkDescriptor> getSemanticChildren(View view) {

+			return SysMLDiagramUpdater.getSemanticChildren(view);

+		}

+

+		/**

+		 * 

+		 * @see org.eclipse.gmf.tooling.runtime.update.DiagramUpdater#getContainedLinks(org.eclipse.gmf.runtime.notation.View)

+		 * 

+		 * @param view

+		 * @return

+		 */

+		public List<UpdaterLinkDescriptor> getContainedLinks(View view) {

+			return SysMLDiagramUpdater.getContainedLinks(view);

+		}

+

+		/**

+		 * 

+		 * @see org.eclipse.gmf.tooling.runtime.update.DiagramUpdater#getIncomingLinks(org.eclipse.gmf.runtime.notation.View)

+		 * 

+		 * @param view

+		 * @return

+		 */

+		public List<UpdaterLinkDescriptor> getIncomingLinks(View view) {

+			return SysMLDiagramUpdater.getIncomingLinks(view);

+		}

+

+		/**

+		 * 

+		 * @see org.eclipse.gmf.tooling.runtime.update.DiagramUpdater#getOutgoingLinks(org.eclipse.gmf.runtime.notation.View)

+		 * 

+		 * @param view

+		 * @return

+		 */

+		public List<UpdaterLinkDescriptor> getOutgoingLinks(View view) {

+			return SysMLDiagramUpdater.getOutgoingLinks(view);

+		}

+	};

+

+	public static List<UpdaterLinkDescriptor> getContainedLinks(final View view) {

+		throw new UnsupportedOperationException("Not yet implemented"); //$NON-NLS-1$

+	}

+

+	public static List<UpdaterLinkDescriptor> getSemanticChildren(final View view) {

+		throw new UnsupportedOperationException("Not yet implemented"); //$NON-NLS-1$

+	}

+

+	/**

+	 * 

+	 * @param view

+	 *        a view

+	 * @return

+	 *         the list of the incoming links for this view

+	 */

+	public static List<UpdaterLinkDescriptor> getIncomingLinks(final View view) {

+		final String id = view.getType();

+		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID)) {

+			return getBlock_shape_sysml_block_as_classifier_IncomingLink(view);

+		}

+		if(id.equals(SysMLGraphicalTypes.LINK_SYSML_ASSOCIATION_ID)) {

+			return getAssociation_link_sysml_association_IncomingLink(view);

+		}

+		if(id.equals(Integer.toString(PackageEditPart.VISUAL_ID)) || id.equals(Integer.toString(PackageEditPartCN.VISUAL_ID))) {

+			return getPackage_2007IncomingLinks(view);

+		}

+		if(id.equals(UMLGraphicalTypes.SHAPE_UML_ACTOR_AS_CLASSIFIER_ID)) {

+			return getActor_shape_uml_actor_as_classifier_IncomingLinks(view);

+		}

+		if(id.equals(UMLGraphicalTypes.SHAPE_UML_SIGNAL_AS_CLASSIFIER_ID)) {

+			return getSignal_shape_uml_signal_as_classifier_IncomingLinks(view);

+		}

+		if(id.equals(UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_LABEL_ID)) {

+			return getProperty_shape_uml_property_as_label_IncomingLinks(view);

+		}

+		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_PART_AS_LABEL_ID)) {

+			return getPart_shape_sysml_part_as_label_IncomingLinks(view);

+		}

+		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_REFERENCE_AS_LABEL_ID)) {

+			return getReference_shape_sysml_reference_as_label_IncomingLinks(view);

+		}

+		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_VALUE_AS_LABEL_ID)) {

+			return getValue_shape_sysml_value_as_label_IncomingLinks(view);

+		}

+		if(id.equals(UMLGraphicalTypes.SHAPE_UML_OPERATION_AS_LABEL_ID)) {

+			return getOperation_shape_uml_operation_as_label_IncomingLinks(view);

+		}

+		if(id.equals(UMLGraphicalTypes.SHAPE_UML_RECEPTION_AS_LABEL_ID)) {

+			return getReception_shape_uml_reception_as_label_IncomingLinks(view);

+		}

+		if(id.equals(Integer.toString(InstanceSpecificationEditPart.VISUAL_ID)) || id.equals(Integer.toString(InstanceSpecificationEditPartCN.VISUAL_ID))) {

+			return getInstanceSpecification_2001IncomingLinks(view);

+		}

+		if(id.equals(Integer.toString(SlotEditPart.VISUAL_ID))) {

+			return getSlot_2001IncomingLinks(view);

+		}

+		if(id.equals(UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID)) {

+			return getDependency_link_uml_dependency_IncomingLinks(view);

+		}

+		if(id.equals(UMLGraphicalTypes.LINK_UML_GENERALIZATION_ID)) {

+			return getGeneralization_link_uml_generalization_IncomingLinks(view);

+		}

+		if(id.equals(UMLGraphicalTypes.SHAPE_UML_PORT_AS_LABEL_ID)) {

+			return getPort_shape_uml_port_as_label_IncomingLinks(view);

+		}

+		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_LABEL_ID)) {

+			return getFlowPort_shape_sysml_flowport_as_label_IncomingLinks(view);

+		}

+		if(id.equals(UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID)) {

+			return getPort_shape_uml_port_as_affixed_IncomingLinks(view);

+		}

+		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID)) {

+			return getFlowPort_shape_sysml_flowport_as_affixed_IncomingLinks(view);

+		}

+		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_FLOWSPECIFICATION_AS_CLASSIFIER_ID)) {

+			return getFlowSpecification_shape_sysml_flowspecification_as_classifier_IncomingLinks(view);

+		}

+		if(id.equals(UMLGraphicalTypes.SHAPE_UML_INTERFACE_AS_CLASSIFIER_ID)) {

+			return getInterface_shape_uml_interface_as_classifier_IncomingLinks(view);

+		}

+		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPROPERTY_AS_LABEL_ID)) {

+			return getFlowProperty_shape_sysml_flowproperty_as_label_IncomingLinks(view);

+		}

+		if(id.equals(UMLGraphicalTypes.LINK_UML_INTERFACEREALIZATION_ID)) {

+			return getInterfaceRealization_link_uml_interfacerealization_IncomingLinks(view);

+		}

+		if(id.equals(UMLGraphicalTypes.LINK_UML_USAGE_ID)) {

+			return getUsage_link_uml_usage_IncomingLinks(view);

+		}

+		if(id.equals(UMLGraphicalTypes.SHAPE_UML_DATATYPE_AS_CLASSIFIER_ID)) {

+			return getDataType_shape_uml_data_type_as_classifier_IncomingLinks(view);

+		}

+		if(id.equals(UMLGraphicalTypes.SHAPE_UML_ENUMERATION_AS_CLASSIFIER_ID)) {

+			return getEnumeration_shape_uml_enumeration_as_classifier_IncomingLinks(view);

+		}

+		if(id.equals(UMLGraphicalTypes.SHAPE_UML_ENUMERATIONLITERAL_AS_LABEL_ID)) {

+			return getEnumerationLiteral_shape_uml_enumerationliteral_as_classifier_IncomingLinks(view);

+		}

+		if(id.equals(UMLGraphicalTypes.SHAPE_UML_PRIMITIVETYPE_AS_CLASSIFIER_ID)) {

+			return getPrimitiveType_shape_uml_primitivetype_as_classifier_IncomingLinks(view);

+		}

+		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_DIMENSION_AS_CLASSIFIER_ID)) {

+			return getDimension_shape_sysml_dimension_as_classifier_IncomingLinks(view);

+		}

+		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_UNIT_AS_CLASSIFIER_ID)) {

+			return getUnit_shape_sysml_unit_as_classifier_IncomingLinks(view);

+		}

+		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_VALUETYPE_AS_CLASSIFIER_ID)) {

+			return getValueType_shape_sysml_valuetype_as_classifier_IncommingLinks(view);

+		}

+		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCK_AS_CLASSIFIER_ID)) {

+			return getConstraintBlock_shape_sysml_constraintblock_as_classifier_IncomingLinks(view);

+		}

+		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTPROPERTY_AS_LABEL_ID)) {

+			return getConstraintProperty_shape_sysml_constraintproperty_as_label_IncomingLinks(view);

+		}

+		if(id.equals(Integer.toString(CommentEditPart.VISUAL_ID)) || id.equals(CommentEditPartCN.VISUAL_ID)) {

+			return getComment_IncominkLinks(view);

+		}

+		if(id.equals(Integer.toString(ConstraintEditPart.VISUAL_ID)) || id.equals(ConstraintEditPartCN.VISUAL_ID)) {

+			return getConstraint_IncomingLinks(view);

+		}

+

+		return Collections.emptyList();

+	}

+

+

+

+

+

+	/**

+	 * 

+	 * @param view

+	 *        a view

+	 * @return

+	 *         the list of the outgoing links for this view

+	 */

+	public static List<UpdaterLinkDescriptor> getOutgoingLinks(final View view) {

+		final String id = view.getType();

+		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_BLOCK_AS_CLASSIFIER_ID)) {

+			return getBlock_shape_sysml_block_as_classifier_OutgoingLink(view);

+		}

+		if(id.equals(SysMLGraphicalTypes.LINK_SYSML_ASSOCIATION_ID)) {

+			return getAssociation_link_sysml_association_OutgoingLink(view);

+		}

+		if(id.equals(Integer.toString(PackageEditPart.VISUAL_ID)) || id.equals(Integer.toString(PackageEditPartCN.VISUAL_ID))) {

+			return getPackage_2007OutgoingLinks(view);

+		}

+		if(id.equals(UMLGraphicalTypes.SHAPE_UML_ACTOR_AS_CLASSIFIER_ID)) {

+			return getActor_shape_uml_actor_as_classifier_OutgoingLinks(view);

+		}

+		if(id.equals(UMLGraphicalTypes.SHAPE_UML_SIGNAL_AS_CLASSIFIER_ID)) {

+			return getSignal_shape_uml_signal_as_classifier_OutgoingLinks(view);

+		}

+		if(id.equals(UMLGraphicalTypes.SHAPE_UML_PROPERTY_AS_LABEL_ID)) {

+			return getProperty_shape_uml_property_as_label_OutgoingLinks(view);

+		}

+		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_PART_AS_LABEL_ID)) {

+			return getPart_shape_sysml_part_as_label_OutgoingLinks(view);

+		}

+		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_REFERENCE_AS_LABEL_ID)) {

+			return getReference_shape_sysml_reference_as_label_OutgoingLinks(view);

+		}

+		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_VALUE_AS_LABEL_ID)) {

+			return getValue_shape_sysml_value_as_label_OutgoingLinks(view);

+		}

+		if(id.equals(UMLGraphicalTypes.SHAPE_UML_OPERATION_AS_LABEL_ID)) {

+			return getOperation_shape_uml_operation_as_label_OutgoingLinks(view);

+		}

+		if(id.equals(UMLGraphicalTypes.SHAPE_UML_RECEPTION_AS_LABEL_ID)) {

+			return getReception_shape_uml_reception_as_label_OutgoingLinks(view);

+		}

+		if(id.equals(Integer.toString(InstanceSpecificationEditPart.VISUAL_ID)) || id.equals(Integer.toString(InstanceSpecificationEditPartCN.VISUAL_ID))) {

+			return getInstanceSpecification_2001OutgoingLinks(view);

+		}

+		if(id.equals(Integer.toString(SlotEditPart.VISUAL_ID))) {

+			return getSlot_2001OutgoingLinks(view);

+		}

+		if(id.equals(UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID)) {

+			return getDependency_link_uml_dependency_OutgoingLinks(view);

+		}

+		if(id.equals(UMLGraphicalTypes.LINK_UML_GENERALIZATION_ID)) {

+			return getGeneralization_link_uml_generalization_OutgoingLinks(view);

+		}

+		if(id.equals(UMLGraphicalTypes.SHAPE_UML_PORT_AS_LABEL_ID)) {

+			return getPort_shape_uml_port_as_label_OutgoingLinks(view);

+		}

+		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_LABEL_ID)) {

+			return getFlowPort_shape_sysml_flowport_as_label_OutgoingLinks(view);

+		}

+		if(id.equals(UMLGraphicalTypes.SHAPE_UML_PORT_AS_AFFIXED_ID)) {

+			return getPort_shape_uml_port_as_affixed_OutgoingLinks(view);

+		}

+		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPORT_AS_AFFIXED_ID)) {

+			return getFlowPort_shape_sysml_flowport_as_affixed_OutgoingLinks(view);

+		}

+		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_FLOWSPECIFICATION_AS_CLASSIFIER_ID)) {

+			return getFlowSpecification_shape_sysml_flowspecification_as_classifier_OutgoingLinks(view);

+		}

+		if(id.equals(UMLGraphicalTypes.SHAPE_UML_INTERFACE_AS_CLASSIFIER_ID)) {

+			return getInterface_shape_uml_interface_as_classifier_OutgoingLinks(view);

+		}

+		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_FLOWPROPERTY_AS_LABEL_ID)) {

+			return getFlowProperty_shape_sysml_flowproperty_as_label_OutgoingLinks(view);

+		}

+		if(id.equals(UMLGraphicalTypes.LINK_UML_INTERFACEREALIZATION_ID)) {

+			return getInterfaceRealization_link_uml_interfacerealization_OutgoingLinks(view);

+		}

+		if(id.equals(UMLGraphicalTypes.LINK_UML_USAGE_ID)) {

+			return getUsage_link_uml_usage_OutgoingLinks(view);

+		}

+		if(id.equals(UMLGraphicalTypes.SHAPE_UML_DATATYPE_AS_CLASSIFIER_ID)) {

+			return getDataType_shape_uml_data_type_as_classifier_OutgoingLinks(view);

+		}

+		if(id.equals(UMLGraphicalTypes.SHAPE_UML_ENUMERATION_AS_CLASSIFIER_ID)) {

+			return getEnumeration_shape_uml_enumeration_as_classifier_OutgoingLinks(view);

+		}

+		if(id.equals(UMLGraphicalTypes.SHAPE_UML_ENUMERATIONLITERAL_AS_LABEL_ID)) {

+			return getEnumerationLiteral_shape_uml_enumerationliteral_as_classifier_OutgoingLinks(view);

+		}

+		if(id.equals(UMLGraphicalTypes.SHAPE_UML_PRIMITIVETYPE_AS_CLASSIFIER_ID)) {

+			return getPrimitiveType_shape_uml_primitivetype_as_classifier_OutgoingLinks(view);

+		}

+		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_DIMENSION_AS_CLASSIFIER_ID)) {

+			return getDimension_shape_sysml_dimension_as_classifier_OutgoingLinks(view);

+		}

+		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_UNIT_AS_CLASSIFIER_ID)) {

+			return getUnit_shape_sysml_unit_as_classifier_OutgoingLinks(view);

+		}

+		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_VALUETYPE_AS_CLASSIFIER_ID)) {

+			return getValueType_shape_sysml_valuetype_as_classifier_OutgoingLinks(view);

+		}

+		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTBLOCK_AS_CLASSIFIER_ID)) {

+			return getConstraintBlock_shape_sysml_constraintblock_as_classifier_OutgoingLinks(view);

+		}

+		if(id.equals(SysMLGraphicalTypes.SHAPE_SYSML_CONSTRAINTPROPERTY_AS_LABEL_ID)) {

+			return getConstraintProperty_shape_sysml_constraintproperty_as_label_OutgoingLinks(view);

+		}

+		if(id.equals(Integer.toString(CommentEditPart.VISUAL_ID)) || id.equals(CommentEditPartCN.VISUAL_ID)) {

+			return getComment_OutgoingLinks(view);

+		}

+		if(id.equals(Integer.toString(ConstraintEditPart.VISUAL_ID)) || id.equals(ConstraintEditPartCN.VISUAL_ID)) {

+			return getConstraint_OutgoingLinks(view);

+		}

+		return Collections.emptyList();

+	}

+

+	private static List<UpdaterLinkDescriptor> getConstraint_IncomingLinks(View view) {

+		Constraint modelElement = (Constraint)view.getElement();

+		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

+		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferences));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferences));

+		return result;

+	}

+

+	private static List<UpdaterLinkDescriptor> getConstraint_OutgoingLinks(View view) {

+		Constraint modelElement = (Constraint)view.getElement();

+		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));

+		return result;

+	}

+

+	private static List<UpdaterLinkDescriptor> getComment_IncominkLinks(View view) {

+		Comment modelElement = (Comment)view.getElement();

+		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

+		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferences));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferences));

+		return result;

+	}

+

+	private static List<UpdaterLinkDescriptor> getComment_OutgoingLinks(View view) {

+		Comment modelElement = (Comment)view.getElement();

+		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement));

+		return result;

+	}

+

+	private static List<UpdaterLinkDescriptor> getConstraintProperty_shape_sysml_constraintproperty_as_label_IncomingLinks(View view) {

+		return getProperty_IncomingLinks(view);

+	}

+

+	private static List<UpdaterLinkDescriptor> getConstraintProperty_shape_sysml_constraintproperty_as_label_OutgoingLinks(View view) {

+		return getProperty_OutgoingLinks(view);

+	}

+

+	private static List<UpdaterLinkDescriptor> getConstraintBlock_shape_sysml_constraintblock_as_classifier_IncomingLinks(View view) {

+		return getBlock_shape_sysml_block_as_classifier_IncomingLink(view);

+	}

+

+	private static List<UpdaterLinkDescriptor> getConstraintBlock_shape_sysml_constraintblock_as_classifier_OutgoingLinks(View view) {

+		return getBlock_shape_sysml_block_as_classifier_OutgoingLink(view);

+	}

+

+

+

+

+	private static List<UpdaterLinkDescriptor> getValueType_shape_sysml_valuetype_as_classifier_IncommingLinks(View view) {

+		return getDataType_shape_uml_data_type_as_classifier_IncomingLinks(view);

+	}

+

+

+	private static List<UpdaterLinkDescriptor> getValueType_shape_sysml_valuetype_as_classifier_OutgoingLinks(View view) {

+		return getDataType_shape_uml_data_type_as_classifier_OutgoingLinks(view);

+	}

+

+	private static List<UpdaterLinkDescriptor> getDimension_shape_sysml_dimension_as_classifier_OutgoingLinks(View view) {

+		return getInstanceSpecification_2001IncomingLinks(view);

+	}

+

+	private static List<UpdaterLinkDescriptor> getDimension_shape_sysml_dimension_as_classifier_IncomingLinks(View view) {

+		return getInstanceSpecification_2001OutgoingLinks(view);

+	}

+

+	private static List<UpdaterLinkDescriptor> getUnit_shape_sysml_unit_as_classifier_OutgoingLinks(View view) {

+		return getInstanceSpecification_2001IncomingLinks(view);

+	}

+

+	private static List<UpdaterLinkDescriptor> getUnit_shape_sysml_unit_as_classifier_IncomingLinks(View view) {

+		return getInstanceSpecification_2001OutgoingLinks(view);

+	}

+

+	private static List<UpdaterLinkDescriptor> getPrimitiveType_shape_uml_primitivetype_as_classifier_IncomingLinks(View view) {

+		PrimitiveType modelElement = (PrimitiveType)view.getElement();

+		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

+		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferences));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Association_link_sysml_association(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_link_uml_generalization(modelElement, crossReferences));

+		return result;

+	}

+

+	private static List<UpdaterLinkDescriptor> getPrimitiveType_shape_uml_primitivetype_as_classifier_OutgoingLinks(View view) {

+		PrimitiveType modelElement = (PrimitiveType)view.getElement();

+		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_link_uml_generalization(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Association_link_sysml_association(modelElement));

+		return result;

+	}

+

+

+

+	private static List<UpdaterLinkDescriptor> getEnumerationLiteral_shape_uml_enumerationliteral_as_classifier_IncomingLinks(View view) {

+		EnumerationLiteral modelElement = (EnumerationLiteral)view.getElement();

+		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

+		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferences));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferences));

+		return result;

+	}

+

+	private static List<UpdaterLinkDescriptor> getEnumerationLiteral_shape_uml_enumerationliteral_as_classifier_OutgoingLinks(View view) {

+		EnumerationLiteral modelElement = (EnumerationLiteral)view.getElement();

+		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));

+		return result;

+	}

+

+	private static List<UpdaterLinkDescriptor> getEnumeration_shape_uml_enumeration_as_classifier_IncomingLinks(View view) {

+		Enumeration modelElement = (Enumeration)view.getElement();

+		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

+		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferences));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Association_link_sysml_association(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_link_uml_generalization(modelElement, crossReferences));

+		return result;

+	}

+

+	private static List<UpdaterLinkDescriptor> getEnumeration_shape_uml_enumeration_as_classifier_OutgoingLinks(View view) {

+		Enumeration modelElement = (Enumeration)view.getElement();

+		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_link_uml_generalization(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Association_link_sysml_association(modelElement));

+		return result;

+	}

+

+	private static List<UpdaterLinkDescriptor> getDataType_shape_uml_data_type_as_classifier_IncomingLinks(View view) {

+		DataType modelElement = (DataType)view.getElement();

+		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

+		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferences));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Association_link_sysml_association(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_link_uml_generalization(modelElement, crossReferences));

+		return result;

+	}

+

+	private static List<UpdaterLinkDescriptor> getDataType_shape_uml_data_type_as_classifier_OutgoingLinks(View view) {

+		DataType modelElement = (DataType)view.getElement();

+		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_link_uml_generalization(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Association_link_sysml_association(modelElement));

+		return result;

+	}

+

+	private static List<UpdaterLinkDescriptor> getUsage_link_uml_usage_IncomingLinks(View view) {

+		Usage modelElement = (Usage)view.getElement();

+		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

+		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferences));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferences));

+		return result;

+	}

+

+	private static List<UpdaterLinkDescriptor> getUsage_link_uml_usage_OutgoingLinks(View view) {

+		InterfaceRealization modelElement = (InterfaceRealization)view.getElement();

+		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));

+		return result;

+	}

+

+	private static List<UpdaterLinkDescriptor> getInterfaceRealization_link_uml_interfacerealization_IncomingLinks(View view) {

+		InterfaceRealization modelElement = (InterfaceRealization)view.getElement();

+		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

+		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferences));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferences));

+		return result;

+	}

+

+	private static List<UpdaterLinkDescriptor> getInterfaceRealization_link_uml_interfacerealization_OutgoingLinks(View view) {

+		InterfaceRealization modelElement = (InterfaceRealization)view.getElement();

+		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));

+		return result;

+	}

+

+	private static List<UpdaterLinkDescriptor> getFlowProperty_shape_sysml_flowproperty_as_label_IncomingLinks(View view) {

+		return getProperty_IncomingLinks(view);

+	}

+

+	private static List<UpdaterLinkDescriptor> getFlowProperty_shape_sysml_flowproperty_as_label_OutgoingLinks(View view) {

+		return getProperty_OutgoingLinks(view);

+	}

+

+	private static List<UpdaterLinkDescriptor> getInterface_shape_uml_interface_as_classifier_IncomingLinks(View view) {

+		return getInterface_IncomingLinks(view);

+	}

+

+	private static List<UpdaterLinkDescriptor> getInterface_shape_uml_interface_as_classifier_OutgoingLinks(View view) {

+		return getInterface_OutgoingLinks(view);

+	}

+

+	private static List<UpdaterLinkDescriptor> getFlowSpecification_shape_sysml_flowspecification_as_classifier_IncomingLinks(View view) {

+		return getInterface_IncomingLinks(view);

+	}

+

+	private static List<UpdaterLinkDescriptor> getFlowSpecification_shape_sysml_flowspecification_as_classifier_OutgoingLinks(View view) {

+		return getInterface_OutgoingLinks(view);

+	}

+

+	private static List<UpdaterLinkDescriptor> getInterface_IncomingLinks(View view) {

+		Interface modelElement = (Interface)view.getElement();

+		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

+		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferences));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Association_link_sysml_association(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_link_uml_generalization(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4003(modelElement, crossReferences));

+		return result;

+	}

+

+	private static List<UpdaterLinkDescriptor> getInterface_OutgoingLinks(View view) {

+		Interface modelElement = (Interface)view.getElement();

+		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Association_link_sysml_association(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_link_uml_generalization(modelElement));

+		return result;

+	}

+

+	private static List<UpdaterLinkDescriptor> getPort_shape_uml_port_as_affixed_IncomingLinks(View view) {

+		return getProperty_IncomingLinks(view);

+	}

+

+	private static List<UpdaterLinkDescriptor> getPort_shape_uml_port_as_affixed_OutgoingLinks(View view) {

+		return getProperty_OutgoingLinks(view);

+	}

+

+	private static List<UpdaterLinkDescriptor> getFlowPort_shape_sysml_flowport_as_affixed_IncomingLinks(View view) {

+		return getProperty_IncomingLinks(view);

+	}

+

+	private static List<UpdaterLinkDescriptor> getFlowPort_shape_sysml_flowport_as_affixed_OutgoingLinks(View view) {

+		return getProperty_OutgoingLinks(view);

+	}

+

+	private static List<UpdaterLinkDescriptor> getFlowPort_shape_sysml_flowport_as_label_IncomingLinks(View view) {

+		return getProperty_IncomingLinks(view);

+	}

+

+	private static List<UpdaterLinkDescriptor> getFlowPort_shape_sysml_flowport_as_label_OutgoingLinks(View view) {

+		return getProperty_IncomingLinks(view);

+	}

+

+	private static List<UpdaterLinkDescriptor> getPort_shape_uml_port_as_label_IncomingLinks(View view) {

+		return getProperty_OutgoingLinks(view);

+	}

+

+	private static List<UpdaterLinkDescriptor> getPort_shape_uml_port_as_label_OutgoingLinks(View view) {

+		return getProperty_OutgoingLinks(view);

+	}

+

+	private static List<UpdaterLinkDescriptor> getDependency_link_uml_dependency_IncomingLinks(View view) {

+		Dependency modelElement = (Dependency)view.getElement();

+		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

+		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferences));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferences));

+		return result;

+	}

+

+	private static List<UpdaterLinkDescriptor> getDependency_link_uml_dependency_OutgoingLinks(View view) {

+		Dependency modelElement = (Dependency)view.getElement();

+		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));

+		return result;

+	}

+

+	private static List<UpdaterLinkDescriptor> getGeneralization_link_uml_generalization_IncomingLinks(View view) {

+		Generalization modelElement = (Generalization)view.getElement();

+		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

+		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferences));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferences));

+		return result;

+	}

+

+	private static List<UpdaterLinkDescriptor> getGeneralization_link_uml_generalization_OutgoingLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	private static List<UpdaterLinkDescriptor> getSlot_2001IncomingLinks(View view) {

+		Slot modelElement = (Slot)view.getElement();

+		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

+		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferences));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferences));

+		return result;

+	}

+

+	private static List<UpdaterLinkDescriptor> getSlot_2001OutgoingLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	private static List<UpdaterLinkDescriptor> getInstanceSpecification_2001IncomingLinks(View view) {

+		InstanceSpecification modelElement = (InstanceSpecification)view.getElement();

+		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

+		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferences));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferences));

+		return result;

+	}

+

+	private static List<UpdaterLinkDescriptor> getInstanceSpecification_2001OutgoingLinks(View view) {

+		InstanceSpecification modelElement = (InstanceSpecification)view.getElement();

+		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));

+		return result;

+	}

+

+	private static List<UpdaterLinkDescriptor> getReception_shape_uml_reception_as_label_IncomingLinks(View view) {

+		Reception modelElement = (Reception)view.getElement();

+		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

+		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferences));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferences));

+		return result;

+	}

+

+	private static List<UpdaterLinkDescriptor> getReception_shape_uml_reception_as_label_OutgoingLinks(View view) {

+		Reception modelElement = (Reception)view.getElement();

+		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));

+		return result;

+	}

+

+	private static List<UpdaterLinkDescriptor> getOperation_shape_uml_operation_as_label_IncomingLinks(View view) {

+		Operation modelElement = (Operation)view.getElement();

+		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

+		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferences));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferences));

+		return result;

+	}

+

+	private static List<UpdaterLinkDescriptor> getOperation_shape_uml_operation_as_label_OutgoingLinks(View view) {

+		Operation modelElement = (Operation)view.getElement();

+		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));

+		return result;

+	}

+

+

+	private static List<UpdaterLinkDescriptor> getValue_shape_sysml_value_as_label_IncomingLinks(View view) {

+		return getProperty_IncomingLinks(view);

+	}

+

+	private static List<UpdaterLinkDescriptor> getValue_shape_sysml_value_as_label_OutgoingLinks(View view) {

+		return getProperty_OutgoingLinks(view);

+	}

+

+	private static List<UpdaterLinkDescriptor> getReference_shape_sysml_reference_as_label_IncomingLinks(View view) {

+		return getProperty_IncomingLinks(view);

+	}

+

+	private static List<UpdaterLinkDescriptor> getReference_shape_sysml_reference_as_label_OutgoingLinks(View view) {

+		return getProperty_IncomingLinks(view);

+	}

+

+	private static List<UpdaterLinkDescriptor> getPart_shape_sysml_part_as_label_IncomingLinks(View view) {

+		return getProperty_OutgoingLinks(view);

+	}

+

+	private static List<UpdaterLinkDescriptor> getPart_shape_sysml_part_as_label_OutgoingLinks(View view) {

+		return getProperty_OutgoingLinks(view);

+	}

+

+	private static List<UpdaterLinkDescriptor> getProperty_shape_uml_property_as_label_IncomingLinks(View view) {

+		return getProperty_IncomingLinks(view);

+	}

+

+	private static List<UpdaterLinkDescriptor> getProperty_shape_uml_property_as_label_OutgoingLinks(View view) {

+		return getProperty_OutgoingLinks(view);

+	}

+

+	private static Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_InterfaceRealization_4003(Interface target, Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		Collection<EStructuralFeature.Setting> settings = crossReferences.get(target);

+		for(EStructuralFeature.Setting setting : settings) {

+			if(setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getInterfaceRealization_Contract() || false == setting.getEObject() instanceof InterfaceRealization) {

+				continue;

+			}

+			InterfaceRealization link = (InterfaceRealization)setting.getEObject();

+			if(InterfaceRealizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+				continue;

+			}

+			if(false == link.eContainer() instanceof BehavioredClassifier) {

+				continue;

+			}

+			BehavioredClassifier container = (BehavioredClassifier)link.eContainer();

+			result.add(new UMLLinkDescriptor(container, target, link, UMLElementTypes.InterfaceRealization_4003, InterfaceRealizationEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	private static List<UpdaterLinkDescriptor> getProperty_IncomingLinks(View view) {

+		Property modelElement = (Property)view.getElement();

+		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

+		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferences));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferences));

+		return result;

+	}

+

+	private static List<UpdaterLinkDescriptor> getProperty_OutgoingLinks(View view) {

+		Property modelElement = (Property)view.getElement();

+		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));

+		return result;

+	}

+

+

+	private static List<UpdaterLinkDescriptor> getSignal_shape_uml_signal_as_classifier_IncomingLinks(View view) {

+		Signal modelElement = (Signal)view.getElement();

+		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

+		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferences));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_link_uml_generalization(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Association_link_sysml_association(modelElement, crossReferences));

+		return result;

+	}

+

+	private static List<UpdaterLinkDescriptor> getSignal_shape_uml_signal_as_classifier_OutgoingLinks(View view) {

+		Signal modelElement = (Signal)view.getElement();

+		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_link_uml_generalization(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Association_link_sysml_association(modelElement));

+		return result;

+

+	}

+

+	private static List<UpdaterLinkDescriptor> getActor_shape_uml_actor_as_classifier_IncomingLinks(View view) {

+		Actor modelElement = (Actor)view.getElement();

+		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

+		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferences));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_link_uml_generalization(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferences));

+		return result;

+	}

+

+	private static List<UpdaterLinkDescriptor> getActor_shape_uml_actor_as_classifier_OutgoingLinks(View view) {

+		Actor modelElement = (Actor)view.getElement();

+		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_link_uml_generalization(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_InterfaceRealization_link_uml_interfacerealization(modelElement));

+		return result;

+	}

+

+	public static List<UpdaterLinkDescriptor> getPackage_2007IncomingLinks(View view) {

+		Package modelElement = (Package)view.getElement();

+		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

+		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferences));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferences));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferences));

+		return result;

+	}

+

+	public static List<UpdaterLinkDescriptor> getPackage_2007OutgoingLinks(View view) {

+		Package modelElement = (Package)view.getElement();

+		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));

+		return result;

+	}

+

+

+	private static List<UpdaterLinkDescriptor> getBlock_shape_sysml_block_as_classifier_IncomingLink(View view) {

+		final Class modelElement = (Class)view.getElement();

+		final Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

+		final LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		result.addAll(getIncomingTypeModelFacetLinks_Association_link_sysml_association(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_link_uml_generalization(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferences));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferences));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferences));

+		return result;

+	}

+

+	private static List<UpdaterLinkDescriptor> getBlock_shape_sysml_block_as_classifier_OutgoingLink(final View view) {

+		final Class modelElement = (Class)view.getElement();

+		final LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_Association_link_sysml_association(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_link_uml_generalization(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_InterfaceRealization_link_uml_interfacerealization(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));

+		return result;

+	}

+

+	private static List<UpdaterLinkDescriptor> getAssociation_link_sysml_association_IncomingLink(final View view) {

+		final Association modelElement = (Association)view.getElement();

+		final LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		final Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_link_uml_generalization(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Association_link_sysml_association(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_link_uml_usage(modelElement, crossReferences));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(modelElement, crossReferences));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(modelElement, crossReferences));

+		return result;

+	}

+

+	private static List<UpdaterLinkDescriptor> getAssociation_link_sysml_association_OutgoingLink(final View view) {

+		final Association modelElement = (Association)view.getElement();

+		final LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_link_uml_generalization(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Association_link_sysml_association(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(modelElement));

+		return result;

+	}

+

+	private static Collection<UpdaterLinkDescriptor> getIncomingTypeModelFacetLinks_Dependency_link_uml_dependency(NamedElement target, Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences) {

+		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		Collection<EStructuralFeature.Setting> settings = crossReferences.get(target);

+		for(EStructuralFeature.Setting setting : settings) {

+			if(setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Dependency) {

+				continue;

+			}

+			Dependency link = (Dependency)setting.getEObject();

+			if(!UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID.equals(SysMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

+				continue;

+			}

+			List<NamedElement> sources = link.getClients();

+			Object theSource = sources.size() >= 1 ? sources.get(0) : null;

+			if(false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement)theSource;

+			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Dependency_4008, -1));

+		}

+		return result;

+	}

+

+	private static Collection<UpdaterLinkDescriptor> getContainedTypeModelFacetLinks_InterfaceRealization_link_uml_interfacerealization(BehavioredClassifier container) {

+		Collection<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		for(Iterator<InterfaceRealization> links = container.getInterfaceRealizations().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof InterfaceRealization) {

+				continue;

+			}

+			InterfaceRealization link = (InterfaceRealization)linkObject;

+			if(!UMLGraphicalTypes.LINK_UML_INTERFACEREALIZATION_ID.equals(SysMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

+				continue;

+			}

+			Interface dst = link.getContract();

+			result.add(new UpdaterLinkDescriptor(container, dst, link, UMLElementTypes.InterfaceRealization_4003, -1));

+		}

+		return result;

+	}

+

+	private static Collection<UpdaterLinkDescriptor> getIncomingTypeModelFacetLinks_Usage_link_uml_usage(NamedElement target, Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences) {

+		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		Collection<EStructuralFeature.Setting> settings = crossReferences.get(target);

+		for(EStructuralFeature.Setting setting : settings) {

+			if(setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Usage) {

+				continue;

+			}

+			Usage link = (Usage)setting.getEObject();

+			if(!UMLGraphicalTypes.LINK_UML_USAGE_ID.equals(SysMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

+				continue;

+			}

+			List<NamedElement> sources = link.getClients();

+			Object theSource = sources.size() >= 1 ? sources.get(0) : null;

+			if(false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement)theSource;

+			result.add(new UpdaterLinkDescriptor(src, target, link, UMLElementTypes.Usage_4007, -1));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static Collection<UpdaterLinkDescriptor> getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(Comment source) {

+		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		for(Iterator<?> destinations = source.getAnnotatedElements().iterator(); destinations.hasNext();) {

+			Element destination = (Element)destinations.next();

+			result.add(new UpdaterLinkDescriptor(source, destination, UMLElementTypes.CommentAnnotatedElement_4013, CommentAnnotatedElementEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static Collection<UpdaterLinkDescriptor> getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(Constraint source) {

+		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		for(Iterator<?> destinations = source.getConstrainedElements().iterator(); destinations.hasNext();) {

+			Element destination = (Element)destinations.next();

+			result.add(new UpdaterLinkDescriptor(source, destination, UMLElementTypes.ConstraintConstrainedElement_4014, ConstraintConstrainedElementEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static Collection<UpdaterLinkDescriptor> getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4013(Element target, Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences) {

+		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		Collection<EStructuralFeature.Setting> settings = crossReferences.get(target);

+		for(EStructuralFeature.Setting setting : settings) {

+			if(setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getComment_AnnotatedElement()) {

+				result.add(new UpdaterLinkDescriptor(setting.getEObject(), target, UMLElementTypes.CommentAnnotatedElement_4013, CommentAnnotatedElementEditPart.VISUAL_ID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static Collection<UpdaterLinkDescriptor> getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4014(Element target, Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences) {

+		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		Collection<EStructuralFeature.Setting> settings = crossReferences.get(target);

+		for(EStructuralFeature.Setting setting : settings) {

+			if(setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getConstraint_ConstrainedElement()) {

+				result.add(new UpdaterLinkDescriptor(setting.getEObject(), target, UMLElementTypes.ConstraintConstrainedElement_4014, ConstraintConstrainedElementEditPart.VISUAL_ID));

+			}

+		}

+		return result;

+	}

+

+

+	private static Collection<UpdaterLinkDescriptor> getOutgoingTypeModelFacetLinks_Usage_link_uml_usage(NamedElement source) {

+		Package container = null;

+		// Find container element for the link.

+		// Climb up by containment hierarchy starting from the source

+		// and return the first element that is instance of the container class.

+		for(EObject element = source; element != null && container == null; element = element.eContainer()) {

+			if(element instanceof Package) {

+				container = (Package)element;

+			}

+		}

+		if(container == null) {

+			return Collections.emptyList();

+		}

+		Collection<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		for(Iterator<PackageableElement> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof Usage) {

+				continue;

+			}

+			Usage link = (Usage)linkObject;

+			if(!UMLGraphicalTypes.LINK_UML_USAGE_ID.equals(SysMLVisualIDRegistry.getLinkWithClassVisualID(linkObject))) {

+				continue;

+			}

+			List<NamedElement> targets = link.getSuppliers();

+			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

+			if(false == theTarget instanceof NamedElement) {

+				continue;

+			}

+			NamedElement dst = (NamedElement)theTarget;

+			List<NamedElement> sources = link.getClients();

+			Object theSource = sources.size() >= 1 ? sources.get(0) : null;

+			if(false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement)theSource;

+			if(src != source) {

+				continue;

+			}

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Usage_4007, -1));

+		}

+		return result;

+	}

+

+

+

+

+	private static Collection<UpdaterLinkDescriptor> getOutgoingTypeModelFacetLinks_Dependency_link_uml_dependency(NamedElement source) {

+		Package container = null;

+		// Find container element for the link.

+		// Climb up by containment hierarchy starting from the source

+		// and return the first element that is instance of the container class.

+		for(EObject element = source; element != null && container == null; element = element.eContainer()) {

+			if(element instanceof Package) {

+				container = (Package)element;

+			}

+		}

+		if(container == null) {

+			return Collections.emptyList();

+		}

+		Collection<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		for(Iterator<PackageableElement> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof Dependency) {

+				continue;

+			}

+			Dependency link = (Dependency)linkObject;

+			if(!UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID.equals(SysMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

+				continue;

+			}

+			List<NamedElement> targets = link.getSuppliers();

+			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

+			if(false == theTarget instanceof NamedElement) {

+				continue;

+			}

+			NamedElement dst = (NamedElement)theTarget;

+			List<NamedElement> sources = link.getClients();

+			Object theSource = sources.size() >= 1 ? sources.get(0) : null;

+			if(false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement)theSource;

+			if(src != source) {

+				continue;

+			}

+			result.add(new UpdaterLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_4008, -1));

+		}

+		return result;

+	}

+

+	private static Collection<UpdaterLinkDescriptor> getContainedTypeModelFacetLinks_Generalization_link_uml_generalization(Classifier container) {

+		Collection<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		for(Iterator<Generalization> links = container.getGeneralizations().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof Generalization) {

+				continue;

+			}

+			Generalization link = (Generalization)linkObject;

+			if(!UMLGraphicalTypes.LINK_UML_GENERALIZATION_ID.equals(SysMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

+				continue;

+			}

+			Classifier dst = link.getGeneral();

+			result.add(new UpdaterLinkDescriptor(container, dst, link, UMLElementTypes.Generalization_4002, -1));

+		}

+		return result;

+	}

+

+	private static Collection<UpdaterLinkDescriptor> getIncomingTypeModelFacetLinks_Generalization_link_uml_generalization(Classifier target, Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences) {

+		LinkedList<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		Collection<EStructuralFeature.Setting> settings = crossReferences.get(target);

+		for(EStructuralFeature.Setting setting : settings) {

+			if(setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getGeneralization_General() || false == setting.getEObject() instanceof Generalization) {

+				continue;

+			}

+			Generalization link = (Generalization)setting.getEObject();

+			if(!UMLGraphicalTypes.LINK_UML_GENERALIZATION_ID.equals(SysMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

+				continue;

+			}

+			if(false == link.eContainer() instanceof Classifier) {

+				continue;

+			}

+			Classifier container = (Classifier)link.eContainer();

+			result.add(new UpdaterLinkDescriptor(container, target, link, UMLElementTypes.Generalization_4002, -1));

+		}

+		return result;

+	}

+

+

+	private static Collection<? extends UpdaterLinkDescriptor> getIncomingTypeModelFacetLinks_Association_link_sysml_association(Type target, Map<EObject, Collection<Setting>> crossReferences) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		Collection<EStructuralFeature.Setting> settings = crossReferences.get(target);

+		for(EStructuralFeature.Setting setting : settings) {

+			if(setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getAssociation_EndType() || false == setting.getEObject() instanceof Association) {

+				continue;

+			}

+			Association link = (Association)setting.getEObject();

+			if(!SysMLGraphicalTypes.LINK_SYSML_ASSOCIATION_ID.equals(SysMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

+				continue;

+			}

+			List<Type> sources = link.getEndTypes();

+			//Object theSource = sources.size() >= 1 ? sources.get(0) : null;

+			Object theSource = sources.size() >= 2 ? sources.get(1) : null;//source and target ar einverted in BDD

+			if(false == theSource instanceof Type) {

+				continue;

+			}

+			Type src = (Type)theSource;

+			result.add(new UMLLinkDescriptor(src, target, link, SysMLElementTypes.ASSOCIATION, -1));

+		}

+		return result;

+	}

+

+	private static Collection<? extends UpdaterLinkDescriptor> getOutgoingTypeModelFacetLinks_Association_link_sysml_association(final Type source) {

+		Package container = null;

+		// Find container element for the link.

+		// Climb up by containment hierarchy starting from the source

+		// and return the first element that is instance of the container class.

+		for(EObject element = source; element != null && container == null; element = element.eContainer()) {

+			if(element instanceof Package) {

+				container = (Package)element;

+			}

+		}

+		if(container == null) {

+			return Collections.emptyList();

+		}

+		Collection<UpdaterLinkDescriptor> result = new LinkedList<UpdaterLinkDescriptor>();

+		for(Iterator<PackageableElement> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof Association) {

+				continue;

+			}

+			Association link = (Association)linkObject;

+			if(!SysMLGraphicalTypes.LINK_SYSML_ASSOCIATION_ID.equals(SysMLVisualIDRegistry.getLinkWithClassVisualID(link))) {

+				continue;

+			}

+			//Papyrus GenCode 

+			List<Type> targets = link.getEndTypes();

+			//			Object theTarget = targets.size() >= 2 ? targets.get(1) : null;

+			Object theTarget = targets.size() >= 1 ? targets.get(0) : null;//source and target are inverted in BDD

+			if(false == theTarget instanceof Type) {

+				continue;

+			}

+			Type dst = (Type)theTarget;

+			List<Type> sources = link.getEndTypes();

+			//			Object theSource = sources.size() >= 1 ? sources.get(0) : null;

+			Object theSource = sources.size() >= 2 ? sources.get(1) : null;//source and target are inverted in BDD

+			if(false == theSource instanceof Type) {

+				continue;

+			}

+			Type src = (Type)theSource;

+			if(src != source) {

+				continue;

+			}

+			result.add(new UMLLinkDescriptor(src, dst, link, SysMLElementTypes.ASSOCIATION, -1));

+		}

+		return result;

+	}

+

+

+}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/part/SysMLVisualIDRegistry.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/part/SysMLVisualIDRegistry.java
new file mode 100644
index 00000000000..734855a1fca
--- /dev/null
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/part/SysMLVisualIDRegistry.java
@@ -0,0 +1,177 @@
+/*****************************************************************************

+ * 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:

+ *		

+ *		CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.sysml.diagram.blockdefinition.part;

+

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.structure.DiagramStructure;

+import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;

+import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * 

+ * @author vl222926

+ *         Adapted code for the code generated for the UML Diagrams

+ */

+public class SysMLVisualIDRegistry {

+

+	private static final String UNKNOWN = "-1"; //$NON-NLS-1$

+

+	public static String getLinkWithClassVisualID(EObject domainElement) {

+		if(domainElement == null) {

+			return UNKNOWN;

+		}

+		final EClass eClass = domainElement.eClass();

+		if(UMLPackage.eINSTANCE.getGeneralization().isSuperTypeOf(eClass)) {

+			return UMLGraphicalTypes.LINK_UML_GENERALIZATION_ID;

+		}

+		if(UMLPackage.eINSTANCE.getInterfaceRealization().isSuperTypeOf(eClass)) {

+			return UMLGraphicalTypes.LINK_UML_INTERFACEREALIZATION_ID;

+		}

+		if(UMLPackage.eINSTANCE.getAssociation().isSuperTypeOf(eClass)) {

+			return SysMLGraphicalTypes.LINK_SYSML_ASSOCIATION_ID;

+		}

+		if(UMLPackage.eINSTANCE.getConnector().isSuperTypeOf(eClass)) {

+			return UMLGraphicalTypes.LINK_UML_CONNECTOR_ID;

+		}

+		//		if(UMLPackage.eINSTANCE.getAssociationClass().isSuperTypeOf(domainElement.eClass())) {

+		//			return AssociationClassLinkEditPart.VISUAL_ID;

+		//		}

+		//		if(UMLPackage.eINSTANCE.getAssociation().isSuperTypeOf(domainElement.eClass())) {

+		//			return AssociationEditPart.VISUAL_ID;

+		//		}

+		//		if(UMLPackage.eINSTANCE.getAssociation().isSuperTypeOf(domainElement.eClass())) {

+		//			return AssociationBranchEditPart.VISUAL_ID;

+		//		}

+		//		if(UMLPackage.eINSTANCE.getGeneralization().isSuperTypeOf(domainElement.eClass())) {

+		//			return GeneralizationEditPart.VISUAL_ID;

+		//		}

+		//		if(UMLPackage.eINSTANCE.getInterfaceRealization().isSuperTypeOf(domainElement.eClass())) {

+		//			return InterfaceRealizationEditPart.VISUAL_ID;

+		//		}

+		//		if(UMLPackage.eINSTANCE.getSubstitution().isSuperTypeOf(domainElement.eClass())) {

+		//			return SubstitutionEditPart.VISUAL_ID;

+		//		}

+		//		if(UMLPackage.eINSTANCE.getRealization().isSuperTypeOf(domainElement.eClass())) {

+		//			return RealizationEditPart.VISUAL_ID;

+		//		}

+		//		if(UMLPackage.eINSTANCE.getAbstraction().isSuperTypeOf(domainElement.eClass())) {

+		//			return AbstractionEditPart.VISUAL_ID;

+		//		}

+		//		if(UMLPackage.eINSTANCE.getUsage().isSuperTypeOf(domainElement.eClass())) {

+		//			return UsageEditPart.VISUAL_ID;

+		//		}

+		if(UMLPackage.eINSTANCE.getDependency().isSuperTypeOf(domainElement.eClass())) {

+			return UMLGraphicalTypes.LINK_UML_DEPENDENCY_ID;

+		}

+		//		if(UMLPackage.eINSTANCE.getDependency().isSuperTypeOf(domainElement.eClass())) {

+		//			return DependencyBranchEditPart.VISUAL_ID;

+		//		}

+		//		if(UMLPackage.eINSTANCE.getElementImport().isSuperTypeOf(domainElement.eClass())) {

+		//			return ElementImportEditPart.VISUAL_ID;

+		//		}

+		//		if(UMLPackage.eINSTANCE.getPackageImport().isSuperTypeOf(domainElement.eClass())) {

+		//			return PackageImportEditPart.VISUAL_ID;

+		//		}

+		//		if(UMLPackage.eINSTANCE.getPackageMerge().isSuperTypeOf(domainElement.eClass())) {

+		//			return PackageMergeEditPart.VISUAL_ID;

+		//		}

+		//		if(UMLPackage.eINSTANCE.getProfileApplication().isSuperTypeOf(domainElement.eClass())) {

+		//			return ProfileApplicationEditPart.VISUAL_ID;

+		//		}

+		//		if(UMLPackage.eINSTANCE.getTemplateBinding().isSuperTypeOf(domainElement.eClass())) {

+		//			return TemplateBindingEditPart.VISUAL_ID;

+		//		}

+		//		if(UMLPackage.eINSTANCE.getGeneralizationSet().isSuperTypeOf(domainElement.eClass())) {

+		//			return GeneralizationSetEditPart.VISUAL_ID;

+		//		}

+		//		if(UMLPackage.eINSTANCE.getInstanceSpecification().isSuperTypeOf(domainElement.eClass())) {

+		//			return InstanceSpecificationLinkEditPart.VISUAL_ID;

+		//		}

+		//		if(UMLPackage.eINSTANCE.getInformationFlow().isSuperTypeOf(domainElement.eClass())) {

+		//			return InformationFlowEditPart.VISUAL_ID;

+		//		}

+		return UNKNOWN;

+	}

+

+	//	//TODO : this class as not been tested...

+	public static final DiagramStructure TYPED_INSTANCE = new DiagramStructure() {

+

+		@Override

+		public int getVisualID(View view) {

+			return 0;

+		}

+

+		@Override

+		public String getModelID(View view) {

+			return null;

+		}

+

+		@Override

+		public int getNodeVisualID(View containerView, EObject domainElement) {

+			return 0;

+		}

+

+		@Override

+		public boolean checkNodeVisualID(View containerView, EObject domainElement, int candidate) {

+			return false;

+		}

+

+		@Override

+		public boolean isCompartmentVisualID(int visualID) {

+			return false;

+		}

+

+		@Override

+		public boolean isSemanticLeafVisualID(int visualID) {

+			return false;

+		}

+

+		//			public String getVisualIDAsString(final View view) {

+		//				return view.getType();

+		//			}

+		//	

+		//			public int getVisualID(View view) {//TODO : not useful with sysml, because we are using String!

+		//				final String type = view.getType();

+		//				return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.getVisualID(view);

+		//			}

+		//	

+		//	

+		//			public String getModelID(View view) {

+		//				return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.getModelID(view);

+		//			}

+		//	

+		//	

+		//			public int getNodeVisualID(View containerView, EObject domainElement) {

+		//				return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.getNodeVisualID(containerView, domainElement);

+		//			}

+		//	

+		//	

+		//			public boolean checkNodeVisualID(View containerView, EObject domainElement, int candidate) {

+		//				return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.checkNodeVisualID(containerView, domainElement, candidate);

+		//			}

+		//	

+		//	

+		//			public boolean isCompartmentVisualID(int visualID) {

+		//				return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.isCompartmentVisualID(visualID);

+		//			}

+		//	

+		//	

+		//			public boolean isSemanticLeafVisualID(int visualID) {

+		//				return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.isSemanticLeafVisualID(visualID);

+		//			}

+	};

+}

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/CustomAssociationPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/CustomAssociationPreferencePage.java
index d82f1a33d30..970149544b5 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/CustomAssociationPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/CustomAssociationPreferencePage.java
@@ -26,7 +26,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
 import org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants;
 import org.eclipse.papyrus.sysml.diagram.common.preferences.LabelPreferenceHelper;
@@ -89,7 +89,7 @@ public class CustomAssociationPreferencePage extends BlockDefinitionDiagramLinkP
 
 		// Initialize default visibility for labels in preference page.
 		for(String labelName : labelDefaultVisibilityMap.keySet()) {
-			String showLabelKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, labelName, PreferenceConstantHelper.LABEL_VISIBILITY);
+			String showLabelKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, labelName, PreferencesConstantsHelper.LABEL_VISIBILITY);
 			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/CustomPreferenceInitializer.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/CustomPreferenceInitializer.java
index 9622dfae275..1dad8589b1b 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/CustomPreferenceInitializer.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/CustomPreferenceInitializer.java
@@ -14,7 +14,7 @@
 package org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;

 import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;

 import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;

@@ -72,8 +72,8 @@ public class CustomPreferenceInitializer extends BlockDefinitionDiagramPreferenc
 	protected void initDefaultPosition(String parentGraphicalType, String graphicalType, int x, int y) {

 		IPreferenceStore store = getPreferenceStore();

 

-		String xKey = PreferenceConstantHelper.getElementConstant(ElementTypes.DIAGRAM_ID + "_" + parentGraphicalType + "-" + graphicalType, PreferenceConstantHelper.LOCATION_X);

-		String yKey = PreferenceConstantHelper.getElementConstant(ElementTypes.DIAGRAM_ID + "_" + parentGraphicalType + "-" + graphicalType, PreferenceConstantHelper.LOCATION_Y);

+		String xKey = PreferencesConstantsHelper.getElementConstant(ElementTypes.DIAGRAM_ID + "_" + parentGraphicalType + "-" + graphicalType, PreferencesConstantsHelper.LOCATION_X);

+		String yKey = PreferencesConstantsHelper.getElementConstant(ElementTypes.DIAGRAM_ID + "_" + parentGraphicalType + "-" + graphicalType, PreferencesConstantsHelper.LOCATION_Y);

 

 		store.setDefault(xKey, x);

 		store.setDefault(yKey, y);

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/FlowPortAsBorderItemPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/FlowPortAsBorderItemPreferencePage.java
index 07fa8082080..d516977f565 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/FlowPortAsBorderItemPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/FlowPortAsBorderItemPreferencePage.java
@@ -29,7 +29,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
 import org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants;
 import org.eclipse.papyrus.sysml.diagram.common.preferences.LabelPreferenceHelper;
@@ -78,12 +78,12 @@ public class FlowPortAsBorderItemPreferencePage extends BlockDefinitionDiagramNo
 
 		store.setDefault(LabelPreferenceHelper.getPreferenceConstant(prefLabelKey, ILabelPreferenceConstants.LABEL_DISPLAY_PREFERENCE), DISP_DIRECTION | DISP_NAME | DISP_TYPE | DISP_UNDEFINED_TYPE);
 
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 20);
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 20);
+		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(String labelName : labelDefaultVisibilityMap.keySet()) {
-			String showLabelKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, labelName, PreferenceConstantHelper.LABEL_VISIBILITY);
+			String showLabelKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, labelName, PreferencesConstantsHelper.LABEL_VISIBILITY);
 			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PortAsBorderItemPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PortAsBorderItemPreferencePage.java
index f55cad024ae..c732e8a5e97 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PortAsBorderItemPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/preferences/PortAsBorderItemPreferencePage.java
@@ -28,7 +28,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
 import org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants;
 import org.eclipse.papyrus.sysml.diagram.common.preferences.LabelPreferenceHelper;
@@ -76,12 +76,12 @@ public class PortAsBorderItemPreferencePage extends BlockDefinitionDiagramNodePr
 	public static void initDefaults(IPreferenceStore store) {
 		store.setDefault(LabelPreferenceHelper.getPreferenceConstant(prefLabelKey, ILabelPreferenceConstants.LABEL_DISPLAY_PREFERENCE), DISP_NAME | DISP_TYPE | DISP_MULTIPLICITY | DISP_UNDEFINED_TYPE);
 
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 20);
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 20);
+		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(String labelName : labelDefaultVisibilityMap.keySet()) {
-			String showLabelKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, labelName, PreferenceConstantHelper.LABEL_VISIBILITY);
+			String showLabelKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, labelName, PreferencesConstantsHelper.LABEL_VISIBILITY);
 			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/utils/FixPortsLocationOnOpening.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/utils/FixPortsLocationOnOpening.java
index 6d3d8114ef8..7e97decc4f5 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/utils/FixPortsLocationOnOpening.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/utils/FixPortsLocationOnOpening.java
@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
 import org.eclipse.gmf.runtime.notation.Bounds;

 import org.eclipse.gmf.runtime.notation.Diagram;

 import org.eclipse.gmf.runtime.notation.Shape;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.sysml.diagram.blockdefinition.Activator;

 import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;

 import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;

@@ -69,8 +69,8 @@ public class FixPortsLocationOnOpening {
 				if ((parentWidth == -1) && (parentHeight == -1)) {

 					// warning the size may not be set in notation (default size), in such a case get default size from preferences.

 					String parentPrefKey = ElementTypes.DIAGRAM_ID + "_" + parentView.getType();

-					parentWidth = Activator.getInstance().getPreferenceStore().getInt(PreferenceConstantHelper.getElementConstant(parentPrefKey, PreferenceConstantHelper.WIDTH));

-					parentHeight = Activator.getInstance().getPreferenceStore().getInt(PreferenceConstantHelper.getElementConstant(parentPrefKey, PreferenceConstantHelper.HEIGHT));

+					parentWidth = Activator.getInstance().getPreferenceStore().getInt(PreferencesConstantsHelper.getElementConstant(parentPrefKey, PreferencesConstantsHelper.WIDTH));

+					parentHeight = Activator.getInstance().getPreferenceStore().getInt(PreferencesConstantsHelper.getElementConstant(parentPrefKey, PreferencesConstantsHelper.HEIGHT));

 				}

 				final Rectangle parentBounds = new Rectangle(parentViewBounds.getX(), parentViewBounds.getY(), parentWidth, parentHeight);

 				

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/DefaultXYLayoutEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/DefaultXYLayoutEditPolicy.java
index 52bdf9c4860..b347f29b0b6 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/DefaultXYLayoutEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-gmf/org/eclipse/papyrus/gmf/diagram/common/edit/policy/DefaultXYLayoutEditPolicy.java
@@ -22,16 +22,16 @@ import org.eclipse.gef.requests.CreateRequest;
 import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
 import org.eclipse.gmf.runtime.diagram.ui.commands.SetBoundsCommand;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.XYLayoutEditPolicy;
 import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.XYLayoutWithConstrainedResizedEditPolicy;
 
 /**
  * Avoid forcing (-1, -1) dimension in set bounds command (let the view factories deal with 
  * size initialization if needed).
  */
-public class DefaultXYLayoutEditPolicy extends XYLayoutEditPolicy {
+public class DefaultXYLayoutEditPolicy extends XYLayoutWithConstrainedResizedEditPolicy {
 
 	/**
 	 * Called in response to a <tt>REQ_CREATE</tt> request. Returns a command
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementBorderEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementBorderEditPart.java
index e3f9c410d81..c71b4be9683 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementBorderEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementBorderEditPart.java
@@ -38,7 +38,7 @@ import org.eclipse.jface.preference.PreferenceConverter;
 import org.eclipse.papyrus.gmf.diagram.common.edit.policy.DefaultGraphicalNodeEditPolicy;
 import org.eclipse.papyrus.gmf.diagram.common.edit.policy.DefaultSemanticEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.sysml.diagram.common.Activator;
 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractBorderEditPart;
 import org.eclipse.papyrus.uml.diagram.common.figure.node.AffixedNamedElementFigure;
@@ -145,8 +145,8 @@ public abstract class AbstractElementBorderEditPart extends AbstractBorderEditPa
 	protected NodeFigure createNodePlate() {
 		String prefElementId = getNotationView().getType();
 		IPreferenceStore store = Activator.getInstance().getPreferenceStore();
-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);
-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);
+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);
+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);
 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));
 
 		//FIXME: workaround for #154536
@@ -196,20 +196,20 @@ public abstract class AbstractElementBorderEditPart extends AbstractBorderEditPa
 
 			String prefColor = null;
 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {
-				prefColor = PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.COLOR_LINE);
+				prefColor = PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.COLOR_LINE);
 
 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {
-				prefColor = PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.COLOR_FONT);
+				prefColor = PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.COLOR_FONT);
 
 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
-				prefColor = PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.COLOR_FILL);
+				prefColor = PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.COLOR_FILL);
 
 			}
 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)store, prefColor));
 
 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {
 
-			String prefGradient = PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.COLOR_GRADIENT);
+			String prefGradient = PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.COLOR_GRADIENT);
 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(store.getString(prefGradient));
 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {
 				result = new Integer(gradientPreferenceConverter.getTransparency());
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementEditPart.java
index f9976df6359..4ecb09dba5a 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementEditPart.java
@@ -33,7 +33,7 @@ import org.eclipse.jface.preference.PreferenceConverter;
 import org.eclipse.papyrus.gmf.diagram.common.edit.policy.DefaultCreationEditPolicy;
 import org.eclipse.papyrus.gmf.diagram.common.edit.policy.DefaultGraphicalNodeEditPolicy;
 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.sysml.diagram.common.Activator;
 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
 import org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure;
@@ -97,8 +97,8 @@ public abstract class AbstractElementEditPart extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {
 		String prefElementId = getNotationView().getType();
 		IPreferenceStore store = Activator.getInstance().getPreferenceStore();
-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);
-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);
+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);
+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);
 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));
 
 		return result;
@@ -147,20 +147,20 @@ public abstract class AbstractElementEditPart extends NamedElementEditPart {
 
 			String prefColor = null;
 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {
-				prefColor = PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.COLOR_LINE);
+				prefColor = PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.COLOR_LINE);
 
 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {
-				prefColor = PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.COLOR_FONT);
+				prefColor = PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.COLOR_FONT);
 
 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
-				prefColor = PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.COLOR_FILL);
+				prefColor = PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.COLOR_FILL);
 
 			}
 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)store, prefColor));
 
 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {
 
-			String prefGradient = PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.COLOR_GRADIENT);
+			String prefGradient = PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.COLOR_GRADIENT);
 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(store.getString(prefGradient));
 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {
 				result = new Integer(gradientPreferenceConverter.getTransparency());
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementLabelEditPart.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementLabelEditPart.java
index 5a3c68781eb..0ac80679123 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementLabelEditPart.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/part/AbstractElementLabelEditPart.java
@@ -71,7 +71,7 @@ import org.eclipse.papyrus.gmf.diagram.common.edit.policy.TextSelectionEditPolic
 import org.eclipse.papyrus.gmf.diagram.common.locator.TextCellEditorLocator;
 import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants;
 import org.eclipse.papyrus.sysml.diagram.common.preferences.LabelPreferenceHelper;
 import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
@@ -644,8 +644,8 @@ public abstract class AbstractElementLabelEditPart extends LabelEditPart impleme
 		// Use default view position as snap back position
 		IPreferenceStore store = org.eclipse.papyrus.infra.gmfdiag.preferences.Activator.getDefault().getPreferenceStore();
 
-		String xKey = PreferenceConstantHelper.getElementConstant(getLabelPreferenceKey(), PreferenceConstantHelper.LOCATION_X);
-		String yKey = PreferenceConstantHelper.getElementConstant(getLabelPreferenceKey(), PreferenceConstantHelper.LOCATION_Y);
+		String xKey = PreferencesConstantsHelper.getElementConstant(getLabelPreferenceKey(), PreferencesConstantsHelper.LOCATION_X);
+		String yKey = PreferencesConstantsHelper.getElementConstant(getLabelPreferenceKey(), PreferencesConstantsHelper.LOCATION_Y);
 
 		Point snapBackPosition = new Point(store.getInt(xKey), store.getInt(yKey));
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/policy/EncapsulatedClassifierResizableShapeEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/policy/EncapsulatedClassifierResizableShapeEditPolicy.java
index b20af1110d0..c8948559040 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/policy/EncapsulatedClassifierResizableShapeEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/policy/EncapsulatedClassifierResizableShapeEditPolicy.java
@@ -13,23 +13,9 @@
  *****************************************************************************/
 package org.eclipse.papyrus.uml.diagram.common.edit.policy;
 
-import java.util.Iterator;
-
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
 import org.eclipse.gef.Request;
 import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CompoundCommand;
 import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gef.requests.ChangeBoundsRequest;
-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.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableShapeEditPolicy;
-import org.eclipse.gmf.runtime.notation.Shape;
-import org.eclipse.papyrus.uml.diagram.common.commands.FixPortLocationCommand;
-import org.eclipse.papyrus.uml.diagram.common.commands.UpdatePortLocationCommand;
 
 /**
  * <pre>
@@ -40,7 +26,7 @@ import org.eclipse.papyrus.uml.diagram.common.commands.UpdatePortLocationCommand
  * the kind of attached IBorderItem and that would only rely on its IBorderItemLocator.
  * </pre>
  */
-public class EncapsulatedClassifierResizableShapeEditPolicy extends ResizableShapeEditPolicy {
+public class EncapsulatedClassifierResizableShapeEditPolicy extends org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.EncapsulatedClassifierResizableShapeEditPolicy {
 
 	/**
 	 * <pre>
@@ -56,71 +42,4 @@ public class EncapsulatedClassifierResizableShapeEditPolicy extends ResizableSha
 		return UnexecutableCommand.INSTANCE;
 	}
 
-	/**
-	 * <pre>
-	 * {@inheritDoc}
-	 * 
-	 * Extends the default resize command by :
-	 * - fixing possible Port location issues before resizing parent
-	 * - make the default parent resize
-	 * - update the Port location after resize (uses the side of the parent where the Port is attached before resize)
-	 * </pre>
-	 */
-	@Override
-	protected Command getResizeCommand(ChangeBoundsRequest request) {
-
-		// Prepare command to move the affixed children as well (and an optional fix command)
-		CompoundCommand updatePortLocationsCommand = new CompoundCommand("Update border items location");
-		CompoundCommand fixPortLocationsCommand = new CompoundCommand("Fix border items location");
-
-		Iterator<?> it = getHost().getChildren().iterator();
-		while(it.hasNext()) {
-			Object tmp = it.next();
-			if(!(tmp instanceof IBorderItemEditPart)) {
-				continue;
-			}
-
-			IBorderItemEditPart borderItem = (IBorderItemEditPart)tmp;
-			Shape borderItemView = (Shape)borderItem.getNotationView();
-			TransactionalEditingDomain editingDomain = TransactionUtil.getEditingDomain(borderItemView);
-
-			// Fix possible location issue in BorderItem bounds in notation model
-			ICommand fixPortLocationCommand = new FixPortLocationCommand(editingDomain, borderItem, (GraphicalEditPart)getHost());
-			if(fixPortLocationCommand.canExecute()) {
-				fixPortLocationsCommand.add(new ICommandProxy(fixPortLocationCommand));
-			}
-
-			ICommand updatePortLocationCommand = new UpdatePortLocationCommand(editingDomain, (GraphicalEditPart)getHost(), borderItem, borderItem.getBorderItemLocator().getCurrentSideOfParent());
-			if(updatePortLocationCommand.canExecute()) {
-				updatePortLocationsCommand.add(new ICommandProxy(updatePortLocationCommand));
-			}
-		}
-
-
-		// Create the complete resize command
-		CompoundCommand resizeCommand = new CompoundCommand("Resize command");
-
-		// Add command to fix border item locations.
-		// The role of this command is to make sure that the Port is correctly located (here this means 
-		// that the figure and the view have the same location) before resizing its parent.
-		// See bug. https://bugs.eclipse.org/bugs/show_bug.cgi?id=354814.
-		if(!fixPortLocationsCommand.isEmpty()) {
-			resizeCommand.add(fixPortLocationsCommand);
-		}
-
-		// Add command to update locations
-		resizeCommand.add(super.getResizeCommand(request));
-
-		// Add command to update border item locations.
-		// This command uses the border side of the border item before the resize action, and thus
-		// requires that the Port location is correct. Previous versions did not move the IBorderItem, this is the reason 
-		// why a fix on the fly may be required.
-		// See bug. https://bugs.eclipse.org/bugs/show_bug.cgi?id=354814.
-		if(!updatePortLocationsCommand.isEmpty()) {
-			resizeCommand.add(updatePortLocationsCommand);
-		}
-
-		return resizeCommand;
-	}
-
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/BlockClassifierViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/BlockClassifierViewFactory.java
index 143897eb9b9..53f5bec9423 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/BlockClassifierViewFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/BlockClassifierViewFactory.java
@@ -49,8 +49,8 @@ public class BlockClassifierViewFactory extends ShapeViewFactory {
 			return;
 		}
 		// Get default size from preferences use set view size.
-		String preferenceConstantWitdh = org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper.getpreferenceKey(view, view.getType(), org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.WIDTH);
-		String preferenceConstantHeight = org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper.getpreferenceKey(view, view.getType(), org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.HEIGHT);
+		String preferenceConstantWitdh = org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper.getpreferenceKey(view, view.getType(), org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.WIDTH);
+		String preferenceConstantHeight = org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper.getpreferenceKey(view, view.getType(), org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.HEIGHT);
 		ViewUtil.setStructuralFeatureValue(view, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getSize_Width(), store.getInt(preferenceConstantWitdh));
 		ViewUtil.setStructuralFeatureValue(view, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getSize_Height(), store.getInt(preferenceConstantHeight));
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/BlockCompositeClassifierViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/BlockCompositeClassifierViewFactory.java
index 8e65efebfcd..35a4862f9bd 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/BlockCompositeClassifierViewFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/BlockCompositeClassifierViewFactory.java
@@ -41,8 +41,8 @@ public class BlockCompositeClassifierViewFactory extends ShapeViewFactory {
 			return;
 		}
 		// Get default size from preferences use set view size.
-		String preferenceConstantWitdh = org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper.getpreferenceKey(view, view.getType(), org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.WIDTH);
-		String preferenceConstantHeight = org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper.getpreferenceKey(view, view.getType(), org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.HEIGHT);
+		String preferenceConstantWitdh = org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper.getpreferenceKey(view, view.getType(), org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.WIDTH);
+		String preferenceConstantHeight = org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper.getpreferenceKey(view, view.getType(), org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.HEIGHT);
 		ViewUtil.setStructuralFeatureValue(view, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getSize_Width(), store.getInt(preferenceConstantWitdh));
 		ViewUtil.setStructuralFeatureValue(view, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getSize_Height(), store.getInt(preferenceConstantHeight));
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/BlockPropertyCompositeClassifierViewFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/BlockPropertyCompositeClassifierViewFactory.java
index 09b7e12d8da..bfbdfd8a2f5 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/BlockPropertyCompositeClassifierViewFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-gen/org/eclipse/papyrus/sysml/diagram/common/factory/BlockPropertyCompositeClassifierViewFactory.java
@@ -42,8 +42,8 @@ public class BlockPropertyCompositeClassifierViewFactory extends ShapeViewFactor
 			return;
 		}
 		// Get default size from preferences use set view size.
-		String preferenceConstantWitdh = org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper.getpreferenceKey(view, view.getType(), org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.WIDTH);
-		String preferenceConstantHeight = org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper.getpreferenceKey(view, view.getType(), org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.HEIGHT);
+		String preferenceConstantWitdh = org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper.getpreferenceKey(view, view.getType(), org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.WIDTH);
+		String preferenceConstantHeight = org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper.getpreferenceKey(view, view.getType(), org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.HEIGHT);
 		ViewUtil.setStructuralFeatureValue(view, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getSize_Width(), store.getInt(preferenceConstantWitdh));
 		ViewUtil.setStructuralFeatureValue(view, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getSize_Height(), store.getInt(preferenceConstantHeight));
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/BlockCompositePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/BlockCompositePreferencePage.java
index c6b6167fe27..fe4fb96ef90 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/BlockCompositePreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/BlockCompositePreferencePage.java
@@ -18,7 +18,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
 import org.eclipse.papyrus.sysml.diagram.internalblock.provider.ElementTypes;
 
@@ -59,19 +59,19 @@ public class BlockCompositePreferencePage extends InternalBlockDiagramNodePrefer
 	/** Default preferences initializer */
 	public static void initDefaults(IPreferenceStore store) {
 		// Start of user code custom default initializations
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 100);
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 150);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 100);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 150);
 		// End of user code
 
 		// Initialize default visibility for compartments in preference page.
 		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
+			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(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			String showCompartmentTitleKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);
+			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/DependencyPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/DependencyPreferencePage.java
index 2289324ee7d..d1cb9fc20b3 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/DependencyPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/DependencyPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.sysml.diagram.internalblock.provider.ElementTypes;
 import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
 
@@ -55,7 +55,7 @@ public class DependencyPreferencePage extends InternalBlockDiagramLinkPreference
 
 		// Initialize default visibility for labels in preference page.
 		for(String labelName : labelDefaultVisibilityMap.keySet()) {
-			String showLabelKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, labelName, PreferenceConstantHelper.LABEL_VISIBILITY);
+			String showLabelKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, labelName, PreferencesConstantsHelper.LABEL_VISIBILITY);
 			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/InternalBlockDiagramGeneralPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/InternalBlockDiagramGeneralPreferencePage.java
index fd7e540dd82..78ef9927b17 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/InternalBlockDiagramGeneralPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/InternalBlockDiagramGeneralPreferencePage.java
@@ -15,10 +15,12 @@ package org.eclipse.papyrus.sysml.diagram.internalblock.preferences;
 
 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.DiagramPreferencePage;
 import org.eclipse.papyrus.sysml.diagram.internalblock.Activator;
+import org.eclipse.papyrus.sysml.diagram.internalblock.provider.ElementTypes;
 
 public class InternalBlockDiagramGeneralPreferencePage extends DiagramPreferencePage {
 
 	public InternalBlockDiagramGeneralPreferencePage() {
 		setPreferenceStore(Activator.getInstance().getPreferenceStore());
+		setPreferenceKey(ElementTypes.DIAGRAM_ID);
 	}
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CustomBlockPropertyCompositePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CustomBlockPropertyCompositePreferencePage.java
index 1b964278224..0d3a22d12ba 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CustomBlockPropertyCompositePreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CustomBlockPropertyCompositePreferencePage.java
@@ -28,7 +28,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants;
 import org.eclipse.papyrus.sysml.diagram.common.preferences.LabelPreferenceHelper;
 import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
@@ -87,20 +87,20 @@ public class CustomBlockPropertyCompositePreferencePage extends InternalBlockDia
 	/** Default preferences initializer */
 	public static void initDefaults(IPreferenceStore store) {
 		// Start of user code custom default initializations
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 200);
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 100);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 200);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100);
 		store.setDefault(LabelPreferenceHelper.getPreferenceConstant(prefLabelKey, ILabelPreferenceConstants.LABEL_DISPLAY_PREFERENCE), DISP_NAME | DISP_TYPE | DISP_UNDEFINED_TYPE);
 		// End of user code
 
 		// Initialize default visibility for compartments in preference page.
 		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
+			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(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			String showCompartmentTitleKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);
+			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CustomConnectorPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CustomConnectorPreferencePage.java
index e79a155a30a..3d98091c9be 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CustomConnectorPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CustomConnectorPreferencePage.java
@@ -24,7 +24,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants;
 import org.eclipse.papyrus.sysml.diagram.common.preferences.LabelPreferenceHelper;
 import org.eclipse.papyrus.sysml.diagram.internalblock.provider.ElementTypes;
@@ -83,7 +83,7 @@ public class CustomConnectorPreferencePage extends InternalBlockDiagramLinkPrefe
 
 		// Initialize default visibility for labels in preference page.
 		for(String labelName : labelDefaultVisibilityMap.keySet()) {
-			String showLabelKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, labelName, PreferenceConstantHelper.LABEL_VISIBILITY);
+			String showLabelKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, labelName, PreferencesConstantsHelper.LABEL_VISIBILITY);
 			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CustomNestedBlockPropertyCompositePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CustomNestedBlockPropertyCompositePreferencePage.java
index eb9b9fd2ecc..50cc1eecfc9 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CustomNestedBlockPropertyCompositePreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CustomNestedBlockPropertyCompositePreferencePage.java
@@ -24,7 +24,7 @@ import static org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPrefere
 import static org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants.DISP_VISIBILITY;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants;
 import org.eclipse.papyrus.sysml.diagram.common.preferences.LabelPreferenceHelper;
 import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
@@ -62,8 +62,8 @@ public class CustomNestedBlockPropertyCompositePreferencePage extends InternalBl
 	public static void initDefaults(IPreferenceStore store) {
 		// Start of user code custom default initializations
 		store.setDefault(LabelPreferenceHelper.getPreferenceConstant(prefLabelKey, ILabelPreferenceConstants.LABEL_DISPLAY_PREFERENCE), DISP_NAME | DISP_TYPE | DISP_UNDEFINED_TYPE);
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 160);
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 80);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 160);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 80);
 		// End of user code
 	}
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CustomPreferenceInitializer.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CustomPreferenceInitializer.java
index 110e8a95487..33260a76b51 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CustomPreferenceInitializer.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/CustomPreferenceInitializer.java
@@ -14,7 +14,7 @@
 package org.eclipse.papyrus.sysml.diagram.internalblock.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;

 import org.eclipse.papyrus.sysml.diagram.internalblock.Activator;

 import org.eclipse.papyrus.sysml.diagram.internalblock.provider.ElementTypes;

@@ -69,8 +69,8 @@ public class CustomPreferenceInitializer extends InternalBlockDiagramPreferenceI
 	protected void initDefaultPosition(String parentGraphicalType, String graphicalType, int x, int y) {

 		IPreferenceStore store = getPreferenceStore();

 

-		String xKey = PreferenceConstantHelper.getElementConstant(ElementTypes.DIAGRAM_ID + "_" + parentGraphicalType + "-" + graphicalType, PreferenceConstantHelper.LOCATION_X);

-		String yKey = PreferenceConstantHelper.getElementConstant(ElementTypes.DIAGRAM_ID + "_" + parentGraphicalType + "-" + graphicalType, PreferenceConstantHelper.LOCATION_Y);

+		String xKey = PreferencesConstantsHelper.getElementConstant(ElementTypes.DIAGRAM_ID + "_" + parentGraphicalType + "-" + graphicalType, PreferencesConstantsHelper.LOCATION_X);

+		String yKey = PreferencesConstantsHelper.getElementConstant(ElementTypes.DIAGRAM_ID + "_" + parentGraphicalType + "-" + graphicalType, PreferencesConstantsHelper.LOCATION_Y);

 

 		store.setDefault(xKey, x);

 		store.setDefault(yKey, y);

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/FlowPortAsBorderItemPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/FlowPortAsBorderItemPreferencePage.java
index ace1b407c9c..d10a38a4c64 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/FlowPortAsBorderItemPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/FlowPortAsBorderItemPreferencePage.java
@@ -29,7 +29,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants;
 import org.eclipse.papyrus.sysml.diagram.common.preferences.LabelPreferenceHelper;
 import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
@@ -81,12 +81,12 @@ public class FlowPortAsBorderItemPreferencePage extends InternalBlockDiagramNode
 
 		store.setDefault(LabelPreferenceHelper.getPreferenceConstant(prefLabelKey, ILabelPreferenceConstants.LABEL_DISPLAY_PREFERENCE), DISP_DIRECTION | DISP_NAME | DISP_TYPE | DISP_UNDEFINED_TYPE);
 
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 20);
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 20);
+		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(String labelName : labelDefaultVisibilityMap.keySet()) {
-			String showLabelKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, labelName, PreferenceConstantHelper.LABEL_VISIBILITY);
+			String showLabelKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, labelName, PreferencesConstantsHelper.LABEL_VISIBILITY);
 			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/PortAsBorderItemPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/PortAsBorderItemPreferencePage.java
index ac1d1a4ff7c..a35d4eb84c6 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/PortAsBorderItemPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/preferences/PortAsBorderItemPreferencePage.java
@@ -28,7 +28,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants;
 import org.eclipse.papyrus.sysml.diagram.common.preferences.LabelPreferenceHelper;
 import org.eclipse.papyrus.sysml.diagram.internalblock.provider.ElementTypes;
@@ -79,12 +79,12 @@ public class PortAsBorderItemPreferencePage extends InternalBlockDiagramNodePref
 	public static void initDefaults(IPreferenceStore store) {
 		store.setDefault(LabelPreferenceHelper.getPreferenceConstant(prefLabelKey, ILabelPreferenceConstants.LABEL_DISPLAY_PREFERENCE), DISP_NAME | DISP_TYPE | DISP_MULTIPLICITY | DISP_UNDEFINED_TYPE);
 
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 20);
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 20);
+		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(String labelName : labelDefaultVisibilityMap.keySet()) {
-			String showLabelKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, labelName, PreferenceConstantHelper.LABEL_VISIBILITY);
+			String showLabelKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, labelName, PreferencesConstantsHelper.LABEL_VISIBILITY);
 			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/FixPortsLocationOnOpening.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/FixPortsLocationOnOpening.java
index 1cde6ef0337..be0fded03c8 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/FixPortsLocationOnOpening.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src/org/eclipse/papyrus/sysml/diagram/internalblock/utils/FixPortsLocationOnOpening.java
@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
 import org.eclipse.gmf.runtime.notation.Bounds;

 import org.eclipse.gmf.runtime.notation.Diagram;

 import org.eclipse.gmf.runtime.notation.Shape;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;

 import org.eclipse.papyrus.sysml.diagram.internalblock.Activator;

 import org.eclipse.papyrus.sysml.diagram.internalblock.provider.ElementTypes;

@@ -71,8 +71,8 @@ public class FixPortsLocationOnOpening {
 				if((parentWidth == -1) && (parentHeight == -1)) {

 					// warning the size may not be set in notation (default size), in such a case get default size from preferences.

 					String parentPrefKey = ElementTypes.DIAGRAM_ID + "_" + parentView.getType();

-					parentWidth = Activator.getInstance().getPreferenceStore().getInt(PreferenceConstantHelper.getElementConstant(parentPrefKey, PreferenceConstantHelper.WIDTH));

-					parentHeight = Activator.getInstance().getPreferenceStore().getInt(PreferenceConstantHelper.getElementConstant(parentPrefKey, PreferenceConstantHelper.HEIGHT));

+					parentWidth = Activator.getInstance().getPreferenceStore().getInt(PreferencesConstantsHelper.getElementConstant(parentPrefKey, PreferencesConstantsHelper.WIDTH));

+					parentHeight = Activator.getInstance().getPreferenceStore().getInt(PreferencesConstantsHelper.getElementConstant(parentPrefKey, PreferencesConstantsHelper.HEIGHT));

 				}

 				final Rectangle parentBounds = new Rectangle(parentViewBounds.getX(), parentViewBounds.getY(), parentWidth, parentHeight);

 

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/META-INF/MANIFEST.MF b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/META-INF/MANIFEST.MF
index bc4a0c4cb02..5e2d1dc918d 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/META-INF/MANIFEST.MF
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/META-INF/MANIFEST.MF
@@ -38,9 +38,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.0.0",

  org.eclipse.ui.ide;bundle-version="3.8.0",

  org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.0",

  org.eclipse.uml2.uml;bundle-version="4.0.0",

- org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.2.0",

  org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0",

  org.eclipse.gmf.tooling.runtime;bundle-version="3.1.0",

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/BlockCompositePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/BlockCompositePreferencePage.java
index a41f8b09bd2..d0027c9811c 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/BlockCompositePreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/BlockCompositePreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		R�gis CHEVREL: chevrel.regis <at> gmail.com
+ *		R�gis CHEVREL: chevrel.regis <at> gmail.com
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -18,7 +18,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
 import org.eclipse.papyrus.sysml.diagram.parametric.provider.ElementTypes;
 
@@ -62,13 +62,13 @@ public class BlockCompositePreferencePage extends ParametricDiagramNodePreferenc
 		
 		// Initialize default visibility for compartments in preference page.
 		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
+			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(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			String showCompartmentTitleKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);
+			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ConnectorPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ConnectorPreferencePage.java
index 10e93963f1f..17505f01b8b 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ConnectorPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ConnectorPreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		R�gis CHEVREL: chevrel.regis <at> gmail.com
+ *		R�gis CHEVREL: chevrel.regis <at> gmail.com
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -18,7 +18,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.sysml.diagram.parametric.provider.ElementTypes;
 import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
 
@@ -57,7 +57,7 @@ public class ConnectorPreferencePage extends ParametricDiagramLinkPreferencePage
 		
 		// Initialize default visibility for labels in preference page.
 		for(String labelName : labelDefaultVisibilityMap.keySet()) {
-			String showLabelKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, labelName, PreferenceConstantHelper.LABEL_VISIBILITY);
+			String showLabelKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, labelName, PreferencesConstantsHelper.LABEL_VISIBILITY);
 			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/DependencyPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/DependencyPreferencePage.java
index 606310ac998..a025cd34343 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/DependencyPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/DependencyPreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		R�gis CHEVREL: chevrel.regis <at> gmail.com
+ *		R�gis CHEVREL: chevrel.regis <at> gmail.com
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -18,7 +18,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.sysml.diagram.parametric.provider.ElementTypes;
 import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
 
@@ -55,7 +55,7 @@ public class DependencyPreferencePage extends ParametricDiagramLinkPreferencePag
 		
 		// Initialize default visibility for labels in preference page.
 		for(String labelName : labelDefaultVisibilityMap.keySet()) {
-			String showLabelKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, labelName, PreferenceConstantHelper.LABEL_VISIBILITY);
+			String showLabelKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, labelName, PreferencesConstantsHelper.LABEL_VISIBILITY);
 			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ParametricDiagramGeneralPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ParametricDiagramGeneralPreferencePage.java
index da9dc31398e..7a1d14342ad 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ParametricDiagramGeneralPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ParametricDiagramGeneralPreferencePage.java
@@ -14,11 +14,13 @@
 package org.eclipse.papyrus.sysml.diagram.parametric.preferences;
 
 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.DiagramPreferencePage;
+import org.eclipse.papyrus.sysml.diagram.internalblock.provider.ElementTypes;
 import org.eclipse.papyrus.sysml.diagram.parametric.Activator;
 
 public class ParametricDiagramGeneralPreferencePage extends DiagramPreferencePage {
 
 	public ParametricDiagramGeneralPreferencePage() {
 		setPreferenceStore(Activator.getInstance().getPreferenceStore());
+		setPreferenceKey(ElementTypes.DIAGRAM_ID);
 	}
 }
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ConstraintParameterAsBorderItemPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ConstraintParameterAsBorderItemPreferencePage.java
index 082d48ae554..86c1fafb1f2 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ConstraintParameterAsBorderItemPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/ConstraintParameterAsBorderItemPreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		R�gis CHEVREL: chevrel.regis <at> gmail.com
+ *		R�gis CHEVREL: chevrel.regis <at> gmail.com
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -28,7 +28,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants;
 import org.eclipse.papyrus.sysml.diagram.common.preferences.LabelPreferenceHelper;
 import org.eclipse.papyrus.sysml.diagram.parametric.provider.ElementTypes;
@@ -79,13 +79,13 @@ public class ConstraintParameterAsBorderItemPreferencePage extends ParametricDia
 	public static void initDefaults(IPreferenceStore store) {
 		store.setDefault(LabelPreferenceHelper.getPreferenceConstant(prefLabelKey, ILabelPreferenceConstants.LABEL_DISPLAY_PREFERENCE), DISP_NAME | DISP_TYPE | DISP_MULTIPLICITY | DISP_UNDEFINED_TYPE);
 
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 20);
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 20);
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.ELEMENTICON), 0);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 20);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 20);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.ELEMENTICON), 0);
 
 		// Initialize default visibility for labels in preference page.
 		for(String labelName : labelDefaultVisibilityMap.keySet()) {
-			String showLabelKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, labelName, PreferenceConstantHelper.LABEL_VISIBILITY);
+			String showLabelKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, labelName, PreferencesConstantsHelper.LABEL_VISIBILITY);
 			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CustomBlockPropertyCompositePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CustomBlockPropertyCompositePreferencePage.java
index 2f1df8e2768..23d565ce9b8 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CustomBlockPropertyCompositePreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CustomBlockPropertyCompositePreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		R�gis CHEVREL: chevrel.regis <at> gmail.com
+ *		R�gis CHEVREL: chevrel.regis <at> gmail.com
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -28,7 +28,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants;
 import org.eclipse.papyrus.sysml.diagram.common.preferences.LabelPreferenceHelper;
 import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
@@ -87,20 +87,20 @@ public class CustomBlockPropertyCompositePreferencePage extends ParametricDiagra
 	/** Default preferences initializer */
 	public static void initDefaults(IPreferenceStore store) {
 		// Start of user code custom default initializations
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 200);
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 100);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 200);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100);
 		store.setDefault(LabelPreferenceHelper.getPreferenceConstant(prefLabelKey, ILabelPreferenceConstants.LABEL_DISPLAY_PREFERENCE), DISP_NAME | DISP_TYPE | DISP_UNDEFINED_TYPE);
 		// End of user code
 
 		// Initialize default visibility for compartments in preference page.
 		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
+			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(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			String showCompartmentTitleKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);
+			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CustomConnectorPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CustomConnectorPreferencePage.java
index c79e6bcf549..28ac1db9788 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CustomConnectorPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CustomConnectorPreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		R�gis CHEVREL: chevrel.regis <at> gmail.com
+ *		R�gis CHEVREL: chevrel.regis <at> gmail.com
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -24,7 +24,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants;
 import org.eclipse.papyrus.sysml.diagram.common.preferences.LabelPreferenceHelper;
 import org.eclipse.papyrus.sysml.diagram.parametric.provider.ElementTypes;
@@ -83,7 +83,7 @@ public class CustomConnectorPreferencePage extends ParametricDiagramLinkPreferen
 
 		// Initialize default visibility for labels in preference page.
 		for(String labelName : labelDefaultVisibilityMap.keySet()) {
-			String showLabelKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, labelName, PreferenceConstantHelper.LABEL_VISIBILITY);
+			String showLabelKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, labelName, PreferencesConstantsHelper.LABEL_VISIBILITY);
 			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CustomConstraintPropertyCompositePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CustomConstraintPropertyCompositePreferencePage.java
index 650c6a8385c..b36f08b06d2 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CustomConstraintPropertyCompositePreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CustomConstraintPropertyCompositePreferencePage.java
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		R�gis CHEVREL: chevrel.regis <at> gmail.com
+ *		R�gis CHEVREL: chevrel.regis <at> gmail.com
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
@@ -28,7 +28,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.sysml.diagram.common.preferences.ILabelPreferenceConstants;
 import org.eclipse.papyrus.sysml.diagram.common.preferences.LabelPreferenceHelper;
 import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
@@ -87,20 +87,20 @@ public class CustomConstraintPropertyCompositePreferencePage extends ParametricD
 	/** Default preferences initializer */
 	public static void initDefaults(IPreferenceStore store) {
 		// Start of user code custom default initializations
-//		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 200);
-//		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 100);
+//		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 200);
+//		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100);
 		store.setDefault(LabelPreferenceHelper.getPreferenceConstant(prefLabelKey, ILabelPreferenceConstants.LABEL_DISPLAY_PREFERENCE), DISP_NAME | DISP_TYPE | DISP_UNDEFINED_TYPE);
 		// End of user code
 
 		// Initialize default visibility for compartments in preference page.
 		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
+			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(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			String showCompartmentTitleKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);
+			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CustomPreferenceInitializer.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CustomPreferenceInitializer.java
index f98fd5275b5..dd338fee814 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CustomPreferenceInitializer.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src/org/eclipse/papyrus/sysml/diagram/parametric/preferences/CustomPreferenceInitializer.java
@@ -7,14 +7,14 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *		R�gis CHEVREL: chevrel.regis <at> gmail.com
+ *		R�gis CHEVREL: chevrel.regis <at> gmail.com
  *		CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
 package org.eclipse.papyrus.sysml.diagram.parametric.preferences;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.sysml.diagram.parametric.Activator;
 import org.eclipse.papyrus.sysml.diagram.parametric.provider.ElementTypes;
 import org.eclipse.papyrus.uml.diagram.common.utils.UMLGraphicalTypes;
@@ -66,8 +66,8 @@ public class CustomPreferenceInitializer extends ParametricDiagramPreferenceInit
 	protected void initDefaultPosition(String parentGraphicalType, String graphicalType, int x, int y) {
 		IPreferenceStore store = getPreferenceStore();
 
-		String xKey = PreferenceConstantHelper.getElementConstant(ElementTypes.DIAGRAM_ID + "_" + parentGraphicalType + "-" + graphicalType, PreferenceConstantHelper.LOCATION_X);
-		String yKey = PreferenceConstantHelper.getElementConstant(ElementTypes.DIAGRAM_ID + "_" + parentGraphicalType + "-" + graphicalType, PreferenceConstantHelper.LOCATION_Y);
+		String xKey = PreferencesConstantsHelper.getElementConstant(ElementTypes.DIAGRAM_ID + "_" + parentGraphicalType + "-" + graphicalType, PreferencesConstantsHelper.LOCATION_X);
+		String yKey = PreferencesConstantsHelper.getElementConstant(ElementTypes.DIAGRAM_ID + "_" + parentGraphicalType + "-" + graphicalType, PreferencesConstantsHelper.LOCATION_Y);
 
 		store.setDefault(xKey, x);
 		store.setDefault(yKey, y);
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/AbstractionPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/AbstractionPreferencePage.java
index d38d2af6c88..d37dec3eb02 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/AbstractionPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/AbstractionPreferencePage.java
@@ -19,7 +19,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.sysml.diagram.requirement.provider.ElementTypes;
 
 public class AbstractionPreferencePage extends RequirementDiagramLinkPreferencePage {
@@ -59,7 +59,7 @@ public class AbstractionPreferencePage extends RequirementDiagramLinkPreferenceP
 		// End of user code
 
 		for(String labelName : labelDefaultVisibilityMap.keySet()) {
-			String showLabelKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, labelName, PreferenceConstantHelper.LABEL_VISIBILITY);
+			String showLabelKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, labelName, PreferencesConstantsHelper.LABEL_VISIBILITY);
 			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/DependencyPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/DependencyPreferencePage.java
index 4c8a78eb62b..12759280d67 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/DependencyPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/DependencyPreferencePage.java
@@ -19,7 +19,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.sysml.diagram.requirement.provider.ElementTypes;
 
 public class DependencyPreferencePage extends RequirementDiagramLinkPreferencePage {
@@ -59,7 +59,7 @@ public class DependencyPreferencePage extends RequirementDiagramLinkPreferencePa
 		// End of user code
 
 		for(String labelName : labelDefaultVisibilityMap.keySet()) {
-			String showLabelKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, labelName, PreferenceConstantHelper.LABEL_VISIBILITY);
+			String showLabelKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, labelName, PreferencesConstantsHelper.LABEL_VISIBILITY);
 			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/NamedElementPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/NamedElementPreferencePage.java
index a8e81943184..eae5350af11 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/NamedElementPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/NamedElementPreferencePage.java
@@ -15,7 +15,7 @@
 package org.eclipse.papyrus.sysml.diagram.requirement.preferences;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.sysml.diagram.requirement.provider.ElementTypes;
 
 public class NamedElementPreferencePage extends RequirementDiagramNodePreferencePage {
@@ -40,8 +40,8 @@ public class NamedElementPreferencePage extends RequirementDiagramNodePreference
 		// Start of user code custom default initializations
 		// End of user code
 
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 100);
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 50);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 100);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 50);
 	}
 
 
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PackageImportPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PackageImportPreferencePage.java
index 42c76ae6e18..8fdfb0e37aa 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PackageImportPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PackageImportPreferencePage.java
@@ -19,7 +19,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.sysml.diagram.requirement.provider.ElementTypes;
 
 public class PackageImportPreferencePage extends RequirementDiagramLinkPreferencePage {
@@ -58,7 +58,7 @@ public class PackageImportPreferencePage extends RequirementDiagramLinkPreferenc
 		// End of user code
 
 		for(String labelName : labelDefaultVisibilityMap.keySet()) {
-			String showLabelKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, labelName, PreferenceConstantHelper.LABEL_VISIBILITY);
+			String showLabelKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, labelName, PreferencesConstantsHelper.LABEL_VISIBILITY);
 			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PackagePreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PackagePreferencePage.java
index 94b4f98a6fe..462310d98f2 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PackagePreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/PackagePreferencePage.java
@@ -19,7 +19,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.sysml.diagram.requirement.provider.ElementTypes;
 
 public class PackagePreferencePage extends RequirementDiagramNodePreferencePage {
@@ -65,17 +65,17 @@ public class PackagePreferencePage extends RequirementDiagramNodePreferencePage
 		// Start of user code custom default initializations
 		// End of user code
 
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 200);
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 100);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 200);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100);
 		// Initialize default visibility for compartments in preference page.
 		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
+			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(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			String showCompartmentTitleKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);
+			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RealizationPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RealizationPreferencePage.java
index 2078034b71a..3e0519bce7f 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RealizationPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RealizationPreferencePage.java
@@ -19,7 +19,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.sysml.diagram.requirement.provider.ElementTypes;
 
 public class RealizationPreferencePage extends RequirementDiagramLinkPreferencePage {
@@ -59,7 +59,7 @@ public class RealizationPreferencePage extends RequirementDiagramLinkPreferenceP
 		// End of user code
 
 		for(String labelName : labelDefaultVisibilityMap.keySet()) {
-			String showLabelKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, labelName, PreferenceConstantHelper.LABEL_VISIBILITY);
+			String showLabelKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, labelName, PreferencesConstantsHelper.LABEL_VISIBILITY);
 			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
 		}
 	}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RequirementDiagramGeneralPreferencePage.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RequirementDiagramGeneralPreferencePage.java
index 540005682ba..810a6d4d059 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RequirementDiagramGeneralPreferencePage.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src-gen/org/eclipse/papyrus/sysml/diagram/requirement/preferences/RequirementDiagramGeneralPreferencePage.java
@@ -16,10 +16,18 @@ package org.eclipse.papyrus.sysml.diagram.requirement.preferences;
 
 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.DiagramPreferencePage;
 import org.eclipse.papyrus.sysml.diagram.requirement.Activator;
+import org.eclipse.papyrus.sysml.diagram.requirement.provider.ElementTypes;
 
 public class RequirementDiagramGeneralPreferencePage extends DiagramPreferencePage {
 
+	/**
+	 * 
+	 * Constructor.
+	 * 
+	 * @G
+	 */
 	public RequirementDiagramGeneralPreferencePage() {
 		setPreferenceStore(Activator.getInstance().getPreferenceStore());
+		setPreferenceKey(ElementTypes.DIAGRAM_ID);
 	}
 }
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/utils/ConnectorUtils.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/utils/ConnectorUtils.java
index d57be0e7c32..056fb1cc950 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/utils/ConnectorUtils.java
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/utils/ConnectorUtils.java
@@ -16,6 +16,8 @@ package org.eclipse.papyrus.sysml.service.types.utils;
 import java.util.ArrayList;

 import java.util.Collections;

 import java.util.List;

+import java.util.regex.Matcher;

+import java.util.regex.Pattern;

 

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.sysml.blocks.Block;

@@ -23,6 +25,7 @@ import org.eclipse.papyrus.sysml.blocks.NestedConnectorEnd;
 import org.eclipse.uml2.uml.ConnectableElement;

 import org.eclipse.uml2.uml.Connector;

 import org.eclipse.uml2.uml.ConnectorEnd;

+import org.eclipse.uml2.uml.NamedElement;

 import org.eclipse.uml2.uml.Port;

 import org.eclipse.uml2.uml.Property;

 import org.eclipse.uml2.uml.Stereotype;

@@ -46,6 +49,16 @@ public class ConnectorUtils extends org.eclipse.papyrus.uml.service.types.utils.
 	public static final String PART_SEPARATOR = "."; //$NON-NLS-1$

 

 	/**

+	 * allow to know if a string contains others characters than a-z A-Z 0-9 and _

+	 */

+	public static final String HAS_NO_WORD_CHAR_REGEX = "\\W+";

+

+	/**

+	 * String used to delimit a name with contains special chars

+	 */

+	public static final String STRING_DELIMITER = "\'";

+

+	/**

 	 * @param view

 	 *        the view

 	 * @return the nearest encapsulated structure container or null

@@ -195,6 +208,8 @@ public class ConnectorUtils extends org.eclipse.papyrus.uml.service.types.utils.
 		return nearestStructureContainer;

 	}

 

+

+

 	/**

 	 * 

 	 * @param end

@@ -210,18 +225,18 @@ public class ConnectorUtils extends org.eclipse.papyrus.uml.service.types.utils.
 			if(nestedConnectorEnd != null) {

 				final List<Property> properties = nestedConnectorEnd.getPropertyPath();

 				for(final Property current : properties) {

-					rolePath.append(current.getName());

+					rolePath.append(getNameWithQuotes(current));

 					rolePath.append(ConnectorUtils.PART_SEPARATOR);

 				}

 			} else {

 				//when the stereotype is applied, the Property for partWithPort is included in the stereotype#path

 				final Property partWithPort = end.getPartWithPort();

 				if(partWithPort != null) {

-					rolePath.append(partWithPort.getName());

+					rolePath.append(getNameWithQuotes(partWithPort));

 					rolePath.append(ConnectorUtils.PART_SEPARATOR);

 				}

 			}

-			rolePath.append(role.getName());

+			rolePath.append(getNameWithQuotes(role));

 		}

 

 		return rolePath.toString();

@@ -229,6 +244,33 @@ public class ConnectorUtils extends org.eclipse.papyrus.uml.service.types.utils.
 

 	/**

 	 * 

+	 * @param property

+	 *        a property

+	 * @return

+	 *         the property name with name delimiter if it is required

+	 */

+	public static final String getNameWithQuotes(final NamedElement property) {

+		final String partName = property.getName();

+		final StringBuffer partNameBuffer = new StringBuffer();

+		final Pattern pattern = Pattern.compile(ConnectorUtils.HAS_NO_WORD_CHAR_REGEX);

+		final Matcher matcher = pattern.matcher(partName);

+		boolean mustHaveQuote = false;

+		while(matcher.find() && !mustHaveQuote) {

+			mustHaveQuote = true;

+		}

+		if(mustHaveQuote) {

+			partNameBuffer.append(ConnectorUtils.STRING_DELIMITER);

+			partNameBuffer.append(partName);

+			partNameBuffer.append(ConnectorUtils.STRING_DELIMITER);

+		} else {

+			partNameBuffer.append(partName);

+		}

+

+		return partNameBuffer.toString();

+	}

+

+	/**

+	 * 

 	 * @param nestedPath

 	 *        the nested path

 	 * @return

diff --git a/plugins/team/org.eclipse.papyrus.team.svn/META-INF/MANIFEST.MF b/plugins/team/org.eclipse.papyrus.team.svn/META-INF/MANIFEST.MF
index 07f3bfc63e2..70edcc6f8cf 100644
--- a/plugins/team/org.eclipse.papyrus.team.svn/META-INF/MANIFEST.MF
+++ b/plugins/team/org.eclipse.papyrus.team.svn/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Require-Bundle: org.eclipse.papyrus.infra.onefile;bundle-version="1.0.0",
  org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.0",

  org.eclipse.emf.edit,

  org.eclipse.papyrus.infra.core;bundle-version="1.0.0",

- com.google.guava;bundle-version="10.0.1"

+ com.google.guava;bundle-version="11.0.0"

 Export-Package: org.eclipse.papyrus.team.svn

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/xtend-gen/org/eclipse/papyrus/uml/alf/generator/.gitignore b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/xtend-gen/org/eclipse/papyrus/uml/alf/generator/.gitignore
new file mode 100644
index 00000000000..741ec3c646b
--- /dev/null
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/xtend-gen/org/eclipse/papyrus/uml/alf/generator/.gitignore
@@ -0,0 +1 @@
+/AlfGenerator.java
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 d4aac3c28d0..8bd2f101951 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
@@ -57,7 +57,7 @@ Require-Bundle: org.eclipse.core.expressions,
  org.eclipse.papyrus.uml.appearance;bundle-version="1.0.0",

  org.eclipse.papyrus.uml.service.types;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.widgets;bundle-version="1.0.0",

- com.google.guava;bundle-version="10.0.1",

+ com.google.guava;bundle-version="11.0.0",

  org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.0.0",

  org.eclipse.papyrus.uml.tools;bundle-version="1.0.0",

  org.eclipse.papyrus.editor;bundle-version="1.0.0",

@@ -72,7 +72,6 @@ Require-Bundle: org.eclipse.core.expressions,
  org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.emf;bundle-version="1.0.0",

- org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.2.0",

  org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0",

  org.eclipse.jface,

  org.eclipse.ui.views,

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/ContainerNodeDescriptorRegistry.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/ContainerNodeDescriptorRegistry.java
index 27c99972600..71312c66842 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/ContainerNodeDescriptorRegistry.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/activitygroup/ContainerNodeDescriptorRegistry.java
@@ -30,7 +30,6 @@ import org.eclipse.papyrus.uml.diagram.activity.activitygroup.groupcontainment.S
 import org.eclipse.papyrus.uml.diagram.activity.activitygroup.groupcontainment.StructuredActivityNodeContainment;

 import org.eclipse.uml2.uml.UMLPackage;

 

-import com.google.common.collect.Iterables;

 import com.google.common.collect.Lists;

 

 /**

@@ -79,7 +78,7 @@ public final class ContainerNodeDescriptorRegistry {
 			IContainerNodeDescriptor result = registry.get(eclass);

 			if(result == null) {

 				ArrayList<EClass> superTypes = Lists.newArrayList(eclass.getEAllSuperTypes());

-				for(EClass aux : Iterables.reverse(superTypes)) {

+				for(EClass aux : Lists.reverse(superTypes)) {

 					result = registry.get(aux);

 					if(result != null) {

 						return result;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateInvocationActionDialog.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateInvocationActionDialog.java
index 3b313ba10c9..354f2bc6655 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateInvocationActionDialog.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/custom-src/org/eclipse/papyrus/uml/diagram/activity/edit/dialogs/CreateInvocationActionDialog.java
@@ -32,7 +32,11 @@ import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.ILabelProvider;

 import org.eclipse.jface.viewers.ISelection;

 import org.eclipse.jface.viewers.StructuredSelection;

+import org.eclipse.papyrus.infra.core.services.ServiceException;

 import org.eclipse.papyrus.infra.core.utils.EditorUtils;

+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.ServiceUtilsForEditPart;

+import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

 import org.eclipse.papyrus.infra.widgets.editors.TreeSelectorDialog;

 import org.eclipse.papyrus.uml.diagram.activity.part.CustomMessages;

 import org.eclipse.papyrus.uml.diagram.activity.part.Messages;

@@ -112,6 +116,7 @@ public abstract class CreateInvocationActionDialog extends FormDialog {
 	 * New Object about to be created

 	 */

 	private InvocationAction invocationAction;

+	

 

 	/**

 	 * Create a new dialog to initialize a CallAction.

@@ -127,6 +132,12 @@ public abstract class CreateInvocationActionDialog extends FormDialog {
 		selectedParent = getDefaultParent(owner);

 		labelProvider = getCustomLabelProvider();

 		this.invocationAction = newAction;

+		try {

+			LabelProviderService labelProviderService=(LabelProviderService)ServiceUtilsForEObject.getInstance().getServiceRegistry(owner).getService(LabelProviderService.class);

+			labelProvider=labelProviderService.getLabelProvider(owner);

+		} catch (ServiceException e) {

+			e.printStackTrace();

+		}

 	}

 	

 	

@@ -510,9 +521,12 @@ public abstract class CreateInvocationActionDialog extends FormDialog {
 	 * 

 	 */

 	protected void handleChooseInvoked() {

+		

+		

 		TreeSelectorDialog dialog = new TreeSelectorDialog(Display.getDefault().getActiveShell());

 		dialog.setContentProvider(new UMLContentProvider(getInvocationAction(), getInvocationFeature()));

-		dialog.setLabelProvider(new UMLLabelProvider());

+		

+		dialog.setLabelProvider(labelProvider);

 		//		UMLMultiEClassifierTreeSelectorDialog dialog = new UMLMultiEClassifierTreeSelectorDialog(getShell(), actionParent, Collections.singleton(getInvocationFeature().getEType()));

 		dialog.setMessage(Messages.UMLModelingAssistantProviderMessage);

 		dialog.setTitle(Messages.UMLModelingAssistantProviderTitle);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/AcceptEventActionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/AcceptEventActionEditPart.java
index 42a588d094b..dcfbea17655 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/AcceptEventActionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/AcceptEventActionEditPart.java
@@ -51,7 +51,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.AcceptEventActionCanonicalEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.AcceptEventActionItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.CreateActionLocalConditionEditPolicy;

@@ -280,8 +280,8 @@ public class AcceptEventActionEditPart extends UMLNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "AcceptEventAction";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -1486,15 +1486,15 @@ public class AcceptEventActionEditPart extends UMLNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("AcceptEventAction", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("AcceptEventAction", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("AcceptEventAction", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("AcceptEventAction", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("AcceptEventAction", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("AcceptEventAction", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("AcceptEventAction", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("AcceptEventAction", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInCallBeActEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInCallBeActEditPart.java
index 414787fe632..9a792ec94ea 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInCallBeActEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInCallBeActEditPart.java
@@ -48,7 +48,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.part.AbstractPinEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActionInputPinInCallBeActItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.NoDeleteFromDiagramEditPolicy;

@@ -203,8 +203,8 @@ public class ActionInputPinInCallBeActEditPart extends AbstractPinEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "ActionInputPin";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1150,15 +1150,15 @@ public class ActionInputPinInCallBeActEditPart extends AbstractPinEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ActionInputPin", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ActionInputPin", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ActionInputPin", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ActionInputPin", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ActionInputPin", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ActionInputPin", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("ActionInputPin", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("ActionInputPin", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInCallOpActAsTargetEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInCallOpActAsTargetEditPart.java
index 76a6a3d5785..f25dc91931d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInCallOpActAsTargetEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInCallOpActAsTargetEditPart.java
@@ -48,7 +48,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.part.AbstractPinEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActionInputPinInCallOpActAsTargetItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.NoDeleteFromDiagramEditPolicy;

@@ -203,8 +203,8 @@ public class ActionInputPinInCallOpActAsTargetEditPart extends AbstractPinEditPa
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "ActionInputPin";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1150,15 +1150,15 @@ public class ActionInputPinInCallOpActAsTargetEditPart extends AbstractPinEditPa
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ActionInputPin", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ActionInputPin", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ActionInputPin", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ActionInputPin", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ActionInputPin", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ActionInputPin", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("ActionInputPin", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("ActionInputPin", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInCallOpActEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInCallOpActEditPart.java
index 92262c75984..ea6cc4ea8bb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInCallOpActEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInCallOpActEditPart.java
@@ -48,7 +48,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.part.AbstractPinEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActionInputPinInCallOpActItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.NoDeleteFromDiagramEditPolicy;

@@ -203,8 +203,8 @@ public class ActionInputPinInCallOpActEditPart extends AbstractPinEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "ActionInputPin";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1150,15 +1150,15 @@ public class ActionInputPinInCallOpActEditPart extends AbstractPinEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ActionInputPin", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ActionInputPin", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ActionInputPin", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ActionInputPin", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ActionInputPin", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ActionInputPin", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("ActionInputPin", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("ActionInputPin", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInOpaqueActEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInOpaqueActEditPart.java
index 2c5118be426..a0cb7e53f54 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInOpaqueActEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInOpaqueActEditPart.java
@@ -47,7 +47,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.part.AbstractPinEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActionInputPinInOpaqueActItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

@@ -200,8 +200,8 @@ public class ActionInputPinInOpaqueActEditPart extends AbstractPinEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "ActionInputPin";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1147,15 +1147,15 @@ public class ActionInputPinInOpaqueActEditPart extends AbstractPinEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ActionInputPin", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ActionInputPin", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ActionInputPin", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ActionInputPin", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ActionInputPin", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ActionInputPin", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("ActionInputPin", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("ActionInputPin", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInSendObjActAsReqEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInSendObjActAsReqEditPart.java
index 0878ac7aa0c..615c2ec9e14 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInSendObjActAsReqEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInSendObjActAsReqEditPart.java
@@ -47,7 +47,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.part.AbstractPinEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActionInputPinInSendObjActAsReqItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

@@ -200,8 +200,8 @@ public class ActionInputPinInSendObjActAsReqEditPart extends AbstractPinEditPart
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "ActionInputPin";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1147,15 +1147,15 @@ public class ActionInputPinInSendObjActAsReqEditPart extends AbstractPinEditPart
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ActionInputPin", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ActionInputPin", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ActionInputPin", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ActionInputPin", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ActionInputPin", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ActionInputPin", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("ActionInputPin", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("ActionInputPin", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInSendObjActAsTargetEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInSendObjActAsTargetEditPart.java
index e8c788084ea..a92bcf066df 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInSendObjActAsTargetEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInSendObjActAsTargetEditPart.java
@@ -47,7 +47,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.part.AbstractPinEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActionInputPinInSendObjActAsTargetItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

@@ -200,8 +200,8 @@ public class ActionInputPinInSendObjActAsTargetEditPart extends AbstractPinEditP
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "ActionInputPin";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1147,15 +1147,15 @@ public class ActionInputPinInSendObjActAsTargetEditPart extends AbstractPinEditP
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ActionInputPin", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ActionInputPin", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ActionInputPin", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ActionInputPin", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ActionInputPin", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ActionInputPin", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("ActionInputPin", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("ActionInputPin", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInSendSigActAsTargetEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInSendSigActAsTargetEditPart.java
index 6352edd17db..69bc54a1023 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInSendSigActAsTargetEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInSendSigActAsTargetEditPart.java
@@ -47,7 +47,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.part.AbstractPinEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActionInputPinInSendSigActAsTargetItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

@@ -200,8 +200,8 @@ public class ActionInputPinInSendSigActAsTargetEditPart extends AbstractPinEditP
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "ActionInputPin";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1147,15 +1147,15 @@ public class ActionInputPinInSendSigActAsTargetEditPart extends AbstractPinEditP
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ActionInputPin", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ActionInputPin", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ActionInputPin", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ActionInputPin", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ActionInputPin", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ActionInputPin", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("ActionInputPin", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("ActionInputPin", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInSendSigActEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInSendSigActEditPart.java
index 1df8db79d32..7cca980dd14 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInSendSigActEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActionInputPinInSendSigActEditPart.java
@@ -47,7 +47,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.part.AbstractPinEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActionInputPinInSendSigActItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

@@ -200,8 +200,8 @@ public class ActionInputPinInSendSigActEditPart extends AbstractPinEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "ActionInputPin";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1147,15 +1147,15 @@ public class ActionInputPinInSendSigActEditPart extends AbstractPinEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ActionInputPin", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ActionInputPin", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ActionInputPin", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ActionInputPin", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ActionInputPin", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ActionInputPin", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("ActionInputPin", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("ActionInputPin", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityEditPart.java
index ca4edc561fb..95757f1ed0b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityEditPart.java
@@ -48,7 +48,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityCanonicalEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.RemoveOrphanViewPolicy;

@@ -295,8 +295,8 @@ public class ActivityEditPart extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Activity";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -440,15 +440,15 @@ public class ActivityEditPart extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Activity", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Activity", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Activity", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Activity", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Activity", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Activity", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Activity", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Activity", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityEditPartCN.java
index b16ca65a5df..594d7e95a40 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityEditPartCN.java
@@ -35,7 +35,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityCanonicalEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityItemSemanticEditPolicyCN;

@@ -287,8 +287,8 @@ public class ActivityEditPartCN extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Activity";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -432,15 +432,15 @@ public class ActivityEditPartCN extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Activity", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Activity", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Activity", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Activity", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Activity", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Activity", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Activity", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Activity", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityFinalNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityFinalNodeEditPart.java
index 35fd3eea6a7..df8acb4c8cb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityFinalNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityFinalNodeEditPart.java
@@ -50,7 +50,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityFinalNodeItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

@@ -1125,15 +1125,15 @@ public class ActivityFinalNodeEditPart extends UMLNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ActivityFinalNode", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ActivityFinalNode", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ActivityFinalNode", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ActivityFinalNode", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ActivityFinalNode", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ActivityFinalNode", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("ActivityFinalNode", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("ActivityFinalNode", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityParameterNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityParameterNodeEditPart.java
index 87fc64822a4..718c6b8e7f9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityParameterNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityParameterNodeEditPart.java
@@ -47,7 +47,7 @@ import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IPapyrusEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityParameterNodeItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.PinLayoutEditPolicy;

@@ -208,8 +208,8 @@ public class ActivityParameterNodeEditPart extends BorderNamedElementEditPart im
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "ActivityParameterNode";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1160,15 +1160,15 @@ public class ActivityParameterNodeEditPart extends BorderNamedElementEditPart im
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ActivityParameterNode", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ActivityParameterNode", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ActivityParameterNode", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ActivityParameterNode", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ActivityParameterNode", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ActivityParameterNode", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("ActivityParameterNode", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("ActivityParameterNode", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityPartitionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityPartitionEditPart.java
index 5b6e9efdd1e..11c20ee6506 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityPartitionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ActivityPartitionEditPart.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityPartitionItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.figures.ActivityPartitionFigure;

@@ -217,8 +217,8 @@ public class ActivityPartitionEditPart extends UMLNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "ActivityPartition";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -342,15 +342,15 @@ public class ActivityPartitionEditPart extends UMLNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ActivityPartition", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ActivityPartition", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ActivityPartition", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ActivityPartition", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ActivityPartition", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ActivityPartition", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("ActivityPartition", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("ActivityPartition", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/AddStructuralFeatureValueActionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/AddStructuralFeatureValueActionEditPart.java
index 7cf28b365d2..3ace84e47f4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/AddStructuralFeatureValueActionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/AddStructuralFeatureValueActionEditPart.java
@@ -42,7 +42,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.AddStructuralFeatureValueActionCanonicalEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.AddStructuralFeatureValueActionItemSemanticEditPolicy;

@@ -251,8 +251,8 @@ public class AddStructuralFeatureValueActionEditPart extends AbstractBorderedSha
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "AddStructuralFeatureValueAction";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -1457,15 +1457,15 @@ public class AddStructuralFeatureValueActionEditPart extends AbstractBorderedSha
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("AddStructuralFeatureValueAction", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("AddStructuralFeatureValueAction", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("AddStructuralFeatureValueAction", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("AddStructuralFeatureValueAction", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("AddStructuralFeatureValueAction", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("AddStructuralFeatureValueAction", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("AddStructuralFeatureValueAction", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("AddStructuralFeatureValueAction", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/AddVariableValueActionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/AddVariableValueActionEditPart.java
index 3de7e95e4f2..fa7ab55e983 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/AddVariableValueActionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/AddVariableValueActionEditPart.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.AddVariableValueActionCanonicalEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.AddVariableValueActionItemSemanticEditPolicy;

@@ -238,8 +238,8 @@ public class AddVariableValueActionEditPart extends AbstractBorderedShapeEditPar
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "AddVariableValueAction";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -1444,15 +1444,15 @@ public class AddVariableValueActionEditPart extends AbstractBorderedShapeEditPar
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("AddVariableValueAction", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("AddVariableValueAction", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("AddVariableValueAction", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("AddVariableValueAction", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("AddVariableValueAction", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("AddVariableValueAction", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("AddVariableValueAction", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("AddVariableValueAction", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/BroadcastSignalActionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/BroadcastSignalActionEditPart.java
index ce009deb82d..1848879ff3e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/BroadcastSignalActionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/BroadcastSignalActionEditPart.java
@@ -33,7 +33,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.BroadcastSignalActionCanonicalEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.BroadcastSignalActionItemSemanticEditPolicy;

@@ -216,8 +216,8 @@ public class BroadcastSignalActionEditPart extends AbstractBorderedShapeEditPart
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "BroadcastSignalAction";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -1422,15 +1422,15 @@ public class BroadcastSignalActionEditPart extends AbstractBorderedShapeEditPart
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("BroadcastSignalAction", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("BroadcastSignalAction", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("BroadcastSignalAction", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("BroadcastSignalAction", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("BroadcastSignalAction", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("BroadcastSignalAction", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("BroadcastSignalAction", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("BroadcastSignalAction", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/CallBehaviorActionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/CallBehaviorActionEditPart.java
index cc6f07f2f5a..ca7ad4b6357 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/CallBehaviorActionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/CallBehaviorActionEditPart.java
@@ -46,7 +46,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.CallBehaviorActionCanonicalEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.CallBehaviorActionItemSemanticEditPolicy;

@@ -285,8 +285,8 @@ public class CallBehaviorActionEditPart extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "CallBehaviorAction";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -1511,15 +1511,15 @@ public class CallBehaviorActionEditPart extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("CallBehaviorAction", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("CallBehaviorAction", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("CallBehaviorAction", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("CallBehaviorAction", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("CallBehaviorAction", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("CallBehaviorAction", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("CallBehaviorAction", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("CallBehaviorAction", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/CallOperationActionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/CallOperationActionEditPart.java
index 55d81af1d1c..3cd70533b20 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/CallOperationActionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/CallOperationActionEditPart.java
@@ -46,7 +46,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.CallOperationActionCanonicalEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.CallOperationActionItemSemanticEditPolicy;

@@ -303,8 +303,8 @@ public class CallOperationActionEditPart extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "CallOperationAction";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -1509,15 +1509,15 @@ public class CallOperationActionEditPart extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("CallOperationAction", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("CallOperationAction", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("CallOperationAction", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("CallOperationAction", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("CallOperationAction", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("CallOperationAction", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("CallOperationAction", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("CallOperationAction", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/CentralBufferNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/CentralBufferNodeEditPart.java
index dd4a87f87e6..1a558adc0e1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/CentralBufferNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/CentralBufferNodeEditPart.java
@@ -34,7 +34,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.BehaviorPropertyNodeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.CentralBufferNodeItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

@@ -203,8 +203,8 @@ public class CentralBufferNodeEditPart extends AbstractBorderedShapeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "CentralBufferNode";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -1202,15 +1202,15 @@ public class CentralBufferNodeEditPart extends AbstractBorderedShapeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("CentralBufferNode", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("CentralBufferNode", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("CentralBufferNode", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("CentralBufferNode", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("CentralBufferNode", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("CentralBufferNode", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("CentralBufferNode", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("CentralBufferNode", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/CommentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/CommentEditPartCN.java
index 2067fd7d7b4..680b74ca6ca 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/CommentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/CommentEditPartCN.java
@@ -40,7 +40,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.CommentItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;

@@ -196,8 +196,8 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Comment";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -716,15 +716,15 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ConditionalNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ConditionalNodeEditPart.java
index 49f9c410b86..76acccae78f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ConditionalNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ConditionalNodeEditPart.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.draw2d.StructuredActivityNodeFigure;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ConditionalNodeItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

@@ -217,8 +217,8 @@ public class ConditionalNodeEditPart extends UMLNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "ConditionalNode";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -1423,15 +1423,15 @@ public class ConditionalNodeEditPart extends UMLNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ConditionalNode", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ConditionalNode", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ConditionalNode", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ConditionalNode", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ConditionalNode", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ConditionalNode", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("ConditionalNode", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("ConditionalNode", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ConstraintAsLocalPostcondEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ConstraintAsLocalPostcondEditPart.java
index 8fd4a805690..7656f9dce1e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ConstraintAsLocalPostcondEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ConstraintAsLocalPostcondEditPart.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ConstraintAsLocalPostcondItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

@@ -206,8 +206,8 @@ public class ConstraintAsLocalPostcondEditPart extends AbstractConstraintEditPar
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Constraint";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -770,15 +770,15 @@ public class ConstraintAsLocalPostcondEditPart extends AbstractConstraintEditPar
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ConstraintAsLocalPrecondEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ConstraintAsLocalPrecondEditPart.java
index 0e791165d29..46d8757e9ff 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ConstraintAsLocalPrecondEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ConstraintAsLocalPrecondEditPart.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ConstraintAsLocalPrecondItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

@@ -206,8 +206,8 @@ public class ConstraintAsLocalPrecondEditPart extends AbstractConstraintEditPart
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Constraint";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -770,15 +770,15 @@ public class ConstraintAsLocalPrecondEditPart extends AbstractConstraintEditPart
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ConstraintEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ConstraintEditPartCN.java
index 60e758730d9..0a04d4603a7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ConstraintEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ConstraintEditPartCN.java
@@ -28,7 +28,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ConstraintItemSemanticEditPolicyCN;

 import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;

@@ -191,8 +191,8 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Constraint";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -755,15 +755,15 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/CreateObjectActionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/CreateObjectActionEditPart.java
index 3f77764418b..2039cf2a81a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/CreateObjectActionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/CreateObjectActionEditPart.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.CreateActionLocalConditionEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.CreateObjectActionCanonicalEditPolicy;

@@ -225,8 +225,8 @@ public class CreateObjectActionEditPart extends AbstractBorderedShapeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "CreateObjectAction";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -1431,15 +1431,15 @@ public class CreateObjectActionEditPart extends AbstractBorderedShapeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("CreateObjectAction", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("CreateObjectAction", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("CreateObjectAction", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("CreateObjectAction", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("CreateObjectAction", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("CreateObjectAction", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("CreateObjectAction", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("CreateObjectAction", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/DataStoreNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/DataStoreNodeEditPart.java
index 6632a336642..c72a1f06fcb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/DataStoreNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/DataStoreNodeEditPart.java
@@ -48,7 +48,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.BehaviorPropertyNodeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.DataStoreNodeItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

@@ -240,8 +240,8 @@ public class DataStoreNodeEditPart extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "DataStoreNode";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -1237,15 +1237,15 @@ public class DataStoreNodeEditPart extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DataStoreNode", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DataStoreNode", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DataStoreNode", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DataStoreNode", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DataStoreNode", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DataStoreNode", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("DataStoreNode", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("DataStoreNode", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/DecisionNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/DecisionNodeEditPart.java
index e464db308d0..bc08c08bf36 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/DecisionNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/DecisionNodeEditPart.java
@@ -44,7 +44,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.BehaviorPropertyNodeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.DecisionNodeItemSemanticEditPolicy;

@@ -1102,15 +1102,15 @@ public class DecisionNodeEditPart extends UMLNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DecisionNode", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DecisionNode", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DecisionNode", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DecisionNode", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DecisionNode", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DecisionNode", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("DecisionNode", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("DecisionNode", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/DestroyObjectActionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/DestroyObjectActionEditPart.java
index d54b0b5a1d1..33cecaa68de 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/DestroyObjectActionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/DestroyObjectActionEditPart.java
@@ -33,7 +33,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.CreateActionLocalConditionEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.CustomDiagramDragDropEditPolicy;

@@ -216,8 +216,8 @@ public class DestroyObjectActionEditPart extends AbstractBorderedShapeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "DestroyObjectAction";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -1422,15 +1422,15 @@ public class DestroyObjectActionEditPart extends AbstractBorderedShapeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DestroyObjectAction", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DestroyObjectAction", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DestroyObjectAction", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DestroyObjectAction", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DestroyObjectAction", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DestroyObjectAction", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("DestroyObjectAction", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("DestroyObjectAction", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/DurationConstraintAsLocalPostcondEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/DurationConstraintAsLocalPostcondEditPart.java
index b4b9c893f80..dda048f4542 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/DurationConstraintAsLocalPostcondEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/DurationConstraintAsLocalPostcondEditPart.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.DurationConstraintAsLocalPostcondItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

@@ -206,8 +206,8 @@ public class DurationConstraintAsLocalPostcondEditPart extends AbstractConstrain
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "DurationConstraint";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -770,15 +770,15 @@ public class DurationConstraintAsLocalPostcondEditPart extends AbstractConstrain
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DurationConstraint", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DurationConstraint", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DurationConstraint", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DurationConstraint", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DurationConstraint", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DurationConstraint", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("DurationConstraint", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("DurationConstraint", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/DurationConstraintAsLocalPrecondEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/DurationConstraintAsLocalPrecondEditPart.java
index 14a8bb26ac7..98dbb9d13d8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/DurationConstraintAsLocalPrecondEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/DurationConstraintAsLocalPrecondEditPart.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.DurationConstraintAsLocalPrecondItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

@@ -206,8 +206,8 @@ public class DurationConstraintAsLocalPrecondEditPart extends AbstractConstraint
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "DurationConstraint";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -770,15 +770,15 @@ public class DurationConstraintAsLocalPrecondEditPart extends AbstractConstraint
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DurationConstraint", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DurationConstraint", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DurationConstraint", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DurationConstraint", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DurationConstraint", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DurationConstraint", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("DurationConstraint", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("DurationConstraint", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ExpansionNodeAsInEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ExpansionNodeAsInEditPart.java
index dc52daf9da9..4ebc3cae4eb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ExpansionNodeAsInEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ExpansionNodeAsInEditPart.java
@@ -43,7 +43,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ExpansionNodeAsInItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.PinLayoutEditPolicy;

@@ -138,8 +138,8 @@ public class ExpansionNodeAsInEditPart extends AbstractBorderItemEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "ExpansionNode";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1105,15 +1105,15 @@ public class ExpansionNodeAsInEditPart extends AbstractBorderItemEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ExpansionNode", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ExpansionNode", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ExpansionNode", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ExpansionNode", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ExpansionNode", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ExpansionNode", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("ExpansionNode", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("ExpansionNode", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ExpansionNodeAsOutEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ExpansionNodeAsOutEditPart.java
index a05d1349e49..2e6c27a8aab 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ExpansionNodeAsOutEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ExpansionNodeAsOutEditPart.java
@@ -43,7 +43,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ExpansionNodeAsOutItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.PinLayoutEditPolicy;

@@ -138,8 +138,8 @@ public class ExpansionNodeAsOutEditPart extends AbstractBorderItemEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "ExpansionNode";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1105,15 +1105,15 @@ public class ExpansionNodeAsOutEditPart extends AbstractBorderItemEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ExpansionNode", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ExpansionNode", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ExpansionNode", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ExpansionNode", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ExpansionNode", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ExpansionNode", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("ExpansionNode", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("ExpansionNode", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ExpansionRegionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ExpansionRegionEditPart.java
index 54bedb08420..c6ccd961179 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ExpansionRegionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ExpansionRegionEditPart.java
@@ -45,7 +45,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.draw2d.StructuredActivityNodeFigure;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ExpansionRegionItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

@@ -252,8 +252,8 @@ public class ExpansionRegionEditPart extends UMLNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "ExpansionRegion";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -1458,15 +1458,15 @@ public class ExpansionRegionEditPart extends UMLNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ExpansionRegion", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ExpansionRegion", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ExpansionRegion", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ExpansionRegion", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ExpansionRegion", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ExpansionRegion", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("ExpansionRegion", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("ExpansionRegion", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/FlowFinalNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/FlowFinalNodeEditPart.java
index a234dc879b3..331b97283dc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/FlowFinalNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/FlowFinalNodeEditPart.java
@@ -50,7 +50,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.FlowFinalNodeItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

@@ -1125,15 +1125,15 @@ public class FlowFinalNodeEditPart extends UMLNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("FlowFinalNode", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("FlowFinalNode", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("FlowFinalNode", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("FlowFinalNode", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("FlowFinalNode", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("FlowFinalNode", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("FlowFinalNode", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("FlowFinalNode", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ForkNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ForkNodeEditPart.java
index 4f8c05d9a1c..846890139b9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ForkNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ForkNodeEditPart.java
@@ -47,7 +47,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ForkJoinResizeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ForkNodeItemSemanticEditPolicy;

@@ -205,8 +205,8 @@ public class ForkNodeEditPart extends UMLNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "ForkNode";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -1128,15 +1128,15 @@ public class ForkNodeEditPart extends UMLNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ForkNode", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ForkNode", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ForkNode", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ForkNode", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ForkNode", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ForkNode", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("ForkNode", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("ForkNode", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InitialNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InitialNodeEditPart.java
index 56f0962b204..b3e4552f4da 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InitialNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InitialNodeEditPart.java
@@ -50,7 +50,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.InitialNodeItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

@@ -1125,15 +1125,15 @@ public class InitialNodeEditPart extends UMLNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InitialNode", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InitialNode", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InitialNode", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InitialNode", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InitialNode", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InitialNode", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("InitialNode", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("InitialNode", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInAddStructuralFeatureValueActionAsObjectEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInAddStructuralFeatureValueActionAsObjectEditPart.java
index 7ad175536cc..ad2952a76cb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInAddStructuralFeatureValueActionAsObjectEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInAddStructuralFeatureValueActionAsObjectEditPart.java
@@ -34,7 +34,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.part.AbstractPinEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.InputPinInAddStructuralFeatureValueActionAsObjectItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

@@ -183,8 +183,8 @@ public class InputPinInAddStructuralFeatureValueActionAsObjectEditPart extends A
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "InputPin";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1130,15 +1130,15 @@ public class InputPinInAddStructuralFeatureValueActionAsObjectEditPart extends A
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInAddStructuralFeatureValueActionAsValueEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInAddStructuralFeatureValueActionAsValueEditPart.java
index 686b084ad1b..60d90eba390 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInAddStructuralFeatureValueActionAsValueEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInAddStructuralFeatureValueActionAsValueEditPart.java
@@ -34,7 +34,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.part.AbstractPinEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.InputPinInAddStructuralFeatureValueActionAsValueItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

@@ -183,8 +183,8 @@ public class InputPinInAddStructuralFeatureValueActionAsValueEditPart extends Ab
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "InputPin";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1130,15 +1130,15 @@ public class InputPinInAddStructuralFeatureValueActionAsValueEditPart extends Ab
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInAddVariableValueActionAsInsertAtEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInAddVariableValueActionAsInsertAtEditPart.java
index 305fd16885d..86f056df616 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInAddVariableValueActionAsInsertAtEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInAddVariableValueActionAsInsertAtEditPart.java
@@ -34,7 +34,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.part.AbstractPinEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.InputPinInAddVariableValueActionAsInsertAtItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

@@ -183,8 +183,8 @@ public class InputPinInAddVariableValueActionAsInsertAtEditPart extends Abstract
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "InputPin";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1130,15 +1130,15 @@ public class InputPinInAddVariableValueActionAsInsertAtEditPart extends Abstract
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInAddVariableValueActionAsValueEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInAddVariableValueActionAsValueEditPart.java
index 7e965fa4a9e..736a1d245ea 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInAddVariableValueActionAsValueEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInAddVariableValueActionAsValueEditPart.java
@@ -34,7 +34,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.part.AbstractPinEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.InputPinInAddVariableValueActionAsValueItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

@@ -183,8 +183,8 @@ public class InputPinInAddVariableValueActionAsValueEditPart extends AbstractPin
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "InputPin";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1130,15 +1130,15 @@ public class InputPinInAddVariableValueActionAsValueEditPart extends AbstractPin
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInBroadcastSignalActionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInBroadcastSignalActionEditPart.java
index 7aadf841c88..8d94d17efc7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInBroadcastSignalActionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInBroadcastSignalActionEditPart.java
@@ -34,7 +34,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.part.AbstractPinEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.InputPinInBroadcastSignalActionItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

@@ -187,8 +187,8 @@ public class InputPinInBroadcastSignalActionEditPart extends AbstractPinEditPart
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "InputPin";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1134,15 +1134,15 @@ public class InputPinInBroadcastSignalActionEditPart extends AbstractPinEditPart
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInCallBeActEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInCallBeActEditPart.java
index 4233fa6b7d5..96031122cd0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInCallBeActEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInCallBeActEditPart.java
@@ -48,7 +48,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.part.AbstractPinEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.InputPinInCallBeActItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.NoDeleteFromDiagramEditPolicy;

@@ -199,8 +199,8 @@ public class InputPinInCallBeActEditPart extends AbstractPinEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "InputPin";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1146,15 +1146,15 @@ public class InputPinInCallBeActEditPart extends AbstractPinEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInCallOpActAsTargetEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInCallOpActAsTargetEditPart.java
index e7c9a508195..22d78940c46 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInCallOpActAsTargetEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInCallOpActAsTargetEditPart.java
@@ -48,7 +48,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.part.AbstractPinEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.InputPinInCallOpActAsTargetItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.NoDeleteFromDiagramEditPolicy;

@@ -199,8 +199,8 @@ public class InputPinInCallOpActAsTargetEditPart extends AbstractPinEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "InputPin";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1146,15 +1146,15 @@ public class InputPinInCallOpActAsTargetEditPart extends AbstractPinEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInCallOpActEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInCallOpActEditPart.java
index 9308e3b4537..6c28a2ef89a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInCallOpActEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInCallOpActEditPart.java
@@ -48,7 +48,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.part.AbstractPinEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.InputPinInCallOpActItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.NoDeleteFromDiagramEditPolicy;

@@ -199,8 +199,8 @@ public class InputPinInCallOpActEditPart extends AbstractPinEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "InputPin";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1146,15 +1146,15 @@ public class InputPinInCallOpActEditPart extends AbstractPinEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInDestroyObjectActionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInDestroyObjectActionEditPart.java
index 65efea8b29e..0abc44f9844 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInDestroyObjectActionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInDestroyObjectActionEditPart.java
@@ -34,7 +34,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.part.AbstractPinEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.InputPinInDestroyObjectActionItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.PinLayoutEditPolicy;

@@ -181,8 +181,8 @@ public class InputPinInDestroyObjectActionEditPart extends AbstractPinEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "InputPin";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1128,15 +1128,15 @@ public class InputPinInDestroyObjectActionEditPart extends AbstractPinEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInLoopNodeAsVariableEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInLoopNodeAsVariableEditPart.java
index b645f7a40bb..306a85df01e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInLoopNodeAsVariableEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInLoopNodeAsVariableEditPart.java
@@ -33,7 +33,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.InputPinInLoopNodeAsVariableItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.PinLayoutEditPolicy;

@@ -159,8 +159,8 @@ public class InputPinInLoopNodeAsVariableEditPart extends BorderedBorderItemEdit
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "InputPin";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1106,15 +1106,15 @@ public class InputPinInLoopNodeAsVariableEditPart extends BorderedBorderItemEdit
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInOpaqueActEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInOpaqueActEditPart.java
index be69f3ac1da..6faca0a98db 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInOpaqueActEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInOpaqueActEditPart.java
@@ -47,7 +47,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.part.AbstractPinEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.InputPinInOpaqueActItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

@@ -196,8 +196,8 @@ public class InputPinInOpaqueActEditPart extends AbstractPinEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "InputPin";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1143,15 +1143,15 @@ public class InputPinInOpaqueActEditPart extends AbstractPinEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInReadStructuralFeatureAsObjectEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInReadStructuralFeatureAsObjectEditPart.java
index 3c4a65e5ea7..d18538acd06 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInReadStructuralFeatureAsObjectEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInReadStructuralFeatureAsObjectEditPart.java
@@ -34,7 +34,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.part.AbstractPinEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.InputPinInReadStructuralFeatureAsObjectItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

@@ -183,8 +183,8 @@ public class InputPinInReadStructuralFeatureAsObjectEditPart extends AbstractPin
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "InputPin";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1130,15 +1130,15 @@ public class InputPinInReadStructuralFeatureAsObjectEditPart extends AbstractPin
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInSendObjActAsReqEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInSendObjActAsReqEditPart.java
index c6fc654b07a..91efdf4575e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInSendObjActAsReqEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInSendObjActAsReqEditPart.java
@@ -47,7 +47,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.part.AbstractPinEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.InputPinInSendObjActAsReqItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

@@ -196,8 +196,8 @@ public class InputPinInSendObjActAsReqEditPart extends AbstractPinEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "InputPin";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1143,15 +1143,15 @@ public class InputPinInSendObjActAsReqEditPart extends AbstractPinEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInSendObjActAsTargetEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInSendObjActAsTargetEditPart.java
index 382502c0833..6f331b70618 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInSendObjActAsTargetEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInSendObjActAsTargetEditPart.java
@@ -47,7 +47,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.part.AbstractPinEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.InputPinInSendObjActAsTargetItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

@@ -196,8 +196,8 @@ public class InputPinInSendObjActAsTargetEditPart extends AbstractPinEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "InputPin";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1143,15 +1143,15 @@ public class InputPinInSendObjActAsTargetEditPart extends AbstractPinEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInSendSigActAsTargetEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInSendSigActAsTargetEditPart.java
index e58151b452f..c9fea3ca602 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInSendSigActAsTargetEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInSendSigActAsTargetEditPart.java
@@ -47,7 +47,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.part.AbstractPinEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.InputPinInSendSigActAsTargetItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

@@ -196,8 +196,8 @@ public class InputPinInSendSigActAsTargetEditPart extends AbstractPinEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "InputPin";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1143,15 +1143,15 @@ public class InputPinInSendSigActAsTargetEditPart extends AbstractPinEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInSendSigActEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInSendSigActEditPart.java
index 2b14b0347a5..a5fc56f96c2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInSendSigActEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InputPinInSendSigActEditPart.java
@@ -47,7 +47,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.part.AbstractPinEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.InputPinInSendSigActItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

@@ -196,8 +196,8 @@ public class InputPinInSendSigActEditPart extends AbstractPinEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "InputPin";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1143,15 +1143,15 @@ public class InputPinInSendSigActEditPart extends AbstractPinEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("InputPin", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("InputPin", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InterruptibleActivityRegionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InterruptibleActivityRegionEditPart.java
index 6b6a3f4b5e0..88a233a6dcf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InterruptibleActivityRegionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InterruptibleActivityRegionEditPart.java
@@ -42,7 +42,7 @@ import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.InterruptibleActivityRegionItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.figures.InterruptibleActivityRegionFigure;

@@ -146,8 +146,8 @@ public class InterruptibleActivityRegionEditPart extends NodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "InterruptibleActivityRegion";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -271,15 +271,15 @@ public class InterruptibleActivityRegionEditPart extends NodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InterruptibleActivityRegion", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InterruptibleActivityRegion", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InterruptibleActivityRegion", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InterruptibleActivityRegion", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InterruptibleActivityRegion", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InterruptibleActivityRegion", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("InterruptibleActivityRegion", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("InterruptibleActivityRegion", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/IntervalConstraintAsLocalPostcondEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/IntervalConstraintAsLocalPostcondEditPart.java
index c346aab22c2..5c08b65ae8d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/IntervalConstraintAsLocalPostcondEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/IntervalConstraintAsLocalPostcondEditPart.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.IntervalConstraintAsLocalPostcondItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

@@ -206,8 +206,8 @@ public class IntervalConstraintAsLocalPostcondEditPart extends AbstractConstrain
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "IntervalConstraint";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -770,15 +770,15 @@ public class IntervalConstraintAsLocalPostcondEditPart extends AbstractConstrain
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("IntervalConstraint", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("IntervalConstraint", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("IntervalConstraint", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("IntervalConstraint", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("IntervalConstraint", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("IntervalConstraint", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("IntervalConstraint", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("IntervalConstraint", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/IntervalConstraintAsLocalPrecondEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/IntervalConstraintAsLocalPrecondEditPart.java
index 02893d489aa..50cb86e0365 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/IntervalConstraintAsLocalPrecondEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/IntervalConstraintAsLocalPrecondEditPart.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.IntervalConstraintAsLocalPrecondItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

@@ -206,8 +206,8 @@ public class IntervalConstraintAsLocalPrecondEditPart extends AbstractConstraint
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "IntervalConstraint";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -770,15 +770,15 @@ public class IntervalConstraintAsLocalPrecondEditPart extends AbstractConstraint
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("IntervalConstraint", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("IntervalConstraint", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("IntervalConstraint", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("IntervalConstraint", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("IntervalConstraint", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("IntervalConstraint", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("IntervalConstraint", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("IntervalConstraint", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/JoinNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/JoinNodeEditPart.java
index ba3ba3182a9..16481e0ecbf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/JoinNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/JoinNodeEditPart.java
@@ -47,7 +47,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ForkJoinResizeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.JoinNodeItemSemanticEditPolicy;

@@ -209,8 +209,8 @@ public class JoinNodeEditPart extends UMLNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "JoinNode";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -1132,15 +1132,15 @@ public class JoinNodeEditPart extends UMLNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("JoinNode", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("JoinNode", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("JoinNode", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("JoinNode", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("JoinNode", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("JoinNode", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("JoinNode", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("JoinNode", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/LoopNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/LoopNodeEditPart.java
index f3a77425f25..73591400e73 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/LoopNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/LoopNodeEditPart.java
@@ -46,7 +46,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.draw2d.StructuredActivityNodeFigure;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.LoopNodeItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

@@ -272,8 +272,8 @@ public class LoopNodeEditPart extends UMLNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "LoopNode";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -1478,15 +1478,15 @@ public class LoopNodeEditPart extends UMLNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("LoopNode", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("LoopNode", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("LoopNode", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("LoopNode", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("LoopNode", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("LoopNode", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("LoopNode", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("LoopNode", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/MergeNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/MergeNodeEditPart.java
index 6ea26bd191d..29781e13f41 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/MergeNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/MergeNodeEditPart.java
@@ -47,7 +47,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.MergeNodeItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

@@ -1109,15 +1109,15 @@ public class MergeNodeEditPart extends UMLNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("MergeNode", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("MergeNode", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("MergeNode", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("MergeNode", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("MergeNode", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("MergeNode", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("MergeNode", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("MergeNode", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OpaqueActionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OpaqueActionEditPart.java
index 4f41c3b8723..40c3f817d51 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OpaqueActionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OpaqueActionEditPart.java
@@ -46,7 +46,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.CreateActionLocalConditionEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.CustomDiagramDragDropEditPolicy;

@@ -270,8 +270,8 @@ public class OpaqueActionEditPart extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "OpaqueAction";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -1476,15 +1476,15 @@ public class OpaqueActionEditPart extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OpaqueAction", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OpaqueAction", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OpaqueAction", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OpaqueAction", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OpaqueAction", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OpaqueAction", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("OpaqueAction", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("OpaqueAction", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInAcceptEventActionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInAcceptEventActionEditPart.java
index 1d8a3b83b85..7ca6e94b781 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInAcceptEventActionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInAcceptEventActionEditPart.java
@@ -47,7 +47,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.part.AbstractPinEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OutputPinInAcceptEventActionItemSemanticEditPolicy;

@@ -196,8 +196,8 @@ public class OutputPinInAcceptEventActionEditPart extends AbstractPinEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "OutputPin";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1143,15 +1143,15 @@ public class OutputPinInAcceptEventActionEditPart extends AbstractPinEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInAddStructuralFeatureValueActionAsResultEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInAddStructuralFeatureValueActionAsResultEditPart.java
index 8d5f4c73454..36f89c97e8f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInAddStructuralFeatureValueActionAsResultEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInAddStructuralFeatureValueActionAsResultEditPart.java
@@ -34,7 +34,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.part.AbstractPinEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OutputPinInAddStructuralFeatureValueActionAsResultItemSemanticEditPolicy;

@@ -183,8 +183,8 @@ public class OutputPinInAddStructuralFeatureValueActionAsResultEditPart extends
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "OutputPin";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1130,15 +1130,15 @@ public class OutputPinInAddStructuralFeatureValueActionAsResultEditPart extends
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInCallBeActEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInCallBeActEditPart.java
index ac5dfbc2641..a0b31150e52 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInCallBeActEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInCallBeActEditPart.java
@@ -48,7 +48,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.part.AbstractPinEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.NoDeleteFromDiagramEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

@@ -199,8 +199,8 @@ public class OutputPinInCallBeActEditPart extends AbstractPinEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "OutputPin";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1146,15 +1146,15 @@ public class OutputPinInCallBeActEditPart extends AbstractPinEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInCallOpActEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInCallOpActEditPart.java
index bda2714e2c6..662dfa4703b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInCallOpActEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInCallOpActEditPart.java
@@ -48,7 +48,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.part.AbstractPinEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.NoDeleteFromDiagramEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

@@ -199,8 +199,8 @@ public class OutputPinInCallOpActEditPart extends AbstractPinEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "OutputPin";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1146,15 +1146,15 @@ public class OutputPinInCallOpActEditPart extends AbstractPinEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInCreateObjectActionAsResultEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInCreateObjectActionAsResultEditPart.java
index 563208f3d0f..04219d5a070 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInCreateObjectActionAsResultEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInCreateObjectActionAsResultEditPart.java
@@ -34,7 +34,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.part.AbstractPinEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OutputPinInCreateObjectActionAsResultItemSemanticEditPolicy;

@@ -183,8 +183,8 @@ public class OutputPinInCreateObjectActionAsResultEditPart extends AbstractPinEd
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "OutputPin";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1130,15 +1130,15 @@ public class OutputPinInCreateObjectActionAsResultEditPart extends AbstractPinEd
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInLoopNodeAsBodyOutputEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInLoopNodeAsBodyOutputEditPart.java
index af18389ed37..fff92eb1ab2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInLoopNodeAsBodyOutputEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInLoopNodeAsBodyOutputEditPart.java
@@ -33,7 +33,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OutputPinInLoopNodeAsBodyOutputItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.PinLayoutEditPolicy;

@@ -159,8 +159,8 @@ public class OutputPinInLoopNodeAsBodyOutputEditPart extends BorderedBorderItemE
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "OutputPin";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1106,15 +1106,15 @@ public class OutputPinInLoopNodeAsBodyOutputEditPart extends BorderedBorderItemE
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInLoopNodeAsLoopVariableEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInLoopNodeAsLoopVariableEditPart.java
index 7ba8512b04a..4d4c85ccee5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInLoopNodeAsLoopVariableEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInLoopNodeAsLoopVariableEditPart.java
@@ -33,7 +33,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OutputPinInLoopNodeAsLoopVariableItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.PinLayoutEditPolicy;

@@ -159,8 +159,8 @@ public class OutputPinInLoopNodeAsLoopVariableEditPart extends BorderedBorderIte
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "OutputPin";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1106,15 +1106,15 @@ public class OutputPinInLoopNodeAsLoopVariableEditPart extends BorderedBorderIte
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInLoopNodeAsResultEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInLoopNodeAsResultEditPart.java
index e22bd48993f..dac5b66ce3c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInLoopNodeAsResultEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInLoopNodeAsResultEditPart.java
@@ -33,7 +33,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OutputPinInLoopNodeAsResultItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.PinLayoutEditPolicy;

@@ -159,8 +159,8 @@ public class OutputPinInLoopNodeAsResultEditPart extends BorderedBorderItemEditP
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "OutputPin";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1106,15 +1106,15 @@ public class OutputPinInLoopNodeAsResultEditPart extends BorderedBorderItemEditP
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInOpaqueActEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInOpaqueActEditPart.java
index 40ee08454d6..dd93183e867 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInOpaqueActEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInOpaqueActEditPart.java
@@ -47,7 +47,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.part.AbstractPinEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OutputPinInOpaqueActItemSemanticEditPolicy;

@@ -196,8 +196,8 @@ public class OutputPinInOpaqueActEditPart extends AbstractPinEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "OutputPin";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1143,15 +1143,15 @@ public class OutputPinInOpaqueActEditPart extends AbstractPinEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInReadStructuralFeatureAsResultEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInReadStructuralFeatureAsResultEditPart.java
index 6ecd7c25981..8b1a56ef3ed 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInReadStructuralFeatureAsResultEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInReadStructuralFeatureAsResultEditPart.java
@@ -34,7 +34,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.part.AbstractPinEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OutputPinInReadStructuralFeatureAsResultItemSemanticEditPolicy;

@@ -183,8 +183,8 @@ public class OutputPinInReadStructuralFeatureAsResultEditPart extends AbstractPi
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "OutputPin";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1130,15 +1130,15 @@ public class OutputPinInReadStructuralFeatureAsResultEditPart extends AbstractPi
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInReadVariableActionAsResultEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInReadVariableActionAsResultEditPart.java
index de282c31886..be816012bf8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInReadVariableActionAsResultEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInReadVariableActionAsResultEditPart.java
@@ -34,7 +34,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.part.AbstractPinEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OutputPinInReadVariableActionAsResultItemSemanticEditPolicy;

@@ -183,8 +183,8 @@ public class OutputPinInReadVariableActionAsResultEditPart extends AbstractPinEd
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "OutputPin";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1130,15 +1130,15 @@ public class OutputPinInReadVariableActionAsResultEditPart extends AbstractPinEd
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInValSpecActEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInValSpecActEditPart.java
index 5736d9eb451..08581269c42 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInValSpecActEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/OutputPinInValSpecActEditPart.java
@@ -47,7 +47,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.part.AbstractPinEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OutputPinInValSpecActItemSemanticEditPolicy;

@@ -196,8 +196,8 @@ public class OutputPinInValSpecActEditPart extends AbstractPinEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "OutputPin";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1143,15 +1143,15 @@ public class OutputPinInValSpecActEditPart extends AbstractPinEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ReadSelfActionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ReadSelfActionEditPart.java
index 6e6188a35b9..ac2650d2863 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ReadSelfActionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ReadSelfActionEditPart.java
@@ -33,7 +33,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.CreateActionLocalConditionEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.CustomDiagramDragDropEditPolicy;

@@ -226,8 +226,8 @@ public class ReadSelfActionEditPart extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "ReadSelfAction";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -1432,15 +1432,15 @@ public class ReadSelfActionEditPart extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ReadSelfAction", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ReadSelfAction", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ReadSelfAction", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ReadSelfAction", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ReadSelfAction", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ReadSelfAction", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("ReadSelfAction", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("ReadSelfAction", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ReadSelfActionOutputPinEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ReadSelfActionOutputPinEditPart.java
index 4354a98b8dd..56c9f778ad6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ReadSelfActionOutputPinEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ReadSelfActionOutputPinEditPart.java
@@ -47,7 +47,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.part.AbstractPinEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.PinLayoutEditPolicy;

@@ -196,8 +196,8 @@ public class ReadSelfActionOutputPinEditPart extends AbstractPinEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "OutputPin";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1143,15 +1143,15 @@ public class ReadSelfActionOutputPinEditPart extends AbstractPinEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("OutputPin", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("OutputPin", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ReadStructuralFeatureActionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ReadStructuralFeatureActionEditPart.java
index 6c564263ffe..f39f86a3548 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ReadStructuralFeatureActionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ReadStructuralFeatureActionEditPart.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.CreateActionLocalConditionEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.CustomDiagramDragDropEditPolicy;

@@ -239,8 +239,8 @@ public class ReadStructuralFeatureActionEditPart extends AbstractBorderedShapeEd
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "ReadStructuralFeatureAction";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -1445,15 +1445,15 @@ public class ReadStructuralFeatureActionEditPart extends AbstractBorderedShapeEd
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ReadStructuralFeatureAction", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ReadStructuralFeatureAction", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ReadStructuralFeatureAction", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ReadStructuralFeatureAction", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ReadStructuralFeatureAction", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ReadStructuralFeatureAction", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("ReadStructuralFeatureAction", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("ReadStructuralFeatureAction", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ReadVariableActionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ReadVariableActionEditPart.java
index 6040e111121..4092ecd08cc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ReadVariableActionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ReadVariableActionEditPart.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.CreateActionLocalConditionEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.CustomDiagramDragDropEditPolicy;

@@ -227,8 +227,8 @@ public class ReadVariableActionEditPart extends AbstractBorderedShapeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "ReadVariableAction";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -1433,15 +1433,15 @@ public class ReadVariableActionEditPart extends AbstractBorderedShapeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ReadVariableAction", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ReadVariableAction", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ReadVariableAction", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ReadVariableAction", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ReadVariableAction", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ReadVariableAction", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("ReadVariableAction", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("ReadVariableAction", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/SendObjectActionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/SendObjectActionEditPart.java
index 7b018fd2f94..9773f907a19 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/SendObjectActionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/SendObjectActionEditPart.java
@@ -46,7 +46,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.CreateActionLocalConditionEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.CustomDiagramDragDropEditPolicy;

@@ -294,8 +294,8 @@ public class SendObjectActionEditPart extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "SendObjectAction";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -1500,15 +1500,15 @@ public class SendObjectActionEditPart extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("SendObjectAction", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("SendObjectAction", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("SendObjectAction", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("SendObjectAction", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("SendObjectAction", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("SendObjectAction", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("SendObjectAction", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("SendObjectAction", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/SendSignalActionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/SendSignalActionEditPart.java
index 46eb5798e38..e17506c4299 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/SendSignalActionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/SendSignalActionEditPart.java
@@ -46,7 +46,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.CreateActionLocalConditionEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.CustomDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.DeleteActionViewEditPolicy;

@@ -291,8 +291,8 @@ public class SendSignalActionEditPart extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "SendSignalAction";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -1497,15 +1497,15 @@ public class SendSignalActionEditPart extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("SendSignalAction", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("SendSignalAction", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("SendSignalAction", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("SendSignalAction", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("SendSignalAction", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("SendSignalAction", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("SendSignalAction", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("SendSignalAction", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/SequenceNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/SequenceNodeEditPart.java
index a1d056c10c2..5660af52086 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/SequenceNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/SequenceNodeEditPart.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.draw2d.StructuredActivityNodeFigure;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.SequenceNodeItemSemanticEditPolicy;

@@ -212,8 +212,8 @@ public class SequenceNodeEditPart extends UMLNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "SequenceNode";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -1418,15 +1418,15 @@ public class SequenceNodeEditPart extends UMLNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("SequenceNode", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("SequenceNode", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("SequenceNode", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("SequenceNode", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("SequenceNode", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("SequenceNode", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("SequenceNode", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("SequenceNode", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ShapeNamedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ShapeNamedElementEditPart.java
index 8fcb3894a03..8f5e8a33776 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ShapeNamedElementEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ShapeNamedElementEditPart.java
@@ -45,7 +45,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ShapeNamedElementItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;

@@ -193,8 +193,8 @@ public class ShapeNamedElementEditPart extends AbstractShapeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "ShapeNamedElement";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -313,15 +313,15 @@ public class ShapeNamedElementEditPart extends AbstractShapeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ShapeNamedElement", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ShapeNamedElement", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ShapeNamedElement", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ShapeNamedElement", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ShapeNamedElement", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ShapeNamedElement", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("ShapeNamedElement", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("ShapeNamedElement", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/StructuredActivityNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/StructuredActivityNodeEditPart.java
index 0a7b623fc8c..c981bd7f932 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/StructuredActivityNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/StructuredActivityNodeEditPart.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.draw2d.StructuredActivityNodeFigure;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.StructuredActivityNodeItemSemanticEditPolicy;

@@ -212,8 +212,8 @@ public class StructuredActivityNodeEditPart extends UMLNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "StructuredActivityNode";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -1418,15 +1418,15 @@ public class StructuredActivityNodeEditPart extends UMLNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("StructuredActivityNode", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("StructuredActivityNode", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("StructuredActivityNode", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("StructuredActivityNode", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("StructuredActivityNode", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("StructuredActivityNode", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("StructuredActivityNode", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("StructuredActivityNode", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/TimeConstraintAsLocalPostcondEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/TimeConstraintAsLocalPostcondEditPart.java
index 338cbf5505f..8cb5365376a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/TimeConstraintAsLocalPostcondEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/TimeConstraintAsLocalPostcondEditPart.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.TimeConstraintAsLocalPostcondItemSemanticEditPolicy;

@@ -206,8 +206,8 @@ public class TimeConstraintAsLocalPostcondEditPart extends AbstractConstraintEdi
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "TimeConstraint";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -770,15 +770,15 @@ public class TimeConstraintAsLocalPostcondEditPart extends AbstractConstraintEdi
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("TimeConstraint", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("TimeConstraint", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("TimeConstraint", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("TimeConstraint", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("TimeConstraint", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("TimeConstraint", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("TimeConstraint", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("TimeConstraint", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/TimeConstraintAsLocalPrecondEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/TimeConstraintAsLocalPrecondEditPart.java
index 1c6ebfcbc1b..aeac7a4bc6d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/TimeConstraintAsLocalPrecondEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/TimeConstraintAsLocalPrecondEditPart.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.TimeConstraintAsLocalPrecondItemSemanticEditPolicy;

@@ -206,8 +206,8 @@ public class TimeConstraintAsLocalPrecondEditPart extends AbstractConstraintEdit
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "TimeConstraint";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -770,15 +770,15 @@ public class TimeConstraintAsLocalPrecondEditPart extends AbstractConstraintEdit
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("TimeConstraint", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("TimeConstraint", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("TimeConstraint", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("TimeConstraint", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("TimeConstraint", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("TimeConstraint", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("TimeConstraint", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("TimeConstraint", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInCallBeActEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInCallBeActEditPart.java
index 5797dea114b..48db608d60b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInCallBeActEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInCallBeActEditPart.java
@@ -48,7 +48,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.part.AbstractPinEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.NoDeleteFromDiagramEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

@@ -203,8 +203,8 @@ public class ValuePinInCallBeActEditPart extends AbstractPinEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "ValuePin";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1150,15 +1150,15 @@ public class ValuePinInCallBeActEditPart extends AbstractPinEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ValuePin", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ValuePin", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ValuePin", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ValuePin", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ValuePin", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ValuePin", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("ValuePin", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("ValuePin", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInCallOpActAsTargetEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInCallOpActAsTargetEditPart.java
index 2bebf1074a2..640ba6f6319 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInCallOpActAsTargetEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInCallOpActAsTargetEditPart.java
@@ -48,7 +48,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.part.AbstractPinEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.NoDeleteFromDiagramEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

@@ -203,8 +203,8 @@ public class ValuePinInCallOpActAsTargetEditPart extends AbstractPinEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "ValuePin";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1150,15 +1150,15 @@ public class ValuePinInCallOpActAsTargetEditPart extends AbstractPinEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ValuePin", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ValuePin", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ValuePin", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ValuePin", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ValuePin", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ValuePin", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("ValuePin", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("ValuePin", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInCallOpActEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInCallOpActEditPart.java
index f27f9a77288..59dd1784020 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInCallOpActEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInCallOpActEditPart.java
@@ -48,7 +48,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.part.AbstractPinEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.NoDeleteFromDiagramEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

@@ -203,8 +203,8 @@ public class ValuePinInCallOpActEditPart extends AbstractPinEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "ValuePin";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1150,15 +1150,15 @@ public class ValuePinInCallOpActEditPart extends AbstractPinEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ValuePin", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ValuePin", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ValuePin", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ValuePin", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ValuePin", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ValuePin", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("ValuePin", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("ValuePin", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInOpaqueActEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInOpaqueActEditPart.java
index d2b47246990..29d4499dc84 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInOpaqueActEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInOpaqueActEditPart.java
@@ -47,7 +47,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.part.AbstractPinEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.PinLayoutEditPolicy;

@@ -200,8 +200,8 @@ public class ValuePinInOpaqueActEditPart extends AbstractPinEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "ValuePin";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1147,15 +1147,15 @@ public class ValuePinInOpaqueActEditPart extends AbstractPinEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ValuePin", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ValuePin", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ValuePin", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ValuePin", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ValuePin", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ValuePin", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("ValuePin", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("ValuePin", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInSendObjActAsReqEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInSendObjActAsReqEditPart.java
index d8034ccbab0..714a7085c69 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInSendObjActAsReqEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInSendObjActAsReqEditPart.java
@@ -47,7 +47,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.part.AbstractPinEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.PinLayoutEditPolicy;

@@ -200,8 +200,8 @@ public class ValuePinInSendObjActAsReqEditPart extends AbstractPinEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "ValuePin";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1147,15 +1147,15 @@ public class ValuePinInSendObjActAsReqEditPart extends AbstractPinEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ValuePin", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ValuePin", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ValuePin", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ValuePin", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ValuePin", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ValuePin", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("ValuePin", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("ValuePin", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInSendObjActAsTargetEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInSendObjActAsTargetEditPart.java
index 70ed0b24687..dcbbdb32bb7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInSendObjActAsTargetEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInSendObjActAsTargetEditPart.java
@@ -47,7 +47,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.part.AbstractPinEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.PinLayoutEditPolicy;

@@ -200,8 +200,8 @@ public class ValuePinInSendObjActAsTargetEditPart extends AbstractPinEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "ValuePin";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1147,15 +1147,15 @@ public class ValuePinInSendObjActAsTargetEditPart extends AbstractPinEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ValuePin", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ValuePin", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ValuePin", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ValuePin", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ValuePin", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ValuePin", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("ValuePin", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("ValuePin", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInSendSigActAsTargetEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInSendSigActAsTargetEditPart.java
index a8ba58020dd..e990a25279b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInSendSigActAsTargetEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInSendSigActAsTargetEditPart.java
@@ -47,7 +47,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.part.AbstractPinEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.PinLayoutEditPolicy;

@@ -200,8 +200,8 @@ public class ValuePinInSendSigActAsTargetEditPart extends AbstractPinEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "ValuePin";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1147,15 +1147,15 @@ public class ValuePinInSendSigActAsTargetEditPart extends AbstractPinEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ValuePin", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ValuePin", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ValuePin", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ValuePin", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ValuePin", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ValuePin", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("ValuePin", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("ValuePin", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInSendSigActEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInSendSigActEditPart.java
index 37b6a91f854..f47c1d10479 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInSendSigActEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValuePinInSendSigActEditPart.java
@@ -47,7 +47,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.part.AbstractPinEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.PinLayoutEditPolicy;

@@ -200,8 +200,8 @@ public class ValuePinInSendSigActEditPart extends AbstractPinEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "ValuePin";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1147,15 +1147,15 @@ public class ValuePinInSendSigActEditPart extends AbstractPinEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ValuePin", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ValuePin", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ValuePin", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ValuePin", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ValuePin", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ValuePin", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("ValuePin", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("ValuePin", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValueSpecificationActionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValueSpecificationActionEditPart.java
index b5096986f6d..1d12b7bfc04 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValueSpecificationActionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/ValueSpecificationActionEditPart.java
@@ -46,7 +46,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.CreateActionLocalConditionEditPolicy;

 import org.eclipse.papyrus.uml.diagram.activity.edit.policies.CustomDiagramDragDropEditPolicy;

@@ -239,8 +239,8 @@ public class ValueSpecificationActionEditPart extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "ValueSpecificationAction";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -1445,15 +1445,15 @@ public class ValueSpecificationActionEditPart extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ValueSpecificationAction", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ValueSpecificationAction", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ValueSpecificationAction", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ValueSpecificationAction", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ValueSpecificationAction", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ValueSpecificationAction", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("ValueSpecificationAction", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("ValueSpecificationAction", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/AcceptEventActionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/AcceptEventActionPreferencePage.java
index c5b43f97d5f..932b93d14ad 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/AcceptEventActionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/AcceptEventActionPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 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;

@@ -49,21 +49,21 @@ public class AcceptEventActionPreferencePage extends AbstractPapyrusNodePreferen
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ActivityDiagramEditPart.MODEL_ID + "_AcceptEventAction";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/org/eclipse/papyrus/uml/diagram/activity/preferences/ActionInputPinPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ActionInputPinPreferencePage.java
index f2ae78e651b..61d49734d40 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ActionInputPinPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ActionInputPinPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 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;

@@ -49,21 +49,21 @@ public class ActionInputPinPreferencePage extends AbstractPapyrusNodePreferenceP
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ActivityDiagramEditPart.MODEL_ID + "_ActionInputPin";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 16);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 16);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/org/eclipse/papyrus/uml/diagram/activity/preferences/ActivityCNPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ActivityCNPreferencePage.java
index 81adf90d9ab..13f8e65d562 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ActivityCNPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ActivityCNPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.activity.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;

 

@@ -37,20 +37,20 @@ public class ActivityCNPreferencePage extends AbstractPapyrusNodePreferencePage
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ActivityDiagramEditPart.MODEL_ID + "_ActivityCN";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 200);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 100);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 200);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 100);

 		for(String name : compartments) {

-			String preferenceName = PreferenceConstantHelper.getCompartmentElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/org/eclipse/papyrus/uml/diagram/activity/preferences/ActivityFinalNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ActivityFinalNodePreferencePage.java
index cafb845af4f..796ab226813 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ActivityFinalNodePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ActivityFinalNodePreferencePage.java
@@ -18,7 +18,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 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;

@@ -49,21 +49,21 @@ public class ActivityFinalNodePreferencePage extends AbstractPapyrusNodePreferen
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ActivityDiagramEditPart.MODEL_ID + "_ActivityFinalNode";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 20);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 20);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/org/eclipse/papyrus/uml/diagram/activity/preferences/ActivityParameterNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ActivityParameterNodePreferencePage.java
index 1786a94f663..17519d8340a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ActivityParameterNodePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ActivityParameterNodePreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.activity.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class ActivityParameterNodePreferencePage extends AbstractPapyrusNodePref
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ActivityDiagramEditPart.MODEL_ID + "_ActivityParameterNode";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/org/eclipse/papyrus/uml/diagram/activity/preferences/ActivityPartitionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ActivityPartitionPreferencePage.java
index 0407159bf5f..c3ddc9c18f9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ActivityPartitionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ActivityPartitionPreferencePage.java
@@ -23,7 +23,7 @@ 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.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 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;

@@ -60,26 +60,26 @@ public class ActivityPartitionPreferencePage extends AbstractPapyrusNodePreferen
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ActivityDiagramEditPart.MODEL_ID + "_ActivityPartition";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/org/eclipse/papyrus/uml/diagram/activity/preferences/ActivityPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ActivityPreferencePage.java
index c3fc9def5d6..30116883f37 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ActivityPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ActivityPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;

 

@@ -53,26 +53,26 @@ public class ActivityPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ActivityDiagramEditPart.MODEL_ID + "_Activity";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 857);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 757);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/org/eclipse/papyrus/uml/diagram/activity/preferences/AddStructuralFeatureValueActionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/AddStructuralFeatureValueActionPreferencePage.java
index 22ac2e6b97d..b747a8eab68 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/AddStructuralFeatureValueActionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/AddStructuralFeatureValueActionPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.activity.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class AddStructuralFeatureValueActionPreferencePage extends AbstractPapyr
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ActivityDiagramEditPart.MODEL_ID + "_AddStructuralFeatureValueAction";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/org/eclipse/papyrus/uml/diagram/activity/preferences/AddVariableValueActionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/AddVariableValueActionPreferencePage.java
index f30c4324f82..b9c2afb6082 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/AddVariableValueActionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/AddVariableValueActionPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.activity.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class AddVariableValueActionPreferencePage extends AbstractPapyrusNodePre
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ActivityDiagramEditPart.MODEL_ID + "_AddVariableValueAction";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/org/eclipse/papyrus/uml/diagram/activity/preferences/BroadcastSignalActionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/BroadcastSignalActionPreferencePage.java
index 4780e70ce98..2c4c8d24f90 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/BroadcastSignalActionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/BroadcastSignalActionPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.activity.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class BroadcastSignalActionPreferencePage extends AbstractPapyrusNodePref
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ActivityDiagramEditPart.MODEL_ID + "_BroadcastSignalAction";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/org/eclipse/papyrus/uml/diagram/activity/preferences/CallBehaviorActionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/CallBehaviorActionPreferencePage.java
index f23e416c817..f0e0f7b73fe 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/CallBehaviorActionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/CallBehaviorActionPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.activity.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class CallBehaviorActionPreferencePage extends AbstractPapyrusNodePrefere
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ActivityDiagramEditPart.MODEL_ID + "_CallBehaviorAction";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/org/eclipse/papyrus/uml/diagram/activity/preferences/CallOperationActionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/CallOperationActionPreferencePage.java
index 6f0f43c5375..e047583b835 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/CallOperationActionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/CallOperationActionPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.activity.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class CallOperationActionPreferencePage extends AbstractPapyrusNodePrefer
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ActivityDiagramEditPart.MODEL_ID + "_CallOperationAction";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/org/eclipse/papyrus/uml/diagram/activity/preferences/CentralBufferNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/CentralBufferNodePreferencePage.java
index 1e16293d4b6..fdf213852bf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/CentralBufferNodePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/CentralBufferNodePreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.activity.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class CentralBufferNodePreferencePage extends AbstractPapyrusNodePreferen
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ActivityDiagramEditPart.MODEL_ID + "_CentralBufferNode";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/org/eclipse/papyrus/uml/diagram/activity/preferences/CommentPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/CommentPreferencePage.java
index 8cda8ba3020..8fcdab47a5a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/CommentPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/CommentPreferencePage.java
@@ -14,7 +14,7 @@ package org.eclipse.papyrus.uml.diagram.activity.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;

 

@@ -44,15 +44,15 @@ public class CommentPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ActivityDiagramEditPart.MODEL_ID + "_Comment";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/org/eclipse/papyrus/uml/diagram/activity/preferences/ConditionalNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ConditionalNodePreferencePage.java
index 2c2fc84b678..5cbc343c698 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ConditionalNodePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ConditionalNodePreferencePage.java
@@ -23,7 +23,7 @@ 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.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 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;

@@ -60,26 +60,26 @@ public class ConditionalNodePreferencePage extends AbstractPapyrusNodePreference
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ActivityDiagramEditPart.MODEL_ID + "_ConditionalNode";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/org/eclipse/papyrus/uml/diagram/activity/preferences/ConstraintPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ConstraintPreferencePage.java
index 56bb9dd6b56..f59e56ff771 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ConstraintPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ConstraintPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.activity.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class ConstraintPreferencePage extends AbstractPapyrusNodePreferencePage
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ActivityDiagramEditPart.MODEL_ID + "_Constraint";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/org/eclipse/papyrus/uml/diagram/activity/preferences/ControlFlowPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ControlFlowPreferencePage.java
index e58376aa031..47ff0aae797 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ControlFlowPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ControlFlowPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 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;

@@ -52,7 +52,7 @@ public class ControlFlowPreferencePage extends AbstractPapyrusLinkPreferencePage
 		String key = ActivityDiagramEditPart.MODEL_ID + "_ControlFlow";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/CreateObjectActionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/CreateObjectActionPreferencePage.java
index 80020fd046b..0bb7ca29d66 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/CreateObjectActionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/CreateObjectActionPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.activity.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class CreateObjectActionPreferencePage extends AbstractPapyrusNodePrefere
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ActivityDiagramEditPart.MODEL_ID + "_CreateObjectAction";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/org/eclipse/papyrus/uml/diagram/activity/preferences/DataStoreNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/DataStoreNodePreferencePage.java
index 605987c2094..1186e05e066 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/DataStoreNodePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/DataStoreNodePreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.activity.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class DataStoreNodePreferencePage extends AbstractPapyrusNodePreferencePa
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ActivityDiagramEditPart.MODEL_ID + "_DataStoreNode";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/org/eclipse/papyrus/uml/diagram/activity/preferences/DecisionNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/DecisionNodePreferencePage.java
index eea986b5b26..ef1eeece53f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/DecisionNodePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/DecisionNodePreferencePage.java
@@ -18,7 +18,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 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;

@@ -49,21 +49,21 @@ public class DecisionNodePreferencePage extends AbstractPapyrusNodePreferencePag
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ActivityDiagramEditPart.MODEL_ID + "_DecisionNode";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/org/eclipse/papyrus/uml/diagram/activity/preferences/DestroyObjectActionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/DestroyObjectActionPreferencePage.java
index e2f77fb31ee..9b0b2945e25 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/DestroyObjectActionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/DestroyObjectActionPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.activity.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class DestroyObjectActionPreferencePage extends AbstractPapyrusNodePrefer
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ActivityDiagramEditPart.MODEL_ID + "_DestroyObjectAction";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/org/eclipse/papyrus/uml/diagram/activity/preferences/DurationConstraintPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/DurationConstraintPreferencePage.java
index d00b0546f34..975b5f6b705 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/DurationConstraintPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/DurationConstraintPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.activity.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class DurationConstraintPreferencePage extends AbstractPapyrusNodePrefere
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ActivityDiagramEditPart.MODEL_ID + "_DurationConstraint";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/org/eclipse/papyrus/uml/diagram/activity/preferences/ExpansionNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ExpansionNodePreferencePage.java
index a6f13785e45..5796a5ed30d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ExpansionNodePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ExpansionNodePreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.activity.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class ExpansionNodePreferencePage extends AbstractPapyrusNodePreferencePa
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ActivityDiagramEditPart.MODEL_ID + "_ExpansionNode";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 48);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 16);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/org/eclipse/papyrus/uml/diagram/activity/preferences/ExpansionRegionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ExpansionRegionPreferencePage.java
index 8ce3278ec96..ca5322dff15 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ExpansionRegionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ExpansionRegionPreferencePage.java
@@ -23,7 +23,7 @@ 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.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 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;

@@ -60,26 +60,26 @@ public class ExpansionRegionPreferencePage extends AbstractPapyrusNodePreference
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ActivityDiagramEditPart.MODEL_ID + "_ExpansionRegion";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/org/eclipse/papyrus/uml/diagram/activity/preferences/FlowFinalNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/FlowFinalNodePreferencePage.java
index e526606e26d..fc1869eb716 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/FlowFinalNodePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/FlowFinalNodePreferencePage.java
@@ -18,7 +18,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 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;

@@ -49,21 +49,21 @@ public class FlowFinalNodePreferencePage extends AbstractPapyrusNodePreferencePa
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ActivityDiagramEditPart.MODEL_ID + "_FlowFinalNode";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 20);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 20);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/org/eclipse/papyrus/uml/diagram/activity/preferences/ForkNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ForkNodePreferencePage.java
index eae6214f6c7..612f82d9636 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ForkNodePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ForkNodePreferencePage.java
@@ -18,7 +18,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 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;

@@ -49,21 +49,21 @@ public class ForkNodePreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ActivityDiagramEditPart.MODEL_ID + "_ForkNode";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 10);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/org/eclipse/papyrus/uml/diagram/activity/preferences/InitialNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/InitialNodePreferencePage.java
index 0b7074954fc..ed044ea1210 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/InitialNodePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/InitialNodePreferencePage.java
@@ -18,7 +18,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 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;

@@ -49,21 +49,21 @@ public class InitialNodePreferencePage extends AbstractPapyrusNodePreferencePage
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ActivityDiagramEditPart.MODEL_ID + "_InitialNode";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/org/eclipse/papyrus/uml/diagram/activity/preferences/InputPinPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/InputPinPreferencePage.java
index 89b8966b611..21fcbdf689d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/InputPinPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/InputPinPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 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;

@@ -49,21 +49,21 @@ public class InputPinPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ActivityDiagramEditPart.MODEL_ID + "_InputPin";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 16);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 16);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/org/eclipse/papyrus/uml/diagram/activity/preferences/InteractionConstraintPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/InteractionConstraintPreferencePage.java
index d17a7b0ad08..76b51bf4ec5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/InteractionConstraintPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/InteractionConstraintPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.activity.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class InteractionConstraintPreferencePage extends AbstractPapyrusNodePref
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ActivityDiagramEditPart.MODEL_ID + "_InteractionConstraint";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/org/eclipse/papyrus/uml/diagram/activity/preferences/InterruptibleActivityRegionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/InterruptibleActivityRegionPreferencePage.java
index 2563ef56a11..2b38a744bda 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/InterruptibleActivityRegionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/InterruptibleActivityRegionPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;

 

@@ -53,26 +53,26 @@ public class InterruptibleActivityRegionPreferencePage extends AbstractPapyrusNo
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ActivityDiagramEditPart.MODEL_ID + "_InterruptibleActivityRegion";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/org/eclipse/papyrus/uml/diagram/activity/preferences/IntervalConstraintPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/IntervalConstraintPreferencePage.java
index 51bfee9c819..085e11aa6bb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/IntervalConstraintPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/IntervalConstraintPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.activity.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class IntervalConstraintPreferencePage extends AbstractPapyrusNodePrefere
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ActivityDiagramEditPart.MODEL_ID + "_IntervalConstraint";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/org/eclipse/papyrus/uml/diagram/activity/preferences/JoinNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/JoinNodePreferencePage.java
index ac7248ad5ae..546243f4d8f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/JoinNodePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/JoinNodePreferencePage.java
@@ -18,7 +18,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 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;

@@ -49,21 +49,21 @@ public class JoinNodePreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ActivityDiagramEditPart.MODEL_ID + "_JoinNode";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 10);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/org/eclipse/papyrus/uml/diagram/activity/preferences/LoopNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/LoopNodePreferencePage.java
index 6253ac73732..06c1415f807 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/LoopNodePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/LoopNodePreferencePage.java
@@ -23,7 +23,7 @@ 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.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 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;

@@ -60,26 +60,26 @@ public class LoopNodePreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ActivityDiagramEditPart.MODEL_ID + "_LoopNode";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/org/eclipse/papyrus/uml/diagram/activity/preferences/MergeNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/MergeNodePreferencePage.java
index 05a13ee4036..af73958f608 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/MergeNodePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/MergeNodePreferencePage.java
@@ -18,7 +18,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 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;

@@ -49,21 +49,21 @@ public class MergeNodePreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ActivityDiagramEditPart.MODEL_ID + "_MergeNode";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/org/eclipse/papyrus/uml/diagram/activity/preferences/ObjectFlowPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ObjectFlowPreferencePage.java
index d8c11af38af..bae75eef2d2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ObjectFlowPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ObjectFlowPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 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;

@@ -52,7 +52,7 @@ public class ObjectFlowPreferencePage extends AbstractPapyrusLinkPreferencePage
 		String key = ActivityDiagramEditPart.MODEL_ID + "_ObjectFlow";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/OpaqueActionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/OpaqueActionPreferencePage.java
index 483b18ba8ac..7e62de31762 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/OpaqueActionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/OpaqueActionPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.activity.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class OpaqueActionPreferencePage extends AbstractPapyrusNodePreferencePag
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ActivityDiagramEditPart.MODEL_ID + "_OpaqueAction";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/org/eclipse/papyrus/uml/diagram/activity/preferences/OutputPinPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/OutputPinPreferencePage.java
index 6eb61807a77..9e83ed85fd3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/OutputPinPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/OutputPinPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 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;

@@ -49,21 +49,21 @@ public class OutputPinPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ActivityDiagramEditPart.MODEL_ID + "_OutputPin";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 16);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 16);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/org/eclipse/papyrus/uml/diagram/activity/preferences/ParameterPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ParameterPreferencePage.java
index 62c639409b6..1cb0904a26e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ParameterPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ParameterPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.activity.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class ParameterPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ActivityDiagramEditPart.MODEL_ID + "_Parameter";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/org/eclipse/papyrus/uml/diagram/activity/preferences/ReadSelfActionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ReadSelfActionPreferencePage.java
index 2faaa8f1469..aebde77bcaa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ReadSelfActionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ReadSelfActionPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.activity.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class ReadSelfActionPreferencePage extends AbstractPapyrusNodePreferenceP
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ActivityDiagramEditPart.MODEL_ID + "_ReadSelfAction";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/org/eclipse/papyrus/uml/diagram/activity/preferences/ReadStructuralFeatureActionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ReadStructuralFeatureActionPreferencePage.java
index fc16cc09f0b..5bed8396c95 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ReadStructuralFeatureActionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ReadStructuralFeatureActionPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.activity.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class ReadStructuralFeatureActionPreferencePage extends AbstractPapyrusNo
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ActivityDiagramEditPart.MODEL_ID + "_ReadStructuralFeatureAction";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/org/eclipse/papyrus/uml/diagram/activity/preferences/ReadVariableActionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ReadVariableActionPreferencePage.java
index e9f2d5c77f5..8a9d83419c9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ReadVariableActionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ReadVariableActionPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.activity.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class ReadVariableActionPreferencePage extends AbstractPapyrusNodePrefere
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ActivityDiagramEditPart.MODEL_ID + "_ReadVariableAction";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/org/eclipse/papyrus/uml/diagram/activity/preferences/SendObjectActionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/SendObjectActionPreferencePage.java
index f73ff7e3741..b9702bbb0a6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/SendObjectActionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/SendObjectActionPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.activity.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class SendObjectActionPreferencePage extends AbstractPapyrusNodePreferenc
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ActivityDiagramEditPart.MODEL_ID + "_SendObjectAction";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/org/eclipse/papyrus/uml/diagram/activity/preferences/SendSignalActionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/SendSignalActionPreferencePage.java
index 7be6d6bd015..f73bee870ed 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/SendSignalActionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/SendSignalActionPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.activity.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class SendSignalActionPreferencePage extends AbstractPapyrusNodePreferenc
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ActivityDiagramEditPart.MODEL_ID + "_SendSignalAction";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/org/eclipse/papyrus/uml/diagram/activity/preferences/SequenceNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/SequenceNodePreferencePage.java
index c63cb2403d7..5b5c31ac110 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/SequenceNodePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/SequenceNodePreferencePage.java
@@ -23,7 +23,7 @@ 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.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 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;

@@ -60,26 +60,26 @@ public class SequenceNodePreferencePage extends AbstractPapyrusNodePreferencePag
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ActivityDiagramEditPart.MODEL_ID + "_SequenceNode";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/org/eclipse/papyrus/uml/diagram/activity/preferences/ShapeNamedElementPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ShapeNamedElementPreferencePage.java
index 4b4f7581dc5..f68dde462fd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ShapeNamedElementPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ShapeNamedElementPreferencePage.java
@@ -17,7 +17,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 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;

@@ -48,21 +48,21 @@ public class ShapeNamedElementPreferencePage extends AbstractPapyrusNodePreferen
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ActivityDiagramEditPart.MODEL_ID + "_ShapeNamedElement";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/org/eclipse/papyrus/uml/diagram/activity/preferences/StructuredActivityNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/StructuredActivityNodePreferencePage.java
index 46f14e9bc47..3daa19f9f9c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/StructuredActivityNodePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/StructuredActivityNodePreferencePage.java
@@ -23,7 +23,7 @@ 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.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 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;

@@ -60,26 +60,26 @@ public class StructuredActivityNodePreferencePage extends AbstractPapyrusNodePre
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ActivityDiagramEditPart.MODEL_ID + "_StructuredActivityNode";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/org/eclipse/papyrus/uml/diagram/activity/preferences/TimeConstraintPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/TimeConstraintPreferencePage.java
index 41208f55d65..a891d138b74 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/TimeConstraintPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/TimeConstraintPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.activity.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class TimeConstraintPreferencePage extends AbstractPapyrusNodePreferenceP
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ActivityDiagramEditPart.MODEL_ID + "_TimeConstraint";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/org/eclipse/papyrus/uml/diagram/activity/preferences/ValuePinPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ValuePinPreferencePage.java
index d3370edae32..fce446e9545 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ValuePinPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ValuePinPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 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;

@@ -49,21 +49,21 @@ public class ValuePinPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ActivityDiagramEditPart.MODEL_ID + "_ValuePin";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 16);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 16);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/org/eclipse/papyrus/uml/diagram/activity/preferences/ValueSpecificationActionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ValueSpecificationActionPreferencePage.java
index baaefb9be54..5d3a48fbb8d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ValueSpecificationActionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/preferences/ValueSpecificationActionPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.activity.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActivityDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class ValueSpecificationActionPreferencePage extends AbstractPapyrusNodeP
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ActivityDiagramEditPart.MODEL_ID + "_ValueSpecificationAction";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/org/eclipse/papyrus/uml/diagram/activity/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/providers/UMLViewProvider.java
index d53ff95b6a4..447b7fb1976 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/providers/UMLViewProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/providers/UMLViewProvider.java
@@ -56,7 +56,7 @@ import org.eclipse.jface.preference.PreferenceConverter;
 import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

 import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.parts.*;

 import org.eclipse.papyrus.uml.diagram.activity.locator.PinPositionLocator;

 import org.eclipse.papyrus.uml.diagram.activity.part.UMLVisualIDRegistry;

@@ -3362,8 +3362,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	private void initFontStyleFromPrefs(View view, final IPreferenceStore store, String elementName) {

-		String fontConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.FONT);

-		String fontColorConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_FONT);

+		String fontConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.FONT);

+		String fontColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_FONT);

 		FontStyle viewFontStyle = (FontStyle)view.getStyle(NotationPackage.Literals.FONT_STYLE);

 		if(viewFontStyle != null) {

 			FontData fontData = PreferenceConverter.getFontData(store, fontConstant);

@@ -3380,7 +3380,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	private void initForegroundFromPrefs(View view, final IPreferenceStore store, String elementName) {

-		String lineColorConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_LINE);

+		String lineColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_LINE);

 		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(store, lineColorConstant);

 		ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getLineStyle_LineColor(), FigureUtilities.RGBToInteger(lineRGB));

 	}

@@ -3389,9 +3389,9 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	private void initBackgroundFromPrefs(View view, final IPreferenceStore store, String elementName) {

-		String fillColorConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_FILL);

-		String gradientColorConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_GRADIENT);

-		String gradientPolicyConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.GRADIENT_POLICY);

+		String fillColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_FILL);

+		String gradientColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_GRADIENT);

+		String gradientPolicyConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.GRADIENT_POLICY);

 		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(store, fillColorConstant);

 		ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getFillStyle_FillColor(), FigureUtilities.RGBToInteger(fillRGB));

 		FillStyle fillStyle = (FillStyle)view.getStyle(NotationPackage.Literals.FILL_STYLE);

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 984bfae9dfe..09689e8b0cb 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
@@ -58,7 +58,7 @@ Require-Bundle: org.eclipse.core.expressions,
  org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.0",

  org.eclipse.papyrus.uml.service.types;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.widgets;bundle-version="1.0.0",

- com.google.guava;bundle-version="10.0.1",

+ com.google.guava;bundle-version="11.0.0",

  org.eclipse.papyrus.infra.emf;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.0.0",

  org.eclipse.papyrus.uml.appearance;bundle-version="1.0.0",

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CShapeNamedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CShapeNamedElementEditPart.java
index 7d130955f30..4015d261fb1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CShapeNamedElementEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/edit/part/CShapeNamedElementEditPart.java
@@ -22,7 +22,7 @@ import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.appearance.helper.AppliedStereotypeHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ShapeNamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

@@ -54,8 +54,8 @@ public class CShapeNamedElementEditPart extends ShapeNamedElementEditPart {
 		

 		String prefElementId = "ShapeNamedElement";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 

 		SVGNodePlateFigure svgNodePlateFigure=new SVGNodePlateFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		if(tokenizer.hasMoreTokens()) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/figure/CustomContextLinkFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/figure/CustomContextLinkFigure.java
index 503cc4c3282..7c1c0bd9944 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/figure/CustomContextLinkFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/figure/CustomContextLinkFigure.java
@@ -41,7 +41,11 @@ public class CustomContextLinkFigure extends DashedEdgeFigure {
 		add(conveyedLabel, 0);

 	}

 

-	protected void setStyle() {

+	/**

+	 * @see org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure#resetStyle()

+	 */

+	@Override

+	public void resetStyle() {

 		PolylineDecoration dec = new PolylineDecoration();

 		dec.setScale(15, 5);

 		dec.setLineWidth(1);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/AbstractPackageableElementCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/AbstractPackageableElementCompartmentEditPart.java
index 55c60cf63ca..8b9e612d08c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/AbstractPackageableElementCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/policies/AbstractPackageableElementCompartmentEditPart.java
@@ -18,16 +18,16 @@ import org.eclipse.gef.Request;
 import org.eclipse.gef.RequestConstants;

 import org.eclipse.gef.requests.SelectionRequest;

 import org.eclipse.gef.tools.DeselectAllTracker;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.internal.tools.RubberbandDragTracker;

 import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.XYLayoutShapeCompartmentEditPart;

 

 /**

  * this is an abstract editpart used to allow double click on XY layout compartment

  * 

  */

 @SuppressWarnings("restriction")

-public abstract class AbstractPackageableElementCompartmentEditPart extends ShapeCompartmentEditPart {

+public abstract class AbstractPackageableElementCompartmentEditPart extends XYLayoutShapeCompartmentEditPart {

 

 	public AbstractPackageableElementCompartmentEditPart(View view) {

 		super(view);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/preferences/InstanceSpecificationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/preferences/InstanceSpecificationPreferencePage.java
index 84c167c8b26..22042e18e2e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/preferences/InstanceSpecificationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/preferences/InstanceSpecificationPreferencePage.java
@@ -17,7 +17,7 @@ import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusElementPreferencePage;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.uml.tools.utils.ICustomAppearence;

 import org.eclipse.swt.SWT;

@@ -74,12 +74,12 @@ public class InstanceSpecificationPreferencePage extends AbstractPapyrusElementP
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String elementName = "InstanceSpecification";

-		PreferenceConverter.setDefault(store, PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		PreferenceConverter.setDefault(store, PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(177, 207, 229));

+		PreferenceConverter.setDefault(store, PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

+		PreferenceConverter.setDefault(store, PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(177, 207, 229));

 		// Set the default for the gradient

-		store.setDefault(PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.GRADIENT_POLICY), false);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.GRADIENT_POLICY), false);

 		GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(new org.eclipse.swt.graphics.RGB(255, 255, 255), new org.eclipse.swt.graphics.RGB(177, 207, 229), 0, 0);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

 		// custom code

 		store.setDefault(IPapyrusInstancePreferencesConstant.INSTANCESPECIFICATION_LABEL_DISPLAY_PREFERENCE, ICustomAppearence.DEFAULT_UML_INSTANCESPECIFICATION);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/preferences/OperationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/preferences/OperationPreferencePage.java
index dc5dbc67b32..c5783e5afaf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/preferences/OperationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/preferences/OperationPreferencePage.java
@@ -17,7 +17,7 @@ import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusElementPreferencePage;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.uml.tools.utils.ICustomAppearence;

 import org.eclipse.swt.SWT;

@@ -78,12 +78,12 @@ public class OperationPreferencePage extends AbstractPapyrusElementPreferencePag
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String elementName = "Operation";

-		PreferenceConverter.setDefault(store, PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		PreferenceConverter.setDefault(store, PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(177, 207, 229));

+		PreferenceConverter.setDefault(store, PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

+		PreferenceConverter.setDefault(store, PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(177, 207, 229));

 		// Set the default for the gradient

-		store.setDefault(PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.GRADIENT_POLICY), false);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.GRADIENT_POLICY), false);

 		GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(new org.eclipse.swt.graphics.RGB(255, 255, 255), new org.eclipse.swt.graphics.RGB(177, 207, 229), 0, 0);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

 		// default for Operation label display

 		store.setDefault(IPapyrusOperationPreferencesConstant.OPERATION_LABEL_DISPLAY_PREFERENCE, ICustomAppearence.DEFAULT_UML_OPERATION);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/preferences/PropertyPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/preferences/PropertyPreferencePage.java
index c32c6f9a3ed..7c15103b18f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/preferences/PropertyPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/custom/preferences/PropertyPreferencePage.java
@@ -17,7 +17,7 @@ import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusElementPreferencePage;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.uml.tools.utils.ICustomAppearence;

 import org.eclipse.swt.SWT;

@@ -75,12 +75,12 @@ public class PropertyPreferencePage extends AbstractPapyrusElementPreferencePage
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String elementName = "Property";

-		PreferenceConverter.setDefault(store, PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		PreferenceConverter.setDefault(store, PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(177, 207, 229));

+		PreferenceConverter.setDefault(store, PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

+		PreferenceConverter.setDefault(store, PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(177, 207, 229));

 		// Set the default for the gradient

-		store.setDefault(PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.GRADIENT_POLICY), false);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.GRADIENT_POLICY), false);

 		GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(new org.eclipse.swt.graphics.RGB(255, 255, 255), new org.eclipse.swt.graphics.RGB(177, 207, 229), 0, 0);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

 		// custom code

 		store.setDefault(IPapyrusPropertyPreferencesConstant.PROPERTY_LABEL_DISPLAY_PREFERENCE, ICustomAppearence.DEFAULT_UML_PROPERTY);

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassEditPart.java
index 09d4cfc925a..e6f6f35d5c1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationClassEditPart.java
@@ -42,7 +42,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomAssociationClassItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.AssociationClassItemSemanticEditPolicy;

@@ -249,8 +249,8 @@ public class AssociationClassEditPart extends ClassifierEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "AssociationClass";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -2161,15 +2161,15 @@ public class AssociationClassEditPart extends ClassifierEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("AssociationClass", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("AssociationClass", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("AssociationClass", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("AssociationClass", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("AssociationClass", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("AssociationClass", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("AssociationClass", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("AssociationClass", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationNodeEditPart.java
index f894e5197a7..1d45b112305 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/AssociationNodeEditPart.java
@@ -44,7 +44,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomAssociationNodeItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.AssociationNodeItemSemanticEditPolicy;

@@ -138,8 +138,8 @@ public class AssociationNodeEditPart extends ShapeNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "AssociationNode";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -2103,15 +2103,15 @@ public class AssociationNodeEditPart extends ShapeNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("AssociationNode", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("AssociationNode", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("AssociationNode", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("AssociationNode", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("AssociationNode", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("AssociationNode", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("AssociationNode", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("AssociationNode", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassEditPart.java
index 544eb10ca54..b0bea20a0cd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassEditPart.java
@@ -47,7 +47,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.locator.ContainmentPositionLocator;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

@@ -305,8 +305,8 @@ public class ClassEditPart extends ClassifierEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Class";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -2235,15 +2235,15 @@ public class ClassEditPart extends ClassifierEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Class", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Class", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Class", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Class", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Class", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Class", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Class", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Class", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassEditPartCN.java
index 133a6035f15..364ae7b0836 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ClassEditPartCN.java
@@ -47,7 +47,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

@@ -291,8 +291,8 @@ public class ClassEditPartCN extends ClassifierEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Class";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -2221,15 +2221,15 @@ public class ClassEditPartCN extends ClassifierEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Class", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Class", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Class", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Class", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Class", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Class", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Class", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Class", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentEditPart.java
index 13b3e8952e3..210c23b2855 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentEditPart.java
@@ -39,7 +39,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.CommentItemSemanticEditPolicy;

@@ -197,8 +197,8 @@ public class CommentEditPart extends AbstractCommentEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Comment";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -483,15 +483,15 @@ public class CommentEditPart extends AbstractCommentEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentEditPartCN.java
index af1d8621ba7..8be52798aea 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/CommentEditPartCN.java
@@ -39,7 +39,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.CommentItemSemanticEditPolicyCN;

@@ -197,8 +197,8 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Comment";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -483,15 +483,15 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentEditPart.java
index 3616c3eb505..cff6b9baca0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentEditPart.java
@@ -46,7 +46,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

@@ -283,8 +283,8 @@ public class ComponentEditPart extends ClassifierEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Component";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -2213,15 +2213,15 @@ public class ComponentEditPart extends ClassifierEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Component", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Component", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Component", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Component", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentEditPartCN.java
index 827bad52ee6..a69e5ca3f4e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ComponentEditPartCN.java
@@ -46,7 +46,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

@@ -283,8 +283,8 @@ public class ComponentEditPartCN extends ClassifierEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Component";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -2213,15 +2213,15 @@ public class ComponentEditPartCN extends ClassifierEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Component", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Component", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Component", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Component", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintEditPart.java
index 863e0a22678..a49275835fd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintEditPart.java
@@ -39,7 +39,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomConstraintItemSemanticEditPolicy;

@@ -206,8 +206,8 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Constraint";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -1596,15 +1596,15 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintEditPartCN.java
index 5e39c642855..64f8e8d3081 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ConstraintEditPartCN.java
@@ -39,7 +39,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomConstraint2ItemSemanticEditPolicy;

@@ -206,8 +206,8 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Constraint";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -1596,15 +1596,15 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContainmentCircleEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContainmentCircleEditPart.java
index 57800a74995..360d406c6fe 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContainmentCircleEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ContainmentCircleEditPart.java
@@ -34,7 +34,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.ContainmentFigure;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomContainmentCircleItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

@@ -137,8 +137,8 @@ public class ContainmentCircleEditPart extends AbstractBorderItemEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "ContainmentCircle";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -226,15 +226,15 @@ public class ContainmentCircleEditPart extends AbstractBorderItemEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ContainmentCircle", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ContainmentCircle", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ContainmentCircle", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ContainmentCircle", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ContainmentCircle", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ContainmentCircle", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("ContainmentCircle", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("ContainmentCircle", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeEditPart.java
index d888c97f163..3d9a55cbe76 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeEditPart.java
@@ -46,7 +46,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

@@ -269,8 +269,8 @@ public class DataTypeEditPart extends ClassifierEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "DataType";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -2168,15 +2168,15 @@ public class DataTypeEditPart extends ClassifierEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DataType", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DataType", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DataType", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DataType", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DataType", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DataType", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("DataType", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("DataType", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeEditPartCN.java
index 713bf1b02cf..2a0d8448e22 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DataTypeEditPartCN.java
@@ -46,7 +46,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

@@ -269,8 +269,8 @@ public class DataTypeEditPartCN extends ClassifierEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "DataType";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -2168,15 +2168,15 @@ public class DataTypeEditPartCN extends ClassifierEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DataType", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DataType", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DataType", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DataType", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DataType", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DataType", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("DataType", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("DataType", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DefaultNamedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DefaultNamedElementEditPart.java
index b831862c441..710a85aaecb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DefaultNamedElementEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DefaultNamedElementEditPart.java
@@ -40,7 +40,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomDefaultNamedElementItemSemanticEditPolicy;

@@ -202,8 +202,8 @@ public class DefaultNamedElementEditPart extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "DefaultNamedElement";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -1336,15 +1336,15 @@ public class DefaultNamedElementEditPart extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DefaultNamedElement", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DefaultNamedElement", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DefaultNamedElement", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DefaultNamedElement", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DefaultNamedElement", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DefaultNamedElement", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("DefaultNamedElement", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("DefaultNamedElement", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyNodeEditPart.java
index 7c68f9522f6..cc2f3a74a5b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DependencyNodeEditPart.java
@@ -49,7 +49,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.DependencyNodeItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

@@ -169,8 +169,8 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "DependencyNode";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -1357,15 +1357,15 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DependencyNode", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DependencyNode", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DependencyNode", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DependencyNode", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DependencyNode", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DependencyNode", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("DependencyNode", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("DependencyNode", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DurationObservationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DurationObservationEditPart.java
index 2826803ca5a..84c289e8ccd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DurationObservationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/DurationObservationEditPart.java
@@ -46,7 +46,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part.AbstractObservationEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.DurationObservationNodeFigure;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

@@ -204,8 +204,8 @@ public class DurationObservationEditPart extends AbstractObservationEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "DurationObservation";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -1487,15 +1487,15 @@ public class DurationObservationEditPart extends AbstractObservationEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DurationObservation", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DurationObservation", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DurationObservation", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DurationObservation", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DurationObservation", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DurationObservation", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("DurationObservation", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("DurationObservation", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEditPart.java
index 4a5eb16020b..c9bfb3d3ae0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEditPart.java
@@ -42,7 +42,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomEnumerationItemSemanticEditPolicy;

@@ -224,8 +224,8 @@ public class EnumerationEditPart extends ClassifierEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Enumeration";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -2120,15 +2120,15 @@ public class EnumerationEditPart extends ClassifierEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Enumeration", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Enumeration", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Enumeration", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Enumeration", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Enumeration", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Enumeration", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Enumeration", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Enumeration", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEditPartCN.java
index b050262ae2c..8ee7d1f9e2f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/EnumerationEditPartCN.java
@@ -42,7 +42,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomEnumerationItemSemanticEditPolicyCN;

@@ -224,8 +224,8 @@ public class EnumerationEditPartCN extends ClassifierEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Enumeration";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -2120,15 +2120,15 @@ public class EnumerationEditPartCN extends ClassifierEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Enumeration", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Enumeration", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Enumeration", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Enumeration", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Enumeration", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Enumeration", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Enumeration", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Enumeration", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemEditPart.java
index 130678ce5f6..ac24403f27c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemEditPart.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.InformationItemFigure;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

@@ -203,8 +203,8 @@ public class InformationItemEditPart extends ClassifierEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "InformationItem";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -2085,15 +2085,15 @@ public class InformationItemEditPart extends ClassifierEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InformationItem", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InformationItem", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InformationItem", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InformationItem", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InformationItem", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InformationItem", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("InformationItem", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("InformationItem", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemEditPartCN.java
index 4b3ed1bcb56..ed87072a7d7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InformationItemEditPartCN.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.InformationItemFigure;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

@@ -203,8 +203,8 @@ public class InformationItemEditPartCN extends ClassifierEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "InformationItem";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -2085,15 +2085,15 @@ public class InformationItemEditPartCN extends ClassifierEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InformationItem", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InformationItem", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InformationItem", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InformationItem", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InformationItem", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InformationItem", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("InformationItem", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("InformationItem", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationEditPart.java
index d8efb018d63..beb9d318f12 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationEditPart.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomInstanceSpecificationItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InstanceSpecificationItemSemanticEditPolicy;

@@ -221,8 +221,8 @@ public class InstanceSpecificationEditPart extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "InstanceSpecification";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -1393,15 +1393,15 @@ public class InstanceSpecificationEditPart extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InstanceSpecification", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InstanceSpecification", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InstanceSpecification", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InstanceSpecification", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InstanceSpecification", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InstanceSpecification", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("InstanceSpecification", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("InstanceSpecification", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationEditPartCN.java
index 1a46109a290..53f5c7aaf8b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InstanceSpecificationEditPartCN.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomInstanceSpecificationItemSemanticEditPolicyCN;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.InstanceSpecificationItemSemanticEditPolicyCN;

@@ -221,8 +221,8 @@ public class InstanceSpecificationEditPartCN extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "InstanceSpecification";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -1393,15 +1393,15 @@ public class InstanceSpecificationEditPartCN extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InstanceSpecification", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InstanceSpecification", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InstanceSpecification", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InstanceSpecification", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InstanceSpecification", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InstanceSpecification", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("InstanceSpecification", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("InstanceSpecification", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceEditPart.java
index 9e8923487bc..9bedf2a0c48 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceEditPart.java
@@ -46,7 +46,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomInterfaceItemSemanticEditPolicy;

@@ -279,8 +279,8 @@ public class InterfaceEditPart extends ClassifierEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Interface";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -2206,15 +2206,15 @@ public class InterfaceEditPart extends ClassifierEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Interface", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Interface", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Interface", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Interface", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Interface", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Interface", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Interface", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Interface", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceEditPartCN.java
index 11ff8f53778..81860de8aa8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/InterfaceEditPartCN.java
@@ -46,7 +46,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomInterfaceItemSemanticEditPolicyCN;

@@ -281,8 +281,8 @@ public class InterfaceEditPartCN extends ClassifierEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Interface";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -2208,15 +2208,15 @@ public class InterfaceEditPartCN extends ClassifierEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Interface", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Interface", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Interface", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Interface", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Interface", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Interface", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Interface", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Interface", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelEditPartCN.java
index b599f8fd9b8..1350ec46655 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelEditPartCN.java
@@ -43,7 +43,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

@@ -261,8 +261,8 @@ public class ModelEditPartCN extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Model";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -1721,15 +1721,15 @@ public class ModelEditPartCN extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Model", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Model", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Model", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Model", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Model", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Model", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Model", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Model", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelEditPartTN.java
index 68267d33ac2..b79cf5b9c4b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ModelEditPartTN.java
@@ -43,7 +43,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

@@ -261,8 +261,8 @@ public class ModelEditPartTN extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Model";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -1721,15 +1721,15 @@ public class ModelEditPartTN extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Model", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Model", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Model", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Model", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Model", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Model", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Model", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Model", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageEditPart.java
index 6a2a8f854b3..82b37eed278 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageEditPart.java
@@ -43,7 +43,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

@@ -263,8 +263,8 @@ public class PackageEditPart extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Package";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -1723,15 +1723,15 @@ public class PackageEditPart extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Package", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Package", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Package", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Package", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Package", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Package", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Package", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Package", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageEditPartCN.java
index 6bf5eba49a7..935c67df5d0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PackageEditPartCN.java
@@ -43,7 +43,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

@@ -259,8 +259,8 @@ public class PackageEditPartCN extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Package";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -1719,15 +1719,15 @@ public class PackageEditPartCN extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Package", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Package", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Package", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Package", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Package", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Package", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Package", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Package", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeEditPart.java
index 48fde17dd19..d20329f043c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeEditPart.java
@@ -42,7 +42,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

@@ -244,8 +244,8 @@ public class PrimitiveTypeEditPart extends ClassifierEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "PrimitiveType";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -2143,15 +2143,15 @@ public class PrimitiveTypeEditPart extends ClassifierEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("PrimitiveType", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("PrimitiveType", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("PrimitiveType", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("PrimitiveType", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("PrimitiveType", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("PrimitiveType", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("PrimitiveType", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("PrimitiveType", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeEditPartCN.java
index 1333286f0de..45ab434a80f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/PrimitiveTypeEditPartCN.java
@@ -42,7 +42,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

@@ -242,8 +242,8 @@ public class PrimitiveTypeEditPartCN extends ClassifierEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "PrimitiveType";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -2141,15 +2141,15 @@ public class PrimitiveTypeEditPartCN extends ClassifierEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("PrimitiveType", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("PrimitiveType", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("PrimitiveType", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("PrimitiveType", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("PrimitiveType", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("PrimitiveType", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("PrimitiveType", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("PrimitiveType", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/RedefinableTemplateSignatureEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/RedefinableTemplateSignatureEditPart.java
index d69112848cb..0c8e964a690 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/RedefinableTemplateSignatureEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/RedefinableTemplateSignatureEditPart.java
@@ -42,7 +42,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part.AbstractRedefinableTemplateSignatureEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.TemplateFigure;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

@@ -206,8 +206,8 @@ public class RedefinableTemplateSignatureEditPart extends AbstractRedefinableTem
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "RedefinableTemplateSignature";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1358,15 +1358,15 @@ public class RedefinableTemplateSignatureEditPart extends AbstractRedefinableTem
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("RedefinableTemplateSignature", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("RedefinableTemplateSignature", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("RedefinableTemplateSignature", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("RedefinableTemplateSignature", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("RedefinableTemplateSignature", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("RedefinableTemplateSignature", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("RedefinableTemplateSignature", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("RedefinableTemplateSignature", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ShapeNamedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ShapeNamedElementEditPart.java
index c8ccf216e24..38876cf0a81 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ShapeNamedElementEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ShapeNamedElementEditPart.java
@@ -48,7 +48,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ShapeNamedElementLayoutEditPolicy;

@@ -204,8 +204,8 @@ public class ShapeNamedElementEditPart extends AbstractShapeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "ShapeNamedElement";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -1333,15 +1333,15 @@ public class ShapeNamedElementEditPart extends AbstractShapeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ShapeNamedElement", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ShapeNamedElement", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ShapeNamedElement", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ShapeNamedElement", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ShapeNamedElement", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ShapeNamedElement", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("ShapeNamedElement", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("ShapeNamedElement", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ShortCutDiagramEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ShortCutDiagramEditPart.java
index 9c5b3920907..57f5248d73c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ShortCutDiagramEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/ShortCutDiagramEditPart.java
@@ -44,7 +44,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomShortcutDiagramItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.policies.ShortCutDiagramItemSemanticEditPolicy;

@@ -189,8 +189,8 @@ public class ShortCutDiagramEditPart extends AbstractShortCutDiagramEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "ShortCutDiagram";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -278,15 +278,15 @@ public class ShortCutDiagramEditPart extends AbstractShortCutDiagramEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ShortCutDiagram", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ShortCutDiagram", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ShortCutDiagram", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ShortCutDiagram", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ShortCutDiagram", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ShortCutDiagram", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("ShortCutDiagram", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("ShortCutDiagram", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalEditPart.java
index 74a5a30485e..50110d8fd37 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalEditPart.java
@@ -46,7 +46,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

@@ -255,8 +255,8 @@ public class SignalEditPart extends ClassifierEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Signal";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -2151,15 +2151,15 @@ public class SignalEditPart extends ClassifierEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Signal", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Signal", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Signal", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Signal", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Signal", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Signal", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Signal", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Signal", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalEditPartCN.java
index c005c632d91..00c899f197f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/SignalEditPartCN.java
@@ -46,7 +46,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

@@ -255,8 +255,8 @@ public class SignalEditPartCN extends ClassifierEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Signal";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -2151,15 +2151,15 @@ public class SignalEditPartCN extends ClassifierEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Signal", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Signal", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Signal", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Signal", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Signal", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Signal", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Signal", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Signal", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TemplateSignatureEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TemplateSignatureEditPart.java
index 813cb5c5cdf..ac4155d2fec 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TemplateSignatureEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TemplateSignatureEditPart.java
@@ -42,7 +42,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.TemplateFigure;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.CustomGraphicalNodeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.itemsemantic.CustomRedefinableTemplateSignatureItemSemanticEditPolicy;

@@ -196,8 +196,8 @@ public class TemplateSignatureEditPart extends AbstractBorderItemEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "TemplateSignature";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -330,15 +330,15 @@ public class TemplateSignatureEditPart extends AbstractBorderItemEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("TemplateSignature", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("TemplateSignature", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("TemplateSignature", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("TemplateSignature", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("TemplateSignature", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("TemplateSignature", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("TemplateSignature", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("TemplateSignature", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TimeObservationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TimeObservationEditPart.java
index b5ad0bf97d5..045a9bdae31 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TimeObservationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/edit/parts/TimeObservationEditPart.java
@@ -46,7 +46,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part.AbstractObservationEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.figure.TimeObservationNodeFigure;

 import org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClazzDiagramChangeStereotypedShapeEditpolicy;

@@ -204,8 +204,8 @@ public class TimeObservationEditPart extends AbstractObservationEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "TimeObservation";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -1487,15 +1487,15 @@ public class TimeObservationEditPart extends AbstractObservationEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("TimeObservation", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("TimeObservation", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("TimeObservation", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("TimeObservation", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("TimeObservation", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("TimeObservation", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("TimeObservation", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("TimeObservation", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/AbstractionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/AbstractionPreferencePage.java
index 473addfd8ca..af09e054f5c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/AbstractionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/AbstractionPreferencePage.java
@@ -17,7 +17,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

@@ -50,7 +50,7 @@ public class AbstractionPreferencePage extends AbstractPapyrusLinkPreferencePage
 		String key = ModelEditPart.MODEL_ID + "_Abstraction";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/AssociationBranchLinkPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/AssociationBranchLinkPreferencePage.java
index 9b5d1ef3dee..5992e9afae2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/AssociationBranchLinkPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/AssociationBranchLinkPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

@@ -51,7 +51,7 @@ public class AssociationBranchLinkPreferencePage extends AbstractPapyrusLinkPref
 		String key = ModelEditPart.MODEL_ID + "_AssociationBranchLink";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/AssociationClassLinkPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/AssociationClassLinkPreferencePage.java
index 4de419e7058..23cfdfaa5c9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/AssociationClassLinkPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/AssociationClassLinkPreferencePage.java
@@ -17,7 +17,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

@@ -50,7 +50,7 @@ public class AssociationClassLinkPreferencePage extends AbstractPapyrusLinkPrefe
 		String key = ModelEditPart.MODEL_ID + "_AssociationClassLink";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/AssociationClassPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/AssociationClassPreferencePage.java
index 9b192958839..a32f32ffb53 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/AssociationClassPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/AssociationClassPreferencePage.java
@@ -17,7 +17,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

@@ -52,26 +52,26 @@ public class AssociationClassPreferencePage extends AbstractPapyrusNodePreferenc
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ModelEditPart.MODEL_ID + "_AssociationClass";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 100);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 100);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 100);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 100);

 		Map<String, Boolean> map = getStaticCompartmentVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/AssociationLinkPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/AssociationLinkPreferencePage.java
index 273e3191f73..77f76dbd353 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/AssociationLinkPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/AssociationLinkPreferencePage.java
@@ -17,7 +17,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

@@ -50,7 +50,7 @@ public class AssociationLinkPreferencePage extends AbstractPapyrusLinkPreference
 		String key = ModelEditPart.MODEL_ID + "_AssociationLink";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/AssociationNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/AssociationNodePreferencePage.java
index 306a7bc8eb9..8703a2a9292 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/AssociationNodePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/AssociationNodePreferencePage.java
@@ -14,7 +14,7 @@ package org.eclipse.papyrus.uml.diagram.clazz.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

@@ -44,15 +44,15 @@ public class AssociationNodePreferencePage extends AbstractPapyrusNodePreference
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ModelEditPart.MODEL_ID + "_AssociationNode";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 20);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 20);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 20);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 20);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ClassPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ClassPreferencePage.java
index 71e9ca77bf8..dc5905080cf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ClassPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ClassPreferencePage.java
@@ -17,7 +17,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

@@ -52,26 +52,26 @@ public class ClassPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ModelEditPart.MODEL_ID + "_Class";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 100);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 100);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 100);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 100);

 		Map<String, Boolean> map = getStaticCompartmentVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ClassifierTemplateParameterPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ClassifierTemplateParameterPreferencePage.java
index 095df4f7fc9..cabf808e26f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ClassifierTemplateParameterPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ClassifierTemplateParameterPreferencePage.java
@@ -14,7 +14,7 @@ package org.eclipse.papyrus.uml.diagram.clazz.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

@@ -44,15 +44,15 @@ public class ClassifierTemplateParameterPreferencePage extends AbstractPapyrusNo
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ModelEditPart.MODEL_ID + "_ClassifierTemplateParameter";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/CommentPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/CommentPreferencePage.java
index 6f2caa0f336..cbd3d928afb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/CommentPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/CommentPreferencePage.java
@@ -14,7 +14,7 @@ package org.eclipse.papyrus.uml.diagram.clazz.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

@@ -44,15 +44,15 @@ public class CommentPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ModelEditPart.MODEL_ID + "_Comment";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ComponentPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ComponentPreferencePage.java
index 8f424029eb7..2739b2b43f2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ComponentPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ComponentPreferencePage.java
@@ -17,7 +17,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

@@ -52,26 +52,26 @@ public class ComponentPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ModelEditPart.MODEL_ID + "_Component";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 100);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 100);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 100);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 100);

 		Map<String, Boolean> map = getStaticCompartmentVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ConnectableElementTemplateParameterPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ConnectableElementTemplateParameterPreferencePage.java
index 2c37916cc53..df44d3d8d58 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ConnectableElementTemplateParameterPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ConnectableElementTemplateParameterPreferencePage.java
@@ -14,7 +14,7 @@ package org.eclipse.papyrus.uml.diagram.clazz.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

@@ -44,15 +44,15 @@ public class ConnectableElementTemplateParameterPreferencePage extends AbstractP
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ModelEditPart.MODEL_ID + "_ConnectableElementTemplateParameter";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ConstraintPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ConstraintPreferencePage.java
index 2b25f6d38da..30c8e2956c4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ConstraintPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ConstraintPreferencePage.java
@@ -14,7 +14,7 @@ package org.eclipse.papyrus.uml.diagram.clazz.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

@@ -44,15 +44,15 @@ public class ConstraintPreferencePage extends AbstractPapyrusNodePreferencePage
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ModelEditPart.MODEL_ID + "_Constraint";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ContainmentCirclePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ContainmentCirclePreferencePage.java
index ade6a03e515..cd6f54ab861 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ContainmentCirclePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ContainmentCirclePreferencePage.java
@@ -14,7 +14,7 @@ package org.eclipse.papyrus.uml.diagram.clazz.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

@@ -44,15 +44,15 @@ public class ContainmentCirclePreferencePage extends AbstractPapyrusNodePreferen
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ModelEditPart.MODEL_ID + "_ContainmentCircle";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 20);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 20);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 20);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 20);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DataTypePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DataTypePreferencePage.java
index 7d248852bcf..234e5e3a147 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DataTypePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DataTypePreferencePage.java
@@ -17,7 +17,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

@@ -52,26 +52,26 @@ public class DataTypePreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ModelEditPart.MODEL_ID + "_DataType";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 100);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 100);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 100);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 100);

 		Map<String, Boolean> map = getStaticCompartmentVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DefaultNamedElementPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DefaultNamedElementPreferencePage.java
index e425eb0918a..62a9827d469 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DefaultNamedElementPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DefaultNamedElementPreferencePage.java
@@ -14,7 +14,7 @@ package org.eclipse.papyrus.uml.diagram.clazz.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

@@ -44,15 +44,15 @@ public class DefaultNamedElementPreferencePage extends AbstractPapyrusNodePrefer
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ModelEditPart.MODEL_ID + "_DefaultNamedElement";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 100);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 50);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 100);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 50);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DependencyLinkPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DependencyLinkPreferencePage.java
index b9a09b6cf3e..bfd36a61efa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DependencyLinkPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DependencyLinkPreferencePage.java
@@ -17,7 +17,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

@@ -50,7 +50,7 @@ public class DependencyLinkPreferencePage extends AbstractPapyrusLinkPreferenceP
 		String key = ModelEditPart.MODEL_ID + "_DependencyLink";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DependencyNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DependencyNodePreferencePage.java
index 4de881eec94..ce7ca434952 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DependencyNodePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DependencyNodePreferencePage.java
@@ -17,7 +17,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

@@ -48,21 +48,21 @@ public class DependencyNodePreferencePage extends AbstractPapyrusNodePreferenceP
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ModelEditPart.MODEL_ID + "_DependencyNode";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 10);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 10);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 10);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 10);

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DurationObservationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DurationObservationPreferencePage.java
index eaf0bc1875c..56991e2c008 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DurationObservationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/DurationObservationPreferencePage.java
@@ -17,7 +17,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

@@ -48,21 +48,21 @@ public class DurationObservationPreferencePage extends AbstractPapyrusNodePrefer
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ModelEditPart.MODEL_ID + "_DurationObservation";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ElementImportPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ElementImportPreferencePage.java
index 8ec5e74b557..143c1966f91 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ElementImportPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ElementImportPreferencePage.java
@@ -17,7 +17,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

@@ -50,7 +50,7 @@ public class ElementImportPreferencePage extends AbstractPapyrusLinkPreferencePa
 		String key = ModelEditPart.MODEL_ID + "_ElementImport";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/EnumerationLiteralPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/EnumerationLiteralPreferencePage.java
index 5a697d83a47..c113b69da07 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/EnumerationLiteralPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/EnumerationLiteralPreferencePage.java
@@ -14,7 +14,7 @@ package org.eclipse.papyrus.uml.diagram.clazz.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

@@ -44,15 +44,15 @@ public class EnumerationLiteralPreferencePage extends AbstractPapyrusNodePrefere
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ModelEditPart.MODEL_ID + "_EnumerationLiteral";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/EnumerationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/EnumerationPreferencePage.java
index 1ae48da3acc..0fa0c0bfa2a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/EnumerationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/EnumerationPreferencePage.java
@@ -17,7 +17,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

@@ -52,26 +52,26 @@ public class EnumerationPreferencePage extends AbstractPapyrusNodePreferencePage
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ModelEditPart.MODEL_ID + "_Enumeration";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 100);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 100);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 100);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 100);

 		Map<String, Boolean> map = getStaticCompartmentVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/GeneralizationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/GeneralizationPreferencePage.java
index 0bcb66d76bf..13a0cf92129 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/GeneralizationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/GeneralizationPreferencePage.java
@@ -17,7 +17,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

@@ -50,7 +50,7 @@ public class GeneralizationPreferencePage extends AbstractPapyrusLinkPreferenceP
 		String key = ModelEditPart.MODEL_ID + "_Generalization";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/GeneralizationSetPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/GeneralizationSetPreferencePage.java
index 967fdbf6eac..30a6df76bc3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/GeneralizationSetPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/GeneralizationSetPreferencePage.java
@@ -17,7 +17,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

@@ -50,7 +50,7 @@ public class GeneralizationSetPreferencePage extends AbstractPapyrusLinkPreferen
 		String key = ModelEditPart.MODEL_ID + "_GeneralizationSet";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/InformationFlowPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/InformationFlowPreferencePage.java
index cb50bbb0ddf..93c353702d8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/InformationFlowPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/InformationFlowPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

@@ -51,7 +51,7 @@ public class InformationFlowPreferencePage extends AbstractPapyrusLinkPreference
 		String key = ModelEditPart.MODEL_ID + "_InformationFlow";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/InformationItemPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/InformationItemPreferencePage.java
index ec6c99b5751..7b51ab18ed6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/InformationItemPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/InformationItemPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.clazz.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class InformationItemPreferencePage extends AbstractPapyrusNodePreference
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ModelEditPart.MODEL_ID + "_InformationItem";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/InstanceSpecificationLinkPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/InstanceSpecificationLinkPreferencePage.java
index dae2c83ed97..cf1b8d92d61 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/InstanceSpecificationLinkPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/InstanceSpecificationLinkPreferencePage.java
@@ -17,7 +17,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

@@ -50,7 +50,7 @@ public class InstanceSpecificationLinkPreferencePage extends AbstractPapyrusLink
 		String key = ModelEditPart.MODEL_ID + "_InstanceSpecificationLink";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/InstanceSpecificationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/InstanceSpecificationPreferencePage.java
index 2cabc75d7f6..5f19b969893 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/InstanceSpecificationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/InstanceSpecificationPreferencePage.java
@@ -17,7 +17,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

@@ -52,26 +52,26 @@ public class InstanceSpecificationPreferencePage extends AbstractPapyrusNodePref
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ModelEditPart.MODEL_ID + "_InstanceSpecification";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 100);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 100);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 100);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 100);

 		Map<String, Boolean> map = getStaticCompartmentVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/InterfacePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/InterfacePreferencePage.java
index 01343695416..a89c1544eb8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/InterfacePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/InterfacePreferencePage.java
@@ -17,7 +17,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

@@ -52,26 +52,26 @@ public class InterfacePreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ModelEditPart.MODEL_ID + "_Interface";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 100);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 100);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 100);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 100);

 		Map<String, Boolean> map = getStaticCompartmentVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/InterfaceRealizationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/InterfaceRealizationPreferencePage.java
index d9a51feb785..c48270f542a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/InterfaceRealizationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/InterfaceRealizationPreferencePage.java
@@ -17,7 +17,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

@@ -50,7 +50,7 @@ public class InterfaceRealizationPreferencePage extends AbstractPapyrusLinkPrefe
 		String key = ModelEditPart.MODEL_ID + "_InterfaceRealization";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ModelPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ModelPreferencePage.java
index f33db3b23f1..9a6cf5113ff 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ModelPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ModelPreferencePage.java
@@ -17,7 +17,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

@@ -52,26 +52,26 @@ public class ModelPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ModelEditPart.MODEL_ID + "_Model";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 200);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 100);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 200);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 100);

 		Map<String, Boolean> map = getStaticCompartmentVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/OperationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/OperationPreferencePage.java
index f6872fbba95..16c9a552c70 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/OperationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/OperationPreferencePage.java
@@ -14,7 +14,7 @@ package org.eclipse.papyrus.uml.diagram.clazz.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

@@ -44,15 +44,15 @@ public class OperationPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ModelEditPart.MODEL_ID + "_Operation";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/OperationTemplateParameterPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/OperationTemplateParameterPreferencePage.java
index 35206aa8558..d50151eb55e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/OperationTemplateParameterPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/OperationTemplateParameterPreferencePage.java
@@ -14,7 +14,7 @@ package org.eclipse.papyrus.uml.diagram.clazz.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

@@ -44,15 +44,15 @@ public class OperationTemplateParameterPreferencePage extends AbstractPapyrusNod
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ModelEditPart.MODEL_ID + "_OperationTemplateParameter";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/PackageImportPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/PackageImportPreferencePage.java
index 63c04a6f182..19e02b89078 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/PackageImportPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/PackageImportPreferencePage.java
@@ -17,7 +17,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

@@ -50,7 +50,7 @@ public class PackageImportPreferencePage extends AbstractPapyrusLinkPreferencePa
 		String key = ModelEditPart.MODEL_ID + "_PackageImport";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/PackageMergePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/PackageMergePreferencePage.java
index 37f75b73d1b..18533bac809 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/PackageMergePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/PackageMergePreferencePage.java
@@ -17,7 +17,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

@@ -50,7 +50,7 @@ public class PackageMergePreferencePage extends AbstractPapyrusLinkPreferencePag
 		String key = ModelEditPart.MODEL_ID + "_PackageMerge";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/PackagePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/PackagePreferencePage.java
index 122a49ce165..ecc431bc00f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/PackagePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/PackagePreferencePage.java
@@ -17,7 +17,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

@@ -52,26 +52,26 @@ public class PackagePreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ModelEditPart.MODEL_ID + "_Package";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 200);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 100);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 200);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 100);

 		Map<String, Boolean> map = getStaticCompartmentVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/PrimitiveTypePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/PrimitiveTypePreferencePage.java
index f80318d3123..21b84b66183 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/PrimitiveTypePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/PrimitiveTypePreferencePage.java
@@ -17,7 +17,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

@@ -52,26 +52,26 @@ public class PrimitiveTypePreferencePage extends AbstractPapyrusNodePreferencePa
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ModelEditPart.MODEL_ID + "_PrimitiveType";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 100);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 50);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 100);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 50);

 		Map<String, Boolean> map = getStaticCompartmentVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/PropertyPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/PropertyPreferencePage.java
index adeabf9d65c..d25885c4d91 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/PropertyPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/PropertyPreferencePage.java
@@ -14,7 +14,7 @@ package org.eclipse.papyrus.uml.diagram.clazz.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

@@ -44,15 +44,15 @@ public class PropertyPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ModelEditPart.MODEL_ID + "_Property";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/RealizationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/RealizationPreferencePage.java
index 9c20a54f3b5..c431c6a4fae 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/RealizationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/RealizationPreferencePage.java
@@ -17,7 +17,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

@@ -50,7 +50,7 @@ public class RealizationPreferencePage extends AbstractPapyrusLinkPreferencePage
 		String key = ModelEditPart.MODEL_ID + "_Realization";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ReceptionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ReceptionPreferencePage.java
index 9cbd7cd8ca4..5f5cefcf730 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ReceptionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ReceptionPreferencePage.java
@@ -14,7 +14,7 @@ package org.eclipse.papyrus.uml.diagram.clazz.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

@@ -44,15 +44,15 @@ public class ReceptionPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ModelEditPart.MODEL_ID + "_Reception";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/RedefinableTemplateSignaturePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/RedefinableTemplateSignaturePreferencePage.java
index e659baf66ae..5ec982a65f9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/RedefinableTemplateSignaturePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/RedefinableTemplateSignaturePreferencePage.java
@@ -17,7 +17,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

@@ -52,26 +52,26 @@ public class RedefinableTemplateSignaturePreferencePage extends AbstractPapyrusN
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ModelEditPart.MODEL_ID + "_RedefinableTemplateSignature";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ShapeNamedElementPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ShapeNamedElementPreferencePage.java
index fa06031ca6e..c6859b38fcd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ShapeNamedElementPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ShapeNamedElementPreferencePage.java
@@ -17,7 +17,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

@@ -48,21 +48,21 @@ public class ShapeNamedElementPreferencePage extends AbstractPapyrusNodePreferen
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ModelEditPart.MODEL_ID + "_ShapeNamedElement";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 50);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 50);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 50);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 50);

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ShortCutDiagramPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ShortCutDiagramPreferencePage.java
index 6746d8c8d2b..ff96b60f3b3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ShortCutDiagramPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/ShortCutDiagramPreferencePage.java
@@ -17,7 +17,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

@@ -48,21 +48,21 @@ public class ShortCutDiagramPreferencePage extends AbstractPapyrusNodePreference
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ModelEditPart.MODEL_ID + "_ShortCutDiagram";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 20);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 20);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/SignalPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/SignalPreferencePage.java
index 4384e63005c..249729a5382 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/SignalPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/SignalPreferencePage.java
@@ -17,7 +17,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

@@ -52,26 +52,26 @@ public class SignalPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ModelEditPart.MODEL_ID + "_Signal";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 100);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 100);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 100);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 100);

 		Map<String, Boolean> map = getStaticCompartmentVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/SlotPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/SlotPreferencePage.java
index 5a9c3e49702..4928d5e78e4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/SlotPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/SlotPreferencePage.java
@@ -14,7 +14,7 @@ package org.eclipse.papyrus.uml.diagram.clazz.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

@@ -44,15 +44,15 @@ public class SlotPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ModelEditPart.MODEL_ID + "_Slot";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/SubstitutionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/SubstitutionPreferencePage.java
index 43e7ed0e236..cba73881e75 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/SubstitutionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/SubstitutionPreferencePage.java
@@ -17,7 +17,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

@@ -50,7 +50,7 @@ public class SubstitutionPreferencePage extends AbstractPapyrusLinkPreferencePag
 		String key = ModelEditPart.MODEL_ID + "_Substitution";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/TemplateBindingPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/TemplateBindingPreferencePage.java
index a7554719886..e5265fe74ff 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/TemplateBindingPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/TemplateBindingPreferencePage.java
@@ -17,7 +17,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

@@ -50,7 +50,7 @@ public class TemplateBindingPreferencePage extends AbstractPapyrusLinkPreference
 		String key = ModelEditPart.MODEL_ID + "_TemplateBinding";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/TemplateParameterPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/TemplateParameterPreferencePage.java
index 917ee7db973..db2b0fc61b5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/TemplateParameterPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/TemplateParameterPreferencePage.java
@@ -14,7 +14,7 @@ package org.eclipse.papyrus.uml.diagram.clazz.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

@@ -44,15 +44,15 @@ public class TemplateParameterPreferencePage extends AbstractPapyrusNodePreferen
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ModelEditPart.MODEL_ID + "_TemplateParameter";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/TemplateSignaturePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/TemplateSignaturePreferencePage.java
index 6fdae7955ad..8d9ac512d63 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/TemplateSignaturePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/TemplateSignaturePreferencePage.java
@@ -17,7 +17,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 

@@ -52,26 +52,26 @@ public class TemplateSignaturePreferencePage extends AbstractPapyrusNodePreferen
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ModelEditPart.MODEL_ID + "_TemplateSignature";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/TimeObservationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/TimeObservationPreferencePage.java
index 2ff9c87ba52..1a40c7d5431 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/TimeObservationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/TimeObservationPreferencePage.java
@@ -17,7 +17,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

@@ -48,21 +48,21 @@ public class TimeObservationPreferencePage extends AbstractPapyrusNodePreference
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ModelEditPart.MODEL_ID + "_TimeObservation";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/UsagePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/UsagePreferencePage.java
index 5a7f8c52e49..f51e726598c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/UsagePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/preferences/UsagePreferencePage.java
@@ -17,7 +17,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

@@ -50,7 +50,7 @@ public class UsagePreferencePage extends AbstractPapyrusLinkPreferencePage {
 		String key = ModelEditPart.MODEL_ID + "_Usage";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLViewProvider.java
index 0e02e3dfd36..11d6f2879b8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLViewProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/providers/UMLViewProvider.java
@@ -54,7 +54,7 @@ import org.eclipse.jface.preference.PreferenceConverter;
 import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

 import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.*;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

@@ -2873,8 +2873,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	private void initFontStyleFromPrefs(View view, final IPreferenceStore store, String elementName) {

-		String fontConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.FONT);

-		String fontColorConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_FONT);

+		String fontConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.FONT);

+		String fontColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_FONT);

 		FontStyle viewFontStyle = (FontStyle)view.getStyle(NotationPackage.Literals.FONT_STYLE);

 		if(viewFontStyle != null) {

 			FontData fontData = PreferenceConverter.getFontData(store, fontConstant);

@@ -2891,7 +2891,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	private void initForegroundFromPrefs(View view, final IPreferenceStore store, String elementName) {

-		String lineColorConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_LINE);

+		String lineColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_LINE);

 		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(store, lineColorConstant);

 		ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getLineStyle_LineColor(), FigureUtilities.RGBToInteger(lineRGB));

 	}

@@ -2900,9 +2900,9 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	private void initBackgroundFromPrefs(View view, final IPreferenceStore store, String elementName) {

-		String fillColorConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_FILL);

-		String gradientColorConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_GRADIENT);

-		String gradientPolicyConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.GRADIENT_POLICY);

+		String fillColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_FILL);

+		String gradientColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_GRADIENT);

+		String gradientPolicyConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.GRADIENT_POLICY);

 		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(store, fillColorConstant);

 		ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getFillStyle_FillColor(), FigureUtilities.RGBToInteger(fillRGB));

 		FillStyle fillStyle = (FillStyle)view.getStyle(NotationPackage.Literals.FILL_STYLE);

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 f508886aa41..5a1b0af9d35 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
@@ -8,7 +8,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.0",

  org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",

  org.eclipse.ui.forms;bundle-version="3.5.100",

- com.google.guava;bundle-version="10.0.1",

+ com.google.guava;bundle-version="11.0.0",

  org.eclipse.emf.ecore;bundle-version="2.8.0",

  org.eclipse.gef;bundle-version="3.8.0",

  org.eclipse.papyrus.infra.core;bundle-version="1.0.0",

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 7291d0120d2..80991b1c221 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
@@ -71,7 +71,7 @@ Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.0.0",
  org.eclipse.papyrus.infra.services.decoration;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.services.resourceloading;bundle-version="1.0.0",

  org.eclipse.papyrus.uml.tools;bundle-version="1.0.0",

- com.google.guava;bundle-version="10.0.1",

+ com.google.guava;bundle-version="11.0.0",

  org.eclipse.papyrus.uml.profile;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.0.0",

  org.eclipse.papyrus.uml.appearance;bundle-version="1.0.0",

@@ -88,11 +88,11 @@ Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.0.0",
  org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.0.0",

  org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.4.0",

  org.eclipse.papyrus.infra.services.localizer;bundle-version="1.0.0",

- org.apache.batik.dom.svg;bundle-version="[1.6.0,1.7.0)",

+ org.apache.batik.dom.svg,

  org.w3c.dom.svg,

- org.apache.batik.css;bundle-version="[1.6.0,1.7.0)",

- org.apache.batik.util;bundle-version="[1.6.0,1.7.0)",

- org.apache.batik.dom;bundle-version="[1.6.0,1.7.0)",

+ org.apache.batik.css,

+ org.apache.batik.util,

+ org.apache.batik.dom,

  org.eclipse.core.databinding;bundle-version="1.4.1",

  org.eclipse.gmf.tooling.runtime

 Bundle-Vendor: %providerName

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/UpdatePortLocationCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/UpdatePortLocationCommand.java
index 4eb98c0e2cd..75aa0112aa7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/UpdatePortLocationCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/UpdatePortLocationCommand.java
@@ -17,13 +17,17 @@ import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.draw2d.PositionConstants;
+import org.eclipse.draw2d.geometry.Point;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.requests.ChangeBoundsRequest;
 import org.eclipse.gmf.runtime.common.core.command.CommandResult;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
 import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
 import org.eclipse.gmf.runtime.notation.Bounds;
 import org.eclipse.gmf.runtime.notation.Shape;
+import org.eclipse.papyrus.uml.diagram.common.Activator;
+import org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator;
 
 /**
  * <pre>
@@ -41,39 +45,51 @@ public class UpdatePortLocationCommand extends AbstractTransactionalCommand {
 	
 	/** The parent edit part */
 	private GraphicalEditPart parentEditPart;
-	
+
 	/** The Port side before parent resize */
 	private final int borderItemSide;
-	
+
+	/**
+	 * the move request;
+	 */
+	private ChangeBoundsRequest request;
+
 	/**
 	 * Constructor.
-	 * @param domain the editing domain
-	 * @param parentEditPart the parent edit part
-	 * @param borderItemEditPart the Port edit part
-	 * @param borderItemSide the side of Port on parent before resize
+	 * 
+	 * @param domain
+	 *        the editing domain
+	 * @param request
+	 *        the move request
+	 * @param parentEditPart
+	 *        the parent edit part
+	 * @param borderItemEditPart
+	 *        the Port edit part
+	 * @param borderItemSide
+	 *        the side of Port on parent before resize
 	 */
-	public UpdatePortLocationCommand(TransactionalEditingDomain domain, GraphicalEditPart parentEditPart, IBorderItemEditPart borderItemEditPart, int borderItemSide) {
-		super(domain, "Update port location command", null);
+	public UpdatePortLocationCommand(TransactionalEditingDomain domain, ChangeBoundsRequest request, GraphicalEditPart parentEditPart, IBorderItemEditPart borderItemEditPart, int borderItemSide) {
+		super(domain, "Update port location command", null); //$NON-NLS-1$
 		this.borderItemEditPart = borderItemEditPart;
 		this.parentEditPart = parentEditPart;
 		this.borderItemSide = borderItemSide;
+		this.request = request;
 	}
 
 	/**
 	 * Set the new IBorderItemEditPart view bounds after a resize of its parent.
 	 */
 	@Override
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor,
-			IAdaptable info) throws ExecutionException {
-		
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+
 		// At this step the resized bounds of the parent should have been set.
 		// Get the parent bounds.
-		Shape parentShape = (Shape) parentEditPart.getNotationView();
-		Bounds parentBounds = (Bounds) parentShape.getLayoutConstraint();
-		
+		Shape parentShape = (Shape)parentEditPart.getNotationView();
+		Bounds parentBounds = (Bounds)parentShape.getLayoutConstraint();
+
 		// Retrieve borderItemBounds
 		int borderItemOffset = 10; // see PortPositionLocator.
-			
+
 		Shape borderItemShape = (Shape)borderItemEditPart.getNotationView();
 		Bounds borderItemBounds = (Bounds)borderItemShape.getLayoutConstraint();
 
@@ -94,11 +110,11 @@ public class UpdatePortLocationCommand extends AbstractTransactionalCommand {
 			borderItemBounds.setY(parentBounds.getHeight() - borderItemOffset);
 			break;
 		case PositionConstants.SOUTH:
-			borderItemBounds.setY(parentBounds.getHeight() - borderItemOffset);	
+			borderItemBounds.setY(parentBounds.getHeight() - borderItemOffset);
 			break;
 		case PositionConstants.SOUTH_WEST:
 			borderItemBounds.setX(-borderItemOffset);
-			borderItemBounds.setY(parentBounds.getHeight() - borderItemOffset);			
+			borderItemBounds.setY(parentBounds.getHeight() - borderItemOffset);
 			break;
 		case PositionConstants.WEST:
 			borderItemBounds.setX(-borderItemOffset);
@@ -107,13 +123,53 @@ public class UpdatePortLocationCommand extends AbstractTransactionalCommand {
 			borderItemBounds.setX(-borderItemOffset);
 			borderItemBounds.setY(-borderItemOffset);
 			break;
-			
+
 		default:
-			// TODO : Add log here, this case should not be possible anymore.
+			Activator.log.warn("Unknown position value has been received"); //$NON-NLS-1$
 			break;
 		}
 
-		return CommandResult.newOKCommandResult();		
-	}
 
+		final int resizeDirection = this.request.getResizeDirection();
+		//if true, we don't move port (so we translate them in the opposite direction		
+		if(this.request.isConstrainedResize()) {// see bug 424942 https://bugs.eclipse.org/bugs/show_bug.cgi?id=424942	
+			final Point delta = request.getMoveDelta();
+			if(resizeDirection == PositionConstants.NORTH) {
+				switch(borderItemSide) {
+				case PositionConstants.EAST:
+				case PositionConstants.WEST:
+					borderItemBounds.setY(borderItemBounds.getY() - delta.y);
+					break;
+				default:
+					//nothing to do
+					break;
+				}
+			} else if(resizeDirection == PositionConstants.WEST) {
+				switch(borderItemSide) {
+				case PositionConstants.SOUTH:
+				case PositionConstants.NORTH:
+					borderItemBounds.setX(borderItemBounds.getX() - delta.x);
+					break;
+				default:
+					//nothing to do
+					break;
+				}
+			} else if(resizeDirection == PositionConstants.NORTH_WEST) {
+				switch(borderItemSide) {
+				case PositionConstants.SOUTH:
+				case PositionConstants.NORTH:
+					borderItemBounds.setX(borderItemBounds.getX() - delta.x);
+					break;
+				case PositionConstants.EAST:
+				case PositionConstants.WEST:
+					borderItemBounds.setY(borderItemBounds.getY() - delta.y);
+					break;
+				default:
+					//nothing to do
+					break;
+				}
+			}
+		}
+		return CommandResult.newOKCommandResult();
+	}
 }
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/BorderNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/BorderNodeEditPart.java
index d0d2aed6e8d..05e05763d54 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/BorderNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/editparts/BorderNodeEditPart.java
@@ -14,6 +14,8 @@
 package org.eclipse.papyrus.uml.diagram.common.editparts;
 
 import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.gef.DragTracker;
+import org.eclipse.gef.Request;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.BorderedBorderItemEditPart;
 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
 import org.eclipse.gmf.runtime.notation.FillStyle;
@@ -23,6 +25,7 @@ import org.eclipse.gmf.runtime.notation.datatype.GradientData;
 import org.eclipse.papyrus.infra.emf.appearance.helper.ShadowFigureHelper;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IPapyrusEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;
+import org.eclipse.papyrus.infra.gmfdiag.common.snap.PapyrusDragBorderNodeEditPartTrackerEx;
 import org.eclipse.swt.graphics.Color;
 
 /**
@@ -187,4 +190,16 @@ public abstract class BorderNodeEditPart extends BorderedBorderItemEditPart impl
 	protected void setLineType(int style) {
 		getPrimaryShape().setLineStyle(style);
 	}
+
+	/**
+	 * 
+	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart#getDragTracker(org.eclipse.gef.Request)
+	 * 
+	 * @param request
+	 * @return
+	 */
+	@Override
+	public DragTracker getDragTracker(final Request request) {
+		return new PapyrusDragBorderNodeEditPartTrackerEx(this, false, true, true);
+	}
 }
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/edge/CommonEdgeFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/edge/CommonEdgeFigure.java
new file mode 100644
index 00000000000..8fada6a47bb
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/edge/CommonEdgeFigure.java
@@ -0,0 +1,49 @@
+/*****************************************************************************

+ * 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.common.figure.edge;

+

+

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.edge.PapyrusEdgeFigure;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.Activator;

+

+/**

+ * 

+ * This figure allows to use the Papyrus Preference Store to know if connection point must be drawn or not.

+ * This class should be located in oep.infra.gmfdiag.common, but there is a dependency problem with oep.infra.gmfdiag.preferences

+ * 

+ */

+public class CommonEdgeFigure extends PapyrusEdgeFigure {

+

+	/**

+	 * 

+	 * Constructor.

+	 * 

+	 */

+	public CommonEdgeFigure() {

+		super();

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.papyrus.infra.gmfdiag.common.figure.edge.PapyrusEdgeFigure#getDrawBendpointPreferenceValue()

+	 * 

+	 * @return

+	 */

+	@Override

+	protected boolean getDrawBendpointPreferenceValue() {

+		final String value = PreferencesConstantsHelper.getPapyrusEditorConstant(PreferencesConstantsHelper.DRAW_CONNECTION_POINT);

+		return Activator.getDefault().getPreferenceStore().getBoolean(value);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/edge/DashedEdgeFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/edge/DashedEdgeFigure.java
index a5e45b05848..3461f0d73da 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/edge/DashedEdgeFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/edge/DashedEdgeFigure.java
@@ -14,10 +14,8 @@
 package org.eclipse.papyrus.uml.diagram.common.figure.edge;
 
 import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.PolygonDecoration;
 import org.eclipse.draw2d.PolylineDecoration;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.swt.graphics.Color;
 
 /**
  * This is a custom figure to represents a default edge. This code was used in
@@ -43,7 +41,7 @@ public class DashedEdgeFigure extends UMLEdgeFigure {
 	 */
 	public DashedEdgeFigure() {
 		super();
-		setStyle();
+		setupDefaultStyle();
 	}
 
 	/**
@@ -62,7 +60,7 @@ public class DashedEdgeFigure extends UMLEdgeFigure {
 	public DashedEdgeFigure(Boolean arrow) {
 		super();
 		this.arrow = arrow;
-		setStyle();
+		setupDefaultStyle();
 		createContents();
 	}
 
@@ -74,7 +72,6 @@ public class DashedEdgeFigure extends UMLEdgeFigure {
 	 */
 	public void setArrow(Boolean arrow) {
 		this.arrow = arrow;
-		setStyle();
 	}
 
 	/**
@@ -91,11 +88,21 @@ public class DashedEdgeFigure extends UMLEdgeFigure {
 	}
 
 	/**
+	 * Resets the style of this figure to its default implementation
+	 */
+	@Override
+	public void resetStyle() {
+		setupDefaultStyle();
+	}
+
+	/**
 	 * Sets initial Style for the figure. It does not give any special Color for
 	 * Background and Foreground. This is the style used for classic arrows:
 	 * ------>
+	 * This method should not be overridden as it defines the default style for the arrow.
+	 * Instead, custom styles should be defined by overriding the resetStyle method.
 	 */
-	protected void setStyle() {
+	protected final void setupDefaultStyle() {
 		PolylineDecoration dec = new PolylineDecoration();
 		dec.setScale(15, 5);
 		dec.setLineWidth(1);
@@ -111,54 +118,5 @@ public class DashedEdgeFigure extends UMLEdgeFigure {
 			dashes[i] = 5;
 		}
 		setLineDash(dashes);
-
-	}
-
-	/**
-	 * Sets initial style for this figure. This is the style used for full
-	 * arrows: ------|>
-	 * 
-	 * @param lineWidth
-	 *        the width of the link
-	 */
-	// @unused
-	protected void setStyle(int lineWidth) {
-		setStyle();
-		// set link appearence
-		setLineWidth(lineWidth);
 	}
-
-	/**
-	 * Sets initial style for this figure. This is the style used for full
-	 * arrows: ------|>
-	 * 
-	 * @param lineWidth
-	 *        the width of the link
-	 * @param foregroundColor
-	 *        the foreground color of the link
-	 * @param backgroundColor
-	 *        the background color of the link
-	 */
-	// @unused
-	protected void setStyle(Color backgroundColor, Color foregroundColor, int lineWidth) {
-		// set the target arrow style
-		PolygonDecoration dec = new PolygonDecoration();
-		dec.setScale(15, 5);
-		dec.setBackgroundColor(backgroundColor);
-		dec.setLineWidth(1);
-		if(arrow) {
-			setTargetDecoration(dec);
-		}
-		// set link appearence
-		setLineWidth(lineWidth);
-		setLineStyle(Graphics.LINE_CUSTOM); // line drawing style
-		setForegroundColor(foregroundColor);
-
-		// set dashes
-		for(int i = 0; i < 10; i++) {
-			dashes[i] = 5;
-		}
-		setLineDash(dashes);
-	}
-
 }
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/edge/UMLEdgeFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/edge/UMLEdgeFigure.java
index d932d843645..d22e504a637 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/edge/UMLEdgeFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/edge/UMLEdgeFigure.java
@@ -14,7 +14,6 @@
 package org.eclipse.papyrus.uml.diagram.common.figure.edge;
 
 import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
 import org.eclipse.papyrus.uml.diagram.common.figure.node.IPapyrusUMLElementFigure;
 import org.eclipse.swt.SWT;
@@ -23,7 +22,7 @@ import org.eclipse.swt.graphics.Image;
 /**
  * An UML edge is an edge that owns a label to display applied stereotypes
  */
-public class UMLEdgeFigure extends PolylineConnectionEx implements IPapyrusUMLElementFigure {
+public class UMLEdgeFigure extends CommonEdgeFigure implements IPapyrusUMLElementFigure {
 
 	/** Child label that displays applied stereotypes string */
 	protected WrappingLabel appliedStereotypeLabel;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/AutomaticCompartmentLayoutManager.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/AutomaticCompartmentLayoutManager.java
index ed6ff56da83..a69e5fa8710 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/AutomaticCompartmentLayoutManager.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/AutomaticCompartmentLayoutManager.java
@@ -1,6 +1,6 @@
 /****************************************************************************
  * Copyright (c) 2009 CEA LIST.
- *  
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -8,7 +8,8 @@
  *
  * Contributors:
  *		Patrick Tessier (CEA LIST), Thibault Landre (Atos Origin) - Initial API and implementation
- *	    Vincent Lorenzo (CEA LIST), change layout(IFigure container)
+ *		Vincent Lorenzo (CEA LIST), change layout(IFigure container)
+ *		Laurent Wouters (CEA LIST), refactoring, cleanup, added layout of labels on top of shapes
  *****************************************************************************/
 package org.eclipse.papyrus.uml.diagram.common.figure.node;
 
@@ -22,34 +23,48 @@ import org.eclipse.draw2d.geometry.Dimension;
 import org.eclipse.draw2d.geometry.Rectangle;
 import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure;
 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.ScalableCompartmentFigure;
 
 /**
- * this is the layout manager in charge to place element in compartment element.
+ * This is the layout manager in charge to place element in compartment element.
  * A modification of the code has been done in order to manage none visible
  * compartment. if a compartment becomes invisible, its size and its height are
  * equal to 1.
- * 
+ *
  */
-
 public class AutomaticCompartmentLayoutManager extends AbstractLayout {
 
 	protected static final int MINIMUM_COMPARTMENT_HEIGHT = 15;
 
-	// list of compartments
-	protected ArrayList<IFigure> compartmentList = new ArrayList<IFigure>();
+	/**
+	 * list of visible compartment children
+	 */
+	protected ArrayList<IFigure> visibleCompartments = new ArrayList<IFigure>();
 
-	// list of none compartments ex wrapping label etc...
-	protected ArrayList<IFigure> notCompartmentList = new ArrayList<IFigure>();
+	/**
+	 * list of visible non-compartment children (e.g. labels)
+	 */
+	protected ArrayList<IFigure> visibleOthers = new ArrayList<IFigure>();
 
-	// background figure
-	//protected IFigure backgroundFigure;
+	/**
+	 * list of the invisible children
+	 */
+	protected ArrayList<IFigure> invisibles = new ArrayList<IFigure>();
+
+	/**
+	 * true if the bounds of the labels are forced by an inner figure
+	 */
+	protected boolean forcedLabelBounds = false;
 
+	/**
+	 * true if extra distance between compartment should be added
+	 */
 	protected boolean addExtraHeight = true;
 
 	/**
-	 * set the distance between compartments
-	 * 
+	 * Sets whether extra distance between compartment should be added
+	 *
 	 * @param addExtraHeight
 	 */
 	public void setAddExtraHeight(boolean addExtraHeight) {
@@ -57,248 +72,348 @@ public class AutomaticCompartmentLayoutManager extends AbstractLayout {
 	}
 
 	/**
-	 * 
 	 * {@inheritDoc}
 	 */
 	@Override
 	protected Dimension calculatePreferredSize(IFigure container, int hint, int hint2) {
-		collectInformationOnChildren(container);
+		collectInformation(container);
 		int minimumWith = 0;
 		int minimumHeight = 0;
 		if(container instanceof CompartmentFigure) {
+			CompartmentFigure cf = (CompartmentFigure)container;
+			WrappingLabel wl = cf.getNameLabel();
 			// display name
-			if(((CompartmentFigure)container).getNameLabel() != null&& container.getChildren().contains(((CompartmentFigure)container).getNameLabel())) {
-				if(((CompartmentFigure)container).getNameLabel().getPreferredSize().width > minimumWith) {
-					minimumWith = ((CompartmentFigure)container).getNameLabel().getPreferredSize().width;
+			if(wl != null && container.getChildren().contains(wl)) {
+				if(wl.getPreferredSize().width > minimumWith) {
+					minimumWith = wl.getPreferredSize().width;
 				}
-				
 			}
 		}
-		if(compartmentList.size() != 0) {
-			for(int i = 0; i < container.getChildren().size(); i++) {
-				IFigure child = (IFigure)container.getChildren().get(i);
+		if(!visibleCompartments.isEmpty()) {
+			for(Object o : container.getChildren()) {
+				IFigure child = (IFigure)o;
 				minimumHeight += child.getPreferredSize().height;
 				minimumWith = Math.max(minimumWith, child.getPreferredSize().width);
 			}
 		} else {
-			for(int i = 0; i < notCompartmentList.size(); i++) {
-				minimumHeight += notCompartmentList.get(i).getPreferredSize().height;
+			for(IFigure child : visibleOthers) {
+				minimumHeight += child.getPreferredSize().height;
 			}
 		}
-		if(addExtraHeight)
+		if(addExtraHeight) {
 			minimumHeight += 7;
+		}
 		return new Dimension(minimumWith, minimumHeight);
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
 	@Override
 	public Dimension getMinimumSize(IFigure container, int wHint, int hHint) {
 		return new Dimension(20, 20);
 	}
 
 	/**
-	 * layout by putting label in the center of figure
-	 * 
-	 * @param container
+	 * {@inheritDoc}
+	 */
+	public void layout(IFigure container) {
+		collectInformation(container);
+		// gets the bounds of this container
+		Rectangle bounds = container.getBounds();
+		// do the layout based on the policies
+		if(!visibleCompartments.isEmpty()) {
+			if(forcedLabelBounds) {
+				layoutForcedLabel(container);
+			} else {
+				layoutDefault(container);
+			}
+		} else {
+			// only non-compartment elements are visible
+			// center them within this container
+			layoutOthers(bounds);
+		}
+		// layout the invisible elements
+		layoutInvisibles(bounds.x + 3, bounds.getBottomLeft().y + 1);
+	}
+
+	/**
+	 * Layouts the invisible elements at the given location
+	 *
+	 * @param x
+	 *        location's x coordinate
+	 * @param y
+	 *        location's y coordinate
 	 */
-	protected void layoutCenterForLabel(IFigure container) {
-		int labelheight = 0;
-		for(int i = 0; i < notCompartmentList.size(); i++) {
-			labelheight += notCompartmentList.get(i).getPreferredSize().height;
+	protected void layoutInvisibles(int x, int y) {
+		for(IFigure child : invisibles) {
+			Rectangle bound = new Rectangle(child.getBounds());
+			bound.x = x;
+			bound.y = y;
+			child.setBounds(bound);
 		}
+	}
 
-		for(int i = 0; i < container.getChildren().size(); i++) {
-			if(notCompartmentList.contains((container.getChildren().get(i)))) {
-				Rectangle bound = new Rectangle(((IFigure)container.getChildren().get(i)).getBounds());
-				bound.setSize(getPreferedSize(((IFigure)container.getChildren().get(i))));
-				if(i > 0) {
-					bound.y = ((IFigure)container.getChildren().get(i - 1)).getBounds().getBottomLeft().y + 1;
-					bound.x = container.getBounds().x + 3;
-					bound.width = container.getBounds().width;
-				} else {
-					bound.x = container.getBounds().x + 3;
-					bound.y = container.getBounds().y + ((container.getBounds().height - labelheight) / 2);
-					bound.width = container.getBounds().width;
+	/**
+	 * Layout the other elements within the given container bounds
+	 *
+	 * @param container
+	 *        The container's bound
+	 */
+	protected void layoutOthers(Rectangle container) {
+		int totalHeight = 0;
+		for(IFigure child : visibleOthers) {
+			totalHeight += child.getPreferredSize().height;
+		}
 
-				}
-				((IFigure)container.getChildren().get(i)).setBounds(bound);
+		IFigure previous = null;
+		for(IFigure child : visibleOthers) {
+			Rectangle bound = new Rectangle();
+			bound.setSize(getPreferedSize(child));
+			if(previous != null) {
+				bound.y = previous.getBounds().getBottomLeft().y + 1;
+				bound.x = container.x + 3;
+				bound.width = container.width;
 			} else {
-				Rectangle bound = new Rectangle(((IFigure)container.getChildren().get(i)).getBounds());
-				bound.y = container.getBounds().getBottomLeft().y + 1;
-				bound.x = container.getBounds().x + 3;
-				((IFigure)container.getChildren().get(i)).setBounds(bound);
+				bound.x = container.x + 3;
+				bound.y = container.y + ((container.height - totalHeight) / 2);
+				bound.width = container.width;
 			}
+			child.setBounds(bound);
+			previous = child;
 		}
-
 	}
 
 	/**
-	 * 
-	 * {@inheritDoc}
+	 * Gets the preferred size of the given figure
+	 *
+	 * @param figure
+	 *        A figure that contains a GMF compartment
+	 * @return The figure's preferred size
 	 */
-	public void layout(IFigure container) {
-		collectInformationOnChildren(container);
-
-		//		container.remove(backgroundFigure);
-		//		container.add(backgroundFigure, 0);
+	private Dimension getPreferedSize(IFigure figure) {
+		Dimension dim = figure.getPreferredSize();
+		if(!figure.getChildren().isEmpty()) {
+			Object compartment = figure.getChildren().get(0);
+			if(compartment instanceof ResizableCompartmentFigure) {
+				dim.height = ((ResizableCompartmentFigure)compartment).getPreferredSize().height + 10;
+				if(dim.height < MINIMUM_COMPARTMENT_HEIGHT) {
+					dim.height = MINIMUM_COMPARTMENT_HEIGHT;
+				}
+			}
+		}
+		return dim;
+	}
 
+	/**
+	 * Default layout behavior with compartments
+	 *
+	 * @param container
+	 *        The container to layout
+	 */
+	protected void layoutDefault(IFigure container) {
 		// this list contains the visible compartments (that is to say :
 		// notCompartmentList + compartmentsList
-		List<IFigure> visibleCompartments = new ArrayList<IFigure>();
-
-		visibleCompartments.addAll(notCompartmentList);
-		visibleCompartments.addAll(compartmentList);
-
-		// choose the good layout by taking in account if it exist GMF
-		// compartment
-		if(compartmentList.size() != 0) {
-			// visit all compartment
-			for(int i = 0; i < container.getChildren().size(); i++) {
-				IFigure currentCompartment = (IFigure)container.getChildren().get(i);
-				// this is a visible compartment
-				if(visibleCompartments.contains(currentCompartment)) {
-
-					Rectangle bound = new Rectangle(currentCompartment.getBounds());
-					currentCompartment.invalidate();
-					Dimension pref = currentCompartment.getPreferredSize();
-					currentCompartment.invalidate();
-					Dimension prefConstraint = currentCompartment.getPreferredSize(container.getBounds().width - 40, -1);
-					if(pref.width < prefConstraint.width) {
-						bound.setSize(pref);
-					} else {
-						bound.setSize(prefConstraint);
-					}
-					//bound.setSize(getPreferedSize(currentCompartment));
-					if(visibleCompartments.indexOf(currentCompartment) > 0) {
-						bound.y = (visibleCompartments.get(visibleCompartments.indexOf(currentCompartment) - 1)).getBounds().getBottomLeft().y + 1;
-						bound.x = container.getBounds().x + 3;
-						bound.width = container.getBounds().width;
-					} else {
-						bound.x = container.getBounds().x + 3;
-						bound.y = container.getBounds().y + 3;
-						bound.width = container.getBounds().width;
-					}
-					currentCompartment.setBounds(bound);
-				} else {
-					// this is a none visible compartment
-					Rectangle bound = new Rectangle(currentCompartment.getBounds());
-					bound.setSize(1, 1);
-					currentCompartment.setBounds(bound);
-				}
+		List<IFigure> visibles = new ArrayList<IFigure>();
+		visibles.addAll(visibleOthers);
+		visibles.addAll(visibleCompartments);
+
+		List<Rectangle> bounds = buildInitialsBounds(container, visibles);
+		double notCompartmentsHeight = getTotalHeight(bounds, 0, visibleOthers.size());
+		double compartmentsHeight = getTotalHeight(bounds, visibleOthers.size(), visibleCompartments.size());
+		double remainingspace = container.getBounds().height - notCompartmentsHeight;
+		// because of the place of the label we have to remove 3
+		remainingspace -= 3;
+		// because we move compartment of 1 pixel the space is decrease of 1 per compartment
+		remainingspace -= visibleCompartments.size();
+		// adjustment ratio for the height of the compartments
+		double ratio = compartmentsHeight / remainingspace;
+
+		for(int i = 0; i != bounds.size(); i++) {
+			Rectangle bound = bounds.get(i);
+			if(i < visibleOthers.size()) {
+				fillBoundsForOther(container, bound, (i == 0) ? null : bounds.get(i - 1));
+			} else {
+				fillBoundsForCompartment(container, bound, (i == 0) ? null : bounds.get(i - 1), ratio);
 			}
-			optimizeCompartmentSize(container);
-		} else {
-			layoutCenterForLabel(container);
+			visibles.get(i).setBounds(bound);
 		}
-
-		//		if(backgroundFigure!=null) {
-		//			Rectangle bound = new Rectangle(((IFigure)container).getBounds());
-		//			bound.y = container.getBounds().y + 1;
-		//			bound.x = container.getBounds().x + 3;
-		//			backgroundFigure.setBounds(bound);	
-		//		}
-		//		
 	}
 
 	/**
-	 * Optimize the size of each compartment depending on the size of the
-	 * compartments container, and the size of each compartment. If a
-	 * compartment is empty, or not expanded, then a default size is applied to
-	 * this compartment
-	 * 
-	 * @param compartmentsDimension
-	 *        an hashmap containing each compartment dimension.
+	 * Fills the given bound data as a compartment child
+	 *
+	 * @param container
+	 *        The container to layout
+	 * @param bound
+	 *        The bound to fill
+	 * @param previous
+	 *        The previously filled bound
+	 * @param ratio
+	 *        The ratio to be applied on the height of the compartment
 	 */
-	protected void optimizeCompartmentSize(IFigure container) {
-		int compartmentsHeight = 0;
-		int notCompartmentsHeight = 0;
-		for(int i = 0; i < notCompartmentList.size(); i++) {
-			notCompartmentsHeight += notCompartmentList.get(i).getBounds().height;
+	private void fillBoundsForCompartment(IFigure container, Rectangle bound, Rectangle previous, double ratio) {
+		fillBoundsForOther(container, bound, previous);
+		bound.height = (int)(bound.height / ratio);
+		if(previous == null) {
+			bound.y = container.getBounds().y;
 		}
+	}
 
-		for(int i = 0; i < compartmentList.size(); i++) {
-			compartmentsHeight += compartmentList.get(i).getBounds().height;
-			
-		}
-		int remainingspace = container.getBounds().height - notCompartmentsHeight;
-		//because of the place of the label we have to remove  3
-		remainingspace=remainingspace-3;
-		//because we move compartment of 1 pixel the space is decrease of 1
-		for(int i = 0; i < compartmentList.size(); i++) {
-			remainingspace=remainingspace-1;
+	/**
+	 * Fills the given bound data as a non-compartment child
+	 *
+	 * @param container
+	 *        The container to layout
+	 * @param bound
+	 *        The bound to fill
+	 * @param previous
+	 *        The previously filled bound
+	 */
+	private void fillBoundsForOther(IFigure container, Rectangle bound, Rectangle previous) {
+		bound.x = container.getBounds().x + 1;
+		bound.width = container.getBounds().width;
+		if(previous == null) {
+			bound.y = container.getBounds().y + 3;
+		} else {
+			bound.y = previous.getBottomLeft().y + 1;
 		}
-		
-
-		// ratio between the height of all compartments and the size of the
-		// compartments container.
-		double ratio = new Integer(compartmentsHeight).doubleValue() / new Integer(remainingspace).doubleValue();
-
-		for(int i = 0; i < compartmentList.size(); i++) {
-			Rectangle bound = new Rectangle((compartmentList.get(i)).getBounds());
-			int value = (int)((double)bound.height / ratio);
-			bound.height = value;
-			bound.x = container.getBounds().x;
-			if(i > 0) {
-				bound.y = (compartmentList.get(i - 1)).getBounds().getBottomLeft().y + 1;
-
-			}
-			(compartmentList.get(i)).setBounds(bound);
+	}
 
+	/**
+	 * Computes the total height of the given list of bounds
+	 *
+	 * @param bounds
+	 *        A list of bounds
+	 * @param startIndex
+	 *        The starting index of the bounds to take into account
+	 * @param count
+	 *        The number of bounds to take into account
+	 * @return The total height of the slice of bounds data
+	 */
+	private double getTotalHeight(List<Rectangle> bounds, int startIndex, int count) {
+		double result = 0.0;
+		for(int i = startIndex; i != startIndex + count; i++) {
+			result += bounds.get(i).preciseHeight();
 		}
+		return result;
+	}
 
+	/**
+	 * Builds the initial bounds data for all the given children
+	 *
+	 * @param container
+	 *        The container to layout
+	 * @param visibles
+	 *        The list of the visible children
+	 * @return A list of the bounds of the given children in the same order
+	 */
+	private List<Rectangle> buildInitialsBounds(IFigure container, List<IFigure> visibles) {
+		List<Rectangle> result = new ArrayList<Rectangle>(visibles.size());
+		for(IFigure child : visibles) {
+			result.add(buildInitialsBounds(container, child));
+		}
+		return result;
 	}
 
 	/**
-	 * use to know what kind of element we have in order to apply the good
-	 * policy for the disposition
-	 * 
+	 * Builds the initial bounds data for the given container and child
+	 *
 	 * @param container
+	 *        The container to layout
+	 * @param child
+	 *        The child for which bounds shall be built
+	 * @return The initial child's bounds
 	 */
-	public void collectInformationOnChildren(IFigure container) {
-		compartmentList = new ArrayList<IFigure>();
-		notCompartmentList = new ArrayList<IFigure>();
-		for(int i = 0; i < container.getChildren().size(); i++) {
-			if(isAGMFContainer(((IFigure)container.getChildren().get(i)))) {
-				compartmentList.add(((IFigure)container.getChildren().get(i)));
-			} else if((container.getChildren().get(i)) instanceof Label || (container.getChildren().get(i)) instanceof WrappingLabel || ((container.getChildren().get(i)) instanceof StereotypePropertiesCompartment)) {
-				notCompartmentList.add(((IFigure)container.getChildren().get(i)));
-			} else {
-				if((container.getChildren().get(i)) instanceof ScalableCompartmentFigure) {
-					compartmentList.add((IFigure)container.getChildren().get(i));
-				}
+	private Rectangle buildInitialsBounds(IFigure container, IFigure child) {
+		Rectangle bounds = new Rectangle(child.getBounds());
+		child.invalidate();
+		Dimension pref = child.getPreferredSize();
+		child.invalidate();
+		Dimension prefConstraint = child.getPreferredSize(container.getBounds().width - 40, -1);
+		if(pref.width < prefConstraint.width) {
+			bounds.setSize(pref);
+		} else {
+			bounds.setSize(prefConstraint);
+		}
+		return bounds;
+	}
 
+	/**
+	 * Layout all the compartment by their default and the label at the forced position
+	 *
+	 * @param container
+	 *        The container to layout
+	 */
+	protected void layoutForcedLabel(IFigure container) {
+		// first, fixes the order of the children
+		// remove the labels
+		container.getChildren().removeAll(visibleOthers);
+		// add them at the end
+		container.getChildren().addAll(visibleOthers);
+
+		List<Rectangle> bounds = buildInitialsBounds(container, visibleCompartments);
+		double compartmentsHeight = getTotalHeight(bounds, 0, visibleCompartments.size());
+		double remainingspace = container.getBounds().height;
+		// because we move compartment of 1 pixel the space is decrease of 1 per compartment
+		remainingspace -= visibleCompartments.size();
+		// adjustment ratio for the height of the compartments
+		double ratio = compartmentsHeight / remainingspace;
+
+		IFigure shapeCompartment = null;
+		for(int i = 0; i != visibleCompartments.size(); i++) {
+			Rectangle bound = bounds.get(i);
+			fillBoundsForCompartment(container, bound, (i == 0) ? null : bounds.get(i - 1), ratio);
+			IFigure compartment = visibleCompartments.get(i);
+			compartment.setBounds(bound);
+			if(compartment instanceof ScalableCompartmentFigure) {
+				shapeCompartment = compartment;
 			}
 		}
+
+		Rectangle otherBounds = container.getBounds();
+		if(shapeCompartment != null) {
+			otherBounds = ((SVGNodePlateFigure)container.getParent()).getLabelBounds(shapeCompartment.getBounds());
+		}
+		layoutOthers(otherBounds);
 	}
 
 	/**
-	 * obtain a prefered size
-	 * 
-	 * @param figure
-	 *        that can contain a GMF compartment figure
-	 * @return a the size
+	 * Collects information on the container to layout
+	 *
+	 * @param container
+	 *        The container to layout
 	 */
-	public Dimension getPreferedSize(IFigure figure) {
-		Dimension dim = figure.getPreferredSize();
-		if(figure.getChildren().size() > 0) {
-			Object compartment = figure.getChildren().get(0);
-			if(compartment instanceof ResizableCompartmentFigure) {
-				dim.height = ((ResizableCompartmentFigure)compartment).getPreferredSize().height + 10;
-				if(dim.height == 0) {
-					dim.height = MINIMUM_COMPARTMENT_HEIGHT;
-				}
-
+	protected void collectInformation(IFigure container) {
+		forcedLabelBounds = false;
+		if(container.getParent() instanceof SVGNodePlateFigure) {
+			forcedLabelBounds = ((SVGNodePlateFigure)container.getParent()).hasLabelBounds();
+		}
+		visibleCompartments.clear();
+		visibleOthers.clear();
+		invisibles.clear();
+		for(Object o : container.getChildren()) {
+			IFigure child = (IFigure)o;
+			if(isGMFContainer(child)) {
+				visibleCompartments.add(child);
+			} else if(child instanceof Label || child instanceof WrappingLabel || child instanceof StereotypePropertiesCompartment) {
+				visibleOthers.add(child);
+			} else if(child instanceof ScalableCompartmentFigure) {
+				visibleCompartments.add(child);
+			} else {
+				invisibles.add(child);
 			}
 		}
-		return dim;
 	}
 
 	/**
-	 * tests is the figure contains a GMF compartment
-	 * 
+	 * Tests whether the figure contains a GMF compartment
+	 *
 	 * @param figure
-	 * @return true if this is the case
+	 *        The figure to test
+	 * @return <code>true</code> if the figure contains a GMF compartment
 	 */
-	public boolean isAGMFContainer(IFigure figure) {
+	private boolean isGMFContainer(IFigure figure) {
 		if(figure instanceof StereotypePropertiesCompartment) {
 			return false;
 		}
@@ -309,5 +424,4 @@ public class AutomaticCompartmentLayoutManager extends AbstractLayout {
 		}
 		return false;
 	}
-
 }
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/HTMLCornerBentFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/HTMLCornerBentFigure.java
index 81067617b97..1534f13a32c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/HTMLCornerBentFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/figure/node/HTMLCornerBentFigure.java
@@ -230,47 +230,53 @@ public class HTMLCornerBentFigure extends CornerBentFigure implements ILabelFigu
 			if(nodeType == Node.TEXT_NODE) {
 				generateTextFromTextNode(node, parentFlow);
 			} else {
-				switch(HTMLTags.valueOf(nodeName)) {
-				case body: // main tag for the comment body
-					// create a block for the body
-					generateBlocksFromBodyNode(node, parentFlow);
-					break;
-				case h3:
-					generateBlocksFromH3Node(node, parentFlow);
-					break;
-				case h4: // sub section heading
-					generateBlocksFromH4Node(node, parentFlow);
-					break;
-				case h5: // sub sub section heading
-					generateBlocksFromH5Node(node, parentFlow);
-					break;
-				case strong: // bold character
-					generateBlocksFromStrongNode(node, parentFlow);
-					break;
-				case em: // italic
-					generateBlocksFromItalicNode(node, parentFlow);
-					break;
-				case u: // underline
-					generateBlocksFromUnderlineNode(node, parentFlow);
-					break;
-				case sub: // subscript
-					break;
-				case sup: // superscript
-					break;
-				case blockquote: // indent left or right
-					break;
-				case table: // table
-					break;
-				case p: // paragraph
-					generateBlocksFromParagraphNode(node, parentFlow);
-					break;
-				case br:
-					generateBlocksFromBRNode(node, parentFlow);
-					break;
-				case font:
-					generateBlocksForFontNode(node, parentFlow);
-				default:
-					break;
+				try {
+					switch(HTMLTags.valueOf(nodeName)) {
+					case body: // main tag for the comment body
+						// create a block for the body
+						generateBlocksFromBodyNode(node, parentFlow);
+						break;
+					case h3:
+						generateBlocksFromH3Node(node, parentFlow);
+						break;
+					case h4: // sub section heading
+						generateBlocksFromH4Node(node, parentFlow);
+						break;
+					case h5: // sub sub section heading
+						generateBlocksFromH5Node(node, parentFlow);
+						break;
+					case strong: // bold character
+					case b:
+						generateBlocksFromStrongNode(node, parentFlow);
+						break;
+					case em: // italic
+						generateBlocksFromItalicNode(node, parentFlow);
+						break;
+					case u: // underline
+						generateBlocksFromUnderlineNode(node, parentFlow);
+						break;
+					case sub: // subscript
+						break;
+					case sup: // superscript
+						break;
+					case blockquote: // indent left or right
+						break;
+					case table: // table
+						break;
+					case p: // paragraph
+						generateBlocksFromParagraphNode(node, parentFlow);
+						break;
+					case br:
+						generateBlocksFromBRNode(node, parentFlow);
+						break;
+					case font:
+						generateBlocksForFontNode(node, parentFlow);
+						break;
+					default:
+						break;
+					}
+				} catch (IllegalArgumentException ex) {
+					//Ignored. Unsupported HTML Tag.
 				}
 			}
 		}
@@ -600,6 +606,7 @@ public class HTMLCornerBentFigure extends CornerBentFigure implements ILabelFigu
 		h4(""), // sub section heading
 		h5(""), // sub sub section heading
 		strong(""), // bold character
+		b(""), // bold character
 		em(""), // italic
 		u(""), // underline
 		sub(""), // subscript
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/helper/PreferenceInitializerForElementHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/helper/PreferenceInitializerForElementHelper.java
index 38668e5f811..873da5338e4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/helper/PreferenceInitializerForElementHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/helper/PreferenceInitializerForElementHelper.java
@@ -45,7 +45,7 @@ import org.eclipse.papyrus.infra.emf.appearance.style.AnnotationStyleProvider;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.infra.gmfdiag.common.providers.ThemeInitializerManager;
 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.FontData;
@@ -62,7 +62,7 @@ public class PreferenceInitializerForElementHelper {
 	}
 
 	public static String getpreferenceKey(View view, String elementName, int pref) {
-		return PreferenceConstantHelper.getElementConstant(view.getDiagram().getType() + "_" + elementName, pref); //$NON-NLS-1$
+		return PreferencesConstantsHelper.getElementConstant(view.getDiagram().getType() + "_" + elementName, pref); //$NON-NLS-1$
 	}
 
 	/**
@@ -80,12 +80,12 @@ public class PreferenceInitializerForElementHelper {
 			return;
 		}
 
-		String fillColorConstant = getpreferenceKey(view, elementName, PreferenceConstantHelper.COLOR_FILL);
-		String gradientColorConstant = getpreferenceKey(view, elementName, PreferenceConstantHelper.COLOR_GRADIENT);
-		String gradientPolicyConstant = getpreferenceKey(view, elementName, PreferenceConstantHelper.GRADIENT_POLICY);
-		String shadowConstant = getpreferenceKey(view, elementName, PreferenceConstantHelper.SHADOW);
-		String elementIcon = getpreferenceKey(view, elementName, PreferenceConstantHelper.ELEMENTICON);
-		String qualifiedName = getpreferenceKey(view, elementName, PreferenceConstantHelper.QUALIFIEDNAME);
+		String fillColorConstant = getpreferenceKey(view, elementName, PreferencesConstantsHelper.COLOR_FILL);
+		String gradientColorConstant = getpreferenceKey(view, elementName, PreferencesConstantsHelper.COLOR_GRADIENT);
+		String gradientPolicyConstant = getpreferenceKey(view, elementName, PreferencesConstantsHelper.GRADIENT_POLICY);
+		String shadowConstant = getpreferenceKey(view, elementName, PreferencesConstantsHelper.SHADOW);
+		String elementIcon = getpreferenceKey(view, elementName, PreferencesConstantsHelper.ELEMENTICON);
+		String qualifiedName = getpreferenceKey(view, elementName, PreferencesConstantsHelper.QUALIFIEDNAME);
 
 		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(store, fillColorConstant);
 		ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getFillStyle_FillColor(), FigureUtilities.RGBToInteger(fillRGB));
@@ -137,8 +137,8 @@ public class PreferenceInitializerForElementHelper {
 			return;
 		}
 
-		String fontConstant = getpreferenceKey(view, elementName, PreferenceConstantHelper.FONT);
-		String fontColorConstant = getpreferenceKey(view, elementName, PreferenceConstantHelper.COLOR_FONT);
+		String fontConstant = getpreferenceKey(view, elementName, PreferencesConstantsHelper.FONT);
+		String fontColorConstant = getpreferenceKey(view, elementName, PreferencesConstantsHelper.COLOR_FONT);
 
 		FontStyle viewFontStyle = (FontStyle)view.getStyle(NotationPackage.Literals.FONT_STYLE);
 		if(viewFontStyle != null) {
@@ -168,7 +168,7 @@ public class PreferenceInitializerForElementHelper {
 			return;
 		}
 
-		String lineColorConstant = getpreferenceKey(view, elementName, PreferenceConstantHelper.COLOR_LINE);
+		String lineColorConstant = getpreferenceKey(view, elementName, PreferencesConstantsHelper.COLOR_LINE);
 		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(store, lineColorConstant);
 		ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getLineStyle_LineColor(), FigureUtilities.RGBToInteger(lineRGB));
 	}
@@ -208,30 +208,30 @@ public class PreferenceInitializerForElementHelper {
 			return;
 		}
 
-		Routing routing = Routing.get(store.getInt(getpreferenceKey(view, elementName, PreferenceConstantHelper.ROUTING_STYLE)));
+		Routing routing = Routing.get(store.getInt(getpreferenceKey(view, elementName, PreferencesConstantsHelper.ROUTING_STYLE)));
 		if(routing != null) {
 			ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);
 		}
-		Smoothness smoothness = Smoothness.get(store.getInt(getpreferenceKey(view, elementName, PreferenceConstantHelper.SMOOTHNESS)));
+		Smoothness smoothness = Smoothness.get(store.getInt(getpreferenceKey(view, elementName, PreferencesConstantsHelper.SMOOTHNESS)));
 		if(routing != null) {
 			ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getRoutingStyle_Smoothness(), smoothness);
 		}
-		JumpLinkStatus jumpLinkStatus = JumpLinkStatus.get(getpreferenceKey(view, elementName, PreferenceConstantHelper.JUMPLINK_STATUS));
+		JumpLinkStatus jumpLinkStatus = JumpLinkStatus.get(getpreferenceKey(view, elementName, PreferencesConstantsHelper.JUMPLINK_STATUS));
 		if(routing != null) {
 			ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getRoutingStyle_JumpLinkStatus(), jumpLinkStatus);
 		}
 
-		JumpLinkType jumpLinkType = JumpLinkType.get(getpreferenceKey(view, elementName, PreferenceConstantHelper.JUMPLINK_TYPE));
+		JumpLinkType jumpLinkType = JumpLinkType.get(getpreferenceKey(view, elementName, PreferencesConstantsHelper.JUMPLINK_TYPE));
 		if(routing != null) {
 			ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getRoutingStyle_JumpLinkType(), jumpLinkType);
 		}
-		boolean jumpLinksReverse = store.getBoolean(getpreferenceKey(view, elementName, PreferenceConstantHelper.JUMPLINK_REVERSE));
+		boolean jumpLinksReverse = store.getBoolean(getpreferenceKey(view, elementName, PreferencesConstantsHelper.JUMPLINK_REVERSE));
 		ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getRoutingStyle_JumpLinksReverse(), jumpLinksReverse);
 
-		boolean routingObstruction = store.getBoolean(getpreferenceKey(view, elementName, PreferenceConstantHelper.ROUTING_POLICY_OBSTRUCTION));
+		boolean routingObstruction = store.getBoolean(getpreferenceKey(view, elementName, PreferencesConstantsHelper.ROUTING_POLICY_OBSTRUCTION));
 		ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getRoutingStyle_AvoidObstructions(), routingObstruction);
 
-		boolean routingDistance = store.getBoolean(getpreferenceKey(view, elementName, PreferenceConstantHelper.ROUTING_POLICY_DISTANCE));
+		boolean routingDistance = store.getBoolean(getpreferenceKey(view, elementName, PreferencesConstantsHelper.ROUTING_POLICY_DISTANCE));
 		ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getRoutingStyle_ClosestDistance(), routingDistance);
 	}
 
@@ -259,7 +259,7 @@ public class PreferenceInitializerForElementHelper {
 					String compartmentName = ((ResizableCompartmentFigure)fig1).getCompartmentTitle();
 					if(compartmentName != null) {
 						String diagramKind = view.getDiagram().getType();
-						String preferenceKey = PreferenceConstantHelper.getCompartmentElementConstant(diagramKind + "_" + elementName, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY); //$NON-NLS-1$
+						String preferenceKey = PreferencesConstantsHelper.getCompartmentElementConstant(diagramKind + "_" + elementName, compartmentName, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY); //$NON-NLS-1$
 						boolean value = store.getBoolean(preferenceKey);
 
 						if(!value) {// the default value is true : nothing to
@@ -268,7 +268,7 @@ public class PreferenceInitializerForElementHelper {
 							ViewUtil.setStructuralFeatureValue((View)object, (EStructuralFeature)namedElement, value);
 						}
 
-						String compartmentNameVisibilityPreference = PreferenceConstantHelper.getCompartmentElementConstant(diagramKind + "_" + elementName, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY); //$NON-NLS-1$
+						String compartmentNameVisibilityPreference = PreferencesConstantsHelper.getCompartmentElementConstant(diagramKind + "_" + elementName, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY); //$NON-NLS-1$
 						boolean showCompartmentName = store.getBoolean(compartmentNameVisibilityPreference);
 						View childView = (View)object;
 						TitleStyle style = (TitleStyle)childView.getStyle(NotationPackage.eINSTANCE.getTitleStyle());
@@ -303,7 +303,7 @@ public class PreferenceInitializerForElementHelper {
 				if(dummyEP instanceof ILabelRoleProvider) {
 					String role = ((ILabelRoleProvider)dummyEP).getLabelRole();
 					String diagramKind = view.getDiagram().getType();
-					String key = PreferenceConstantHelper.getLabelElementConstant(diagramKind + "_" + elementName, role, PreferenceConstantHelper.LABEL_VISIBILITY); //$NON-NLS-1$
+					String key = PreferencesConstantsHelper.getLabelElementConstant(diagramKind + "_" + elementName, role, PreferencesConstantsHelper.LABEL_VISIBILITY); //$NON-NLS-1$
 					((View)object).setVisible(store.getBoolean(key));
 				}
 				dummyEP = null;
@@ -323,8 +323,8 @@ public class PreferenceInitializerForElementHelper {
 	 */
 	public static Dimension getDimensionFromPref(View view, final IPreferenceStore store, String elementName) {
 		Dimension dim = new Dimension();
-		String width = getpreferenceKey(view, elementName, PreferenceConstantHelper.WIDTH);
-		String height = getpreferenceKey(view, elementName, PreferenceConstantHelper.HEIGHT);
+		String width = getpreferenceKey(view, elementName, PreferencesConstantsHelper.WIDTH);
+		String height = getpreferenceKey(view, elementName, PreferencesConstantsHelper.HEIGHT);
 		dim = new Dimension(store.getInt(width), store.getInt(height));
 		return dim;
 	}
@@ -345,8 +345,8 @@ public class PreferenceInitializerForElementHelper {
 		Node label = (Node)view;
 		Location location = (Location)label.getLayoutConstraint();
 
-		String xKey = getpreferenceKey(view, elementName, PreferenceConstantHelper.LOCATION_X);
-		String yKey = getpreferenceKey(view, elementName, PreferenceConstantHelper.LOCATION_Y);
+		String xKey = getpreferenceKey(view, elementName, PreferencesConstantsHelper.LOCATION_X);
+		String yKey = getpreferenceKey(view, elementName, PreferencesConstantsHelper.LOCATION_Y);
 
 		location.setX(store.getInt(xKey));
 		location.setY(store.getInt(yKey));
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/PaletteProfileApplicationListener.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/PaletteProfileApplicationListener.java
index c4dd85525a2..fd22f58d5dd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/PaletteProfileApplicationListener.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/service/PaletteProfileApplicationListener.java
@@ -17,6 +17,9 @@ import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.gmf.runtime.common.core.service.ProviderChangeEvent;
 import org.eclipse.papyrus.commands.Activator;
 import org.eclipse.papyrus.infra.core.listenerservice.IPapyrusListener;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
+import org.eclipse.ui.IEditorPart;
 import org.eclipse.uml2.uml.ProfileApplication;
 
 /**
@@ -41,7 +44,14 @@ public class PaletteProfileApplicationListener implements IPapyrusListener {
 		if(notification.getNotifier() instanceof ProfileApplication) {
 			if(Notification.SET == notification.getEventType()) {
 				try {
+					ProfileApplication profileApplication = (ProfileApplication)notification.getNotifier();
+					IEditorPart editor = ServiceUtilsForEObject.getInstance().getNestedActiveIEditorPart(profileApplication);
+					if(editor == null) {
+						return;
+					}
 					PapyrusPaletteService.getInstance().providerChanged(new ProviderChangeEvent(PapyrusPaletteService.getInstance()));
+				} catch (ServiceException ex) {
+					//Nothing to do. The ServiceRegistry is not available or there is no active editor. Don't update the palette
 				} catch (Exception ex) {
 					//Bug 407849: If a listener throws an exception, the operation is rolled back. In this case, we simply want to update the palettes and exceptions should only be logged
 					Activator.log.error(ex);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/CommentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/CommentEditPartCN.java
index 0f41a44c7cd..718307e83bc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/CommentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/CommentEditPartCN.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -196,8 +196,8 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Comment";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -398,15 +398,15 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/ConstraintEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/ConstraintEditPartCN.java
index 9049f57466e..bc1a93aa12c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/ConstraintEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/ConstraintEditPartCN.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

@@ -198,8 +198,8 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Constraint";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -406,15 +406,15 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/DurationObservationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/DurationObservationEditPartCN.java
index b8fb5fa8f15..b7aa1efdf57 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/DurationObservationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/DurationObservationEditPartCN.java
@@ -50,7 +50,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

@@ -202,8 +202,8 @@ public class DurationObservationEditPartCN extends AbstractObservationEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "DurationObservation";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -401,15 +401,15 @@ public class DurationObservationEditPartCN extends AbstractObservationEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DurationObservation", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DurationObservation", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DurationObservation", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DurationObservation", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DurationObservation", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DurationObservation", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("DurationObservation", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("DurationObservation", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/InteractionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/InteractionEditPart.java
index d6ff22f8830..2174f8f069a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/InteractionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/InteractionEditPart.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -214,8 +214,8 @@ public class InteractionEditPart extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Interaction";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -396,15 +396,15 @@ public class InteractionEditPart extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Interaction", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Interaction", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Interaction", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Interaction", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Interaction", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Interaction", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Interaction", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Interaction", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/LifelineEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/LifelineEditPartCN.java
index d8411292048..1d726eb1ce9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/LifelineEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/LifelineEditPartCN.java
@@ -42,7 +42,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -207,8 +207,8 @@ public class LifelineEditPartCN extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Lifeline";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -400,15 +400,15 @@ public class LifelineEditPartCN extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Lifeline", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Lifeline", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Lifeline", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Lifeline", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Lifeline", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Lifeline", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Lifeline", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Lifeline", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/ShortCutDiagramEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/ShortCutDiagramEditPart.java
index f28e14d95e2..1f1f79f8d9d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/ShortCutDiagramEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/ShortCutDiagramEditPart.java
@@ -45,7 +45,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractShortCutDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShortCutDiagramEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.DiagramNodeFigure;

@@ -188,8 +188,8 @@ public class ShortCutDiagramEditPart extends AbstractShortCutDiagramEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "ShortCutDiagram";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -277,15 +277,15 @@ public class ShortCutDiagramEditPart extends AbstractShortCutDiagramEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ShortCutDiagram", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ShortCutDiagram", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ShortCutDiagram", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ShortCutDiagram", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ShortCutDiagram", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ShortCutDiagram", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("ShortCutDiagram", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("ShortCutDiagram", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/TimeObservationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/TimeObservationEditPartCN.java
index f8af7369a51..dcecd227dac 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/TimeObservationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/edit/parts/TimeObservationEditPartCN.java
@@ -50,7 +50,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

@@ -202,8 +202,8 @@ public class TimeObservationEditPartCN extends AbstractObservationEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "TimeObservation";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -401,15 +401,15 @@ public class TimeObservationEditPartCN extends AbstractObservationEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("TimeObservation", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("TimeObservation", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("TimeObservation", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("TimeObservation", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("TimeObservation", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("TimeObservation", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("TimeObservation", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("TimeObservation", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/CommentPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/CommentPreferencePage.java
index e060491b6e8..5bfad6a9af8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/CommentPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/CommentPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.communication.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.communication.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.communication.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class CommentPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ModelEditPart.MODEL_ID + "_Comment";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/ConstraintPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/ConstraintPreferencePage.java
index 6997315b8d8..ce7ceadef47 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/ConstraintPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/ConstraintPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.communication.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.communication.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.communication.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class ConstraintPreferencePage extends AbstractPapyrusNodePreferencePage
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ModelEditPart.MODEL_ID + "_Constraint";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/DurationObservationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/DurationObservationPreferencePage.java
index 8f9896700ed..2e48b41b65e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/DurationObservationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/DurationObservationPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.communication.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.communication.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.communication.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class DurationObservationPreferencePage extends AbstractPapyrusNodePrefer
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ModelEditPart.MODEL_ID + "_DurationObservation";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/InteractionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/InteractionPreferencePage.java
index 5401d04e297..ce3d2dae8f4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/InteractionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/InteractionPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.communication.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.communication.part.UMLDiagramEditorPlugin;

 

@@ -53,26 +53,26 @@ public class InteractionPreferencePage extends AbstractPapyrusNodePreferencePage
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ModelEditPart.MODEL_ID + "_Interaction";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 857);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 757);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/LifelinePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/LifelinePreferencePage.java
index 754c90ac895..25e84712ff2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/LifelinePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/LifelinePreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.communication.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.communication.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.communication.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class LifelinePreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ModelEditPart.MODEL_ID + "_Lifeline";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 100);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 25);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 100);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 25);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/ShortCutDiagramPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/ShortCutDiagramPreferencePage.java
index 6b5969b6fb1..7435ea34372 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/ShortCutDiagramPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/ShortCutDiagramPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.communication.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.communication.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.communication.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class ShortCutDiagramPreferencePage extends AbstractPapyrusNodePreference
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ModelEditPart.MODEL_ID + "_ShortCutDiagram";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 20);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 20);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 20);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 20);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/TimeObservationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/TimeObservationPreferencePage.java
index 16abeddf7ee..ca9fab6696d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/TimeObservationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/preferences/TimeObservationPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.communication.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.communication.edit.parts.ModelEditPart;

 import org.eclipse.papyrus.uml.diagram.communication.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class TimeObservationPreferencePage extends AbstractPapyrusNodePreference
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ModelEditPart.MODEL_ID + "_TimeObservation";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.communication/src/org/eclipse/papyrus/uml/diagram/communication/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/providers/UMLViewProvider.java
index 7e3eeed5154..968df63cc56 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/providers/UMLViewProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/providers/UMLViewProvider.java
@@ -55,7 +55,7 @@ import org.eclipse.jface.preference.PreferenceConverter;
 import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

 import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.uml.diagram.communication.edit.parts.AppliedStereotypeMessageEditPart;

 import org.eclipse.papyrus.uml.diagram.communication.edit.parts.CommentAnnotatedElementEditPart;

@@ -689,8 +689,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	private void initFontStyleFromPrefs(View view, final IPreferenceStore store, String elementName) {

-		String fontConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.FONT);

-		String fontColorConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_FONT);

+		String fontConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.FONT);

+		String fontColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_FONT);

 		FontStyle viewFontStyle = (FontStyle)view.getStyle(NotationPackage.Literals.FONT_STYLE);

 		if(viewFontStyle != null) {

 			FontData fontData = PreferenceConverter.getFontData(store, fontConstant);

@@ -707,7 +707,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	private void initForegroundFromPrefs(View view, final IPreferenceStore store, String elementName) {

-		String lineColorConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_LINE);

+		String lineColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_LINE);

 		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(store, lineColorConstant);

 		ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getLineStyle_LineColor(), FigureUtilities.RGBToInteger(lineRGB));

 	}

@@ -716,9 +716,9 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	private void initBackgroundFromPrefs(View view, final IPreferenceStore store, String elementName) {

-		String fillColorConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_FILL);

-		String gradientColorConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_GRADIENT);

-		String gradientPolicyConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.GRADIENT_POLICY);

+		String fillColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_FILL);

+		String gradientColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_GRADIENT);

+		String gradientPolicyConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.GRADIENT_POLICY);

 		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(store, fillColorConstant);

 		ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getFillStyle_FillColor(), FigureUtilities.RGBToInteger(fillRGB));

 		FillStyle fillStyle = (FillStyle)view.getStyle(NotationPackage.Literals.FILL_STYLE);

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 9e074fa6948..d324a48f003 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
@@ -64,8 +64,5 @@ Bundle-Vendor: %providerName
 Eclipse-LazyStart: true

 Bundle-Version: 1.0.0.qualifier

 Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.diagram.component.part.UMLDi

- agramEditorPlugin

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.component;singlet

- on:=true

-

+Bundle-Activator: org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin

+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.component; singleton:=true

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/command/PortCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/command/PortCreateCommand.java
new file mode 100644
index 00000000000..03c882bdb54
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/command/PortCreateCommand.java
@@ -0,0 +1,82 @@
+/*****************************************************************************

+ * Copyright (c) 2009 CEA LIST.

+ *

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.diagram.component.custom.command;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.papyrus.uml.diagram.component.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Port;

+import org.eclipse.uml2.uml.Property;

+import org.eclipse.uml2.uml.StructuredClassifier;

+import org.eclipse.uml2.uml.UMLFactory;

+

+/**

+ * Port creation command used to create Port on a Property (no direct containment link between

+ * Property and Port).

+ * 

+ */

+public class PortCreateCommand extends org.eclipse.papyrus.uml.diagram.component.edit.commands.PortCreateCommand {

+

+	/** Constructor **/

+	public PortCreateCommand(CreateElementRequest req) {

+		super(req);

+	}

+

+	/**

+	 * <pre>

+	 * Checks if the Port can be created on the Property.

+	 * The Property must be typed by a StructuredClassifier (in other words, an element that 

+	 * can own Port). The new Port is owned be the type of the Property. 

+	 *  

+	 * {@inheritDoc}

+	 * </pre>

+	 */

+	@Override

+	public boolean canExecute() {

+		Property target = (Property)getElementToEdit();

+

+		if((target.getType() != null) && (target.getType() instanceof StructuredClassifier)) {

+			return true;

+		}

+

+		return false;

+	}

+

+	/**

+	 * <pre>

+	 * Custom creation of the Port : 

+	 * - resolve the Property type

+	 * - add a new Port on this type. 

+	 *  

+	 * {@inheritDoc}

+	 * </pre>

+	 */

+	@Override

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		Port newElement = UMLFactory.eINSTANCE.createPort();

+

+		StructuredClassifier owner = (StructuredClassifier)((Property)getElementToEdit()).getType();

+		owner.getOwnedAttributes().add(newElement);

+

+		ElementInitializers.getInstance().init_Port_3069(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/command/ConnectorCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/command/ConnectorCreateCommand.java
new file mode 100644
index 00000000000..8b6d7dcc79c
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/command/ConnectorCreateCommand.java
@@ -0,0 +1,279 @@
+/*****************************************************************************

+ * Copyright (c) 2009-2011 CEA LIST.

+ *

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.diagram.component.custom.edit.command;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.GraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.Messages;

+import org.eclipse.papyrus.uml.diagram.component.providers.ElementInitializers;

+import org.eclipse.uml2.uml.ConnectableElement;

+import org.eclipse.uml2.uml.Connector;

+import org.eclipse.uml2.uml.ConnectorEnd;

+import org.eclipse.uml2.uml.Port;

+import org.eclipse.uml2.uml.Property;

+import org.eclipse.uml2.uml.StructuredClassifier;

+import org.eclipse.uml2.uml.UMLFactory;

+

+/**

+ * <pre>

+ * This class is a custom creation command for Connector.

+ * 

+ * Difficulties for Connector creation:

+ * - differences between semantic (ConnectableEnd) graphical (ConnectableElement) ends of Connector 

+ * - requires to know not only the graphical end (Port, Property) but also the graphical parent in case of Port.

+ * 

+ * The Connector source and target are declared as ConnectorEnd in the GMFGEN model to ensure correct validation,

+ * but the real source and target are ConnectableElement.

+ * 

+ * </pre>

+ */

+public class ConnectorCreateCommand extends org.eclipse.papyrus.uml.diagram.component.edit.commands.ConnectorCreateCommand {

+

+	/** Graphical parent of Source **/

+	protected Property sourcePartWithPort = null;

+

+	/** Graphical parent of Target **/

+	protected Property targetPartWithPort = null;

+

+	/** Graphical EditPart of Source **/

+	protected GraphicalEditPart sourceGraphicalEditPart = null;

+

+	/** Graphical EditPart of Target **/

+	protected GraphicalEditPart targetGraphicalEditPart = null;

+

+	/**

+	 * Constructor of Connector custom creation command

+	 * 

+	 * @param req

+	 *        the creation request

+	 * @param source

+	 *        the connector source element

+	 * @param target

+	 *        the connector target element

+	 */

+	public ConnectorCreateCommand(CreateRelationshipRequest req, EObject source, EObject target) {

+

+		super(req, source, target);

+

+		// Resolve graphical parents of source and target store in request as Parameters

+		// These parameters are added in request by (custom) GraphicalNodeEditPolicy

+		if(req.getParameter(GraphicalNodeEditPolicy.CONNECTOR_CREATE_REQUEST_SOURCE_PARENT) instanceof Property) {

+			sourcePartWithPort = (Property)req.getParameter(GraphicalNodeEditPolicy.CONNECTOR_CREATE_REQUEST_SOURCE_PARENT);

+		}

+

+		if(req.getParameter(GraphicalNodeEditPolicy.CONNECTOR_CREATE_REQUEST_TARGET_PARENT) instanceof Property) {

+			targetPartWithPort = (Property)req.getParameter(GraphicalNodeEditPolicy.CONNECTOR_CREATE_REQUEST_TARGET_PARENT);

+		}

+

+		if(req.getParameter(GraphicalNodeEditPolicy.CONNECTOR_CREATE_REQUEST_SOURCE_GRAPHICAL) instanceof GraphicalEditPart) {

+			sourceGraphicalEditPart = (GraphicalEditPart)req.getParameter(GraphicalNodeEditPolicy.CONNECTOR_CREATE_REQUEST_SOURCE_GRAPHICAL);

+		}

+

+		if(req.getParameter(GraphicalNodeEditPolicy.CONNECTOR_CREATE_REQUEST_TARGET_GRAPHICAL) instanceof GraphicalEditPart) {

+			targetGraphicalEditPart = (GraphicalEditPart)req.getParameter(GraphicalNodeEditPolicy.CONNECTOR_CREATE_REQUEST_TARGET_GRAPHICAL);

+		}

+

+		container = deduceContainer(_getSource(), _getTarget());

+	}

+

+	/**

+	 * Replaces the original getter which is cast as ConnectorEnd (expected end of Connector)

+	 * 

+	 * @return the element that is graphically connected to Connector as source

+	 */

+	protected ConnectableElement _getSource() {

+		return (ConnectableElement)source;

+	}

+

+	/**

+	 * Replaces the original getter which is cast as ConnectorEnd (expected end of Connector)

+	 * 

+	 * @return the element that is graphically connected to Connector as target

+	 */

+	protected ConnectableElement _getTarget() {

+		return (ConnectableElement)target;

+	}

+

+	/**

+	 * <pre>

+	 * Checks if the Connector can be created or not.

+	 * 

+	 * {@inheritDoc}

+	 * </pre>

+	 */

+	@Override

+	public boolean canExecute() {

+		if((source == null) && (target == null)) {

+			return false;

+		}

+		if((source != null) && !(source instanceof ConnectableElement)) {

+			return false;

+		}

+		if((target != null) && !(target instanceof ConnectableElement)) {

+			return false;

+		}

+		if(source == null) {

+			return true; // link creation is in progress; source is not defined yet

+		}

+

+		if((target != null) && (getContainer() == null)) {

+			return false;

+		}

+		// return

+		// UMLBaseItemSemanticEditPolicy.LinkConstraints.canCreateConnector_4013(getContainer(),

+		// _getSource(),

+		// _getTarget());

+		// this returns true anyway...

+		return true;

+	}

+

+	/**

+	 * <pre>

+	 * Creates the new Connector.

+	 * 

+	 * {@inheritDoc}

+	 * </pre>

+	 */

+	@Override

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		if(!canExecute()) {

+			throw new ExecutionException("Invalid arguments in create link command");

+		}

+		Connector newElement = UMLFactory.eINSTANCE.createConnector();

+		getContainer().getOwnedConnectors().add(newElement);

+

+		ConnectorEnd end0 = UMLFactory.eINSTANCE.createConnectorEnd();

+		end0.setLower(1);

+		end0.setUpper(1);

+		if(_getSource() instanceof Port) {

+			end0.setRole((Port)_getSource());

+			end0.setPartWithPort(sourcePartWithPort);

+

+		} else if(_getSource() instanceof ConnectableElement) {

+			end0.setRole((ConnectableElement)_getSource());

+

+		} else {

+			throw new ExecutionException("Invalid source in create Connector command");

+		}

+

+		ConnectorEnd end1 = UMLFactory.eINSTANCE.createConnectorEnd();

+		end1.setLower(1);

+		end1.setUpper(1);

+		if(_getTarget() instanceof Port) {

+			end1.setRole((Port)_getTarget());

+			end1.setPartWithPort(targetPartWithPort);

+

+		} else if(_getTarget() instanceof ConnectableElement) {

+			end1.setRole((ConnectableElement)_getTarget());

+

+		} else {

+			throw new ExecutionException("Invalid target in create Connector command");

+		}

+

+		newElement.getEnds().add(end0);

+		newElement.getEnds().add(end1);

+

+		ElementInitializers.getInstance().init_Connector_4019(newElement);

+

+		doConfigure(newElement, monitor, info);

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * <pre>

+	 * This method is the exact copy of the inherited method, except that it uses the local getters

+	 * (_getSource(), _getTarget()). 

+	 * 

+	 * {@inheritDoc}

+	 * </pre>

+	 */

+	@Override

+	protected void doConfigure(Connector newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, _getSource());

+		configureRequest.setParameter(CreateRelationshipRequest.TARGET, _getTarget());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+	/**

+	 * 

+	 * Tries to find a common StructuredClassifier container to add the new Connector.

+	 * 

+	 * @see org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConnectorCreateCommand#deduceContainer(org.eclipse.emf.ecore.EObject,

+	 *      org.eclipse.emf.ecore.EObject)

+	 * 

+	 * @param source

+	 *        the source object

+	 * @param target

+	 *        the target object

+	 * @return a common StructuredClassifier container (graphical search)

+	 */

+	@Override

+	protected StructuredClassifier deduceContainer(EObject source, EObject target) {

+

+		StructuredClassifier containerProposedBySource = proposedContainer(sourceGraphicalEditPart);

+		StructuredClassifier containerProposedByTarget = proposedContainer(targetGraphicalEditPart);

+

+		StructuredClassifier deducedContainer = null;

+

+		if((containerProposedBySource != null) && (containerProposedByTarget != null)) {

+			if(containerProposedBySource == containerProposedByTarget) {

+				deducedContainer = containerProposedBySource;

+			}

+		}

+

+		return deducedContainer;

+	}

+

+	/**

+	 * Parse graphical parent of the graphicalEditPart until a StructureClassifier is found.

+	 * 

+	 * @param graphicalEditPart

+	 *        the graphical edit part

+	 * @return null or a StructuredClassifier that graphically contains the graphicalEditPart

+	 */

+	private StructuredClassifier proposedContainer(GraphicalEditPart graphicalEditPart) {

+

+		for(EditPart ep = graphicalEditPart; ep != null; ep = ep.getParent()) {

+			if(ep instanceof GraphicalEditPart) {

+				GraphicalEditPart parent = (GraphicalEditPart)ep;

+				EObject semanticParent = parent.resolveSemanticElement();

+				if(semanticParent instanceof StructuredClassifier) {

+					return (StructuredClassifier)semanticParent;

+				}

+			}

+		}

+

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/helpers/ConnectorHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/helpers/ConnectorHelper.java
new file mode 100644
index 00000000000..0afb8d7de2b
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/helpers/ConnectorHelper.java
@@ -0,0 +1,246 @@
+/*****************************************************************************

+ * Copyright (c) 2009 CEA LIST.

+ *

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.diagram.component.custom.edit.helpers;

+

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.PrecisionRectangle;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPartViewer;

+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;

+import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

+import org.eclipse.gmf.runtime.diagram.ui.commands.CreateCommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.SetBoundsCommand;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;

+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.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.type.core.IHintedType;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.uml.diagram.common.commands.CommonDeferredCreateConnectionViewCommand;

+import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;

+import org.eclipse.papyrus.uml.diagram.common.helper.ElementHelper;

+import org.eclipse.papyrus.uml.diagram.common.layout.LayoutUtils;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.uml2.uml.ConnectableElement;

+import org.eclipse.uml2.uml.Connector;

+import org.eclipse.uml2.uml.Property;

+

+/**

+ * Helper class containing the specific behavior for drag and drop of Connector

+ */

+public class ConnectorHelper extends ElementHelper {

+

+	/**

+	 * Constructor

+	 * 

+	 * @param editDomain

+	 *        the editing domain

+	 */

+	public ConnectorHelper(TransactionalEditingDomain editDomain) {

+		super();

+		this.editDomain = editDomain;

+	}

+

+	/**

+	 * This method returns the drop command to use for Connector links. Mainly based on

+	 * 

+	 * @param connector

+	 *        the connector to drop

+	 * @param linkVisualID

+	 *        the visual identifier of the EditPart of the dropped Connector

+	 * @param viewer

+	 * @param host

+	 *        the EditPart of the element where the Connector is drop

+	 * @param diagramPreferencesHint

+	 * @param location

+	 *        the location where the Connector is dropped

+	 * @param containerView

+	 * @return the drop command for Connector

+	 */

+	public CompositeCommand dropConnector(Connector connector, int linkVisualID, EditPartViewer viewer, EditPart host, PreferencesHint diagramPreferencesHint, Point location, View containerView) {

+

+		CompositeCommand cc = new CompositeCommand("drop Connector");

+

+		ConnectableElement sourceRole = connector.getEnds().get(0).getRole();

+		ConnectableElement targetRole = connector.getEnds().get(1).getRole();

+		Property sourcePartWithPort = connector.getEnds().get(0).getPartWithPort();

+		Property targetPartWithPort = connector.getEnds().get(1).getPartWithPort();

+

+		if(sourceRole == null || targetRole == null) {//if an end is deleted, and the connector is still in the model (see bug 293168)

+			return cc;

+		}

+

+		// look for editpart

+		GraphicalEditPart sourceEditPart = resolveRoleEditPart(sourceRole, sourcePartWithPort, viewer);

+		GraphicalEditPart targetEditPart = resolveRoleEditPart(targetRole, targetPartWithPort, viewer);

+

+		// descriptor of the link

+		CreateConnectionViewRequest.ConnectionViewDescriptor linkdescriptor = new CreateConnectionViewRequest.ConnectionViewDescriptor(UMLElementTypes.getElementType(linkVisualID), ((IHintedType)UMLElementTypes.getElementType(linkVisualID)).getSemanticHint(), diagramPreferencesHint);

+

+		IAdaptable sourceAdapter = null;

+		IAdaptable targetAdapter = null;

+

+		//the parents of the ports, we use them when the PortEditPart are not on the diagram

+		EditPart sourceParent = null;

+		EditPart targetParent = null;

+

+

+

+

+		/*

+		 * when the ports are not represented on the diagram,

+		 * we look for their parents.

+		 */

+		DiagramEditPart diagram = DiagramEditPartsUtil.getDiagramEditPart(host);

+		if(sourceEditPart == null || targetEditPart == null) {

+

+			List<IGraphicalEditPart> AllEP = DiagramEditPartsUtil.getAllEditParts(diagram);

+			EObject srcParent = sourceRole.eContainer();

+			EObject tgtParent = targetRole.eContainer();

+			for(IGraphicalEditPart iGraphicalEditPart : AllEP) {

+				EObject object = ViewUtil.resolveSemanticElement((View)(iGraphicalEditPart).getModel());//method getHostObject

+				if(object == srcParent && !(iGraphicalEditPart instanceof CompartmentEditPart)) {

+					sourceParent = iGraphicalEditPart;

+				}

+				if(object == tgtParent && !(iGraphicalEditPart instanceof CompartmentEditPart)) {

+					targetParent = iGraphicalEditPart;

+				}

+				if(targetParent != null && sourceParent != null) {

+					break;

+				}

+			}

+

+

+			/*

+			 * the parent of the port are not represented on the diagram

+			 * we do nothing

+			 */

+			if(targetParent == null || sourceParent == null) {

+				return cc;

+			}

+		}

+

+		//set the location to absolute

+		Point absolutePosition = location.getCopy();

+		PrecisionRectangle hostBounds = LayoutUtils.getAbsolutePosition(host);

+		if(!hostBounds.equals(LayoutUtils.getAbsolutePosition(diagram))) {

+			absolutePosition = absolutePosition.translate(hostBounds.getLocation());//OK, the location is now in absolute!

+		}

+

+

+		if(sourceEditPart == null) {

+

+			//translate the point to relative (with the source editpart)

+			Point portLocation = absolutePosition.getCopy();

+			PrecisionRectangle parentBounds = LayoutUtils.getAbsolutePosition(sourceParent);

+			if(!sourceParent.equals(LayoutUtils.getAbsolutePosition(diagram))) {

+				portLocation = portLocation.translate(parentBounds.getLocation().getNegated());

+			}

+

+			// creation of the node

+			ViewDescriptor descriptor = new ViewDescriptor(new EObjectAdapter(sourceRole), Node.class, null, ViewUtil.APPEND, true, ((IGraphicalEditPart)host).getDiagramPreferencesHint());

+

+			// get the command and execute it.

+			CreateCommand nodeCreationCommand = new CreateCommand(((IGraphicalEditPart)host).getEditingDomain(), descriptor, ((View)sourceParent.getModel()));

+			cc.compose(nodeCreationCommand);

+			SetBoundsCommand setBoundsCommand = new SetBoundsCommand(getEditingDomain(), "move", (IAdaptable)nodeCreationCommand.getCommandResult().getReturnValue(), portLocation);

+			cc.compose(setBoundsCommand);

+

+			sourceAdapter = (IAdaptable)nodeCreationCommand.getCommandResult().getReturnValue();

+		} else {

+			sourceAdapter = new SemanticAdapter(null, sourceEditPart.getModel());

+		}

+

+

+		if(targetEditPart == null) {

+			//translate the location in relative (with the target editpart)

+			Point portLocation = absolutePosition.getCopy();

+			PrecisionRectangle parentBounds = LayoutUtils.getAbsolutePosition(targetParent);

+			if(!targetParent.equals(LayoutUtils.getAbsolutePosition(diagram))) {

+				portLocation = portLocation.translate(parentBounds.getLocation().getNegated());

+			}

+

+			// creation of the node

+			ViewDescriptor descriptor = new ViewDescriptor(new EObjectAdapter(targetRole), Node.class, null, ViewUtil.APPEND, true, ((IGraphicalEditPart)host).getDiagramPreferencesHint());

+

+			// get the command and execute it.

+			CreateCommand nodeCreationCommand = new CreateCommand(((IGraphicalEditPart)host).getEditingDomain(), descriptor, ((View)targetParent.getModel()));

+			cc.compose(nodeCreationCommand);

+			SetBoundsCommand setBoundsCommand = new SetBoundsCommand(getEditingDomain(), "move", (IAdaptable)nodeCreationCommand.getCommandResult().getReturnValue(), portLocation);

+			cc.compose(setBoundsCommand);

+			targetAdapter = (IAdaptable)nodeCreationCommand.getCommandResult().getReturnValue();

+

+		} else {

+			targetAdapter = new SemanticAdapter(null, targetEditPart.getModel());

+		}

+

+		CommonDeferredCreateConnectionViewCommand aLinkCommand = new CommonDeferredCreateConnectionViewCommand(getEditingDomain(), ((IHintedType)UMLElementTypes.getElementType(linkVisualID)).getSemanticHint(), sourceAdapter, targetAdapter, viewer, diagramPreferencesHint, linkdescriptor, null);

+		aLinkCommand.setElement(connector);

+		cc.compose(aLinkCommand);

+		return cc;

+	}

+

+	/**

+	 * This method resolve the EditPart of the GraphicalElement attached to a ConnectorEnd.

+	 * 

+	 * @param role

+	 *        the role of the considered ConnectorEnd

+	 * @param partWithPort

+	 *        the partWithPort feature of the considered ConnectorEnd

+	 * @param viewer

+	 * @return the searched EditPart or null

+	 */

+	private ShapeNodeEditPart resolveRoleEditPart(ConnectableElement role, Property partWithPort, EditPartViewer viewer) {

+		Collection<?> editPartSet = viewer.getEditPartRegistry().values();

+		Iterator<?> editPartIterator = editPartSet.iterator();

+		EditPart foundEditPart = null;

+		while(editPartIterator.hasNext() && foundEditPart == null) {

+

+			EditPart currentEditPart = (EditPart)editPartIterator.next();

+

+			if((currentEditPart instanceof ShapeNodeEditPart) && (role.equals(((ShapeNodeEditPart)currentEditPart).resolveSemanticElement()))) {

+

+				if(partWithPort == null) {

+

+					foundEditPart = currentEditPart;

+

+				} else { // (partWithPort != null

+

+					ShapeNodeEditPart graphicalParent = (ShapeNodeEditPart)currentEditPart.getParent();

+					if(partWithPort.equals(graphicalParent.resolveSemanticElement())) {

+

+						foundEditPart = currentEditPart;

+

+					}

+				}

+			}

+		}

+		return (ShapeNodeEditPart)foundEditPart;

+	}

+

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomInterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomInterfaceEditPart.java
index ff312ca2a60..1ec659e4d58 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomInterfaceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomInterfaceEditPart.java
@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.notation.EObjectValueStyle;
 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.EllipseFigure;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPart;

@@ -54,8 +54,8 @@ public class CustomInterfaceEditPart extends InterfaceEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "NamedElement";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new EllipseFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomModelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomModelEditPart.java
index 3627f51dc69..8caf3f25902 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomModelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomModelEditPart.java
@@ -17,7 +17,7 @@ import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.Activator;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageNodePlateFigure;

@@ -48,8 +48,8 @@ public class CustomModelEditPart extends ModelEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Model";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new PackageNodePlateFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomModelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomModelEditPartCN.java
index a38f5f9d069..b64240f2263 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomModelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomModelEditPartCN.java
@@ -17,7 +17,7 @@ import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.Activator;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageNodePlateFigure;

@@ -47,8 +47,8 @@ public class CustomModelEditPartCN extends ModelEditPartCN {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Model";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new PackageNodePlateFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomPackageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomPackageEditPart.java
index b52183e8989..6f0a1debd78 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomPackageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomPackageEditPart.java
@@ -16,7 +16,7 @@ import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageNodePlateFigure;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackageEditPart;

@@ -43,8 +43,8 @@ public class CustomPackageEditPart extends PackageEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Package";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new PackageNodePlateFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomPackageEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomPackageEditPartCN.java
index 7db7e1a7a74..07767313094 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomPackageEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/CustomPackageEditPartCN.java
@@ -16,7 +16,7 @@ import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageNodePlateFigure;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackageEditPartCN;

@@ -43,8 +43,8 @@ public class CustomPackageEditPartCN extends PackageEditPartCN {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Package";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new PackageNodePlateFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/PropertyPartEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/PropertyPartEditPartCN.java
new file mode 100644
index 00000000000..534b29b20d0
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/part/PropertyPartEditPartCN.java
@@ -0,0 +1,81 @@
+/*****************************************************************************

+ * 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:

+ *  Patrick Tessier (CEA LIST)- Initial API and implementation

+ /*****************************************************************************/

+

+package org.eclipse.papyrus.uml.diagram.component.custom.edit.part;

+

+import org.eclipse.draw2d.Graphics;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.uml2.uml.AggregationKind;

+import org.eclipse.uml2.uml.Property;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * <pre>

+ * This class will be inherited by the GMF generated {@link org.eclipse.papyrus.uml.diagram.composite.edit.parts.PropertyPartEditPartCN}

+ * in order to refresh the related figure when when the Property::aggregation eAttribute value 

+ * changes.

+ * </pre>

+ */

+public abstract class PropertyPartEditPartCN extends NamedElementEditPart {

+

+	/**

+	 * Constructor

+	 * 

+	 * @param view

+	 */

+	public PropertyPartEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * <pre>

+	 * Calls the figure refresh when a change event is detected on 

+	 * UMLPackage.eINSTANCE.getProperty_Aggregation().

+	 * 

+	 * {@inheritDoc}

+	 * </pre>

+	 */

+	@Override

+	protected void handleNotificationEvent(Notification event) {

+

+		if((resolveSemanticElement() != null) && (resolveSemanticElement().equals(event.getNotifier()))) {

+			if(UMLPackage.eINSTANCE.getProperty_Aggregation().equals(event.getFeature())) {

+				refreshVisuals();

+			}

+		}

+		super.handleNotificationEvent(event);

+	}

+	

+

+	/**

+	 * <pre>

+	 * Refresh the figure with dashed border when Property aggregation value is SHARED.

+	 * Else set the border style to solid line.

+	 * 

+	 * {@inheritDoc}

+	 * </pre>

+	 */

+	@Override

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		if((resolveSemanticElement() != null) && (resolveSemanticElement() instanceof Property)) {

+			if(((Property)resolveSemanticElement()).getAggregation().equals(AggregationKind.SHARED_LITERAL)) {

+				getPrimaryShape().setLineStyle(Graphics.LINE_CUSTOM);

+			} else {

+				getPrimaryShape().setLineStyle(Graphics.LINE_SOLID);

+			}

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/CustomDiagramDragDropEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/CustomDiagramDragDropEditPolicy.java
index beb3d6e6543..5885a92a1ba 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/CustomDiagramDragDropEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/CustomDiagramDragDropEditPolicy.java
@@ -46,6 +46,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.uml.diagram.common.editpolicies.OldCommonDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.command.CreateViewCommand;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.helpers.ComponentLinkMappingHelper;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.helpers.ConnectorHelper;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.helpers.MultiDependencyHelper;

 import org.eclipse.papyrus.uml.diagram.component.custom.locators.PortPositionLocator;

 import org.eclipse.papyrus.uml.diagram.component.custom.log.Log;

@@ -55,6 +56,7 @@ import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentEditPartPCN;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPartCN;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPartPCN;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConnectorEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintEditPartPCN;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyNodeEditPart;

@@ -77,6 +79,7 @@ import org.eclipse.uml2.uml.Collaboration;
 import org.eclipse.uml2.uml.CollaborationUse;

 import org.eclipse.uml2.uml.Comment;

 import org.eclipse.uml2.uml.ConnectableElement;

+import org.eclipse.uml2.uml.Connector;

 import org.eclipse.uml2.uml.Constraint;

 import org.eclipse.uml2.uml.Dependency;

 import org.eclipse.uml2.uml.Element;

@@ -132,6 +135,8 @@ public class CustomDiagramDragDropEditPolicy extends OldCommonDiagramDragDropEdi
 		droppableElementsVisualId.add(CommentEditPart.VISUAL_ID);

 		droppableElementsVisualId.add(ConstraintEditPart.VISUAL_ID);

 		droppableElementsVisualId.add(PortEditPart.VISUAL_ID);

+		

+		droppableElementsVisualId.add(ConnectorEditPart.VISUAL_ID);

 

 		return droppableElementsVisualId;

 	}

@@ -200,6 +205,8 @@ public class CustomDiagramDragDropEditPolicy extends OldCommonDiagramDragDropEdi
 			return dropAsNormalBinaryLink(dropRequest, semanticElement, linkVISUALID);

 		case UsageEditPart.VISUAL_ID:

 			return dropAsNormalBinaryLink(dropRequest, semanticElement, linkVISUALID);

+		case ConnectorEditPart.VISUAL_ID:

+			return dropConnector(dropRequest, semanticElement, linkVISUALID);

 

 

 		default:

@@ -241,6 +248,28 @@ public class CustomDiagramDragDropEditPolicy extends OldCommonDiagramDragDropEdi
 	}

 

 	/**

+	 * Returns the drop command for Connector links.

+	 * 

+	 * @param dropRequest

+	 *        the drop request

+	 * @param semanticLink

+	 *        the element to drop

+	 * @param linkVISUALID

+	 *        the visual identifier of the EditPart of the dropped element

+	 * @return the drop command

+	 */

+	protected Command dropConnector(DropObjectsRequest dropRequest, Element semanticLink, int linkVISUALID) {

+		Collection<?> connectorEnds = ComponentLinkMappingHelper.getInstance().getSource(semanticLink);

+

+		if((connectorEnds != null) && (connectorEnds.size() == 2)) {

+

+			ConnectorHelper helper = new ConnectorHelper(getEditingDomain());

+			return new ICommandProxy(helper.dropConnector((Connector)semanticLink, linkVISUALID, getViewer(), getHost(), getDiagramPreferencesHint(), dropRequest.getLocation(), ((GraphicalEditPart)getHost()).getNotationView()));

+		} else {

+			return UnexecutableCommand.INSTANCE;

+		}

+	}

+	/**

 	 * call the mechanism to drop a binary link without specific type

 	 * 

 	 * @param dropRequest

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/PortItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/PortItemSemanticEditPolicy.java
index d83df159b4c..756f2100991 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/PortItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/PortItemSemanticEditPolicy.java
@@ -16,8 +16,17 @@ package org.eclipse.papyrus.uml.diagram.component.custom.edit.policies;
 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

+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.ReorientRelationshipRequest;

+import org.eclipse.gmf.runtime.notation.View;

+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.custom.edit.command.ConnectorCreateCommand;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.service.types.utils.RequestParameterConstants;

 

 // TODO: Auto-generated Javadoc

 /**

@@ -28,13 +37,34 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
  */

 public class PortItemSemanticEditPolicy extends org.eclipse.papyrus.uml.diagram.component.edit.policies.PortItemSemanticEditPolicy {

 

+	@Override

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case org.eclipse.papyrus.uml.diagram.component.edit.parts.ConnectorEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+

+			// Add graphical new end View in request parameters

+			View targetView = (View)getHost().getModel();

+			req.setParameter(RequestParameterConstants.EDGE_REORIENT_REQUEST_END_VIEW, targetView);

+

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

 	/**

 	 * <pre>

 	 * Forbid direct destruction of Port in case the graphical parent is not

-	 * the semantic parent.

-	 *

-	 * @param req the req

-	 * @return the destroy element command

+	 * the semantic parent.  

+	 * 

 	 * {@inheritDoc}

 	 * </pre>

 	 */

@@ -51,4 +81,36 @@ public class PortItemSemanticEditPolicy extends org.eclipse.papyrus.uml.diagram.
 		return super.getDestroyElementCommand(req);

 	}

 

+	/**

+	 * <pre>

+	 * Calls a custom creation command to allow the creation of a Connector connected to a Port

+	 * on its source end. 

+	 * 

+	 * {@inheritDoc}

+	 * </pre>

+	 */

+	@Override

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		if(UMLElementTypes.Connector_4019 == req.getElementType()) {

+			return getGEFWrapper(new ConnectorCreateCommand(req, req.getSource(), null));

+		}

+		return super.getStartCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * <pre>

+	 * Calls a custom creation command to allow the creation of a Connector connected to a Port

+	 * on its target end. 

+	 * 

+	 * {@inheritDoc}

+	 * </pre>

+	 */

+	@Override

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		if(UMLElementTypes.Connector_4019 == req.getElementType()) {

+			return getGEFWrapper(new ConnectorCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return super.getCompleteCreateRelationshipCommand(req);

+	}

+

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/PortLabelEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/PortLabelEditPolicy.java
index 47c810663a0..0dcbe365cd2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/PortLabelEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/PortLabelEditPolicy.java
@@ -12,26 +12,7 @@
  *****************************************************************************/

 package org.eclipse.papyrus.uml.diagram.component.custom.edit.policies;

 

-import java.util.Collection;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EAnnotation;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gef.GraphicalEditPart;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AbstractMaskManagedEditPolicy;

-import org.eclipse.papyrus.uml.diagram.common.helper.PropertyLabelHelper;

-import org.eclipse.papyrus.uml.diagram.component.custom.preferences.IPapyrusPropertyPreferencesConstant;

-import org.eclipse.papyrus.uml.diagram.component.custom.preferences.PropertyPreferencePage;

-import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.uml.tools.utils.ICustomAppearence;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.Type;

-import org.eclipse.uml2.uml.UMLPackage;

 

 /**

  * Specific edit policy for label displaying stereotypes and their properties for edges representing

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/PortLayoutEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/PortLayoutEditPolicy.java
index c9c64d98cc9..0e11cbf9e27 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/PortLayoutEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/PortLayoutEditPolicy.java
@@ -22,6 +22,7 @@ import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
 import org.eclipse.gef.requests.CreateRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortNameEditPart;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/PropertyLayoutEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/PropertyLayoutEditPolicy.java
new file mode 100644
index 00000000000..5aa1d3759aa
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/PropertyLayoutEditPolicy.java
@@ -0,0 +1,27 @@
+/*****************************************************************************

+ * 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:

+ *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.diagram.component.custom.edit.policies;

+

+

+/**

+ * This edit policy replaces the GMF generated edit policy for Property used as Part in composite structure diagram.

+ * In particular it provides a getCreateCommands that add a ChangeBoundRequest on a created Port

+ * in order to locate it at the cursor position.

+ * This class inherits from StructuredClassifierLayoutEditPolicy which provides support for a correct placement of

+ * port during creation.

+ * An example of code generated by GMF can be found in {@link PropertyPartEditPartCN#createLayoutEditPolicy()}.

+ */

+public class PropertyLayoutEditPolicy extends StructuredClassifierLayoutEditPolicy {

+

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/itemsemantic/PropertyPartItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/itemsemantic/PropertyPartItemSemanticEditPolicyCN.java
new file mode 100644
index 00000000000..94dac2414e0
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/edit/policies/itemsemantic/PropertyPartItemSemanticEditPolicyCN.java
@@ -0,0 +1,134 @@
+/*****************************************************************************

+ * Copyright (c) 2009-2011 CEA LIST.

+ *

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.itemsemantic;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+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.ReorientRelationshipRequest;

+import org.eclipse.gmf.runtime.notation.View;

+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.ConnectorCreateCommand;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConnectorEditPart;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.service.types.utils.RequestParameterConstants;

+

+/**

+ * <pre>

+ * This class provides a custom edit policy used to replace the SEMANTIC_ROLE 

+ * generated for the Property element (when used as Composite Part)

+ * 

+ * TODO : This should probably also manage Port clean removal (semantic deletion causes issues)

+ * </pre>

+ */

+public class PropertyPartItemSemanticEditPolicyCN extends org.eclipse.papyrus.uml.diagram.component.edit.policies.PropertyItemSemanticEditPolicy {

+

+	/**

+	 * <pre>

+	 * Calls a custom creation command to allow the creation of a Port on a Property. 

+	 * The Property has to be typed by a StructuredClassifier. 

+	 * 

+	 * {@inheritDoc}

+	 * </pre>

+	 */

+	@Override

+	protected Command getCreateCommand(CreateElementRequest req) {

+		if(org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes.Port_3069 == req.getElementType()) {

+			return getGEFWrapper(new org.eclipse.papyrus.uml.diagram.component.custom.command.PortCreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * <pre>

+	 * Forbid direct destruction of Property in case the graphical parent is not

+	 * the semantic parent.  

+	 * 

+	 * {@inheritDoc}

+	 * </pre>

+	 */

+	@Override

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+

+		EObject graphicalParent = ((GraphicalEditPart)getHost().getParent()).resolveSemanticElement();

+		EObject semanticParent = req.getElementToDestroy().eContainer();

+

+		if(graphicalParent != semanticParent) {

+			return UnexecutableCommand.INSTANCE;

+		}

+

+		return super.getDestroyElementCommand(req);

+	}

+	/**

+	 * <pre>

+	 * Calls a custom creation command to allow the creation of a Connector connected to a Property

+	 * on its source end. 

+	 * 

+	 * {@inheritDoc}

+	 * </pre>

+	 */

+	@Override

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		if(UMLElementTypes.Connector_4019 == req.getElementType()) {

+			return getGEFWrapper(new ConnectorCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return super.getStartCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * <pre>

+	 * Calls a custom creation command to allow the creation of a Connector connected to a Property

+	 * on its target end. 

+	 * 

+	 * {@inheritDoc}

+	 * </pre>

+	 */

+	@Override

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		if(UMLElementTypes.Connector_4019 == req.getElementType()) {

+			return getGEFWrapper(new ConnectorCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return super.getCompleteCreateRelationshipCommand(req);

+	}

+

+	@Override

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ConnectorEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+

+			// Add graphical new end View in request parameters

+			View targetView = (View)getHost().getModel();

+			req.setParameter(RequestParameterConstants.EDGE_REORIENT_REQUEST_END_VIEW, targetView);

+

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/factory/CustomUMLEditPartFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/factory/CustomUMLEditPartFactory.java
index 55527d04a11..1dee5e30229 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/factory/CustomUMLEditPartFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/factory/CustomUMLEditPartFactory.java
@@ -14,9 +14,9 @@ package org.eclipse.papyrus.uml.diagram.component.custom.factory;
 

 import org.eclipse.gef.EditPart;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.component.custom.edit.part.CustomInterfaceEditPart;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.part.CustomDependencyBranchEditPart;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.part.CustomDependencyNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.part.CustomInterfaceEditPart;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.part.CustomInterfaceRealizationEditPart;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.part.CustomModelEditPart;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.part.CustomModelEditPartCN;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/edges/ConnectorFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/edges/ConnectorFigure.java
new file mode 100644
index 00000000000..0b48f971bd6
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/edges/ConnectorFigure.java
@@ -0,0 +1,99 @@
+/*****************************************************************************

+ * Copyright (c) 2009 CEA LIST.

+ *

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.diagram.component.custom.figure.edges;

+

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.UMLEdgeFigure;

+

+/**

+ * Figure for Connector representation.

+ */

+public class ConnectorFigure extends UMLEdgeFigure {

+

+	/** Owned label for Connector Name **/

+	private WrappingLabel fNameLabel;

+

+	/** Owned label for Connector source multiplicity **/

+	private WrappingLabel fMultiplicitySourceLabel;

+

+	/** Owned label for Connector target multiplicity **/

+	private WrappingLabel fMultiplicityTargetLabel;

+

+	/**

+	 * Default constructor

+	 */

+	public ConnectorFigure() {

+		super();

+		createContents();

+	}

+

+	/**

+	 * {@inheritDoc}

+	 */

+	@Override

+	protected void createContents() {

+		super.createContents();

+

+		fNameLabel = new WrappingLabel();

+		// fNameLabel.setText(""); //$NON-NLS-1$

+

+		this.add(fNameLabel);

+

+		fMultiplicitySourceLabel = new WrappingLabel();

+		// fMultiplicitySourceLabel.setText(""); //$NON-NLS-1$

+

+		this.add(fMultiplicitySourceLabel);

+

+		fMultiplicityTargetLabel = new WrappingLabel();

+		// fMultiplicityTargetLabel.setText(""); //$NON-NLS-1$

+

+		this.add(fMultiplicityTargetLabel);

+	}

+

+	/**

+	 * Gets the applied stereotype association label.

+	 * 

+	 * @return the applied stereotype association label

+	 */

+	public WrappingLabel getAppliedStereotypeAssociationLabel() {

+		return appliedStereotypeLabel;

+	}

+

+	/**

+	 * Gets the Connector name label.

+	 * 

+	 * @return the Connector name label

+	 */

+	public WrappingLabel getNameLabel() {

+		return fNameLabel;

+	}

+

+	/**

+	 * Gets the multiplicity source label.

+	 * 

+	 * @return the multiplicity source label

+	 */

+	public WrappingLabel getMultiplicitySourceLabel() {

+		return fMultiplicitySourceLabel;

+	}

+

+	/**

+	 * Gets the multiplicity target label.

+	 * 

+	 * @return the multiplicity target label

+	 */

+	public WrappingLabel getMultiplicityTargetLabel() {

+		return fMultiplicityTargetLabel;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/edges/UsageLinkFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/edges/UsageLinkFigure.java
index e651a1e988d..ae22a156055 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/edges/UsageLinkFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/edges/UsageLinkFigure.java
@@ -21,21 +21,33 @@ import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;
 **/

 public class UsageLinkFigure extends DashedEdgeFigure{

 	

+	private boolean asLink = true;

 	

 	/**

+	 * @see org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure#resetStyle()

+	 */

+	@Override

+	public void resetStyle() {

+		this.arrow = !asLink;

+		setupDefaultStyle();

+		if (asLink) {

+			this.setLineStyle(Graphics.LINE_SOLID);

+		} else {

+			this.setLineStyle(Graphics.LINE_CUSTOM);

+		}

+	}

+

+	/**

 	 * display it as a line

 	 */

 	public void displayAsAlink(){

-		setArrow(false);

-		this.setLineStyle(Graphics.LINE_SOLID);

-		

+		asLink = true;

 	}

+

 	/**

 	 * display it as the UML representation with its decoration

 	 */

 	public void displayAsUMLShape(){

-		this.setLineStyle(Graphics.LINE_CUSTOM);

-		setArrow(true);

-		

+		asLink = false;

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/nodes/LollipopInterfaceFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/nodes/LollipopInterfaceFigure.java
index dd45ca39a26..3163a200892 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/nodes/LollipopInterfaceFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/nodes/LollipopInterfaceFigure.java
@@ -1,3 +1,15 @@
+/*****************************************************************************

+ * 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:

+ *  Patrick Tessier (CEA LIST)- Initial API and implementation

+ /*****************************************************************************/

 package org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes;

 

 import org.eclipse.draw2d.Graphics;

@@ -130,25 +142,21 @@ public class LollipopInterfaceFigure  extends PapyrusNodeFigure implements IPapy
 

 	}

 

-	@Override

 	public void setStereotypeDisplay(String stereotypes, Image image) {

 		// TODO Auto-generated method stub

 

 	}

 

-	@Override

 	public void setStereotypePropertiesInBrace(String stereotypeProperties) {

 		// TODO Auto-generated method stub

 

 	}

 

-	@Override

 	public void setStereotypePropertiesInCompartment(String stereotypeProperties) {

 		// TODO Auto-generated method stub

 

 	}

 

-	@Override

 	public Label getStereotypesLabel() {

 		// TODO Auto-generated method stub

 		return null;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/nodes/PropertyPartFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/nodes/PropertyPartFigure.java
new file mode 100644
index 00000000000..b4c1142f171
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/figure/nodes/PropertyPartFigure.java
@@ -0,0 +1,64 @@
+/*****************************************************************************

+ * 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:

+ *  Patrick Tessier (CEA LIST)- Initial API and implementation

+ /*****************************************************************************/

+

+package org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes;

+

+import java.util.ArrayList;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.CompartmentFigure;

+

+/**

+ * Figure for Composite representation of Class.

+ */

+public class PropertyPartFigure extends CompartmentFigure {

+

+	/** The Internal Structure Compartment */

+	private final static String COMPOSITE_COMPARTMENT = "compositeCompartment";

+

+	/** The List of Compartment */

+	private final static List<String> COMPARTMENT = new ArrayList<String>() {

+

+		private static final long serialVersionUID = 1L;

+		{

+			add(COMPOSITE_COMPARTMENT);

+		}

+	};

+

+	/**

+	 * Default Constructor

+	 */

+	public PropertyPartFigure() {

+		this(null);

+	}

+

+	/**

+	 * Create a new Classifier figure with the given tag

+	 * 

+	 * @param tagLabel

+	 *        a String that will be displayed at the top of the figure

+	 */

+	public PropertyPartFigure(String tagLabel) {

+		super(COMPARTMENT, tagLabel);

+	}

+

+	/**

+	 * Get the attribute's compartment figure

+	 * 

+	 * @return

+	 */

+	public IFigure getCompositeCompartmentFigure() {

+		return getCompartment(COMPOSITE_COMPARTMENT);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/parts/PropertyDiagramUpdater.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/parts/PropertyDiagramUpdater.java
new file mode 100644
index 00000000000..671ffab91ec
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/parts/PropertyDiagramUpdater.java
@@ -0,0 +1,69 @@
+/*****************************************************************************

+ * Copyright (c) 2009 CEA LIST.

+ *

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.diagram.component.custom.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.uml.diagram.common.part.ICustomDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater;

+

+/**

+ * <pre>

+ * This class provides a custom implementation for the method 

+ * resolving the semantic children of a Property (as viewed in a

+ * structured classifier) in {@link UMLDiagramUpdater}.

+ * </pre>

+ */

+public class PropertyDiagramUpdater implements ICustomDiagramUpdater {

+

+	/**

+	 * <pre>

+	 * The original generated method of {@link UMLDiagramUpdater} class is kept commented below.

+	 * 

+	 * In the CompositeStructure Diagram, Port may be shown graphically attached to 

+	 * a Property. This is only possible if the Property is typed by the StructuredClassifier

+	 * that owns the Port.

+	 * 

+	 * In order to implement this in GMF, the Port is declared as an affixed child for both

+	 * StructuredClassifier and Property, but as the Port is not contained by Property, the 

+	 * Property related getSemanticChildren is not generated properly. 

+	 * 

+	 * FIXME : Not sure whether the {@link UMLDiagramUpdater} class is really needed by Papyrus

+	 * 

+	 * {@inheritDoc}

+	 * </pre>

+	 */

+	public List<?> getSemanticChildren(View view) {

+

+		return Collections.EMPTY_LIST;

+

+		// if (!view.isSetElement()) {

+		// return Collections.EMPTY_LIST;

+		// }

+		//

+		// Property modelElement = (Property) view.getElement();

+		// List<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		// for (Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+		// Property childElement = (Property) it.next();

+		// int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+		// if (visualID == PortEditPart.VISUAL_ID) {

+		// result.add(new UMLNodeDescriptor(childElement, visualID));

+		// continue;

+		// }

+		// }

+		// return result;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/preferences/IPapyrusPropertyPreferencesConstant.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/preferences/IPapyrusPropertyPreferencesConstant.java
index 6d1a2bda4d4..e9a926693a3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/preferences/IPapyrusPropertyPreferencesConstant.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/preferences/IPapyrusPropertyPreferencesConstant.java
@@ -13,6 +13,8 @@
  *****************************************************************************/

 package org.eclipse.papyrus.uml.diagram.component.custom.preferences;

 

+import org.eclipse.uml2.uml.Property;

+

 

 // TODO: Auto-generated Javadoc

 /**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/preferences/OperationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/preferences/OperationPreferencePage.java
index 4ee2e663497..9216c473f44 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/preferences/OperationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/preferences/OperationPreferencePage.java
@@ -15,9 +15,9 @@ package org.eclipse.papyrus.uml.diagram.component.custom.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusElementPreferencePage;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.papyrus.uml.tools.utils.ICustomAppearence;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.events.SelectionEvent;

@@ -80,13 +80,13 @@ public class OperationPreferencePage extends AbstractPapyrusElementPreferencePag
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String elementName = "Operation";

-		PreferenceConverter.setDefault(store, PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		PreferenceConverter.setDefault(store, PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(177, 207, 229));

+		PreferenceConverter.setDefault(store, PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

+		PreferenceConverter.setDefault(store, PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(177, 207, 229));

 

 		// Set the default for the gradient

-		store.setDefault(PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.GRADIENT_POLICY), false);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.GRADIENT_POLICY), false);

 		GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(new org.eclipse.swt.graphics.RGB(255, 255, 255), new org.eclipse.swt.graphics.RGB(177, 207, 229), 0, 0);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

 

 		// default for Operation label display

 		store.setDefault(IPapyrusOperationPreferencesConstant.OPERATION_LABEL_DISPLAY_PREFERENCE, ICustomAppearence.DEFAULT_UML_OPERATION);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/preferences/PropertyPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/preferences/PropertyPreferencePage.java
index 5eda95edf74..d13b460a401 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/preferences/PropertyPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/preferences/PropertyPreferencePage.java
@@ -15,9 +15,9 @@ package org.eclipse.papyrus.uml.diagram.component.custom.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusElementPreferencePage;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.uml.tools.utils.ICustomAppearence;

 import org.eclipse.swt.SWT;

@@ -30,6 +30,7 @@ import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.swt.widgets.Group;

 import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;

+import org.eclipse.uml2.uml.Property;

 

 // TODO: Auto-generated Javadoc

 /**

@@ -92,13 +93,13 @@ public class PropertyPreferencePage extends AbstractPapyrusElementPreferencePage
 	public static void initDefaults(IPreferenceStore store) {

 

 		String elementName = "Property";

-		PreferenceConverter.setDefault(store, PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		PreferenceConverter.setDefault(store, PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(177, 207, 229));

+		PreferenceConverter.setDefault(store, PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

+		PreferenceConverter.setDefault(store, PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(177, 207, 229));

 

 		// Set the default for the gradient

-		store.setDefault(PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.GRADIENT_POLICY), false);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.GRADIENT_POLICY), false);

 		GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(new org.eclipse.swt.graphics.RGB(255, 255, 255), new org.eclipse.swt.graphics.RGB(177, 207, 229), 0, 0);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

 

 		// custom code

 		store.setDefault(IPapyrusPropertyPreferencesConstant.LABEL_DISPLAY_PREFERENCE, ICustomAppearence.DEFAULT_UML_PROPERTY);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/ui/CreateUmlElementDialog.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/ui/CreateUmlElementDialog.java
index adf970a7413..06266f5718f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/ui/CreateUmlElementDialog.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/custom-src/org/eclipse/papyrus/uml/diagram/component/custom/ui/CreateUmlElementDialog.java
@@ -32,6 +32,7 @@ import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

 import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

 import org.eclipse.gmf.runtime.emf.type.core.IHintedType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.CreateRelationshipCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

 import org.eclipse.jface.viewers.ILabelProvider;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/messages.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/messages.properties
index 0df5b2ee507..ebe249e6611 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/messages.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/messages.properties
@@ -149,3 +149,7 @@ InterfaceRealizationCreationTool_title=Interface Realization
 InterfaceRealizationCreationTool_desc=Create an Interface Realization
 ComponentRealizationCreationTool_title=Component Realization
 ComponentRealizationCreationTool_desc=Create a Component Realization
+createPartCreationTool_title=Part
+createPartCreationTool_desc=create a part
+createConnectorCreationTool_title=Connector
+createConnectorCreationTool_desc=Create new Connector
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.gmfgen b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.gmfgen
index c1d0449c859..2ace1f129ac 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.gmfgen
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.gmfgen
@@ -52,7 +52,7 @@
           canonicalEditPolicyClassName="PortCanonicalEditPolicy"

           graphicalNodeEditPolicyClassName="PortGraphicalNodeEditPolicy"

           createCommandClassName="PortCreateCommand"

-          containers="/0/@diagram/@topLevelNodes.1 /0/@diagram/@childNodes.4 /0/@diagram/@childNodes.5">

+          containers="/0/@diagram/@topLevelNodes.1 /0/@diagram/@childNodes.4 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.12">

         <diagramRunTimeClass

             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

         <elementType

@@ -464,9 +464,9 @@
           <metaClass

               href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Component"/>

           <containmentMetaFeature

-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Component/packagedElement"/>

           <childMetaFeature

-              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Class/nestedClassifier"/>

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Component/packagedElement"/>

           <modelElementInitializer

               xsi:type="gmfgen:GenFeatureSeqInitializer">

             <initializers

@@ -987,6 +987,101 @@
           </modelFacet>

         </labels>

       </childNodes>

+      <childNodes

+          visualID="3079"

+          editPartClassName="PropertyPartEditPartCN"

+          childNodes="/0/@diagram/@childNodes.0"

+          containers="/0/@diagram/@compartments.0 /0/@diagram/@compartments.5 /0/@diagram/@compartments.6">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.PropertyPartFigure">

+          <attributes

+              xsi:type="gmfgen:StyleAttributes"

+              fixedForeground="true"

+              fixedBackground="true"/>

+          <attributes

+              xsi:type="gmfgen:DefaultSizeAttributes"

+              width="150"

+              height="70"/>

+        </viewmap>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.itemsemantic.PropertyPartItemSemanticEditPolicyCN"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gef.EditPolicy.LAYOUT_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.PropertyLayoutEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy"/>

+        <modelFacet>

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Property"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/ownedAttribute"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.1/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+        </modelFacet>

+        <labels

+            visualID="5268"

+            editPartClassName="PropertyPartNameEditPartCN"

+            itemSemanticEditPolicyClassName="PropertyPartNameItemSemanticEditPolicyCN"

+            elementIcon="true">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:StyleAttributes"

+                fixedFont="true"

+                fixedForeground="true"/>

+          </viewmap>

+          <behaviour

+              xsi:type="gmfgen:CustomBehaviour"

+              key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY"

+              editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.PropertyLabelEditPolicy"/>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0"

+              viewPattern="{0}"

+              editorPattern="{0}"

+              editPattern="{0}">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </childNodes>

       <topLevelNodes

           visualID="3203"

           editPartClassName="DependencyNodeEditPart"

@@ -2455,13 +2550,92 @@
             xsi:type="gmfgen:FigureViewmap"

             figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx"/>

       </links>

+      <links

+          visualID="4019"

+          editPartClassName="ConnectorEditPart">

+        <diagramRunTimeClass

+            href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>

+        <elementType

+            xsi:type="gmfgen:MetamodelType"/>

+        <viewmap

+            xsi:type="gmfgen:FigureViewmap"

+            figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.component.custom.figure.edges.ConnectorFigure"/>

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy"/>

+        <modelFacet

+            xsi:type="gmfgen:TypeLinkModelFacet">

+          <metaClass

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Connector"/>

+          <containmentMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StructuredClassifier/ownedConnector"/>

+          <modelElementInitializer

+              xsi:type="gmfgen:GenFeatureSeqInitializer">

+            <initializers

+                xsi:type="gmfgen:GenFeatureValueSpec"

+                value="/0/@expressionProviders/@providers.1/@expressions.0">

+              <feature

+                  href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+            </initializers>

+          </modelElementInitializer>

+          <sourceMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Connector/end"/>

+          <targetMetaFeature

+              href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Connector/end"/>

+        </modelFacet>

+        <labels

+            visualID="6024"

+            editPartClassName="ConnectorAppliedStereotypeEditPart"

+            itemSemanticEditPolicyClassName="ConnectorAppliedStereotypeItemSemanticEditPolicy">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getAppliedStereotypeLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                y="60"/>

+          </viewmap>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.2"

+              viewPattern="&lt;&lt;{0}>>"

+              editorPattern="&lt;&lt;{0}>>"

+              editPattern="&lt;&lt;{0}>>">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+        <labels

+            visualID="6025">

+          <diagramRunTimeClass

+              href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>

+          <viewmap

+              xsi:type="gmfgen:ParentAssignedViewmap"

+              getterName="getNameLabel"

+              figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">

+            <attributes

+                xsi:type="gmfgen:LabelOffsetAttributes"

+                y="-20"/>

+          </viewmap>

+          <modelFacet

+              xsi:type="gmfgen:FeatureLabelModelFacet"

+              parser="/0/@labelParsers/@implementations.0">

+            <metaFeatures

+                href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>

+          </modelFacet>

+        </labels>

+      </links>

       <compartments

           visualID="7001"

           editPartClassName="ComponentCompositeCompartmentEditPart"

           itemSemanticEditPolicyClassName="ComponentCompositeCompartmentItemSemanticEditPolicy"

           canonicalEditPolicyClassName="ComponentCompositeCompartmentCanonicalEditPolicy"

-          childNodes="/0/@diagram/@childNodes.4"

+          childNodes="/0/@diagram/@childNodes.4 /0/@diagram/@childNodes.12"

           title="CompositeCompartment"

+          hideIfEmpty="false"

           node="/0/@diagram/@topLevelNodes.1"

           listLayout="false">

         <diagramRunTimeClass

@@ -2584,8 +2758,9 @@
           editPartClassName="ComponentCompositeCompartmentEditPartCN"

           itemSemanticEditPolicyClassName="ComponentCompositeCompartmentItemSemanticEditPolicyCN"

           canonicalEditPolicyClassName="ComponentCompositeCompartmentCanonicalEditPolicyCN"

-          childNodes="/0/@diagram/@childNodes.4"

+          childNodes="/0/@diagram/@childNodes.4 /0/@diagram/@childNodes.12"

           title="CompositeCompartmentCN"

+          hideIfEmpty="false"

           node="/0/@diagram/@childNodes.4"

           listLayout="false">

         <diagramRunTimeClass

@@ -2608,8 +2783,9 @@
           editPartClassName="ComponentCompositeCompartmentEditPartPCN"

           itemSemanticEditPolicyClassName="ComponentCompositeCompartmentItemSemanticEditPolicyPCN"

           canonicalEditPolicyClassName="ComponentCompositeCompartmentCanonicalEditPolicyPCN"

-          childNodes="/0/@diagram/@childNodes.4"

+          childNodes="/0/@diagram/@childNodes.4 /0/@diagram/@childNodes.12"

           title="CompositeCompartmentPCN"

+          hideIfEmpty="false"

           node="/0/@diagram/@childNodes.5"

           listLayout="false">

         <diagramRunTimeClass

@@ -2751,7 +2927,7 @@
               smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"

               createMethodName="createPropertyCreationTool"

               id="&quot;component.tool.property&quot;"

-              genNodes="/0/@diagram/@childNodes.8"/>

+              genNodes="/0/@diagram/@childNodes.8 /0/@diagram/@childNodes.12"/>

           <entries

               xsi:type="gmfgen:ToolEntry"

               title="Operation"

@@ -2810,6 +2986,15 @@
               genLinks="/0/@diagram/@links.8 /0/@diagram/@links.9"/>

           <entries

               xsi:type="gmfgen:ToolEntry"

+              title="Connector"

+              description="Create new Connector"

+              largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif"

+              smallIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif"

+              createMethodName="createConnectorCreationTool"

+              id="&quot;component.tool.connector&quot;"

+              genLinks="/0/@diagram/@links.13"/>

+          <entries

+              xsi:type="gmfgen:ToolEntry"

               title="Dependency"

               description="Create a Dependency"

               largeIconPath="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"

@@ -2996,14 +3181,14 @@
         extensibleViaService="true">

       <implementations

           xsi:type="gmfgen:PredefinedParser"

-          uses="/0/@diagram/@childNodes.0/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.1/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.8/@labels.0/@modelFacet /0/@diagram/@links.4/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.3/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.6/@labels.0/@modelFacet /0/@diagram/@childNodes.4/@labels.0/@modelFacet /0/@diagram/@childNodes.5/@labels.0/@modelFacet /0/@diagram/@childNodes.11/@labels.0/@modelFacet /0/@diagram/@childNodes.7/@labels.0/@modelFacet /0/@diagram/@links.6/@labels.0/@modelFacet /0/@diagram/@links.3/@labels.0/@modelFacet /0/@diagram/@links.5/@labels.0/@modelFacet /0/@diagram/@links.10/@labels.0/@modelFacet /0/@diagram/@childNodes.2/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.2/@labels.0/@modelFacet /0/@diagram/@childNodes.1/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.0/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.7/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.4/@labels.0/@modelFacet /0/@diagram/@childNodes.8/@labelModelFacet /0/@diagram/@childNodes.9/@labelModelFacet /0/@diagram/@childNodes.10/@labelModelFacet /0/@diagram/@childNodes.3/@labels.0/@modelFacet"/>

+          uses="/0/@diagram/@childNodes.0/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.1/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.8/@labels.0/@modelFacet /0/@diagram/@links.4/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.3/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.6/@labels.0/@modelFacet /0/@diagram/@childNodes.4/@labels.0/@modelFacet /0/@diagram/@childNodes.5/@labels.0/@modelFacet /0/@diagram/@childNodes.11/@labels.0/@modelFacet /0/@diagram/@childNodes.7/@labels.0/@modelFacet /0/@diagram/@links.6/@labels.0/@modelFacet /0/@diagram/@links.3/@labels.0/@modelFacet /0/@diagram/@links.5/@labels.0/@modelFacet /0/@diagram/@links.10/@labels.0/@modelFacet /0/@diagram/@childNodes.2/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.2/@labels.0/@modelFacet /0/@diagram/@childNodes.1/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.0/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.7/@labels.0/@modelFacet /0/@diagram/@topLevelNodes.4/@labels.0/@modelFacet /0/@diagram/@childNodes.8/@labelModelFacet /0/@diagram/@childNodes.9/@labelModelFacet /0/@diagram/@childNodes.10/@labelModelFacet /0/@diagram/@childNodes.3/@labels.0/@modelFacet /0/@diagram/@childNodes.12/@labels.0/@modelFacet /0/@diagram/@links.13/@labels.1/@modelFacet"/>

       <implementations

           xsi:type="gmfgen:CustomParser"

           uses="/0/@diagram/@topLevelNodes.5/@labels.0/@modelFacet /0/@diagram/@childNodes.6/@labels.0/@modelFacet"

           qualifiedName="org.eclipse.papyrus.uml.diagram.common.parser.CommentParser"/>

       <implementations

           xsi:type="gmfgen:CustomParser"

-          uses="/0/@diagram/@links.2/@labels.0/@modelFacet /0/@diagram/@links.4/@labels.1/@modelFacet /0/@diagram/@links.6/@labels.1/@modelFacet /0/@diagram/@links.3/@labels.1/@modelFacet /0/@diagram/@links.5/@labels.1/@modelFacet /0/@diagram/@links.10/@labels.1/@modelFacet /0/@diagram/@childNodes.0/@labels.1/@modelFacet"

+          uses="/0/@diagram/@links.2/@labels.0/@modelFacet /0/@diagram/@links.4/@labels.1/@modelFacet /0/@diagram/@links.6/@labels.1/@modelFacet /0/@diagram/@links.3/@labels.1/@modelFacet /0/@diagram/@links.5/@labels.1/@modelFacet /0/@diagram/@links.10/@labels.1/@modelFacet /0/@diagram/@childNodes.0/@labels.1/@modelFacet /0/@diagram/@links.13/@labels.0/@modelFacet"

           qualifiedName="org.eclipse.papyrus.uml.diagram.common.parser.stereotype.AppliedStereotypeParser"/>

       <implementations

           xsi:type="gmfgen:CustomParser"

@@ -3026,6 +3211,18 @@
         superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.AbstractBorderEditPart"/>

     <extensionNodes

         xsi:type="papyrusgmfgenextension:ExtendedGenView"

+        comment="Label in charge to display applied stereotypes on links"

+        genView="/0/@diagram/@links.2 /0/@diagram/@links.3 /0/@diagram/@links.4 /0/@diagram/@links.5 /0/@diagram/@links.6 /0/@diagram/@links.10 /0/@diagram/@links.11 /0/@diagram/@links.13"

+        name="ExtendedUMLLinks"

+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart"/>

+    <extensionNodes

+        xsi:type="papyrusgmfgenextension:ExtendedGenView"

+        comment="This manages graphical refresh when aggregation kind changes"

+        genView="/0/@diagram/@childNodes.12"

+        name="EP_ConnectableElement_As_Part_NODE"

+        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.component.custom.edit.part.PropertyPartEditPartCN"/>

+    <extensionNodes

+        xsi:type="papyrusgmfgenextension:ExtendedGenView"

         comment="Elements that inherits Composite"

         genView="/0/@diagram/@topLevelNodes.1 /0/@diagram/@childNodes.4 /0/@diagram/@childNodes.5"

         name="Composite inheritance"

@@ -3044,12 +3241,6 @@
         superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.AbstractLabelEditPart"/>

     <extensionNodes

         xsi:type="papyrusgmfgenextension:ExtendedGenView"

-        comment="Label in charge to display applied stereotypes on links"

-        genView="/0/@diagram/@links.2 /0/@diagram/@links.3 /0/@diagram/@links.4 /0/@diagram/@links.5 /0/@diagram/@links.6 /0/@diagram/@links.10 /0/@diagram/@links.11"

-        name="ExtendedUMLLinks"

-        superOwnedEditPart="org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart"/>

-    <extensionNodes

-        xsi:type="papyrusgmfgenextension:ExtendedGenView"

         comment="Add super class to a Comment edit parts"

         genView="/0/@diagram/@childNodes.6 /0/@diagram/@topLevelNodes.5"

         name="EP_Comment_NODE"

@@ -3095,22 +3286,17 @@
         xsi:type="papyrusgmfgenextension:EditPartUsingDeleteService"

         comment="The delete service is used on every TopNode Childnode and Link"

         name="Every TopNode ChildNode Link"

-        genView="/0/@diagram/@childNodes.0 /0/@diagram/@childNodes.2 /0/@diagram/@childNodes.4 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@topLevelNodes.0 /0/@diagram/@topLevelNodes.1 /0/@diagram/@topLevelNodes.8 /0/@diagram/@topLevelNodes.3 /0/@diagram/@topLevelNodes.5 /0/@diagram/@topLevelNodes.6 /0/@diagram/@links.0 /0/@diagram/@links.1 /0/@diagram/@links.2 /0/@diagram/@links.4 /0/@diagram/@links.6 /0/@diagram/@links.5 /0/@diagram/@links.8 /0/@diagram/@links.10 /0/@diagram/@links.11 /0/@diagram/@childNodes.8"/>

+        genView="/0/@diagram/@childNodes.0 /0/@diagram/@childNodes.2 /0/@diagram/@childNodes.4 /0/@diagram/@childNodes.5 /0/@diagram/@childNodes.11 /0/@diagram/@childNodes.6 /0/@diagram/@childNodes.7 /0/@diagram/@topLevelNodes.0 /0/@diagram/@topLevelNodes.1 /0/@diagram/@topLevelNodes.8 /0/@diagram/@topLevelNodes.3 /0/@diagram/@topLevelNodes.5 /0/@diagram/@topLevelNodes.6 /0/@diagram/@links.0 /0/@diagram/@links.1 /0/@diagram/@links.2 /0/@diagram/@links.4 /0/@diagram/@links.6 /0/@diagram/@links.5 /0/@diagram/@links.8 /0/@diagram/@links.10 /0/@diagram/@links.11 /0/@diagram/@childNodes.8 /0/@diagram/@links.13"/>

     <extensionNodes

         xsi:type="papyrusgmfgenextension:EditPartUsingReorientService"

         comment="Use the edit service for reorient command (All DirectedRelationship)"

         name="DirectedRelationship"

-        genView="/0/@diagram/@links.2 /0/@diagram/@links.0 /0/@diagram/@links.1 /0/@diagram/@links.3 /0/@diagram/@links.4 /0/@diagram/@links.5 /0/@diagram/@links.6 /0/@diagram/@links.10 /0/@diagram/@links.11"/>

-    <extensionNodes

-        xsi:type="papyrusgmfgenextension:CompartmentVisibilityPreference"

-        comment="Hidden Compartements"

-        visibleByDefault="false"

-        compartments="/0/@diagram/@compartments.0 /0/@diagram/@compartments.5 /0/@diagram/@compartments.6"/>

+        genView="/0/@diagram/@links.2 /0/@diagram/@links.0 /0/@diagram/@links.1 /0/@diagram/@links.3 /0/@diagram/@links.4 /0/@diagram/@links.5 /0/@diagram/@links.6 /0/@diagram/@links.10 /0/@diagram/@links.11 /0/@diagram/@links.13"/>

     <extensionNodes

         xsi:type="papyrusgmfgenextension:CompartmentTitleVisibilityPreference"

         comment="Hidden Compartments Title"

         visibleByDefault="false"

-        compartments="/0/@diagram/@compartments.0 /0/@diagram/@compartments.5 /0/@diagram/@compartments.6 /0/@diagram/@compartments.2 /0/@diagram/@compartments.4 /0/@diagram/@compartments.1 /0/@diagram/@compartments.3 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10"/>

+        compartments="/0/@diagram/@compartments.2 /0/@diagram/@compartments.4 /0/@diagram/@compartments.1 /0/@diagram/@compartments.3 /0/@diagram/@compartments.7 /0/@diagram/@compartments.8 /0/@diagram/@compartments.9 /0/@diagram/@compartments.10 /0/@diagram/@compartments.0 /0/@diagram/@compartments.5 /0/@diagram/@compartments.6"/>

     <extensionNodes

         xsi:type="papyrusgmfgenextension:LabelVisibilityPreference"

         comment="Name"

@@ -3123,5 +3309,16 @@
         role="Stereotype"

         linkLabels="/0/@diagram/@links.4/@labels.1 /0/@diagram/@links.2/@labels.0 /0/@diagram/@links.3/@labels.1 /0/@diagram/@links.5/@labels.1 /0/@diagram/@links.6/@labels.1 /0/@diagram/@links.10/@labels.1"

         externalNodeLabels="/0/@diagram/@childNodes.0/@labels.1"/>

+    <extensionNodes

+        xsi:type="papyrusgmfgenextension:SpecificDiagramUpdater"

+        comment="Property (Part) custom DiagramUpdater"

+        classpath="org.eclipse.papyrus.uml.diagram.component.custom.parts.PropertyDiagramUpdater"

+        genNode="/0/@diagram/@childNodes.12"/>

+    <extensionNodes

+        xsi:type="papyrusgmfgenextension:LabelVisibilityPreference"

+        comment="Name (Connector)"

+        role="Name"

+        linkLabels="/0/@diagram/@links.13/@labels.1"

+        visibleByDefault="false"/>

   </papyrusgmfgenextension:PapyrusExtensionRootNode>

 </xmi:XMI>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.properties
index 27f5beedebc..f05f9c5e4b2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.properties
@@ -58,4 +58,7 @@ metatype.name.Reception_6=Reception
 metatype.name.Interface_3078=Interface

 metatype.name.NamedElement_3072=Interface

 metatype.name.Link_4018=InterfacePortLink

-
\ No newline at end of file
+


+metatype.name.Property_3079=Property

+metatype.name.Connector_4019=Connector

+


diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.xml
index 40e5768ea23..69aa0c6db5e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/plugin.xml
@@ -299,8 +299,8 @@
       <viewProvider class="org.eclipse.papyrus.uml.diagram.component.providers.UMLViewProvider">
          <Priority name="Lowest"/>
          <context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="PapyrusUMLComponentDiagram"/>
-         <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="3203,2002,3202,3200,3205,3201,3199,3204,2003,3069,3077,3076,3078,3070,3071,3074,3075,1,5,6,3072"/>
-         <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="4001,4006,4003,4012,4014,4007,4013,4016,4015,4009,4010,4017,4018"/>
+         <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="3203,2002,3202,3200,3205,3201,3199,3204,2003,3069,3077,3076,3078,3070,3071,3074,3075,1,5,6,3072,3079"/>
+         <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="4001,4006,4003,4012,4014,4007,4013,4016,4015,4009,4010,4017,4018,4019"/>
       </viewProvider>
    </extension>
 
@@ -312,13 +312,13 @@
             <method name="getType()" value="PapyrusUMLComponentDiagram"/>
          </object>
          <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-nodes">
-            <method name="getType()" value="3203,2002,3202,3200,3205,3201,3199,3204,2003,3069,3077,3076,3078,3070,3071,3074,3075,1,5,6,3072"/>
+            <method name="getType()" value="3203,2002,3202,3200,3205,3201,3199,3204,2003,3069,3077,3076,3078,3070,3071,3074,3075,1,5,6,3072,3079"/>
          </object>
          <object class="org.eclipse.gmf.runtime.notation.Edge" id="generated-links">
-            <method name="getType()" value="4001,4006,4003,4012,4014,4007,4013,4016,4015,4009,4010,4017,4018"/>
+            <method name="getType()" value="4001,4006,4003,4012,4014,4007,4013,4016,4015,4009,4010,4017,4018,4019"/>
          </object>
          <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-labels">
-            <method name="getType()" value="5008,5004,5262,5254,5266,5255,5252,5253,5265,5005,5006,5007,5264,5261,5267,5256,5257,5258,5259,5260,0"/>
+            <method name="getType()" value="5008,5004,5262,5254,5266,5255,5252,5253,5265,5005,5006,5007,5264,5261,5267,5256,5257,5258,5259,5260,0,5268"/>
          </object>
          <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-compartments">
             <method name="getType()" value="7001,7006,7002,7007,7005,7003,7004,7008,7009,7010,7011"/>
@@ -353,7 +353,8 @@
          <object class="org.eclipse.papyrus.uml.diagram.component.edit.parts.OperationForInterfaceEditPart" id="Operation_5"/>
          <object class="org.eclipse.papyrus.uml.diagram.component.edit.parts.ReceptionInInterfaceEditPart" id="Reception_6"/>
          <object class="org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPartPCN" id="Interface_3072"/>
-         <context elements="Package_1000,Dependency_3203,Component_2002,Model_3202,Package_3200,Interface_3205,Comment_3201,Constraint_3199,NamedElement_3204,NamedElement_2003,Port_3069,Model_3077,Package_3076,Interface_3078,Component_3070,Component_3071,Comment_3074,Constraint_3075,Property_1,Operation_5,Reception_6,Interface_3072"/>
+         <object class="org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN" id="Property_3079"/>
+         <context elements="Package_1000,Dependency_3203,Component_2002,Model_3202,Package_3200,Interface_3205,Comment_3201,Constraint_3199,NamedElement_3204,NamedElement_2003,Port_3069,Model_3077,Package_3076,Interface_3078,Component_3070,Component_3071,Comment_3074,Constraint_3075,Property_1,Operation_5,Reception_6,Interface_3072,Property_3079"/>
       </modelingAssistantProvider>
    </extension>
 
@@ -584,6 +585,16 @@
       </metamodel>
       <metamodel nsURI="http://www.eclipse.org/uml2/4.0.0/UML">
          <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.component.Property_3079"
+               name="%metatype.name.Property_3079"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Property"
+               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.PropertyEditHelper">
+            <param name="semanticHint" value="3079"/>
+         </metamodelType>
+      </metamodel>
+      <metamodel nsURI="http://www.eclipse.org/uml2/4.0.0/UML">
+         <metamodelType
                id="org.eclipse.papyrus.uml.diagram.component.Usage_4001"
                name="%metatype.name.Usage_4001"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
@@ -703,6 +714,16 @@
          <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
          <param name="semanticHint" value="4018"/>
       </specializationType>
+      <metamodel nsURI="http://www.eclipse.org/uml2/4.0.0/UML">
+         <metamodelType
+               id="org.eclipse.papyrus.uml.diagram.component.Connector_4019"
+               name="%metatype.name.Connector_4019"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+               eclass="Connector"
+               edithelper="org.eclipse.papyrus.uml.diagram.component.edit.helpers.ConnectorEditHelper">
+            <param name="semanticHint" value="4019"/>
+         </metamodelType>
+      </metamodel>
    </extension>
 
    <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings" id="element-types-bindings">
@@ -740,6 +761,7 @@
          <elementType ref="org.eclipse.papyrus.uml.diagram.component.Operation_5"/>
          <elementType ref="org.eclipse.papyrus.uml.diagram.component.Reception_6"/>
          <elementType ref="org.eclipse.papyrus.uml.diagram.component.Interface_3072"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Property_3079"/>
          <elementType ref="org.eclipse.papyrus.uml.diagram.component.Usage_4001"/>
          <elementType ref="org.eclipse.papyrus.uml.diagram.component.InterfaceRealization_4006"/>
          <elementType ref="org.eclipse.papyrus.uml.diagram.component.Generalization_4003"/>
@@ -753,6 +775,7 @@
          <elementType ref="org.eclipse.papyrus.uml.diagram.component.Dependency_4010"/>
          <elementType ref="org.eclipse.papyrus.uml.diagram.component.Dependency_4017"/>
          <elementType ref="org.eclipse.papyrus.uml.diagram.component.Link_4018"/>
+         <elementType ref="org.eclipse.papyrus.uml.diagram.component.Connector_4019"/>
          <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>
       </binding>
    </extension>
@@ -953,6 +976,16 @@
  	</entry>

 	<entry

        defineOnly="true"

+       description="Create new Connector"

+       id="component.tool.connector"

+       kind="tool"

+       label="Connector"

+       large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif"

+       path=""

+       small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif">

+ 	</entry>

+	<entry

+       defineOnly="true"

        description="Create a Dependency"

        id="component.tool.dependency"

        kind="tool"

@@ -1132,6 +1165,10 @@
           path="/component.group.links">

     </predefinedEntry>

  	<predefinedEntry

+          id="component.tool.connector"

+          path="/component.group.links">

+    </predefinedEntry>

+ 	<predefinedEntry

           id="component.tool.dependency"

           path="/component.group.links">

     </predefinedEntry>

@@ -1299,6 +1336,14 @@
 

 	<?gmfgen generated="true"?>

 	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLComponentDiagram"

+			class="org.eclipse.papyrus.uml.diagram.component.preferences.ConnectorPreferencePage"

+            id="org.eclipse.papyrus.uml.diagram.component.preferences.ConnectorPreferencePage"

+            name="Connector Link" />

+		

+		

+

+	<?gmfgen generated="true"?>

+	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLComponentDiagram"

 			class="org.eclipse.papyrus.uml.diagram.component.preferences.ManifestationPreferencePage"

             id="org.eclipse.papyrus.uml.diagram.component.preferences.ManifestationPreferencePage"

             name="Manifestation Link" />

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ComponentCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ComponentCreateCommandCN.java
index 1cc5857c03f..b9d914ae021 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ComponentCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ComponentCreateCommandCN.java
@@ -25,7 +25,6 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.uml.diagram.component.providers.ElementInitializers;

-import org.eclipse.uml2.uml.Class;

 import org.eclipse.uml2.uml.Component;

 import org.eclipse.uml2.uml.UMLFactory;

 

@@ -95,8 +94,8 @@ public class ComponentCreateCommandCN extends EditElementCommand {
 	 */

 	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

 		Component newElement = UMLFactory.eINSTANCE.createComponent();

-		Class owner = (Class)getElementToEdit();

-		owner.getNestedClassifiers().add(newElement);

+		Component owner = (Component)getElementToEdit();

+		owner.getPackagedElements().add(newElement);

 		ElementInitializers.getInstance().init_Component_3070(newElement);

 		doConfigure(newElement, monitor, info);

 		((CreateElementRequest)getRequest()).setNewElement(newElement);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ConnectorCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ConnectorCreateCommand.java
new file mode 100644
index 00000000000..353de7eebf7
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ConnectorCreateCommand.java
@@ -0,0 +1,164 @@
+/*****************************************************************************

+ * 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:

+ *  Patrick Tessier (CEA LIST) - Initial API and implementation

+ /*****************************************************************************/

+package org.eclipse.papyrus.uml.diagram.component.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Connector;

+import org.eclipse.uml2.uml.ConnectorEnd;

+import org.eclipse.uml2.uml.StructuredClassifier;

+import org.eclipse.uml2.uml.UMLFactory;

+

+/**

+ * @generated

+ */

+public class ConnectorCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	protected final EObject source;

+

+	/**

+	 * @generated

+	 */

+	protected final EObject target;

+

+	/**

+	 * @generated

+	 */

+	protected StructuredClassifier container;

+

+	/**

+	 * @generated

+	 */

+	public ConnectorCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {

+		super(request.getLabel(), null, request);

+		this.source = source;

+		this.target = target;

+		container = deduceContainer(source, target);

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		if(source == null && target == null) {

+			return false;

+		}

+		if(source != null && false == source instanceof ConnectorEnd) {

+			return false;

+		}

+		if(target != null && false == target instanceof ConnectorEnd) {

+			return false;

+		}

+		if(getSource() == null) {

+			return true; // link creation is in progress; source is not defined yet

+		}

+		// target may be null here but it's possible to check constraint

+		if(getContainer() == null) {

+			return false;

+		}

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateConnector_4019(getContainer(), getSource(), getTarget());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		if(!canExecute()) {

+			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

+		}

+		Connector newElement = UMLFactory.eINSTANCE.createConnector();

+		getContainer().getOwnedConnectors().add(newElement);

+		newElement.getEnds().add(getSource());

+		newElement.getEnds().add(getTarget());

+		ElementInitializers.getInstance().init_Connector_4019(newElement);

+		doConfigure(newElement, monitor, info);

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(Connector newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());

+		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setElementToEdit(EObject element) {

+		throw new UnsupportedOperationException();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected ConnectorEnd getSource() {

+		return (ConnectorEnd)source;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected ConnectorEnd getTarget() {

+		return (ConnectorEnd)target;

+	}

+

+	/**

+	 * @generated

+	 */

+	public StructuredClassifier getContainer() {

+		return container;

+	}

+

+	/**

+	 * Default approach is to traverse ancestors of the source to find instance of container.

+	 * Modify with appropriate logic.

+	 * 

+	 * @generated

+	 */

+	protected StructuredClassifier deduceContainer(EObject source, EObject target) {

+		// Find container element for the new link.

+		// Climb up by containment hierarchy starting from the source

+		// and return the first element that is instance of the container class.

+		for(EObject element = source; element != null; element = element.eContainer()) {

+			if(element instanceof StructuredClassifier) {

+				return (StructuredClassifier)element;

+			}

+		}

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ConnectorReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ConnectorReorientCommand.java
new file mode 100644
index 00000000000..6cf570c1e60
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/ConnectorReorientCommand.java
@@ -0,0 +1,177 @@
+/*****************************************************************************

+ * 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:

+ *  Patrick Tessier (CEA LIST) - Initial API and implementation

+ /*****************************************************************************/

+package org.eclipse.papyrus.uml.diagram.component.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.uml2.uml.Connector;

+import org.eclipse.uml2.uml.ConnectorEnd;

+import org.eclipse.uml2.uml.StructuredClassifier;

+

+/**

+ * @generated

+ */

+public class ConnectorReorientCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private final int reorientDirection;

+

+	/**

+	 * @generated

+	 */

+	private final EObject oldEnd;

+

+	/**

+	 * @generated

+	 */

+	private final EObject newEnd;

+

+	/**

+	 * @generated

+	 */

+	public ConnectorReorientCommand(ReorientRelationshipRequest request) {

+		super(request.getLabel(), request.getRelationship(), request);

+		reorientDirection = request.getDirection();

+		oldEnd = request.getOldRelationshipEnd();

+		newEnd = request.getNewRelationshipEnd();

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		if(false == getElementToEdit() instanceof Connector) {

+			return false;

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {

+			return canReorientSource();

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {

+			return canReorientTarget();

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean canReorientSource() {

+		if(!(oldEnd instanceof ConnectorEnd && newEnd instanceof ConnectorEnd)) {

+			return false;

+		}

+		if(getLink().getEnds().size() != 1) {

+			return false;

+		}

+		ConnectorEnd target = (ConnectorEnd)getLink().getEnds().get(0);

+		if(!(getLink().eContainer() instanceof StructuredClassifier)) {

+			return false;

+		}

+		StructuredClassifier container = (StructuredClassifier)getLink().eContainer();

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistConnector_4019(container, getLink(), getNewSource(), target);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean canReorientTarget() {

+		if(!(oldEnd instanceof ConnectorEnd && newEnd instanceof ConnectorEnd)) {

+			return false;

+		}

+		if(getLink().getEnds().size() != 1) {

+			return false;

+		}

+		ConnectorEnd source = (ConnectorEnd)getLink().getEnds().get(0);

+		if(!(getLink().eContainer() instanceof StructuredClassifier)) {

+			return false;

+		}

+		StructuredClassifier container = (StructuredClassifier)getLink().eContainer();

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistConnector_4019(container, getLink(), source, getNewTarget());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		if(!canExecute()) {

+			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {

+			return reorientSource();

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {

+			return reorientTarget();

+		}

+		throw new IllegalStateException();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult reorientSource() throws ExecutionException {

+		getLink().getEnds().remove(getOldSource());

+		getLink().getEnds().add(getNewSource());

+		return CommandResult.newOKCommandResult(getLink());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult reorientTarget() throws ExecutionException {

+		getLink().getEnds().remove(getOldTarget());

+		getLink().getEnds().add(getNewTarget());

+		return CommandResult.newOKCommandResult(getLink());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Connector getLink() {

+		return (Connector)getElementToEdit();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected ConnectorEnd getOldSource() {

+		return (ConnectorEnd)oldEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected ConnectorEnd getNewSource() {

+		return (ConnectorEnd)newEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected ConnectorEnd getOldTarget() {

+		return (ConnectorEnd)oldEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected ConnectorEnd getNewTarget() {

+		return (ConnectorEnd)newEnd;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/DependencyBranchCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/DependencyBranchCreateCommand.java
index 18f34e74c01..6d5c6a1244f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/DependencyBranchCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/DependencyBranchCreateCommand.java
@@ -145,8 +145,8 @@ public class DependencyBranchCreateCommand extends EditElementCommand {
 	}

 

 	/**

-	 * Default approach is to traverse ancestors of the source to find instance of container.

-	 * Modify with appropriate logic.

+	 * Default approach is to traverse ancestors of the source to find instance

+	 * of container. Modify with appropriate logic.

 	 * 

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/PropertyCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/PropertyCreateCommand.java
new file mode 100644
index 00000000000..f52dbd6f352
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/commands/PropertyCreateCommand.java
@@ -0,0 +1,110 @@
+/*

+ * 

+ */

+package org.eclipse.papyrus.uml.diagram.component.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.uml.diagram.component.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Property;

+import org.eclipse.uml2.uml.StructuredClassifier;

+import org.eclipse.uml2.uml.UMLFactory;

+

+/**

+ * @generated

+ */

+public class PropertyCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private EClass eClass = null;

+

+	/**

+	 * @generated

+	 */

+	private EObject eObject = null;

+

+	/**

+	 * @generated

+	 */

+	public PropertyCreateCommand(CreateElementRequest req, EObject eObject) {

+		super(req.getLabel(), null, req);

+		this.eObject = eObject;

+		this.eClass = eObject != null ? eObject.eClass() : null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static PropertyCreateCommand create(CreateElementRequest req, EObject eObject) {

+		return new PropertyCreateCommand(req, eObject);

+	}

+

+	/**

+	 * @generated

+	 */

+	public PropertyCreateCommand(CreateElementRequest req) {

+		super(req.getLabel(), null, req);

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		if(container != null) {

+			return container;

+		}

+		return eObject;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		return true;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		Property newElement = UMLFactory.eINSTANCE.createProperty();

+		StructuredClassifier owner = (StructuredClassifier)getElementToEdit();

+		owner.getOwnedAttributes().add(newElement);

+		ElementInitializers.getInstance().init_Property_3079(newElement);

+		doConfigure(newElement, monitor, info);

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(Property newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/ConnectorEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/ConnectorEditHelper.java
new file mode 100644
index 00000000000..c1e4878e4bc
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/helpers/ConnectorEditHelper.java
@@ -0,0 +1,21 @@
+/*****************************************************************************

+ * 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:

+ *  Patrick Tessier (CEA LIST) - Initial API and implementation

+ /*****************************************************************************/

+package org.eclipse.papyrus.uml.diagram.component.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class ConnectorEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentEditPart.java
index 09108bc2474..984ac827787 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentEditPart.java
@@ -39,8 +39,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -197,8 +197,8 @@ public class CommentEditPart extends AbstractCommentEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Comment";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -349,6 +349,9 @@ public class CommentEditPart extends AbstractCommentEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.CommentAnnotatedElement_4015);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.CommentAnnotatedElement_4015);

+		}

 		return types;

 	}

 

@@ -376,6 +379,7 @@ public class CommentEditPart extends AbstractCommentEditPart {
 			types.add(UMLElementTypes.Comment_3074);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		}

 		return types;

 	}

@@ -415,15 +419,15 @@ public class CommentEditPart extends AbstractCommentEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentEditPartPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentEditPartPCN.java
index 45b690ecf01..bc6632ee81f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentEditPartPCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/CommentEditPartPCN.java
@@ -39,8 +39,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -197,8 +197,8 @@ public class CommentEditPartPCN extends AbstractCommentEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Comment";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -349,6 +349,9 @@ public class CommentEditPartPCN extends AbstractCommentEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.CommentAnnotatedElement_4015);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.CommentAnnotatedElement_4015);

+		}

 		return types;

 	}

 

@@ -376,6 +379,7 @@ public class CommentEditPartPCN extends AbstractCommentEditPart {
 			types.add(UMLElementTypes.Comment_3074);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		}

 		return types;

 	}

@@ -415,15 +419,15 @@ public class CommentEditPartPCN extends AbstractCommentEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPart.java
index e6345e3982f..d8952aa4df1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPart.java
@@ -44,8 +44,8 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IPapyrusEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

@@ -251,8 +251,8 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Component";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -405,6 +405,9 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Usage_4001);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Usage_4001);

+		}

 		if(targetEditPart instanceof RectangleInterfaceEditPart) {

 			types.add(UMLElementTypes.InterfaceRealization_4006);

 		}

@@ -480,6 +483,9 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Substitution_4012);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Substitution_4012);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Manifestation_4014);

 		}

@@ -528,6 +534,9 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Manifestation_4014);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Manifestation_4014);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.ComponentRealization_4007);

 		}

@@ -576,6 +585,9 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.ComponentRealization_4007);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.ComponentRealization_4007);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Abstraction_4013);

 		}

@@ -624,6 +636,9 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Abstraction_4013);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Abstraction_4013);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Dependency_4010);

 		}

@@ -672,6 +687,9 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Dependency_4010);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Dependency_4010);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Dependency_4017);

 		}

@@ -720,6 +738,9 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Dependency_4017);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Dependency_4017);

+		}

 		return types;

 	}

 

@@ -745,6 +766,7 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {

 			types.add(UMLElementTypes.Interface_3205);

 			types.add(UMLElementTypes.Interface_3078);

@@ -773,6 +795,7 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -790,6 +813,7 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -807,6 +831,7 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -824,6 +849,7 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Dependency_4010) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -841,6 +867,7 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -858,6 +885,7 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		}

 		return types;

 	}

@@ -902,6 +930,7 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Generalization_4003) {

 			types.add(UMLElementTypes.Component_2002);

 			types.add(UMLElementTypes.Interface_3205);

@@ -926,6 +955,7 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -943,6 +973,7 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -960,6 +991,7 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -977,6 +1009,7 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {

 			types.add(UMLElementTypes.Comment_3201);

 			types.add(UMLElementTypes.Comment_3074);

@@ -1000,6 +1033,7 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -1017,6 +1051,7 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		}

 		return types;

 	}

@@ -1031,15 +1066,15 @@ public class ComponentEditPart extends NamedElementEditPart implements IPapyrusE
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Component", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Component", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Component", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Component", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPartCN.java
index 438f43aea89..9a46b0f2d46 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPartCN.java
@@ -43,8 +43,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

@@ -250,8 +250,8 @@ public class ComponentEditPartCN extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Component";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -404,6 +404,9 @@ public class ComponentEditPartCN extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Usage_4001);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Usage_4001);

+		}

 		if(targetEditPart instanceof RectangleInterfaceEditPart) {

 			types.add(UMLElementTypes.InterfaceRealization_4006);

 		}

@@ -479,6 +482,9 @@ public class ComponentEditPartCN extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Substitution_4012);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Substitution_4012);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Manifestation_4014);

 		}

@@ -527,6 +533,9 @@ public class ComponentEditPartCN extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Manifestation_4014);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Manifestation_4014);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.ComponentRealization_4007);

 		}

@@ -575,6 +584,9 @@ public class ComponentEditPartCN extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.ComponentRealization_4007);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.ComponentRealization_4007);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Abstraction_4013);

 		}

@@ -623,6 +635,9 @@ public class ComponentEditPartCN extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Abstraction_4013);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Abstraction_4013);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Dependency_4010);

 		}

@@ -671,6 +686,9 @@ public class ComponentEditPartCN extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Dependency_4010);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Dependency_4010);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Dependency_4017);

 		}

@@ -719,6 +737,9 @@ public class ComponentEditPartCN extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Dependency_4017);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Dependency_4017);

+		}

 		return types;

 	}

 

@@ -744,6 +765,7 @@ public class ComponentEditPartCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {

 			types.add(UMLElementTypes.Interface_3205);

 			types.add(UMLElementTypes.Interface_3078);

@@ -772,6 +794,7 @@ public class ComponentEditPartCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -789,6 +812,7 @@ public class ComponentEditPartCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -806,6 +830,7 @@ public class ComponentEditPartCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -823,6 +848,7 @@ public class ComponentEditPartCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Dependency_4010) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -840,6 +866,7 @@ public class ComponentEditPartCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -857,6 +884,7 @@ public class ComponentEditPartCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		}

 		return types;

 	}

@@ -901,6 +929,7 @@ public class ComponentEditPartCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Generalization_4003) {

 			types.add(UMLElementTypes.Component_2002);

 			types.add(UMLElementTypes.Interface_3205);

@@ -925,6 +954,7 @@ public class ComponentEditPartCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -942,6 +972,7 @@ public class ComponentEditPartCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -959,6 +990,7 @@ public class ComponentEditPartCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -976,6 +1008,7 @@ public class ComponentEditPartCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {

 			types.add(UMLElementTypes.Comment_3201);

 			types.add(UMLElementTypes.Comment_3074);

@@ -999,6 +1032,7 @@ public class ComponentEditPartCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -1016,6 +1050,7 @@ public class ComponentEditPartCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		}

 		return types;

 	}

@@ -1030,15 +1065,15 @@ public class ComponentEditPartCN extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Component", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Component", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Component", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Component", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPartPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPartPCN.java
index d6e078b047f..acdcb620423 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPartPCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ComponentEditPartPCN.java
@@ -43,8 +43,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

@@ -250,8 +250,8 @@ public class ComponentEditPartPCN extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Component";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -404,6 +404,9 @@ public class ComponentEditPartPCN extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Usage_4001);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Usage_4001);

+		}

 		if(targetEditPart instanceof RectangleInterfaceEditPart) {

 			types.add(UMLElementTypes.InterfaceRealization_4006);

 		}

@@ -479,6 +482,9 @@ public class ComponentEditPartPCN extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Substitution_4012);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Substitution_4012);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Manifestation_4014);

 		}

@@ -527,6 +533,9 @@ public class ComponentEditPartPCN extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Manifestation_4014);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Manifestation_4014);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.ComponentRealization_4007);

 		}

@@ -575,6 +584,9 @@ public class ComponentEditPartPCN extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.ComponentRealization_4007);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.ComponentRealization_4007);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Abstraction_4013);

 		}

@@ -623,6 +635,9 @@ public class ComponentEditPartPCN extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Abstraction_4013);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Abstraction_4013);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Dependency_4010);

 		}

@@ -671,6 +686,9 @@ public class ComponentEditPartPCN extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Dependency_4010);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Dependency_4010);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Dependency_4017);

 		}

@@ -719,6 +737,9 @@ public class ComponentEditPartPCN extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Dependency_4017);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Dependency_4017);

+		}

 		return types;

 	}

 

@@ -744,6 +765,7 @@ public class ComponentEditPartPCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {

 			types.add(UMLElementTypes.Interface_3205);

 			types.add(UMLElementTypes.Interface_3078);

@@ -772,6 +794,7 @@ public class ComponentEditPartPCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -789,6 +812,7 @@ public class ComponentEditPartPCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -806,6 +830,7 @@ public class ComponentEditPartPCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -823,6 +848,7 @@ public class ComponentEditPartPCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Dependency_4010) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -840,6 +866,7 @@ public class ComponentEditPartPCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -857,6 +884,7 @@ public class ComponentEditPartPCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		}

 		return types;

 	}

@@ -901,6 +929,7 @@ public class ComponentEditPartPCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Generalization_4003) {

 			types.add(UMLElementTypes.Component_2002);

 			types.add(UMLElementTypes.Interface_3205);

@@ -925,6 +954,7 @@ public class ComponentEditPartPCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -942,6 +972,7 @@ public class ComponentEditPartPCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -959,6 +990,7 @@ public class ComponentEditPartPCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -976,6 +1008,7 @@ public class ComponentEditPartPCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {

 			types.add(UMLElementTypes.Comment_3201);

 			types.add(UMLElementTypes.Comment_3074);

@@ -999,6 +1032,7 @@ public class ComponentEditPartPCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -1016,6 +1050,7 @@ public class ComponentEditPartPCN extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		}

 		return types;

 	}

@@ -1030,15 +1065,15 @@ public class ComponentEditPartPCN extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Component", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Component", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Component", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Component", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConnectorAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConnectorAppliedStereotypeEditPart.java
new file mode 100644
index 00000000000..58d849699df
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConnectorAppliedStereotypeEditPart.java
@@ -0,0 +1,751 @@
+/*****************************************************************************

+ * 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:

+ *  Patrick Tessier (CEA LIST) - Initial API and implementation

+ /*****************************************************************************/

+package org.eclipse.papyrus.uml.diagram.component.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6024;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.component.edit.parts.ConnectorAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 60));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ConnectorAppliedStereotypeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public int getKeyPoint() {

+		return ConnectionLocator.MIDDLE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Connector_4019, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.component.edit.parts.ConnectorAppliedStereotypeEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		getManager().show();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+		final Request theRequest = request;

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					setParser(((ICustomDirectEditorConfiguration)configuration).createParser(this.resolveSemanticElement()));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((request instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)request;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && languagePreferred != configuration.getLanguage()) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConnectorEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConnectorEditPart.java
new file mode 100644
index 00000000000..9bfc0a0aac1
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConnectorEditPart.java
@@ -0,0 +1,117 @@
+/*****************************************************************************

+ * 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:

+ *  Patrick Tessier (CEA LIST) - Initial API and implementation

+ /*****************************************************************************/

+package org.eclipse.papyrus.uml.diagram.component.edit.parts;

+

+import org.eclipse.draw2d.Connection;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.custom.figure.edges.ConnectorFigure;

+import org.eclipse.papyrus.uml.diagram.component.edit.policies.ConnectorItemSemanticEditPolicy;

+

+/**

+ * @generated

+ */

+public class ConnectorEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 4019;

+

+	/**

+	 * @generated

+	 */

+	public ConnectorEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ConnectorItemSemanticEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof ConnectorAppliedStereotypeEditPart) {

+			((ConnectorAppliedStereotypeEditPart)childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel());

+			return true;

+		}

+		if(childEditPart instanceof ConnectorNameEditPart) {

+			((ConnectorNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof ConnectorAppliedStereotypeEditPart) {

+			return true;

+		}

+		if(childEditPart instanceof ConnectorNameEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected Connection createConnectionFigure() {

+		return new ConnectorFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public ConnectorFigure getPrimaryShape() {

+		return (ConnectorFigure)getFigure();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConnectorNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConnectorNameEditPart.java
new file mode 100644
index 00000000000..3358db897ea
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConnectorNameEditPart.java
@@ -0,0 +1,766 @@
+/*****************************************************************************

+ * 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:

+ *  Patrick Tessier (CEA LIST) - Initial API and implementation

+ /*****************************************************************************/

+package org.eclipse.papyrus.uml.diagram.component.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ConnectorNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, ILabelRoleProvider {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6025;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.component.edit.parts.ConnectorNameEditPart.VISUAL_ID), new Point(0, -20));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ConnectorNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public int getKeyPoint() {

+		return ConnectionLocator.MIDDLE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Connector_4019, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.component.edit.parts.ConnectorNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		getManager().show();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+		final Request theRequest = request;

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					setParser(((ICustomDirectEditorConfiguration)configuration).createParser(this.resolveSemanticElement()));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((request instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)request;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && languagePreferred != configuration.getLanguage()) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getLabelRole() {

+		return "Name";//$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getIconPathRole() {

+		return "";//$NON-NLS-1$

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintEditPart.java
index 001343db403..ad9a66b3fb3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintEditPart.java
@@ -39,8 +39,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -204,8 +204,8 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Constraint";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -358,6 +358,9 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Usage_4001);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Usage_4001);

+		}

 		if(targetEditPart instanceof RectangleInterfaceEditPart) {

 			types.add(UMLElementTypes.InterfaceRealization_4006);

 		}

@@ -415,6 +418,9 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Substitution_4012);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Substitution_4012);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Manifestation_4014);

 		}

@@ -463,6 +469,9 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Manifestation_4014);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Manifestation_4014);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.ComponentRealization_4007);

 		}

@@ -511,6 +520,9 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.ComponentRealization_4007);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.ComponentRealization_4007);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Abstraction_4013);

 		}

@@ -559,6 +571,9 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Abstraction_4013);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Abstraction_4013);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.ConstraintConstrainedElement_4009);

 		}

@@ -613,6 +628,9 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.ConstraintConstrainedElement_4009);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.ConstraintConstrainedElement_4009);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Dependency_4010);

 		}

@@ -661,6 +679,9 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Dependency_4010);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Dependency_4010);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Dependency_4017);

 		}

@@ -709,6 +730,9 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Dependency_4017);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Dependency_4017);

+		}

 		return types;

 	}

 

@@ -734,6 +758,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {

 			types.add(UMLElementTypes.Interface_3205);

 			types.add(UMLElementTypes.Interface_3078);

@@ -755,6 +780,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -772,6 +798,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -789,6 +816,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -806,6 +834,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.ConstraintConstrainedElement_4009) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -825,6 +854,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Comment_3074);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Dependency_4010) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -842,6 +872,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -859,6 +890,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		}

 		return types;

 	}

@@ -902,6 +934,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Substitution_4012) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -919,6 +952,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -936,6 +970,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -953,6 +988,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -970,6 +1006,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {

 			types.add(UMLElementTypes.Comment_3201);

 			types.add(UMLElementTypes.Comment_3074);

@@ -993,6 +1030,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -1010,6 +1048,7 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		}

 		return types;

 	}

@@ -1024,15 +1063,15 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintEditPartPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintEditPartPCN.java
index 97eb753fae0..d9ede4ebf71 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintEditPartPCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ConstraintEditPartPCN.java
@@ -39,8 +39,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -204,8 +204,8 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Constraint";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -358,6 +358,9 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Usage_4001);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Usage_4001);

+		}

 		if(targetEditPart instanceof RectangleInterfaceEditPart) {

 			types.add(UMLElementTypes.InterfaceRealization_4006);

 		}

@@ -415,6 +418,9 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Substitution_4012);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Substitution_4012);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Manifestation_4014);

 		}

@@ -463,6 +469,9 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Manifestation_4014);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Manifestation_4014);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.ComponentRealization_4007);

 		}

@@ -511,6 +520,9 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.ComponentRealization_4007);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.ComponentRealization_4007);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Abstraction_4013);

 		}

@@ -559,6 +571,9 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Abstraction_4013);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Abstraction_4013);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.ConstraintConstrainedElement_4009);

 		}

@@ -613,6 +628,9 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.ConstraintConstrainedElement_4009);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.ConstraintConstrainedElement_4009);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Dependency_4010);

 		}

@@ -661,6 +679,9 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Dependency_4010);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Dependency_4010);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Dependency_4017);

 		}

@@ -709,6 +730,9 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Dependency_4017);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Dependency_4017);

+		}

 		return types;

 	}

 

@@ -734,6 +758,7 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {

 			types.add(UMLElementTypes.Interface_3205);

 			types.add(UMLElementTypes.Interface_3078);

@@ -755,6 +780,7 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -772,6 +798,7 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -789,6 +816,7 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -806,6 +834,7 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.ConstraintConstrainedElement_4009) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -825,6 +854,7 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Comment_3074);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Dependency_4010) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -842,6 +872,7 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -859,6 +890,7 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		}

 		return types;

 	}

@@ -902,6 +934,7 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Substitution_4012) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -919,6 +952,7 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -936,6 +970,7 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -953,6 +988,7 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -970,6 +1006,7 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {

 			types.add(UMLElementTypes.Comment_3201);

 			types.add(UMLElementTypes.Comment_3074);

@@ -993,6 +1030,7 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -1010,6 +1048,7 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		}

 		return types;

 	}

@@ -1024,15 +1063,15 @@ public class ConstraintEditPartPCN extends AbstractConstraintEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DefaultNamedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DefaultNamedElementEditPart.java
index 1b811fca96c..d5af8622e11 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DefaultNamedElementEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DefaultNamedElementEditPart.java
@@ -39,8 +39,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;

@@ -192,8 +192,8 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "DefaultNamedElement";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -201,8 +201,8 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart {
 	/**

 	 * Creates figure for this edit part.

 	 * 

-	 * Body of this method does not depend on settings in generation model

-	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * Body of this method does not depend on settings in generation model so

+	 * you may safely remove <i>generated</i> tag and modify it.

 	 * 

 	 * @generated

 	 */

@@ -216,8 +216,8 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart {
 	}

 

 	/**

-	 * Default implementation treats passed figure as content pane.

-	 * Respects layout one may have set for generated figure.

+	 * Default implementation treats passed figure as content pane. Respects

+	 * layout one may have set for generated figure.

 	 * 

 	 * @param nodeShape

 	 *        instance of generated figure class

@@ -345,6 +345,9 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Usage_4001);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Usage_4001);

+		}

 		if(targetEditPart instanceof RectangleInterfaceEditPart) {

 			types.add(UMLElementTypes.InterfaceRealization_4006);

 		}

@@ -402,6 +405,9 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Substitution_4012);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Substitution_4012);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Manifestation_4014);

 		}

@@ -450,6 +456,9 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Manifestation_4014);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Manifestation_4014);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.ComponentRealization_4007);

 		}

@@ -498,6 +507,9 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.ComponentRealization_4007);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.ComponentRealization_4007);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Abstraction_4013);

 		}

@@ -546,6 +558,9 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Abstraction_4013);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Abstraction_4013);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Dependency_4010);

 		}

@@ -594,6 +609,9 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Dependency_4010);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Dependency_4010);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Dependency_4017);

 		}

@@ -642,6 +660,9 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Dependency_4017);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Dependency_4017);

+		}

 		return types;

 	}

 

@@ -667,6 +688,7 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {

 			types.add(UMLElementTypes.Interface_3205);

 			types.add(UMLElementTypes.Interface_3078);

@@ -688,6 +710,7 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -705,6 +728,7 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -722,6 +746,7 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -739,6 +764,7 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Dependency_4010) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -756,6 +782,7 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -773,6 +800,7 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		}

 		return types;

 	}

@@ -816,6 +844,7 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Substitution_4012) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -833,6 +862,7 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -850,6 +880,7 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -867,6 +898,7 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -884,6 +916,7 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {

 			types.add(UMLElementTypes.Comment_3201);

 			types.add(UMLElementTypes.Comment_3074);

@@ -907,6 +940,7 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -924,6 +958,7 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		}

 		return types;

 	}

@@ -938,15 +973,15 @@ public class DefaultNamedElementEditPart extends ShapeNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DefaultNamedElement", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DefaultNamedElement", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DefaultNamedElement", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DefaultNamedElement", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DefaultNamedElement", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DefaultNamedElement", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("DefaultNamedElement", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("DefaultNamedElement", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DefaultNamedElementNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DefaultNamedElementNameEditPart.java
index 18617b9b211..f5822daa3af 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DefaultNamedElementNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DefaultNamedElementNameEditPart.java
@@ -596,7 +596,9 @@ public class DefaultNamedElementNameEditPart extends PapyrusCompartmentEditPart
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see

+	 *         org

+	 *         .eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyBranchEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyBranchEditPart.java
index ebbbb4391b1..3bc72bfc3f3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyBranchEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyBranchEditPart.java
@@ -51,8 +51,8 @@ public class DependencyBranchEditPart extends UMLConnectionNodeEditPart implemen
 	/**

 	 * Creates figure for this edit part.

 	 * 

-	 * Body of this method does not depend on settings in generation model

-	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * Body of this method does not depend on settings in generation model so

+	 * you may safely remove <i>generated</i> tag and modify it.

 	 * 

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyNodeEditPart.java
index c54546523b0..652f5382380 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/DependencyNodeEditPart.java
@@ -47,8 +47,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;

@@ -168,8 +168,8 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "DependencyNode";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -177,8 +177,8 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 	/**

 	 * Creates figure for this edit part.

 	 * 

-	 * Body of this method does not depend on settings in generation model

-	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * Body of this method does not depend on settings in generation model so

+	 * you may safely remove <i>generated</i> tag and modify it.

 	 * 

 	 * @generated

 	 */

@@ -192,8 +192,8 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 	}

 

 	/**

-	 * Default implementation treats passed figure as content pane.

-	 * Respects layout one may have set for generated figure.

+	 * Default implementation treats passed figure as content pane. Respects

+	 * layout one may have set for generated figure.

 	 * 

 	 * @param nodeShape

 	 *        instance of generated figure class

@@ -316,6 +316,9 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Usage_4001);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Usage_4001);

+		}

 		if(targetEditPart instanceof RectangleInterfaceEditPart) {

 			types.add(UMLElementTypes.InterfaceRealization_4006);

 		}

@@ -373,6 +376,9 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Substitution_4012);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Substitution_4012);

+		}

 		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Manifestation_4014);

 		}

@@ -421,6 +427,9 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Manifestation_4014);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Manifestation_4014);

+		}

 		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyNodeEditPart) {

 			types.add(UMLElementTypes.ComponentRealization_4007);

 		}

@@ -469,6 +478,9 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.ComponentRealization_4007);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.ComponentRealization_4007);

+		}

 		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Abstraction_4013);

 		}

@@ -517,6 +529,9 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Abstraction_4013);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Abstraction_4013);

+		}

 		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Dependency_4010);

 		}

@@ -565,6 +580,9 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Dependency_4010);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Dependency_4010);

+		}

 		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Dependency_4017);

 		}

@@ -613,6 +631,9 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Dependency_4017);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Dependency_4017);

+		}

 		return types;

 	}

 

@@ -638,6 +659,7 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {

 			types.add(UMLElementTypes.Interface_3205);

 			types.add(UMLElementTypes.Interface_3078);

@@ -659,6 +681,7 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -676,6 +699,7 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -693,6 +717,7 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -710,6 +735,7 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Dependency_4010) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -727,6 +753,7 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -744,6 +771,7 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		}

 		return types;

 	}

@@ -787,6 +815,7 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Substitution_4012) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -804,6 +833,7 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -821,6 +851,7 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -838,6 +869,7 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -855,6 +887,7 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {

 			types.add(UMLElementTypes.Comment_3201);

 			types.add(UMLElementTypes.Comment_3074);

@@ -878,6 +911,7 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -895,6 +929,7 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		}

 		return types;

 	}

@@ -944,15 +979,15 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DependencyNode", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DependencyNode", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DependencyNode", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DependencyNode", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DependencyNode", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DependencyNode", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("DependencyNode", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("DependencyNode", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceAttributeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceAttributeCompartmentEditPartCN.java
index 7bfc6458433..f38a4d351f0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceAttributeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceAttributeCompartmentEditPartCN.java
@@ -1,3 +1,6 @@
+/*

+ * 

+ */

 package org.eclipse.papyrus.uml.diagram.component.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceEditPart.java
index f3fd700d58f..62fe7bf788f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceEditPart.java
@@ -44,8 +44,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;

@@ -166,8 +166,8 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "NamedElement";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -314,6 +314,9 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Usage_4001);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Usage_4001);

+		}

 		if(targetEditPart instanceof RectangleInterfaceEditPart) {

 			types.add(UMLElementTypes.InterfaceRealization_4006);

 		}

@@ -371,6 +374,9 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Substitution_4012);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Substitution_4012);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Manifestation_4014);

 		}

@@ -419,6 +425,9 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Manifestation_4014);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Manifestation_4014);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.ComponentRealization_4007);

 		}

@@ -467,6 +476,9 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.ComponentRealization_4007);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.ComponentRealization_4007);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Abstraction_4013);

 		}

@@ -515,6 +527,9 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Abstraction_4013);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Abstraction_4013);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Dependency_4010);

 		}

@@ -563,6 +578,9 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Dependency_4010);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Dependency_4010);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Dependency_4017);

 		}

@@ -611,6 +629,9 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Dependency_4017);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Dependency_4017);

+		}

 		return types;

 	}

 

@@ -636,6 +657,7 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {

 			types.add(UMLElementTypes.Interface_3205);

 			types.add(UMLElementTypes.Interface_3078);

@@ -657,6 +679,7 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -674,6 +697,7 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -691,6 +715,7 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -708,6 +733,7 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Dependency_4010) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -725,6 +751,7 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -742,6 +769,7 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		}

 		return types;

 	}

@@ -785,6 +813,7 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Substitution_4012) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -802,6 +831,7 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -819,6 +849,7 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -836,6 +867,7 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -853,6 +885,7 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {

 			types.add(UMLElementTypes.Comment_3201);

 			types.add(UMLElementTypes.Comment_3074);

@@ -876,6 +909,7 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -893,6 +927,7 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		}

 		return types;

 	}

@@ -907,15 +942,15 @@ public class InterfaceEditPart extends AbstractBorderedShapeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("NamedElement", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("NamedElement", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("NamedElement", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("NamedElement", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("NamedElement", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("NamedElement", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("NamedElement", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("NamedElement", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceEditPartPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceEditPartPCN.java
index ff75a72372e..b3c4fa8acea 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceEditPartPCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceEditPartPCN.java
@@ -44,8 +44,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;

 import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;

@@ -168,8 +168,8 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Interface";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -317,6 +317,9 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Usage_4001);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Usage_4001);

+		}

 		if(targetEditPart instanceof RectangleInterfaceEditPart) {

 			types.add(UMLElementTypes.InterfaceRealization_4006);

 		}

@@ -392,6 +395,9 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Substitution_4012);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Substitution_4012);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Manifestation_4014);

 		}

@@ -440,6 +446,9 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Manifestation_4014);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Manifestation_4014);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.ComponentRealization_4007);

 		}

@@ -488,6 +497,9 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.ComponentRealization_4007);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.ComponentRealization_4007);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Abstraction_4013);

 		}

@@ -536,6 +548,9 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Abstraction_4013);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Abstraction_4013);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Dependency_4010);

 		}

@@ -584,6 +599,9 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Dependency_4010);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Dependency_4010);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Dependency_4017);

 		}

@@ -632,6 +650,9 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart {
 		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Dependency_4017);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Dependency_4017);

+		}

 		return types;

 	}

 

@@ -657,6 +678,7 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {

 			types.add(UMLElementTypes.Interface_3205);

 			types.add(UMLElementTypes.Interface_3078);

@@ -685,6 +707,7 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -702,6 +725,7 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -719,6 +743,7 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -736,6 +761,7 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Dependency_4010) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -753,6 +779,7 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -770,6 +797,7 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		}

 		return types;

 	}

@@ -815,6 +843,7 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -832,6 +861,7 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Generalization_4003) {

 			types.add(UMLElementTypes.Component_2002);

 			types.add(UMLElementTypes.Interface_3205);

@@ -856,6 +886,7 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -873,6 +904,7 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -890,6 +922,7 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -907,6 +940,7 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {

 			types.add(UMLElementTypes.Comment_3201);

 			types.add(UMLElementTypes.Comment_3074);

@@ -930,6 +964,7 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -947,6 +982,7 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		}

 		return types;

 	}

@@ -961,15 +997,15 @@ public class InterfaceEditPartPCN extends AbstractBorderedShapeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Interface", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Interface", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Interface", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Interface", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Interface", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Interface", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Interface", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Interface", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceOperationCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceOperationCompartmentEditPartCN.java
index 16f64908f78..cfc9114ee90 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceOperationCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfaceOperationCompartmentEditPartCN.java
@@ -1,3 +1,6 @@
+/*

+ * 

+ */

 package org.eclipse.papyrus.uml.diagram.component.edit.parts;

 

 import org.eclipse.draw2d.geometry.Dimension;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfacePortLinkEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfacePortLinkEditPart.java
index 9ebbbae9b4b..1a3b937abeb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfacePortLinkEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/InterfacePortLinkEditPart.java
@@ -1,3 +1,6 @@
+/*

+ * 

+ */

 package org.eclipse.papyrus.uml.diagram.component.edit.parts;

 

 import org.eclipse.draw2d.Connection;

@@ -38,8 +41,8 @@ public class InterfacePortLinkEditPart extends ConnectionEditPart implements ITr
 	/**

 	 * Creates figure for this edit part.

 	 * 

-	 * Body of this method does not depend on settings in generation model

-	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * Body of this method does not depend on settings in generation model so

+	 * you may safely remove <i>generated</i> tag and modify it.

 	 * 

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelEditPart.java
index 45ba7d5e800..caa5cd7e27a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelEditPart.java
@@ -39,8 +39,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -215,8 +215,8 @@ public class ModelEditPart extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Model";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -224,8 +224,8 @@ public class ModelEditPart extends NamedElementEditPart {
 	/**

 	 * Creates figure for this edit part.

 	 * 

-	 * Body of this method does not depend on settings in generation model

-	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * Body of this method does not depend on settings in generation model so

+	 * you may safely remove <i>generated</i> tag and modify it.

 	 * 

 	 * @generated

 	 */

@@ -239,8 +239,8 @@ public class ModelEditPart extends NamedElementEditPart {
 	}

 

 	/**

-	 * Default implementation treats passed figure as content pane.

-	 * Respects layout one may have set for generated figure.

+	 * Default implementation treats passed figure as content pane. Respects

+	 * layout one may have set for generated figure.

 	 * 

 	 * @param nodeShape

 	 *        instance of generated figure class

@@ -368,6 +368,9 @@ public class ModelEditPart extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Usage_4001);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Usage_4001);

+		}

 		if(targetEditPart instanceof RectangleInterfaceEditPart) {

 			types.add(UMLElementTypes.InterfaceRealization_4006);

 		}

@@ -425,6 +428,9 @@ public class ModelEditPart extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Substitution_4012);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Substitution_4012);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Manifestation_4014);

 		}

@@ -473,6 +479,9 @@ public class ModelEditPart extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Manifestation_4014);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Manifestation_4014);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.ComponentRealization_4007);

 		}

@@ -521,6 +530,9 @@ public class ModelEditPart extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.ComponentRealization_4007);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.ComponentRealization_4007);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Abstraction_4013);

 		}

@@ -569,6 +581,9 @@ public class ModelEditPart extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Abstraction_4013);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Abstraction_4013);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Dependency_4010);

 		}

@@ -617,6 +632,9 @@ public class ModelEditPart extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Dependency_4010);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Dependency_4010);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Dependency_4017);

 		}

@@ -665,6 +683,9 @@ public class ModelEditPart extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Dependency_4017);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Dependency_4017);

+		}

 		return types;

 	}

 

@@ -690,6 +711,7 @@ public class ModelEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {

 			types.add(UMLElementTypes.Interface_3205);

 			types.add(UMLElementTypes.Interface_3078);

@@ -711,6 +733,7 @@ public class ModelEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -728,6 +751,7 @@ public class ModelEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -745,6 +769,7 @@ public class ModelEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -762,6 +787,7 @@ public class ModelEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Dependency_4010) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -779,6 +805,7 @@ public class ModelEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -796,6 +823,7 @@ public class ModelEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		}

 		return types;

 	}

@@ -839,6 +867,7 @@ public class ModelEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Substitution_4012) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -856,6 +885,7 @@ public class ModelEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -873,6 +903,7 @@ public class ModelEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -890,6 +921,7 @@ public class ModelEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -907,6 +939,7 @@ public class ModelEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {

 			types.add(UMLElementTypes.Comment_3201);

 			types.add(UMLElementTypes.Comment_3074);

@@ -930,6 +963,7 @@ public class ModelEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -947,6 +981,7 @@ public class ModelEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		}

 		return types;

 	}

@@ -961,15 +996,15 @@ public class ModelEditPart extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Model", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Model", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Model", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Model", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Model", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Model", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Model", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Model", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelEditPartCN.java
index 033bfa89374..c213784778b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelEditPartCN.java
@@ -39,8 +39,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

@@ -205,8 +205,8 @@ public class ModelEditPartCN extends ShapeNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Model";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -214,8 +214,8 @@ public class ModelEditPartCN extends ShapeNodeEditPart {
 	/**

 	 * Creates figure for this edit part.

 	 * 

-	 * Body of this method does not depend on settings in generation model

-	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * Body of this method does not depend on settings in generation model so

+	 * you may safely remove <i>generated</i> tag and modify it.

 	 * 

 	 * @generated

 	 */

@@ -229,8 +229,8 @@ public class ModelEditPartCN extends ShapeNodeEditPart {
 	}

 

 	/**

-	 * Default implementation treats passed figure as content pane.

-	 * Respects layout one may have set for generated figure.

+	 * Default implementation treats passed figure as content pane. Respects

+	 * layout one may have set for generated figure.

 	 * 

 	 * @param nodeShape

 	 *        instance of generated figure class

@@ -358,6 +358,9 @@ public class ModelEditPartCN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Usage_4001);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Usage_4001);

+		}

 		if(targetEditPart instanceof RectangleInterfaceEditPart) {

 			types.add(UMLElementTypes.InterfaceRealization_4006);

 		}

@@ -415,6 +418,9 @@ public class ModelEditPartCN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Substitution_4012);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Substitution_4012);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Manifestation_4014);

 		}

@@ -463,6 +469,9 @@ public class ModelEditPartCN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Manifestation_4014);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Manifestation_4014);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.ComponentRealization_4007);

 		}

@@ -511,6 +520,9 @@ public class ModelEditPartCN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.ComponentRealization_4007);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.ComponentRealization_4007);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Abstraction_4013);

 		}

@@ -559,6 +571,9 @@ public class ModelEditPartCN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Abstraction_4013);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Abstraction_4013);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Dependency_4010);

 		}

@@ -607,6 +622,9 @@ public class ModelEditPartCN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Dependency_4010);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Dependency_4010);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Dependency_4017);

 		}

@@ -655,6 +673,9 @@ public class ModelEditPartCN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Dependency_4017);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Dependency_4017);

+		}

 		return types;

 	}

 

@@ -680,6 +701,7 @@ public class ModelEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {

 			types.add(UMLElementTypes.Interface_3205);

 			types.add(UMLElementTypes.Interface_3078);

@@ -701,6 +723,7 @@ public class ModelEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -718,6 +741,7 @@ public class ModelEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -735,6 +759,7 @@ public class ModelEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -752,6 +777,7 @@ public class ModelEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Dependency_4010) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -769,6 +795,7 @@ public class ModelEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -786,6 +813,7 @@ public class ModelEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		}

 		return types;

 	}

@@ -829,6 +857,7 @@ public class ModelEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Substitution_4012) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -846,6 +875,7 @@ public class ModelEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -863,6 +893,7 @@ public class ModelEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -880,6 +911,7 @@ public class ModelEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -897,6 +929,7 @@ public class ModelEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {

 			types.add(UMLElementTypes.Comment_3201);

 			types.add(UMLElementTypes.Comment_3074);

@@ -920,6 +953,7 @@ public class ModelEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -937,6 +971,7 @@ public class ModelEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		}

 		return types;

 	}

@@ -951,15 +986,15 @@ public class ModelEditPartCN extends ShapeNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Model", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Model", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Model", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Model", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Model", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Model", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Model", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Model", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelNameEditPart.java
index 023204b8bad..f121eeb2cf1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelNameEditPart.java
@@ -610,7 +610,9 @@ public class ModelNameEditPart extends PapyrusCompartmentEditPart implements ITe
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see

+	 *         org

+	 *         .eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelNameEditPartCN.java
index a9892f76a02..56c1dfc543c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ModelNameEditPartCN.java
@@ -610,7 +610,9 @@ public class ModelNameEditPartCN extends PapyrusCompartmentEditPart implements I
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see

+	 *         org

+	 *         .eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/MultiDependencyLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/MultiDependencyLabelEditPart.java
index bc52781b34a..637d3a2bc1c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/MultiDependencyLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/MultiDependencyLabelEditPart.java
@@ -626,7 +626,9 @@ public class MultiDependencyLabelEditPart extends LabelEditPart implements IText
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see

+	 *         org

+	 *         .eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/OperationForInterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/OperationForInterfaceEditPart.java
index 16320014923..53c0e3f40c8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/OperationForInterfaceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/OperationForInterfaceEditPart.java
@@ -621,7 +621,9 @@ public class OperationForInterfaceEditPart extends UMLCompartmentEditPart implem
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see

+	 *         org

+	 *         .eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageEditPart.java
index 03327433c09..73b245b0870 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageEditPart.java
@@ -39,8 +39,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -215,8 +215,8 @@ public class PackageEditPart extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Package";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -368,6 +368,9 @@ public class PackageEditPart extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Usage_4001);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Usage_4001);

+		}

 		if(targetEditPart instanceof RectangleInterfaceEditPart) {

 			types.add(UMLElementTypes.InterfaceRealization_4006);

 		}

@@ -425,6 +428,9 @@ public class PackageEditPart extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Substitution_4012);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Substitution_4012);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Manifestation_4014);

 		}

@@ -473,6 +479,9 @@ public class PackageEditPart extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Manifestation_4014);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Manifestation_4014);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.ComponentRealization_4007);

 		}

@@ -521,6 +530,9 @@ public class PackageEditPart extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.ComponentRealization_4007);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.ComponentRealization_4007);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Abstraction_4013);

 		}

@@ -569,6 +581,9 @@ public class PackageEditPart extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Abstraction_4013);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Abstraction_4013);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Dependency_4010);

 		}

@@ -617,6 +632,9 @@ public class PackageEditPart extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Dependency_4010);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Dependency_4010);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Dependency_4017);

 		}

@@ -665,6 +683,9 @@ public class PackageEditPart extends NamedElementEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Dependency_4017);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Dependency_4017);

+		}

 		return types;

 	}

 

@@ -690,6 +711,7 @@ public class PackageEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {

 			types.add(UMLElementTypes.Interface_3205);

 			types.add(UMLElementTypes.Interface_3078);

@@ -711,6 +733,7 @@ public class PackageEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -728,6 +751,7 @@ public class PackageEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -745,6 +769,7 @@ public class PackageEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -762,6 +787,7 @@ public class PackageEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Dependency_4010) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -779,6 +805,7 @@ public class PackageEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -796,6 +823,7 @@ public class PackageEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		}

 		return types;

 	}

@@ -839,6 +867,7 @@ public class PackageEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Substitution_4012) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -856,6 +885,7 @@ public class PackageEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -873,6 +903,7 @@ public class PackageEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -890,6 +921,7 @@ public class PackageEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -907,6 +939,7 @@ public class PackageEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {

 			types.add(UMLElementTypes.Comment_3201);

 			types.add(UMLElementTypes.Comment_3074);

@@ -930,6 +963,7 @@ public class PackageEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -947,6 +981,7 @@ public class PackageEditPart extends NamedElementEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		}

 		return types;

 	}

@@ -961,15 +996,15 @@ public class PackageEditPart extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Package", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Package", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Package", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Package", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Package", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Package", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Package", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Package", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageEditPartCN.java
index ec872bb5ecf..1091bac1f6e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageEditPartCN.java
@@ -39,8 +39,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

@@ -205,8 +205,8 @@ public class PackageEditPartCN extends ShapeNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Package";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -214,8 +214,8 @@ public class PackageEditPartCN extends ShapeNodeEditPart {
 	/**

 	 * Creates figure for this edit part.

 	 * 

-	 * Body of this method does not depend on settings in generation model

-	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * Body of this method does not depend on settings in generation model so

+	 * you may safely remove <i>generated</i> tag and modify it.

 	 * 

 	 * @generated

 	 */

@@ -229,8 +229,8 @@ public class PackageEditPartCN extends ShapeNodeEditPart {
 	}

 

 	/**

-	 * Default implementation treats passed figure as content pane.

-	 * Respects layout one may have set for generated figure.

+	 * Default implementation treats passed figure as content pane. Respects

+	 * layout one may have set for generated figure.

 	 * 

 	 * @param nodeShape

 	 *        instance of generated figure class

@@ -358,6 +358,9 @@ public class PackageEditPartCN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Usage_4001);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Usage_4001);

+		}

 		if(targetEditPart instanceof RectangleInterfaceEditPart) {

 			types.add(UMLElementTypes.InterfaceRealization_4006);

 		}

@@ -415,6 +418,9 @@ public class PackageEditPartCN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Substitution_4012);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Substitution_4012);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Manifestation_4014);

 		}

@@ -463,6 +469,9 @@ public class PackageEditPartCN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Manifestation_4014);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Manifestation_4014);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.ComponentRealization_4007);

 		}

@@ -511,6 +520,9 @@ public class PackageEditPartCN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.ComponentRealization_4007);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.ComponentRealization_4007);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Abstraction_4013);

 		}

@@ -559,6 +571,9 @@ public class PackageEditPartCN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Abstraction_4013);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Abstraction_4013);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Dependency_4010);

 		}

@@ -607,6 +622,9 @@ public class PackageEditPartCN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Dependency_4010);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Dependency_4010);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Dependency_4017);

 		}

@@ -655,6 +673,9 @@ public class PackageEditPartCN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Dependency_4017);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Dependency_4017);

+		}

 		return types;

 	}

 

@@ -680,6 +701,7 @@ public class PackageEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {

 			types.add(UMLElementTypes.Interface_3205);

 			types.add(UMLElementTypes.Interface_3078);

@@ -701,6 +723,7 @@ public class PackageEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -718,6 +741,7 @@ public class PackageEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -735,6 +759,7 @@ public class PackageEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -752,6 +777,7 @@ public class PackageEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Dependency_4010) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -769,6 +795,7 @@ public class PackageEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -786,6 +813,7 @@ public class PackageEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		}

 		return types;

 	}

@@ -829,6 +857,7 @@ public class PackageEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Substitution_4012) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -846,6 +875,7 @@ public class PackageEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -863,6 +893,7 @@ public class PackageEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -880,6 +911,7 @@ public class PackageEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -897,6 +929,7 @@ public class PackageEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {

 			types.add(UMLElementTypes.Comment_3201);

 			types.add(UMLElementTypes.Comment_3074);

@@ -920,6 +953,7 @@ public class PackageEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -937,6 +971,7 @@ public class PackageEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		}

 		return types;

 	}

@@ -951,15 +986,15 @@ public class PackageEditPartCN extends ShapeNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Package", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Package", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Package", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Package", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Package", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Package", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Package", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Package", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageNameEditPartCN.java
index 0b82a871b44..09f88b6174a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PackageNameEditPartCN.java
@@ -610,7 +610,9 @@ public class PackageNameEditPartCN extends PapyrusCompartmentEditPart implements
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see

+	 *         org

+	 *         .eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PortEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PortEditPart.java
index 38345c26c45..27620f879ae 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PortEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PortEditPart.java
@@ -48,8 +48,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractBorderEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

@@ -207,8 +207,8 @@ public class PortEditPart extends AbstractBorderEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Port";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -357,6 +357,9 @@ public class PortEditPart extends AbstractBorderEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Usage_4001);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Usage_4001);

+		}

 		if(targetEditPart instanceof RectangleInterfaceEditPart) {

 			types.add(UMLElementTypes.InterfaceRealization_4006);

 		}

@@ -414,6 +417,9 @@ public class PortEditPart extends AbstractBorderEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Substitution_4012);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Substitution_4012);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Manifestation_4014);

 		}

@@ -462,6 +468,9 @@ public class PortEditPart extends AbstractBorderEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Manifestation_4014);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Manifestation_4014);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.ComponentRealization_4007);

 		}

@@ -510,6 +519,9 @@ public class PortEditPart extends AbstractBorderEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.ComponentRealization_4007);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.ComponentRealization_4007);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Abstraction_4013);

 		}

@@ -558,6 +570,9 @@ public class PortEditPart extends AbstractBorderEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Abstraction_4013);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Abstraction_4013);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Dependency_4010);

 		}

@@ -606,6 +621,9 @@ public class PortEditPart extends AbstractBorderEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Dependency_4010);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Dependency_4010);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Dependency_4017);

 		}

@@ -654,6 +672,9 @@ public class PortEditPart extends AbstractBorderEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Dependency_4017);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Dependency_4017);

+		}

 		return types;

 	}

 

@@ -679,6 +700,7 @@ public class PortEditPart extends AbstractBorderEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {

 			types.add(UMLElementTypes.Interface_3205);

 			types.add(UMLElementTypes.Interface_3078);

@@ -700,6 +722,7 @@ public class PortEditPart extends AbstractBorderEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -717,6 +740,7 @@ public class PortEditPart extends AbstractBorderEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -734,6 +758,7 @@ public class PortEditPart extends AbstractBorderEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -751,6 +776,7 @@ public class PortEditPart extends AbstractBorderEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Dependency_4010) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -768,6 +794,7 @@ public class PortEditPart extends AbstractBorderEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -785,6 +812,7 @@ public class PortEditPart extends AbstractBorderEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		}

 		return types;

 	}

@@ -828,6 +856,7 @@ public class PortEditPart extends AbstractBorderEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Substitution_4012) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -845,6 +874,7 @@ public class PortEditPart extends AbstractBorderEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -862,6 +892,7 @@ public class PortEditPart extends AbstractBorderEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -879,6 +910,7 @@ public class PortEditPart extends AbstractBorderEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -896,6 +928,7 @@ public class PortEditPart extends AbstractBorderEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {

 			types.add(UMLElementTypes.Comment_3201);

 			types.add(UMLElementTypes.Comment_3074);

@@ -919,6 +952,7 @@ public class PortEditPart extends AbstractBorderEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -936,6 +970,7 @@ public class PortEditPart extends AbstractBorderEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		}

 		return types;

 	}

@@ -950,15 +985,15 @@ public class PortEditPart extends AbstractBorderEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Port", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Port", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Port", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Port", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Port", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Port", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Port", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Port", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyForInterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyForInterfaceEditPart.java
index cfc97da9df6..23043ae73a6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyForInterfaceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyForInterfaceEditPart.java
@@ -621,7 +621,9 @@ public class PropertyForInterfaceEditPart extends UMLCompartmentEditPart impleme
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see

+	 *         org

+	 *         .eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyPartEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyPartEditPartCN.java
new file mode 100644
index 00000000000..8fcfa2c504b
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyPartEditPartCN.java
@@ -0,0 +1,1038 @@
+/*****************************************************************************

+ * 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:

+ *  Patrick Tessier (CEA LIST) - Initial API and implementation

+ /*****************************************************************************/

+package org.eclipse.papyrus.uml.diagram.component.edit.parts;

+

+import java.util.ArrayList;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.draw2d.Shape;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EStructuralFeature;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.preference.IPreferenceStore;

+import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.PropertyLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.itemsemantic.PropertyPartItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.component.custom.figure.nodes.PropertyPartFigure;

+import org.eclipse.papyrus.uml.diagram.component.custom.locators.PortPositionLocator;

+import org.eclipse.papyrus.uml.diagram.component.edit.policies.PropertyItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class PropertyPartEditPartCN extends org.eclipse.papyrus.uml.diagram.component.custom.edit.part.PropertyPartEditPartCN {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3079;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public PropertyPartEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PropertyItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		//in Papyrus diagrams are not strongly synchronised

+		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.component.edit.policies.PropertyCanonicalEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PropertyPartItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, new PropertyLayoutEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * Papyrus codeGen

+	 * 

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

+				case PortEditPart.VISUAL_ID:

+					return new BorderItemResizableEditPolicy();

+				}

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new PropertyPartFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public PropertyPartFigure getPrimaryShape() {

+		return (PropertyPartFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof PropertyPartNameEditPartCN) {

+			((PropertyPartNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart)childEditPart).getFigure(), locator);

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof PropertyPartNameEditPartCN) {

+			return true;

+		}

+		if(childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart)childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if(editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		String prefElementId = "Property";

+		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model so

+	 * you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createMainFigure() {

+		NodeFigure figure = createNodePlate();

+		figure.setLayoutManager(new StackLayout());

+		IFigure shape = createNodeShape();

+		figure.add(shape);

+		contentPane = setupContentPane(shape);

+		return figure;

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane. Respects

+	 * layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		if(primaryShape instanceof Shape) {

+			((Shape)primaryShape).setLineWidth(width);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof Shape) {

+			((Shape)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(PropertyPartNameEditPartCN.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnSource() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(8);

+		types.add(UMLElementTypes.Usage_4001);

+		types.add(UMLElementTypes.InterfaceRealization_4006);

+		types.add(UMLElementTypes.Substitution_4012);

+		types.add(UMLElementTypes.Manifestation_4014);

+		types.add(UMLElementTypes.ComponentRealization_4007);

+		types.add(UMLElementTypes.Abstraction_4013);

+		types.add(UMLElementTypes.Dependency_4010);

+		types.add(UMLElementTypes.Dependency_4017);

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnSourceAndTarget(IGraphicalEditPart targetEditPart) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if(targetEditPart instanceof DependencyNodeEditPart) {

+			types.add(UMLElementTypes.Usage_4001);

+		}

+		if(targetEditPart instanceof ComponentEditPart) {

+			types.add(UMLElementTypes.Usage_4001);

+		}

+		if(targetEditPart instanceof ModelEditPart) {

+			types.add(UMLElementTypes.Usage_4001);

+		}

+		if(targetEditPart instanceof PackageEditPart) {

+			types.add(UMLElementTypes.Usage_4001);

+		}

+		if(targetEditPart instanceof RectangleInterfaceEditPart) {

+			types.add(UMLElementTypes.Usage_4001);

+		}

+		if(targetEditPart instanceof ConstraintEditPart) {

+			types.add(UMLElementTypes.Usage_4001);

+		}

+		if(targetEditPart instanceof DefaultNamedElementEditPart) {

+			types.add(UMLElementTypes.Usage_4001);

+		}

+		if(targetEditPart instanceof InterfaceEditPart) {

+			types.add(UMLElementTypes.Usage_4001);

+		}

+		if(targetEditPart instanceof PortEditPart) {

+			types.add(UMLElementTypes.Usage_4001);

+		}

+		if(targetEditPart instanceof ModelEditPartCN) {

+			types.add(UMLElementTypes.Usage_4001);

+		}

+		if(targetEditPart instanceof PackageEditPartCN) {

+			types.add(UMLElementTypes.Usage_4001);

+		}

+		if(targetEditPart instanceof RectangleInterfaceEditPartCN) {

+			types.add(UMLElementTypes.Usage_4001);

+		}

+		if(targetEditPart instanceof ComponentEditPartCN) {

+			types.add(UMLElementTypes.Usage_4001);

+		}

+		if(targetEditPart instanceof ComponentEditPartPCN) {

+			types.add(UMLElementTypes.Usage_4001);

+		}

+		if(targetEditPart instanceof ConstraintEditPartPCN) {

+			types.add(UMLElementTypes.Usage_4001);

+		}

+		if(targetEditPart instanceof InterfaceEditPartPCN) {

+			types.add(UMLElementTypes.Usage_4001);

+		}

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Usage_4001);

+		}

+		if(targetEditPart instanceof RectangleInterfaceEditPart) {

+			types.add(UMLElementTypes.InterfaceRealization_4006);

+		}

+		if(targetEditPart instanceof RectangleInterfaceEditPartCN) {

+			types.add(UMLElementTypes.InterfaceRealization_4006);

+		}

+		if(targetEditPart instanceof InterfaceEditPartPCN) {

+			types.add(UMLElementTypes.InterfaceRealization_4006);

+		}

+		if(targetEditPart instanceof DependencyNodeEditPart) {

+			types.add(UMLElementTypes.Substitution_4012);

+		}

+		if(targetEditPart instanceof ComponentEditPart) {

+			types.add(UMLElementTypes.Substitution_4012);

+		}

+		if(targetEditPart instanceof ModelEditPart) {

+			types.add(UMLElementTypes.Substitution_4012);

+		}

+		if(targetEditPart instanceof PackageEditPart) {

+			types.add(UMLElementTypes.Substitution_4012);

+		}

+		if(targetEditPart instanceof RectangleInterfaceEditPart) {

+			types.add(UMLElementTypes.Substitution_4012);

+		}

+		if(targetEditPart instanceof ConstraintEditPart) {

+			types.add(UMLElementTypes.Substitution_4012);

+		}

+		if(targetEditPart instanceof DefaultNamedElementEditPart) {

+			types.add(UMLElementTypes.Substitution_4012);

+		}

+		if(targetEditPart instanceof InterfaceEditPart) {

+			types.add(UMLElementTypes.Substitution_4012);

+		}

+		if(targetEditPart instanceof PortEditPart) {

+			types.add(UMLElementTypes.Substitution_4012);

+		}

+		if(targetEditPart instanceof ModelEditPartCN) {

+			types.add(UMLElementTypes.Substitution_4012);

+		}

+		if(targetEditPart instanceof PackageEditPartCN) {

+			types.add(UMLElementTypes.Substitution_4012);

+		}

+		if(targetEditPart instanceof RectangleInterfaceEditPartCN) {

+			types.add(UMLElementTypes.Substitution_4012);

+		}

+		if(targetEditPart instanceof ComponentEditPartCN) {

+			types.add(UMLElementTypes.Substitution_4012);

+		}

+		if(targetEditPart instanceof ComponentEditPartPCN) {

+			types.add(UMLElementTypes.Substitution_4012);

+		}

+		if(targetEditPart instanceof ConstraintEditPartPCN) {

+			types.add(UMLElementTypes.Substitution_4012);

+		}

+		if(targetEditPart instanceof InterfaceEditPartPCN) {

+			types.add(UMLElementTypes.Substitution_4012);

+		}

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Substitution_4012);

+		}

+		if(targetEditPart instanceof DependencyNodeEditPart) {

+			types.add(UMLElementTypes.Manifestation_4014);

+		}

+		if(targetEditPart instanceof ComponentEditPart) {

+			types.add(UMLElementTypes.Manifestation_4014);

+		}

+		if(targetEditPart instanceof ModelEditPart) {

+			types.add(UMLElementTypes.Manifestation_4014);

+		}

+		if(targetEditPart instanceof PackageEditPart) {

+			types.add(UMLElementTypes.Manifestation_4014);

+		}

+		if(targetEditPart instanceof RectangleInterfaceEditPart) {

+			types.add(UMLElementTypes.Manifestation_4014);

+		}

+		if(targetEditPart instanceof ConstraintEditPart) {

+			types.add(UMLElementTypes.Manifestation_4014);

+		}

+		if(targetEditPart instanceof DefaultNamedElementEditPart) {

+			types.add(UMLElementTypes.Manifestation_4014);

+		}

+		if(targetEditPart instanceof InterfaceEditPart) {

+			types.add(UMLElementTypes.Manifestation_4014);

+		}

+		if(targetEditPart instanceof PortEditPart) {

+			types.add(UMLElementTypes.Manifestation_4014);

+		}

+		if(targetEditPart instanceof ModelEditPartCN) {

+			types.add(UMLElementTypes.Manifestation_4014);

+		}

+		if(targetEditPart instanceof PackageEditPartCN) {

+			types.add(UMLElementTypes.Manifestation_4014);

+		}

+		if(targetEditPart instanceof RectangleInterfaceEditPartCN) {

+			types.add(UMLElementTypes.Manifestation_4014);

+		}

+		if(targetEditPart instanceof ComponentEditPartCN) {

+			types.add(UMLElementTypes.Manifestation_4014);

+		}

+		if(targetEditPart instanceof ComponentEditPartPCN) {

+			types.add(UMLElementTypes.Manifestation_4014);

+		}

+		if(targetEditPart instanceof ConstraintEditPartPCN) {

+			types.add(UMLElementTypes.Manifestation_4014);

+		}

+		if(targetEditPart instanceof InterfaceEditPartPCN) {

+			types.add(UMLElementTypes.Manifestation_4014);

+		}

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Manifestation_4014);

+		}

+		if(targetEditPart instanceof DependencyNodeEditPart) {

+			types.add(UMLElementTypes.ComponentRealization_4007);

+		}

+		if(targetEditPart instanceof ComponentEditPart) {

+			types.add(UMLElementTypes.ComponentRealization_4007);

+		}

+		if(targetEditPart instanceof ModelEditPart) {

+			types.add(UMLElementTypes.ComponentRealization_4007);

+		}

+		if(targetEditPart instanceof PackageEditPart) {

+			types.add(UMLElementTypes.ComponentRealization_4007);

+		}

+		if(targetEditPart instanceof RectangleInterfaceEditPart) {

+			types.add(UMLElementTypes.ComponentRealization_4007);

+		}

+		if(targetEditPart instanceof ConstraintEditPart) {

+			types.add(UMLElementTypes.ComponentRealization_4007);

+		}

+		if(targetEditPart instanceof DefaultNamedElementEditPart) {

+			types.add(UMLElementTypes.ComponentRealization_4007);

+		}

+		if(targetEditPart instanceof InterfaceEditPart) {

+			types.add(UMLElementTypes.ComponentRealization_4007);

+		}

+		if(targetEditPart instanceof PortEditPart) {

+			types.add(UMLElementTypes.ComponentRealization_4007);

+		}

+		if(targetEditPart instanceof ModelEditPartCN) {

+			types.add(UMLElementTypes.ComponentRealization_4007);

+		}

+		if(targetEditPart instanceof PackageEditPartCN) {

+			types.add(UMLElementTypes.ComponentRealization_4007);

+		}

+		if(targetEditPart instanceof RectangleInterfaceEditPartCN) {

+			types.add(UMLElementTypes.ComponentRealization_4007);

+		}

+		if(targetEditPart instanceof ComponentEditPartCN) {

+			types.add(UMLElementTypes.ComponentRealization_4007);

+		}

+		if(targetEditPart instanceof ComponentEditPartPCN) {

+			types.add(UMLElementTypes.ComponentRealization_4007);

+		}

+		if(targetEditPart instanceof ConstraintEditPartPCN) {

+			types.add(UMLElementTypes.ComponentRealization_4007);

+		}

+		if(targetEditPart instanceof InterfaceEditPartPCN) {

+			types.add(UMLElementTypes.ComponentRealization_4007);

+		}

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.ComponentRealization_4007);

+		}

+		if(targetEditPart instanceof DependencyNodeEditPart) {

+			types.add(UMLElementTypes.Abstraction_4013);

+		}

+		if(targetEditPart instanceof ComponentEditPart) {

+			types.add(UMLElementTypes.Abstraction_4013);

+		}

+		if(targetEditPart instanceof ModelEditPart) {

+			types.add(UMLElementTypes.Abstraction_4013);

+		}

+		if(targetEditPart instanceof PackageEditPart) {

+			types.add(UMLElementTypes.Abstraction_4013);

+		}

+		if(targetEditPart instanceof RectangleInterfaceEditPart) {

+			types.add(UMLElementTypes.Abstraction_4013);

+		}

+		if(targetEditPart instanceof ConstraintEditPart) {

+			types.add(UMLElementTypes.Abstraction_4013);

+		}

+		if(targetEditPart instanceof DefaultNamedElementEditPart) {

+			types.add(UMLElementTypes.Abstraction_4013);

+		}

+		if(targetEditPart instanceof InterfaceEditPart) {

+			types.add(UMLElementTypes.Abstraction_4013);

+		}

+		if(targetEditPart instanceof PortEditPart) {

+			types.add(UMLElementTypes.Abstraction_4013);

+		}

+		if(targetEditPart instanceof ModelEditPartCN) {

+			types.add(UMLElementTypes.Abstraction_4013);

+		}

+		if(targetEditPart instanceof PackageEditPartCN) {

+			types.add(UMLElementTypes.Abstraction_4013);

+		}

+		if(targetEditPart instanceof RectangleInterfaceEditPartCN) {

+			types.add(UMLElementTypes.Abstraction_4013);

+		}

+		if(targetEditPart instanceof ComponentEditPartCN) {

+			types.add(UMLElementTypes.Abstraction_4013);

+		}

+		if(targetEditPart instanceof ComponentEditPartPCN) {

+			types.add(UMLElementTypes.Abstraction_4013);

+		}

+		if(targetEditPart instanceof ConstraintEditPartPCN) {

+			types.add(UMLElementTypes.Abstraction_4013);

+		}

+		if(targetEditPart instanceof InterfaceEditPartPCN) {

+			types.add(UMLElementTypes.Abstraction_4013);

+		}

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Abstraction_4013);

+		}

+		if(targetEditPart instanceof DependencyNodeEditPart) {

+			types.add(UMLElementTypes.Dependency_4010);

+		}

+		if(targetEditPart instanceof ComponentEditPart) {

+			types.add(UMLElementTypes.Dependency_4010);

+		}

+		if(targetEditPart instanceof ModelEditPart) {

+			types.add(UMLElementTypes.Dependency_4010);

+		}

+		if(targetEditPart instanceof PackageEditPart) {

+			types.add(UMLElementTypes.Dependency_4010);

+		}

+		if(targetEditPart instanceof RectangleInterfaceEditPart) {

+			types.add(UMLElementTypes.Dependency_4010);

+		}

+		if(targetEditPart instanceof ConstraintEditPart) {

+			types.add(UMLElementTypes.Dependency_4010);

+		}

+		if(targetEditPart instanceof DefaultNamedElementEditPart) {

+			types.add(UMLElementTypes.Dependency_4010);

+		}

+		if(targetEditPart instanceof InterfaceEditPart) {

+			types.add(UMLElementTypes.Dependency_4010);

+		}

+		if(targetEditPart instanceof PortEditPart) {

+			types.add(UMLElementTypes.Dependency_4010);

+		}

+		if(targetEditPart instanceof ModelEditPartCN) {

+			types.add(UMLElementTypes.Dependency_4010);

+		}

+		if(targetEditPart instanceof PackageEditPartCN) {

+			types.add(UMLElementTypes.Dependency_4010);

+		}

+		if(targetEditPart instanceof RectangleInterfaceEditPartCN) {

+			types.add(UMLElementTypes.Dependency_4010);

+		}

+		if(targetEditPart instanceof ComponentEditPartCN) {

+			types.add(UMLElementTypes.Dependency_4010);

+		}

+		if(targetEditPart instanceof ComponentEditPartPCN) {

+			types.add(UMLElementTypes.Dependency_4010);

+		}

+		if(targetEditPart instanceof ConstraintEditPartPCN) {

+			types.add(UMLElementTypes.Dependency_4010);

+		}

+		if(targetEditPart instanceof InterfaceEditPartPCN) {

+			types.add(UMLElementTypes.Dependency_4010);

+		}

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Dependency_4010);

+		}

+		if(targetEditPart instanceof DependencyNodeEditPart) {

+			types.add(UMLElementTypes.Dependency_4017);

+		}

+		if(targetEditPart instanceof ComponentEditPart) {

+			types.add(UMLElementTypes.Dependency_4017);

+		}

+		if(targetEditPart instanceof ModelEditPart) {

+			types.add(UMLElementTypes.Dependency_4017);

+		}

+		if(targetEditPart instanceof PackageEditPart) {

+			types.add(UMLElementTypes.Dependency_4017);

+		}

+		if(targetEditPart instanceof RectangleInterfaceEditPart) {

+			types.add(UMLElementTypes.Dependency_4017);

+		}

+		if(targetEditPart instanceof ConstraintEditPart) {

+			types.add(UMLElementTypes.Dependency_4017);

+		}

+		if(targetEditPart instanceof DefaultNamedElementEditPart) {

+			types.add(UMLElementTypes.Dependency_4017);

+		}

+		if(targetEditPart instanceof InterfaceEditPart) {

+			types.add(UMLElementTypes.Dependency_4017);

+		}

+		if(targetEditPart instanceof PortEditPart) {

+			types.add(UMLElementTypes.Dependency_4017);

+		}

+		if(targetEditPart instanceof ModelEditPartCN) {

+			types.add(UMLElementTypes.Dependency_4017);

+		}

+		if(targetEditPart instanceof PackageEditPartCN) {

+			types.add(UMLElementTypes.Dependency_4017);

+		}

+		if(targetEditPart instanceof RectangleInterfaceEditPartCN) {

+			types.add(UMLElementTypes.Dependency_4017);

+		}

+		if(targetEditPart instanceof ComponentEditPartCN) {

+			types.add(UMLElementTypes.Dependency_4017);

+		}

+		if(targetEditPart instanceof ComponentEditPartPCN) {

+			types.add(UMLElementTypes.Dependency_4017);

+		}

+		if(targetEditPart instanceof ConstraintEditPartPCN) {

+			types.add(UMLElementTypes.Dependency_4017);

+		}

+		if(targetEditPart instanceof InterfaceEditPartPCN) {

+			types.add(UMLElementTypes.Dependency_4017);

+		}

+		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Dependency_4017);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMATypesForTarget(IElementType relationshipType) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if(relationshipType == UMLElementTypes.Usage_4001) {

+			types.add(UMLElementTypes.Dependency_3203);

+			types.add(UMLElementTypes.Component_2002);

+			types.add(UMLElementTypes.Model_3202);

+			types.add(UMLElementTypes.Package_3200);

+			types.add(UMLElementTypes.Interface_3205);

+			types.add(UMLElementTypes.Constraint_3199);

+			types.add(UMLElementTypes.NamedElement_3204);

+			types.add(UMLElementTypes.NamedElement_2003);

+			types.add(UMLElementTypes.Port_3069);

+			types.add(UMLElementTypes.Model_3077);

+			types.add(UMLElementTypes.Package_3076);

+			types.add(UMLElementTypes.Interface_3078);

+			types.add(UMLElementTypes.Component_3070);

+			types.add(UMLElementTypes.Component_3071);

+			types.add(UMLElementTypes.Constraint_3075);

+			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

+		} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {

+			types.add(UMLElementTypes.Interface_3205);

+			types.add(UMLElementTypes.Interface_3078);

+			types.add(UMLElementTypes.Interface_3072);

+		} else if(relationshipType == UMLElementTypes.Substitution_4012) {

+			types.add(UMLElementTypes.Dependency_3203);

+			types.add(UMLElementTypes.Component_2002);

+			types.add(UMLElementTypes.Model_3202);

+			types.add(UMLElementTypes.Package_3200);

+			types.add(UMLElementTypes.Interface_3205);

+			types.add(UMLElementTypes.Constraint_3199);

+			types.add(UMLElementTypes.NamedElement_3204);

+			types.add(UMLElementTypes.NamedElement_2003);

+			types.add(UMLElementTypes.Port_3069);

+			types.add(UMLElementTypes.Model_3077);

+			types.add(UMLElementTypes.Package_3076);

+			types.add(UMLElementTypes.Interface_3078);

+			types.add(UMLElementTypes.Component_3070);

+			types.add(UMLElementTypes.Component_3071);

+			types.add(UMLElementTypes.Constraint_3075);

+			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

+		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {

+			types.add(UMLElementTypes.Dependency_3203);

+			types.add(UMLElementTypes.Component_2002);

+			types.add(UMLElementTypes.Model_3202);

+			types.add(UMLElementTypes.Package_3200);

+			types.add(UMLElementTypes.Interface_3205);

+			types.add(UMLElementTypes.Constraint_3199);

+			types.add(UMLElementTypes.NamedElement_3204);

+			types.add(UMLElementTypes.NamedElement_2003);

+			types.add(UMLElementTypes.Port_3069);

+			types.add(UMLElementTypes.Model_3077);

+			types.add(UMLElementTypes.Package_3076);

+			types.add(UMLElementTypes.Interface_3078);

+			types.add(UMLElementTypes.Component_3070);

+			types.add(UMLElementTypes.Component_3071);

+			types.add(UMLElementTypes.Constraint_3075);

+			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

+		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {

+			types.add(UMLElementTypes.Dependency_3203);

+			types.add(UMLElementTypes.Component_2002);

+			types.add(UMLElementTypes.Model_3202);

+			types.add(UMLElementTypes.Package_3200);

+			types.add(UMLElementTypes.Interface_3205);

+			types.add(UMLElementTypes.Constraint_3199);

+			types.add(UMLElementTypes.NamedElement_3204);

+			types.add(UMLElementTypes.NamedElement_2003);

+			types.add(UMLElementTypes.Port_3069);

+			types.add(UMLElementTypes.Model_3077);

+			types.add(UMLElementTypes.Package_3076);

+			types.add(UMLElementTypes.Interface_3078);

+			types.add(UMLElementTypes.Component_3070);

+			types.add(UMLElementTypes.Component_3071);

+			types.add(UMLElementTypes.Constraint_3075);

+			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

+		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {

+			types.add(UMLElementTypes.Dependency_3203);

+			types.add(UMLElementTypes.Component_2002);

+			types.add(UMLElementTypes.Model_3202);

+			types.add(UMLElementTypes.Package_3200);

+			types.add(UMLElementTypes.Interface_3205);

+			types.add(UMLElementTypes.Constraint_3199);

+			types.add(UMLElementTypes.NamedElement_3204);

+			types.add(UMLElementTypes.NamedElement_2003);

+			types.add(UMLElementTypes.Port_3069);

+			types.add(UMLElementTypes.Model_3077);

+			types.add(UMLElementTypes.Package_3076);

+			types.add(UMLElementTypes.Interface_3078);

+			types.add(UMLElementTypes.Component_3070);

+			types.add(UMLElementTypes.Component_3071);

+			types.add(UMLElementTypes.Constraint_3075);

+			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

+		} else if(relationshipType == UMLElementTypes.Dependency_4010) {

+			types.add(UMLElementTypes.Dependency_3203);

+			types.add(UMLElementTypes.Component_2002);

+			types.add(UMLElementTypes.Model_3202);

+			types.add(UMLElementTypes.Package_3200);

+			types.add(UMLElementTypes.Interface_3205);

+			types.add(UMLElementTypes.Constraint_3199);

+			types.add(UMLElementTypes.NamedElement_3204);

+			types.add(UMLElementTypes.NamedElement_2003);

+			types.add(UMLElementTypes.Port_3069);

+			types.add(UMLElementTypes.Model_3077);

+			types.add(UMLElementTypes.Package_3076);

+			types.add(UMLElementTypes.Interface_3078);

+			types.add(UMLElementTypes.Component_3070);

+			types.add(UMLElementTypes.Component_3071);

+			types.add(UMLElementTypes.Constraint_3075);

+			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

+		} else if(relationshipType == UMLElementTypes.Dependency_4017) {

+			types.add(UMLElementTypes.Dependency_3203);

+			types.add(UMLElementTypes.Component_2002);

+			types.add(UMLElementTypes.Model_3202);

+			types.add(UMLElementTypes.Package_3200);

+			types.add(UMLElementTypes.Interface_3205);

+			types.add(UMLElementTypes.Constraint_3199);

+			types.add(UMLElementTypes.NamedElement_3204);

+			types.add(UMLElementTypes.NamedElement_2003);

+			types.add(UMLElementTypes.Port_3069);

+			types.add(UMLElementTypes.Model_3077);

+			types.add(UMLElementTypes.Package_3076);

+			types.add(UMLElementTypes.Interface_3078);

+			types.add(UMLElementTypes.Component_3070);

+			types.add(UMLElementTypes.Component_3071);

+			types.add(UMLElementTypes.Constraint_3075);

+			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMARelTypesOnTarget() {

+		ArrayList<IElementType> types = new ArrayList<IElementType>(9);

+		types.add(UMLElementTypes.Usage_4001);

+		types.add(UMLElementTypes.Substitution_4012);

+		types.add(UMLElementTypes.Manifestation_4014);

+		types.add(UMLElementTypes.ComponentRealization_4007);

+		types.add(UMLElementTypes.Abstraction_4013);

+		types.add(UMLElementTypes.CommentAnnotatedElement_4015);

+		types.add(UMLElementTypes.ConstraintConstrainedElement_4009);

+		types.add(UMLElementTypes.Dependency_4010);

+		types.add(UMLElementTypes.Dependency_4017);

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<IElementType> getMATypesForSource(IElementType relationshipType) {

+		LinkedList<IElementType> types = new LinkedList<IElementType>();

+		if(relationshipType == UMLElementTypes.Usage_4001) {

+			types.add(UMLElementTypes.Dependency_3203);

+			types.add(UMLElementTypes.Component_2002);

+			types.add(UMLElementTypes.Model_3202);

+			types.add(UMLElementTypes.Package_3200);

+			types.add(UMLElementTypes.Interface_3205);

+			types.add(UMLElementTypes.Constraint_3199);

+			types.add(UMLElementTypes.NamedElement_3204);

+			types.add(UMLElementTypes.NamedElement_2003);

+			types.add(UMLElementTypes.Port_3069);

+			types.add(UMLElementTypes.Model_3077);

+			types.add(UMLElementTypes.Package_3076);

+			types.add(UMLElementTypes.Interface_3078);

+			types.add(UMLElementTypes.Component_3070);

+			types.add(UMLElementTypes.Component_3071);

+			types.add(UMLElementTypes.Constraint_3075);

+			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

+		} else if(relationshipType == UMLElementTypes.Substitution_4012) {

+			types.add(UMLElementTypes.Dependency_3203);

+			types.add(UMLElementTypes.Component_2002);

+			types.add(UMLElementTypes.Model_3202);

+			types.add(UMLElementTypes.Package_3200);

+			types.add(UMLElementTypes.Interface_3205);

+			types.add(UMLElementTypes.Constraint_3199);

+			types.add(UMLElementTypes.NamedElement_3204);

+			types.add(UMLElementTypes.NamedElement_2003);

+			types.add(UMLElementTypes.Port_3069);

+			types.add(UMLElementTypes.Model_3077);

+			types.add(UMLElementTypes.Package_3076);

+			types.add(UMLElementTypes.Interface_3078);

+			types.add(UMLElementTypes.Component_3070);

+			types.add(UMLElementTypes.Component_3071);

+			types.add(UMLElementTypes.Constraint_3075);

+			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

+		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {

+			types.add(UMLElementTypes.Dependency_3203);

+			types.add(UMLElementTypes.Component_2002);

+			types.add(UMLElementTypes.Model_3202);

+			types.add(UMLElementTypes.Package_3200);

+			types.add(UMLElementTypes.Interface_3205);

+			types.add(UMLElementTypes.Constraint_3199);

+			types.add(UMLElementTypes.NamedElement_3204);

+			types.add(UMLElementTypes.NamedElement_2003);

+			types.add(UMLElementTypes.Port_3069);

+			types.add(UMLElementTypes.Model_3077);

+			types.add(UMLElementTypes.Package_3076);

+			types.add(UMLElementTypes.Interface_3078);

+			types.add(UMLElementTypes.Component_3070);

+			types.add(UMLElementTypes.Component_3071);

+			types.add(UMLElementTypes.Constraint_3075);

+			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

+		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {

+			types.add(UMLElementTypes.Dependency_3203);

+			types.add(UMLElementTypes.Component_2002);

+			types.add(UMLElementTypes.Model_3202);

+			types.add(UMLElementTypes.Package_3200);

+			types.add(UMLElementTypes.Interface_3205);

+			types.add(UMLElementTypes.Constraint_3199);

+			types.add(UMLElementTypes.NamedElement_3204);

+			types.add(UMLElementTypes.NamedElement_2003);

+			types.add(UMLElementTypes.Port_3069);

+			types.add(UMLElementTypes.Model_3077);

+			types.add(UMLElementTypes.Package_3076);

+			types.add(UMLElementTypes.Interface_3078);

+			types.add(UMLElementTypes.Component_3070);

+			types.add(UMLElementTypes.Component_3071);

+			types.add(UMLElementTypes.Constraint_3075);

+			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

+		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {

+			types.add(UMLElementTypes.Dependency_3203);

+			types.add(UMLElementTypes.Component_2002);

+			types.add(UMLElementTypes.Model_3202);

+			types.add(UMLElementTypes.Package_3200);

+			types.add(UMLElementTypes.Interface_3205);

+			types.add(UMLElementTypes.Constraint_3199);

+			types.add(UMLElementTypes.NamedElement_3204);

+			types.add(UMLElementTypes.NamedElement_2003);

+			types.add(UMLElementTypes.Port_3069);

+			types.add(UMLElementTypes.Model_3077);

+			types.add(UMLElementTypes.Package_3076);

+			types.add(UMLElementTypes.Interface_3078);

+			types.add(UMLElementTypes.Component_3070);

+			types.add(UMLElementTypes.Component_3071);

+			types.add(UMLElementTypes.Constraint_3075);

+			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

+		} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {

+			types.add(UMLElementTypes.Comment_3201);

+			types.add(UMLElementTypes.Comment_3074);

+		} else if(relationshipType == UMLElementTypes.ConstraintConstrainedElement_4009) {

+			types.add(UMLElementTypes.Constraint_3199);

+			types.add(UMLElementTypes.Constraint_3075);

+		} else if(relationshipType == UMLElementTypes.Dependency_4010) {

+			types.add(UMLElementTypes.Dependency_3203);

+			types.add(UMLElementTypes.Component_2002);

+			types.add(UMLElementTypes.Model_3202);

+			types.add(UMLElementTypes.Package_3200);

+			types.add(UMLElementTypes.Interface_3205);

+			types.add(UMLElementTypes.Constraint_3199);

+			types.add(UMLElementTypes.NamedElement_3204);

+			types.add(UMLElementTypes.NamedElement_2003);

+			types.add(UMLElementTypes.Port_3069);

+			types.add(UMLElementTypes.Model_3077);

+			types.add(UMLElementTypes.Package_3076);

+			types.add(UMLElementTypes.Interface_3078);

+			types.add(UMLElementTypes.Component_3070);

+			types.add(UMLElementTypes.Component_3071);

+			types.add(UMLElementTypes.Constraint_3075);

+			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

+		} else if(relationshipType == UMLElementTypes.Dependency_4017) {

+			types.add(UMLElementTypes.Dependency_3203);

+			types.add(UMLElementTypes.Component_2002);

+			types.add(UMLElementTypes.Model_3202);

+			types.add(UMLElementTypes.Package_3200);

+			types.add(UMLElementTypes.Interface_3205);

+			types.add(UMLElementTypes.Constraint_3199);

+			types.add(UMLElementTypes.NamedElement_3204);

+			types.add(UMLElementTypes.NamedElement_2003);

+			types.add(UMLElementTypes.Port_3069);

+			types.add(UMLElementTypes.Model_3077);

+			types.add(UMLElementTypes.Package_3076);

+			types.add(UMLElementTypes.Interface_3078);

+			types.add(UMLElementTypes.Component_3070);

+			types.add(UMLElementTypes.Component_3071);

+			types.add(UMLElementTypes.Constraint_3075);

+			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

+		}

+		return types;

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public Object getPreferredValue(EStructuralFeature feature) {

+		IPreferenceStore preferenceStore = (IPreferenceStore)getDiagramPreferencesHint().getPreferenceStore();

+		Object result = null;

+		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

+			String prefColor = null;

+			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

+				prefColor = PreferencesConstantsHelper.getElementConstant("Property", PreferencesConstantsHelper.COLOR_LINE);

+			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

+				prefColor = PreferencesConstantsHelper.getElementConstant("Property", PreferencesConstantsHelper.COLOR_FONT);

+			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

+				prefColor = PreferencesConstantsHelper.getElementConstant("Property", PreferencesConstantsHelper.COLOR_FILL);

+			}

+			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

+		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Property", PreferencesConstantsHelper.COLOR_GRADIENT);

+			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

+			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

+				result = new Integer(gradientPreferenceConverter.getTransparency());

+			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

+				result = gradientPreferenceConverter.getGradientData();

+			}

+		}

+		if(result == null) {

+			result = getStructuralFeatureValue(feature);

+		}

+		return result;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyPartNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyPartNameEditPartCN.java
new file mode 100644
index 00000000000..3353d90c10f
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/PropertyPartNameEditPartCN.java
@@ -0,0 +1,810 @@
+/*****************************************************************************

+ * 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:

+ *  Patrick Tessier (CEA LIST) - Initial API and implementation

+ /*****************************************************************************/

+package org.eclipse.papyrus.uml.diagram.component.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.NameLabelIconHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.component.custom.edit.policies.PropertyLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5268;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public PropertyPartNameEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new PropertyLabelEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(WrappingLabel figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(NameLabelIconHelper.showLabelIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Property_3079, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartNameEditPartCN.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		getManager().show();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+		final Request theRequest = request;

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					setParser(((ICustomDirectEditorConfiguration)configuration).createParser(this.resolveSemanticElement()));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((request instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)request;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return (View)getModel();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see

+	 *         org

+	 *         .eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && languagePreferred != configuration.getLanguage()) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ReceptionInInterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ReceptionInInterfaceEditPart.java
index 025e857eca5..10f6179e03f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ReceptionInInterfaceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/ReceptionInInterfaceEditPart.java
@@ -616,7 +616,9 @@ public class ReceptionInInterfaceEditPart extends CompartmentEditPart implements
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see

+	 *         org

+	 *         .eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceEditPart.java
index 99fb1c403ce..cb7322b0900 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceEditPart.java
@@ -41,8 +41,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

@@ -216,8 +216,8 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Interface";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -225,8 +225,8 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart {
 	/**

 	 * Creates figure for this edit part.

 	 * 

-	 * Body of this method does not depend on settings in generation model

-	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * Body of this method does not depend on settings in generation model so

+	 * you may safely remove <i>generated</i> tag and modify it.

 	 * 

 	 * @generated

 	 */

@@ -240,8 +240,8 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart {
 	}

 

 	/**

-	 * Default implementation treats passed figure as content pane.

-	 * Respects layout one may have set for generated figure.

+	 * Default implementation treats passed figure as content pane. Respects

+	 * layout one may have set for generated figure.

 	 * 

 	 * @param nodeShape

 	 *        instance of generated figure class

@@ -370,6 +370,9 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Usage_4001);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Usage_4001);

+		}

 		if(targetEditPart instanceof org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPart) {

 			types.add(UMLElementTypes.InterfaceRealization_4006);

 		}

@@ -445,6 +448,9 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Substitution_4012);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Substitution_4012);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Manifestation_4014);

 		}

@@ -493,6 +499,9 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Manifestation_4014);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Manifestation_4014);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.ComponentRealization_4007);

 		}

@@ -541,6 +550,9 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.ComponentRealization_4007);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.ComponentRealization_4007);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Abstraction_4013);

 		}

@@ -589,6 +601,9 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Abstraction_4013);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Abstraction_4013);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Dependency_4010);

 		}

@@ -637,6 +652,9 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Dependency_4010);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Dependency_4010);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Dependency_4017);

 		}

@@ -685,6 +703,9 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Dependency_4017);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Dependency_4017);

+		}

 		return types;

 	}

 

@@ -710,6 +731,7 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {

 			types.add(UMLElementTypes.Interface_3205);

 			types.add(UMLElementTypes.Interface_3078);

@@ -738,6 +760,7 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -755,6 +778,7 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -772,6 +796,7 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -789,6 +814,7 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Dependency_4010) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -806,6 +832,7 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -823,6 +850,7 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		}

 		return types;

 	}

@@ -868,6 +896,7 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -885,6 +914,7 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Generalization_4003) {

 			types.add(UMLElementTypes.Component_2002);

 			types.add(UMLElementTypes.Interface_3205);

@@ -909,6 +939,7 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -926,6 +957,7 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -943,6 +975,7 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -960,6 +993,7 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {

 			types.add(UMLElementTypes.Comment_3201);

 			types.add(UMLElementTypes.Comment_3074);

@@ -983,6 +1017,7 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -1000,6 +1035,7 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		}

 		return types;

 	}

@@ -1034,15 +1070,15 @@ public class RectangleInterfaceEditPart extends ShapeNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Interface", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Interface", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Interface", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Interface", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Interface", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Interface", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Interface", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Interface", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceEditPartCN.java
index 3df6c9cee5d..40449ec65b0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceEditPartCN.java
@@ -1,3 +1,6 @@
+/*

+ * 

+ */

 package org.eclipse.papyrus.uml.diagram.component.edit.parts;

 

 import java.util.ArrayList;

@@ -29,8 +32,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

@@ -204,8 +207,8 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Interface";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -213,8 +216,8 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart {
 	/**

 	 * Creates figure for this edit part.

 	 * 

-	 * Body of this method does not depend on settings in generation model

-	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * Body of this method does not depend on settings in generation model so

+	 * you may safely remove <i>generated</i> tag and modify it.

 	 * 

 	 * @generated

 	 */

@@ -228,8 +231,8 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart {
 	}

 

 	/**

-	 * Default implementation treats passed figure as content pane.

-	 * Respects layout one may have set for generated figure.

+	 * Default implementation treats passed figure as content pane. Respects

+	 * layout one may have set for generated figure.

 	 * 

 	 * @param nodeShape

 	 *        instance of generated figure class

@@ -358,6 +361,9 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Usage_4001);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Usage_4001);

+		}

 		if(targetEditPart instanceof RectangleInterfaceEditPart) {

 			types.add(UMLElementTypes.InterfaceRealization_4006);

 		}

@@ -433,6 +439,9 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Substitution_4012);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Substitution_4012);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Manifestation_4014);

 		}

@@ -481,6 +490,9 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Manifestation_4014);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Manifestation_4014);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.ComponentRealization_4007);

 		}

@@ -529,6 +541,9 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.ComponentRealization_4007);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.ComponentRealization_4007);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Abstraction_4013);

 		}

@@ -577,6 +592,9 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Abstraction_4013);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Abstraction_4013);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Dependency_4010);

 		}

@@ -625,6 +643,9 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Dependency_4010);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Dependency_4010);

+		}

 		if(targetEditPart instanceof DependencyNodeEditPart) {

 			types.add(UMLElementTypes.Dependency_4017);

 		}

@@ -673,6 +694,9 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			types.add(UMLElementTypes.Dependency_4017);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			types.add(UMLElementTypes.Dependency_4017);

+		}

 		return types;

 	}

 

@@ -698,6 +722,7 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {

 			types.add(UMLElementTypes.Interface_3205);

 			types.add(UMLElementTypes.Interface_3078);

@@ -726,6 +751,7 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -743,6 +769,7 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -760,6 +787,7 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -777,6 +805,7 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Dependency_4010) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -794,6 +823,7 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -811,6 +841,7 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		}

 		return types;

 	}

@@ -856,6 +887,7 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.InterfaceRealization_4006) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -873,6 +905,7 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Generalization_4003) {

 			types.add(UMLElementTypes.Component_2002);

 			types.add(UMLElementTypes.Interface_3205);

@@ -897,6 +930,7 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Manifestation_4014) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -914,6 +948,7 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.ComponentRealization_4007) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -931,6 +966,7 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Abstraction_4013) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -948,6 +984,7 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.CommentAnnotatedElement_4015) {

 			types.add(UMLElementTypes.Comment_3201);

 			types.add(UMLElementTypes.Comment_3074);

@@ -971,6 +1008,7 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		} else if(relationshipType == UMLElementTypes.Dependency_4017) {

 			types.add(UMLElementTypes.Dependency_3203);

 			types.add(UMLElementTypes.Component_2002);

@@ -988,6 +1026,7 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart {
 			types.add(UMLElementTypes.Component_3071);

 			types.add(UMLElementTypes.Constraint_3075);

 			types.add(UMLElementTypes.Interface_3072);

+			types.add(UMLElementTypes.Property_3079);

 		}

 		return types;

 	}

@@ -1022,15 +1061,15 @@ public class RectangleInterfaceEditPartCN extends ShapeNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Interface", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Interface", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Interface", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Interface", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Interface", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Interface", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Interface", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Interface", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceNameEditPart.java
index bcd0fbb634d..e8e000fd125 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceNameEditPart.java
@@ -611,7 +611,9 @@ public class RectangleInterfaceNameEditPart extends PapyrusCompartmentEditPart i
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see

+	 *         org

+	 *         .eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceNameEditPartCN.java
index ccb70a7b1b3..dfedbe7b9e5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/RectangleInterfaceNameEditPartCN.java
@@ -1,3 +1,6 @@
+/*

+ * 

+ */

 package org.eclipse.papyrus.uml.diagram.component.edit.parts;

 

 import java.util.Collections;

@@ -584,7 +587,9 @@ public class RectangleInterfaceNameEditPartCN extends PapyrusCompartmentEditPart
 	/**

 	 * Returns the kind of associated editor for direct edition.

 	 * 

-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see

+	 *         org

+	 *         .eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

 	 * @generated

 	 */

 	public int getDirectEditionType() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/UMLEditPartFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/UMLEditPartFactory.java
index c3342f3b831..dc138a60512 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/UMLEditPartFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/parts/UMLEditPartFactory.java
@@ -124,6 +124,10 @@ public class UMLEditPartFactory implements EditPartFactory {
 				return new InterfaceEditPartPCN(view);

 			case InterfaceNameEditPartPCN.VISUAL_ID:

 				return new InterfaceNameEditPartPCN(view);

+			case PropertyPartEditPartCN.VISUAL_ID:

+				return new PropertyPartEditPartCN(view);

+			case PropertyPartNameEditPartCN.VISUAL_ID:

+				return new PropertyPartNameEditPartCN(view);

 			case ComponentCompositeCompartmentEditPart.VISUAL_ID:

 				return new ComponentCompositeCompartmentEditPart(view);

 			case ModelPackageableElementCompartmentEditPart.VISUAL_ID:

@@ -194,6 +198,12 @@ public class UMLEditPartFactory implements EditPartFactory {
 				return new DependencyBranchEditPart(view);

 			case InterfacePortLinkEditPart.VISUAL_ID:

 				return new InterfacePortLinkEditPart(view);

+			case ConnectorEditPart.VISUAL_ID:

+				return new ConnectorEditPart(view);

+			case ConnectorAppliedStereotypeEditPart.VISUAL_ID:

+				return new ConnectorAppliedStereotypeEditPart(view);

+			case ConnectorNameEditPart.VISUAL_ID:

+				return new ConnectorNameEditPart(view);

 			}

 		}

 		return createUnrecognizedEditPart(context, model);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicy.java
index 1441754b117..dab5005fa68 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicy.java
@@ -14,9 +14,11 @@ package org.eclipse.papyrus.uml.diagram.component.edit.policies;
 

 import java.util.ArrayList;

 import java.util.Collection;

+import java.util.HashSet;

 import java.util.Iterator;

 import java.util.LinkedList;

 import java.util.List;

+import java.util.Set;

 

 import org.eclipse.core.runtime.IAdaptable;

 import org.eclipse.emf.ecore.EObject;

@@ -33,6 +35,7 @@ import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLNodeDescriptor;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

@@ -49,6 +52,11 @@ public class ComponentCompositeCompartmentCanonicalEditPolicy extends CanonicalE
 	/**

 	 * @generated

 	 */

+	private Set<EStructuralFeature> myFeaturesToSynchronize;

+

+	/**

+	 * @generated

+	 */

 	protected void refreshOnActivate() {

 		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

 		List<?> c = getHost().getChildren();

@@ -59,13 +67,15 @@ public class ComponentCompositeCompartmentCanonicalEditPolicy extends CanonicalE
 	}

 

 	/**

-	 * Gets the feature to synchronize.

-	 * 

-	 * @return the feature to synchronize

 	 * @generated

 	 */

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getClass_NestedClassifier();

+	protected Set getFeaturesToSynchronize() {

+		if(myFeaturesToSynchronize == null) {

+			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

+			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getComponent_PackagedElement());

+			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getStructuredClassifier_OwnedAttribute());

+		}

+		return myFeaturesToSynchronize;

 	}

 

 	/**

@@ -108,7 +118,8 @@ public class ComponentCompositeCompartmentCanonicalEditPolicy extends CanonicalE
 	 * @generated

 	 */

 	private boolean isMyDiagramElement(View view) {

-		return ComponentEditPartCN.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);

+		int visualID = UMLVisualIDRegistry.getVisualID(view);

+		return visualID == ComponentEditPartCN.VISUAL_ID || visualID == PropertyPartEditPartCN.VISUAL_ID;

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicyCN.java
index 5a3ba74d566..89de98ea1d6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicyCN.java
@@ -14,9 +14,11 @@ package org.eclipse.papyrus.uml.diagram.component.edit.policies;
 

 import java.util.ArrayList;

 import java.util.Collection;

+import java.util.HashSet;

 import java.util.Iterator;

 import java.util.LinkedList;

 import java.util.List;

+import java.util.Set;

 

 import org.eclipse.core.runtime.IAdaptable;

 import org.eclipse.emf.ecore.EObject;

@@ -33,6 +35,7 @@ import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLNodeDescriptor;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

@@ -49,6 +52,11 @@ public class ComponentCompositeCompartmentCanonicalEditPolicyCN extends Canonica
 	/**

 	 * @generated

 	 */

+	private Set<EStructuralFeature> myFeaturesToSynchronize;

+

+	/**

+	 * @generated

+	 */

 	protected void refreshOnActivate() {

 		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

 		List<?> c = getHost().getChildren();

@@ -59,13 +67,15 @@ public class ComponentCompositeCompartmentCanonicalEditPolicyCN extends Canonica
 	}

 

 	/**

-	 * Gets the feature to synchronize.

-	 * 

-	 * @return the feature to synchronize

 	 * @generated

 	 */

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getClass_NestedClassifier();

+	protected Set getFeaturesToSynchronize() {

+		if(myFeaturesToSynchronize == null) {

+			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

+			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getComponent_PackagedElement());

+			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getStructuredClassifier_OwnedAttribute());

+		}

+		return myFeaturesToSynchronize;

 	}

 

 	/**

@@ -108,7 +118,8 @@ public class ComponentCompositeCompartmentCanonicalEditPolicyCN extends Canonica
 	 * @generated

 	 */

 	private boolean isMyDiagramElement(View view) {

-		return ComponentEditPartCN.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);

+		int visualID = UMLVisualIDRegistry.getVisualID(view);

+		return visualID == ComponentEditPartCN.VISUAL_ID || visualID == PropertyPartEditPartCN.VISUAL_ID;

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicyPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicyPCN.java
index 2886b9eb53a..a1b3114be39 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicyPCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentCanonicalEditPolicyPCN.java
@@ -14,9 +14,11 @@ package org.eclipse.papyrus.uml.diagram.component.edit.policies;
 

 import java.util.ArrayList;

 import java.util.Collection;

+import java.util.HashSet;

 import java.util.Iterator;

 import java.util.LinkedList;

 import java.util.List;

+import java.util.Set;

 

 import org.eclipse.core.runtime.IAdaptable;

 import org.eclipse.emf.ecore.EObject;

@@ -33,6 +35,7 @@ import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPartCN;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLNodeDescriptor;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

@@ -49,6 +52,11 @@ public class ComponentCompositeCompartmentCanonicalEditPolicyPCN extends Canonic
 	/**

 	 * @generated

 	 */

+	private Set<EStructuralFeature> myFeaturesToSynchronize;

+

+	/**

+	 * @generated

+	 */

 	protected void refreshOnActivate() {

 		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

 		List<?> c = getHost().getChildren();

@@ -59,13 +67,15 @@ public class ComponentCompositeCompartmentCanonicalEditPolicyPCN extends Canonic
 	}

 

 	/**

-	 * Gets the feature to synchronize.

-	 * 

-	 * @return the feature to synchronize

 	 * @generated

 	 */

-	protected EStructuralFeature getFeatureToSynchronize() {

-		return UMLPackage.eINSTANCE.getClass_NestedClassifier();

+	protected Set getFeaturesToSynchronize() {

+		if(myFeaturesToSynchronize == null) {

+			myFeaturesToSynchronize = new HashSet<EStructuralFeature>();

+			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getComponent_PackagedElement());

+			myFeaturesToSynchronize.add(UMLPackage.eINSTANCE.getStructuredClassifier_OwnedAttribute());

+		}

+		return myFeaturesToSynchronize;

 	}

 

 	/**

@@ -108,7 +118,8 @@ public class ComponentCompositeCompartmentCanonicalEditPolicyPCN extends Canonic
 	 * @generated

 	 */

 	private boolean isMyDiagramElement(View view) {

-		return ComponentEditPartCN.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);

+		int visualID = UMLVisualIDRegistry.getVisualID(view);

+		return visualID == ComponentEditPartCN.VISUAL_ID || visualID == PropertyPartEditPartCN.VISUAL_ID;

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicy.java
index f7dd5361c47..473de7eaf50 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicy.java
@@ -18,6 +18,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

 import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

 import org.eclipse.papyrus.uml.diagram.component.edit.commands.ComponentCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.component.edit.commands.PropertyCreateCommand;

 import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

 

 // TODO: Auto-generated Javadoc

@@ -69,6 +70,12 @@ public class ComponentCompositeCompartmentItemSemanticEditPolicy extends UMLBase
 			}

 			return getGEFWrapper(new ComponentCreateCommandCN(req));

 		}

+		if(UMLElementTypes.Property_3079 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new PropertyCreateCommand(req));

+		}

 		return super.getCreateCommand(req);

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicyCN.java
index 91cb2be43e3..be548445f52 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicyCN.java
@@ -18,6 +18,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

 import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

 import org.eclipse.papyrus.uml.diagram.component.edit.commands.ComponentCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.component.edit.commands.PropertyCreateCommand;

 import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

 

 // TODO: Auto-generated Javadoc

@@ -69,6 +70,12 @@ public class ComponentCompositeCompartmentItemSemanticEditPolicyCN extends UMLBa
 			}

 			return getGEFWrapper(new ComponentCreateCommandCN(req));

 		}

+		if(UMLElementTypes.Property_3079 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new PropertyCreateCommand(req));

+		}

 		return super.getCreateCommand(req);

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicyPCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicyPCN.java
index 9511030f6d7..b205d5452e7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicyPCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicyPCN.java
@@ -18,6 +18,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
 import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

 import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

 import org.eclipse.papyrus.uml.diagram.component.edit.commands.ComponentCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.component.edit.commands.PropertyCreateCommand;

 import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

 

 // TODO: Auto-generated Javadoc

@@ -69,6 +70,12 @@ public class ComponentCompositeCompartmentItemSemanticEditPolicyPCN extends UMLB
 			}

 			return getGEFWrapper(new ComponentCreateCommandCN(req));

 		}

+		if(UMLElementTypes.Property_3079 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new PropertyCreateCommand(req));

+		}

 		return super.getCreateCommand(req);

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ConnectorItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ConnectorItemSemanticEditPolicy.java
new file mode 100644
index 00000000000..48c66a93686
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ConnectorItemSemanticEditPolicy.java
@@ -0,0 +1,291 @@
+/*****************************************************************************

+ * 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:

+ *  Patrick Tessier (CEA LIST) - Initial API and implementation

+ /*****************************************************************************/

+package org.eclipse.papyrus.uml.diagram.component.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+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.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+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;

+import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.component.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.component.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.component.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.component.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.component.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class ConnectorItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ConnectorItemSemanticEditPolicy() {

+		super(UMLElementTypes.Connector_4019);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.Usage_4001 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4014 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4013 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyBranchCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.Usage_4001 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4006 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.Substitution_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4014 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4013 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyBranchCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case UsageEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case DependencyBranchEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/DefaultNamedElementItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/DefaultNamedElementItemSemanticEditPolicy.java
index f4d1323fdf8..7e42a205919 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/DefaultNamedElementItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/DefaultNamedElementItemSemanticEditPolicy.java
@@ -287,8 +287,8 @@ public class DefaultNamedElementItemSemanticEditPolicy extends UMLBaseItemSemant
 	}

 

 	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

+	 * Returns command to reorient EReference based link. New link target or

+	 * source should be the domain model element associated with this node.

 	 * 

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/DependencyBranchItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/DependencyBranchItemSemanticEditPolicy.java
index 75c2ca206d8..3789004a692 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/DependencyBranchItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/DependencyBranchItemSemanticEditPolicy.java
@@ -274,8 +274,8 @@ public class DependencyBranchItemSemanticEditPolicy extends UMLBaseItemSemanticE
 	}

 

 	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

+	 * Returns command to reorient EReference based link. New link target or

+	 * source should be the domain model element associated with this node.

 	 * 

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/DependencyNodeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/DependencyNodeItemSemanticEditPolicy.java
index 4d74aea4a5e..f31f5f28d36 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/DependencyNodeItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/DependencyNodeItemSemanticEditPolicy.java
@@ -274,8 +274,8 @@ public class DependencyNodeItemSemanticEditPolicy extends UMLBaseItemSemanticEdi
 	}

 

 	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

+	 * Returns command to reorient EReference based link. New link target or

+	 * source should be the domain model element associated with this node.

 	 * 

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceAttributeCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceAttributeCompartmentCanonicalEditPolicyCN.java
index caf0e0725f7..73138c5361a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceAttributeCompartmentCanonicalEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceAttributeCompartmentCanonicalEditPolicyCN.java
@@ -1,3 +1,6 @@
+/*

+ * 

+ */

 package org.eclipse.papyrus.uml.diagram.component.edit.policies;

 

 import java.util.ArrayList;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceAttributeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceAttributeCompartmentItemSemanticEditPolicyCN.java
index e09555e8baf..57a380c06e2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceAttributeCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceAttributeCompartmentItemSemanticEditPolicyCN.java
@@ -1,3 +1,6 @@
+/*

+ * 

+ */

 package org.eclipse.papyrus.uml.diagram.component.edit.policies;

 

 import org.eclipse.gef.commands.Command;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceOperationCompartmentCanonicalEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceOperationCompartmentCanonicalEditPolicyCN.java
index aa071e45517..8120b78b1b0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceOperationCompartmentCanonicalEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceOperationCompartmentCanonicalEditPolicyCN.java
@@ -1,3 +1,6 @@
+/*

+ * 

+ */

 package org.eclipse.papyrus.uml.diagram.component.edit.policies;

 

 import java.util.ArrayList;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceOperationCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceOperationCompartmentItemSemanticEditPolicyCN.java
index a16623330ab..30f55bc324c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceOperationCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/InterfaceOperationCompartmentItemSemanticEditPolicyCN.java
@@ -1,3 +1,6 @@
+/*

+ * 

+ */

 package org.eclipse.papyrus.uml.diagram.component.edit.policies;

 

 import org.eclipse.gef.commands.Command;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelCanonicalEditPolicy.java
index a1bc003d38d..9a39f7c2f76 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelCanonicalEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelCanonicalEditPolicy.java
@@ -59,6 +59,7 @@ import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPart;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPartCN;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPartPCN;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConnectorEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintEditPartPCN;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.DefaultNamedElementEditPart;

@@ -77,6 +78,7 @@ import org.eclipse.papyrus.uml.diagram.component.edit.parts.ModelEditPartCN;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackageEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackageEditPartCN;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPartCN;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.SubstitutionEditPart;

@@ -490,6 +492,14 @@ public class ModelCanonicalEditPolicy extends CanonicalEditPolicy {
 			domain2NotationMap.putView(view.getElement(), view);

 			break;

 		}

+		case PropertyPartEditPartCN.VISUAL_ID:

+		{

+			if(!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(UMLDiagramUpdater.getProperty_3079ContainedLinks(view));

+			}

+			domain2NotationMap.putView(view.getElement(), view);

+			break;

+		}

 		case UsageEditPart.VISUAL_ID:

 		{

 			if(!domain2NotationMap.containsKey(view.getElement())) {

@@ -562,6 +572,14 @@ public class ModelCanonicalEditPolicy extends CanonicalEditPolicy {
 			domain2NotationMap.putView(view.getElement(), view);

 			break;

 		}

+		case ConnectorEditPart.VISUAL_ID:

+		{

+			if(!domain2NotationMap.containsKey(view.getElement())) {

+				result.addAll(UMLDiagramUpdater.getConnector_4019ContainedLinks(view));

+			}

+			domain2NotationMap.putView(view.getElement(), view);

+			break;

+		}

 		}

 		for(Iterator children = view.getChildren().iterator(); children.hasNext();) {

 			result.addAll(collectAllLinks((View)children.next(), domain2NotationMap));

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelItemSemanticEditPolicy.java
index 06454c7c85f..36ec451cdd5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelItemSemanticEditPolicy.java
@@ -627,8 +627,8 @@ public class ModelItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
 	}

 

 	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

+	 * Returns command to reorient EReference based link. New link target or

+	 * source should be the domain model element associated with this node.

 	 * 

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelItemSemanticEditPolicyCN.java
index e13399e3a33..3b4473b6949 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/ModelItemSemanticEditPolicyCN.java
@@ -627,8 +627,8 @@ public class ModelItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy
 	}

 

 	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

+	 * Returns command to reorient EReference based link. New link target or

+	 * source should be the domain model element associated with this node.

 	 * 

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/PackageItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/PackageItemSemanticEditPolicyCN.java
index 37ccc4a7ccb..7f919994079 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/PackageItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/PackageItemSemanticEditPolicyCN.java
@@ -274,8 +274,8 @@ public class PackageItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPoli
 	}

 

 	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

+	 * Returns command to reorient EReference based link. New link target or

+	 * source should be the domain model element associated with this node.

 	 * 

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/PropertyCanonicalEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/PropertyCanonicalEditPolicy.java
new file mode 100644
index 00000000000..fd5cce09029
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/PropertyCanonicalEditPolicy.java
@@ -0,0 +1,168 @@
+/*****************************************************************************

+ * 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:

+ *  Patrick Tessier (CEA LIST) - Initial API and implementation

+ /*****************************************************************************/

+package org.eclipse.papyrus.uml.diagram.component.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

+import org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand;

+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.Node;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortEditPart;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLNodeDescriptor;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class PropertyCanonicalEditPolicy extends CanonicalEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	protected void refreshOnActivate() {

+		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners

+		List<?> c = getHost().getChildren();

+		for(int i = 0; i < c.size(); i++) {

+			((EditPart)c.get(i)).activate();

+		}

+		super.refreshOnActivate();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EStructuralFeature getFeatureToSynchronize() {

+		return UMLPackage.eINSTANCE.getStructuredClassifier_OwnedAttribute();

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("rawtypes")

+	protected List getSemanticChildrenList() {

+		View viewObject = (View)getHost().getModel();

+		LinkedList<EObject> result = new LinkedList<EObject>();

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getProperty_3079SemanticChildren(viewObject);

+		for(UMLNodeDescriptor d : childDescriptors) {

+			result.add(d.getModelElement());

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isOrphaned(Collection<EObject> semanticChildren, final View view) {

+		return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());

+	}

+

+	/**

+	 * @generated

+	 */

+	private boolean isMyDiagramElement(View view) {

+		return PortEditPart.VISUAL_ID == UMLVisualIDRegistry.getVisualID(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSemantic() {

+		if(resolveSemanticElement() == null) {

+			return;

+		}

+		LinkedList<IAdaptable> createdViews = new LinkedList<IAdaptable>();

+		List<UMLNodeDescriptor> childDescriptors = UMLDiagramUpdater.getProperty_3079SemanticChildren((View)getHost().getModel());

+		LinkedList<View> orphaned = new LinkedList<View>();

+		// we care to check only views we recognize as ours

+		LinkedList<View> knownViewChildren = new LinkedList<View>();

+		for(View v : getViewChildren()) {

+			if(isMyDiagramElement(v)) {

+				knownViewChildren.add(v);

+			}

+		}

+		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)

+		//

+		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP

+		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 

+		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()

+		for(Iterator<UMLNodeDescriptor> descriptorsIterator = childDescriptors.iterator(); descriptorsIterator.hasNext();) {

+			UMLNodeDescriptor next = descriptorsIterator.next();

+			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

+			LinkedList<View> perfectMatch = new LinkedList<View>(); // both semanticElement and hint match that of NodeDescriptor

+			for(View childView : getViewChildren()) {

+				EObject semanticElement = childView.getElement();

+				if(next.getModelElement().equals(semanticElement)) {

+					if(hint.equals(childView.getType())) {

+						perfectMatch.add(childView);

+						// actually, can stop iteration over view children here, but

+						// may want to use not the first view but last one as a 'real' match (the way original CEP does

+						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren

+					}

+				}

+			}

+			if(perfectMatch.size() > 0) {

+				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor

+				// use only one view (first or last?), keep rest as orphaned for further consideration

+				knownViewChildren.remove(perfectMatch.getFirst());

+			}

+		}

+		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,

+		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.

+		orphaned.addAll(knownViewChildren);

+		//

+		ArrayList<CreateViewRequest.ViewDescriptor> viewDescriptors = new ArrayList<CreateViewRequest.ViewDescriptor>(childDescriptors.size());

+		for(UMLNodeDescriptor next : childDescriptors) {

+			String hint = UMLVisualIDRegistry.getType(next.getVisualID());

+			IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);

+			CreateViewRequest.ViewDescriptor descriptor = new CreateViewRequest.ViewDescriptor(elementAdapter, Node.class, hint, ViewUtil.APPEND, false, host().getDiagramPreferencesHint());

+			viewDescriptors.add(descriptor);

+		}

+		boolean changed = deleteViews(orphaned.iterator());

+		//

+		CreateViewRequest request = getCreateViewRequest(viewDescriptors);

+		Command cmd = getCreateViewCommand(request);

+		if(cmd != null && cmd.canExecute()) {

+			SetViewMutabilityCommand.makeMutable(new EObjectAdapter(host().getNotationView())).execute();

+			executeCommand(cmd);

+			@SuppressWarnings("unchecked")

+			List<IAdaptable> nl = (List<IAdaptable>)request.getNewObject();

+			createdViews.addAll(nl);

+		}

+		if(changed || createdViews.size() > 0) {

+			postProcessRefreshSemantic(createdViews);

+		}

+		if(createdViews.size() > 1) {

+			// perform a layout of the container

+			DeferredLayoutCommand layoutCmd = new DeferredLayoutCommand(host().getEditingDomain(), createdViews, host());

+			executeCommand(new ICommandProxy(layoutCmd));

+		}

+		makeViewsImmutable(createdViews);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/PropertyItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/PropertyItemSemanticEditPolicy.java
new file mode 100644
index 00000000000..172f026e434
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/PropertyItemSemanticEditPolicy.java
@@ -0,0 +1,401 @@
+/*****************************************************************************

+ * 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:

+ *  Patrick Tessier (CEA LIST)- Initial API and implementation

+ /*****************************************************************************/

+package org.eclipse.papyrus.uml.diagram.component.edit.policies;

+

+import java.util.ArrayList;

+import java.util.Iterator;

+import java.util.List;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+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.DestroyReferenceRequest;

+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.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.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+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;

+import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.component.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.component.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.component.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyBranchCreateCommand;

+import org.eclipse.papyrus.uml.diagram.component.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.component.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.component.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.component.edit.commands.PortCreateCommand;

+import org.eclipse.papyrus.uml.diagram.component.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.component.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyBranchEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.component.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class PropertyItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public PropertyItemSemanticEditPolicy() {

+		super(UMLElementTypes.Property_3079);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.Port_3069 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedTypeCreationCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new PortCreateCommand(req));

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View)getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(true);

+		EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+		if(annotation == null) {

+			// there are indirectly referenced children, need extra commands: true

+			addDestroyChildNodesCommand(cmd);

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			List<EObject> todestroy = new ArrayList<EObject>();

+			todestroy.add(req.getElementToDestroy());

+			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

+		} else {

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addDestroyChildNodesCommand(ICompositeCommand cmd) {

+		View view = (View)getHost().getModel();

+		for(Iterator<?> nit = view.getChildren().iterator(); nit.hasNext();) {

+			Node node = (Node)nit.next();

+			switch(UMLVisualIDRegistry.getVisualID(node)) {

+			case PortEditPart.VISUAL_ID:

+				for(Iterator<?> it = node.getTargetEdges().iterator(); it.hasNext();) {

+					Edge incomingLink = (Edge)it.next();

+					switch(UMLVisualIDRegistry.getVisualID(incomingLink)) {

+					case CommentAnnotatedElementEditPart.VISUAL_ID:

+					case ConstraintConstrainedElementEditPart.VISUAL_ID:

+						DestroyReferenceRequest destroyRefReq = new DestroyReferenceRequest(incomingLink.getSource().getElement(), null, incomingLink.getTarget().getElement(), false);

+						cmd.add(new DestroyReferenceCommand(destroyRefReq));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

+						break;

+					case UsageEditPart.VISUAL_ID:

+					case SubstitutionEditPart.VISUAL_ID:

+					case ManifestationEditPart.VISUAL_ID:

+					case ComponentRealizationEditPart.VISUAL_ID:

+					case AbstractionEditPart.VISUAL_ID:

+					case DependencyEditPart.VISUAL_ID:

+					case DependencyBranchEditPart.VISUAL_ID:

+						DestroyElementRequest destroyEltReq = new DestroyElementRequest(incomingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(destroyEltReq));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));

+						break;

+					}

+				}

+				for(Iterator<?> it = node.getSourceEdges().iterator(); it.hasNext();) {

+					Edge outgoingLink = (Edge)it.next();

+					switch(UMLVisualIDRegistry.getVisualID(outgoingLink)) {

+					case UsageEditPart.VISUAL_ID:

+					case InterfaceRealizationEditPart.VISUAL_ID:

+					case SubstitutionEditPart.VISUAL_ID:

+					case ManifestationEditPart.VISUAL_ID:

+					case ComponentRealizationEditPart.VISUAL_ID:

+					case AbstractionEditPart.VISUAL_ID:

+					case DependencyEditPart.VISUAL_ID:

+					case DependencyBranchEditPart.VISUAL_ID:

+						DestroyElementRequest destroyEltReq = new DestroyElementRequest(outgoingLink.getElement(), false);

+						cmd.add(new DestroyElementCommand(destroyEltReq));

+						cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));

+						break;

+					}

+				}

+				cmd.add(new DestroyElementCommand(new DestroyElementRequest(getEditingDomain(), node.getElement(), false))); // directlyOwned: false

+				// don't need explicit deletion of node as parent's view deletion would clean child views as well 

+				// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), node));

+				break;

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.Usage_4001 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4014 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4013 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyBranchCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.Usage_4001 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4006 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.Substitution_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4014 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4013 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyBranchCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case UsageEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case DependencyBranchEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or

+	 * source should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/RectangleInterfaceItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/RectangleInterfaceItemSemanticEditPolicy.java
index 22ac18ffcf9..ef4527b1f92 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/RectangleInterfaceItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/RectangleInterfaceItemSemanticEditPolicy.java
@@ -357,8 +357,8 @@ public class RectangleInterfaceItemSemanticEditPolicy extends UMLBaseItemSemanti
 	}

 

 	/**

-	 * Returns command to reorient EReference based link. New link target or source

-	 * should be the domain model element associated with this node.

+	 * Returns command to reorient EReference based link. New link target or

+	 * source should be the domain model element associated with this node.

 	 * 

 	 * @generated

 	 */

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/UMLBaseItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/UMLBaseItemSemanticEditPolicy.java
index b9c150d1168..6ccb7b8c931 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/UMLBaseItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/edit/policies/UMLBaseItemSemanticEditPolicy.java
@@ -59,6 +59,8 @@ import org.eclipse.uml2.uml.Abstraction;
 import org.eclipse.uml2.uml.Classifier;

 import org.eclipse.uml2.uml.Comment;

 import org.eclipse.uml2.uml.ComponentRealization;

+import org.eclipse.uml2.uml.Connector;

+import org.eclipse.uml2.uml.ConnectorEnd;

 import org.eclipse.uml2.uml.Constraint;

 import org.eclipse.uml2.uml.Dependency;

 import org.eclipse.uml2.uml.Element;

@@ -68,6 +70,7 @@ import org.eclipse.uml2.uml.InterfaceRealization;
 import org.eclipse.uml2.uml.Manifestation;

 import org.eclipse.uml2.uml.NamedElement;

 import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.StructuredClassifier;

 import org.eclipse.uml2.uml.Substitution;

 import org.eclipse.uml2.uml.UMLPackage;

 import org.eclipse.uml2.uml.Usage;

@@ -717,6 +720,13 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 		}

 

 		/**

+		 * @generated

+		 */

+		public boolean canCreateConnector_4019(StructuredClassifier container, ConnectorEnd source, ConnectorEnd target) {

+			return canExistConnector_4019(container, null, source, target);

+		}

+

+		/**

 		 * Can exist usage_4001.

 		 * 

 		 * @param container

@@ -957,5 +967,12 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
 		public boolean canExistLink_4018() {

 			return true;

 		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canExistConnector_4019(StructuredClassifier container, Connector linkInstance, ConnectorEnd source, ConnectorEnd target) {

+			return true;

+		}

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/Messages.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/Messages.java
index 54a67f39fd3..073952f2193 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/Messages.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/Messages.java
@@ -255,222 +255,232 @@ public class Messages extends NLS {
 	/**

 	 * @generated

 	 */

-	public static String NodesGroup_title;

+	public static String createNodesGroup_title;

 

 	/**

 	 * @generated

 	 */

-	public static String NodesGroup_desc;

+	public static String createNodesGroup_desc;

 

 	/**

 	 * @generated

 	 */

-	public static String LinksGroup_title;

+	public static String createLinksGroup_title;

 

 	/**

 	 * @generated

 	 */

-	public static String LinksGroup_desc;

+	public static String createLinksGroup_desc;

 

 	/**

 	 * @generated

 	 */

-	public static String ConstraintCreationTool_title;

+	public static String createConstraintCreationTool_title;

 

 	/**

 	 * @generated

 	 */

-	public static String ConstraintCreationTool_desc;

+	public static String createConstraintCreationTool_desc;

 

 	/**

 	 * @generated

 	 */

-	public static String CommentCreationTool_title;

+	public static String createCommentCreationTool_title;

 

 	/**

 	 * @generated

 	 */

-	public static String CommentCreationTool_desc;

+	public static String createCommentCreationTool_desc;

 

 	/**

 	 * @generated

 	 */

-	public static String ComponentCreationTool_title;

+	public static String createComponentCreationTool_title;

 

 	/**

 	 * @generated

 	 */

-	public static String ComponentCreationTool_desc;

+	public static String createComponentCreationTool_desc;

 

 	/**

 	 * @generated

 	 */

-	public static String RectancleInterfaceCreationTool_title;

+	public static String createRectancleInterfaceCreationTool_title;

 

 	/**

 	 * @generated

 	 */

-	public static String RectancleInterfaceCreationTool_desc;

+	public static String createRectancleInterfaceCreationTool_desc;

 

 	/**

 	 * @generated

 	 */

-	public static String ModelCreationTool_title;

+	public static String createModelCreationTool_title;

 

 	/**

 	 * @generated

 	 */

-	public static String ModelCreationTool_desc;

+	public static String createModelCreationTool_desc;

 

 	/**

 	 * @generated

 	 */

-	public static String PropertyCreationTool_title;

+	public static String createPropertyCreationTool_title;

 

 	/**

 	 * @generated

 	 */

-	public static String PropertyCreationTool_desc;

+	public static String createPropertyCreationTool_desc;

 

 	/**

 	 * @generated

 	 */

-	public static String OperationCreationTool_title;

+	public static String createOperationCreationTool_title;

 

 	/**

 	 * @generated

 	 */

-	public static String OperationCreationTool_desc;

+	public static String createOperationCreationTool_desc;

 

 	/**

 	 * @generated

 	 */

-	public static String PackageCreationTool_title;

+	public static String createPackageCreationTool_title;

 

 	/**

 	 * @generated

 	 */

-	public static String PackageCreationTool_desc;

+	public static String createPackageCreationTool_desc;

 

 	/**

 	 * @generated

 	 */

-	public static String PortCreationTool_title;

+	public static String createPortCreationTool_title;

 

 	/**

 	 * @generated

 	 */

-	public static String PortCreationTool_desc;

+	public static String createPortCreationTool_desc;

 

 	/**

 	 * @generated

 	 */

-	public static String ReceptionCreationTool_title;

+	public static String createReceptionCreationTool_title;

 

 	/**

 	 * @generated

 	 */

-	public static String ReceptionCreationTool_desc;

+	public static String createReceptionCreationTool_desc;

 

 	/**

 	 * @generated

 	 */

-	public static String LinkCreationTool_title;

+	public static String createLinkCreationTool_title;

 

 	/**

 	 * @generated

 	 */

-	public static String LinkCreationTool_desc;

+	public static String createLinkCreationTool_desc;

 

 	/**

 	 * @generated

 	 */

-	public static String DependencyCreationTool_title;

+	public static String createConnectorCreationTool_title;

 

 	/**

 	 * @generated

 	 */

-	public static String DependencyCreationTool_desc;

+	public static String createConnectorCreationTool_desc;

 

 	/**

 	 * @generated

 	 */

-	public static String DependencyBranchCreationTool_title;

+	public static String createDependencyCreationTool_title;

 

 	/**

 	 * @generated

 	 */

-	public static String DependencyBranchCreationTool_desc;

+	public static String createDependencyCreationTool_desc;

 

 	/**

 	 * @generated

 	 */

-	public static String AbstractionCreationTool_title;

+	public static String createDependencyBranchCreationTool_title;

 

 	/**

 	 * @generated

 	 */

-	public static String AbstractionCreationTool_desc;

+	public static String createDependencyBranchCreationTool_desc;

 

 	/**

 	 * @generated

 	 */

-	public static String ManifestationCreationTool_title;

+	public static String createAbstractionCreationTool_title;

 

 	/**

 	 * @generated

 	 */

-	public static String ManifestationCreationTool_desc;

+	public static String createAbstractionCreationTool_desc;

 

 	/**

 	 * @generated

 	 */

-	public static String GeneralizationCreationTool_title;

+	public static String createManifestationCreationTool_title;

 

 	/**

 	 * @generated

 	 */

-	public static String GeneralizationCreationTool_desc;

+	public static String createManifestationCreationTool_desc;

 

 	/**

 	 * @generated

 	 */

-	public static String UsageCreationTool_title;

+	public static String createGeneralizationCreationTool_title;

 

 	/**

 	 * @generated

 	 */

-	public static String UsageCreationTool_desc;

+	public static String createGeneralizationCreationTool_desc;

 

 	/**

 	 * @generated

 	 */

-	public static String SubstitutionCreationTool_title;

+	public static String createUsageCreationTool_title;

 

 	/**

 	 * @generated

 	 */

-	public static String SubstitutionCreationTool_desc;

+	public static String createUsageCreationTool_desc;

 

 	/**

 	 * @generated

 	 */

-	public static String InterfaceRealizationCreationTool_title;

+	public static String createSubstitutionCreationTool_title;

 

 	/**

 	 * @generated

 	 */

-	public static String InterfaceRealizationCreationTool_desc;

+	public static String createSubstitutionCreationTool_desc;

 

 	/**

 	 * @generated

 	 */

-	public static String ComponentRealizationCreationTool_title;

+	public static String createInterfaceRealizationCreationTool_title;

 

 	/**

 	 * @generated

 	 */

-	public static String ComponentRealizationCreationTool_desc;

+	public static String createInterfaceRealizationCreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String createComponentRealizationCreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String createComponentRealizationCreationTool_desc;

 

 	/**

 	 * @generated

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/UMLDiagramUpdater.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/UMLDiagramUpdater.java
index 6a0cbebb203..bbcdd13f7b8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/UMLDiagramUpdater.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/UMLDiagramUpdater.java
@@ -24,6 +24,8 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.util.EcoreUtil;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.gmf.tooling.runtime.update.DiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.common.part.ICustomDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.component.custom.parts.PropertyDiagramUpdater;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.AbstractionEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentAnnotatedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.CommentEditPart;

@@ -36,6 +38,7 @@ import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPart;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPartCN;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPartPCN;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConnectorEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintConstrainedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintEditPartPCN;

@@ -63,6 +66,7 @@ import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackagePackageableEl
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackagePackageableElementCompartmentEditPartCN;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyForInterfaceEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ReceptionInInterfaceEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPartCN;

@@ -74,6 +78,8 @@ import org.eclipse.uml2.uml.Classifier;
 import org.eclipse.uml2.uml.Comment;

 import org.eclipse.uml2.uml.Component;

 import org.eclipse.uml2.uml.ComponentRealization;

+import org.eclipse.uml2.uml.Connector;

+import org.eclipse.uml2.uml.ConnectorEnd;

 import org.eclipse.uml2.uml.Constraint;

 import org.eclipse.uml2.uml.Dependency;

 import org.eclipse.uml2.uml.Element;

@@ -89,6 +95,7 @@ import org.eclipse.uml2.uml.PackageableElement;
 import org.eclipse.uml2.uml.Port;

 import org.eclipse.uml2.uml.Property;

 import org.eclipse.uml2.uml.Reception;

+import org.eclipse.uml2.uml.StructuredClassifier;

 import org.eclipse.uml2.uml.Substitution;

 import org.eclipse.uml2.uml.Type;

 import org.eclipse.uml2.uml.UMLPackage;

@@ -112,6 +119,8 @@ public class UMLDiagramUpdater {
 			return getComponent_3070SemanticChildren(view);

 		case ComponentEditPartPCN.VISUAL_ID:

 			return getComponent_3071SemanticChildren(view);

+		case PropertyPartEditPartCN.VISUAL_ID:

+			return getProperty_3079SemanticChildren(view);

 		case ComponentCompositeCompartmentEditPart.VISUAL_ID:

 			return getComponentCompositeCompartment_7001SemanticChildren(view);

 		case ModelPackageableElementCompartmentEditPart.VISUAL_ID:

@@ -265,6 +274,14 @@ public class UMLDiagramUpdater {
 	/**

 	 * @generated

 	 */

+	public static List getProperty_3079SemanticChildren(View view) {

+		ICustomDiagramUpdater customUpdater = new PropertyDiagramUpdater();

+		return customUpdater.getSemanticChildren(view);

+	}

+

+	/**

+	 * @generated

+	 */

 	public static List<UMLNodeDescriptor> getComponentCompositeCompartment_7001SemanticChildren(View view) {

 		if(false == view.eContainer() instanceof View) {

 			return Collections.emptyList();

@@ -275,14 +292,22 @@ public class UMLDiagramUpdater {
 		}

 		Component modelElement = (Component)containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

-			Classifier childElement = (Classifier)it.next();

+		for(Iterator<?> it = modelElement.getPackagedElements().iterator(); it.hasNext();) {

+			PackageableElement childElement = (PackageableElement)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if(visualID == ComponentEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

 		return result;

 	}

 

@@ -523,14 +548,22 @@ public class UMLDiagramUpdater {
 		}

 		Component modelElement = (Component)containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

-			Classifier childElement = (Classifier)it.next();

+		for(Iterator<?> it = modelElement.getPackagedElements().iterator(); it.hasNext();) {

+			PackageableElement childElement = (PackageableElement)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if(visualID == ComponentEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

 		return result;

 	}

 

@@ -547,14 +580,22 @@ public class UMLDiagramUpdater {
 		}

 		Component modelElement = (Component)containerView.getElement();

 		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

-		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

-			Classifier childElement = (Classifier)it.next();

+		for(Iterator<?> it = modelElement.getPackagedElements().iterator(); it.hasNext();) {

+			PackageableElement childElement = (PackageableElement)it.next();

 			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

 			if(visualID == ComponentEditPartCN.VISUAL_ID) {

 				result.add(new UMLNodeDescriptor(childElement, visualID));

 				continue;

 			}

 		}

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

 		return result;

 	}

 

@@ -719,6 +760,8 @@ public class UMLDiagramUpdater {
 			return getReception_6ContainedLinks(view);

 		case InterfaceEditPartPCN.VISUAL_ID:

 			return getInterface_3072ContainedLinks(view);

+		case PropertyPartEditPartCN.VISUAL_ID:

+			return getProperty_3079ContainedLinks(view);

 		case UsageEditPart.VISUAL_ID:

 			return getUsage_4001ContainedLinks(view);

 		case InterfaceRealizationEditPart.VISUAL_ID:

@@ -737,6 +780,8 @@ public class UMLDiagramUpdater {
 			return getDependency_4010ContainedLinks(view);

 		case DependencyBranchEditPart.VISUAL_ID:

 			return getDependency_4017ContainedLinks(view);

+		case ConnectorEditPart.VISUAL_ID:

+			return getConnector_4019ContainedLinks(view);

 		}

 		return Collections.emptyList();

 	}

@@ -788,6 +833,8 @@ public class UMLDiagramUpdater {
 			return getReception_6IncomingLinks(view);

 		case InterfaceEditPartPCN.VISUAL_ID:

 			return getInterface_3072IncomingLinks(view);

+		case PropertyPartEditPartCN.VISUAL_ID:

+			return getProperty_3079IncomingLinks(view);

 		case UsageEditPart.VISUAL_ID:

 			return getUsage_4001IncomingLinks(view);

 		case InterfaceRealizationEditPart.VISUAL_ID:

@@ -806,6 +853,8 @@ public class UMLDiagramUpdater {
 			return getDependency_4010IncomingLinks(view);

 		case DependencyBranchEditPart.VISUAL_ID:

 			return getDependency_4017IncomingLinks(view);

+		case ConnectorEditPart.VISUAL_ID:

+			return getConnector_4019IncomingLinks(view);

 		}

 		return Collections.emptyList();

 	}

@@ -857,6 +906,8 @@ public class UMLDiagramUpdater {
 			return getReception_6OutgoingLinks(view);

 		case InterfaceEditPartPCN.VISUAL_ID:

 			return getInterface_3072OutgoingLinks(view);

+		case PropertyPartEditPartCN.VISUAL_ID:

+			return getProperty_3079OutgoingLinks(view);

 		case UsageEditPart.VISUAL_ID:

 			return getUsage_4001OutgoingLinks(view);

 		case InterfaceRealizationEditPart.VISUAL_ID:

@@ -875,6 +926,8 @@ public class UMLDiagramUpdater {
 			return getDependency_4010OutgoingLinks(view);

 		case DependencyBranchEditPart.VISUAL_ID:

 			return getDependency_4017OutgoingLinks(view);

+		case ConnectorEditPart.VISUAL_ID:

+			return getConnector_4019OutgoingLinks(view);

 		}

 		return Collections.emptyList();

 	}

@@ -910,6 +963,7 @@ public class UMLDiagramUpdater {
 		Component modelElement = (Component)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getContainedTypeModelFacetLinks_Generalization_4003(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4019(modelElement));

 		return result;

 	}

 

@@ -1049,6 +1103,7 @@ public class UMLDiagramUpdater {
 		Component modelElement = (Component)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getContainedTypeModelFacetLinks_Generalization_4003(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4019(modelElement));

 		return result;

 	}

 

@@ -1059,6 +1114,7 @@ public class UMLDiagramUpdater {
 		Component modelElement = (Component)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		result.addAll(getContainedTypeModelFacetLinks_Generalization_4003(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4019(modelElement));

 		return result;

 	}

 

@@ -1075,6 +1131,13 @@ public class UMLDiagramUpdater {
 	/**

 	 * @generated

 	 */

+	public static List<UMLLinkDescriptor> getProperty_3079ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

 	public static List<UMLLinkDescriptor> getComment_3074ContainedLinks(View view) {

 		Comment modelElement = (Comment)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

@@ -1179,6 +1242,13 @@ public class UMLDiagramUpdater {
 	/**

 	 * @generated

 	 */

+	public static List<UMLLinkDescriptor> getConnector_4019ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

 	public static List<UMLLinkDescriptor> getDependency_3203IncomingLinks(View view) {

 		Dependency modelElement = (Dependency)view.getElement();

 		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

@@ -1485,6 +1555,25 @@ public class UMLDiagramUpdater {
 	/**

 	 * @generated

 	 */

+	public static List<UMLLinkDescriptor> getProperty_3079IncomingLinks(View view) {

+		Property modelElement = (Property)view.getElement();

+		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4001(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4012(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4014(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4007(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4013(modelElement, crossReferences));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4015(modelElement, crossReferences));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4009(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferences));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

 	public static List<UMLLinkDescriptor> getComment_3074IncomingLinks(View view) {

 		Comment modelElement = (Comment)view.getElement();

 		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

@@ -1701,6 +1790,25 @@ public class UMLDiagramUpdater {
 	/**

 	 * @generated

 	 */

+	public static List<UMLLinkDescriptor> getConnector_4019IncomingLinks(View view) {

+		Connector modelElement = (Connector)view.getElement();

+		Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4001(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4012(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4014(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4007(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4013(modelElement, crossReferences));

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4015(modelElement, crossReferences));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4009(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferences));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferences));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

 	public static List<UMLLinkDescriptor> getDependency_3203OutgoingLinks(View view) {

 		Dependency modelElement = (Dependency)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

@@ -1973,6 +2081,23 @@ public class UMLDiagramUpdater {
 	/**

 	 * @generated

 	 */

+	public static List<UMLLinkDescriptor> getProperty_3079OutgoingLinks(View view) {

+		Property modelElement = (Property)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4001(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4014(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4013(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

 	public static List<UMLLinkDescriptor> getComment_3074OutgoingLinks(View view) {

 		Comment modelElement = (Comment)view.getElement();

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

@@ -2165,6 +2290,23 @@ public class UMLDiagramUpdater {
 	/**

 	 * @generated

 	 */

+	public static List<UMLLinkDescriptor> getConnector_4019OutgoingLinks(View view) {

+		Connector modelElement = (Connector)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4001(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4014(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4013(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

 	private static Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Usage_4001(Package container) {

 		Collection result = new LinkedList();

 		for(Iterator links = container.getPackagedElements().iterator(); links.hasNext();) {

@@ -2429,6 +2571,38 @@ public class UMLDiagramUpdater {
 	/**

 	 * @generated

 	 */

+	private static Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Connector_4019(StructuredClassifier container) {

+		Collection result = new LinkedList();

+		for(Iterator links = container.getOwnedConnectors().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof Connector) {

+				continue;

+			}

+			Connector link = (Connector)linkObject;

+			if(ConnectorEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+				continue;

+			}

+			//Papyrus GenCode 

+			List targets = link.getEnds();

+			Object theTarget = targets.size() >= 2 ? targets.get(1) : null;

+			if(false == theTarget instanceof ConnectorEnd) {

+				continue;

+			}

+			ConnectorEnd dst = (ConnectorEnd)theTarget;

+			List sources = link.getEnds();

+			Object theSource = sources.size() >= 1 ? sources.get(0) : null;

+			if(false == theSource instanceof ConnectorEnd) {

+				continue;

+			}

+			ConnectorEnd src = (ConnectorEnd)theSource;

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Connector_4019, ConnectorEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

 	private static Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Usage_4001(NamedElement target, Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences) {

 		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

 		Collection<EStructuralFeature.Setting> settings = crossReferences.get(target);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/UMLPaletteFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/UMLPaletteFactory.java
index c84bf8c6e52..34b6574f20e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/UMLPaletteFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/UMLPaletteFactory.java
@@ -85,6 +85,11 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
 	/**

 	 * @generated

 	 */

+	private final static String COMPONENT_TOOL_CONNECTOR = "component.tool.connector"; //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

 	private final static String COMPONENT_TOOL_DEPENDENCY = "component.tool.dependency"; //$NON-NLS-1$

 

 	/**

@@ -170,6 +175,9 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
 		if(toolId.equals(COMPONENT_TOOL_LINK)) {

 			return createLinkCreationTool();

 		}

+		if(toolId.equals(COMPONENT_TOOL_CONNECTOR)) {

+			return createConnectorCreationTool();

+		}

 		if(toolId.equals(COMPONENT_TOOL_DEPENDENCY)) {

 			return createDependencyCreationTool();

 		}

@@ -258,8 +266,9 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
 	 * @generated

 	 */

 	private Tool createPropertyCreationTool() {

-		List<IElementType> types = new ArrayList<IElementType>(1);

+		List<IElementType> types = new ArrayList<IElementType>(2);

 		types.add(UMLElementTypes.Property_1);

+		types.add(UMLElementTypes.Property_3079);

 		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

 		return tool;

 	}

@@ -330,6 +339,16 @@ public class UMLPaletteFactory extends PaletteFactory.Adapter {
 	/**

 	 * @generated

 	 */

+	private Tool createConnectorCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(UMLElementTypes.Connector_4019);

+		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

 	private Tool createDependencyCreationTool() {

 		List<IElementType> types = new ArrayList<IElementType>(1);

 		types.add(UMLElementTypes.Dependency_4010);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/UMLVisualIDRegistry.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/UMLVisualIDRegistry.java
index 765d2a54bc9..0b694f6d6b3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/UMLVisualIDRegistry.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/UMLVisualIDRegistry.java
@@ -38,6 +38,9 @@ import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentNameEditPar
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationAppliedStereotypeEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationNameEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConnectorAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConnectorEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConnectorNameEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintEditPartPCN;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintNameEditPart;

@@ -83,6 +86,8 @@ import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortAppliedStereotyp
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortNameEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyForInterfaceEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartNameEditPartCN;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ReceptionInInterfaceEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPartCN;

@@ -241,10 +246,18 @@ public class UMLVisualIDRegistry {
 				return PortEditPart.VISUAL_ID;

 			}

 			break;

+		case PropertyPartEditPartCN.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

+				return PortEditPart.VISUAL_ID;

+			}

+			break;

 		case ComponentCompositeCompartmentEditPart.VISUAL_ID:

 			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

 				return ComponentEditPartCN.VISUAL_ID;

 			}

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())) {

+				return PropertyPartEditPartCN.VISUAL_ID;

+			}

 			break;

 		case ModelPackageableElementCompartmentEditPart.VISUAL_ID:

 			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

@@ -342,11 +355,17 @@ public class UMLVisualIDRegistry {
 			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

 				return ComponentEditPartCN.VISUAL_ID;

 			}

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())) {

+				return PropertyPartEditPartCN.VISUAL_ID;

+			}

 			break;

 		case ComponentCompositeCompartmentEditPartPCN.VISUAL_ID:

 			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

 				return ComponentEditPartCN.VISUAL_ID;

 			}

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())) {

+				return PropertyPartEditPartCN.VISUAL_ID;

+			}

 			break;

 		case InterfaceAttributeCompartmentEditPart.VISUAL_ID:

 			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())) {

@@ -567,10 +586,21 @@ public class UMLVisualIDRegistry {
 				return true;

 			}

 			break;

+		case PropertyPartEditPartCN.VISUAL_ID:

+			if(PropertyPartNameEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PortEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

 		case ComponentCompositeCompartmentEditPart.VISUAL_ID:

 			if(ComponentEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

 			break;

 		case ModelPackageableElementCompartmentEditPart.VISUAL_ID:

 			if(RectangleInterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

@@ -668,11 +698,17 @@ public class UMLVisualIDRegistry {
 			if(ComponentEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

 			break;

 		case ComponentCompositeCompartmentEditPartPCN.VISUAL_ID:

 			if(ComponentEditPartCN.VISUAL_ID == nodeVisualID) {

 				return true;

 			}

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

 			break;

 		case InterfaceAttributeCompartmentEditPart.VISUAL_ID:

 			if(PropertyForInterfaceEditPart.VISUAL_ID == nodeVisualID) {

@@ -745,6 +781,14 @@ public class UMLVisualIDRegistry {
 				return true;

 			}

 			break;

+		case ConnectorEditPart.VISUAL_ID:

+			if(ConnectorAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ConnectorNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

 		}

 		return false;

 	}

@@ -783,6 +827,9 @@ public class UMLVisualIDRegistry {
 		if(UMLPackage.eINSTANCE.getDependency().isSuperTypeOf(domainElement.eClass())) {

 			return DependencyBranchEditPart.VISUAL_ID;

 		}

+		if(UMLPackage.eINSTANCE.getConnector().isSuperTypeOf(domainElement.eClass())) {

+			return ConnectorEditPart.VISUAL_ID;

+		}

 		return -1;

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/AbstractionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/AbstractionPreferencePage.java
index ab906b0f957..179956d00e3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/AbstractionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/AbstractionPreferencePage.java
@@ -16,8 +16,8 @@ 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.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;

@@ -62,7 +62,7 @@ public class AbstractionPreferencePage extends AbstractPapyrusLinkPreferencePage
 		String key = ComponentDiagramEditPart.MODEL_ID + "_Abstraction";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/CommentPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/CommentPreferencePage.java
index 7f9a416d793..649a5a628de 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/CommentPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/CommentPreferencePage.java
@@ -13,8 +13,8 @@
 package org.eclipse.papyrus.uml.diagram.component.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.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;

 

@@ -56,15 +56,15 @@ public class CommentPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ComponentDiagramEditPart.MODEL_ID + "_Comment";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ComponentPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ComponentPreferencePage.java
index f731d0a5729..423032803f4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ComponentPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ComponentPreferencePage.java
@@ -16,8 +16,8 @@ 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.utils.PreferenceConstantHelper;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;

 

@@ -62,26 +62,26 @@ public class ComponentPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ComponentDiagramEditPart.MODEL_ID + "_Component";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 150);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 70);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 150);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 70);

 		Map<String, Boolean> map = getStaticCompartmentVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//store.setDefault(org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

 	}

 

 	/**

@@ -104,7 +104,7 @@ public class ComponentPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	private static TreeMap<String, Boolean> getStaticCompartmentVisibilityPreferences() {

 		TreeMap<String, Boolean> map = new TreeMap<String, Boolean>();

-		map.put("CompositeCompartment", Boolean.FALSE);

+		map.put("CompositeCompartment", Boolean.TRUE);

 		return map;

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ComponentRealizationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ComponentRealizationPreferencePage.java
index 9df6f76947f..7eda37e8a42 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ComponentRealizationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ComponentRealizationPreferencePage.java
@@ -16,8 +16,8 @@ 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.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;

@@ -62,7 +62,7 @@ public class ComponentRealizationPreferencePage extends AbstractPapyrusLinkPrefe
 		String key = ComponentDiagramEditPart.MODEL_ID + "_ComponentRealization";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ConnectorPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ConnectorPreferencePage.java
new file mode 100644
index 00000000000..345882cb69f
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ConnectorPreferencePage.java
@@ -0,0 +1,82 @@
+/*****************************************************************************

+ * 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:

+ *  Patrick Tessier (CEA LIST) - Initial API and implementation

+ /*****************************************************************************/

+package org.eclipse.papyrus.uml.diagram.component.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.common.util.StringComparator;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;

+

+/**

+ * @generated

+ */

+public class ConnectorPreferencePage extends AbstractPapyrusLinkPreferencePage {

+

+	/**

+	 * @generated

+	 */

+	public ConnectorPreferencePage() {

+		super();

+		setPreferenceKey(ComponentDiagramEditPart.MODEL_ID + "_Connector");

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected String getBundleId() {

+		return UMLDiagramEditorPlugin.ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static void initDefaults(IPreferenceStore store) {

+		String key = ComponentDiagramEditPart.MODEL_ID + "_Connector";

+		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", "");//$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$

+		return map;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected TreeMap<String, String> getLabelRole() {

+		return getStaticLabelRole();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ConstraintPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ConstraintPreferencePage.java
index cc2dadc6b0b..76008afe195 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ConstraintPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ConstraintPreferencePage.java
@@ -13,8 +13,8 @@
 package org.eclipse.papyrus.uml.diagram.component.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.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;

 

@@ -56,15 +56,15 @@ public class ConstraintPreferencePage extends AbstractPapyrusNodePreferencePage
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ComponentDiagramEditPart.MODEL_ID + "_Constraint";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/DefaultNamedElementPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/DefaultNamedElementPreferencePage.java
index e401908da46..5758dfc1908 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/DefaultNamedElementPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/DefaultNamedElementPreferencePage.java
@@ -13,8 +13,8 @@
 package org.eclipse.papyrus.uml.diagram.component.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.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;

 

@@ -44,15 +44,15 @@ public class DefaultNamedElementPreferencePage extends AbstractPapyrusNodePrefer
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ComponentDiagramEditPart.MODEL_ID + "_DefaultNamedElement";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 100);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 50);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 100);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 50);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/DependencyLinkPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/DependencyLinkPreferencePage.java
index fcb657ed874..a1349566615 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/DependencyLinkPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/DependencyLinkPreferencePage.java
@@ -16,8 +16,8 @@ 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.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;

@@ -50,7 +50,7 @@ public class DependencyLinkPreferencePage extends AbstractPapyrusLinkPreferenceP
 		String key = ComponentDiagramEditPart.MODEL_ID + "_DependencyLink";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/DependencyNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/DependencyNodePreferencePage.java
index 17a7524f892..dd8a64a5451 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/DependencyNodePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/DependencyNodePreferencePage.java
@@ -13,8 +13,8 @@
 package org.eclipse.papyrus.uml.diagram.component.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.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;

 

@@ -44,15 +44,15 @@ public class DependencyNodePreferencePage extends AbstractPapyrusNodePreferenceP
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ComponentDiagramEditPart.MODEL_ID + "_DependencyNode";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 10);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 10);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 10);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 10);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/DiagramPreferenceInitializer.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/DiagramPreferenceInitializer.java
index 954b7195f7c..defb2ade432 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/DiagramPreferenceInitializer.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/DiagramPreferenceInitializer.java
@@ -47,6 +47,7 @@ public class DiagramPreferenceInitializer extends AbstractPreferenceInitializer
 		ConstraintConstrainedElementPreferencePage.initDefaults(store);

 		AbstractionPreferencePage.initDefaults(store);

 		InterfacePortLinkPreferencePage.initDefaults(store);

+		ConnectorPreferencePage.initDefaults(store);

 		ManifestationPreferencePage.initDefaults(store);

 		GeneralizationPreferencePage.initDefaults(store);

 		DependencyPreferencePage.initDefaults(store);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/GeneralizationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/GeneralizationPreferencePage.java
index 33041484d5c..30a443cbe38 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/GeneralizationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/GeneralizationPreferencePage.java
@@ -16,8 +16,8 @@ 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.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;

@@ -62,7 +62,7 @@ public class GeneralizationPreferencePage extends AbstractPapyrusLinkPreferenceP
 		String key = ComponentDiagramEditPart.MODEL_ID + "_Generalization";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/InterfacePortLinkPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/InterfacePortLinkPreferencePage.java
index 41562b70b88..33e011206f9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/InterfacePortLinkPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/InterfacePortLinkPreferencePage.java
@@ -1,3 +1,6 @@
+/*

+ * 

+ */

 package org.eclipse.papyrus.uml.diagram.component.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/InterfacePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/InterfacePreferencePage.java
index 31ef36fa7c0..5a60dfb862c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/InterfacePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/InterfacePreferencePage.java
@@ -16,8 +16,8 @@ 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.utils.PreferenceConstantHelper;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;

 

@@ -64,26 +64,26 @@ public class InterfacePreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ComponentDiagramEditPart.MODEL_ID + "_Interface";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 100);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 100);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 100);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 100);

 		Map<String, Boolean> map = getStaticCompartmentVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ManifestationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ManifestationPreferencePage.java
index cf09ec35e2e..e2cf55395a2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ManifestationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ManifestationPreferencePage.java
@@ -16,8 +16,8 @@ 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.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;

@@ -62,7 +62,7 @@ public class ManifestationPreferencePage extends AbstractPapyrusLinkPreferencePa
 		String key = ComponentDiagramEditPart.MODEL_ID + "_Manifestation";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ModelPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ModelPreferencePage.java
index 84407b3ec08..5e5427f4d91 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ModelPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ModelPreferencePage.java
@@ -16,8 +16,8 @@ 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.utils.PreferenceConstantHelper;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;

 

@@ -52,26 +52,26 @@ public class ModelPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ComponentDiagramEditPart.MODEL_ID + "_Model";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 150);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 150);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 150);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 150);

 		Map<String, Boolean> map = getStaticCompartmentVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/NamedElementPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/NamedElementPreferencePage.java
index 0e5e161c4c2..fb33e9b122a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/NamedElementPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/NamedElementPreferencePage.java
@@ -17,8 +17,8 @@ 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.utils.PreferenceConstantHelper;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;

@@ -49,21 +49,21 @@ public class NamedElementPreferencePage extends AbstractPapyrusNodePreferencePag
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ComponentDiagramEditPart.MODEL_ID + "_NamedElement";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/OperationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/OperationPreferencePage.java
index 7f06261db3d..6baa1d89a7f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/OperationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/OperationPreferencePage.java
@@ -14,8 +14,8 @@
 package org.eclipse.papyrus.uml.diagram.component.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.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class OperationPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ComponentDiagramEditPart.MODEL_ID + "_Operation";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/PackagePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/PackagePreferencePage.java
index f5ab5e62038..72081118f93 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/PackagePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/PackagePreferencePage.java
@@ -16,8 +16,8 @@ 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.utils.PreferenceConstantHelper;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;

 

@@ -62,26 +62,26 @@ public class PackagePreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ComponentDiagramEditPart.MODEL_ID + "_Package";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 150);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 150);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 150);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 150);

 		Map<String, Boolean> map = getStaticCompartmentVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/PortPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/PortPreferencePage.java
index e48c3bcfdca..d1112b83238 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/PortPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/PortPreferencePage.java
@@ -16,8 +16,8 @@ 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.utils.PreferenceConstantHelper;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;

@@ -60,21 +60,21 @@ public class PortPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ComponentDiagramEditPart.MODEL_ID + "_Port";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 20);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 20);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/PropertyPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/PropertyPreferencePage.java
index 0c3a846cf92..b3b59834d4b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/PropertyPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/PropertyPreferencePage.java
@@ -14,8 +14,8 @@
 package org.eclipse.papyrus.uml.diagram.component.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.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class PropertyPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ComponentDiagramEditPart.MODEL_ID + "_Property";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 150);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 70);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ReceptionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ReceptionPreferencePage.java
index 6c29db2be2d..e04f6a50ec0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ReceptionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/ReceptionPreferencePage.java
@@ -14,8 +14,8 @@
 package org.eclipse.papyrus.uml.diagram.component.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.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class ReceptionPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ComponentDiagramEditPart.MODEL_ID + "_Reception";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/SubstitutionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/SubstitutionPreferencePage.java
index 91de330b11f..2261df7489e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/SubstitutionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/preferences/SubstitutionPreferencePage.java
@@ -16,8 +16,8 @@ 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.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin;

@@ -62,7 +62,7 @@ public class SubstitutionPreferencePage extends AbstractPapyrusLinkPreferencePag
 		String key = ComponentDiagramEditPart.MODEL_ID + "_Substitution";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/providers/ElementInitializers.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/providers/ElementInitializers.java
index f5e7dc51ed5..1249d7d866d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/providers/ElementInitializers.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/providers/ElementInitializers.java
@@ -20,6 +20,7 @@ import org.eclipse.uml2.uml.AggregationKind;
 import org.eclipse.uml2.uml.Comment;

 import org.eclipse.uml2.uml.Component;

 import org.eclipse.uml2.uml.ComponentRealization;

+import org.eclipse.uml2.uml.Connector;

 import org.eclipse.uml2.uml.Constraint;

 import org.eclipse.uml2.uml.Dependency;

 import org.eclipse.uml2.uml.Interface;

@@ -222,6 +223,18 @@ public class ElementInitializers {
 	/**

 	 * @generated

 	 */

+	public void init_Property_3079(Property instance) {

+		try {

+			Object value_0 = name_Property_3079(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

 	public void init_Comment_3074(Comment instance) {

 		try {

 			Object value_0 = body_Comment_3074(instance);

@@ -380,6 +393,18 @@ public class ElementInitializers {
 	/**

 	 * @generated

 	 */

+	public void init_Connector_4019(Connector instance) {

+		try {

+			Object value_0 = name_Connector_4019(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

 	private String name_Model_3202(Model self) {

 		return NamedElementHelper.EINSTANCE.getNewUMLElementName(self.getOwner(), self.eClass());

 	}

@@ -479,6 +504,13 @@ public class ElementInitializers {
 	/**

 	 * @generated

 	 */

+	private String name_Property_3079(Property self) {

+		return NamedElementHelper.EINSTANCE.getNewUMLElementName(self.getOwner(), self.eClass());

+	}

+

+	/**

+	 * @generated

+	 */

 	private String name_Substitution_4012(Substitution self) {

 		return NamedElementHelper.EINSTANCE.getNewUMLElementName(self.getOwner(), self.eClass());

 	}

@@ -521,6 +553,13 @@ public class ElementInitializers {
 	/**

 	 * @generated

 	 */

+	private String name_Connector_4019(Connector self) {

+		return NamedElementHelper.EINSTANCE.getNewUMLElementName(self.getOwner(), self.eClass());

+	}

+

+	/**

+	 * @generated

+	 */

 	public static ElementInitializers getInstance() {

 		ElementInitializers cached = UMLDiagramEditorPlugin.getInstance().getElementInitializers();

 		if(cached == null) {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/providers/UMLElementTypes.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/providers/UMLElementTypes.java
index 4411974f907..665c5b1ac86 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/providers/UMLElementTypes.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/providers/UMLElementTypes.java
@@ -33,6 +33,7 @@ import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPart;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPartCN;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentEditPartPCN;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConnectorEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintConstrainedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintEditPartPCN;

@@ -54,6 +55,7 @@ import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackageEditPart;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackageEditPartCN;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyForInterfaceEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ReceptionInInterfaceEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPartCN;

@@ -177,6 +179,11 @@ public class UMLElementTypes {
 	/**

 	 * @generated

 	 */

+	public static final IElementType Property_3079 = getElementType("org.eclipse.papyrus.uml.diagram.component.Property_3079"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

 	public static final IElementType Comment_3074 = getElementType("org.eclipse.papyrus.uml.diagram.component.Comment_3074"); //$NON-NLS-1$

 

 	/**

@@ -267,6 +274,11 @@ public class UMLElementTypes {
 	/**

 	 * @generated

 	 */

+	public static final IElementType Connector_4019 = getElementType("org.eclipse.papyrus.uml.diagram.component.Connector_4019"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

 	public static ImageDescriptor getImageDescriptor(ENamedElement element) {

 		return elementTypeImages.getImageDescriptor(element);

 	}

@@ -323,6 +335,7 @@ public class UMLElementTypes {
 			elements.put(Operation_5, UMLPackage.eINSTANCE.getOperation());

 			elements.put(Reception_6, UMLPackage.eINSTANCE.getReception());

 			elements.put(Interface_3072, UMLPackage.eINSTANCE.getInterface());

+			elements.put(Property_3079, UMLPackage.eINSTANCE.getProperty());

 			elements.put(Usage_4001, UMLPackage.eINSTANCE.getUsage());

 			elements.put(InterfaceRealization_4006, UMLPackage.eINSTANCE.getInterfaceRealization());

 			elements.put(Generalization_4003, UMLPackage.eINSTANCE.getGeneralization());

@@ -334,6 +347,7 @@ public class UMLElementTypes {
 			elements.put(ConstraintConstrainedElement_4009, UMLPackage.eINSTANCE.getConstraint_ConstrainedElement());

 			elements.put(Dependency_4010, UMLPackage.eINSTANCE.getDependency());

 			elements.put(Dependency_4017, UMLPackage.eINSTANCE.getDependency());

+			elements.put(Connector_4019, UMLPackage.eINSTANCE.getConnector());

 		}

 		return (ENamedElement)elements.get(type);

 	}

@@ -373,6 +387,7 @@ public class UMLElementTypes {
 			KNOWN_ELEMENT_TYPES.add(Operation_5);

 			KNOWN_ELEMENT_TYPES.add(Reception_6);

 			KNOWN_ELEMENT_TYPES.add(Interface_3072);

+			KNOWN_ELEMENT_TYPES.add(Property_3079);

 			KNOWN_ELEMENT_TYPES.add(Usage_4001);

 			KNOWN_ELEMENT_TYPES.add(InterfaceRealization_4006);

 			KNOWN_ELEMENT_TYPES.add(Generalization_4003);

@@ -386,6 +401,7 @@ public class UMLElementTypes {
 			KNOWN_ELEMENT_TYPES.add(Dependency_4010);

 			KNOWN_ELEMENT_TYPES.add(Dependency_4017);

 			KNOWN_ELEMENT_TYPES.add(Link_4018);

+			KNOWN_ELEMENT_TYPES.add(Connector_4019);

 		}

 		return KNOWN_ELEMENT_TYPES.contains(elementType);

 	}

@@ -439,6 +455,8 @@ public class UMLElementTypes {
 			return Reception_6;

 		case InterfaceEditPartPCN.VISUAL_ID:

 			return Interface_3072;

+		case PropertyPartEditPartCN.VISUAL_ID:

+			return Property_3079;

 		case UsageEditPart.VISUAL_ID:

 			return Usage_4001;

 		case InterfaceRealizationEditPart.VISUAL_ID:

@@ -465,6 +483,8 @@ public class UMLElementTypes {
 			return Dependency_4017;

 		case InterfacePortLinkEditPart.VISUAL_ID:

 			return Link_4018;

+		case ConnectorEditPart.VISUAL_ID:

+			return Connector_4019;

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/providers/UMLModelingAssistantProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/providers/UMLModelingAssistantProvider.java
index 39853610bb9..4bff1304af2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/providers/UMLModelingAssistantProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/providers/UMLModelingAssistantProvider.java
@@ -53,6 +53,7 @@ import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackageEditPartCN;
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackagePackageableElementCompartmentEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackagePackageableElementCompartmentEditPartCN;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPartCN;

 import org.eclipse.papyrus.uml.diagram.component.part.Messages;

@@ -113,9 +114,15 @@ public class UMLModelingAssistantProvider extends ModelingAssistantProvider {
 			types.add(UMLElementTypes.Port_3069);

 			return types;

 		}

-		if(editPart instanceof ComponentCompositeCompartmentEditPart) {

+		if(editPart instanceof PropertyPartEditPartCN) {

 			ArrayList<IElementType> types = new ArrayList<IElementType>(1);

+			types.add(UMLElementTypes.Port_3069);

+			return types;

+		}

+		if(editPart instanceof ComponentCompositeCompartmentEditPart) {

+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);

 			types.add(UMLElementTypes.Component_3070);

+			types.add(UMLElementTypes.Property_3079);

 			return types;

 		}

 		if(editPart instanceof ModelPackageableElementCompartmentEditPart) {

@@ -163,13 +170,15 @@ public class UMLModelingAssistantProvider extends ModelingAssistantProvider {
 			return types;

 		}

 		if(editPart instanceof ComponentCompositeCompartmentEditPartCN) {

-			ArrayList<IElementType> types = new ArrayList<IElementType>(1);

+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);

 			types.add(UMLElementTypes.Component_3070);

+			types.add(UMLElementTypes.Property_3079);

 			return types;

 		}

 		if(editPart instanceof ComponentCompositeCompartmentEditPartPCN) {

-			ArrayList<IElementType> types = new ArrayList<IElementType>(1);

+			ArrayList<IElementType> types = new ArrayList<IElementType>(2);

 			types.add(UMLElementTypes.Component_3070);

+			types.add(UMLElementTypes.Property_3079);

 			return types;

 		}

 		return Collections.EMPTY_LIST;

@@ -234,6 +243,9 @@ public class UMLModelingAssistantProvider extends ModelingAssistantProvider {
 		if(sourceEditPart instanceof InterfaceEditPartPCN) {

 			return ((InterfaceEditPartPCN)sourceEditPart).getMARelTypesOnSource();

 		}

+		if(sourceEditPart instanceof PropertyPartEditPartCN) {

+			return ((PropertyPartEditPartCN)sourceEditPart).getMARelTypesOnSource();

+		}

 		return Collections.EMPTY_LIST;

 	}

 

@@ -296,6 +308,9 @@ public class UMLModelingAssistantProvider extends ModelingAssistantProvider {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			return ((InterfaceEditPartPCN)targetEditPart).getMARelTypesOnTarget();

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			return ((PropertyPartEditPartCN)targetEditPart).getMARelTypesOnTarget();

+		}

 		return Collections.EMPTY_LIST;

 	}

 

@@ -359,6 +374,9 @@ public class UMLModelingAssistantProvider extends ModelingAssistantProvider {
 		if(sourceEditPart instanceof InterfaceEditPartPCN) {

 			return ((InterfaceEditPartPCN)sourceEditPart).getMARelTypesOnSourceAndTarget(targetEditPart);

 		}

+		if(sourceEditPart instanceof PropertyPartEditPartCN) {

+			return ((PropertyPartEditPartCN)sourceEditPart).getMARelTypesOnSourceAndTarget(targetEditPart);

+		}

 		return Collections.EMPTY_LIST;

 	}

 

@@ -421,6 +439,9 @@ public class UMLModelingAssistantProvider extends ModelingAssistantProvider {
 		if(targetEditPart instanceof InterfaceEditPartPCN) {

 			return ((InterfaceEditPartPCN)targetEditPart).getMATypesForSource(relationshipType);

 		}

+		if(targetEditPart instanceof PropertyPartEditPartCN) {

+			return ((PropertyPartEditPartCN)targetEditPart).getMATypesForSource(relationshipType);

+		}

 		return Collections.EMPTY_LIST;

 	}

 

@@ -483,6 +504,9 @@ public class UMLModelingAssistantProvider extends ModelingAssistantProvider {
 		if(sourceEditPart instanceof InterfaceEditPartPCN) {

 			return ((InterfaceEditPartPCN)sourceEditPart).getMATypesForTarget(relationshipType);

 		}

+		if(sourceEditPart instanceof PropertyPartEditPartCN) {

+			return ((PropertyPartEditPartCN)sourceEditPart).getMATypesForTarget(relationshipType);

+		}

 		return Collections.EMPTY_LIST;

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/providers/UMLParserProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/providers/UMLParserProvider.java
index e3cbb86186b..d842904118d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/providers/UMLParserProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/providers/UMLParserProvider.java
@@ -36,6 +36,8 @@ import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentNameEditPar
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentNameEditPartPCN;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationAppliedStereotypeEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationNameEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConnectorAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConnectorNameEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintNameEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintNameEditPartPCN;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintSpecificationEditPart;

@@ -57,6 +59,7 @@ import org.eclipse.papyrus.uml.diagram.component.edit.parts.PackageNameEditPartC
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortAppliedStereotypeEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortNameEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyForInterfaceEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartNameEditPartCN;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ReceptionInInterfaceEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceNameEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceNameEditPartCN;

@@ -380,6 +383,26 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	/**

 	 * @generated

 	 */

+	private IParser propertyName_5268Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getPropertyName_5268Parser() {

+		if(propertyName_5268Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			propertyName_5268Parser = parser;

+		}

+		return propertyName_5268Parser;

+	}

+

+	/**

+	 * @generated

+	 */

 	private CommentParser commentBody_5258Parser;

 

 	/**

@@ -656,6 +679,38 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 	/**

 	 * @generated

 	 */

+	private AppliedStereotypeParser connectorName_6024Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getConnectorName_6024Parser() {

+		if(connectorName_6024Parser == null) {

+			connectorName_6024Parser = new AppliedStereotypeParser();

+		}

+		return connectorName_6024Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser connectorName_6025Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getConnectorName_6025Parser() {

+		if(connectorName_6025Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			connectorName_6025Parser = parser;

+		}

+		return connectorName_6025Parser;

+	}

+

+	/**

+	 * @generated

+	 */

 	protected IParser getParser(int visualID) {

 		switch(visualID) {

 		case MultiDependencyLabelEditPart.VISUAL_ID:

@@ -706,6 +761,8 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 			return getReception_6Parser();

 		case InterfaceNameEditPartPCN.VISUAL_ID:

 			return getInterfaceName_0Parser();

+		case PropertyPartNameEditPartCN.VISUAL_ID:

+			return getPropertyName_5268Parser();

 		case GeneralizationAppliedStereotypeEditPart.VISUAL_ID:

 			return getGeneralizationIsSubstitutable_2Parser();

 		case SubstitutionNameEditPart.VISUAL_ID:

@@ -728,6 +785,10 @@ public class UMLParserProvider extends AbstractProvider implements IParserProvid
 			return getDependencyName_6009Parser();

 		case DependencyAppliedStereotypeEditPart.VISUAL_ID:

 			return getDependencyName_6023Parser();

+		case ConnectorAppliedStereotypeEditPart.VISUAL_ID:

+			return getConnectorName_6024Parser();

+		case ConnectorNameEditPart.VISUAL_ID:

+			return getConnectorName_6025Parser();

 		}

 		return null;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/providers/UMLViewProvider.java
index de54c82ff97..8303d7ce62b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/providers/UMLViewProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/providers/UMLViewProvider.java
@@ -53,8 +53,8 @@ import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

 import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.AbstractionAppliedStereotypeEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.AbstractionEditPart;

@@ -77,6 +77,9 @@ import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentNameEditPar
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationAppliedStereotypeEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ComponentRealizationNameEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConnectorAppliedStereotypeEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConnectorEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConnectorNameEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintConstrainedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ConstraintEditPartPCN;

@@ -125,6 +128,8 @@ import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortAppliedStereotyp
 import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.PortNameEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyForInterfaceEditPart;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartEditPartCN;

+import org.eclipse.papyrus.uml.diagram.component.edit.parts.PropertyPartNameEditPartCN;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.ReceptionInInterfaceEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPart;

 import org.eclipse.papyrus.uml.diagram.component.edit.parts.RectangleInterfaceEditPartCN;

@@ -262,6 +267,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 				case PropertyForInterfaceEditPart.VISUAL_ID:

 				case OperationForInterfaceEditPart.VISUAL_ID:

 				case ReceptionInInterfaceEditPart.VISUAL_ID:

+				case PropertyPartEditPartCN.VISUAL_ID:

 				case ComponentEditPartCN.VISUAL_ID:

 				case ComponentEditPartPCN.VISUAL_ID:

 				case CommentEditPartPCN.VISUAL_ID:

@@ -276,7 +282,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 				}

 			}

 		}

-		return DependencyNodeEditPart.VISUAL_ID == visualID || ComponentEditPart.VISUAL_ID == visualID || ModelEditPart.VISUAL_ID == visualID || PackageEditPart.VISUAL_ID == visualID || RectangleInterfaceEditPart.VISUAL_ID == visualID || CommentEditPart.VISUAL_ID == visualID || ConstraintEditPart.VISUAL_ID == visualID || DefaultNamedElementEditPart.VISUAL_ID == visualID || InterfaceEditPart.VISUAL_ID == visualID || PortEditPart.VISUAL_ID == visualID || ModelEditPartCN.VISUAL_ID == visualID || PackageEditPartCN.VISUAL_ID == visualID || RectangleInterfaceEditPartCN.VISUAL_ID == visualID || ComponentEditPartCN.VISUAL_ID == visualID || ComponentEditPartPCN.VISUAL_ID == visualID || CommentEditPartPCN.VISUAL_ID == visualID || ConstraintEditPartPCN.VISUAL_ID == visualID || PropertyForInterfaceEditPart.VISUAL_ID == visualID || OperationForInterfaceEditPart.VISUAL_ID == visualID || ReceptionInInterfaceEditPart.VISUAL_ID == visualID || InterfaceEditPartPCN.VISUAL_ID == visualID;

+		return DependencyNodeEditPart.VISUAL_ID == visualID || ComponentEditPart.VISUAL_ID == visualID || ModelEditPart.VISUAL_ID == visualID || PackageEditPart.VISUAL_ID == visualID || RectangleInterfaceEditPart.VISUAL_ID == visualID || CommentEditPart.VISUAL_ID == visualID || ConstraintEditPart.VISUAL_ID == visualID || DefaultNamedElementEditPart.VISUAL_ID == visualID || InterfaceEditPart.VISUAL_ID == visualID || PortEditPart.VISUAL_ID == visualID || ModelEditPartCN.VISUAL_ID == visualID || PackageEditPartCN.VISUAL_ID == visualID || RectangleInterfaceEditPartCN.VISUAL_ID == visualID || ComponentEditPartCN.VISUAL_ID == visualID || ComponentEditPartPCN.VISUAL_ID == visualID || CommentEditPartPCN.VISUAL_ID == visualID || ConstraintEditPartPCN.VISUAL_ID == visualID || PropertyForInterfaceEditPart.VISUAL_ID == visualID || OperationForInterfaceEditPart.VISUAL_ID == visualID || ReceptionInInterfaceEditPart.VISUAL_ID == visualID || InterfaceEditPartPCN.VISUAL_ID == visualID || PropertyPartEditPartCN.VISUAL_ID == visualID;

 	}

 

 	/**

@@ -377,6 +383,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 			return createReception_6(domainElement, containerView, index, persisted, preferencesHint);

 		case InterfaceEditPartPCN.VISUAL_ID:

 			return createInterface_3072(domainElement, containerView, index, persisted, preferencesHint);

+		case PropertyPartEditPartCN.VISUAL_ID:

+			return createProperty_3079(domainElement, containerView, index, persisted, preferencesHint);

 		}

 		// can't happen, provided #provides(CreateNodeViewOperation) is correct

 		return null;

@@ -415,6 +423,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 			return createDependency_4017(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

 		case InterfacePortLinkEditPart.VISUAL_ID:

 			return createLink_4018(containerView, index, persisted, preferencesHint);

+		case ConnectorEditPart.VISUAL_ID:

+			return createConnector_4019(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

 		}

 		// can never happen, provided #provides(CreateEdgeViewOperation) is correct

 		return null;

@@ -762,6 +772,24 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

+	public Node createProperty_3079(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Node node = NotationFactory.eINSTANCE.createShape();

+		node.getStyles().add(NotationFactory.eINSTANCE.createDescriptionStyle());

+		node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(PropertyPartEditPartCN.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Property");

+		Node label5268 = createLabel(node, UMLVisualIDRegistry.getType(PropertyPartNameEditPartCN.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

 	public Node createComment_3074(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

 		Shape node = NotationFactory.eINSTANCE.createShape();

 		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

@@ -1256,6 +1284,44 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	/**

 	 * @generated

 	 */

+	public Edge createConnector_4019(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Connector edge = NotationFactory.eINSTANCE.createConnector();

+		edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

+		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints();

+		ArrayList<RelativeBendpoint> points = new ArrayList<RelativeBendpoint>(2);

+		points.add(new RelativeBendpoint());

+		points.add(new RelativeBendpoint());

+		bendpoints.setPoints(points);

+		edge.setBendpoints(bendpoints);

+		ViewUtil.insertChildView(containerView, edge, index, persisted);

+		edge.setType(UMLVisualIDRegistry.getType(ConnectorEditPart.VISUAL_ID));

+		edge.setElement(domainElement);

+		// initializePreferences

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+		PreferenceInitializerForElementHelper.initForegroundFromPrefs(edge, prefStore, "Connector");

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Connector");

+		//org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));

+		//if (routing != null) {

+		//	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);

+		//}

+		PreferenceInitializerForElementHelper.initRountingFromPrefs(edge, prefStore, "Connector");

+		Node label6024 = createLabel(edge, UMLVisualIDRegistry.getType(ConnectorAppliedStereotypeEditPart.VISUAL_ID));

+		label6024.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

+		Location location6024 = (Location)label6024.getLayoutConstraint();

+		location6024.setX(0);

+		location6024.setY(60);

+		Node label6025 = createLabel(edge, UMLVisualIDRegistry.getType(ConnectorNameEditPart.VISUAL_ID));

+		label6025.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

+		Location location6025 = (Location)label6025.getLayoutConstraint();

+		location6025.setX(0);

+		location6025.setY(-20);

+		PreferenceInitializerForElementHelper.initLabelVisibilityFromPrefs(edge, prefStore, "Connector");

+		return edge;

+	}

+

+	/**

+	 * @generated

+	 */

 	protected void stampShortcut(View containerView, Node target) {

 		if(!ComponentDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID(containerView))) {

 			EAnnotation shortcutAnnotation = EcoreFactory.eINSTANCE.createEAnnotation();

@@ -1333,8 +1399,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	private void initFontStyleFromPrefs(View view, final IPreferenceStore store, String elementName) {

-		String fontConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.FONT);

-		String fontColorConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_FONT);

+		String fontConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.FONT);

+		String fontColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_FONT);

 		FontStyle viewFontStyle = (FontStyle)view.getStyle(NotationPackage.Literals.FONT_STYLE);

 		if(viewFontStyle != null) {

 			FontData fontData = PreferenceConverter.getFontData(store, fontConstant);

@@ -1351,7 +1417,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	private void initForegroundFromPrefs(View view, final IPreferenceStore store, String elementName) {

-		String lineColorConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_LINE);

+		String lineColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_LINE);

 		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(store, lineColorConstant);

 		ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getLineStyle_LineColor(), FigureUtilities.RGBToInteger(lineRGB));

 	}

@@ -1360,9 +1426,9 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	private void initBackgroundFromPrefs(View view, final IPreferenceStore store, String elementName) {

-		String fillColorConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_FILL);

-		String gradientColorConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_GRADIENT);

-		String gradientPolicyConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.GRADIENT_POLICY);

+		String fillColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_FILL);

+		String gradientColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_GRADIENT);

+		String gradientPolicyConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.GRADIENT_POLICY);

 		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(store, fillColorConstant);

 		ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getFillStyle_FillColor(), FigureUtilities.RGBToInteger(fillRGB));

 		FillStyle fillStyle = (FillStyle)view.getStyle(NotationPackage.Literals.FILL_STYLE);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/EncapsulatedClassifierResizableShapeEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/EncapsulatedClassifierResizableShapeEditPolicy.java
index f6f726cf33e..76def34ef67 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/EncapsulatedClassifierResizableShapeEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/EncapsulatedClassifierResizableShapeEditPolicy.java
@@ -24,8 +24,8 @@ 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.diagram.ui.editparts.IBorderItemEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableShapeEditPolicy;

 import org.eclipse.gmf.runtime.notation.Shape;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.PapyrusResizableShapeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.commands.FixPortLocationCommand;

 import org.eclipse.papyrus.uml.diagram.common.commands.UpdatePortLocationCommand;

 

@@ -38,7 +38,7 @@ import org.eclipse.papyrus.uml.diagram.common.commands.UpdatePortLocationCommand
  * the kind of attached IBorderItem and that would only rely on its IBorderItemLocator.

  * </pre>

  */

-public class EncapsulatedClassifierResizableShapeEditPolicy extends ResizableShapeEditPolicy {

+public class EncapsulatedClassifierResizableShapeEditPolicy extends PapyrusResizableShapeEditPolicy {

 

 	/**

 	 * <pre>

@@ -54,8 +54,8 @@ public class EncapsulatedClassifierResizableShapeEditPolicy extends ResizableSha
 	protected Command getResizeCommand(ChangeBoundsRequest request) {

 		

 		// Prepare command to move the affixed children as well (and an optional fix command)

-		CompoundCommand updatePortLocationsCommand = new CompoundCommand("Update border items location");

-		CompoundCommand fixPortLocationsCommand = new CompoundCommand("Fix border items location");

+		CompoundCommand updatePortLocationsCommand = new CompoundCommand("Update border items location"); //$NON-NLS-1$

+		CompoundCommand fixPortLocationsCommand = new CompoundCommand("Fix border items location"); //$NON-NLS-1$

 		

 		Iterator<?> it = getHost().getChildren().iterator();

 		while(it.hasNext()) {

@@ -74,7 +74,7 @@ public class EncapsulatedClassifierResizableShapeEditPolicy extends ResizableSha
 				fixPortLocationsCommand.add(new ICommandProxy(fixPortLocationCommand));

 			}

 					

-			ICommand updatePortLocationCommand = new UpdatePortLocationCommand(editingDomain, (GraphicalEditPart) getHost(), borderItem, borderItem.getBorderItemLocator().getCurrentSideOfParent());

+			ICommand updatePortLocationCommand = new UpdatePortLocationCommand(editingDomain, request, (GraphicalEditPart)getHost(), borderItem, borderItem.getBorderItemLocator().getCurrentSideOfParent());

 			if (updatePortLocationCommand.canExecute()) {

 				updatePortLocationsCommand.add(new ICommandProxy(updatePortLocationCommand));

 			}

@@ -82,7 +82,7 @@ public class EncapsulatedClassifierResizableShapeEditPolicy extends ResizableSha
 		

 		

 		// Create the complete resize command

-		CompoundCommand resizeCommand = new CompoundCommand("Resize command");

+		CompoundCommand resizeCommand = new CompoundCommand("Resize command"); //$NON-NLS-1$

 	

 		// Add command to fix border item locations.

 		// The role of this command is to make sure that the Port is correctly located (here this means 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/preferences/CollaborationUsePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/preferences/CollaborationUsePreferencePage.java
index 8a3fe5b10af..751361dfed8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/preferences/CollaborationUsePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/preferences/CollaborationUsePreferencePage.java
@@ -17,7 +17,7 @@ import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusElementPreferencePage;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.uml.tools.utils.ICustomAppearence;

 import org.eclipse.swt.SWT;

@@ -81,13 +81,13 @@ public class CollaborationUsePreferencePage extends AbstractPapyrusElementPrefer
 	public static void initDefaults(IPreferenceStore store) {

 

 		String elementName = "CollaborationUse";

-		PreferenceConverter.setDefault(store, PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		PreferenceConverter.setDefault(store, PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(177, 207, 229));

+		PreferenceConverter.setDefault(store, PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

+		PreferenceConverter.setDefault(store, PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(177, 207, 229));

 

 		// Set the default for the gradient

-		store.setDefault(PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.GRADIENT_POLICY), false);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.GRADIENT_POLICY), false);

 		GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(new org.eclipse.swt.graphics.RGB(255, 255, 255), new org.eclipse.swt.graphics.RGB(177, 207, 229), 0, 0);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

 

 		// custom code

 		store.setDefault(IPapyrusCollaborationUsePreferencesConstant.LABEL_DISPLAY_PREFERENCE, ICustomAppearence.DEFAULT_UML_PROPERTY);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/preferences/ParameterPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/preferences/ParameterPreferencePage.java
index 6e6fa52dbba..f63bae39276 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/preferences/ParameterPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/preferences/ParameterPreferencePage.java
@@ -17,7 +17,7 @@ import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusElementPreferencePage;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.uml.tools.utils.ICustomAppearence;

 import org.eclipse.swt.SWT;

@@ -81,13 +81,13 @@ public class ParameterPreferencePage extends AbstractPapyrusElementPreferencePag
 	public static void initDefaults(IPreferenceStore store) {

 

 		String elementName = "Parameter";

-		PreferenceConverter.setDefault(store, PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		PreferenceConverter.setDefault(store, PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(177, 207, 229));

+		PreferenceConverter.setDefault(store, PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

+		PreferenceConverter.setDefault(store, PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(177, 207, 229));

 

 		// Set the default for the gradient

-		store.setDefault(PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.GRADIENT_POLICY), false);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.GRADIENT_POLICY), false);

 		GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(new org.eclipse.swt.graphics.RGB(255, 255, 255), new org.eclipse.swt.graphics.RGB(177, 207, 229), 0, 0);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

 

 		// custom code

 		store.setDefault(IPapyrusPropertyPreferencesConstant.LABEL_DISPLAY_PREFERENCE, ICustomAppearence.DEFAULT_UML_PARAMETER);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/preferences/PropertyPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/preferences/PropertyPreferencePage.java
index a1e28115557..2c0ee4a256c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/preferences/PropertyPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/preferences/PropertyPreferencePage.java
@@ -17,7 +17,7 @@ import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusElementPreferencePage;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.uml.tools.utils.ICustomAppearence;

 import org.eclipse.swt.SWT;

@@ -81,13 +81,13 @@ public class PropertyPreferencePage extends AbstractPapyrusElementPreferencePage
 	public static void initDefaults(IPreferenceStore store) {

 

 		String elementName = "Property";

-		PreferenceConverter.setDefault(store, PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		PreferenceConverter.setDefault(store, PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(177, 207, 229));

+		PreferenceConverter.setDefault(store, PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

+		PreferenceConverter.setDefault(store, PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(177, 207, 229));

 

 		// Set the default for the gradient

-		store.setDefault(PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.GRADIENT_POLICY), false);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.GRADIENT_POLICY), false);

 		GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(new org.eclipse.swt.graphics.RGB(255, 255, 255), new org.eclipse.swt.graphics.RGB(177, 207, 229), 0, 0);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

 

 		// custom code

 		store.setDefault(IPapyrusPropertyPreferencesConstant.LABEL_DISPLAY_PREFERENCE, ICustomAppearence.DEFAULT_UML_PROPERTY);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeEditPart.java
index d530922b7c4..3255e83bc1f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeEditPart.java
@@ -45,7 +45,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

@@ -260,8 +260,8 @@ public class ActivityCompositeEditPart extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Activity";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5090,15 +5090,15 @@ public class ActivityCompositeEditPart extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Activity", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Activity", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Activity", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Activity", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Activity", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Activity", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Activity", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Activity", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeEditPartCN.java
index 4b8b3ed87a0..93fc28b97aa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeEditPartCN.java
@@ -45,7 +45,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

@@ -260,8 +260,8 @@ public class ActivityCompositeEditPartCN extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Activity";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5090,15 +5090,15 @@ public class ActivityCompositeEditPartCN extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Activity", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Activity", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Activity", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Activity", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Activity", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Activity", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Activity", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Activity", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorEditPart.java
index dc86e930efa..ed60562eb78 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorEditPart.java
@@ -44,7 +44,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

@@ -193,8 +193,8 @@ public class ActorEditPart extends ShapeNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Actor";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5085,15 +5085,15 @@ public class ActorEditPart extends ShapeNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Actor", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Actor", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Actor", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Actor", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Actor", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Actor", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Actor", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Actor", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorEditPartCN.java
index b81fb635978..e612041012b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorEditPartCN.java
@@ -44,7 +44,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

@@ -193,8 +193,8 @@ public class ActorEditPartCN extends ShapeNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Actor";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5085,15 +5085,15 @@ public class ActorEditPartCN extends ShapeNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Actor", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Actor", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Actor", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Actor", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Actor", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Actor", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Actor", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Actor", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AnyReceiveEventEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AnyReceiveEventEditPart.java
index f52d43f8738..a2cf41e8e3d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AnyReceiveEventEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AnyReceiveEventEditPart.java
@@ -44,7 +44,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

@@ -191,8 +191,8 @@ public class AnyReceiveEventEditPart extends ShapeNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "AnyReceiveEvent";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -4855,15 +4855,15 @@ public class AnyReceiveEventEditPart extends ShapeNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("AnyReceiveEvent", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("AnyReceiveEvent", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("AnyReceiveEvent", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("AnyReceiveEvent", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("AnyReceiveEvent", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("AnyReceiveEvent", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("AnyReceiveEvent", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("AnyReceiveEvent", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactEditPart.java
index 8312c067e18..edb43974e37 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactEditPart.java
@@ -44,7 +44,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

@@ -193,8 +193,8 @@ public class ArtifactEditPart extends ShapeNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Artifact";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5085,15 +5085,15 @@ public class ArtifactEditPart extends ShapeNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Artifact", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Artifact", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Artifact", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Artifact", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Artifact", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Artifact", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Artifact", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Artifact", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactEditPartCN.java
index 312ad1919b1..735ee43679c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactEditPartCN.java
@@ -44,7 +44,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

@@ -193,8 +193,8 @@ public class ArtifactEditPartCN extends ShapeNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Artifact";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5085,15 +5085,15 @@ public class ArtifactEditPartCN extends ShapeNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Artifact", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Artifact", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Artifact", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Artifact", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Artifact", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Artifact", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Artifact", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Artifact", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/BehaviorPortEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/BehaviorPortEditPart.java
index 73f423b3647..a87963c658b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/BehaviorPortEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/BehaviorPortEditPart.java
@@ -34,7 +34,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.PapyrusRoundedNodeFigure;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.uml.diagram.composite.custom.edit.parts.AbstractBehaviorPortEditPart;

@@ -137,8 +137,8 @@ public class BehaviorPortEditPart extends AbstractBehaviorPortEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Undefined";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -219,15 +219,15 @@ public class BehaviorPortEditPart extends AbstractBehaviorPortEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Undefined", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Undefined", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Undefined", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Undefined", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Undefined", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Undefined", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Undefined", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Undefined", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CallEventEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CallEventEditPart.java
index c9469732bba..0989ef04955 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CallEventEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CallEventEditPart.java
@@ -44,7 +44,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

@@ -191,8 +191,8 @@ public class CallEventEditPart extends ShapeNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "CallEvent";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -4855,15 +4855,15 @@ public class CallEventEditPart extends ShapeNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("CallEvent", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("CallEvent", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("CallEvent", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("CallEvent", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("CallEvent", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("CallEvent", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("CallEvent", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("CallEvent", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ChangeEventEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ChangeEventEditPart.java
index 28f5fecc362..16313507abf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ChangeEventEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ChangeEventEditPart.java
@@ -44,7 +44,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

@@ -191,8 +191,8 @@ public class ChangeEventEditPart extends ShapeNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "ChangeEvent";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -4855,15 +4855,15 @@ public class ChangeEventEditPart extends ShapeNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ChangeEvent", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ChangeEvent", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ChangeEvent", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ChangeEvent", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ChangeEvent", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ChangeEvent", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("ChangeEvent", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("ChangeEvent", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeEditPart.java
index d7f5385aacd..e478e6169ea 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeEditPart.java
@@ -45,7 +45,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

@@ -251,8 +251,8 @@ public class ClassCompositeEditPart extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Class";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5081,15 +5081,15 @@ public class ClassCompositeEditPart extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Class", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Class", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Class", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Class", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Class", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Class", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Class", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Class", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeEditPartCN.java
index be903b8c472..96d3ebc04a0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeEditPartCN.java
@@ -45,7 +45,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

@@ -251,8 +251,8 @@ public class ClassCompositeEditPartCN extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Class";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5081,15 +5081,15 @@ public class ClassCompositeEditPartCN extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Class", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Class", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Class", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Class", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Class", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Class", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Class", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Class", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeEditPart.java
index f7be26c907c..6093ab3a71d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeEditPart.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -216,8 +216,8 @@ public class CollaborationCompositeEditPart extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Collaboration";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5046,15 +5046,15 @@ public class CollaborationCompositeEditPart extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Collaboration", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Collaboration", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Collaboration", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Collaboration", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Collaboration", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Collaboration", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Collaboration", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Collaboration", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeEditPartCN.java
index 6ea24c01e9b..33abd16bd57 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeEditPartCN.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -216,8 +216,8 @@ public class CollaborationCompositeEditPartCN extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Collaboration";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5046,15 +5046,15 @@ public class CollaborationCompositeEditPartCN extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Collaboration", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Collaboration", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Collaboration", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Collaboration", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Collaboration", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Collaboration", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Collaboration", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Collaboration", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationRoleEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationRoleEditPartCN.java
index 566c482454f..7bb427f5f7b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationRoleEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationRoleEditPartCN.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -200,8 +200,8 @@ public class CollaborationRoleEditPartCN extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "CollaborationRole";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -4802,15 +4802,15 @@ public class CollaborationRoleEditPartCN extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("CollaborationRole", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("CollaborationRole", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("CollaborationRole", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("CollaborationRole", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("CollaborationRole", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("CollaborationRole", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("CollaborationRole", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("CollaborationRole", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationUseEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationUseEditPartCN.java
index 87a3e318bf6..c061806f2bf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationUseEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationUseEditPartCN.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -199,8 +199,8 @@ public class CollaborationUseEditPartCN extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "CollaborationUse";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -4801,15 +4801,15 @@ public class CollaborationUseEditPartCN extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("CollaborationUse", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("CollaborationUse", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("CollaborationUse", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("CollaborationUse", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("CollaborationUse", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("CollaborationUse", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("CollaborationUse", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("CollaborationUse", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentEditPart.java
index eac607582b4..8ff5f8710bc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentEditPart.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -194,8 +194,8 @@ public class CommentEditPart extends AbstractCommentEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Comment";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -676,15 +676,15 @@ public class CommentEditPart extends AbstractCommentEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentEditPartCN.java
index 9ea6599227c..40d1b78072f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentEditPartCN.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -194,8 +194,8 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Comment";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -676,15 +676,15 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeEditPart.java
index 99034063aad..9d67371b05a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeEditPart.java
@@ -45,7 +45,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

@@ -251,8 +251,8 @@ public class ComponentCompositeEditPart extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Component";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5081,15 +5081,15 @@ public class ComponentCompositeEditPart extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Component", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Component", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Component", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Component", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeEditPartCN.java
index 7436838ff4e..80c912df05b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeEditPartCN.java
@@ -45,7 +45,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

@@ -251,8 +251,8 @@ public class ComponentCompositeEditPartCN extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Component";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5081,15 +5081,15 @@ public class ComponentCompositeEditPartCN extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Component", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Component", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Component", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Component", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintEditPart.java
index cd8f02765d6..cd52aa507fa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintEditPart.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -201,8 +201,8 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Constraint";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5133,15 +5133,15 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintEditPartCN.java
index 77033d63e45..9384554c24e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintEditPartCN.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -201,8 +201,8 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Constraint";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5133,15 +5133,15 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeEditPart.java
index 5bf99024c29..749c98277fd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeEditPart.java
@@ -43,7 +43,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -232,8 +232,8 @@ public class DataTypeEditPart extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "DataType";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5079,15 +5079,15 @@ public class DataTypeEditPart extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DataType", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DataType", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DataType", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DataType", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DataType", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DataType", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("DataType", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("DataType", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeEditPartCN.java
index 40ec8acb2aa..a58ed488293 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeEditPartCN.java
@@ -43,7 +43,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -232,8 +232,8 @@ public class DataTypeEditPartCN extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "DataType";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5079,15 +5079,15 @@ public class DataTypeEditPartCN extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DataType", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DataType", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DataType", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DataType", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DataType", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DataType", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("DataType", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("DataType", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationEditPart.java
index 74ef6897f27..297291dc6b1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationEditPart.java
@@ -44,7 +44,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

@@ -191,8 +191,8 @@ public class DeploymentSpecificationEditPart extends ShapeNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "DeploymentSpecification";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5083,15 +5083,15 @@ public class DeploymentSpecificationEditPart extends ShapeNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DeploymentSpecification", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DeploymentSpecification", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DeploymentSpecification", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DeploymentSpecification", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DeploymentSpecification", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DeploymentSpecification", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("DeploymentSpecification", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("DeploymentSpecification", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationEditPartCN.java
index 82b6601c2d2..5b93bce2aae 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationEditPartCN.java
@@ -44,7 +44,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

@@ -191,8 +191,8 @@ public class DeploymentSpecificationEditPartCN extends ShapeNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "DeploymentSpecification";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5083,15 +5083,15 @@ public class DeploymentSpecificationEditPartCN extends ShapeNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DeploymentSpecification", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DeploymentSpecification", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DeploymentSpecification", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DeploymentSpecification", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DeploymentSpecification", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DeploymentSpecification", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("DeploymentSpecification", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("DeploymentSpecification", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeEditPart.java
index 3c64703c860..3f8dac0e51e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeEditPart.java
@@ -45,7 +45,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

@@ -249,8 +249,8 @@ public class DeviceCompositeEditPart extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Device";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5079,15 +5079,15 @@ public class DeviceCompositeEditPart extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Device", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Device", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Device", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Device", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Device", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Device", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Device", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Device", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeEditPartCN.java
index f45f4d03fb5..9825d2e20f7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeEditPartCN.java
@@ -45,7 +45,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

@@ -249,8 +249,8 @@ public class DeviceCompositeEditPartCN extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Device";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5079,15 +5079,15 @@ public class DeviceCompositeEditPartCN extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Device", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Device", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Device", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Device", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Device", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Device", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Device", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Device", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintEditPart.java
index 05e252e85a1..cb0d0bd359e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintEditPart.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -201,8 +201,8 @@ public class DurationConstraintEditPart extends AbstractConstraintEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "DurationConstraint";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5133,15 +5133,15 @@ public class DurationConstraintEditPart extends AbstractConstraintEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DurationConstraint", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DurationConstraint", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DurationConstraint", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DurationConstraint", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DurationConstraint", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DurationConstraint", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("DurationConstraint", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("DurationConstraint", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintEditPartCN.java
index b3a4c6bda5d..4295e7bc2d5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintEditPartCN.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -201,8 +201,8 @@ public class DurationConstraintEditPartCN extends AbstractConstraintEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "DurationConstraint";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5133,15 +5133,15 @@ public class DurationConstraintEditPartCN extends AbstractConstraintEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DurationConstraint", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DurationConstraint", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DurationConstraint", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DurationConstraint", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DurationConstraint", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DurationConstraint", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("DurationConstraint", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("DurationConstraint", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationEditPart.java
index 6c3ef38f06c..1b9b316a7af 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationEditPart.java
@@ -44,7 +44,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

@@ -191,8 +191,8 @@ public class DurationEditPart extends ShapeNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Duration";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -4855,15 +4855,15 @@ public class DurationEditPart extends ShapeNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Duration", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Duration", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Duration", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Duration", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Duration", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Duration", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Duration", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Duration", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationIntervalEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationIntervalEditPart.java
index 47bc6f07646..95bc5bb89eb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationIntervalEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationIntervalEditPart.java
@@ -44,7 +44,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

@@ -191,8 +191,8 @@ public class DurationIntervalEditPart extends ShapeNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "DurationInterval";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -4855,15 +4855,15 @@ public class DurationIntervalEditPart extends ShapeNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DurationInterval", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DurationInterval", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DurationInterval", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DurationInterval", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DurationInterval", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DurationInterval", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("DurationInterval", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("DurationInterval", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationEditPart.java
index 9f691da164e..92fcb29a9c0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationEditPart.java
@@ -47,7 +47,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

@@ -202,8 +202,8 @@ public class DurationObservationEditPart extends AbstractObservationEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "DurationObservation";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5121,15 +5121,15 @@ public class DurationObservationEditPart extends AbstractObservationEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DurationObservation", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DurationObservation", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DurationObservation", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DurationObservation", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DurationObservation", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DurationObservation", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("DurationObservation", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("DurationObservation", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEditPart.java
index e4d076d2051..bac5e92bd43 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEditPart.java
@@ -44,7 +44,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -220,8 +220,8 @@ public class EnumerationEditPart extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Enumeration";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5064,15 +5064,15 @@ public class EnumerationEditPart extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Enumeration", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Enumeration", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Enumeration", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Enumeration", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Enumeration", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Enumeration", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Enumeration", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Enumeration", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEditPartCN.java
index b87b4d70fda..d30462d9c40 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEditPartCN.java
@@ -44,7 +44,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -220,8 +220,8 @@ public class EnumerationEditPartCN extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Enumeration";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5064,15 +5064,15 @@ public class EnumerationEditPartCN extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Enumeration", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Enumeration", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Enumeration", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Enumeration", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Enumeration", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Enumeration", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Enumeration", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Enumeration", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPart.java
index e08b40a37a5..5ad0b286fe5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPart.java
@@ -45,7 +45,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

@@ -249,8 +249,8 @@ public class ExecutionEnvironmentCompositeEditPart extends NamedElementEditPart
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "ExecutionEnvironment";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5079,15 +5079,15 @@ public class ExecutionEnvironmentCompositeEditPart extends NamedElementEditPart
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ExecutionEnvironment", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ExecutionEnvironment", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ExecutionEnvironment", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ExecutionEnvironment", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ExecutionEnvironment", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ExecutionEnvironment", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("ExecutionEnvironment", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("ExecutionEnvironment", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPartCN.java
index efc0adeea05..b6d2f908ba0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPartCN.java
@@ -45,7 +45,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

@@ -249,8 +249,8 @@ public class ExecutionEnvironmentCompositeEditPartCN extends NamedElementEditPar
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "ExecutionEnvironment";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5079,15 +5079,15 @@ public class ExecutionEnvironmentCompositeEditPartCN extends NamedElementEditPar
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ExecutionEnvironment", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ExecutionEnvironment", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ExecutionEnvironment", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ExecutionEnvironment", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ExecutionEnvironment", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ExecutionEnvironment", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("ExecutionEnvironment", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("ExecutionEnvironment", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExpressionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExpressionEditPart.java
index e433cdef6b0..bf57eacc61e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExpressionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExpressionEditPart.java
@@ -44,7 +44,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

@@ -191,8 +191,8 @@ public class ExpressionEditPart extends ShapeNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Expression";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -4855,15 +4855,15 @@ public class ExpressionEditPart extends ShapeNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Expression", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Expression", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Expression", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Expression", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Expression", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Expression", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Expression", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Expression", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPart.java
index 1df31035583..964120b1a4c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPart.java
@@ -45,7 +45,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

@@ -260,8 +260,8 @@ public class FunctionBehaviorCompositeEditPart extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "FunctionBehavior";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5090,15 +5090,15 @@ public class FunctionBehaviorCompositeEditPart extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("FunctionBehavior", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("FunctionBehavior", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("FunctionBehavior", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("FunctionBehavior", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("FunctionBehavior", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("FunctionBehavior", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("FunctionBehavior", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("FunctionBehavior", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPartCN.java
index 302483bee24..f4d674ea3f3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPartCN.java
@@ -45,7 +45,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

@@ -260,8 +260,8 @@ public class FunctionBehaviorCompositeEditPartCN extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "FunctionBehavior";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5090,15 +5090,15 @@ public class FunctionBehaviorCompositeEditPartCN extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("FunctionBehavior", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("FunctionBehavior", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("FunctionBehavior", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("FunctionBehavior", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("FunctionBehavior", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("FunctionBehavior", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("FunctionBehavior", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("FunctionBehavior", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemEditPart.java
index 36cb04988c0..cd596b230c3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemEditPart.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -198,8 +198,8 @@ public class InformationItemEditPart extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "InformationItem";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5206,15 +5206,15 @@ public class InformationItemEditPart extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InformationItem", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InformationItem", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InformationItem", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InformationItem", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InformationItem", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InformationItem", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("InformationItem", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("InformationItem", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemEditPartCN.java
index 5611bab8015..aa3d5587d85 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemEditPartCN.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -198,8 +198,8 @@ public class InformationItemEditPartCN extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "InformationItem";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5206,15 +5206,15 @@ public class InformationItemEditPartCN extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InformationItem", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InformationItem", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InformationItem", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InformationItem", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InformationItem", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InformationItem", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("InformationItem", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("InformationItem", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InstanceValueEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InstanceValueEditPart.java
index 04dd14700b1..9267b376a06 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InstanceValueEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InstanceValueEditPart.java
@@ -44,7 +44,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

@@ -191,8 +191,8 @@ public class InstanceValueEditPart extends ShapeNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "InstanceValue";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -4855,15 +4855,15 @@ public class InstanceValueEditPart extends ShapeNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InstanceValue", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InstanceValue", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InstanceValue", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InstanceValue", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InstanceValue", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InstanceValue", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("InstanceValue", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("InstanceValue", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeEditPart.java
index 9087b66b46d..aadf9748cf8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeEditPart.java
@@ -45,7 +45,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

@@ -260,8 +260,8 @@ public class InteractionCompositeEditPart extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Interaction";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5090,15 +5090,15 @@ public class InteractionCompositeEditPart extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Interaction", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Interaction", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Interaction", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Interaction", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Interaction", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Interaction", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Interaction", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Interaction", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeEditPartCN.java
index 7d3b6191447..1224f261ba3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeEditPartCN.java
@@ -45,7 +45,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

@@ -260,8 +260,8 @@ public class InteractionCompositeEditPartCN extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Interaction";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5090,15 +5090,15 @@ public class InteractionCompositeEditPartCN extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Interaction", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Interaction", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Interaction", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Interaction", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Interaction", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Interaction", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Interaction", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Interaction", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintEditPart.java
index 66cd85a3cf1..3ad24074e5b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintEditPart.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -201,8 +201,8 @@ public class InteractionConstraintEditPart extends AbstractConstraintEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "InteractionConstraint";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5133,15 +5133,15 @@ public class InteractionConstraintEditPart extends AbstractConstraintEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InteractionConstraint", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InteractionConstraint", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InteractionConstraint", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InteractionConstraint", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InteractionConstraint", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InteractionConstraint", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("InteractionConstraint", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("InteractionConstraint", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintEditPartCN.java
index 15da562fcf5..6810a733b45 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintEditPartCN.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -201,8 +201,8 @@ public class InteractionConstraintEditPartCN extends AbstractConstraintEditPart
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "InteractionConstraint";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5133,15 +5133,15 @@ public class InteractionConstraintEditPartCN extends AbstractConstraintEditPart
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InteractionConstraint", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InteractionConstraint", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InteractionConstraint", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InteractionConstraint", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InteractionConstraint", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InteractionConstraint", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("InteractionConstraint", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("InteractionConstraint", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceEditPart.java
index 6f19b82bd9d..2868f37f833 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceEditPart.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -200,8 +200,8 @@ public class InterfaceEditPart extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Interface";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5030,15 +5030,15 @@ public class InterfaceEditPart extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Interface", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Interface", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Interface", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Interface", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Interface", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Interface", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Interface", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Interface", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceEditPartCN.java
index e7c4c722393..4ea41b1e52d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceEditPartCN.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -200,8 +200,8 @@ public class InterfaceEditPartCN extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Interface";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5030,15 +5030,15 @@ public class InterfaceEditPartCN extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Interface", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Interface", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Interface", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Interface", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Interface", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Interface", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Interface", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Interface", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintEditPart.java
index 5e6ef03027c..fa0012a14bc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintEditPart.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -201,8 +201,8 @@ public class IntervalConstraintEditPart extends AbstractConstraintEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "IntervalConstraint";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5133,15 +5133,15 @@ public class IntervalConstraintEditPart extends AbstractConstraintEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("IntervalConstraint", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("IntervalConstraint", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("IntervalConstraint", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("IntervalConstraint", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("IntervalConstraint", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("IntervalConstraint", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("IntervalConstraint", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("IntervalConstraint", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintEditPartCN.java
index 7c4591b9aac..e4155a33f93 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintEditPartCN.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -201,8 +201,8 @@ public class IntervalConstraintEditPartCN extends AbstractConstraintEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "IntervalConstraint";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5133,15 +5133,15 @@ public class IntervalConstraintEditPartCN extends AbstractConstraintEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("IntervalConstraint", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("IntervalConstraint", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("IntervalConstraint", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("IntervalConstraint", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("IntervalConstraint", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("IntervalConstraint", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("IntervalConstraint", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("IntervalConstraint", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalEditPart.java
index 475bd8774d9..ca28c350152 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalEditPart.java
@@ -44,7 +44,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

@@ -191,8 +191,8 @@ public class IntervalEditPart extends ShapeNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Interval";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -4855,15 +4855,15 @@ public class IntervalEditPart extends ShapeNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Interval", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Interval", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Interval", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Interval", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Interval", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Interval", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Interval", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Interval", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralBooleanEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralBooleanEditPart.java
index 01012ffe250..aafc7f7fe38 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralBooleanEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralBooleanEditPart.java
@@ -44,7 +44,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

@@ -191,8 +191,8 @@ public class LiteralBooleanEditPart extends ShapeNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "LiteralBoolean";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -4855,15 +4855,15 @@ public class LiteralBooleanEditPart extends ShapeNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("LiteralBoolean", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("LiteralBoolean", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("LiteralBoolean", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("LiteralBoolean", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("LiteralBoolean", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("LiteralBoolean", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("LiteralBoolean", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("LiteralBoolean", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralIntegerEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralIntegerEditPart.java
index 084d5e825f7..062a5cd4b85 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralIntegerEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralIntegerEditPart.java
@@ -44,7 +44,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

@@ -191,8 +191,8 @@ public class LiteralIntegerEditPart extends ShapeNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "LiteralInteger";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -4855,15 +4855,15 @@ public class LiteralIntegerEditPart extends ShapeNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("LiteralInteger", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("LiteralInteger", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("LiteralInteger", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("LiteralInteger", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("LiteralInteger", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("LiteralInteger", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("LiteralInteger", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("LiteralInteger", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralNullEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralNullEditPart.java
index 855008eedfa..87c56ebc3b9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralNullEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralNullEditPart.java
@@ -44,7 +44,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

@@ -191,8 +191,8 @@ public class LiteralNullEditPart extends ShapeNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "LiteralNull";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -4855,15 +4855,15 @@ public class LiteralNullEditPart extends ShapeNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("LiteralNull", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("LiteralNull", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("LiteralNull", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("LiteralNull", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("LiteralNull", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("LiteralNull", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("LiteralNull", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("LiteralNull", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralStringEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralStringEditPart.java
index 04386dcb597..8aeacf5c1de 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralStringEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralStringEditPart.java
@@ -44,7 +44,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

@@ -191,8 +191,8 @@ public class LiteralStringEditPart extends ShapeNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "LiteralString";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -4855,15 +4855,15 @@ public class LiteralStringEditPart extends ShapeNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("LiteralString", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("LiteralString", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("LiteralString", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("LiteralString", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("LiteralString", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("LiteralString", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("LiteralString", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("LiteralString", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralUnlimitedNaturalEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralUnlimitedNaturalEditPart.java
index 4a89df62587..fdd7c66cbcf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralUnlimitedNaturalEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralUnlimitedNaturalEditPart.java
@@ -44,7 +44,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

@@ -191,8 +191,8 @@ public class LiteralUnlimitedNaturalEditPart extends ShapeNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "LiteralUnlimitedNatural";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -4855,15 +4855,15 @@ public class LiteralUnlimitedNaturalEditPart extends ShapeNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("LiteralUnlimitedNatural", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("LiteralUnlimitedNatural", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("LiteralUnlimitedNatural", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("LiteralUnlimitedNatural", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("LiteralUnlimitedNatural", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("LiteralUnlimitedNatural", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("LiteralUnlimitedNatural", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("LiteralUnlimitedNatural", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeEditPart.java
index 2713f967ee6..4aa423f7661 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeEditPart.java
@@ -45,7 +45,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

@@ -251,8 +251,8 @@ public class NodeCompositeEditPart extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Node";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5081,15 +5081,15 @@ public class NodeCompositeEditPart extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Node", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Node", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Node", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Node", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Node", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Node", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Node", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Node", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeEditPartCN.java
index c00ce836dec..7acfe018bca 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeEditPartCN.java
@@ -45,7 +45,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

@@ -251,8 +251,8 @@ public class NodeCompositeEditPartCN extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Node";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5081,15 +5081,15 @@ public class NodeCompositeEditPartCN extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Node", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Node", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Node", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Node", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Node", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Node", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Node", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Node", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPart.java
index bc1f3bdd50f..47860018dd4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPart.java
@@ -45,7 +45,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

@@ -260,8 +260,8 @@ public class OpaqueBehaviorCompositeEditPart extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "OpaqueBehavior";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5090,15 +5090,15 @@ public class OpaqueBehaviorCompositeEditPart extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OpaqueBehavior", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OpaqueBehavior", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OpaqueBehavior", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OpaqueBehavior", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OpaqueBehavior", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OpaqueBehavior", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("OpaqueBehavior", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("OpaqueBehavior", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPartCN.java
index 98245324862..e68dde93d3b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPartCN.java
@@ -45,7 +45,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

@@ -260,8 +260,8 @@ public class OpaqueBehaviorCompositeEditPartCN extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "OpaqueBehavior";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5090,15 +5090,15 @@ public class OpaqueBehaviorCompositeEditPartCN extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OpaqueBehavior", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OpaqueBehavior", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OpaqueBehavior", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OpaqueBehavior", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OpaqueBehavior", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OpaqueBehavior", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("OpaqueBehavior", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("OpaqueBehavior", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueExpressionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueExpressionEditPart.java
index b9564fad772..7907d20ebdc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueExpressionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueExpressionEditPart.java
@@ -44,7 +44,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

@@ -191,8 +191,8 @@ public class OpaqueExpressionEditPart extends ShapeNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "OpaqueExpression";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -4855,15 +4855,15 @@ public class OpaqueExpressionEditPart extends ShapeNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OpaqueExpression", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OpaqueExpression", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OpaqueExpression", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OpaqueExpression", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OpaqueExpression", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OpaqueExpression", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("OpaqueExpression", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("OpaqueExpression", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterEditPart.java
index 2f78167eab6..53712db17a4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterEditPart.java
@@ -47,7 +47,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractBorderEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

@@ -204,8 +204,8 @@ public class ParameterEditPart extends AbstractBorderEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Parameter";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -4803,15 +4803,15 @@ public class ParameterEditPart extends AbstractBorderEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Parameter", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Parameter", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Parameter", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Parameter", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Parameter", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Parameter", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Parameter", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Parameter", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortEditPart.java
index 0cb64a87a56..57f4ffd62a4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortEditPart.java
@@ -47,7 +47,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractBorderEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

@@ -206,8 +206,8 @@ public class PortEditPart extends AbstractBorderEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Port";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -4805,15 +4805,15 @@ public class PortEditPart extends AbstractBorderEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Port", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Port", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Port", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Port", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Port", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Port", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Port", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Port", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeEditPart.java
index a545a743a7d..d0fa6c8c18a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeEditPart.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -200,8 +200,8 @@ public class PrimitiveTypeEditPart extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "PrimitiveType";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5030,15 +5030,15 @@ public class PrimitiveTypeEditPart extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("PrimitiveType", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("PrimitiveType", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("PrimitiveType", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("PrimitiveType", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("PrimitiveType", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("PrimitiveType", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("PrimitiveType", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("PrimitiveType", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeEditPartCN.java
index 95dd166f09b..d58c420a900 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeEditPartCN.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -200,8 +200,8 @@ public class PrimitiveTypeEditPartCN extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "PrimitiveType";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5030,15 +5030,15 @@ public class PrimitiveTypeEditPartCN extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("PrimitiveType", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("PrimitiveType", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("PrimitiveType", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("PrimitiveType", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("PrimitiveType", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("PrimitiveType", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("PrimitiveType", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("PrimitiveType", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartEditPartCN.java
index 02c2623977d..17c001c3d1b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartEditPartCN.java
@@ -45,7 +45,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -252,8 +252,8 @@ public class PropertyPartEditPartCN extends org.eclipse.papyrus.uml.diagram.comp
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Property";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -4854,15 +4854,15 @@ public class PropertyPartEditPartCN extends org.eclipse.papyrus.uml.diagram.comp
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Property", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Property", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Property", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Property", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Property", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Property", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Property", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Property", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPart.java
index f71f6cb3a75..f06cfd2b3a8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPart.java
@@ -45,7 +45,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

@@ -260,8 +260,8 @@ public class ProtocolStateMachineCompositeEditPart extends NamedElementEditPart
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "ProtocolStateMachine";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5090,15 +5090,15 @@ public class ProtocolStateMachineCompositeEditPart extends NamedElementEditPart
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ProtocolStateMachine", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ProtocolStateMachine", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ProtocolStateMachine", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ProtocolStateMachine", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ProtocolStateMachine", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ProtocolStateMachine", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("ProtocolStateMachine", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("ProtocolStateMachine", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPartCN.java
index 32cf4a1a16f..b6147c03b95 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPartCN.java
@@ -45,7 +45,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

@@ -260,8 +260,8 @@ public class ProtocolStateMachineCompositeEditPartCN extends NamedElementEditPar
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "ProtocolStateMachine";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5090,15 +5090,15 @@ public class ProtocolStateMachineCompositeEditPartCN extends NamedElementEditPar
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ProtocolStateMachine", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ProtocolStateMachine", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ProtocolStateMachine", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ProtocolStateMachine", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ProtocolStateMachine", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ProtocolStateMachine", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("ProtocolStateMachine", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("ProtocolStateMachine", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEditPart.java
index 554ec3019ba..1ea32b5f3f0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEditPart.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -196,8 +196,8 @@ public class SignalEditPart extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Signal";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5026,15 +5026,15 @@ public class SignalEditPart extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Signal", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Signal", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Signal", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Signal", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Signal", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Signal", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Signal", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Signal", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEditPartCN.java
index 70e97ee2ddf..f05a5885320 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEditPartCN.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -196,8 +196,8 @@ public class SignalEditPartCN extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Signal";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5026,15 +5026,15 @@ public class SignalEditPartCN extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Signal", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Signal", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Signal", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Signal", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Signal", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Signal", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Signal", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Signal", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEventEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEventEditPart.java
index aa93d3d840f..d7e6623d5a0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEventEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEventEditPart.java
@@ -44,7 +44,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

@@ -191,8 +191,8 @@ public class SignalEventEditPart extends ShapeNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "SignalEvent";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -4855,15 +4855,15 @@ public class SignalEventEditPart extends ShapeNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("SignalEvent", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("SignalEvent", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("SignalEvent", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("SignalEvent", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("SignalEvent", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("SignalEvent", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("SignalEvent", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("SignalEvent", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeEditPart.java
index f908944684b..50805cbdf43 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeEditPart.java
@@ -45,7 +45,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

@@ -260,8 +260,8 @@ public class StateMachineCompositeEditPart extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "StateMachine";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5090,15 +5090,15 @@ public class StateMachineCompositeEditPart extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("StateMachine", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("StateMachine", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("StateMachine", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("StateMachine", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("StateMachine", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("StateMachine", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("StateMachine", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("StateMachine", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeEditPartCN.java
index 5e4e71e625f..f54b41023e8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeEditPartCN.java
@@ -45,7 +45,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

@@ -260,8 +260,8 @@ public class StateMachineCompositeEditPartCN extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "StateMachine";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5090,15 +5090,15 @@ public class StateMachineCompositeEditPartCN extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("StateMachine", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("StateMachine", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("StateMachine", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("StateMachine", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("StateMachine", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("StateMachine", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("StateMachine", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("StateMachine", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StringExpressionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StringExpressionEditPart.java
index 6730d1016a4..f228ba2d945 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StringExpressionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StringExpressionEditPart.java
@@ -44,7 +44,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

@@ -191,8 +191,8 @@ public class StringExpressionEditPart extends ShapeNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "StringExpression";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -4855,15 +4855,15 @@ public class StringExpressionEditPart extends ShapeNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("StringExpression", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("StringExpression", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("StringExpression", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("StringExpression", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("StringExpression", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("StringExpression", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("StringExpression", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("StringExpression", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintEditPart.java
index 61d1deffe2d..2b1994ae5f2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintEditPart.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -201,8 +201,8 @@ public class TimeConstraintEditPart extends AbstractConstraintEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "TimeConstraint";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5133,15 +5133,15 @@ public class TimeConstraintEditPart extends AbstractConstraintEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("TimeConstraint", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("TimeConstraint", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("TimeConstraint", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("TimeConstraint", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("TimeConstraint", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("TimeConstraint", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("TimeConstraint", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("TimeConstraint", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintEditPartCN.java
index 0d074ac47df..f6a9269672e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintEditPartCN.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -201,8 +201,8 @@ public class TimeConstraintEditPartCN extends AbstractConstraintEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "TimeConstraint";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5133,15 +5133,15 @@ public class TimeConstraintEditPartCN extends AbstractConstraintEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("TimeConstraint", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("TimeConstraint", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("TimeConstraint", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("TimeConstraint", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("TimeConstraint", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("TimeConstraint", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("TimeConstraint", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("TimeConstraint", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeEventEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeEventEditPart.java
index 1c9bebeab05..3bfd0fdd2cd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeEventEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeEventEditPart.java
@@ -44,7 +44,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

@@ -191,8 +191,8 @@ public class TimeEventEditPart extends ShapeNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "TimeEvent";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -4855,15 +4855,15 @@ public class TimeEventEditPart extends ShapeNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("TimeEvent", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("TimeEvent", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("TimeEvent", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("TimeEvent", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("TimeEvent", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("TimeEvent", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("TimeEvent", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("TimeEvent", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeExpressionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeExpressionEditPart.java
index 42ceeb08a11..d2e7b4dbc80 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeExpressionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeExpressionEditPart.java
@@ -44,7 +44,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

@@ -191,8 +191,8 @@ public class TimeExpressionEditPart extends ShapeNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "TimeExpression";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -4855,15 +4855,15 @@ public class TimeExpressionEditPart extends ShapeNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("TimeExpression", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("TimeExpression", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("TimeExpression", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("TimeExpression", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("TimeExpression", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("TimeExpression", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("TimeExpression", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("TimeExpression", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeIntervalEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeIntervalEditPart.java
index 52c3e84180b..7601c0c3621 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeIntervalEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeIntervalEditPart.java
@@ -44,7 +44,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

@@ -191,8 +191,8 @@ public class TimeIntervalEditPart extends ShapeNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "TimeInterval";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -4855,15 +4855,15 @@ public class TimeIntervalEditPart extends ShapeNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("TimeInterval", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("TimeInterval", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("TimeInterval", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("TimeInterval", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("TimeInterval", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("TimeInterval", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("TimeInterval", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("TimeInterval", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationEditPart.java
index f81f1c7ea98..1a2bc1f411e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationEditPart.java
@@ -47,7 +47,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

@@ -202,8 +202,8 @@ public class TimeObservationEditPart extends AbstractObservationEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "TimeObservation";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5121,15 +5121,15 @@ public class TimeObservationEditPart extends AbstractObservationEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("TimeObservation", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("TimeObservation", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("TimeObservation", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("TimeObservation", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("TimeObservation", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("TimeObservation", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("TimeObservation", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("TimeObservation", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseEditPart.java
index 497addf20b1..27774742999 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseEditPart.java
@@ -44,7 +44,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

@@ -193,8 +193,8 @@ public class UseCaseEditPart extends ShapeNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "UseCase";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5085,15 +5085,15 @@ public class UseCaseEditPart extends ShapeNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("UseCase", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("UseCase", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("UseCase", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("UseCase", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("UseCase", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("UseCase", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("UseCase", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("UseCase", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseEditPartCN.java
index 15aa3d43740..38eaf81f6ac 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseEditPartCN.java
@@ -44,7 +44,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

@@ -193,8 +193,8 @@ public class UseCaseEditPartCN extends ShapeNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "UseCase";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -5085,15 +5085,15 @@ public class UseCaseEditPartCN extends ShapeNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("UseCase", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("UseCase", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("UseCase", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("UseCase", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("UseCase", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("UseCase", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("UseCase", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("UseCase", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/AbstractionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/AbstractionPreferencePage.java
index af2d9eaa2ca..30c7bf2b640 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/AbstractionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/AbstractionPreferencePage.java
@@ -5,7 +5,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

@@ -38,7 +38,7 @@ public class AbstractionPreferencePage extends AbstractPapyrusLinkPreferencePage
 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_Abstraction";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ActivityPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ActivityPreferencePage.java
index dcb638ced53..7179c559ad8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ActivityPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ActivityPreferencePage.java
@@ -5,7 +5,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -40,26 +40,26 @@ public class ActivityPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_Activity";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ActorPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ActorPreferencePage.java
index f0d8f69c1ff..142caf3a674 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ActorPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ActorPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.composite.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class ActorPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_Actor";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/AnyReceiveEventPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/AnyReceiveEventPreferencePage.java
index a0bcf67bf27..cd6c070136f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/AnyReceiveEventPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/AnyReceiveEventPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.composite.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class AnyReceiveEventPreferencePage extends AbstractPapyrusNodePreference
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_AnyReceiveEvent";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ArtifactPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ArtifactPreferencePage.java
index 300004548ec..a4e565dd9fd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ArtifactPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ArtifactPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.composite.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class ArtifactPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_Artifact";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/CallEventPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/CallEventPreferencePage.java
index d77309ba0ef..495d39f702b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/CallEventPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/CallEventPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.composite.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class CallEventPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_CallEvent";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ChangeEventPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ChangeEventPreferencePage.java
index bb649096b8e..b3aa9c578fe 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ChangeEventPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ChangeEventPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.composite.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class ChangeEventPreferencePage extends AbstractPapyrusNodePreferencePage
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_ChangeEvent";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ClassPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ClassPreferencePage.java
index 00461bac10e..f1161b59602 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ClassPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ClassPreferencePage.java
@@ -5,7 +5,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -40,26 +40,26 @@ public class ClassPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_Class";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/CollaborationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/CollaborationPreferencePage.java
index eb9296c5d0c..e88b446b526 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/CollaborationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/CollaborationPreferencePage.java
@@ -5,7 +5,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -40,26 +40,26 @@ public class CollaborationPreferencePage extends AbstractPapyrusNodePreferencePa
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_Collaboration";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/CollaborationRolePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/CollaborationRolePreferencePage.java
index de34d6c4171..df426fc5068 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/CollaborationRolePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/CollaborationRolePreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.composite.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class CollaborationRolePreferencePage extends AbstractPapyrusNodePreferen
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_CollaborationRole";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/CollaborationUsePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/CollaborationUsePreferencePage.java
index fbddc9f3e77..4c380b6b3c6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/CollaborationUsePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/CollaborationUsePreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.composite.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class CollaborationUsePreferencePage extends AbstractPapyrusNodePreferenc
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_CollaborationUse";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/CommentPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/CommentPreferencePage.java
index bdbc2c9d0be..cbe77a8f6f0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/CommentPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/CommentPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.composite.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class CommentPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_Comment";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ComponentPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ComponentPreferencePage.java
index 4350e736c62..1691df6e696 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ComponentPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ComponentPreferencePage.java
@@ -5,7 +5,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -40,26 +40,26 @@ public class ComponentPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_Component";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ComponentRealizationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ComponentRealizationPreferencePage.java
index 723094a05b2..0d5834dcb70 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ComponentRealizationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ComponentRealizationPreferencePage.java
@@ -5,7 +5,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

@@ -38,7 +38,7 @@ public class ComponentRealizationPreferencePage extends AbstractPapyrusLinkPrefe
 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_ComponentRealization";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ConnectorPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ConnectorPreferencePage.java
index 49a40c841da..2e41642f229 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ConnectorPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ConnectorPreferencePage.java
@@ -5,7 +5,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

@@ -38,7 +38,7 @@ public class ConnectorPreferencePage extends AbstractPapyrusLinkPreferencePage {
 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_Connector";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ConstraintPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ConstraintPreferencePage.java
index 71849ce372c..3d259d06484 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ConstraintPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ConstraintPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.composite.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class ConstraintPreferencePage extends AbstractPapyrusNodePreferencePage
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_Constraint";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/CreationEventPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/CreationEventPreferencePage.java
index f51b4986bfa..71252a4f517 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/CreationEventPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/CreationEventPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.composite.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class CreationEventPreferencePage extends AbstractPapyrusNodePreferencePa
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_CreationEvent";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DataTypePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DataTypePreferencePage.java
index f6acbd6d602..f65689971a3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DataTypePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DataTypePreferencePage.java
@@ -5,7 +5,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -40,26 +40,26 @@ public class DataTypePreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_DataType";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DependencyPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DependencyPreferencePage.java
index 330b911f1d6..56e8fe7a0ac 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DependencyPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DependencyPreferencePage.java
@@ -5,7 +5,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

@@ -38,7 +38,7 @@ public class DependencyPreferencePage extends AbstractPapyrusLinkPreferencePage
 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_Dependency";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DeploymentPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DeploymentPreferencePage.java
index e61d567bf01..89b85c3e031 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DeploymentPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DeploymentPreferencePage.java
@@ -5,7 +5,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

@@ -38,7 +38,7 @@ public class DeploymentPreferencePage extends AbstractPapyrusLinkPreferencePage
 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_Deployment";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DeploymentSpecificationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DeploymentSpecificationPreferencePage.java
index f8f16a09692..e88a4ec98df 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DeploymentSpecificationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DeploymentSpecificationPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.composite.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class DeploymentSpecificationPreferencePage extends AbstractPapyrusNodePr
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_DeploymentSpecification";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DestructionEventPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DestructionEventPreferencePage.java
index 25af856ee44..2539bb9d1fa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DestructionEventPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DestructionEventPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.composite.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class DestructionEventPreferencePage extends AbstractPapyrusNodePreferenc
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_DestructionEvent";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DevicePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DevicePreferencePage.java
index a1c7f1405e9..65f0fbe1962 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DevicePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DevicePreferencePage.java
@@ -5,7 +5,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -40,26 +40,26 @@ public class DevicePreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_Device";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DurationConstraintPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DurationConstraintPreferencePage.java
index da567984c0f..7237aa41e30 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DurationConstraintPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DurationConstraintPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.composite.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class DurationConstraintPreferencePage extends AbstractPapyrusNodePrefere
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_DurationConstraint";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DurationIntervalPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DurationIntervalPreferencePage.java
index 93b3d966e5c..11b5a675a5d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DurationIntervalPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DurationIntervalPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.composite.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class DurationIntervalPreferencePage extends AbstractPapyrusNodePreferenc
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_DurationInterval";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DurationObservationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DurationObservationPreferencePage.java
index b5dce473a6c..bf1c75f17e3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DurationObservationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DurationObservationPreferencePage.java
@@ -5,7 +5,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

@@ -36,21 +36,21 @@ public class DurationObservationPreferencePage extends AbstractPapyrusNodePrefer
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_DurationObservation";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DurationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DurationPreferencePage.java
index d4af281aa58..703fa6b9d69 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DurationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DurationPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.composite.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class DurationPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_Duration";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/EnumerationLiteralPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/EnumerationLiteralPreferencePage.java
index 9c5d80ff434..d7fa8348190 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/EnumerationLiteralPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/EnumerationLiteralPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.composite.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class EnumerationLiteralPreferencePage extends AbstractPapyrusNodePrefere
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_EnumerationLiteral";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/EnumerationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/EnumerationPreferencePage.java
index cffda7070ca..340bb115a2b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/EnumerationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/EnumerationPreferencePage.java
@@ -5,7 +5,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -40,26 +40,26 @@ public class EnumerationPreferencePage extends AbstractPapyrusNodePreferencePage
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_Enumeration";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ExecutionEnvironmentPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ExecutionEnvironmentPreferencePage.java
index b5dfc175577..5db20dbb0fd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ExecutionEnvironmentPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ExecutionEnvironmentPreferencePage.java
@@ -5,7 +5,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -40,26 +40,26 @@ public class ExecutionEnvironmentPreferencePage extends AbstractPapyrusNodePrefe
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_ExecutionEnvironment";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ExecutionEventPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ExecutionEventPreferencePage.java
index a9b197eed48..568dffa5312 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ExecutionEventPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ExecutionEventPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.composite.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class ExecutionEventPreferencePage extends AbstractPapyrusNodePreferenceP
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_ExecutionEvent";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ExpressionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ExpressionPreferencePage.java
index 62a80968318..ed9dd92321e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ExpressionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ExpressionPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.composite.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class ExpressionPreferencePage extends AbstractPapyrusNodePreferencePage
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_Expression";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/FunctionBehaviorPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/FunctionBehaviorPreferencePage.java
index 708ef4066fe..cb741c69ae4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/FunctionBehaviorPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/FunctionBehaviorPreferencePage.java
@@ -5,7 +5,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -40,26 +40,26 @@ public class FunctionBehaviorPreferencePage extends AbstractPapyrusNodePreferenc
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_FunctionBehavior";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/GeneralizationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/GeneralizationPreferencePage.java
index 3c105a9def7..15bccfb2745 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/GeneralizationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/GeneralizationPreferencePage.java
@@ -5,7 +5,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

@@ -38,7 +38,7 @@ public class GeneralizationPreferencePage extends AbstractPapyrusLinkPreferenceP
 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_Generalization";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/InformationFlowPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/InformationFlowPreferencePage.java
index 5dbbca0e49c..7d819c666fb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/InformationFlowPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/InformationFlowPreferencePage.java
@@ -5,7 +5,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

@@ -38,7 +38,7 @@ public class InformationFlowPreferencePage extends AbstractPapyrusLinkPreference
 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_InformationFlow";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/InformationItemPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/InformationItemPreferencePage.java
index a5275c6b20c..62a0a9eccfa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/InformationItemPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/InformationItemPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.composite.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class InformationItemPreferencePage extends AbstractPapyrusNodePreference
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_InformationItem";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 80);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 80);

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/InstanceValuePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/InstanceValuePreferencePage.java
index c47e8f1f478..42561d91f2f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/InstanceValuePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/InstanceValuePreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.composite.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class InstanceValuePreferencePage extends AbstractPapyrusNodePreferencePa
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_InstanceValue";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/InteractionConstraintPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/InteractionConstraintPreferencePage.java
index baa5875924a..ba58f25e394 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/InteractionConstraintPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/InteractionConstraintPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.composite.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class InteractionConstraintPreferencePage extends AbstractPapyrusNodePref
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_InteractionConstraint";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/InteractionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/InteractionPreferencePage.java
index 710c0a334b9..e9bf88342f3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/InteractionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/InteractionPreferencePage.java
@@ -5,7 +5,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -40,26 +40,26 @@ public class InteractionPreferencePage extends AbstractPapyrusNodePreferencePage
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_Interaction";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/InterfacePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/InterfacePreferencePage.java
index be41c83da8a..535b594c42d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/InterfacePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/InterfacePreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.composite.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class InterfacePreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_Interface";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/InterfaceRealizationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/InterfaceRealizationPreferencePage.java
index cdc77e0c1f4..f0c2c24fdeb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/InterfaceRealizationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/InterfaceRealizationPreferencePage.java
@@ -5,7 +5,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

@@ -38,7 +38,7 @@ public class InterfaceRealizationPreferencePage extends AbstractPapyrusLinkPrefe
 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_InterfaceRealization";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/IntervalConstraintPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/IntervalConstraintPreferencePage.java
index a2738cf7fb1..cb2320fd2a7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/IntervalConstraintPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/IntervalConstraintPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.composite.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class IntervalConstraintPreferencePage extends AbstractPapyrusNodePrefere
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_IntervalConstraint";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/IntervalPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/IntervalPreferencePage.java
index 34a312769e9..3748603d658 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/IntervalPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/IntervalPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.composite.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class IntervalPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_Interval";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/LiteralBooleanPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/LiteralBooleanPreferencePage.java
index 5b1a0fdd4aa..421cf8820c4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/LiteralBooleanPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/LiteralBooleanPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.composite.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class LiteralBooleanPreferencePage extends AbstractPapyrusNodePreferenceP
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_LiteralBoolean";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/LiteralIntegerPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/LiteralIntegerPreferencePage.java
index 0b8df483f82..256ffc031a0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/LiteralIntegerPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/LiteralIntegerPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.composite.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class LiteralIntegerPreferencePage extends AbstractPapyrusNodePreferenceP
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_LiteralInteger";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/LiteralNullPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/LiteralNullPreferencePage.java
index c974bedfbc3..17346eda946 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/LiteralNullPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/LiteralNullPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.composite.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class LiteralNullPreferencePage extends AbstractPapyrusNodePreferencePage
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_LiteralNull";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/LiteralStringPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/LiteralStringPreferencePage.java
index 91af8e0f239..602d0713c21 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/LiteralStringPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/LiteralStringPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.composite.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class LiteralStringPreferencePage extends AbstractPapyrusNodePreferencePa
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_LiteralString";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/LiteralUnlimitedNaturalPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/LiteralUnlimitedNaturalPreferencePage.java
index 537de31bdc3..59bfd501f66 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/LiteralUnlimitedNaturalPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/LiteralUnlimitedNaturalPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.composite.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class LiteralUnlimitedNaturalPreferencePage extends AbstractPapyrusNodePr
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_LiteralUnlimitedNatural";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ManifestationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ManifestationPreferencePage.java
index 3d30931b45d..e2fc39c1e57 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ManifestationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ManifestationPreferencePage.java
@@ -5,7 +5,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

@@ -38,7 +38,7 @@ public class ManifestationPreferencePage extends AbstractPapyrusLinkPreferencePa
 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_Manifestation";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/NodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/NodePreferencePage.java
index e8773018358..d3ca71889a0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/NodePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/NodePreferencePage.java
@@ -5,7 +5,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -40,26 +40,26 @@ public class NodePreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_Node";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/OpaqueBehaviorPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/OpaqueBehaviorPreferencePage.java
index 6c4d63c1926..55f5d1c7fd3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/OpaqueBehaviorPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/OpaqueBehaviorPreferencePage.java
@@ -5,7 +5,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -40,26 +40,26 @@ public class OpaqueBehaviorPreferencePage extends AbstractPapyrusNodePreferenceP
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_OpaqueBehavior";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/OpaqueExpressionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/OpaqueExpressionPreferencePage.java
index b9d4ac64d31..5f09ad25cc3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/OpaqueExpressionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/OpaqueExpressionPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.composite.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class OpaqueExpressionPreferencePage extends AbstractPapyrusNodePreferenc
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_OpaqueExpression";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/OperationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/OperationPreferencePage.java
index bde057623c7..66e1d9d91ad 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/OperationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/OperationPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.composite.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class OperationPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_Operation";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ParameterPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ParameterPreferencePage.java
index 9d5c20e21f7..ab03febe408 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ParameterPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ParameterPreferencePage.java
@@ -5,7 +5,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

@@ -36,21 +36,21 @@ public class ParameterPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_Parameter";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 20);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 20);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/PortPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/PortPreferencePage.java
index 92fd2bf6edf..9c6f24b27bb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/PortPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/PortPreferencePage.java
@@ -5,7 +5,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

@@ -36,21 +36,21 @@ public class PortPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_Port";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 20);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 20);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/PrimitiveTypePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/PrimitiveTypePreferencePage.java
index 293533fab7b..03e1454cc24 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/PrimitiveTypePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/PrimitiveTypePreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.composite.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class PrimitiveTypePreferencePage extends AbstractPapyrusNodePreferencePa
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_PrimitiveType";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/PropertyPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/PropertyPreferencePage.java
index 4bdfcd5663c..aca01bc659a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/PropertyPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/PropertyPreferencePage.java
@@ -5,7 +5,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -40,26 +40,26 @@ public class PropertyPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_Property";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ProtocolStateMachinePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ProtocolStateMachinePreferencePage.java
index 08d1412f9f8..5c09514e04b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ProtocolStateMachinePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ProtocolStateMachinePreferencePage.java
@@ -5,7 +5,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -40,26 +40,26 @@ public class ProtocolStateMachinePreferencePage extends AbstractPapyrusNodePrefe
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_ProtocolStateMachine";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/RealizationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/RealizationPreferencePage.java
index 3802b56ee72..98a1bf7f4cc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/RealizationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/RealizationPreferencePage.java
@@ -5,7 +5,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

@@ -38,7 +38,7 @@ public class RealizationPreferencePage extends AbstractPapyrusLinkPreferencePage
 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_Realization";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ReceptionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ReceptionPreferencePage.java
index 1af53bb0527..5c7158e045d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ReceptionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/ReceptionPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.composite.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class ReceptionPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_Reception";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/RoleBindingPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/RoleBindingPreferencePage.java
index f74260d919a..85694b86a8d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/RoleBindingPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/RoleBindingPreferencePage.java
@@ -5,7 +5,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

@@ -38,7 +38,7 @@ public class RoleBindingPreferencePage extends AbstractPapyrusLinkPreferencePage
 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_RoleBinding";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/SendOperationEventPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/SendOperationEventPreferencePage.java
index 58e450c0ed0..2bdda84ee60 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/SendOperationEventPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/SendOperationEventPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.composite.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class SendOperationEventPreferencePage extends AbstractPapyrusNodePrefere
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_SendOperationEvent";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/SendSignalEventPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/SendSignalEventPreferencePage.java
index bf086b0c34e..10aa515651d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/SendSignalEventPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/SendSignalEventPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.composite.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class SendSignalEventPreferencePage extends AbstractPapyrusNodePreference
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_SendSignalEvent";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/SignalEventPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/SignalEventPreferencePage.java
index 78d148ad64d..61d4cbbd752 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/SignalEventPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/SignalEventPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.composite.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class SignalEventPreferencePage extends AbstractPapyrusNodePreferencePage
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_SignalEvent";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/SignalPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/SignalPreferencePage.java
index 0391db889f0..02847e91167 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/SignalPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/SignalPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.composite.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class SignalPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_Signal";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/StateMachinePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/StateMachinePreferencePage.java
index c40248624b7..b95676eabbf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/StateMachinePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/StateMachinePreferencePage.java
@@ -5,7 +5,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -40,26 +40,26 @@ public class StateMachinePreferencePage extends AbstractPapyrusNodePreferencePag
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_StateMachine";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/StringExpressionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/StringExpressionPreferencePage.java
index 62f5528bf63..2386a55b033 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/StringExpressionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/StringExpressionPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.composite.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class StringExpressionPreferencePage extends AbstractPapyrusNodePreferenc
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_StringExpression";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/SubstitutionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/SubstitutionPreferencePage.java
index 6d875e1dc47..b3bf5f08ba2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/SubstitutionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/SubstitutionPreferencePage.java
@@ -5,7 +5,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

@@ -38,7 +38,7 @@ public class SubstitutionPreferencePage extends AbstractPapyrusLinkPreferencePag
 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_Substitution";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/TimeConstraintPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/TimeConstraintPreferencePage.java
index 387f3850a05..9212496f715 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/TimeConstraintPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/TimeConstraintPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.composite.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class TimeConstraintPreferencePage extends AbstractPapyrusNodePreferenceP
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_TimeConstraint";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/TimeEventPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/TimeEventPreferencePage.java
index 5e570c32609..9e540baf92f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/TimeEventPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/TimeEventPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.composite.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class TimeEventPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_TimeEvent";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/TimeExpressionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/TimeExpressionPreferencePage.java
index ab8f9367dc6..fe769848f7b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/TimeExpressionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/TimeExpressionPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.composite.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class TimeExpressionPreferencePage extends AbstractPapyrusNodePreferenceP
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_TimeExpression";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/TimeIntervalPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/TimeIntervalPreferencePage.java
index 247d099acff..e6064ddd499 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/TimeIntervalPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/TimeIntervalPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.composite.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class TimeIntervalPreferencePage extends AbstractPapyrusNodePreferencePag
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_TimeInterval";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/TimeObservationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/TimeObservationPreferencePage.java
index bbffd16d029..c841f61b19d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/TimeObservationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/TimeObservationPreferencePage.java
@@ -5,7 +5,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

@@ -36,21 +36,21 @@ public class TimeObservationPreferencePage extends AbstractPapyrusNodePreference
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_TimeObservation";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/UndefinedPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/UndefinedPreferencePage.java
index 5e72f8988f7..bc9b63f5a0a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/UndefinedPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/UndefinedPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.composite.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class UndefinedPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_Undefined";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/UsagePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/UsagePreferencePage.java
index b68b08390aa..ef4a5b705a9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/UsagePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/UsagePreferencePage.java
@@ -5,7 +5,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

@@ -38,7 +38,7 @@ public class UsagePreferencePage extends AbstractPapyrusLinkPreferencePage {
 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_Usage";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/UseCasePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/UseCasePreferencePage.java
index 66c93f34f56..6193eca7ec7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/UseCasePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/UseCasePreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.composite.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class UseCasePreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = CompositeStructureDiagramEditPart.MODEL_ID + "_UseCase";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLViewProvider.java
index a7bc6425785..e6dc2cdfaed 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLViewProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLViewProvider.java
@@ -56,7 +56,7 @@ import org.eclipse.jface.preference.PreferenceConverter;
 import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

 import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.uml.diagram.composite.edit.parts.*;

 import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

@@ -3309,8 +3309,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	private void initFontStyleFromPrefs(View view, final IPreferenceStore store, String elementName) {

-		String fontConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.FONT);

-		String fontColorConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_FONT);

+		String fontConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.FONT);

+		String fontColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_FONT);

 		FontStyle viewFontStyle = (FontStyle)view.getStyle(NotationPackage.Literals.FONT_STYLE);

 		if(viewFontStyle != null) {

 			FontData fontData = PreferenceConverter.getFontData(store, fontConstant);

@@ -3327,7 +3327,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	private void initForegroundFromPrefs(View view, final IPreferenceStore store, String elementName) {

-		String lineColorConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_LINE);

+		String lineColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_LINE);

 		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(store, lineColorConstant);

 		ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getLineStyle_LineColor(), FigureUtilities.RGBToInteger(lineRGB));

 	}

@@ -3336,9 +3336,9 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	private void initBackgroundFromPrefs(View view, final IPreferenceStore store, String elementName) {

-		String fillColorConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_FILL);

-		String gradientColorConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_GRADIENT);

-		String gradientPolicyConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.GRADIENT_POLICY);

+		String fillColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_FILL);

+		String gradientColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_GRADIENT);

+		String gradientPolicyConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.GRADIENT_POLICY);

 		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(store, fillColorConstant);

 		ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getFillStyle_FillColor(), FigureUtilities.RGBToInteger(fillRGB));

 		FillStyle fillStyle = (FillStyle)view.getStyle(NotationPackage.Literals.FILL_STYLE);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactEditPart.java
index 53564e24dc9..93193ea1867 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactEditPart.java
@@ -40,7 +40,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.CompositeEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -224,8 +224,8 @@ CompositeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Artifact";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 

 		return result;

@@ -873,15 +873,15 @@ CompositeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Artifact", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Artifact", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Artifact", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Artifact", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Artifact", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Artifact", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Artifact", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Artifact", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactEditPartACN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactEditPartACN.java
index 0c2a3224ea3..87a29cd5d6f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactEditPartACN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactEditPartACN.java
@@ -40,7 +40,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.CompositeEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -224,8 +224,8 @@ CompositeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Artifact";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 

 		return result;

@@ -873,15 +873,15 @@ CompositeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Artifact", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Artifact", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Artifact", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Artifact", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Artifact", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Artifact", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Artifact", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Artifact", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactEditPartCN.java
index cac4272b6ea..6098e44b06b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ArtifactEditPartCN.java
@@ -40,7 +40,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.CompositeEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -209,8 +209,8 @@ CompositeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Artifact";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 

 		return result;

@@ -858,15 +858,15 @@ CompositeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Artifact", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Artifact", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Artifact", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Artifact", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Artifact", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Artifact", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Artifact", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Artifact", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/CommentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/CommentEditPart.java
index b38a1c073f4..46f0a7d5b81 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/CommentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/CommentEditPart.java
@@ -40,7 +40,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -201,8 +201,8 @@ AbstractCommentEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Comment";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 

 		return result;

@@ -439,15 +439,15 @@ AbstractCommentEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/CommentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/CommentEditPartCN.java
index 903d00b7c88..7f7e34f77f3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/CommentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/CommentEditPartCN.java
@@ -40,7 +40,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -201,8 +201,8 @@ AbstractCommentEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Comment";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 

 		return result;

@@ -441,15 +441,15 @@ AbstractCommentEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ConstraintEditPart.java
index c243db51540..535d3b97138 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ConstraintEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ConstraintEditPart.java
@@ -40,7 +40,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -208,8 +208,8 @@ AbstractConstraintEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Constraint";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 

 		return result;

@@ -882,15 +882,15 @@ AbstractConstraintEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ConstraintEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ConstraintEditPartCN.java
index 08578e0932b..8a5f2e54907 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ConstraintEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ConstraintEditPartCN.java
@@ -177,8 +177,8 @@ org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart {
 	protected org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure createNodePlate() {
 		String prefElementId = "Constraint";
 		org.eclipse.jface.preference.IPreferenceStore store = org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramEditorPlugin.getInstance().getPreferenceStore();
-		String preferenceConstantWitdh = org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.WIDTH);
-		String preferenceConstantHeight = org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.HEIGHT);
+		String preferenceConstantWitdh = org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.WIDTH);
+		String preferenceConstantHeight = org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.HEIGHT);
 		org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure result = new org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));
 
 		return result;
@@ -857,15 +857,15 @@ org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart {
 		if(feature == org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
 			String prefColor = null;
 			if(feature == org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getLineStyle_LineColor()) {
-				prefColor = org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant("Constraint", org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE);
+				prefColor = org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant("Constraint", org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_LINE);
 			} else if(feature == org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getFontStyle_FontColor()) {
-				prefColor = org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant("Constraint", org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FONT);
+				prefColor = org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant("Constraint", org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FONT);
 			} else if(feature == org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
-				prefColor = org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant("Constraint", org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL);
+				prefColor = org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant("Constraint", org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_FILL);
 			}
 			result = org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities.RGBToInteger(org.eclipse.jface.preference.PreferenceConverter.getColor((org.eclipse.jface.preference.IPreferenceStore)preferenceStore, prefColor));
 		} else if(feature == org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getFillStyle_Gradient()) {
-			String prefGradient = org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant("Constraint", org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT);
+			String prefGradient = org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.getElementConstant("Constraint", org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper.COLOR_GRADIENT);
 			org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(preferenceStore.getString(prefGradient));
 			if(feature == org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getFillStyle_Transparency()) {
 				result = new Integer(gradientPreferenceConverter.getTransparency());
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DefaultNamedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DefaultNamedElementEditPart.java
index 1d9b457e7d1..53c898e36ed 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DefaultNamedElementEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DefaultNamedElementEditPart.java
@@ -40,7 +40,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -206,8 +206,8 @@ NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "DefaultNamedElement";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 

 		return result;

@@ -788,15 +788,15 @@ NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DefaultNamedElement", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DefaultNamedElement", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DefaultNamedElement", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DefaultNamedElement", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DefaultNamedElement", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DefaultNamedElement", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("DefaultNamedElement", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("DefaultNamedElement", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DependencyNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DependencyNodeEditPart.java
index 853c76c48f4..f3ae25d66cf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DependencyNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DependencyNodeEditPart.java
@@ -49,7 +49,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.uml.diagram.deployment.custom.edit.policies.CustomGraphicalNodeEditPolicy;

@@ -171,8 +171,8 @@ AbstractBorderedShapeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "DependencyNode";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 

 		return result;

@@ -784,15 +784,15 @@ AbstractBorderedShapeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DependencyNode", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DependencyNode", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DependencyNode", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DependencyNode", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DependencyNode", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DependencyNode", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("DependencyNode", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("DependencyNode", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeviceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeviceEditPart.java
index 0538eac6d2f..22e1ef138e4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeviceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeviceEditPart.java
@@ -40,7 +40,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.DeploymentNodeEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -226,8 +226,8 @@ DeploymentNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Device";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 

 		return result;

@@ -875,15 +875,15 @@ DeploymentNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Device", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Device", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Device", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Device", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Device", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Device", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Device", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Device", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeviceEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeviceEditPartCN.java
index 84ac74230ef..ae14aae1f01 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeviceEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/DeviceEditPartCN.java
@@ -40,7 +40,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.DeploymentNodeEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -211,8 +211,8 @@ DeploymentNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Device";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 

 		return result;

@@ -860,15 +860,15 @@ DeploymentNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Device", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Device", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Device", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Device", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Device", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Device", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Device", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Device", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ExecutionEnvironmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ExecutionEnvironmentEditPart.java
index a694ddfb884..23261b2f3d9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ExecutionEnvironmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ExecutionEnvironmentEditPart.java
@@ -40,7 +40,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.DeploymentNodeEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -226,8 +226,8 @@ DeploymentNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "ExecutionEnvironment";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 

 		return result;

@@ -875,15 +875,15 @@ DeploymentNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ExecutionEnvironment", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ExecutionEnvironment", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ExecutionEnvironment", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ExecutionEnvironment", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ExecutionEnvironment", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ExecutionEnvironment", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("ExecutionEnvironment", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("ExecutionEnvironment", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ExecutionEnvironmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ExecutionEnvironmentEditPartCN.java
index 097afb7482a..cfdbd04e634 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ExecutionEnvironmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ExecutionEnvironmentEditPartCN.java
@@ -40,7 +40,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.DeploymentNodeEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -211,8 +211,8 @@ DeploymentNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "ExecutionEnvironment";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 

 		return result;

@@ -860,15 +860,15 @@ DeploymentNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ExecutionEnvironment", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ExecutionEnvironment", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ExecutionEnvironment", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ExecutionEnvironment", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ExecutionEnvironment", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ExecutionEnvironment", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("ExecutionEnvironment", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("ExecutionEnvironment", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ModelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ModelEditPart.java
index ef8a561c741..17479030449 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ModelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ModelEditPart.java
@@ -40,7 +40,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -220,8 +220,8 @@ NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Model";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 

 		return result;

@@ -802,15 +802,15 @@ NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Model", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Model", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Model", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Model", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Model", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Model", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Model", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Model", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ModelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ModelEditPartCN.java
index e4bc567dd12..a90c0b0afc7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ModelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/ModelEditPartCN.java
@@ -40,7 +40,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -220,8 +220,8 @@ NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Model";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 

 		return result;

@@ -802,15 +802,15 @@ NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Model", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Model", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Model", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Model", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Model", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Model", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Model", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Model", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedArtifactNodeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedArtifactNodeEditPartCN.java
index 49db89c7364..9edec543367 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedArtifactNodeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedArtifactNodeEditPartCN.java
@@ -40,7 +40,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

@@ -213,8 +213,8 @@ ShapeNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Artifact";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 

 		return result;

@@ -864,15 +864,15 @@ ShapeNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Artifact", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Artifact", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Artifact", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Artifact", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Artifact", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Artifact", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Artifact", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Artifact", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedDeviceEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedDeviceEditPartCN.java
index 82724d4ffc2..cb22baf3f60 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedDeviceEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedDeviceEditPartCN.java
@@ -40,7 +40,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

@@ -215,8 +215,8 @@ ShapeNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Device";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 

 		return result;

@@ -866,15 +866,15 @@ ShapeNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Device", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Device", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Device", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Device", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Device", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Device", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Device", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Device", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedExecutionEnvironmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedExecutionEnvironmentEditPartCN.java
index 664686a77b9..54fe3c82c37 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedExecutionEnvironmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedExecutionEnvironmentEditPartCN.java
@@ -40,7 +40,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

@@ -215,8 +215,8 @@ ShapeNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "ExecutionEnvironment";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 

 		return result;

@@ -866,15 +866,15 @@ ShapeNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ExecutionEnvironment", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ExecutionEnvironment", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ExecutionEnvironment", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ExecutionEnvironment", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ExecutionEnvironment", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ExecutionEnvironment", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("ExecutionEnvironment", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("ExecutionEnvironment", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedNodeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedNodeEditPartCN.java
index 07693acdd04..8620ed1667e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedNodeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NestedNodeEditPartCN.java
@@ -39,7 +39,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

@@ -214,8 +214,8 @@ ShapeNodeEditPart {
 	protected org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure createNodePlate() {

 		String prefElementId = "Node";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 

 		return result;

@@ -865,15 +865,15 @@ ShapeNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Node", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Node", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Node", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Node", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Node", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Node", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Node", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Node", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NodeEditPart.java
index ff073c52291..bdbb91f67ff 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NodeEditPart.java
@@ -39,7 +39,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.DeploymentNodeEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -225,8 +225,8 @@ DeploymentNodeEditPart {
 	protected org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure createNodePlate() {

 		String prefElementId = "Node";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 

 		return result;

@@ -874,15 +874,15 @@ DeploymentNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Node", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Node", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Node", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Node", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Node", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Node", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Node", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Node", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NodeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NodeEditPartCN.java
index 9ba75ecd46f..70aa5ce9729 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NodeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/NodeEditPartCN.java
@@ -39,7 +39,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.DeploymentNodeEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -210,8 +210,8 @@ DeploymentNodeEditPart {
 	protected org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure createNodePlate() {

 		String prefElementId = "Node";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 

 		return result;

@@ -859,15 +859,15 @@ DeploymentNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Node", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Node", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Node", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Node", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Node", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Node", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Node", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Node", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/PackageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/PackageEditPart.java
index a8c5a4039a7..424704e469e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/PackageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/PackageEditPart.java
@@ -40,7 +40,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -220,8 +220,8 @@ NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Package";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 

 		return result;

@@ -802,15 +802,15 @@ NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Package", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Package", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Package", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Package", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Package", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Package", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Package", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Package", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/PackageEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/PackageEditPartCN.java
index f717c1ebe18..c84bfb157b0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/PackageEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/edit/parts/PackageEditPartCN.java
@@ -40,7 +40,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -220,8 +220,8 @@ NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Package";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 

 		return result;

@@ -802,15 +802,15 @@ NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Package", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Package", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Package", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Package", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Package", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Package", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Package", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Package", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/ArtifactPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/ArtifactPreferencePage.java
index 0f0cd35ade7..c18a847542d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/ArtifactPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/ArtifactPreferencePage.java
@@ -17,7 +17,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.DeploymentDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramEditorPlugin;

 

@@ -53,30 +53,30 @@ public class ArtifactPreferencePage extends AbstractPapyrusNodePreferencePage {
 	public static void initDefaults(IPreferenceStore store) {

 

 		String key = DeploymentDiagramEditPart.MODEL_ID + "_Artifact";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 150);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 70);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 150);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 70);

 

 		Map<String, Boolean> map = getStaticCompartmentVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/CommentPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/CommentPreferencePage.java
index e3f310ec7dd..a87e2bf5b67 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/CommentPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/CommentPreferencePage.java
@@ -26,7 +26,7 @@ package org.eclipse.papyrus.uml.diagram.deployment.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.DeploymentDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramEditorPlugin;

 

@@ -57,18 +57,18 @@ public class CommentPreferencePage extends AbstractPapyrusNodePreferencePage {
 	public static void initDefaults(IPreferenceStore store) {

 

 		String key = DeploymentDiagramEditPart.MODEL_ID + "_Comment";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/ConstraintPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/ConstraintPreferencePage.java
index 86228652d95..5f53f576584 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/ConstraintPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/ConstraintPreferencePage.java
@@ -26,7 +26,7 @@ package org.eclipse.papyrus.uml.diagram.deployment.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.DeploymentDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramEditorPlugin;

 

@@ -57,18 +57,18 @@ public class ConstraintPreferencePage extends AbstractPapyrusNodePreferencePage
 	public static void initDefaults(IPreferenceStore store) {

 

 		String key = DeploymentDiagramEditPart.MODEL_ID + "_Constraint";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/DefaultNamedElementPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/DefaultNamedElementPreferencePage.java
index 28806cb82c9..48517212a20 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/DefaultNamedElementPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/DefaultNamedElementPreferencePage.java
@@ -14,7 +14,7 @@ package org.eclipse.papyrus.uml.diagram.deployment.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.DeploymentDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramEditorPlugin;

 

@@ -45,18 +45,18 @@ public class DefaultNamedElementPreferencePage extends AbstractPapyrusNodePrefer
 	public static void initDefaults(IPreferenceStore store) {

 

 		String key = DeploymentDiagramEditPart.MODEL_ID + "_DefaultNamedElement";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 100);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 50);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 100);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 50);

 

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/DependencyLinkPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/DependencyLinkPreferencePage.java
index 84ad109a29a..a150632fc41 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/DependencyLinkPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/DependencyLinkPreferencePage.java
@@ -17,7 +17,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.DeploymentDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramEditorPlugin;

@@ -51,7 +51,7 @@ public class DependencyLinkPreferencePage extends AbstractPapyrusLinkPreferenceP
 		String key = DeploymentDiagramEditPart.MODEL_ID + "_DependencyLink";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/DependencyNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/DependencyNodePreferencePage.java
index df9e001ae9d..fdebe0b0a4d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/DependencyNodePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/DependencyNodePreferencePage.java
@@ -14,7 +14,7 @@ package org.eclipse.papyrus.uml.diagram.deployment.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.DeploymentDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramEditorPlugin;

 

@@ -45,18 +45,18 @@ public class DependencyNodePreferencePage extends AbstractPapyrusNodePreferenceP
 	public static void initDefaults(IPreferenceStore store) {

 

 		String key = DeploymentDiagramEditPart.MODEL_ID + "_DependencyNode";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 10);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 10);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 10);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 10);

 

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/DependencyPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/DependencyPreferencePage.java
index 3779f43f690..24b432ed72d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/DependencyPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/DependencyPreferencePage.java
@@ -17,7 +17,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.DeploymentDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramEditorPlugin;

@@ -51,7 +51,7 @@ public class DependencyPreferencePage extends AbstractPapyrusLinkPreferencePage
 		String key = DeploymentDiagramEditPart.MODEL_ID + "_Dependency";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/DeploymentPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/DeploymentPreferencePage.java
index 59abc556bae..6be8a2cc2d5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/DeploymentPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/DeploymentPreferencePage.java
@@ -17,7 +17,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.DeploymentDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramEditorPlugin;

@@ -51,7 +51,7 @@ public class DeploymentPreferencePage extends AbstractPapyrusLinkPreferencePage
 		String key = DeploymentDiagramEditPart.MODEL_ID + "_Deployment";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/DevicePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/DevicePreferencePage.java
index 9143076f583..2342174a40a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/DevicePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/DevicePreferencePage.java
@@ -17,7 +17,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.DeploymentDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramEditorPlugin;

 

@@ -53,30 +53,30 @@ public class DevicePreferencePage extends AbstractPapyrusNodePreferencePage {
 	public static void initDefaults(IPreferenceStore store) {

 

 		String key = DeploymentDiagramEditPart.MODEL_ID + "_Device";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 150);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 100);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 150);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 100);

 

 		Map<String, Boolean> map = getStaticCompartmentVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/ExecutionEnvironmentPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/ExecutionEnvironmentPreferencePage.java
index d233c522ea7..f87916df319 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/ExecutionEnvironmentPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/ExecutionEnvironmentPreferencePage.java
@@ -17,7 +17,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.DeploymentDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramEditorPlugin;

 

@@ -53,30 +53,30 @@ public class ExecutionEnvironmentPreferencePage extends AbstractPapyrusNodePrefe
 	public static void initDefaults(IPreferenceStore store) {

 

 		String key = DeploymentDiagramEditPart.MODEL_ID + "_ExecutionEnvironment";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 150);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 100);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 150);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 100);

 

 		Map<String, Boolean> map = getStaticCompartmentVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/GeneralizationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/GeneralizationPreferencePage.java
index d679569433f..eb492a30ddf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/GeneralizationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/GeneralizationPreferencePage.java
@@ -17,7 +17,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.DeploymentDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramEditorPlugin;

@@ -51,7 +51,7 @@ public class GeneralizationPreferencePage extends AbstractPapyrusLinkPreferenceP
 		String key = DeploymentDiagramEditPart.MODEL_ID + "_Generalization";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/ManifestationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/ManifestationPreferencePage.java
index 0736c4eaa35..168c3ea837d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/ManifestationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/ManifestationPreferencePage.java
@@ -17,7 +17,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.DeploymentDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramEditorPlugin;

@@ -51,7 +51,7 @@ public class ManifestationPreferencePage extends AbstractPapyrusLinkPreferencePa
 		String key = DeploymentDiagramEditPart.MODEL_ID + "_Manifestation";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/ModelPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/ModelPreferencePage.java
index bd7c4dce7e5..a2e540ebb6e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/ModelPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/ModelPreferencePage.java
@@ -17,7 +17,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.DeploymentDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramEditorPlugin;

 

@@ -53,30 +53,30 @@ public class ModelPreferencePage extends AbstractPapyrusNodePreferencePage {
 	public static void initDefaults(IPreferenceStore store) {

 

 		String key = DeploymentDiagramEditPart.MODEL_ID + "_Model";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 150);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 150);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 150);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 150);

 

 		Map<String, Boolean> map = getStaticCompartmentVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/NodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/NodePreferencePage.java
index 0bff984e396..7f640e1ef1f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/NodePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/NodePreferencePage.java
@@ -17,7 +17,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.DeploymentDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramEditorPlugin;

 

@@ -53,30 +53,30 @@ public class NodePreferencePage extends AbstractPapyrusNodePreferencePage {
 	public static void initDefaults(IPreferenceStore store) {

 

 		String key = DeploymentDiagramEditPart.MODEL_ID + "_Node";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 150);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 150);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 150);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 150);

 

 		Map<String, Boolean> map = getStaticCompartmentVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/PackagePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/PackagePreferencePage.java
index de66a680bc0..b0aac3f6f1b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/PackagePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/preferences/PackagePreferencePage.java
@@ -17,7 +17,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.DeploymentDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.deployment.part.UMLDiagramEditorPlugin;

 

@@ -53,30 +53,30 @@ public class PackagePreferencePage extends AbstractPapyrusNodePreferencePage {
 	public static void initDefaults(IPreferenceStore store) {

 

 		String key = DeploymentDiagramEditPart.MODEL_ID + "_Package";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 150);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 150);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 150);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 150);

 

 		Map<String, Boolean> map = getStaticCompartmentVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/providers/UMLViewProvider.java
index bab66fb811a..ded535485b9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/providers/UMLViewProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/providers/UMLViewProvider.java
@@ -45,7 +45,7 @@ import org.eclipse.jface.preference.PreferenceConverter;
 import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

 import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.ArtifactCompositeCompartmentEditPart;

 import org.eclipse.papyrus.uml.diagram.deployment.edit.parts.ArtifactCompositeCompartmentEditPartACN;

@@ -1352,8 +1352,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	private void initFontStyleFromPrefs(View view, final IPreferenceStore store, String elementName) {

-		String fontConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.FONT);

-		String fontColorConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_FONT);

+		String fontConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.FONT);

+		String fontColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_FONT);

 

 		FontStyle viewFontStyle = (FontStyle)view.getStyle(NotationPackage.Literals.FONT_STYLE);

 		if(viewFontStyle != null) {

@@ -1372,7 +1372,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	private void initForegroundFromPrefs(View view, final IPreferenceStore store, String elementName) {

-		String lineColorConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_LINE);

+		String lineColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_LINE);

 		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(store, lineColorConstant);

 		ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getLineStyle_LineColor(), FigureUtilities.RGBToInteger(lineRGB));

 	}

@@ -1381,9 +1381,9 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	private void initBackgroundFromPrefs(View view, final IPreferenceStore store, String elementName) {

-		String fillColorConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_FILL);

-		String gradientColorConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_GRADIENT);

-		String gradientPolicyConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.GRADIENT_POLICY);

+		String fillColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_FILL);

+		String gradientColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_GRADIENT);

+		String gradientPolicyConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.GRADIENT_POLICY);

 

 		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(store, fillColorConstant);

 		ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getFillStyle_FillColor(), FigureUtilities.RGBToInteger(fillRGB));

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/plugin.xml
index 1a4008a46d2..1b34c61399d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/plugin.xml
@@ -12,5 +12,8 @@
       <strategy

             strategy="org.eclipse.papyrus.uml.diagram.dnd.lifeline.ClassifierToLifelineDropStrategy">

       </strategy>

+      <strategy

+            strategy="org.eclipse.papyrus.uml.diagram.dnd.lifeline.ClassifierToInteractionDropStrategy">

+      </strategy>

    </extension>

 </plugin>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/src/org/eclipse/papyrus/uml/diagram/dnd/lifeline/ClassifierToInteractionDropStrategy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/src/org/eclipse/papyrus/uml/diagram/dnd/lifeline/ClassifierToInteractionDropStrategy.java
new file mode 100644
index 00000000000..73e506bab1e
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/src/org/eclipse/papyrus/uml/diagram/dnd/lifeline/ClassifierToInteractionDropStrategy.java
@@ -0,0 +1,101 @@
+/*

+ * 

+ */

+package org.eclipse.papyrus.uml.diagram.dnd.lifeline;

+

+import java.util.ArrayList;

+import java.util.List;

+

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.RequestConstants;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.requests.DropRequest;

+import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;

+import org.eclipse.papyrus.infra.gmfdiag.dnd.strategy.TransactionalDropStrategy;

+import org.eclipse.papyrus.uml.diagram.dnd.Activator;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.uml2.uml.Interaction;

+import org.eclipse.uml2.uml.Lifeline;

+import org.eclipse.uml2.uml.Property;

+import org.eclipse.uml2.uml.Type;

+import org.eclipse.uml2.uml.Classifier;

+

+public class ClassifierToInteractionDropStrategy extends TransactionalDropStrategy {

+

+	public String getLabel() {

+		return "Create a Lifeline";

+	}

+

+	public String getDescription() {

+		return "Drop a classifier on an interaction , create the lifeline and type it. This will create a new lifeline, a new Property in the interaction, typed by the dropped classifier. The Lifeline will represent this property." + "It is also possible to drop directly an already existing Property to the lifeline.";

+	}

+

+	public Image getImage() {

+		return null;

+	}

+

+	public String getID() {

+		return Activator.PLUGIN_ID + ".ClassifierToLifeline.represents";

+	}

+

+	@Deprecated

+	public int getPriority() {

+		return 0;

+	}

+

+	@Override

+	protected Command doGetCommand(Request request, EditPart targetEditPart) {

+		EObject targetElement = getTargetSemanticElement(targetEditPart);

+		final Point location;

+		if(!(targetElement instanceof Interaction)) {

+			return null;

+		}

+		if( request instanceof DropObjectsRequest){

+			location=((DropObjectsRequest)request).getLocation();

+		}

+		else{

+			location=new Point(100, 100);

+		}

+		final EditPart interactionEditPart= targetEditPart;

+		final Interaction targetInteraction = (Interaction)targetElement;

+

+		List<EObject> sourceElements = getSourceEObjects(request);

+

+		//The only supported case is "Drop a single classifier on an interaction"

+		if(sourceElements.size() != 1) {

+			return null;

+		}

+

+		EObject sourceElement = sourceElements.get(0);

+		if(sourceElement instanceof Type) {

+			final Type sourceType = (Type)sourceElement;

+

+			Command resultCommand = new Command(getLabel()) {

+

+				@Override

+				public void execute() {

+					Lifeline lifeline= targetInteraction.createLifeline("");

+					Property property = targetInteraction.createOwnedAttribute("", sourceType);

+					lifeline.setRepresents(property);

+					ArrayList<Lifeline> droppedLifelines= new ArrayList<Lifeline>();

+					droppedLifelines.add(lifeline);

+					DropObjectsRequest dropRequest= new DropObjectsRequest();

+					dropRequest.setObjects(droppedLifelines);

+					dropRequest.setLocation(location);

+					Command cmd=interactionEditPart.getCommand(dropRequest);

+					cmd.execute();

+					

+					

+				}

+			};

+

+			return resultCommand;

+		} 

+

+		return null;

+	}

+

+}

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 f3b6015c6c8..7eba98fc56d 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
@@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.uml.diagram.timing;bundle-version="1.0.0",

  org.eclipse.ui.navigator;bundle-version="3.5.200",

  org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.0.0",

- com.google.guava;bundle-version="10.0.1",

+ com.google.guava;bundle-version="11.0.0",

  org.eclipse.papyrus.sysml.diagram.common;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.0.0",

  org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="1.6.0",

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
index bb16e1e3206..7d99bf210fd 100644
--- 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
@@ -15,7 +15,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
 
 public class ActivityFinalNodePreferencePage extends InteractionOverviewDiagramNodePreferencePage {
@@ -54,11 +54,11 @@ public class ActivityFinalNodePreferencePage extends InteractionOverviewDiagramN
 		// Start of user code custom default initializations
 		// End of user code
 
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 20);
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 20);
+		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 = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, labelName, PreferenceConstantHelper.LABEL_VISIBILITY);
+			final String showLabelKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, labelName, PreferencesConstantsHelper.LABEL_VISIBILITY);
 			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
 		}
 	}
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
index 24aacab1410..f2da5d22a8f 100644
--- 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
@@ -15,7 +15,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
 
 public class ActivityPreferencePage extends InteractionOverviewDiagramNodePreferencePage {
@@ -66,18 +66,18 @@ public class ActivityPreferencePage extends InteractionOverviewDiagramNodePrefer
 		// Start of user code custom default initializations
 		// End of user code
 
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 857);
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 757);
+		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 = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
+			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 = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);
+			final String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
 	}
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
index b605d2a4b7b..3984e64dbd4 100644
--- 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
@@ -15,7 +15,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
 
 public class ConditionalNodePreferencePage extends InteractionOverviewDiagramNodePreferencePage {
@@ -62,14 +62,14 @@ public class ConditionalNodePreferencePage extends InteractionOverviewDiagramNod
 
 		// Initialize default visibility for compartments in preference page.
 		for(final String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			final String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
+			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 = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);
+			final String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
 	}
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
index 73881f06f7a..96199161e8b 100644
--- 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
@@ -15,7 +15,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
 
 public class ControlFlowPreferencePage extends InteractionOverviewDiagramLinkPreferencePage {
@@ -58,7 +58,7 @@ public class ControlFlowPreferencePage extends InteractionOverviewDiagramLinkPre
 		// End of user code
 
 		for(final String labelName : labelDefaultVisibilityMap.keySet()) {
-			final String showLabelKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, labelName, PreferenceConstantHelper.LABEL_VISIBILITY);
+			final String showLabelKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, labelName, PreferencesConstantsHelper.LABEL_VISIBILITY);
 			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
 		}
 	}
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
index be5392737d2..8202ebdb94f 100644
--- 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
@@ -15,7 +15,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
 
 public class DecisionNodePreferencePage extends InteractionOverviewDiagramNodePreferencePage {
@@ -57,7 +57,7 @@ public class DecisionNodePreferencePage extends InteractionOverviewDiagramNodePr
 
 		// Initialize default visibility for labels in preference page.
 		for(final String labelName : labelDefaultVisibilityMap.keySet()) {
-			final String showLabelKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, labelName, PreferenceConstantHelper.LABEL_VISIBILITY);
+			final String showLabelKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, labelName, PreferencesConstantsHelper.LABEL_VISIBILITY);
 			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
 		}
 	}
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
index 70a1ef5304b..a6c55c81d7b 100644
--- 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
@@ -15,7 +15,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
 
 public class FlowFinalNodePreferencePage extends InteractionOverviewDiagramNodePreferencePage {
@@ -54,11 +54,11 @@ public class FlowFinalNodePreferencePage extends InteractionOverviewDiagramNodeP
 		// Start of user code custom default initializations
 		// End of user code
 
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 20);
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 20);
+		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 = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, labelName, PreferenceConstantHelper.LABEL_VISIBILITY);
+			final String showLabelKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, labelName, PreferencesConstantsHelper.LABEL_VISIBILITY);
 			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
 		}
 	}
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
index 56e73a92990..d23d1dfb443 100644
--- 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
@@ -15,7 +15,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
 
 public class ForkNodePreferencePage extends InteractionOverviewDiagramNodePreferencePage {
@@ -54,11 +54,11 @@ public class ForkNodePreferencePage extends InteractionOverviewDiagramNodePrefer
 		// Start of user code custom default initializations
 		// End of user code
 
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 10);
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 40);
+		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 = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, labelName, PreferenceConstantHelper.LABEL_VISIBILITY);
+			final String showLabelKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, labelName, PreferencesConstantsHelper.LABEL_VISIBILITY);
 			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
 		}
 	}
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
index c0cf274d33e..14210cd82a2 100644
--- 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
@@ -15,7 +15,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
 
 public class InitialNodePreferencePage extends InteractionOverviewDiagramNodePreferencePage {
@@ -56,7 +56,7 @@ public class InitialNodePreferencePage extends InteractionOverviewDiagramNodePre
 
 		// Initialize default visibility for labels in preference page.
 		for(final String labelName : labelDefaultVisibilityMap.keySet()) {
-			final String showLabelKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, labelName, PreferenceConstantHelper.LABEL_VISIBILITY);
+			final String showLabelKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, labelName, PreferencesConstantsHelper.LABEL_VISIBILITY);
 			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
 		}
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/InteractionOverviewDiagramGeneralPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/InteractionOverviewDiagramGeneralPreferencePage.java
index a9a30b4ae5a..80a3784cc3b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/InteractionOverviewDiagramGeneralPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/preferences/InteractionOverviewDiagramGeneralPreferencePage.java
@@ -12,10 +12,12 @@ package org.eclipse.papyrus.uml.diagram.interactionoverview.preferences;
 
 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.DiagramPreferencePage;
 import org.eclipse.papyrus.uml.diagram.interactionoverview.Activator;
+import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
 
 public class InteractionOverviewDiagramGeneralPreferencePage extends DiagramPreferencePage {
 
 	public InteractionOverviewDiagramGeneralPreferencePage() {
 		setPreferenceStore(Activator.getInstance().getPreferenceStore());
+		setPreferenceKey(ElementTypes.DIAGRAM_ID);
 	}
 }
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
index 20088ce9033..b368a672483 100644
--- 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
@@ -15,7 +15,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
 
 public class JoinNodePreferencePage extends InteractionOverviewDiagramNodePreferencePage {
@@ -55,11 +55,11 @@ public class JoinNodePreferencePage extends InteractionOverviewDiagramNodePrefer
 		// Start of user code custom default initializations
 		// End of user code
 
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 10);
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 40);
+		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 = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, labelName, PreferenceConstantHelper.LABEL_VISIBILITY);
+			final String showLabelKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, labelName, PreferencesConstantsHelper.LABEL_VISIBILITY);
 			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
 		}
 	}
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
index 9677b51f130..35caf6699d3 100644
--- 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
@@ -15,7 +15,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
 
 public class LoopNodePreferencePage extends InteractionOverviewDiagramNodePreferencePage {
@@ -62,14 +62,14 @@ public class LoopNodePreferencePage extends InteractionOverviewDiagramNodePrefer
 
 		// Initialize default visibility for compartments in preference page.
 		for(final String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			final String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
+			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 = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);
+			final String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
 	}
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
index 836df7d51ff..ce34b2a49e3 100644
--- 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
@@ -15,7 +15,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
 
 public class MergeNodePreferencePage extends InteractionOverviewDiagramNodePreferencePage {
@@ -56,7 +56,7 @@ public class MergeNodePreferencePage extends InteractionOverviewDiagramNodePrefe
 
 		// Initialize default visibility for labels in preference page.
 		for(final String labelName : labelDefaultVisibilityMap.keySet()) {
-			final String showLabelKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, labelName, PreferenceConstantHelper.LABEL_VISIBILITY);
+			final String showLabelKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, labelName, PreferencesConstantsHelper.LABEL_VISIBILITY);
 			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
 		}
 	}
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
index 1b502f85276..3d741b71b9f 100644
--- 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
@@ -15,7 +15,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
 
 public class NamedElementPreferencePage extends InteractionOverviewDiagramNodePreferencePage {
@@ -56,7 +56,7 @@ public class NamedElementPreferencePage extends InteractionOverviewDiagramNodePr
 
 		// Initialize default visibility for labels in preference page.
 		for(final String labelName : labelDefaultVisibilityMap.keySet()) {
-			final String showLabelKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, labelName, PreferenceConstantHelper.LABEL_VISIBILITY);
+			final String showLabelKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, labelName, PreferencesConstantsHelper.LABEL_VISIBILITY);
 			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
 		}
 	}
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
index 2b2fa8622dd..6d6180110d9 100644
--- 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
@@ -15,7 +15,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.uml.diagram.interactionoverview.provider.ElementTypes;
 
 public class SequenceNodePreferencePage extends InteractionOverviewDiagramNodePreferencePage {
@@ -62,14 +62,14 @@ public class SequenceNodePreferencePage extends InteractionOverviewDiagramNodePr
 
 		// Initialize default visibility for compartments in preference page.
 		for(final String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			final String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
+			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 = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);
+			final String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
 	}
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 84aa04b9d83..a064f57bd17 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
@@ -50,7 +50,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.activity.edit.parts.AcceptEventActionEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActionInputPinInCallBeActEditPart;

 import org.eclipse.papyrus.uml.diagram.activity.edit.parts.ActionInputPinInCallOpActAsTargetEditPart;

@@ -327,8 +327,8 @@ public class CallBehaviorActionAsInteractionEditPart extends NamedElementEditPar
 	protected NodeFigure createNodePlate() {

 		final String prefElementId = "CallBehaviorAction";

 		final IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		final String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		final String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		final String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		final String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		final DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -898,15 +898,15 @@ public class CallBehaviorActionAsInteractionEditPart extends NamedElementEditPar
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("CallBehaviorAction", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("CallBehaviorAction", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("CallBehaviorAction", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("CallBehaviorAction", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("CallBehaviorAction", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("CallBehaviorAction", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor(preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			final String prefGradient = PreferenceConstantHelper.getElementConstant("CallBehaviorAction", PreferenceConstantHelper.COLOR_GRADIENT);

+			final String prefGradient = PreferencesConstantsHelper.getElementConstant("CallBehaviorAction", PreferencesConstantsHelper.COLOR_GRADIENT);

 			final GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

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 475fb18630c..ed1a5483cb7 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
@@ -21,10 +21,11 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.ide;bundle-version="3.8.0",

  org.eclipse.papyrus.infra.emf;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.widgets;bundle-version="1.0.0",

- org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.2.0",

  org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0",

  org.eclipse.papyrus.uml.pastemanager;bundle-version="1.0.0",

- org.eclipse.papyrus.infra.tools;bundle-version="1.0.0"

+ org.eclipse.papyrus.infra.tools;bundle-version="1.0.0",

+ org.eclipse.emf.facet.infra.browser.custom.ui;bundle-version="0.4.0",

+ org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.4.0"

 Export-Package: org.eclipse.papyrus.uml.diagram.menu,

  org.eclipse.papyrus.uml.diagram.menu.actions,

  org.eclipse.papyrus.uml.diagram.menu.actions.handlers

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/TODO b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/TODO
new file mode 100644
index 00000000000..9819887edfc
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/TODO
@@ -0,0 +1,3 @@
+The main part of this plugin must be moved into org.eclipse.papyrus.infra.gmfdiag.menu

+

+The class HandlerStateSourceProvider must be removed and replace by property tester or test in the plugin.xml
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/build.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/build.properties
index 023fcaea1ed..6f5ddd0023a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/build.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/build.properties
@@ -5,7 +5,8 @@ bin.includes = META-INF/,\
                plugin.xml,\

                about.html,\

                icons/,\

-               plugin.properties

+               plugin.properties,\

+               plugin.pdoc

 output..=bin/

 src.includes = about.html

 source..=src/

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/plugin.pdoc b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/plugin.pdoc
new file mode 100644
index 00000000000..d3d8f95e2f2
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/plugin.pdoc
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides handlers for the actions done on UML Diagram.">

+  <referent firstName="vincent" lastName="lorenzo" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA-LIST"/>

+</doc:Documentation>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/plugin.xml
index e5fcb908200..631bc54de33 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/plugin.xml
@@ -1341,13 +1341,13 @@
             label="&amp;View"

             tooltip="This Menu provides Action for the View">

          <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ViewGridCommand"

+               commandId="org.eclipse.papyrus.infra.gmfdiag.menu.ViewGridCommand"

                label="&amp;Grid"

                style="toggle"

                tooltip="Toggle the grid lines on the diagram">

          </command>

          <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ViewRulersCommand"

+               commandId="org.eclipse.papyrus.infra.gmfdiag.menu.ViewRulersCommand"

                label="&amp;Rulers"

                style="toggle"

                tooltip="Toggle the rulers on the diagram">

@@ -1357,14 +1357,14 @@
                visible="true">

          </separator>

          <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ViewPageBreaksCommand"

+               commandId="org.eclipse.papyrus.infra.gmfdiag.menu.ViewPageBreaksCommand"

                icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/viewpagebreaks.gif"

                label="&amp;Page Breaks"

                style="toggle"

                tooltip="Show the page breaks on the diagram">

          </command>

          <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.RecalculatePageBreaksCommand"

+               commandId="org.eclipse.papyrus.infra.gmfdiag.menu.RecalculatePageBreaksCommand"

                icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/recalcpagebreaks.gif"

                label="&amp;Recalculate Page Breaks"

                style="push"

@@ -1375,7 +1375,7 @@
                visible="true">

          </separator>

          <command

-               commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SnapToGridCommand"

+               commandId="org.eclipse.papyrus.infra.gmfdiag.menu.SnapToGridCommand"

                label="&amp;Snap to Grid"

                style="toggle"

                tooltip="Toggle Snap to Grid">

@@ -2061,13 +2061,13 @@
          allPopups="false"

          locationURI="popup:org.eclipse.papyrus.uml.diagram.ui.popupmenu.view">

       <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ViewGridCommand"

+            commandId="org.eclipse.papyrus.infra.gmfdiag.menu.ViewGridCommand"

             label="&amp;Grid"

             style="toggle"

             tooltip="Toggle the grid lines on the diagram">

       </command>

       <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ViewRulersCommand"

+            commandId="org.eclipse.papyrus.infra.gmfdiag.menu.ViewRulersCommand"

             label="&amp;Rulers"

             style="toggle"

             tooltip="Toggle the rulers on the diagram">

@@ -2077,14 +2077,14 @@
             visible="true">

       </separator>

       <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ViewPageBreaksCommand"

+            commandId="org.eclipse.papyrus.infra.gmfdiag.menu.ViewPageBreaksCommand"

             icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/viewpagebreaks.gif"

             label="&amp;Page Breaks"

             style="toggle"

             tooltip="Show the page breaks on the diagram">

       </command>

       <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.RecalculatePageBreaksCommand"

+            commandId="org.eclipse.papyrus.infra.gmfdiag.menu.RecalculatePageBreaksCommand"

             icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui.actions/icons/elcl16/recalcpagebreaks.gif"

             label="&amp;Recalculate Page Breaks"

             style="push"

@@ -2095,7 +2095,7 @@
             visible="true">

       </separator>

       <command

-            commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SnapToGridCommand"

+            commandId="org.eclipse.papyrus.infra.gmfdiag.menu.SnapToGridCommand"

             label="Snap to &amp;Grid"

             style="toggle"

             tooltip="Toggle Snap to Grid">

@@ -2456,7 +2456,7 @@
    <command

          categoryId="org.eclipse.papyrus.editor.category"

          description="The command to view the Grid"

-         id="org.eclipse.papyrus.uml.diagram.menu.commands.ViewGridCommand"

+         id="org.eclipse.papyrus.infra.gmfdiag.menu.ViewGridCommand"

          name="Grid Command">

       <state

             class="org.eclipse.jface.commands.ToggleState"

@@ -2466,7 +2466,7 @@
    <command

          categoryId="org.eclipse.papyrus.editor.category"

          description="The command to view the Rulers"

-         id="org.eclipse.papyrus.uml.diagram.menu.commands.ViewRulersCommand"

+         id="org.eclipse.papyrus.infra.gmfdiag.menu.ViewRulersCommand"

          name="Rulers Command">

       <state

             class="org.eclipse.jface.commands.ToggleState"

@@ -2476,7 +2476,7 @@
    <command

          categoryId="org.eclipse.papyrus.editor.category"

          description="The command to view the page breaks"

-         id="org.eclipse.papyrus.uml.diagram.menu.commands.ViewPageBreaksCommand"

+         id="org.eclipse.papyrus.infra.gmfdiag.menu.ViewPageBreaksCommand"

          name="Page breaks Command">

       <state

             class="org.eclipse.jface.commands.ToggleState"

@@ -2486,13 +2486,13 @@
    <command

          categoryId="org.eclipse.papyrus.editor.category"

          description="The command to recalculate the Page Breaks"

-         id="org.eclipse.papyrus.uml.diagram.menu.commands.RecalculatePageBreaksCommand"

+         id="org.eclipse.papyrus.infra.gmfdiag.menu.RecalculatePageBreaksCommand"

          name="Recalculate Page Breaks Command">

    </command>

    <command

          categoryId="org.eclipse.papyrus.editor.category"

          description="The command to snap to grid"

-         id="org.eclipse.papyrus.uml.diagram.menu.commands.SnapToGridCommand"

+         id="org.eclipse.papyrus.infra.gmfdiag.menu.SnapToGridCommand"

          name="Snap To Grid Command">

       <state

             class="org.eclipse.papyrus.uml.diagram.menu.providers.InitTrueToggleState"

@@ -2649,72 +2649,62 @@
       point="org.eclipse.ui.handlers">

    <handler

          class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ViewGridHandler"

-         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ViewGridCommand">

+         commandId="org.eclipse.papyrus.infra.gmfdiag.menu.ViewGridCommand">

       <activeWhen>

-         <and>

-            <with

-                  variable="grid">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

+         <with

+               variable="activePart">

+            <adapt

+                  type="org.eclipse.gmf.runtime.notation.Diagram">

+            </adapt>

+         </with>

       </activeWhen>

    </handler>

    <handler

          class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.RecalculatePageBreaksHandler"

-         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.RecalculatePageBreaksCommand">

+         commandId="org.eclipse.papyrus.infra.gmfdiag.menu.RecalculatePageBreaksCommand">

       <activeWhen>

-         <and>

-            <with

-                  variable="recalculatePageBreaks">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

+         <with

+               variable="activePart">

+            <adapt

+                  type="org.eclipse.gmf.runtime.notation.Diagram">

+            </adapt>

+         </with>

       </activeWhen>

    </handler>

    <handler

          class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.SnapToGridHandler"

-         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.SnapToGridCommand">

+         commandId="org.eclipse.papyrus.infra.gmfdiag.menu.SnapToGridCommand">

       <activeWhen>

-         <and>

-            <with

-                  variable="snapToGrid">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

+         <with

+               variable="activePart">

+            <adapt

+                  type="org.eclipse.gmf.runtime.notation.Diagram">

+            </adapt>

+         </with>

       </activeWhen>

    </handler>

    <handler

          class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ViewPageBreaksHandler"

-         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ViewPageBreaksCommand">

+         commandId="org.eclipse.papyrus.infra.gmfdiag.menu.ViewPageBreaksCommand">

       <activeWhen>

-         <and>

-            <with

-                  variable="pageBreaks">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

+         <with

+               variable="activePart">

+            <adapt

+                  type="org.eclipse.gmf.runtime.notation.Diagram">

+            </adapt>

+         </with>

       </activeWhen>

    </handler>

    <handler

          class="org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ViewRulersHandler"

-         commandId="org.eclipse.papyrus.uml.diagram.menu.commands.ViewRulersCommand">

+         commandId="org.eclipse.papyrus.infra.gmfdiag.menu.ViewRulersCommand">

       <activeWhen>

-         <and>

-            <with

-                  variable="rulers">

-               <equals

-                     value="enabled">

-               </equals>

-            </with>

-         </and>

+         <with

+               variable="activePart">

+            <adapt

+                  type="org.eclipse.gmf.runtime.notation.Diagram">

+            </adapt>

+         </with>

       </activeWhen>

    </handler>

    <handler

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/ShowHideLabelsAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/ShowHideLabelsAction.java
index 298fb391587..90d8d12ca74 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/ShowHideLabelsAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/ShowHideLabelsAction.java
@@ -37,8 +37,12 @@ import org.eclipse.gmf.runtime.notation.Node;
 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.viewers.ILabelProvider;

 import org.eclipse.jface.viewers.ITreeContentProvider;

 import org.eclipse.jface.viewers.Viewer;

+import org.eclipse.papyrus.infra.core.services.ServiceException;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.ServiceUtilsForEditPart;

+import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

 import org.eclipse.papyrus.uml.diagram.common.commands.ShowHideLabelsRequest;

 import org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider;

 import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

@@ -67,6 +71,7 @@ public class ShowHideLabelsAction extends AbstractGraphicalParametricAction {
 	public static final String HIDE_PARAMETER = "hide"; //$NON-NLS-1$

 

 	public static final String SHOW_PARAMETER = "show"; //$NON-NLS-1$

+	public ILabelProvider labelProvider;

 

 

 	/**

@@ -80,6 +85,16 @@ public class ShowHideLabelsAction extends AbstractGraphicalParametricAction {
 	 */

 	public ShowHideLabelsAction(String parameter, List<IGraphicalEditPart> selectedEditPart) {

 		super(parameter, selectedEditPart);

+		

+		LabelProviderService labelProviderService;

+		try {

+			labelProviderService = (LabelProviderService)ServiceUtilsForEditPart.getInstance().getServiceRegistry(getDiagramEditPart()).getService(LabelProviderService.class);

+			labelProvider=labelProviderService.getLabelProvider(getDiagramEditPart());

+		} catch (ServiceException e) {

+			e.printStackTrace();

+		}

+		

+

 	}

 

 	/**

@@ -255,7 +270,8 @@ public class ShowHideLabelsAction extends AbstractGraphicalParametricAction {
 			CompoundCommand cmd = new CompoundCommand("Manage Conection Labels "); //$NON-NLS-1$

 

 			DiagramEditPart diagramEP = DiagramEditPartsUtil.getDiagramEditPart(editparts.get(0));

-			ShowHideLabelSelectionDialog selectionDialog = new ShowHideLabelSelectionDialog(DisplayUtils.getDisplay().getActiveShell(), new UMLLabelProvider(), new ContentProvider(diagramEP));

+			

+			ShowHideLabelSelectionDialog selectionDialog = new ShowHideLabelSelectionDialog(DisplayUtils.getDisplay().getActiveShell(), labelProvider, new ContentProvider(diagramEP));

 			selectionDialog.setTitle(this.title);

 			selectionDialog.setMessage(this.message);

 			selectionDialog.setContainerMode(true);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/AbstractViewHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/AbstractViewHandler.java
index da76b8fa6d9..067e7ed933d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/AbstractViewHandler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/AbstractViewHandler.java
@@ -69,6 +69,12 @@ public abstract class AbstractViewHandler extends AbstractParametricHandler {/*
 		return ((DiagramGraphicalViewer)getDiagramGraphicalViewer()).getWorkspaceViewerPreferenceStore().getBoolean(id);

 	}

 

+	/**

+	 * 

+	 * @see org.eclipse.papyrus.uml.diagram.menu.actions.handlers.AbstractParametricHandler#setEnabled(java.lang.Object)

+	 * 

+	 * @param evaluationContext

+	 */

 	@Override

 	public void setEnabled(Object evaluationContext) {

 		setBaseEnabled(getDiagramGraphicalViewer() != null);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/RecalculatePageBreaksHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/RecalculatePageBreaksHandler.java
index 6e21010293e..13710ac45cc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/RecalculatePageBreaksHandler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/actions/handlers/RecalculatePageBreaksHandler.java
@@ -16,9 +16,9 @@ package org.eclipse.papyrus.uml.diagram.menu.actions.handlers;
 import org.eclipse.core.commands.ExecutionEvent;

 import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.internal.properties.WorkspaceViewerProperties;

 import org.eclipse.gmf.runtime.diagram.ui.internal.requests.RecalculatePageBreaksRequest;

-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramGraphicalViewer;

+

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 

 /**

  * 

@@ -36,16 +36,7 @@ public class RecalculatePageBreaksHandler extends AbstractViewHandler {
 	 * 

 	 */

 	public RecalculatePageBreaksHandler() {

-		super(WorkspaceViewerProperties.VIEWPAGEBREAKS);

-	}

-

-	@Override

-	public void setEnabled(Object evaluationContext) {

-		if(super.isEnabled() && (getDiagramGraphicalViewer() instanceof DiagramGraphicalViewer)) {

-			setBaseEnabled(isChecked());

-			return;

-		}

-		setBaseEnabled(false);

+		super(PreferencesConstantsHelper.VIEW_PAGE_BREAK_CONSTANT);
 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/providers/HandlerStateSourceProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/providers/HandlerStateSourceProvider.java
index 1e6504c6e54..cbce7e28d98 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/providers/HandlerStateSourceProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/src/org/eclipse/papyrus/uml/diagram/menu/providers/HandlerStateSourceProvider.java
@@ -26,16 +26,11 @@ import org.eclipse.papyrus.uml.diagram.menu.actions.handlers.FillColorHandler;
 import org.eclipse.papyrus.uml.diagram.menu.actions.handlers.FontHandler;

 import org.eclipse.papyrus.uml.diagram.menu.actions.handlers.LineColorHandler;

 import org.eclipse.papyrus.uml.diagram.menu.actions.handlers.LineStyleHandler;

-import org.eclipse.papyrus.uml.diagram.menu.actions.handlers.RecalculatePageBreaksHandler;

 import org.eclipse.papyrus.uml.diagram.menu.actions.handlers.SelectHandler;

 import org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ShowHideCompartmentHandler;

 import org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ShowHideContentsHandler;

 import org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ShowHideLabelsHandler;

-import org.eclipse.papyrus.uml.diagram.menu.actions.handlers.SnapToGridHandler;

 import org.eclipse.papyrus.uml.diagram.menu.actions.handlers.SortFilterCompartmentItemsHandler;

-import org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ViewGridHandler;

-import org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ViewPageBreaksHandler;

-import org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ViewRulersHandler;

 import org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ZOrderHandler;

 import org.eclipse.papyrus.uml.diagram.menu.actions.handlers.ZoomHandler;

 import org.eclipse.ui.ISources;

@@ -61,16 +56,6 @@ public class HandlerStateSourceProvider extends AbstractActionStateSourceProvide
 

 	public static final String COPY_APPEARANCE_PROPERTIES = "copyAppearanceProperties";//$NON-NLS-1$

 

-	public static final String GRID = "grid";//$NON-NLS-1$

-

-	public static final String RULERS = "rulers";//$NON-NLS-1$

-

-	public static final String PAGE_BREAKS = "pageBreaks";//$NON-NLS-1$

-

-	public static final String RECALCULATE_PAGE_BREAKS = "recalculatePageBreaks";//$NON-NLS-1$

-

-	public static final String SNAP_TO_GRID = "snapToGrid";//$NON-NLS-1$

-

 	public static final String SORT_FILTER_COMPARTMENT_ITEMS = "sortFilterCompartmentItems"; //$NON-NLS-1$

 

 	public static final String ZOOM = "zoom"; //$NON-NLS-1$

@@ -115,11 +100,6 @@ public class HandlerStateSourceProvider extends AbstractActionStateSourceProvide
 		currentState.put(SHOW_HIDE_CONTENTS, DISABLED);

 		currentState.put(SHOW_HIDE_COMPARTMENTS, DISABLED);

 		currentState.put(COPY_APPEARANCE_PROPERTIES, DISABLED);

-		currentState.put(GRID, DISABLED);

-		currentState.put(RULERS, DISABLED);

-		currentState.put(PAGE_BREAKS, DISABLED);

-		currentState.put(RECALCULATE_PAGE_BREAKS, DISABLED);

-		currentState.put(SNAP_TO_GRID, DISABLED);

 		currentState.put(SORT_FILTER_COMPARTMENT_ITEMS, DISABLED);

 		currentState.put(ZOOM, DISABLED);

 

@@ -155,7 +135,7 @@ public class HandlerStateSourceProvider extends AbstractActionStateSourceProvide
 	 */

 	@Override

 	public String[] getProvidedSourceNames() {

-		return new String[]{ SHOW_HIDE_CONTENTS, SHOW_HIDE_COMPARTMENTS, COPY_APPEARANCE_PROPERTIES, GRID, RULERS, PAGE_BREAKS, RECALCULATE_PAGE_BREAKS, SNAP_TO_GRID, ZOOM

+		return new String[]{ SHOW_HIDE_CONTENTS, SHOW_HIDE_COMPARTMENTS, COPY_APPEARANCE_PROPERTIES, ZOOM

 

 

 		, BRING_TO_FRONT, SEND_TO_BACK, BRING_FORWARD, SEND_BACKWARD

@@ -181,11 +161,7 @@ public class HandlerStateSourceProvider extends AbstractActionStateSourceProvide
 		refresh(SHOW_HIDE_CONTENTS, new ShowHideContentsHandler());

 		refresh(SHOW_HIDE_COMPARTMENTS, new ShowHideCompartmentHandler());

 		refresh(COPY_APPEARANCE_PROPERTIES, new CopyAppearancePropertiesHandler());

-		refresh(GRID, new ViewGridHandler());

-		refresh(RULERS, new ViewRulersHandler());

-		refresh(PAGE_BREAKS, new ViewPageBreaksHandler());

-		refresh(RECALCULATE_PAGE_BREAKS, new RecalculatePageBreaksHandler());

-		refresh(SNAP_TO_GRID, new SnapToGridHandler());

+

 		refresh(SORT_FILTER_COMPARTMENT_ITEMS, new SortFilterCompartmentItemsHandler());

 		refresh(ZOOM, new ZoomHandler());

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/AbstractionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/AbstractionPreferencePage.java
index 91e6c52192e..d77d4b0be61 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/AbstractionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/AbstractionPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.uml.diagram.pkg.provider.ElementTypes;
 
 public class AbstractionPreferencePage extends PackageDiagramLinkPreferencePage {
@@ -58,7 +58,7 @@ public class AbstractionPreferencePage extends PackageDiagramLinkPreferencePage
 		// End of user code
 
 		for(String labelName : labelDefaultVisibilityMap.keySet()) {
-			String showLabelKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, labelName, PreferenceConstantHelper.LABEL_VISIBILITY);
+			String showLabelKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, labelName, PreferencesConstantsHelper.LABEL_VISIBILITY);
 			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
 		}
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/DependencyPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/DependencyPreferencePage.java
index ca658ce057b..bf34433f72e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/DependencyPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/DependencyPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.uml.diagram.pkg.provider.ElementTypes;
 
 public class DependencyPreferencePage extends PackageDiagramLinkPreferencePage {
@@ -58,7 +58,7 @@ public class DependencyPreferencePage extends PackageDiagramLinkPreferencePage {
 		// End of user code
 
 		for(String labelName : labelDefaultVisibilityMap.keySet()) {
-			String showLabelKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, labelName, PreferenceConstantHelper.LABEL_VISIBILITY);
+			String showLabelKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, labelName, PreferencesConstantsHelper.LABEL_VISIBILITY);
 			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
 		}
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/ModelPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/ModelPreferencePage.java
index 6fe9dbdf70d..b65cdb493dd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/ModelPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/ModelPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.uml.diagram.pkg.provider.ElementTypes;
 
 public class ModelPreferencePage extends PackageDiagramNodePreferencePage {
@@ -63,17 +63,17 @@ public class ModelPreferencePage extends PackageDiagramNodePreferencePage {
 		// Start of user code custom default initializations
 		// End of user code
 
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 200);
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 100);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 200);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100);
 		// Initialize default visibility for compartments in preference page.
 		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
+			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(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			String showCompartmentTitleKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);
+			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/PackageDiagramGeneralPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/PackageDiagramGeneralPreferencePage.java
index 7e37ff5c55c..386452fee6a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/PackageDiagramGeneralPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/PackageDiagramGeneralPreferencePage.java
@@ -15,10 +15,12 @@ package org.eclipse.papyrus.uml.diagram.pkg.preferences;
 
 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.DiagramPreferencePage;
 import org.eclipse.papyrus.uml.diagram.pkg.Activator;
+import org.eclipse.papyrus.uml.diagram.pkg.provider.ElementTypes;
 
 public class PackageDiagramGeneralPreferencePage extends DiagramPreferencePage {
 
 	public PackageDiagramGeneralPreferencePage() {
 		setPreferenceStore(Activator.getInstance().getPreferenceStore());
+		setPreferenceKey(ElementTypes.DIAGRAM_ID);
 	}
 }
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/PackageImportPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/PackageImportPreferencePage.java
index 6ce87092a76..ba5011319d9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/PackageImportPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/PackageImportPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.uml.diagram.pkg.provider.ElementTypes;
 
 public class PackageImportPreferencePage extends PackageDiagramLinkPreferencePage {
@@ -57,7 +57,7 @@ public class PackageImportPreferencePage extends PackageDiagramLinkPreferencePag
 		// End of user code
 
 		for(String labelName : labelDefaultVisibilityMap.keySet()) {
-			String showLabelKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, labelName, PreferenceConstantHelper.LABEL_VISIBILITY);
+			String showLabelKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, labelName, PreferencesConstantsHelper.LABEL_VISIBILITY);
 			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
 		}
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/PackagePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/PackagePreferencePage.java
index ed0ecb85a81..981e2158c01 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/PackagePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/PackagePreferencePage.java
@@ -18,7 +18,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.uml.diagram.pkg.provider.ElementTypes;
 
 public class PackagePreferencePage extends PackageDiagramNodePreferencePage {
@@ -63,17 +63,17 @@ public class PackagePreferencePage extends PackageDiagramNodePreferencePage {
 		// Start of user code custom default initializations
 		// End of user code
 
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 200);
-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 100);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 200);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100);
 		// Initialize default visibility for compartments in preference page.
 		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
-			String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
+			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(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
-			String showCompartmentTitleKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);
+			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);
 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
 		}
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src/org/eclipse/papyrus/uml/diagram/pkg/CustomModelPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src/org/eclipse/papyrus/uml/diagram/pkg/CustomModelPreferencePage.java
index bb13346545e..d51b074bd9d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src/org/eclipse/papyrus/uml/diagram/pkg/CustomModelPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src/org/eclipse/papyrus/uml/diagram/pkg/CustomModelPreferencePage.java
@@ -14,7 +14,7 @@
 package org.eclipse.papyrus.uml.diagram.pkg;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.pkg.preferences.ModelPreferencePage;

 

 public class CustomModelPreferencePage extends ModelPreferencePage {

@@ -33,17 +33,17 @@ public class CustomModelPreferencePage extends ModelPreferencePage {
 		// Start of user code custom default initializations

 		// End of user code

 

-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 200);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 100);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 200);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100);

 		// Initialize default visibility for compartments in preference page.

 		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {

-			String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			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(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {

-			String showCompartmentTitleKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);

 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src/org/eclipse/papyrus/uml/diagram/pkg/CustomPackagePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src/org/eclipse/papyrus/uml/diagram/pkg/CustomPackagePreferencePage.java
index 3e10d2869b6..1e2c4baac7f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src/org/eclipse/papyrus/uml/diagram/pkg/CustomPackagePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg/src/org/eclipse/papyrus/uml/diagram/pkg/CustomPackagePreferencePage.java
@@ -14,7 +14,7 @@
 package org.eclipse.papyrus.uml.diagram.pkg;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.pkg.preferences.PackagePreferencePage;

 

 public class CustomPackagePreferencePage extends PackagePreferencePage {

@@ -33,17 +33,17 @@ public class CustomPackagePreferencePage extends PackagePreferencePage {
 		// Start of user code custom default initializations

 		// End of user code

 

-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 200);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 100);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.WIDTH), 200);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(prefKey, PreferencesConstantsHelper.HEIGHT), 100);

 		// Initialize default visibility for compartments in preference page.

 		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {

-			String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			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(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {

-			String showCompartmentTitleKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			String showCompartmentTitleKey = PreferencesConstantsHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);

 			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/preferences/OperationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/preferences/OperationPreferencePage.java
index 505b365f1dd..df5c061472e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/preferences/OperationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/preferences/OperationPreferencePage.java
@@ -17,7 +17,7 @@ import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusElementPreferencePage;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 import org.eclipse.papyrus.uml.tools.utils.ICustomAppearence;

 import org.eclipse.swt.SWT;

@@ -80,13 +80,13 @@ public class OperationPreferencePage extends AbstractPapyrusElementPreferencePag
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String elementName = "Operation"; //$NON-NLS-1$

-		PreferenceConverter.setDefault(store, PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		PreferenceConverter.setDefault(store, PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(177, 207, 229));

+		PreferenceConverter.setDefault(store, PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

+		PreferenceConverter.setDefault(store, PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(177, 207, 229));

 

 		// Set the default for the gradient

-		store.setDefault(PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.GRADIENT_POLICY), false);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.GRADIENT_POLICY), false);

 		GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(new org.eclipse.swt.graphics.RGB(255, 255, 255), new org.eclipse.swt.graphics.RGB(177, 207, 229), 0, 0);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

 

 		// default for Operation label display

 		store.setDefault(IPapyrusOperationPreferencesConstant.OPERATION_LABEL_DISPLAY_PREFERENCE, ICustomAppearence.DEFAULT_UML_OPERATION);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/preferences/PropertyPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/preferences/PropertyPreferencePage.java
index f576c2dd238..bdc98a65512 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/preferences/PropertyPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/preferences/PropertyPreferencePage.java
@@ -17,7 +17,7 @@ import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusElementPreferencePage;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.tools.utils.ICustomAppearence;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.events.SelectionEvent;

@@ -77,13 +77,13 @@ public class PropertyPreferencePage extends AbstractPapyrusElementPreferencePage
 	public static void initDefaults(IPreferenceStore store) {

 

 		String elementName = "Property"; //$NON-NLS-1$

-		PreferenceConverter.setDefault(store, PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		PreferenceConverter.setDefault(store, PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(177, 207, 229));

+		PreferenceConverter.setDefault(store, PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

+		PreferenceConverter.setDefault(store, PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(177, 207, 229));

 

 		// Set the default for the gradient

-		store.setDefault(PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.GRADIENT_POLICY), false);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.GRADIENT_POLICY), false);

 		GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(new org.eclipse.swt.graphics.RGB(255, 255, 255), new org.eclipse.swt.graphics.RGB(177, 207, 229), 0, 0);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

 

 		// custom code

 		store.setDefault(IPapyrusPropertyPreferencesConstant.PROPERTY_LABEL_DISPLAY_PREFERENCE, ICustomAppearence.DEFAULT_UML_PROPERTY);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationNodeEditPart.java
index 956588df5c7..279b5d12629 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationNodeEditPart.java
@@ -45,7 +45,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic.CustomAssociationNodeItemSemanticEditPolicy;

@@ -139,8 +139,8 @@ public class AssociationNodeEditPart extends ShapeNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "AssociationNode";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -882,15 +882,15 @@ public class AssociationNodeEditPart extends ShapeNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("AssociationNode", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("AssociationNode", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("AssociationNode", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("AssociationNode", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("AssociationNode", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("AssociationNode", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("AssociationNode", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("AssociationNode", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/CommentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/CommentEditPart.java
index 7a2205c6ec2..e35e9c4fa80 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/CommentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/CommentEditPart.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -196,8 +196,8 @@ public class CommentEditPart extends AbstractCommentEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Comment";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -430,15 +430,15 @@ public class CommentEditPart extends AbstractCommentEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/CommentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/CommentEditPartCN.java
index e0e6666e6e7..49b9625a2bd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/CommentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/CommentEditPartCN.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -196,8 +196,8 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Comment";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -430,15 +430,15 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintEditPart.java
index b483c7ad87d..4032fe619e5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintEditPart.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -204,8 +204,8 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Constraint";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -735,15 +735,15 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintEditPartCN.java
index 25d0b2061a4..6b3e32c1119 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintEditPartCN.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

@@ -200,8 +200,8 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Constraint";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -731,15 +731,15 @@ public class ConstraintEditPartCN extends AbstractConstraintEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeEditPart.java
index 23f617c43e1..7b309f9e04a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeEditPart.java
@@ -43,7 +43,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -236,8 +236,8 @@ public class DataTypeEditPart extends ClassifierEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "DataType";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -913,15 +913,15 @@ public class DataTypeEditPart extends ClassifierEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DataType", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DataType", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DataType", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DataType", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DataType", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DataType", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("DataType", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("DataType", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeEditPartCN.java
index e4f7ac2859b..3ec458cc2b8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeEditPartCN.java
@@ -43,7 +43,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -236,8 +236,8 @@ public class DataTypeEditPartCN extends ClassifierEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "DataType";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -913,15 +913,15 @@ public class DataTypeEditPartCN extends ClassifierEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DataType", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DataType", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DataType", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DataType", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DataType", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DataType", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("DataType", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("DataType", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DependencyNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DependencyNodeEditPart.java
index 31a73ddf807..810cd1a10bf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DependencyNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DependencyNodeEditPart.java
@@ -50,7 +50,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.profile.edit.policies.DependencyNodeItemSemanticEditPolicy;

@@ -168,8 +168,8 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Dependency";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -569,15 +569,15 @@ public class DependencyNodeEditPart extends AbstractBorderedShapeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Dependency", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Dependency", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Dependency", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Dependency", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Dependency", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Dependency", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Dependency", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Dependency", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationEditPart.java
index 0d4672959ce..9e86994e73c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationEditPart.java
@@ -43,7 +43,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -222,8 +222,8 @@ public class EnumerationEditPart extends ClassifierEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Enumeration";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -896,15 +896,15 @@ public class EnumerationEditPart extends ClassifierEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Enumeration", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Enumeration", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Enumeration", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Enumeration", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Enumeration", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Enumeration", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Enumeration", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Enumeration", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationEditPartCN.java
index 4dc8cdca906..3198e090164 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationEditPartCN.java
@@ -43,7 +43,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -220,8 +220,8 @@ public class EnumerationEditPartCN extends ClassifierEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Enumeration";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -894,15 +894,15 @@ public class EnumerationEditPartCN extends ClassifierEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Enumeration", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Enumeration", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Enumeration", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Enumeration", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Enumeration", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Enumeration", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Enumeration", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Enumeration", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/MetaclassEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/MetaclassEditPart.java
index c881514680d..4889d20cced 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/MetaclassEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/MetaclassEditPart.java
@@ -42,7 +42,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -208,8 +208,8 @@ public class MetaclassEditPart extends ClassifierEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Metaclass";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -868,15 +868,15 @@ public class MetaclassEditPart extends ClassifierEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Metaclass", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Metaclass", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Metaclass", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Metaclass", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Metaclass", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Metaclass", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Metaclass", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Metaclass", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/MetaclassEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/MetaclassEditPartCN.java
index 6ea32e2ed88..03e02fd105c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/MetaclassEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/MetaclassEditPartCN.java
@@ -42,7 +42,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -208,8 +208,8 @@ public class MetaclassEditPartCN extends ClassifierEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Metaclass";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -868,15 +868,15 @@ public class MetaclassEditPartCN extends ClassifierEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Metaclass", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Metaclass", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Metaclass", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Metaclass", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Metaclass", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Metaclass", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Metaclass", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Metaclass", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelEditPartCN.java
index e5c5a23945d..12893b59b9d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelEditPartCN.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -216,8 +216,8 @@ public class ModelEditPartCN extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Model";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -728,15 +728,15 @@ public class ModelEditPartCN extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Model", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Model", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Model", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Model", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Model", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Model", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Model", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Model", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelEditPartTN.java
index 67ffda1b69a..afeeb39b1c1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelEditPartTN.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -216,8 +216,8 @@ public class ModelEditPartTN extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Model";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -728,15 +728,15 @@ public class ModelEditPartTN extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Model", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Model", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Model", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Model", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Model", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Model", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Model", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Model", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageEditPart.java
index a8de1994907..da9b5862848 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageEditPart.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -216,8 +216,8 @@ public class PackageEditPart extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Package";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -728,15 +728,15 @@ public class PackageEditPart extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Package", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Package", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Package", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Package", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Package", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Package", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Package", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Package", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageEditPartCN.java
index 27b85879fe4..aa97682edc7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageEditPartCN.java
@@ -42,7 +42,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -220,8 +220,8 @@ public class PackageEditPartCN extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Package";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -732,15 +732,15 @@ public class PackageEditPartCN extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Package", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Package", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Package", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Package", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Package", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Package", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Package", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Package", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PrimitiveTypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PrimitiveTypeEditPart.java
index c6c394a1df2..2296fd170b5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PrimitiveTypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PrimitiveTypeEditPart.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -200,8 +200,8 @@ public class PrimitiveTypeEditPart extends ClassifierEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "PrimitiveType";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -860,15 +860,15 @@ public class PrimitiveTypeEditPart extends ClassifierEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("PrimitiveType", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("PrimitiveType", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("PrimitiveType", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("PrimitiveType", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("PrimitiveType", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("PrimitiveType", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("PrimitiveType", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("PrimitiveType", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PrimitiveTypeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PrimitiveTypeEditPartCN.java
index 7da40089216..ec5776c11ec 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PrimitiveTypeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PrimitiveTypeEditPartCN.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -200,8 +200,8 @@ public class PrimitiveTypeEditPartCN extends ClassifierEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "PrimitiveType";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -860,15 +860,15 @@ public class PrimitiveTypeEditPartCN extends ClassifierEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("PrimitiveType", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("PrimitiveType", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("PrimitiveType", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("PrimitiveType", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("PrimitiveType", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("PrimitiveType", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("PrimitiveType", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("PrimitiveType", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileEditPartCN.java
index 57c6f8b8ebc..5df5b033092 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileEditPartCN.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -216,8 +216,8 @@ public class ProfileEditPartCN extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Profile";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -736,15 +736,15 @@ public class ProfileEditPartCN extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Profile", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Profile", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Profile", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Profile", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Profile", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Profile", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Profile", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Profile", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileEditPartTN.java
index c5215eb7326..67369da1b95 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileEditPartTN.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -216,8 +216,8 @@ public class ProfileEditPartTN extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Profile";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -736,15 +736,15 @@ public class ProfileEditPartTN extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Profile", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Profile", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Profile", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Profile", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Profile", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Profile", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Profile", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Profile", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ShortCutDiagramEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ShortCutDiagramEditPart.java
index 1ad448d49c4..eccdebf5b9f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ShortCutDiagramEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ShortCutDiagramEditPart.java
@@ -45,7 +45,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractShortCutDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShortCutDiagramEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy;

@@ -190,8 +190,8 @@ public class ShortCutDiagramEditPart extends AbstractShortCutDiagramEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "ShortCutDiagram";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -279,15 +279,15 @@ public class ShortCutDiagramEditPart extends AbstractShortCutDiagramEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ShortCutDiagram", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ShortCutDiagram", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ShortCutDiagram", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ShortCutDiagram", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ShortCutDiagram", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ShortCutDiagram", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("ShortCutDiagram", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("ShortCutDiagram", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeEditPart.java
index d244a9c4a8c..0d655a86c10 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeEditPart.java
@@ -44,7 +44,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

@@ -244,8 +244,8 @@ public class StereotypeEditPart extends ClassifierEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Stereotype";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -921,15 +921,15 @@ public class StereotypeEditPart extends ClassifierEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Stereotype", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Stereotype", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Stereotype", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Stereotype", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Stereotype", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Stereotype", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Stereotype", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Stereotype", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeEditPartCN.java
index d1f7e0705db..844241fffb6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeEditPartCN.java
@@ -44,7 +44,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

@@ -244,8 +244,8 @@ public class StereotypeEditPartCN extends ClassifierEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Stereotype";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -921,15 +921,15 @@ public class StereotypeEditPartCN extends ClassifierEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Stereotype", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Stereotype", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Stereotype", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Stereotype", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Stereotype", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Stereotype", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Stereotype", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Stereotype", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/AssociationNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/AssociationNodePreferencePage.java
index 429562eb675..6ec6bf9f3be 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/AssociationNodePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/AssociationNodePreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.profile.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class AssociationNodePreferencePage extends AbstractPapyrusNodePreference
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ProfileDiagramEditPart.MODEL_ID + "_AssociationNode";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 20);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 20);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 20);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 20);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/AssociationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/AssociationPreferencePage.java
index 206b6ea8889..bda477bc5f1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/AssociationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/AssociationPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

@@ -51,7 +51,7 @@ public class AssociationPreferencePage extends AbstractPapyrusLinkPreferencePage
 		String key = ProfileDiagramEditPart.MODEL_ID + "_Association";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/CommentPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/CommentPreferencePage.java
index 158d58955bb..c1c0bd044d8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/CommentPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/CommentPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.profile.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class CommentPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ProfileDiagramEditPart.MODEL_ID + "_Comment";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ConstraintPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ConstraintPreferencePage.java
index 23834221d1c..93b930c3151 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ConstraintPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ConstraintPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.profile.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class ConstraintPreferencePage extends AbstractPapyrusNodePreferencePage
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ProfileDiagramEditPart.MODEL_ID + "_Constraint";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DataTypePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DataTypePreferencePage.java
index 05a64a42c6d..f7db6f1a29e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DataTypePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DataTypePreferencePage.java
@@ -18,7 +18,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 

@@ -53,26 +53,26 @@ public class DataTypePreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ProfileDiagramEditPart.MODEL_ID + "_DataType";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 100);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 100);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 100);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 100);

 		Map<String, Boolean> map = getStaticCompartmentVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ElementImportPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ElementImportPreferencePage.java
index ef9fd2127da..b50d9cc6449 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ElementImportPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ElementImportPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

@@ -51,7 +51,7 @@ public class ElementImportPreferencePage extends AbstractPapyrusLinkPreferencePa
 		String key = ProfileDiagramEditPart.MODEL_ID + "_ElementImport";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/EnumerationLiteralPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/EnumerationLiteralPreferencePage.java
index debf2a9938d..be97162762c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/EnumerationLiteralPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/EnumerationLiteralPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.profile.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class EnumerationLiteralPreferencePage extends AbstractPapyrusNodePrefere
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ProfileDiagramEditPart.MODEL_ID + "_EnumerationLiteral";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/EnumerationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/EnumerationPreferencePage.java
index 29dce3482d4..77a046dbbe3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/EnumerationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/EnumerationPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 

@@ -53,26 +53,26 @@ public class EnumerationPreferencePage extends AbstractPapyrusNodePreferencePage
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ProfileDiagramEditPart.MODEL_ID + "_Enumeration";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 100);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 100);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 100);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 100);

 		Map<String, Boolean> map = getStaticCompartmentVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/GeneralizationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/GeneralizationPreferencePage.java
index a7088e1a68c..80cac82d3cc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/GeneralizationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/GeneralizationPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

@@ -51,7 +51,7 @@ public class GeneralizationPreferencePage extends AbstractPapyrusLinkPreferenceP
 		String key = ProfileDiagramEditPart.MODEL_ID + "_Generalization";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/MetaclassPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/MetaclassPreferencePage.java
index 9a7457ed189..5c7cc642b47 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/MetaclassPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/MetaclassPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.profile.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class MetaclassPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ProfileDiagramEditPart.MODEL_ID + "_Metaclass";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 100);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 50);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 100);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 50);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ModelPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ModelPreferencePage.java
index 2be2d73c19a..dcbea2a56f0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ModelPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ModelPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 

@@ -53,26 +53,26 @@ public class ModelPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ProfileDiagramEditPart.MODEL_ID + "_Model";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 200);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 100);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 200);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 100);

 		Map<String, Boolean> map = getStaticCompartmentVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/OperationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/OperationPreferencePage.java
index 8d4db9a3969..50359273f78 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/OperationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/OperationPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.profile.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class OperationPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ProfileDiagramEditPart.MODEL_ID + "_Operation";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PackageImportPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PackageImportPreferencePage.java
index b852fda95ec..4c64710984f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PackageImportPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PackageImportPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

@@ -51,7 +51,7 @@ public class PackageImportPreferencePage extends AbstractPapyrusLinkPreferencePa
 		String key = ProfileDiagramEditPart.MODEL_ID + "_PackageImport";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PackagePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PackagePreferencePage.java
index 19e8f2ba393..44589333faf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PackagePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PackagePreferencePage.java
@@ -18,7 +18,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 

@@ -53,26 +53,26 @@ public class PackagePreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ProfileDiagramEditPart.MODEL_ID + "_Package";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 200);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 100);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 200);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 100);

 		Map<String, Boolean> map = getStaticCompartmentVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PrimitiveTypePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PrimitiveTypePreferencePage.java
index 9307c13aa54..ec91d7935c7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PrimitiveTypePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PrimitiveTypePreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.profile.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class PrimitiveTypePreferencePage extends AbstractPapyrusNodePreferencePa
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ProfileDiagramEditPart.MODEL_ID + "_PrimitiveType";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 100);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 50);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 100);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 50);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ProfilePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ProfilePreferencePage.java
index e74db6c0641..140cf32a388 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ProfilePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ProfilePreferencePage.java
@@ -18,7 +18,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 

@@ -53,26 +53,26 @@ public class ProfilePreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ProfileDiagramEditPart.MODEL_ID + "_Profile";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 200);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 100);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 200);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 100);

 		Map<String, Boolean> map = getStaticCompartmentVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PropertyPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PropertyPreferencePage.java
index 560f094937d..326d4870ab3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PropertyPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PropertyPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.profile.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class PropertyPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ProfileDiagramEditPart.MODEL_ID + "_Property";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ShortCutDiagramPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ShortCutDiagramPreferencePage.java
index 3e254804174..6020c9443b4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ShortCutDiagramPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ShortCutDiagramPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

@@ -49,21 +49,21 @@ public class ShortCutDiagramPreferencePage extends AbstractPapyrusNodePreference
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ProfileDiagramEditPart.MODEL_ID + "_ShortCutDiagram";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 20);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 20);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/StereotypePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/StereotypePreferencePage.java
index 20b3507e159..565249c4435 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/StereotypePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/StereotypePreferencePage.java
@@ -18,7 +18,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;

 

@@ -53,26 +53,26 @@ public class StereotypePreferencePage extends AbstractPapyrusNodePreferencePage
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = ProfileDiagramEditPart.MODEL_ID + "_Stereotype";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 100);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 100);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 100);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 100);

 		Map<String, Boolean> map = getStaticCompartmentVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLViewProvider.java
index ca0f370af07..e14d0a5566c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLViewProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLViewProvider.java
@@ -55,7 +55,7 @@ import org.eclipse.jface.preference.PreferenceConverter;
 import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

 import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AppliedStereotypeElementImportEditPart;

 import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationAppliedStereotypeEditPart;

@@ -1474,8 +1474,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	private void initFontStyleFromPrefs(View view, final IPreferenceStore store, String elementName) {

-		String fontConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.FONT);

-		String fontColorConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_FONT);

+		String fontConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.FONT);

+		String fontColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_FONT);

 		FontStyle viewFontStyle = (FontStyle)view.getStyle(NotationPackage.Literals.FONT_STYLE);

 		if(viewFontStyle != null) {

 			FontData fontData = PreferenceConverter.getFontData(store, fontConstant);

@@ -1492,7 +1492,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	private void initForegroundFromPrefs(View view, final IPreferenceStore store, String elementName) {

-		String lineColorConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_LINE);

+		String lineColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_LINE);

 		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(store, lineColorConstant);

 		ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getLineStyle_LineColor(), FigureUtilities.RGBToInteger(lineRGB));

 	}

@@ -1501,9 +1501,9 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	private void initBackgroundFromPrefs(View view, final IPreferenceStore store, String elementName) {

-		String fillColorConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_FILL);

-		String gradientColorConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_GRADIENT);

-		String gradientPolicyConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.GRADIENT_POLICY);

+		String fillColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_FILL);

+		String gradientColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_GRADIENT);

+		String gradientPolicyConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.GRADIENT_POLICY);

 		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(store, fillColorConstant);

 		ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getFillStyle_FillColor(), FigureUtilities.RGBToInteger(fillRGB));

 		FillStyle fillStyle = (FillStyle)view.getStyle(NotationPackage.Literals.FILL_STYLE);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CreateGateViewCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CreateGateViewCommand.java
index 803ce0d3195..d727f216596 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CreateGateViewCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/command/CreateGateViewCommand.java
@@ -37,7 +37,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.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+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.edit.parts.GateEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

@@ -203,8 +203,8 @@ public class CreateGateViewCommand extends AbstractTransactionalCommand {
 		int y = ((Integer)getStructuralFeatureValue(view, NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		String prefElementId = ViewUtil.resolveSemanticElement(view).eClass().getName();

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(view, prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(view, prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(view, prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(view, prefElementId, PreferencesConstantsHelper.HEIGHT);

 		if(width <= 0) {

 			width = store.getInt(preferenceConstantWitdh);

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomCombinedFragmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomCombinedFragmentEditPart.java
index f2234b26d71..0b046c40cdb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomCombinedFragmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomCombinedFragmentEditPart.java
@@ -85,7 +85,7 @@ import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
 import org.eclipse.papyrus.infra.emf.appearance.helper.ShadowFigureHelper;

 import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

 import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.IPapyrusNodeFigure;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.PapyrusNodeFigure;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.AnchorHelper;

@@ -203,8 +203,8 @@ public class CustomCombinedFragmentEditPart extends CombinedFragmentEditPart imp
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "CombinedFragment";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new AnchorHelper.CombinedFragmentNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomConsiderIgnoreFragmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomConsiderIgnoreFragmentEditPart.java
index d2de97dc818..deef5bb44b2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomConsiderIgnoreFragmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomConsiderIgnoreFragmentEditPart.java
@@ -23,7 +23,7 @@ import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
 import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.uml.diagram.common.providers.UIAdapterImpl;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.helpers.AnchorHelper;

@@ -83,8 +83,8 @@ public class CustomConsiderIgnoreFragmentEditPart extends CustomCombinedFragment
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "ConsiderIgnoreFragment";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new AnchorHelper.CombinedFragmentNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomDurationConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomDurationConstraintEditPart.java
index 134d63232fc..6b13cf9a483 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomDurationConstraintEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomDurationConstraintEditPart.java
@@ -61,7 +61,7 @@ import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.draw2d.LinesBorder;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;

@@ -784,8 +784,8 @@ public class CustomDurationConstraintEditPart extends DurationConstraintEditPart
 		int y = ((Integer)getStructuralFeatureValue(view, NotationPackage.eINSTANCE.getLocation_Y())).intValue();

 		String prefElementId = ViewUtil.resolveSemanticElement(view).eClass().getName();

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(view, prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(view, prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(view, prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(view, prefElementId, PreferencesConstantsHelper.HEIGHT);

 		if(width <= 0) {

 			width = store.getInt(preferenceConstantWitdh);

 		}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomDurationConstraintInMessageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomDurationConstraintInMessageEditPart.java
index 0ba53371431..5d082f9483a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomDurationConstraintInMessageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomDurationConstraintInMessageEditPart.java
@@ -154,8 +154,8 @@ public class CustomDurationConstraintInMessageEditPart extends DurationConstrain
 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(-1, -1);

 		//String prefElementId = "DurationConstraint";

 		//IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		//String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		//String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		//String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		//String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		//DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomDurationObservationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomDurationObservationEditPart.java
index 0e77a20511b..a811e322a58 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomDurationObservationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomDurationObservationEditPart.java
@@ -131,8 +131,8 @@ public class CustomDurationObservationEditPart extends DurationObservationEditPa
 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(-1, -1);

 		//String prefElementId = "DurationObservation";

 		//IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		//String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		//String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		//String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		//String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		//DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomInteractionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomInteractionEditPart.java
index 03051e3900d..c8f0d53a64b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomInteractionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomInteractionEditPart.java
@@ -52,7 +52,7 @@ import org.eclipse.gmf.runtime.notation.Shape;
 import org.eclipse.gmf.runtime.notation.Size;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.InteractionRectangleFigure;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.uml.diagram.common.providers.UIAdapterImpl;

@@ -519,8 +519,8 @@ public class CustomInteractionEditPart extends InteractionEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Interaction";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight)) {

 

 			@Override

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomTimeConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomTimeConstraintEditPart.java
index eefa6f0c1c8..d15bf1efc50 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomTimeConstraintEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomTimeConstraintEditPart.java
@@ -149,8 +149,8 @@ public class CustomTimeConstraintEditPart extends TimeConstraintEditPart {
 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(TimeConstraintFigure.TIME_MARK_LENGTH, 1);

 		//String prefElementId = "TimeConstraint";

 		//IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		//String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		//String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		//String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		//String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		//DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomTimeObservationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomTimeObservationEditPart.java
index aa40806a9df..57a7cd2c064 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomTimeObservationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomTimeObservationEditPart.java
@@ -151,8 +151,8 @@ public class CustomTimeObservationEditPart extends TimeObservationEditPart {
 		//DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(TimeMarkElementFigure.TIME_MARK_LENGTH, 1);

 		//String prefElementId = "TimeObservation";

 		//IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		//String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		//String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		//String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		//String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		//DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		//result.getBounds().setSize(result.getPreferredSize());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionCompartmentXYLayoutEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionCompartmentXYLayoutEditPolicy.java
index 64761b029c9..53e653c3608 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionCompartmentXYLayoutEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/InteractionCompartmentXYLayoutEditPolicy.java
@@ -666,6 +666,9 @@ public class InteractionCompartmentXYLayoutEditPolicy extends XYLayoutEditPolicy
 	public Command getCommand(Request request) {
 		if(request instanceof ChangeBoundsRequest) {
 			ChangeBoundsRequest cbr = (ChangeBoundsRequest)request;
+			if (cbr.getEditParts() == null){
+				return super.getCommand(request);
+			}
 			int resizeDirection = cbr.getResizeDirection();
 			CompoundCommand compoundCmd = new CompoundCommand("Resize of Interaction Compartment Elements");
 			for(EditPart ep : (List<EditPart>)cbr.getEditParts()) {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/CustomContextLinkFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/CustomContextLinkFigure.java
index efaf5ab083a..d802846854f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/CustomContextLinkFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/CustomContextLinkFigure.java
@@ -41,7 +41,11 @@ public class CustomContextLinkFigure extends DashedEdgeFigure {
 		add(conveyedLabel, 0);

 	}

 

-	protected void setStyle() {

+	/**

+	 * @see org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure#resetStyle()

+	 */

+	@Override

+	public void resetStyle() {

 		PolylineDecoration dec = new PolylineDecoration();

 		dec.setScale(15, 5);

 		dec.setLineWidth(1);

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 1c47e9ce392..0097b4696ad 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
@@ -26,7 +26,7 @@ import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.BackgroundColor;
 import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.DecorationGroup;

 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.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.part.Messages;

 import org.eclipse.swt.SWT;

@@ -64,10 +64,10 @@ public class CustomCombinedFragmentPreferencePage extends CombinedFragmentPrefer
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = PackageEditPart.MODEL_ID + "_CombinedFragment";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 40);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 40);

 		for(String name : compartments) {

-			String preferenceName = PreferenceConstantHelper.getCompartmentElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getCompartmentElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, true);

 		}

 	}

@@ -156,11 +156,11 @@ public class CustomCombinedFragmentPreferencePage extends CombinedFragmentPrefer
 			gridData.grabExcessHorizontalSpace = true;

 			gridData.horizontalSpan = 2;

 			group.setLayoutData(gridData);

-			String compartmentVisibilityPreference = PreferenceConstantHelper.getCompartmentElementConstant(getKey(), compartment, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String compartmentVisibilityPreference = PreferencesConstantsHelper.getCompartmentElementConstant(getKey(), compartment, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			String compartmentVisibilityLabel = "Show compartment";

 			Button showCompartmentButton = addCheckboxField(group, compartmentVisibilityPreference, compartmentVisibilityLabel);

 			if(this.compartmentsWithTitle.contains(compartment)) {

-				String compartmentNameVisibilityPreference = PreferenceConstantHelper.getCompartmentElementConstant(getKey(), compartment, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+				String compartmentNameVisibilityPreference = PreferencesConstantsHelper.getCompartmentElementConstant(getKey(), compartment, PreferencesConstantsHelper.COMPARTMENT_NAME_VISIBILITY);

 				String compartmentNameVisibilityLabel = "Show name";

 				Button showNameButton = addCheckboxField(group, compartmentNameVisibilityPreference, compartmentNameVisibilityLabel);

 				boolean showCompartmentIsNotChecked = !myPreferenceStore.getBoolean(compartmentVisibilityPreference);

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 6bfec7d1e0d..a10ff5f684c 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
@@ -22,7 +22,7 @@ import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.BackgroundColor;
 import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.DecorationGroup;

 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.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.part.Messages;

 import org.eclipse.papyrus.uml.diagram.sequence.preferences.CustomCombinedFragmentPreferencePage.NodeCompartmentGroupEx;

@@ -53,10 +53,10 @@ public class CustomConsiderIgnoreFragmentPreferencePage extends ConsiderIgnoreFr
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = PackageEditPart.MODEL_ID + "_ConsiderIgnoreFragment";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 40);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 40);

 		for(String name : compartments) {

-			String preferenceName = PreferenceConstantHelper.getCompartmentElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getCompartmentElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, true);

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/preferences/CustomDestructionOccurrenceSpecificationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/preferences/CustomDestructionOccurrenceSpecificationPreferencePage.java
index 624c08bafee..780d14f3b85 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/preferences/CustomDestructionOccurrenceSpecificationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/preferences/CustomDestructionOccurrenceSpecificationPreferencePage.java
@@ -14,7 +14,7 @@
 package org.eclipse.papyrus.uml.diagram.sequence.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

 

 /**

@@ -27,7 +27,7 @@ public class CustomDestructionOccurrenceSpecificationPreferencePage extends Dest
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = PackageEditPart.MODEL_ID + "_DestructionOccurrenceSpecification";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 20);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 20);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 20);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 20);

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/preferences/CustomLifelinePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/preferences/CustomLifelinePreferencePage.java
index 5d742c51b9e..3ed373f0457 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/preferences/CustomLifelinePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/preferences/CustomLifelinePreferencePage.java
@@ -14,7 +14,7 @@
 package org.eclipse.papyrus.uml.diagram.sequence.preferences;

 

 import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.events.SelectionEvent;

@@ -46,8 +46,8 @@ public class CustomLifelinePreferencePage extends LifelinePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = PackageEditPart.MODEL_ID + "_Lifeline";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 100);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 250);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 100);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 250);

 		store.setDefault(LABEL_DISPLAY_PREFERENCE, DEFAULT_LABEL_DISPLAY);

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/preferences/DestructionEventPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/preferences/DestructionEventPreferencePage.java
index 362c93d6ff7..3a926005543 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/preferences/DestructionEventPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/preferences/DestructionEventPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.sequence.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class DestructionEventPreferencePage extends AbstractPapyrusNodePreferenc
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = PackageEditPart.MODEL_ID + "_DestructionEvent";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.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 8033037ed35..41c6a79e657 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
@@ -40,7 +40,7 @@ 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.gmfdiag.preferences.utils.PreferenceConstantHelper;

+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;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragment2EditPart;

@@ -185,8 +185,8 @@ public class FixGateViewOnOpening {
 		EObject element = ViewUtil.resolveSemanticElement(shape);

 		String prefElementId = element.eClass().getName();

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(shape, prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(shape, prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(shape, prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(shape, prefElementId, PreferencesConstantsHelper.HEIGHT);

 		return new Dimension(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 	}

 

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ActionExecutionSpecificationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ActionExecutionSpecificationEditPart.java
index f3726aa953b..b5de6a8d566 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ActionExecutionSpecificationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ActionExecutionSpecificationEditPart.java
@@ -42,7 +42,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+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.edit.policies.ActionExecutionSpecificationItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.ElementCreationWithMessageEditPolicy;

@@ -149,8 +149,8 @@ public class ActionExecutionSpecificationEditPart extends AbstractExecutionSpeci
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "ActionExecutionSpecification";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -1015,15 +1015,15 @@ public class ActionExecutionSpecificationEditPart extends AbstractExecutionSpeci
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ActionExecutionSpecification", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ActionExecutionSpecification", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ActionExecutionSpecification", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ActionExecutionSpecification", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ActionExecutionSpecification", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ActionExecutionSpecification", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("ActionExecutionSpecification", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("ActionExecutionSpecification", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/BehaviorExecutionSpecificationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/BehaviorExecutionSpecificationEditPart.java
index 00eeafec744..e7fc9df9d78 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/BehaviorExecutionSpecificationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/BehaviorExecutionSpecificationEditPart.java
@@ -42,7 +42,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+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.edit.policies.BehaviorExecutionSpecificationItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.ElementCreationWithMessageEditPolicy;

@@ -149,8 +149,8 @@ public class BehaviorExecutionSpecificationEditPart extends AbstractExecutionSpe
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "BehaviorExecutionSpecification";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -1015,15 +1015,15 @@ public class BehaviorExecutionSpecificationEditPart extends AbstractExecutionSpe
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("BehaviorExecutionSpecification", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("BehaviorExecutionSpecification", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("BehaviorExecutionSpecification", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("BehaviorExecutionSpecification", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("BehaviorExecutionSpecification", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("BehaviorExecutionSpecification", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("BehaviorExecutionSpecification", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("BehaviorExecutionSpecification", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CombinedFragment2EditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CombinedFragment2EditPart.java
index b6478e8108d..a39e07987d5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CombinedFragment2EditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CombinedFragment2EditPart.java
@@ -40,7 +40,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+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.edit.policies.CombinedFragment2ItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.LifelineChildGraphicalNodeEditPolicy;

@@ -133,8 +133,8 @@ public class CombinedFragment2EditPart extends ShapeNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "CombinedFragment";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -959,15 +959,15 @@ public class CombinedFragment2EditPart extends ShapeNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("CombinedFragment", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("CombinedFragment", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("CombinedFragment", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("CombinedFragment", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("CombinedFragment", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("CombinedFragment", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("CombinedFragment", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("CombinedFragment", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CombinedFragmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CombinedFragmentEditPart.java
index 3889005edf0..952ba449df9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CombinedFragmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CombinedFragmentEditPart.java
@@ -43,7 +43,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

@@ -209,8 +209,8 @@ public class CombinedFragmentEditPart extends InteractionFragmentEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "CombinedFragment";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -296,15 +296,15 @@ public class CombinedFragmentEditPart extends InteractionFragmentEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("CombinedFragment", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("CombinedFragment", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("CombinedFragment", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("CombinedFragment", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("CombinedFragment", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("CombinedFragment", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("CombinedFragment", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("CombinedFragment", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CommentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CommentEditPart.java
index ea5ce5c2916..99f8a3f7bcc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CommentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CommentEditPart.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -195,8 +195,8 @@ public class CommentEditPart extends AbstractCommentEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Comment";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -1111,15 +1111,15 @@ public class CommentEditPart extends AbstractCommentEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ConsiderIgnoreFragmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ConsiderIgnoreFragmentEditPart.java
index e7c7fcb2f6f..a63d27c811d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ConsiderIgnoreFragmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ConsiderIgnoreFragmentEditPart.java
@@ -40,7 +40,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.CombinedFragmentItemComponentEditPolicy;

@@ -148,8 +148,8 @@ public class ConsiderIgnoreFragmentEditPart extends CombinedFragmentEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "ConsiderIgnoreFragment";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -974,15 +974,15 @@ public class ConsiderIgnoreFragmentEditPart extends CombinedFragmentEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ConsiderIgnoreFragment", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ConsiderIgnoreFragment", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ConsiderIgnoreFragment", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ConsiderIgnoreFragment", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ConsiderIgnoreFragment", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ConsiderIgnoreFragment", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("ConsiderIgnoreFragment", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("ConsiderIgnoreFragment", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ConstraintEditPart.java
index 4c7b2dd3b63..19ab03132cc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ConstraintEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ConstraintEditPart.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -201,8 +201,8 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Constraint";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -1127,15 +1127,15 @@ public class ConstraintEditPart extends AbstractConstraintEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ContinuationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ContinuationEditPart.java
index c2d872411c8..d907fa701d3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ContinuationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/ContinuationEditPart.java
@@ -43,7 +43,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.draw2d.CenterLayout;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.CenteredWrappedLabel;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

@@ -189,8 +189,8 @@ public class ContinuationEditPart extends AbstractBorderItemEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Continuation";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1071,15 +1071,15 @@ public class ContinuationEditPart extends AbstractBorderItemEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Continuation", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Continuation", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Continuation", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Continuation", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Continuation", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Continuation", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Continuation", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Continuation", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DestructionOccurrenceSpecificationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DestructionOccurrenceSpecificationEditPart.java
index c2e7ae2ef3a..c6bc3ced4d6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DestructionOccurrenceSpecificationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DestructionOccurrenceSpecificationEditPart.java
@@ -29,7 +29,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+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.edit.policies.DestructionEventComponentEditPolicy;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.DestructionOccurrenceSpecificationItemSemanticEditPolicy;

@@ -123,8 +123,8 @@ public class DestructionOccurrenceSpecificationEditPart extends AbstractBorderIt
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "DestructionOccurrenceSpecification";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -972,15 +972,15 @@ public class DestructionOccurrenceSpecificationEditPart extends AbstractBorderIt
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DestructionOccurrenceSpecification", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DestructionOccurrenceSpecification", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DestructionOccurrenceSpecification", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DestructionOccurrenceSpecification", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DestructionOccurrenceSpecification", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DestructionOccurrenceSpecification", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("DestructionOccurrenceSpecification", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("DestructionOccurrenceSpecification", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DurationConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DurationConstraintEditPart.java
index cb1665594c7..48c2628a71f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DurationConstraintEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DurationConstraintEditPart.java
@@ -52,7 +52,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.draw2d.CenterLayout;

 import org.eclipse.papyrus.uml.diagram.common.draw2d.LinesBorder;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

@@ -174,8 +174,8 @@ public class DurationConstraintEditPart extends BorderedBorderItemEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "DurationConstraint";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1147,15 +1147,15 @@ public class DurationConstraintEditPart extends BorderedBorderItemEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DurationConstraint", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DurationConstraint", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DurationConstraint", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DurationConstraint", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DurationConstraint", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DurationConstraint", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("DurationConstraint", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("DurationConstraint", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DurationConstraintInMessageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DurationConstraintInMessageEditPart.java
index 955467451e6..0c1f786a95d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DurationConstraintInMessageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DurationConstraintInMessageEditPart.java
@@ -52,7 +52,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+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.edit.policies.DeleteTimeElementWithoutEventPolicy;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.DurationConstraintInMessageItemSemanticEditPolicy;

@@ -227,8 +227,8 @@ public class DurationConstraintInMessageEditPart extends AbstractBorderedShapeEd
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "DurationConstraint";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -1186,15 +1186,15 @@ public class DurationConstraintInMessageEditPart extends AbstractBorderedShapeEd
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DurationConstraint", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DurationConstraint", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DurationConstraint", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DurationConstraint", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DurationConstraint", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DurationConstraint", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("DurationConstraint", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("DurationConstraint", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DurationObservationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DurationObservationEditPart.java
index 07792dfc12f..24fe9993825 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DurationObservationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DurationObservationEditPart.java
@@ -52,7 +52,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+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.edit.policies.DeleteTimeElementWithoutEventPolicy;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.DurationObservationItemSemanticEditPolicy;

@@ -227,8 +227,8 @@ public class DurationObservationEditPart extends AbstractBorderedShapeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "DurationObservation";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -1098,15 +1098,15 @@ public class DurationObservationEditPart extends AbstractBorderedShapeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DurationObservation", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DurationObservation", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DurationObservation", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DurationObservation", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DurationObservation", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DurationObservation", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("DurationObservation", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("DurationObservation", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionEditPart.java
index d459a512c58..3e56c3c5627 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionEditPart.java
@@ -42,7 +42,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.InteractionRectangleFigure;

@@ -207,8 +207,8 @@ public class InteractionEditPart extends ShapeNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Interaction";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -1051,15 +1051,15 @@ public class InteractionEditPart extends ShapeNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Interaction", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Interaction", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Interaction", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Interaction", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Interaction", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Interaction", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Interaction", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Interaction", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionOperandEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionOperandEditPart.java
index 3da937a71ee..0e4c147422d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionOperandEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionOperandEditPart.java
@@ -46,7 +46,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

@@ -163,8 +163,8 @@ public class InteractionOperandEditPart extends AbstractBorderedShapeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "InteractionOperand";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -307,15 +307,15 @@ public class InteractionOperandEditPart extends AbstractBorderedShapeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InteractionOperand", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InteractionOperand", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InteractionOperand", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InteractionOperand", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InteractionOperand", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InteractionOperand", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("InteractionOperand", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("InteractionOperand", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionUseEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionUseEditPart.java
index 82ec3aa98f2..cfeec27b6e9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionUseEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/InteractionUseEditPart.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+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.edit.policies.InteractionUseItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.OpenDiagramEditPolicy;

@@ -203,8 +203,8 @@ public class InteractionUseEditPart extends InteractionFragmentEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "InteractionUse";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -303,15 +303,15 @@ public class InteractionUseEditPart extends InteractionFragmentEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InteractionUse", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InteractionUse", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InteractionUse", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InteractionUse", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("InteractionUse", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("InteractionUse", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("InteractionUse", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("InteractionUse", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/LifelineEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/LifelineEditPart.java
index fb6a3848b8e..84733c7ec81 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/LifelineEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/LifelineEditPart.java
@@ -45,7 +45,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

@@ -286,8 +286,8 @@ public class LifelineEditPart extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Lifeline";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -1129,15 +1129,15 @@ public class LifelineEditPart extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Lifeline", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Lifeline", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Lifeline", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Lifeline", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Lifeline", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Lifeline", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Lifeline", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Lifeline", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/StateInvariantEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/StateInvariantEditPart.java
index dda103c16ee..913de484223 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/StateInvariantEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/StateInvariantEditPart.java
@@ -43,7 +43,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.draw2d.CenterLayout;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.CenteredWrappedLabel;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

@@ -185,8 +185,8 @@ public class StateInvariantEditPart extends AbstractBorderItemEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "StateInvariant";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1061,15 +1061,15 @@ public class StateInvariantEditPart extends AbstractBorderItemEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("StateInvariant", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("StateInvariant", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("StateInvariant", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("StateInvariant", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("StateInvariant", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("StateInvariant", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("StateInvariant", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("StateInvariant", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/TimeConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/TimeConstraintEditPart.java
index ab5e775e8ce..512789711e7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/TimeConstraintEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/TimeConstraintEditPart.java
@@ -50,7 +50,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+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.edit.policies.DeleteTimeElementWithoutEventPolicy;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.TimeConstraintItemSemanticEditPolicy;

@@ -170,8 +170,8 @@ public class TimeConstraintEditPart extends BorderedBorderItemEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "TimeConstraint";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1108,15 +1108,15 @@ public class TimeConstraintEditPart extends BorderedBorderItemEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("TimeConstraint", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("TimeConstraint", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("TimeConstraint", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("TimeConstraint", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("TimeConstraint", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("TimeConstraint", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("TimeConstraint", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("TimeConstraint", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/TimeObservationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/TimeObservationEditPart.java
index 5c80e51077d..ff135c1f9cc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/TimeObservationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/TimeObservationEditPart.java
@@ -50,7 +50,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+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.edit.policies.DeleteTimeElementWithoutEventPolicy;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.TimeObservationItemSemanticEditPolicy;

@@ -170,8 +170,8 @@ public class TimeObservationEditPart extends BorderedBorderItemEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "TimeObservation";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -1020,15 +1020,15 @@ public class TimeObservationEditPart extends BorderedBorderItemEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("TimeObservation", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("TimeObservation", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("TimeObservation", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("TimeObservation", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("TimeObservation", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("TimeObservation", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("TimeObservation", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("TimeObservation", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/ActionExecutionSpecificationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/ActionExecutionSpecificationPreferencePage.java
index a6bbeda8ac4..7db0b71edf3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/ActionExecutionSpecificationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/ActionExecutionSpecificationPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.sequence.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class ActionExecutionSpecificationPreferencePage extends AbstractPapyrusN
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = PackageEditPart.MODEL_ID + "_ActionExecutionSpecification";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 16);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 60);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 16);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 60);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/BehaviorExecutionSpecificationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/BehaviorExecutionSpecificationPreferencePage.java
index 1b8291315e3..379b0450851 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/BehaviorExecutionSpecificationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/BehaviorExecutionSpecificationPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.sequence.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class BehaviorExecutionSpecificationPreferencePage extends AbstractPapyru
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = PackageEditPart.MODEL_ID + "_BehaviorExecutionSpecification";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 16);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 60);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 16);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 60);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/CombinedFragmentPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/CombinedFragmentPreferencePage.java
index 2da46247cb0..936f2b24256 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/CombinedFragmentPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/CombinedFragmentPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.sequence.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class CombinedFragmentPreferencePage extends AbstractPapyrusNodePreferenc
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = PackageEditPart.MODEL_ID + "_CombinedFragment";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/CommentPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/CommentPreferencePage.java
index 5df7ed38b0c..e77de863fc3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/CommentPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/CommentPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.sequence.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class CommentPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = PackageEditPart.MODEL_ID + "_Comment";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/ConsiderIgnoreFragmentPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/ConsiderIgnoreFragmentPreferencePage.java
index fb83881159d..c3c63e6f616 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/ConsiderIgnoreFragmentPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/ConsiderIgnoreFragmentPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.sequence.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class ConsiderIgnoreFragmentPreferencePage extends AbstractPapyrusNodePre
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = PackageEditPart.MODEL_ID + "_ConsiderIgnoreFragment";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/ConstraintPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/ConstraintPreferencePage.java
index 6e9c7820918..51bb0cf6646 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/ConstraintPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/ConstraintPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.sequence.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class ConstraintPreferencePage extends AbstractPapyrusNodePreferencePage
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = PackageEditPart.MODEL_ID + "_Constraint";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/ContinuationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/ContinuationPreferencePage.java
index d3d0257f74b..ddbe2f561b2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/ContinuationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/ContinuationPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.sequence.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class ContinuationPreferencePage extends AbstractPapyrusNodePreferencePag
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = PackageEditPart.MODEL_ID + "_Continuation";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/DestructionOccurrenceSpecificationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/DestructionOccurrenceSpecificationPreferencePage.java
index 1b6506827f3..6c5a727eda0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/DestructionOccurrenceSpecificationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/DestructionOccurrenceSpecificationPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.sequence.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class DestructionOccurrenceSpecificationPreferencePage extends AbstractPa
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = PackageEditPart.MODEL_ID + "_DestructionOccurrenceSpecification";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/DurationConstraintInMessagePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/DurationConstraintInMessagePreferencePage.java
index 1f15796ac51..2eb4c57389f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/DurationConstraintInMessagePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/DurationConstraintInMessagePreferencePage.java
@@ -17,7 +17,7 @@ import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

 /**

@@ -38,11 +38,11 @@ public class DurationConstraintInMessagePreferencePage extends AbstractPapyrusNo
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String elementName = "DurationConstraintInMessage";

-		PreferenceConverter.setDefault(store, PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		PreferenceConverter.setDefault(store, PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		PreferenceConverter.setDefault(store, PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

+		PreferenceConverter.setDefault(store, PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

 		// Set the default for the gradient

-		store.setDefault(PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.GRADIENT_POLICY), false);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.GRADIENT_POLICY), false);

 		GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(new org.eclipse.swt.graphics.RGB(255, 255, 255), new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/DurationConstraintPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/DurationConstraintPreferencePage.java
index 64bbe570221..9e031cce846 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/DurationConstraintPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/DurationConstraintPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.sequence.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class DurationConstraintPreferencePage extends AbstractPapyrusNodePrefere
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = PackageEditPart.MODEL_ID + "_DurationConstraint";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/DurationObservationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/DurationObservationPreferencePage.java
index 040b62f5a4e..5c57145ddb4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/DurationObservationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/DurationObservationPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.sequence.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class DurationObservationPreferencePage extends AbstractPapyrusNodePrefer
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = PackageEditPart.MODEL_ID + "_DurationObservation";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/InteractionOperandPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/InteractionOperandPreferencePage.java
index 4843755b463..8c9c8f5719b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/InteractionOperandPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/InteractionOperandPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.sequence.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class InteractionOperandPreferencePage extends AbstractPapyrusNodePrefere
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = PackageEditPart.MODEL_ID + "_InteractionOperand";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/InteractionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/InteractionPreferencePage.java
index baf0c4fb315..3a33114eb5d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/InteractionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/InteractionPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

@@ -53,26 +53,26 @@ public class InteractionPreferencePage extends AbstractPapyrusNodePreferencePage
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = PackageEditPart.MODEL_ID + "_Interaction";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 857);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 757);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/InteractionUsePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/InteractionUsePreferencePage.java
index 4b6a468c942..90f27731230 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/InteractionUsePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/InteractionUsePreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.sequence.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class InteractionUsePreferencePage extends AbstractPapyrusNodePreferenceP
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = PackageEditPart.MODEL_ID + "_InteractionUse";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/LifelinePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/LifelinePreferencePage.java
index 5dc7a739cbf..856716088b1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/LifelinePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/LifelinePreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.sequence.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class LifelinePreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = PackageEditPart.MODEL_ID + "_Lifeline";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 100);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 250);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 100);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 250);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/StateInvariantPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/StateInvariantPreferencePage.java
index c23279afbb6..52ac2db2160 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/StateInvariantPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/StateInvariantPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.sequence.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class StateInvariantPreferencePage extends AbstractPapyrusNodePreferenceP
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = PackageEditPart.MODEL_ID + "_StateInvariant";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/TimeConstraintPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/TimeConstraintPreferencePage.java
index bed1f46c38e..76fa6ecbe3f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/TimeConstraintPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/TimeConstraintPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.sequence.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class TimeConstraintPreferencePage extends AbstractPapyrusNodePreferenceP
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = PackageEditPart.MODEL_ID + "_TimeConstraint";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/TimeObservationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/TimeObservationPreferencePage.java
index f40d40267df..4150ce7a3f1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/TimeObservationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/preferences/TimeObservationPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.sequence.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.PackageEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class TimeObservationPreferencePage extends AbstractPapyrusNodePreference
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = PackageEditPart.MODEL_ID + "_TimeObservation";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/providers/UMLViewProvider.java
index 66c88dba033..8cf4da11f6d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/providers/UMLViewProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/providers/UMLViewProvider.java
@@ -55,7 +55,7 @@ import org.eclipse.jface.preference.PreferenceConverter;
 import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

 import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+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.edit.parts.ActionExecutionSpecificationEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.BehaviorExecutionSpecificationEditPart;

@@ -1242,8 +1242,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	private void initFontStyleFromPrefs(View view, final IPreferenceStore store, String elementName) {

-		String fontConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.FONT);

-		String fontColorConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_FONT);

+		String fontConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.FONT);

+		String fontColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_FONT);

 		FontStyle viewFontStyle = (FontStyle)view.getStyle(NotationPackage.Literals.FONT_STYLE);

 		if(viewFontStyle != null) {

 			FontData fontData = PreferenceConverter.getFontData(store, fontConstant);

@@ -1260,7 +1260,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	private void initForegroundFromPrefs(View view, final IPreferenceStore store, String elementName) {

-		String lineColorConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_LINE);

+		String lineColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_LINE);

 		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(store, lineColorConstant);

 		ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getLineStyle_LineColor(), FigureUtilities.RGBToInteger(lineRGB));

 	}

@@ -1269,9 +1269,9 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	private void initBackgroundFromPrefs(View view, final IPreferenceStore store, String elementName) {

-		String fillColorConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_FILL);

-		String gradientColorConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_GRADIENT);

-		String gradientPolicyConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.GRADIENT_POLICY);

+		String fillColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_FILL);

+		String gradientColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_GRADIENT);

+		String gradientPolicyConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.GRADIENT_POLICY);

 		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(store, fillColorConstant);

 		ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getFillStyle_FillColor(), FigureUtilities.RGBToInteger(fillRGB));

 		FillStyle fillStyle = (FillStyle)view.getStyle(NotationPackage.Literals.FILL_STYLE);

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/CustomFirstRegionInStateMachineCreateElementCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/CustomFirstRegionInStateMachineCreateElementCommand.java
new file mode 100644
index 00000000000..9fdc5f77704
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/CustomFirstRegionInStateMachineCreateElementCommand.java
@@ -0,0 +1,158 @@
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
+import org.eclipse.gmf.runtime.diagram.core.services.ViewService;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;
+import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.notation.Bounds;
+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.uml.diagram.common.commands.SemanticAdapter;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.Zone;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.ElementInitializers;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
+import org.eclipse.uml2.uml.Region;
+import org.eclipse.uml2.uml.StateMachine;
+import org.eclipse.uml2.uml.UMLFactory;
+
+/**
+ * Create a region.
+ * TODO: Differences with generated RegionCreateCommand ? (is the latter used?)
+ */
+public class CustomFirstRegionInStateMachineCreateElementCommand extends AbstractTransactionalCommand {
+
+	IAdaptable adaptable;
+
+	IAdaptable adaptableForDropped = null;
+
+	PreferencesHint prefHints;
+
+	CreateViewRequest.ViewDescriptor viewDescriptor;
+
+	CreateElementRequest createElementRequest;
+
+	String dropLocation = Zone.NONE;
+
+	public CustomFirstRegionInStateMachineCreateElementCommand(IAdaptable adaptable, IAdaptable adaptableForDropped, PreferencesHint prefHints, TransactionalEditingDomain domain, String label, String dropLocation) {
+		super(domain, label, null);
+		this.adaptable = adaptable;
+		this.adaptableForDropped = adaptableForDropped;
+		this.prefHints = prefHints;
+
+		viewDescriptor = new ViewDescriptor(adaptable, prefHints);
+
+		// make sure the return object is available even before
+		// executing/undoing/redoing
+		setResult(CommandResult.newOKCommandResult(viewDescriptor));
+
+		this.dropLocation = dropLocation;
+	}
+
+	@Override
+	public boolean canExecute() {
+		if (true) return true;
+		View compartment = (View)adaptable.getAdapter(View.class);
+		if(compartment.getChildren().isEmpty()) {
+			View owner = (View)compartment.eContainer();
+			return true;
+			/*
+			State state = (State)owner.getElement();
+			if(state.getSubmachine() == null)
+				return true;
+			return false;
+			*/
+		}
+		// CHECK THIS		
+		//		else{
+		//			ENamedElement namedElement =  PackageUtil.getElement("notation.View.visible");
+		//			if(ViewUtil.getStructuralFeatureValue(compartment, (EStructuralFeature)namedElement).equals(new Boolean(false))){
+		//				SetPropertyCommand showCompartment = new SetPropertyCommand(getEditingDomain(), adaptable, "notation.View.visible", "Visibility", true);
+		//				showCompartment.setOptions(Collections.singletonMap(Transaction.OPTION_UNPROTECTED, Boolean.TRUE));
+		//
+		//				try {
+		//					showCompartment.execute(null, null);
+		//				} catch (ExecutionException e) {
+		//				}				
+		//
+		//			}
+		//			return false;
+		//		}
+		return true;
+	}
+
+	protected void doConfigure(Region newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		IElementType elementType = createElementRequest.getElementType();
+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
+		configureRequest.setClientContext(createElementRequest.getClientContext());
+		configureRequest.addParameters(createElementRequest.getParameters());
+		ICommand configureCommand = elementType.getEditCommand(configureRequest);
+		if(configureCommand != null && configureCommand.canExecute()) {
+			configureCommand.execute(monitor, info);
+		}
+	}
+
+	@Override
+	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+		// adapt the view at execution time
+		View ownerView = (View)adaptable.getAdapter(View.class);
+		Node compartment = (Node)ownerView.getChildren().get(1);
+		
+		// get state bounds
+		int height = Zone.getHeight(ownerView);
+		int width = Zone.getWidth(ownerView);
+		if(height < Zone.defaultHeight) {
+			height = Zone.defaultHeight;
+			Zone.setHeight(ownerView, height);
+		}
+		if(width < Zone.defaultWidth) {
+			width = Zone.defaultWidth;
+			Zone.setWidth(ownerView, width);
+		}
+
+		if(adaptableForDropped == null) {
+			Region umlRegion = UMLFactory.eINSTANCE.createRegion();
+
+			createElementRequest = new CreateElementRequest(getEditingDomain(), ownerView, UMLElementTypes.Region_3000);
+
+			StateMachine umlState = (StateMachine)ownerView.getElement();
+			umlState.getRegions().add(umlRegion);
+
+			ElementInitializers.getInstance().init_Region_3000(umlRegion);
+
+			doConfigure(umlRegion, monitor, info);
+
+			adaptableForDropped = new SemanticAdapter(umlRegion, null);
+		}
+
+		// create a view for the new region on the stateMachineCompartment
+		String semanticHint = ((IHintedType)UMLElementTypes.Region_3000).getSemanticHint();
+		Node newRegion = (Node)ViewService.getInstance().createNode(adaptableForDropped, compartment, semanticHint, -1, prefHints);
+
+		// add region specific annotation
+		Zone.createRegionDefaultAnnotation(newRegion);
+
+		// adjust bounds and zone
+		LayoutConstraint lc = compartment.getLayoutConstraint();
+		if(lc instanceof Bounds) {
+			Bounds bounds = (Bounds) lc;
+			Zone.setWidth(newRegion, bounds.getWidth());
+			Zone.setHeight(newRegion, bounds.getHeight());
+		}
+
+		viewDescriptor.setView(newRegion);
+
+		return CommandResult.newOKCommandResult(viewDescriptor);
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/CustomRegionPreDeleteCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/CustomRegionPreDeleteCommand.java
index 418cc788b63..9914add528d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/CustomRegionPreDeleteCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/commands/CustomRegionPreDeleteCommand.java
@@ -11,26 +11,19 @@ import org.eclipse.gmf.runtime.common.core.command.CommandResult;
 import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.Zone;
-import org.eclipse.uml2.uml.StateMachine;
 
 public class CustomRegionPreDeleteCommand extends DeleteCommand {
 
 	public CustomRegionPreDeleteCommand(TransactionalEditingDomain editingDomain, View view) {
 		super(editingDomain, view);
-		// TODO Auto-generated constructor stub
 	}
 
 	/*
-	 * Prevents the removal of the last region displayed in the state machine or composite state
+	 * Was: Prevents the removal of the last region displayed in the state machine or composite state
+	 * Restriction has been removed, see bug 424449 - [State machine diagram] state machine cannot be deleted
 	 */
 	@Override
 	public boolean canExecute() {
-		View compartment = (View)getView().eContainer();
-		if(compartment.getElement() instanceof StateMachine) {
-			if(compartment.getChildren().size() != 1)
-				return true;
-			return false;
-		}
 		return true;
 	}
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomRegionCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomRegionCompartmentEditPart.java
index 0c955220ca7..9247dac4839 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomRegionCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomRegionCompartmentEditPart.java
@@ -17,16 +17,13 @@ public class CustomRegionCompartmentEditPart extends RegionCompartmentEditPart {
 
 	public CustomRegionCompartmentEditPart(View view) {
 		super(view);
-		// TODO Auto-generated constructor stub
 	}
 
 	@Override
 	protected void createDefaultEditPolicies() {
-		// TODO Auto-generated method stub
 		super.createDefaultEditPolicies();
 		removeEditPolicy(EditPolicyRoles.CONNECTION_HANDLES_ROLE);
 		removeEditPolicy(EditPolicyRoles.POPUPBAR_ROLE);
-
 	}
 
 	public IFigure createFigure() {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomRegionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomRegionEditPart.java
index 2ef125bbb7f..2ec023b6976 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomRegionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/edit/part/CustomRegionEditPart.java
@@ -19,16 +19,13 @@ public class CustomRegionEditPart extends RegionEditPart {
 
 	public CustomRegionEditPart(View view) {
 		super(view);
-		// TODO Auto-generated constructor stub
 	}
 
 	@Override
 	protected void createDefaultEditPolicies() {
-		// TODO Auto-generated method stub
 		super.createDefaultEditPolicies();
 		removeEditPolicy(EditPolicyRoles.CONNECTION_HANDLES_ROLE);
 		removeEditPolicy(EditPolicyRoles.POPUPBAR_ROLE);
-
 	}
 
 	/**
@@ -66,7 +63,6 @@ public class CustomRegionEditPart extends RegionEditPart {
 
 	@Override
 	protected void refreshVisuals() {
-		// TODO Auto-generated method stub
 		super.refreshVisuals();
 
 		View view = (View)getModel();
@@ -74,23 +70,28 @@ public class CustomRegionEditPart extends RegionEditPart {
 
 		// check the region zone
 		String zone = Zone.getZone(view);
-		// check the neighbours if any and change the corresponding flags in the
-		// figure
-		if(Zone.hasRightNeighbours(zone))
-			f.setDisplayRightBorder(true);
-		else
-			f.setDisplayRightBorder(false);
-		if(Zone.hasBottomNeighbours(zone))
-			f.setDisplayBottomBorder(true);
-		else
+		if (zone != null) {
+			// check the neighbours if any and change the corresponding flags in the
+			// figure
+			if(Zone.hasRightNeighbours(zone))
+				f.setDisplayRightBorder(true);
+			else
+				f.setDisplayRightBorder(false);
+			if(Zone.hasBottomNeighbours(zone))
+				f.setDisplayBottomBorder(true);
+			else
+				f.setDisplayBottomBorder(false);
+			
+			CustomRegionResizableEditPolicy policy = (CustomRegionResizableEditPolicy)getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+			// test for allowed directions
+			int dirs = Zone.getAllowedResizeDirections(zone);
+			// constrain the edit policy with these directions
+			if(policy != null)
+				policy.setResizeDirections(dirs);
+		}
+		else {
 			f.setDisplayBottomBorder(false);
-
-		CustomRegionResizableEditPolicy policy = (CustomRegionResizableEditPolicy)getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		// test for allowed directions
-		int dirs = Zone.getAllowedResizeDirections(zone);
-		// constrain the edit policy with these directions
-		if(policy != null)
-			policy.setResizeDirections(dirs);
-
+			f.setDisplayRightBorder(false);
+		}
 	}
 }
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/figures/NoExtraHeightLayoutManager.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/figures/NoExtraHeightLayoutManager.java
index 919b89bdd2f..46e3a6d1734 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/figures/NoExtraHeightLayoutManager.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/figures/NoExtraHeightLayoutManager.java
@@ -45,12 +45,12 @@ public class NoExtraHeightLayoutManager extends AutomaticCompartmentLayoutManage
 	protected void optimizeCompartmentSize(IFigure container, int vOffset) {
 		int compartmentsHeight = 0;
 		int notCompartmentsHeight = vOffset;
-		for(int i = 0; i < notCompartmentList.size(); i++) {
-			notCompartmentsHeight += notCompartmentList.get(i).getBounds().height;
+		for(int i = 0; i < visibleOthers.size(); i++) {
+			notCompartmentsHeight += visibleOthers.get(i).getBounds().height;
 		}
 
-		for(int i = 0; i < compartmentList.size(); i++) {
-			compartmentsHeight += compartmentList.get(i).getBounds().height;
+		for(int i = 0; i < visibleCompartments.size(); i++) {
+			compartmentsHeight += visibleCompartments.get(i).getBounds().height;
 		}
 		int remainingspace = container.getBounds().height - notCompartmentsHeight;
 
@@ -58,23 +58,23 @@ public class NoExtraHeightLayoutManager extends AutomaticCompartmentLayoutManage
 		// compartments container.
 		double ratio = new Integer(compartmentsHeight).doubleValue() / new Integer(remainingspace).doubleValue();
 
-		for(int i = 0; i < compartmentList.size(); i++) {
-			Rectangle bound = new Rectangle((compartmentList.get(i)).getBounds());
+		for(int i = 0; i < visibleCompartments.size(); i++) {
+			Rectangle bound = new Rectangle((visibleCompartments.get(i)).getBounds());
 			int value = (int)(bound.height / ratio);
 			bound.height = value;
 			bound.x = container.getBounds().x;
 			if(i > 0) {
-				bound.y = (compartmentList.get(i - 1)).getBounds().getBottomLeft().y;
+				bound.y = (visibleCompartments.get(i - 1)).getBounds().getBottomLeft().y;
 			}
-			(compartmentList.get(i)).setBounds(bound);
+			(visibleCompartments.get(i)).setBounds(bound);
 		}
 	}
 
 	@Override
 	public void layout(IFigure container) {
 
-		collectInformationOnChildren(container);
-		if(compartmentList.size() != 0) {
+		collectInformation(container);
+		if(visibleCompartments.size() != 0) {
 			// visit all compartments
 			IFigure previousCompartment = null;
 			int vOffset = 0;
@@ -104,7 +104,7 @@ public class NoExtraHeightLayoutManager extends AutomaticCompartmentLayoutManage
 						bounds.y = container.getBounds().y;
 						// difference to superclass: first visible compartment does not start with a vertical offset of 3 pixels, unless
 						// a "not"-compartment, i.e. a label
-						if(notCompartmentList.contains(currentCompartment)) {
+						if(visibleOthers.contains(currentCompartment)) {
 							vOffset = 3; // is taken into account by optimizeCompartmentSize;
 							bounds.y += vOffset;
 						}
@@ -121,7 +121,7 @@ public class NoExtraHeightLayoutManager extends AutomaticCompartmentLayoutManage
 			}
 			optimizeCompartmentSize(container, vOffset);
 		} else {
-			layoutCenterForLabel(container);
+			layoutOthers(container.getBounds());
 		}
 	}
 }
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/figures/TransitionFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/figures/TransitionFigure.java
index d20c18c6139..c787207712b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/figures/TransitionFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/figures/TransitionFigure.java
@@ -1,3 +1,15 @@
+/*****************************************************************************

+ * Copyright (c) 2014 CEA.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  CEA - Initial API and implementation

+ *

+ *****************************************************************************/

 package org.eclipse.papyrus.uml.diagram.statemachine.custom.figures;

 

 import org.eclipse.draw2d.Graphics;

@@ -16,15 +28,14 @@ public class TransitionFigure extends DashedEdgeFigure {
 	 */

 	public TransitionFigure() {

 		super();

-		setStyle();

+		setupDefaultStyle();

 	}

 

 	/**

-	 * Sets initial Style for the figure. It does not give any special Color for

-	 * Background and Foreground. This is the style used for classic arrows:

-	 * ------>

+	 * @see org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure#resetStyle()

 	 */

-	protected void setStyle() {

+	@Override

+	public void resetStyle() {

 		PolylineDecoration dec = new PolylineDecoration();

 		dec.setScale(15, 5);

 		dec.setLineWidth(1);

@@ -34,6 +45,5 @@ public class TransitionFigure extends DashedEdgeFigure {
 			this.setTargetDecoration(null);

 		}// arrow at target endpoint

 		this.setLineStyle(Graphics.LINE_CUSTOM); // line drawing style

-

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/helpers/Zone.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/helpers/Zone.java
index 0d9f989338e..2ce73462ab0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/helpers/Zone.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/helpers/Zone.java
@@ -126,7 +126,7 @@ public class Zone {
 	 */
 	public static int getAllowedResizeDirections(String s) {
 		if(s == null)
-			throw new IllegalArgumentException();
+			return PositionConstants.NONE;
 		// this involves bit-wise operations
 		// we start with none directions allowed
 		// then add others
@@ -529,7 +529,7 @@ public class Zone {
 	 */
 	public static String getZone(View view) {
 		if(view.getEAnnotation(ANNOTATION_KEY) == null)
-			throw new IllegalArgumentException();
+			return null;
 		if(!view.getEAnnotation(ANNOTATION_KEY).getDetails().containsKey(ZONE_KEY))
 			throw new IllegalArgumentException();
 		return view.getEAnnotation(ANNOTATION_KEY).getDetails().get(ZONE_KEY);
@@ -687,7 +687,7 @@ public class Zone {
 	 */
 	public static boolean isBottom(String s) {
 		if(s == null)
-			throw new IllegalArgumentException();
+			return false;
 		return s.endsWith(Zone.BOTTOM);
 	}
 
@@ -701,24 +701,11 @@ public class Zone {
 	 */
 	public static boolean isLeft(String s) {
 		if(s == null)
-			throw new IllegalArgumentException();
+			return false;
 		return s.endsWith(Zone.LEFT);
 	}
 
 	/**
-	 * Checks whether the leaf location encoded is NONE.
-	 * 
-	 * @param s
-	 *        a string
-	 * @return boolean true or false
-	 */
-	public static boolean isNone(String s) {
-		if(s == null)
-			throw new IllegalArgumentException();
-		return s.equals(Zone.NONE);
-	}
-
-	/**
 	 * Checks whether the view is a region
 	 * 
 	 * @param view
@@ -727,7 +714,7 @@ public class Zone {
 	 */
 	public static boolean isRegion(View view) {
 		if(view == null)
-			throw new IllegalArgumentException();
+			return false;
 		return (UMLVisualIDRegistry.getVisualID(view.getType()) == RegionEditPart.VISUAL_ID);
 	}
 
@@ -741,7 +728,7 @@ public class Zone {
 	 */
 	public static boolean isRight(String s) {
 		if(s == null)
-			throw new IllegalArgumentException();
+			return false;
 		return s.endsWith(Zone.RIGHT);
 	}
 
@@ -767,7 +754,7 @@ public class Zone {
 	 */
 	public static boolean isTop(String s) {
 		if(s == null)
-			throw new IllegalArgumentException();
+			return false;
 		return s.endsWith(Zone.TOP);
 	}
 
@@ -783,7 +770,10 @@ public class Zone {
 		// get the region zone
 		String zone = getZone(region);
 		// get its counterpart
-		String cZone = getZoneCounterpart(zone);
+		if (zone == null) {
+			return;
+		}
+ 		String cZone = getZoneCounterpart(zone);
 
 		List<View> list = new ArrayList<View>();
 		// get the stateMachine compartment
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomStateMachineCompartmentCreationEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomStateMachineCompartmentCreationEditPolicy.java
new file mode 100644
index 00000000000..f9998dec26d
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/policies/CustomStateMachineCompartmentCreationEditPolicy.java
@@ -0,0 +1,71 @@
+package org.eclipse.papyrus.uml.diagram.statemachine.custom.policies;
+
+import java.util.Iterator;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.requests.ChangeBoundsRequest;
+import org.eclipse.gef.requests.CreateRequest;
+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateUnspecifiedTypeRequest;
+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
+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.uml.diagram.common.commands.SemanticAdapter;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.commands.CustomFirstRegionInStateMachineCreateElementCommand;
+import org.eclipse.papyrus.uml.diagram.statemachine.custom.helpers.Zone;
+import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes;
+
+public class CustomStateMachineCompartmentCreationEditPolicy extends CreationEditPolicy {
+
+	IFigure sizeOnDropFeedback = null;
+
+	String dropLocation = Zone.RIGHT;
+	
+	@Override
+	public Command getCommand(Request request) {
+
+		// CHECK THIS
+		TransactionalEditingDomain editingDomain = ((IGraphicalEditPart)getHost()).getEditingDomain();
+		CompositeTransactionalCommand cc = new CompositeTransactionalCommand(editingDomain, DiagramUIMessages.AddCommand_Label);
+		if(understandsRequest(request)) {
+			if(request instanceof CreateUnspecifiedTypeRequest) {
+				CreateUnspecifiedTypeRequest unspecReq = (CreateUnspecifiedTypeRequest)request;
+				for(Iterator iter = unspecReq.getElementTypes().iterator(); iter.hasNext();) {
+					IElementType elementType = (IElementType)iter.next();
+					CreateRequest createRequest = unspecReq.getRequestForType(elementType);
+
+					if(((IHintedType)elementType).getSemanticHint().equals(((IHintedType)UMLElementTypes.Region_3000).getSemanticHint())) {
+
+						// starting point is the existing region compartment on
+						// which mouse was moving
+						View existingRegionCompartmentView = (View)getHost().getModel();
+						// the existing region view
+						View existingRegionView = (View)existingRegionCompartmentView.eContainer();
+						// get and adaptable for it, to pass on to commands
+						IAdaptable adaptableForExistingRegionView = (IAdaptable)new SemanticAdapter(null, existingRegionView);
+
+						// do the whole job
+						CustomFirstRegionInStateMachineCreateElementCommand createNewRegion = new CustomFirstRegionInStateMachineCreateElementCommand(adaptableForExistingRegionView, null, ((IGraphicalEditPart)getHost()).getDiagramPreferencesHint(), editingDomain, DiagramUIMessages.CreateCommand_Label, dropLocation);
+
+						cc.compose(createNewRegion);
+						return new ICommandProxy(cc.reduce());
+					}
+				}
+			}
+			else if(request instanceof ChangeBoundsRequest) {
+				return getReparentCommand((ChangeBoundsRequest) request);
+			}
+
+			return super.getCommand(request);
+		}
+		return null;
+	}
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/preferences/CustomStatePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/preferences/CustomStatePreferencePage.java
index 10977c0e4f3..172b59179aa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/preferences/CustomStatePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/preferences/CustomStatePreferencePage.java
@@ -1,7 +1,7 @@
 package org.eclipse.papyrus.uml.diagram.statemachine.custom.preferences;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
 import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PackageEditPart;
 import org.eclipse.papyrus.uml.diagram.statemachine.preferences.StatePreferencePage;
 
@@ -10,11 +10,11 @@ public class CustomStatePreferencePage extends StatePreferencePage {
 	public static void initDefaults(IPreferenceStore store) {
 
 		String key = PackageEditPart.MODEL_ID + "_State";
-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);
-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 40);
+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 40);
 
 		for(String name : compartments) {
-			String preferenceName = PreferenceConstantHelper.getCompartmentElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
+			String preferenceName = PreferencesConstantsHelper.getCompartmentElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);
 			store.setDefault(preferenceName, false);
 		}
 	}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/preferences/CustomTransitionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/preferences/CustomTransitionPreferencePage.java
index 1034eea9b31..da9129f4dbb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/preferences/CustomTransitionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/preferences/CustomTransitionPreferencePage.java
@@ -1,6 +1,7 @@
 package org.eclipse.papyrus.uml.diagram.statemachine.custom.preferences;
 
 import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.gmfdiag.common.helper.DiagramHelper;
 import org.eclipse.papyrus.uml.diagram.statemachine.preferences.TransitionPreferencePage;
 import org.eclipse.papyrus.uml.tools.utils.ICustomAppearence;
 import org.eclipse.swt.SWT;
@@ -37,22 +38,29 @@ public class CustomTransitionPreferencePage extends TransitionPreferencePage {
 	 * @param store the preference store associated with the state machine diagram.
 	 */
 	public static void initDefaults(IPreferenceStore store) {
+		boolean refresh = false;
 		int cutLength = 1;
 		if(cutLength != store.getInt(PreferenceConstants.BODY_CUT_LENGTH)) {
 			store.setValue(PreferenceConstants.BODY_CUT_LENGTH, cutLength);
+			refresh = true;
 		}
 		
 		boolean indicateParams = true;
 		if(indicateParams != store.getBoolean(PreferenceConstants.INDICATE_PARAMETERS)) {
 			store.setValue(PreferenceConstants.INDICATE_PARAMETERS, indicateParams);
+			refresh = true;
 		}
 		TransitionPreferencePage.initDefaults(store);
 		
 		boolean lineBreakBeforeEffect = true;
 		if(lineBreakBeforeEffect != store.getBoolean(PreferenceConstants.LINEBREAK_BEFORE_EFFECT)) {
 			store.setValue(PreferenceConstants.LINEBREAK_BEFORE_EFFECT, lineBreakBeforeEffect);
+			refresh = true;
 		}
 		TransitionPreferencePage.initDefaults(store);
+		if (refresh) {
+			DiagramHelper.refreshDiagrams();
+		}
 	}
 	
 	
@@ -161,21 +169,29 @@ public class CustomTransitionPreferencePage extends TransitionPreferencePage {
 	 */
 	protected void storePreferences() {
 		IPreferenceStore store = getPreferenceStore();
+		boolean refresh = false;
 		// checks the stored value and the actual one, so does not refresh diagram if it is not
 		// needed
 		boolean lineBreakBeforeEffect = bLineBreakBeforeEffector.getSelection();
 		if(lineBreakBeforeEffect != store.getBoolean(PreferenceConstants.LINEBREAK_BEFORE_EFFECT)) {
 			store.setValue(PreferenceConstants.LINEBREAK_BEFORE_EFFECT, lineBreakBeforeEffect);
+			refresh = true;
 		}
 
 		int cutLength = new Integer(tBodyCutLength.getText().trim());
 		if(cutLength != store.getInt(PreferenceConstants.BODY_CUT_LENGTH)) {
 			store.setValue(PreferenceConstants.BODY_CUT_LENGTH, cutLength);
+			refresh = true;
 		}
 		
 		boolean indicateParams = bIndicateParameters.getSelection();
 		if(indicateParams != store.getBoolean(PreferenceConstants.INDICATE_PARAMETERS)) {
 			store.setValue(PreferenceConstants.INDICATE_PARAMETERS, indicateParams);
+			refresh = true;
+		}
+		if (refresh) {
+			DiagramHelper.setNeedsRefresh();
+			DiagramHelper.refreshDiagrams();
 		}
 	}
 }
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/model/stateMachineDiagram.gmfgen b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/model/stateMachineDiagram.gmfgen
index 6d8f75e9881..4cc6d94fc91 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/model/stateMachineDiagram.gmfgen
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/model/stateMachineDiagram.gmfgen
@@ -103,6 +103,10 @@
             editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomRegionComponentEditPolicy"/>

         <behaviour

             xsi:type="gmfgen:CustomBehaviour"

+            key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE"

+            editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomStateMachineCreationEditPolicy"/> 

+        <behaviour

+            xsi:type="gmfgen:CustomBehaviour"

             key="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY"

             editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy"/>

         <modelFacet>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/CommentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/CommentEditPart.java
index a0ad22890eb..eed0ec12b60 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/CommentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/CommentEditPart.java
@@ -28,7 +28,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure;

@@ -173,8 +173,8 @@ public class CommentEditPart extends ShapeNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Comment";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -385,15 +385,15 @@ public class CommentEditPart extends ShapeNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/ConnectionPointReferenceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/ConnectionPointReferenceEditPart.java
index 8acdd469396..a340c8d6611 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/ConnectionPointReferenceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/ConnectionPointReferenceEditPart.java
@@ -37,7 +37,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractBorderEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -169,8 +169,8 @@ public class ConnectionPointReferenceEditPart extends AbstractBorderEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "ConnectionPointReference";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -321,15 +321,15 @@ public class ConnectionPointReferenceEditPart extends AbstractBorderEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ConnectionPointReference", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ConnectionPointReference", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ConnectionPointReference", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ConnectionPointReference", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ConnectionPointReference", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ConnectionPointReference", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("ConnectionPointReference", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("ConnectionPointReference", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/ConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/ConstraintEditPart.java
index af56b2cad72..ef2e87ecd03 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/ConstraintEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/ConstraintEditPart.java
@@ -28,7 +28,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure;

@@ -178,8 +178,8 @@ public class ConstraintEditPart extends ShapeNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Constraint";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -390,15 +390,15 @@ public class ConstraintEditPart extends ShapeNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/FinalStateEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/FinalStateEditPart.java
index f801439b650..9319d2581ab 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/FinalStateEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/FinalStateEditPart.java
@@ -34,7 +34,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLNodeEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

@@ -161,8 +161,8 @@ public class FinalStateEditPart extends UMLNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "FinalState";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -311,15 +311,15 @@ public class FinalStateEditPart extends UMLNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("FinalState", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("FinalState", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("FinalState", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("FinalState", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("FinalState", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("FinalState", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("FinalState", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("FinalState", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateChoiceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateChoiceEditPart.java
index 59bdd95c1ec..3c435c89ccc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateChoiceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateChoiceEditPart.java
@@ -34,7 +34,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLNodeEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -164,8 +164,8 @@ public class PseudostateChoiceEditPart extends UMLNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Pseudostate";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -314,15 +314,15 @@ public class PseudostateChoiceEditPart extends UMLNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Pseudostate", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Pseudostate", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Pseudostate", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Pseudostate", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Pseudostate", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Pseudostate", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Pseudostate", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Pseudostate", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateDeepHistoryEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateDeepHistoryEditPart.java
index 1832512815d..b17e9891c82 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateDeepHistoryEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateDeepHistoryEditPart.java
@@ -34,7 +34,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLNodeEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -164,8 +164,8 @@ public class PseudostateDeepHistoryEditPart extends UMLNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Pseudostate";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -314,15 +314,15 @@ public class PseudostateDeepHistoryEditPart extends UMLNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Pseudostate", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Pseudostate", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Pseudostate", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Pseudostate", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Pseudostate", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Pseudostate", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Pseudostate", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Pseudostate", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateEntryPointEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateEntryPointEditPart.java
index 6e08d157993..4ef0fe73100 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateEntryPointEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateEntryPointEditPart.java
@@ -34,7 +34,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractBorderEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -165,8 +165,8 @@ public class PseudostateEntryPointEditPart extends AbstractBorderEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Pseudostate";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -317,15 +317,15 @@ public class PseudostateEntryPointEditPart extends AbstractBorderEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Pseudostate", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Pseudostate", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Pseudostate", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Pseudostate", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Pseudostate", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Pseudostate", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Pseudostate", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Pseudostate", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateExitPointEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateExitPointEditPart.java
index 1677b884839..5ec52f63e1f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateExitPointEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateExitPointEditPart.java
@@ -37,7 +37,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractBorderEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -169,8 +169,8 @@ public class PseudostateExitPointEditPart extends AbstractBorderEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Pseudostate";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		//FIXME: workaround for #154536

 		result.getBounds().setSize(result.getPreferredSize());

@@ -321,15 +321,15 @@ public class PseudostateExitPointEditPart extends AbstractBorderEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Pseudostate", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Pseudostate", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Pseudostate", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Pseudostate", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Pseudostate", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Pseudostate", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Pseudostate", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Pseudostate", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateForkEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateForkEditPart.java
index 576b7e4c23e..8a198ab27b4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateForkEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateForkEditPart.java
@@ -34,7 +34,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLNodeEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -166,8 +166,8 @@ public class PseudostateForkEditPart extends UMLNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Pseudostate";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -316,15 +316,15 @@ public class PseudostateForkEditPart extends UMLNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Pseudostate", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Pseudostate", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Pseudostate", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Pseudostate", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Pseudostate", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Pseudostate", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Pseudostate", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Pseudostate", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateInitialEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateInitialEditPart.java
index 255a2ff5662..8c49007300b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateInitialEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateInitialEditPart.java
@@ -34,7 +34,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLNodeEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -164,8 +164,8 @@ public class PseudostateInitialEditPart extends UMLNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Pseudostate";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -314,15 +314,15 @@ public class PseudostateInitialEditPart extends UMLNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Pseudostate", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Pseudostate", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Pseudostate", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Pseudostate", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Pseudostate", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Pseudostate", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Pseudostate", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Pseudostate", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateJoinEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateJoinEditPart.java
index f2af9f4e2cf..2d8f190701a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateJoinEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateJoinEditPart.java
@@ -34,7 +34,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLNodeEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -166,8 +166,8 @@ public class PseudostateJoinEditPart extends UMLNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Pseudostate";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -316,15 +316,15 @@ public class PseudostateJoinEditPart extends UMLNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Pseudostate", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Pseudostate", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Pseudostate", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Pseudostate", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Pseudostate", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Pseudostate", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Pseudostate", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Pseudostate", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateJunctionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateJunctionEditPart.java
index 54cce39c595..e77f6212d5c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateJunctionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateJunctionEditPart.java
@@ -34,7 +34,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLNodeEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -164,8 +164,8 @@ public class PseudostateJunctionEditPart extends UMLNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Pseudostate";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -314,15 +314,15 @@ public class PseudostateJunctionEditPart extends UMLNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Pseudostate", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Pseudostate", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Pseudostate", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Pseudostate", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Pseudostate", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Pseudostate", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Pseudostate", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Pseudostate", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateShallowHistoryEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateShallowHistoryEditPart.java
index 7a29dd3285b..fa772e5dc7c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateShallowHistoryEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateShallowHistoryEditPart.java
@@ -34,7 +34,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLNodeEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -164,8 +164,8 @@ public class PseudostateShallowHistoryEditPart extends UMLNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Pseudostate";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -314,15 +314,15 @@ public class PseudostateShallowHistoryEditPart extends UMLNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Pseudostate", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Pseudostate", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Pseudostate", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Pseudostate", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Pseudostate", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Pseudostate", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Pseudostate", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Pseudostate", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateTerminateEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateTerminateEditPart.java
index d24b8b75156..588d98285b4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateTerminateEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/PseudostateTerminateEditPart.java
@@ -34,7 +34,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLNodeEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -164,8 +164,8 @@ public class PseudostateTerminateEditPart extends UMLNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Pseudostate";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -314,15 +314,15 @@ public class PseudostateTerminateEditPart extends UMLNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Pseudostate", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Pseudostate", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Pseudostate", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Pseudostate", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Pseudostate", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Pseudostate", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Pseudostate", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Pseudostate", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/RegionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/RegionEditPart.java
index 0c67c33ff4b..f8c39c2b900 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/RegionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/RegionEditPart.java
@@ -28,7 +28,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

@@ -152,8 +152,8 @@ public class RegionEditPart extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Region";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -195,15 +195,15 @@ public class RegionEditPart extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Region", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Region", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Region", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Region", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Region", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Region", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Region", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Region", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/StateEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/StateEditPart.java
index 9d361401cfe..fe79a7c5fc7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/StateEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/StateEditPart.java
@@ -32,7 +32,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

@@ -204,8 +204,8 @@ public class StateEditPart extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "State";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -367,15 +367,15 @@ public class StateEditPart extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("State", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("State", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("State", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("State", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("State", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("State", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("State", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("State", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/StateMachineCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/StateMachineCompartmentEditPart.java
index 86403d6a6f9..2003aac4cf0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/StateMachineCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/StateMachineCompartmentEditPart.java
@@ -16,6 +16,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomStateMachineCompartmentCreationEditPolicy;

 import org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomStateMachineCompartmentXYLayoutEditPolicy;

 import org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.CustomStateMachineDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.statemachine.custom.policies.RemoveOrphanViewPolicy;

@@ -51,6 +52,7 @@ public class StateMachineCompartmentEditPart extends ShapeCompartmentEditPart {
 		//in Papyrus diagrams are not strongly synchronised

 		//installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new org.eclipse.papyrus.uml.diagram.statemachine.edit.policies.StateMachineCompartmentCanonicalEditPolicy());

 		installEditPolicy("RemoveOrphanView", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new CustomStateMachineCompartmentCreationEditPolicy());

 		installEditPolicy(EditPolicy.LAYOUT_ROLE, new CustomStateMachineCompartmentXYLayoutEditPolicy());

 		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomStateMachineDiagramDragDropEditPolicy());

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/StateMachineEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/StateMachineEditPart.java
index de242e6a87a..d522fe1e6ae 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/StateMachineEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/edit/parts/StateMachineEditPart.java
@@ -32,7 +32,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

@@ -193,8 +193,8 @@ public class StateMachineEditPart extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "StateMachine";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -296,15 +296,15 @@ public class StateMachineEditPart extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("StateMachine", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("StateMachine", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("StateMachine", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("StateMachine", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("StateMachine", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("StateMachine", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("StateMachine", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("StateMachine", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/CommentPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/CommentPreferencePage.java
index 894873b84b9..75b90397b97 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/CommentPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/CommentPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.statemachine.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PackageEditPart;

 import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class CommentPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = PackageEditPart.MODEL_ID + "_Comment";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/ConnectionPointReferencePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/ConnectionPointReferencePreferencePage.java
index 009b134e47a..22fbf230102 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/ConnectionPointReferencePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/ConnectionPointReferencePreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.statemachine.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PackageEditPart;

 import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;

 

@@ -16,16 +16,16 @@ public class ConnectionPointReferencePreferencePage extends AbstractPapyrusNodeP
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = PackageEditPart.MODEL_ID + "_ConnectionPointReference";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 4);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 4);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 4);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 4);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/ConstraintPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/ConstraintPreferencePage.java
index 19ebd1873d1..3d93f211501 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/ConstraintPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/ConstraintPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.statemachine.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PackageEditPart;

 import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class ConstraintPreferencePage extends AbstractPapyrusNodePreferencePage
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = PackageEditPart.MODEL_ID + "_Constraint";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/DoActivityStateBehaviorPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/DoActivityStateBehaviorPreferencePage.java
index 25bd3ac6283..7890bc449bc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/DoActivityStateBehaviorPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/DoActivityStateBehaviorPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.statemachine.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PackageEditPart;

 import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class DoActivityStateBehaviorPreferencePage extends AbstractPapyrusNodePr
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = PackageEditPart.MODEL_ID + "_DoActivityStateBehavior";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/EntryStateBehaviorPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/EntryStateBehaviorPreferencePage.java
index 43b96a3384f..794d56cb565 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/EntryStateBehaviorPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/EntryStateBehaviorPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.statemachine.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PackageEditPart;

 import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class EntryStateBehaviorPreferencePage extends AbstractPapyrusNodePrefere
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = PackageEditPart.MODEL_ID + "_EntryStateBehavior";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/ExitStateBehaviorPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/ExitStateBehaviorPreferencePage.java
index ca41c5c274d..36d17b51ee3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/ExitStateBehaviorPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/ExitStateBehaviorPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.statemachine.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PackageEditPart;

 import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class ExitStateBehaviorPreferencePage extends AbstractPapyrusNodePreferen
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = PackageEditPart.MODEL_ID + "_ExitStateBehavior";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/FinalStatePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/FinalStatePreferencePage.java
index 5cec1815998..e064474f3cb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/FinalStatePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/FinalStatePreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.statemachine.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PackageEditPart;

 import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;

 

@@ -16,16 +16,16 @@ public class FinalStatePreferencePage extends AbstractPapyrusNodePreferencePage
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = PackageEditPart.MODEL_ID + "_FinalState";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 16);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 16);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 16);

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/InternalTransitionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/InternalTransitionPreferencePage.java
index 4f722ba920a..30050fc9db8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/InternalTransitionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/InternalTransitionPreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.statemachine.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PackageEditPart;

 import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;

 

@@ -32,15 +32,15 @@ public class InternalTransitionPreferencePage extends AbstractPapyrusNodePrefere
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = PackageEditPart.MODEL_ID + "_InternalTransition";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/PseudostatePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/PseudostatePreferencePage.java
index 97104e39ff5..9a243255344 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/PseudostatePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/PseudostatePreferencePage.java
@@ -2,7 +2,7 @@ package org.eclipse.papyrus.uml.diagram.statemachine.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PackageEditPart;

 import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;

 

@@ -16,16 +16,16 @@ public class PseudostatePreferencePage extends AbstractPapyrusNodePreferencePage
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = PackageEditPart.MODEL_ID + "_Pseudostate";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 4);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 4);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 4);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 4);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/RegionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/RegionPreferencePage.java
index 0e14d56b8dc..a7a58a22e7a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/RegionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/RegionPreferencePage.java
@@ -5,7 +5,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PackageEditPart;

 import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;

 

@@ -24,26 +24,26 @@ public class RegionPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = PackageEditPart.MODEL_ID + "_Region";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/StateMachinePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/StateMachinePreferencePage.java
index d7c6d75f076..fba86f96f27 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/StateMachinePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/StateMachinePreferencePage.java
@@ -5,7 +5,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PackageEditPart;

 import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;

 

@@ -24,26 +24,26 @@ public class StateMachinePreferencePage extends AbstractPapyrusNodePreferencePag
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = PackageEditPart.MODEL_ID + "_StateMachine";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 200);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 100);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 200);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 100);

 		Map<String, Boolean> map = getStaticCompartmentVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/StatePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/StatePreferencePage.java
index d3f77f3a225..3c1ab8eb1fd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/StatePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/preferences/StatePreferencePage.java
@@ -5,7 +5,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.PackageEditPart;

 import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin;

 

@@ -24,26 +24,26 @@ public class StatePreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = PackageEditPart.MODEL_ID + "_State";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/providers/UMLViewProvider.java
index 12426f14e40..587bd08f842 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/providers/UMLViewProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/providers/UMLViewProvider.java
@@ -42,7 +42,7 @@ import org.eclipse.jface.preference.PreferenceConverter;
 import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

 import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.CommentAnnotatedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.CommentBodyEditPart;

@@ -878,9 +878,9 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	private void initBackgroundFromPrefs(View view, final IPreferenceStore store, String elementName) {

-		String fillColorConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_FILL);

-		String gradientColorConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_GRADIENT);

-		String gradientPolicyConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.GRADIENT_POLICY);

+		String fillColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_FILL);

+		String gradientColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_GRADIENT);

+		String gradientPolicyConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.GRADIENT_POLICY);

 		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(store, fillColorConstant);

 		ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getFillStyle_FillColor(), FigureUtilities.RGBToInteger(fillRGB));

 		FillStyle fillStyle = (FillStyle)view.getStyle(NotationPackage.Literals.FILL_STYLE);

@@ -896,8 +896,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	private void initFontStyleFromPrefs(View view, final IPreferenceStore store, String elementName) {

-		String fontConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.FONT);

-		String fontColorConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_FONT);

+		String fontConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.FONT);

+		String fontColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_FONT);

 		FontStyle viewFontStyle = (FontStyle)view.getStyle(NotationPackage.Literals.FONT_STYLE);

 		if(viewFontStyle != null) {

 			FontData fontData = PreferenceConverter.getFontData(store, fontConstant);

@@ -914,7 +914,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	private void initForegroundFromPrefs(View view, final IPreferenceStore store, String elementName) {

-		String lineColorConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_LINE);

+		String lineColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_LINE);

 		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(store, lineColorConstant);

 		ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getLineStyle_LineColor(), FigureUtilities.RGBToInteger(lineRGB));

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/CompactLifelineEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/CompactLifelineEditPartCN.java
index aaa107537e6..fe191dab8a5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/CompactLifelineEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/CompactLifelineEditPartCN.java
@@ -38,7 +38,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

@@ -247,8 +247,8 @@ LifelineEditPart {
 	protected NodeFigure createNodePlate() {

 		final String prefElementId = "CompactLifeline";

 		final IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		final String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		final String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		final String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		final String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		final DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 

 		return result;

@@ -431,15 +431,15 @@ LifelineEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("CompactLifeline", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("CompactLifeline", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("CompactLifeline", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("CompactLifeline", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("CompactLifeline", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("CompactLifeline", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor(preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			final String prefGradient = PreferenceConstantHelper.getElementConstant("CompactLifeline", PreferenceConstantHelper.COLOR_GRADIENT);

+			final String prefGradient = PreferencesConstantsHelper.getElementConstant("CompactLifeline", PreferencesConstantsHelper.COLOR_GRADIENT);

 			final GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/CompactStateInvariantEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/CompactStateInvariantEditPartCN.java
index 119d6556fc1..8a1bd124782 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/CompactStateInvariantEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/CompactStateInvariantEditPartCN.java
@@ -46,7 +46,7 @@ import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.uml.diagram.timing.custom.edit.policies.CustomCompactStateInvariantItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.timing.custom.edit.policies.TimingDiagramDragDropEditPolicy;

@@ -259,8 +259,8 @@ NodeEditPart {
 	protected NodeFigure createNodePlate() {

 		final String prefElementId = "CompactStateInvariant";

 		final IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		final String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		final String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		final String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		final String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		final DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 

 		return result;

@@ -422,15 +422,15 @@ NodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("CompactStateInvariant", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("CompactStateInvariant", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("CompactStateInvariant", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("CompactStateInvariant", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("CompactStateInvariant", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("CompactStateInvariant", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor(preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			final String prefGradient = PreferenceConstantHelper.getElementConstant("CompactStateInvariant", PreferenceConstantHelper.COLOR_GRADIENT);

+			final String prefGradient = PreferencesConstantsHelper.getElementConstant("CompactStateInvariant", PreferencesConstantsHelper.COLOR_GRADIENT);

 			final GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/DestructionOccurrenceSpecificationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/DestructionOccurrenceSpecificationEditPartCN.java
index 250f70984cc..46ab0b52f44 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/DestructionOccurrenceSpecificationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/DestructionOccurrenceSpecificationEditPartCN.java
@@ -44,7 +44,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.uml.diagram.timing.custom.edit.policies.CustomDestructionOccurrenceSpecificationItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.timing.custom.edit.policies.TimingDiagramDragDropEditPolicy;

@@ -181,8 +181,8 @@ AbstractBorderedShapeEditPart {
 	protected NodeFigure createNodePlate() {

 		final String prefElementId = "DestructionOccurrenceSpecification";

 		final IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		final String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		final String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		final String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		final String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		final DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 

 		return result;

@@ -513,15 +513,15 @@ AbstractBorderedShapeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DestructionOccurrenceSpecification", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DestructionOccurrenceSpecification", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DestructionOccurrenceSpecification", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DestructionOccurrenceSpecification", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DestructionOccurrenceSpecification", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DestructionOccurrenceSpecification", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor(preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			final String prefGradient = PreferenceConstantHelper.getElementConstant("DestructionOccurrenceSpecification", PreferenceConstantHelper.COLOR_GRADIENT);

+			final String prefGradient = PreferencesConstantsHelper.getElementConstant("DestructionOccurrenceSpecification", PreferencesConstantsHelper.COLOR_GRADIENT);

 			final GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/DurationConstraintEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/DurationConstraintEditPartCN.java
index c978446903f..443b4a4bd2a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/DurationConstraintEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/DurationConstraintEditPartCN.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.uml.diagram.timing.custom.edit.policies.TimingDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.timing.custom.figures.DimensioningArrowFigure;

@@ -171,8 +171,8 @@ AbstractBorderedShapeEditPart {
 	protected NodeFigure createNodePlate() {

 		final String prefElementId = "DurationConstraint";

 		final IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		final String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		final String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		final String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		final String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		final DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 

 		return result;

@@ -329,15 +329,15 @@ AbstractBorderedShapeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DurationConstraint", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DurationConstraint", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DurationConstraint", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DurationConstraint", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DurationConstraint", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DurationConstraint", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor(preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			final String prefGradient = PreferenceConstantHelper.getElementConstant("DurationConstraint", PreferenceConstantHelper.COLOR_GRADIENT);

+			final String prefGradient = PreferencesConstantsHelper.getElementConstant("DurationConstraint", PreferencesConstantsHelper.COLOR_GRADIENT);

 			final GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/DurationObservationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/DurationObservationEditPartCN.java
index 1a6f626bc2b..731b37c263e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/DurationObservationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/DurationObservationEditPartCN.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.uml.diagram.timing.custom.edit.policies.TimingDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.timing.custom.figures.DimensioningArrowFigure;

@@ -171,8 +171,8 @@ AbstractBorderedShapeEditPart {
 	protected NodeFigure createNodePlate() {

 		final String prefElementId = "DurationObservation";

 		final IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		final String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		final String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		final String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		final String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		final DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 

 		return result;

@@ -329,15 +329,15 @@ AbstractBorderedShapeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DurationObservation", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DurationObservation", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DurationObservation", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DurationObservation", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DurationObservation", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DurationObservation", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor(preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			final String prefGradient = PreferenceConstantHelper.getElementConstant("DurationObservation", PreferenceConstantHelper.COLOR_GRADIENT);

+			final String prefGradient = PreferencesConstantsHelper.getElementConstant("DurationObservation", PreferencesConstantsHelper.COLOR_GRADIENT);

 			final GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/FreeTimingRulerEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/FreeTimingRulerEditPartCN.java
index f63d2b6a620..b05ee8127c6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/FreeTimingRulerEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/FreeTimingRulerEditPartCN.java
@@ -31,7 +31,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.uml.diagram.timing.custom.edit.policies.TimingDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.timing.custom.figures.TimingRulerFigure;

@@ -191,8 +191,8 @@ ShapeNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		final String prefElementId = "FreeTimingRuler";

 		final IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		final String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		final String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		final String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		final String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		final DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 

 		return result;

@@ -285,15 +285,15 @@ ShapeNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("FreeTimingRuler", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("FreeTimingRuler", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("FreeTimingRuler", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("FreeTimingRuler", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("FreeTimingRuler", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("FreeTimingRuler", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor(preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			final String prefGradient = PreferenceConstantHelper.getElementConstant("FreeTimingRuler", PreferenceConstantHelper.COLOR_GRADIENT);

+			final String prefGradient = PreferencesConstantsHelper.getElementConstant("FreeTimingRuler", PreferencesConstantsHelper.COLOR_GRADIENT);

 			final GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/FullLifelineEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/FullLifelineEditPartCN.java
index a6d0f80501f..7da507f6c47 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/FullLifelineEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/FullLifelineEditPartCN.java
@@ -38,7 +38,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

@@ -262,8 +262,8 @@ LifelineEditPart {
 	protected NodeFigure createNodePlate() {

 		final String prefElementId = "FullLifeline";

 		final IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		final String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		final String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		final String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		final String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		final DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 

 		return result;

@@ -449,15 +449,15 @@ LifelineEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("FullLifeline", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("FullLifeline", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("FullLifeline", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("FullLifeline", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("FullLifeline", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("FullLifeline", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor(preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			final String prefGradient = PreferenceConstantHelper.getElementConstant("FullLifeline", PreferenceConstantHelper.COLOR_GRADIENT);

+			final String prefGradient = PreferencesConstantsHelper.getElementConstant("FullLifeline", PreferencesConstantsHelper.COLOR_GRADIENT);

 			final GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/FullStateInvariantEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/FullStateInvariantEditPartCN.java
index a0f6e38d3a2..71b58d62e23 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/FullStateInvariantEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/FullStateInvariantEditPartCN.java
@@ -45,7 +45,7 @@ import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.uml.diagram.timing.custom.edit.policies.CustomFullStateInvariantItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.timing.custom.edit.policies.TimingDiagramDragDropEditPolicy;

@@ -203,8 +203,8 @@ NodeEditPart {
 	protected NodeFigure createNodePlate() {

 		final String prefElementId = "FullStateInvariant";

 		final IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		final String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		final String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		final String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		final String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		final DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 

 		return result;

@@ -361,15 +361,15 @@ NodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("FullStateInvariant", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("FullStateInvariant", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("FullStateInvariant", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("FullStateInvariant", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("FullStateInvariant", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("FullStateInvariant", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor(preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			final String prefGradient = PreferenceConstantHelper.getElementConstant("FullStateInvariant", PreferenceConstantHelper.COLOR_GRADIENT);

+			final String prefGradient = PreferencesConstantsHelper.getElementConstant("FullStateInvariant", PreferencesConstantsHelper.COLOR_GRADIENT);

 			final GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/FullStateInvariantVerticalLineEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/FullStateInvariantVerticalLineEditPart.java
index 85f3e3eabff..206b12f0884 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/FullStateInvariantVerticalLineEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/FullStateInvariantVerticalLineEditPart.java
@@ -29,7 +29,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.uml.diagram.timing.custom.edit.policies.TimingDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.timing.custom.figures.FullStateInvariantVerticalLineFigure;

@@ -129,8 +129,8 @@ ShapeNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		final String prefElementId = "VerticalLineStateInvariant";

 		final IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		final String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		final String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		final String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		final String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		final DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 

 		return result;

@@ -218,15 +218,15 @@ ShapeNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("VerticalLineStateInvariant", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("VerticalLineStateInvariant", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("VerticalLineStateInvariant", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("VerticalLineStateInvariant", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("VerticalLineStateInvariant", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("VerticalLineStateInvariant", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor(preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			final String prefGradient = PreferenceConstantHelper.getElementConstant("VerticalLineStateInvariant", PreferenceConstantHelper.COLOR_GRADIENT);

+			final String prefGradient = PreferencesConstantsHelper.getElementConstant("VerticalLineStateInvariant", PreferencesConstantsHelper.COLOR_GRADIENT);

 			final GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/GateEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/GateEditPart.java
index 910b733bd49..841a76f0302 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/GateEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/GateEditPart.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.uml.diagram.timing.custom.edit.policies.CustomGateItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.timing.custom.edit.policies.TimingDiagramDragDropEditPolicy;

@@ -174,8 +174,8 @@ BorderedBorderItemEditPart {
 	protected NodeFigure createNodePlate() {

 		final String prefElementId = "Gate";

 		final IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		final String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		final String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		final String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		final String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		final DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 

 		// FIXME: workaround for #154536

@@ -508,15 +508,15 @@ BorderedBorderItemEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Gate", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Gate", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Gate", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Gate", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Gate", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Gate", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor(preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			final String prefGradient = PreferenceConstantHelper.getElementConstant("Gate", PreferenceConstantHelper.COLOR_GRADIENT);

+			final String prefGradient = PreferencesConstantsHelper.getElementConstant("Gate", PreferencesConstantsHelper.COLOR_GRADIENT);

 			final GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/GeneralOrderingEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/GeneralOrderingEditPart.java
index db2e3eaa388..149649d60f5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/GeneralOrderingEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/GeneralOrderingEditPart.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.uml.diagram.timing.custom.edit.policies.TimingDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.timing.custom.figures.GeneralOrderingHorizontalFigure;

@@ -171,8 +171,8 @@ AbstractBorderedShapeEditPart {
 	protected NodeFigure createNodePlate() {

 		final String prefElementId = "GeneralOrdering";

 		final IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		final String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		final String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		final String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		final String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		final DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 

 		return result;

@@ -329,15 +329,15 @@ AbstractBorderedShapeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("GeneralOrdering", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("GeneralOrdering", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("GeneralOrdering", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("GeneralOrdering", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("GeneralOrdering", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("GeneralOrdering", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor(preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			final String prefGradient = PreferenceConstantHelper.getElementConstant("GeneralOrdering", PreferenceConstantHelper.COLOR_GRADIENT);

+			final String prefGradient = PreferencesConstantsHelper.getElementConstant("GeneralOrdering", PreferencesConstantsHelper.COLOR_GRADIENT);

 			final GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/InteractionEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/InteractionEditPartTN.java
index d0bbaceeff2..786b6e89509 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/InteractionEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/InteractionEditPartTN.java
@@ -43,7 +43,7 @@ import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

@@ -269,8 +269,8 @@ NodeEditPart {
 	protected NodeFigure createNodePlate() {

 		final String prefElementId = "Interaction";

 		final IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		final String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		final String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		final String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		final String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		final DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 

 		return result;

@@ -456,15 +456,15 @@ NodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Interaction", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Interaction", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Interaction", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Interaction", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Interaction", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Interaction", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor(preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			final String prefGradient = PreferenceConstantHelper.getElementConstant("Interaction", PreferenceConstantHelper.COLOR_GRADIENT);

+			final String prefGradient = PreferencesConstantsHelper.getElementConstant("Interaction", PreferencesConstantsHelper.COLOR_GRADIENT);

 			final GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/LifelineEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/LifelineEditPart.java
index b0884b89d32..5ff564b83de 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/LifelineEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/LifelineEditPart.java
@@ -36,7 +36,7 @@ import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.uml.diagram.timing.custom.figures.LifelineFigure;

 import org.eclipse.papyrus.uml.diagram.timing.edit.policies.LifelineItemSemanticEditPolicy;

@@ -148,8 +148,8 @@ NodeEditPart {
 	protected NodeFigure createNodePlate() {

 		final String prefElementId = "Lifeline";

 		final IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		final String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		final String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		final String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		final String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		final DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 

 		return result;

@@ -298,15 +298,15 @@ NodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Lifeline", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Lifeline", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Lifeline", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Lifeline", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Lifeline", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Lifeline", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor(preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			final String prefGradient = PreferenceConstantHelper.getElementConstant("Lifeline", PreferenceConstantHelper.COLOR_GRADIENT);

+			final String prefGradient = PreferencesConstantsHelper.getElementConstant("Lifeline", PreferencesConstantsHelper.COLOR_GRADIENT);

 			final GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/LinearTimingRulerEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/LinearTimingRulerEditPartCN.java
index ba88049158a..169db26e547 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/LinearTimingRulerEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/LinearTimingRulerEditPartCN.java
@@ -31,7 +31,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.uml.diagram.timing.custom.edit.policies.TimingDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.timing.custom.figures.TimingRulerFigure;

@@ -191,8 +191,8 @@ ShapeNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		final String prefElementId = "LinearTimingRuler";

 		final IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		final String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		final String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		final String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		final String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		final DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 

 		return result;

@@ -285,15 +285,15 @@ ShapeNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("LinearTimingRuler", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("LinearTimingRuler", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("LinearTimingRuler", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("LinearTimingRuler", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("LinearTimingRuler", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("LinearTimingRuler", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor(preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			final String prefGradient = PreferenceConstantHelper.getElementConstant("LinearTimingRuler", PreferenceConstantHelper.COLOR_GRADIENT);

+			final String prefGradient = PreferencesConstantsHelper.getElementConstant("LinearTimingRuler", PreferencesConstantsHelper.COLOR_GRADIENT);

 			final GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/MessageOccurrenceSpecificationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/MessageOccurrenceSpecificationEditPartCN.java
index 34155f232b8..cd0c9f11d75 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/MessageOccurrenceSpecificationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/MessageOccurrenceSpecificationEditPartCN.java
@@ -46,7 +46,7 @@ import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.uml.diagram.timing.custom.edit.policies.CustomMessageOccurrenceSpecificationItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.timing.custom.edit.policies.TimingDiagramDragDropEditPolicy;

@@ -209,8 +209,8 @@ NodeEditPart {
 	protected NodeFigure createNodePlate() {

 		final String prefElementId = "MessageOccurrenceSpecification";

 		final IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		final String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		final String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		final String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		final String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		final DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 

 		return result;

@@ -541,15 +541,15 @@ NodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("MessageOccurrenceSpecification", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("MessageOccurrenceSpecification", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("MessageOccurrenceSpecification", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("MessageOccurrenceSpecification", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("MessageOccurrenceSpecification", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("MessageOccurrenceSpecification", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor(preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			final String prefGradient = PreferenceConstantHelper.getElementConstant("MessageOccurrenceSpecification", PreferenceConstantHelper.COLOR_GRADIENT);

+			final String prefGradient = PreferencesConstantsHelper.getElementConstant("MessageOccurrenceSpecification", PreferencesConstantsHelper.COLOR_GRADIENT);

 			final GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/OccurrenceSpecificationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/OccurrenceSpecificationEditPartCN.java
index 00e042a8369..46765ab3520 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/OccurrenceSpecificationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/OccurrenceSpecificationEditPartCN.java
@@ -46,7 +46,7 @@ import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.uml.diagram.timing.custom.edit.policies.CustomOccurrenceSpecificationItemSemanticEditPolicy;

 import org.eclipse.papyrus.uml.diagram.timing.custom.edit.policies.TimingDiagramDragDropEditPolicy;

@@ -209,8 +209,8 @@ NodeEditPart {
 	protected NodeFigure createNodePlate() {

 		final String prefElementId = "OccurrenceSpecification";

 		final IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		final String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		final String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		final String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		final String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		final DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 

 		return result;

@@ -367,15 +367,15 @@ NodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OccurrenceSpecification", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OccurrenceSpecification", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OccurrenceSpecification", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OccurrenceSpecification", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("OccurrenceSpecification", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("OccurrenceSpecification", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor(preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			final String prefGradient = PreferenceConstantHelper.getElementConstant("OccurrenceSpecification", PreferenceConstantHelper.COLOR_GRADIENT);

+			final String prefGradient = PreferencesConstantsHelper.getElementConstant("OccurrenceSpecification", PreferencesConstantsHelper.COLOR_GRADIENT);

 			final GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/StateDefinitionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/StateDefinitionEditPart.java
index 94ef6867f3d..dc4eb8f6d37 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/StateDefinitionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/StateDefinitionEditPart.java
@@ -32,7 +32,7 @@ import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.uml.diagram.timing.custom.edit.policies.TimingDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.timing.custom.figures.StateDefinitionFigure;

@@ -197,8 +197,8 @@ NodeEditPart {
 	protected NodeFigure createNodePlate() {

 		final String prefElementId = "StateDefinition";

 		final IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		final String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		final String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		final String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		final String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		final DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 

 		return result;

@@ -299,15 +299,15 @@ NodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("StateDefinition", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("StateDefinition", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("StateDefinition", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("StateDefinition", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("StateDefinition", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("StateDefinition", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor(preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			final String prefGradient = PreferenceConstantHelper.getElementConstant("StateDefinition", PreferenceConstantHelper.COLOR_GRADIENT);

+			final String prefGradient = PreferencesConstantsHelper.getElementConstant("StateDefinition", PreferencesConstantsHelper.COLOR_GRADIENT);

 			final GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/TickEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/TickEditPart.java
index 13cbe3b5827..d26c3bf0bda 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/TickEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/TickEditPart.java
@@ -37,7 +37,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.uml.diagram.timing.custom.edit.policies.TimingDiagramDragDropEditPolicy;

 import org.eclipse.papyrus.uml.diagram.timing.custom.figures.VerticalMarkFigure;

@@ -165,8 +165,8 @@ AbstractBorderedShapeEditPart {
 	protected NodeFigure createNodePlate() {

 		final String prefElementId = "Tick";

 		final IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		final String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		final String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		final String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		final String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		final DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 

 		return result;

@@ -262,15 +262,15 @@ AbstractBorderedShapeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Tick", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Tick", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Tick", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Tick", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Tick", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Tick", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor(preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			final String prefGradient = PreferenceConstantHelper.getElementConstant("Tick", PreferenceConstantHelper.COLOR_GRADIENT);

+			final String prefGradient = PreferencesConstantsHelper.getElementConstant("Tick", PreferencesConstantsHelper.COLOR_GRADIENT);

 			final GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/TimeConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/TimeConstraintEditPart.java
index ab72cff4639..90f0afd15b6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/TimeConstraintEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/TimeConstraintEditPart.java
@@ -44,7 +44,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.uml.diagram.timing.custom.edit.policies.FirstEventRefreshEditPolicy;

 import org.eclipse.papyrus.uml.diagram.timing.custom.edit.policies.TimingDiagramDragDropEditPolicy;

@@ -181,8 +181,8 @@ AbstractBorderedShapeEditPart {
 	protected NodeFigure createNodePlate() {

 		final String prefElementId = "TimeConstraint";

 		final IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		final String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		final String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		final String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		final String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		final DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 

 		return result;

@@ -339,15 +339,15 @@ AbstractBorderedShapeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("TimeConstraint", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("TimeConstraint", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("TimeConstraint", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("TimeConstraint", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("TimeConstraint", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("TimeConstraint", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor(preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			final String prefGradient = PreferenceConstantHelper.getElementConstant("TimeConstraint", PreferenceConstantHelper.COLOR_GRADIENT);

+			final String prefGradient = PreferencesConstantsHelper.getElementConstant("TimeConstraint", PreferencesConstantsHelper.COLOR_GRADIENT);

 			final GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/TimeObservationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/TimeObservationEditPart.java
index b48778e1d82..65f45325c65 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/TimeObservationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/edit/parts/TimeObservationEditPart.java
@@ -44,7 +44,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.uml.diagram.timing.custom.edit.policies.FirstEventRefreshEditPolicy;

 import org.eclipse.papyrus.uml.diagram.timing.custom.edit.policies.TimingDiagramDragDropEditPolicy;

@@ -181,8 +181,8 @@ AbstractBorderedShapeEditPart {
 	protected NodeFigure createNodePlate() {

 		final String prefElementId = "TimeObservation";

 		final IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		final String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		final String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		final String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		final String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		final DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 

 		return result;

@@ -339,15 +339,15 @@ AbstractBorderedShapeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("TimeObservation", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("TimeObservation", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("TimeObservation", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("TimeObservation", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("TimeObservation", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("TimeObservation", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor(preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			final String prefGradient = PreferenceConstantHelper.getElementConstant("TimeObservation", PreferenceConstantHelper.COLOR_GRADIENT);

+			final String prefGradient = PreferencesConstantsHelper.getElementConstant("TimeObservation", PreferencesConstantsHelper.COLOR_GRADIENT);

 			final GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/CompactLifelinePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/CompactLifelinePreferencePage.java
index 03978bd3db8..cc8254e586d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/CompactLifelinePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/CompactLifelinePreferencePage.java
@@ -13,7 +13,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.timing.edit.parts.TimingDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.timing.part.UMLDiagramEditorPlugin;

 

@@ -51,39 +51,39 @@ public class CompactLifelinePreferencePage extends AbstractPapyrusNodePreference
 	public static void initDefaults(final IPreferenceStore store) {

 

 		final String key = TimingDiagramEditPart.MODEL_ID + "_CompactLifeline";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 40);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 40);

 

 		Map<String, Boolean> map = getStaticCompartmentVisibilityPreferences();

 		for(final String name : map.keySet()) {

-			final String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			final String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(final String name : map.keySet()) {

-			final String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			final 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT),

+		// 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.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/CompactStateInvariantPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/CompactStateInvariantPreferencePage.java
index 6760aed22d6..8311f5e0972 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/CompactStateInvariantPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/CompactStateInvariantPreferencePage.java
@@ -10,7 +10,7 @@ package org.eclipse.papyrus.uml.diagram.timing.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.timing.edit.parts.TimingDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.timing.part.UMLDiagramEditorPlugin;

 

@@ -43,27 +43,27 @@ public class CompactStateInvariantPreferencePage extends AbstractPapyrusNodePref
 	public static void initDefaults(final IPreferenceStore store) {

 

 		final String key = TimingDiagramEditPart.MODEL_ID + "_CompactStateInvariant";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT),

+		// 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.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/DestructionOccurrenceSpecificationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/DestructionOccurrenceSpecificationPreferencePage.java
index 972f61fc2e5..cce68b15f76 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/DestructionOccurrenceSpecificationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/DestructionOccurrenceSpecificationPreferencePage.java
@@ -10,7 +10,7 @@ package org.eclipse.papyrus.uml.diagram.timing.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.timing.edit.parts.TimingDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.timing.part.UMLDiagramEditorPlugin;

 

@@ -43,27 +43,27 @@ public class DestructionOccurrenceSpecificationPreferencePage extends AbstractPa
 	public static void initDefaults(final IPreferenceStore store) {

 

 		final String key = TimingDiagramEditPart.MODEL_ID + "_DestructionOccurrenceSpecification";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT),

+		// 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.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/DurationConstraintPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/DurationConstraintPreferencePage.java
index 07da09bb590..abc56209e1b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/DurationConstraintPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/DurationConstraintPreferencePage.java
@@ -10,7 +10,7 @@ package org.eclipse.papyrus.uml.diagram.timing.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.timing.edit.parts.TimingDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.timing.part.UMLDiagramEditorPlugin;

 

@@ -43,27 +43,27 @@ public class DurationConstraintPreferencePage extends AbstractPapyrusNodePrefere
 	public static void initDefaults(final IPreferenceStore store) {

 

 		final String key = TimingDiagramEditPart.MODEL_ID + "_DurationConstraint";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT),

+		// 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.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/DurationObservationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/DurationObservationPreferencePage.java
index 7cdb3ca0eab..7420343d287 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/DurationObservationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/DurationObservationPreferencePage.java
@@ -10,7 +10,7 @@ package org.eclipse.papyrus.uml.diagram.timing.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.timing.edit.parts.TimingDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.timing.part.UMLDiagramEditorPlugin;

 

@@ -43,27 +43,27 @@ public class DurationObservationPreferencePage extends AbstractPapyrusNodePrefer
 	public static void initDefaults(final IPreferenceStore store) {

 

 		final String key = TimingDiagramEditPart.MODEL_ID + "_DurationObservation";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT),

+		// 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.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/FreeTimingRulerPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/FreeTimingRulerPreferencePage.java
index 06e1c96389a..6ffb0583f0f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/FreeTimingRulerPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/FreeTimingRulerPreferencePage.java
@@ -13,7 +13,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.timing.edit.parts.TimingDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.timing.part.UMLDiagramEditorPlugin;

 

@@ -51,39 +51,39 @@ public class FreeTimingRulerPreferencePage extends AbstractPapyrusNodePreference
 	public static void initDefaults(final IPreferenceStore store) {

 

 		final String key = TimingDiagramEditPart.MODEL_ID + "_FreeTimingRuler";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 40);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 40);

 

 		Map<String, Boolean> map = getStaticCompartmentVisibilityPreferences();

 		for(final String name : map.keySet()) {

-			final String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			final String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(final String name : map.keySet()) {

-			final String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			final 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT),

+		// 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.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/FullLifelinePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/FullLifelinePreferencePage.java
index ddebd699779..a2fe1e71413 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/FullLifelinePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/FullLifelinePreferencePage.java
@@ -13,7 +13,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.timing.edit.parts.TimingDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.timing.part.UMLDiagramEditorPlugin;

 

@@ -51,39 +51,39 @@ public class FullLifelinePreferencePage extends AbstractPapyrusNodePreferencePag
 	public static void initDefaults(final IPreferenceStore store) {

 

 		final String key = TimingDiagramEditPart.MODEL_ID + "_FullLifeline";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 40);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 40);

 

 		Map<String, Boolean> map = getStaticCompartmentVisibilityPreferences();

 		for(final String name : map.keySet()) {

-			final String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			final String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(final String name : map.keySet()) {

-			final String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			final 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT),

+		// 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.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/FullStateInvariantPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/FullStateInvariantPreferencePage.java
index 843bb2955f1..72ae0851d0c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/FullStateInvariantPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/FullStateInvariantPreferencePage.java
@@ -10,7 +10,7 @@ package org.eclipse.papyrus.uml.diagram.timing.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.timing.edit.parts.TimingDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.timing.part.UMLDiagramEditorPlugin;

 

@@ -43,27 +43,27 @@ public class FullStateInvariantPreferencePage extends AbstractPapyrusNodePrefere
 	public static void initDefaults(final IPreferenceStore store) {

 

 		final String key = TimingDiagramEditPart.MODEL_ID + "_FullStateInvariant";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT),

+		// 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.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/GatePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/GatePreferencePage.java
index 5dc8275d1f4..0e11c5f58a7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/GatePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/GatePreferencePage.java
@@ -10,7 +10,7 @@ package org.eclipse.papyrus.uml.diagram.timing.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.timing.edit.parts.TimingDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.timing.part.UMLDiagramEditorPlugin;

 

@@ -43,27 +43,27 @@ public class GatePreferencePage extends AbstractPapyrusNodePreferencePage {
 	public static void initDefaults(final IPreferenceStore store) {

 

 		final String key = TimingDiagramEditPart.MODEL_ID + "_Gate";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT),

+		// 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.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/GeneralOrderingPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/GeneralOrderingPreferencePage.java
index 9c58d1149a5..4bda75a4bdf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/GeneralOrderingPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/GeneralOrderingPreferencePage.java
@@ -10,7 +10,7 @@ package org.eclipse.papyrus.uml.diagram.timing.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.timing.edit.parts.TimingDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.timing.part.UMLDiagramEditorPlugin;

 

@@ -43,27 +43,27 @@ public class GeneralOrderingPreferencePage extends AbstractPapyrusNodePreference
 	public static void initDefaults(final IPreferenceStore store) {

 

 		final String key = TimingDiagramEditPart.MODEL_ID + "_GeneralOrdering";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT),

+		// 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.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/InteractionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/InteractionPreferencePage.java
index 33bb500f43f..6c46071a13f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/InteractionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/InteractionPreferencePage.java
@@ -13,7 +13,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.timing.edit.parts.TimingDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.timing.part.UMLDiagramEditorPlugin;

 

@@ -51,39 +51,39 @@ public class InteractionPreferencePage extends AbstractPapyrusNodePreferencePage
 	public static void initDefaults(final IPreferenceStore store) {

 

 		final String key = TimingDiagramEditPart.MODEL_ID + "_Interaction";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 600);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 400);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 600);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 400);

 

 		Map<String, Boolean> map = getStaticCompartmentVisibilityPreferences();

 		for(final String name : map.keySet()) {

-			final String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			final String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(final String name : map.keySet()) {

-			final String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			final 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT),

+		// 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.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/LifelinePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/LifelinePreferencePage.java
index de07c88bb0c..264c5f3995d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/LifelinePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/LifelinePreferencePage.java
@@ -10,7 +10,7 @@ package org.eclipse.papyrus.uml.diagram.timing.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.timing.edit.parts.TimingDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.timing.part.UMLDiagramEditorPlugin;

 

@@ -43,27 +43,27 @@ public class LifelinePreferencePage extends AbstractPapyrusNodePreferencePage {
 	public static void initDefaults(final IPreferenceStore store) {

 

 		final String key = TimingDiagramEditPart.MODEL_ID + "_Lifeline";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT),

+		// 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.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/LinearTimingRulerPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/LinearTimingRulerPreferencePage.java
index b52faf23840..72c86f053f8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/LinearTimingRulerPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/LinearTimingRulerPreferencePage.java
@@ -13,7 +13,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.timing.edit.parts.TimingDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.timing.part.UMLDiagramEditorPlugin;

 

@@ -51,39 +51,39 @@ public class LinearTimingRulerPreferencePage extends AbstractPapyrusNodePreferen
 	public static void initDefaults(final IPreferenceStore store) {

 

 		final String key = TimingDiagramEditPart.MODEL_ID + "_LinearTimingRuler";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 40);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 40);

 

 		Map<String, Boolean> map = getStaticCompartmentVisibilityPreferences();

 		for(final String name : map.keySet()) {

-			final String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			final String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(final String name : map.keySet()) {

-			final String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			final 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT),

+		// 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.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/MessageOccurrenceSpecificationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/MessageOccurrenceSpecificationPreferencePage.java
index 9ea31f974d9..7c41d74c1ec 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/MessageOccurrenceSpecificationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/MessageOccurrenceSpecificationPreferencePage.java
@@ -10,7 +10,7 @@ package org.eclipse.papyrus.uml.diagram.timing.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.timing.edit.parts.TimingDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.timing.part.UMLDiagramEditorPlugin;

 

@@ -43,27 +43,27 @@ public class MessageOccurrenceSpecificationPreferencePage extends AbstractPapyru
 	public static void initDefaults(final IPreferenceStore store) {

 

 		final String key = TimingDiagramEditPart.MODEL_ID + "_MessageOccurrenceSpecification";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT),

+		// 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.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/OccurrenceSpecificationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/OccurrenceSpecificationPreferencePage.java
index c731e5dab8d..5c7e20dca45 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/OccurrenceSpecificationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/OccurrenceSpecificationPreferencePage.java
@@ -10,7 +10,7 @@ package org.eclipse.papyrus.uml.diagram.timing.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.timing.edit.parts.TimingDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.timing.part.UMLDiagramEditorPlugin;

 

@@ -43,27 +43,27 @@ public class OccurrenceSpecificationPreferencePage extends AbstractPapyrusNodePr
 	public static void initDefaults(final IPreferenceStore store) {

 

 		final String key = TimingDiagramEditPart.MODEL_ID + "_OccurrenceSpecification";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 4);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 4);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 4);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 4);

 

 		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT),

+		// 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.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/StateDefinitionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/StateDefinitionPreferencePage.java
index 24807648696..7aefd371f8b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/StateDefinitionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/StateDefinitionPreferencePage.java
@@ -10,7 +10,7 @@ package org.eclipse.papyrus.uml.diagram.timing.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.timing.edit.parts.TimingDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.timing.part.UMLDiagramEditorPlugin;

 

@@ -43,27 +43,27 @@ public class StateDefinitionPreferencePage extends AbstractPapyrusNodePreference
 	public static void initDefaults(final IPreferenceStore store) {

 

 		final String key = TimingDiagramEditPart.MODEL_ID + "_StateDefinition";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT),

+		// 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.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/TickPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/TickPreferencePage.java
index 918962de9c2..498d9959115 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/TickPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/TickPreferencePage.java
@@ -10,7 +10,7 @@ package org.eclipse.papyrus.uml.diagram.timing.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.timing.edit.parts.TimingDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.timing.part.UMLDiagramEditorPlugin;

 

@@ -43,27 +43,27 @@ public class TickPreferencePage extends AbstractPapyrusNodePreferencePage {
 	public static void initDefaults(final IPreferenceStore store) {

 

 		final String key = TimingDiagramEditPart.MODEL_ID + "_Tick";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 5);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 12);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 5);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 12);

 

 		// org.eclipse.jface.preference.PreferenceConverter.setDefault(store,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT),

+		// 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.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/TimeConstraintPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/TimeConstraintPreferencePage.java
index db72955452c..9ab72e282c7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/TimeConstraintPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/TimeConstraintPreferencePage.java
@@ -10,7 +10,7 @@ package org.eclipse.papyrus.uml.diagram.timing.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.timing.edit.parts.TimingDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.timing.part.UMLDiagramEditorPlugin;

 

@@ -43,27 +43,27 @@ public class TimeConstraintPreferencePage extends AbstractPapyrusNodePreferenceP
 	public static void initDefaults(final IPreferenceStore store) {

 

 		final String key = TimingDiagramEditPart.MODEL_ID + "_TimeConstraint";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT),

+		// 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.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/TimeObservationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/TimeObservationPreferencePage.java
index bfb07108d2b..4749c69023e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/TimeObservationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/TimeObservationPreferencePage.java
@@ -10,7 +10,7 @@ package org.eclipse.papyrus.uml.diagram.timing.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.timing.edit.parts.TimingDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.timing.part.UMLDiagramEditorPlugin;

 

@@ -43,27 +43,27 @@ public class TimeObservationPreferencePage extends AbstractPapyrusNodePreference
 	public static void initDefaults(final IPreferenceStore store) {

 

 		final String key = TimingDiagramEditPart.MODEL_ID + "_TimeObservation";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT),

+		// 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.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/VerticalLineStateInvariantPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/VerticalLineStateInvariantPreferencePage.java
index 148ee1ee229..9a2b9672e64 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/VerticalLineStateInvariantPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/preferences/VerticalLineStateInvariantPreferencePage.java
@@ -10,7 +10,7 @@ package org.eclipse.papyrus.uml.diagram.timing.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.timing.edit.parts.TimingDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.timing.part.UMLDiagramEditorPlugin;

 

@@ -43,27 +43,27 @@ public class VerticalLineStateInvariantPreferencePage extends AbstractPapyrusNod
 	public static void initDefaults(final IPreferenceStore store) {

 

 		final String key = TimingDiagramEditPart.MODEL_ID + "_VerticalLineStateInvariant";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		// 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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName,

-		// org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT),

+		// 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.timing/src/org/eclipse/papyrus/uml/diagram/timing/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/providers/UMLViewProvider.java
index ea40727ec7c..3f809601a06 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/providers/UMLViewProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/providers/UMLViewProvider.java
@@ -50,7 +50,7 @@ import org.eclipse.jface.preference.PreferenceConverter;
 import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

 import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.uml.diagram.timing.edit.parts.CompactLifelineCompartmentEditPartCN;

 import org.eclipse.papyrus.uml.diagram.timing.edit.parts.CompactLifelineEditPartCN;

@@ -1363,8 +1363,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	private void initFontStyleFromPrefs(final View view, final IPreferenceStore store, final String elementName) {

-		final String fontConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.FONT);

-		final String fontColorConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_FONT);

+		final String fontConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.FONT);

+		final String fontColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_FONT);

 

 		final FontStyle viewFontStyle = (FontStyle)view.getStyle(NotationPackage.Literals.FONT_STYLE);

 		if(viewFontStyle != null) {

@@ -1383,7 +1383,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	private void initForegroundFromPrefs(final View view, final IPreferenceStore store, final String elementName) {

-		final String lineColorConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_LINE);

+		final String lineColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_LINE);

 		final org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(store, lineColorConstant);

 		ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getLineStyle_LineColor(), FigureUtilities.RGBToInteger(lineRGB));

 	}

@@ -1392,9 +1392,9 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	private void initBackgroundFromPrefs(final View view, final IPreferenceStore store, final String elementName) {

-		final String fillColorConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_FILL);

-		final String gradientColorConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_GRADIENT);

-		final String gradientPolicyConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.GRADIENT_POLICY);

+		final String fillColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_FILL);

+		final String gradientColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_GRADIENT);

+		final String gradientPolicyConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.GRADIENT_POLICY);

 

 		final org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(store, fillColorConstant);

 		ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getFillStyle_FillColor(), FigureUtilities.RGBToInteger(fillRGB));

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 3217c6762e0..46aebfc41a0 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
@@ -61,7 +61,6 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.0",

- org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.2.0",

  org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0",

  org.eclipse.emf.ecore,

  org.eclipse.emf.ecore.xmi,

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/ui/SubjectSelectionDialog.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/ui/SubjectSelectionDialog.java
index bd31458def5..a61556e0eb6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/ui/SubjectSelectionDialog.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/ui/SubjectSelectionDialog.java
@@ -21,9 +21,9 @@ import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ISelection;

 import org.eclipse.jface.viewers.IStructuredContentProvider;

 import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.jface.viewers.LabelProvider;

 import org.eclipse.jface.viewers.TableViewer;

 import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.papyrus.infra.emf.providers.EMFLabelProvider;

 import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 import org.eclipse.swt.events.MouseEvent;

 import org.eclipse.swt.events.MouseListener;

@@ -61,13 +61,10 @@ public class SubjectSelectionDialog extends AbstractSubjectMetaclassesSelectionD
 	 * 

 	 */

 	protected void createContents() {

-		// TODO Auto-generated method stub

 		super.createContents();

-		final ILabelProvider labelProvider = new EMFLabelProvider() {

-

+		final ILabelProvider labelProvider = new LabelProvider() {

 			@Override

 			public String getText(Object element) {

-				// TODO Auto-generated method stub

 				if(element instanceof IHintedType) {

 					String out = ((IHintedType)element).getDisplayName();

 					return out;

@@ -77,7 +74,6 @@ public class SubjectSelectionDialog extends AbstractSubjectMetaclassesSelectionD
 

 			@Override

 			public Image getImage(Object element) {

-				// TODO Auto-generated method stub

 				final ILabelProvider labelProvider = new AdapterFactoryLabelProvider(UMLDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory());

 				return labelProvider.getImage(UMLFactory.eINSTANCE.createClass());

 			}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorAsRectangleEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorAsRectangleEditPartTN.java
index 732c244e27d..d59cbe9c34e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorAsRectangleEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorAsRectangleEditPartTN.java
@@ -42,7 +42,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.draw2d.CenterLayout;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

@@ -179,8 +179,8 @@ public class ActorAsRectangleEditPartTN extends ShapeNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Actor";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -898,15 +898,15 @@ public class ActorAsRectangleEditPartTN extends ShapeNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Actor", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Actor", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Actor", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Actor", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Actor", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Actor", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Actor", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Actor", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorEditPartTN.java
index f6d023eae07..b8644eb0ab3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorEditPartTN.java
@@ -47,7 +47,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLNodeEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

@@ -200,8 +200,8 @@ public class ActorEditPartTN extends UMLNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Actor";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -844,15 +844,15 @@ public class ActorEditPartTN extends UMLNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Actor", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Actor", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Actor", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Actor", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Actor", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Actor", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Actor", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Actor", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInComponentEditPart.java
index a6b2dd5d59c..b09735a9c39 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInComponentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInComponentEditPart.java
@@ -47,7 +47,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLNodeEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

@@ -200,8 +200,8 @@ public class ActorInComponentEditPart extends UMLNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Actor";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -844,15 +844,15 @@ public class ActorInComponentEditPart extends UMLNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Actor", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Actor", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Actor", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Actor", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Actor", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Actor", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Actor", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Actor", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInPackageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInPackageEditPart.java
index 5a940c6e7ab..a48824a7afe 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInPackageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ActorInPackageEditPart.java
@@ -47,7 +47,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.UMLNodeEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

@@ -200,8 +200,8 @@ public class ActorInPackageEditPart extends UMLNodeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Actor";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -844,15 +844,15 @@ public class ActorInPackageEditPart extends UMLNodeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Actor", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Actor", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Actor", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Actor", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Actor", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Actor", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Actor", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Actor", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/CommentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/CommentEditPartCN.java
index 0580566f3c4..2ab5c8eb048 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/CommentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/CommentEditPartCN.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -199,8 +199,8 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Comment";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -426,15 +426,15 @@ public class CommentEditPartCN extends AbstractCommentEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/CommentEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/CommentEditPartTN.java
index f6818210465..163e19c6b8d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/CommentEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/CommentEditPartTN.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -199,8 +199,8 @@ public class CommentEditPartTN extends AbstractCommentEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Comment";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -426,15 +426,15 @@ public class CommentEditPartTN extends AbstractCommentEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Comment", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Comment", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentInComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentInComponentEditPart.java
index 7a542edbee7..885ad9456d5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentInComponentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentInComponentEditPart.java
@@ -46,7 +46,7 @@ import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IPapyrusEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.draw2d.PileLayout;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -214,8 +214,8 @@ public class ComponentInComponentEditPart extends ShapeNodeEditPart implements I
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Component";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -971,15 +971,15 @@ public class ComponentInComponentEditPart extends ShapeNodeEditPart implements I
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Component", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Component", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Component", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Component", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentInPackageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentInPackageEditPart.java
index 9ae960936d7..621512687b7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentInPackageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ComponentInPackageEditPart.java
@@ -46,7 +46,7 @@ import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IPapyrusEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.draw2d.PileLayout;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -214,8 +214,8 @@ public class ComponentInPackageEditPart extends ShapeNodeEditPart implements IPa
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Component";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -971,15 +971,15 @@ public class ComponentInPackageEditPart extends ShapeNodeEditPart implements IPa
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Component", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Component", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Component", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Component", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Component", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ConstraintEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ConstraintEditPartTN.java
index f24c97e2821..dcfc68d0747 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ConstraintEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ConstraintEditPartTN.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -204,8 +204,8 @@ public class ConstraintEditPartTN extends AbstractConstraintEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Constraint";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -807,15 +807,15 @@ public class ConstraintEditPartTN extends AbstractConstraintEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ConstraintInComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ConstraintInComponentEditPart.java
index bca1a2b2cca..5fd3cf60ac9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ConstraintInComponentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ConstraintInComponentEditPart.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -204,8 +204,8 @@ public class ConstraintInComponentEditPart extends AbstractConstraintEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Constraint";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -807,15 +807,15 @@ public class ConstraintInComponentEditPart extends AbstractConstraintEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ConstraintInPackageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ConstraintInPackageEditPart.java
index 88259ef52d0..8b4e449fa79 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ConstraintInPackageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ConstraintInPackageEditPart.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -204,8 +204,8 @@ public class ConstraintInPackageEditPart extends AbstractConstraintEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Constraint";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -807,15 +807,15 @@ public class ConstraintInPackageEditPart extends AbstractConstraintEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Constraint", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Constraint", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/DefaultNamedElementEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/DefaultNamedElementEditPartTN.java
index 8250123a1fb..047138014ad 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/DefaultNamedElementEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/DefaultNamedElementEditPartTN.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -201,8 +201,8 @@ public class DefaultNamedElementEditPartTN extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "DefaultNamedElement";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -722,15 +722,15 @@ public class DefaultNamedElementEditPartTN extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DefaultNamedElement", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DefaultNamedElement", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DefaultNamedElement", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DefaultNamedElement", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("DefaultNamedElement", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("DefaultNamedElement", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("DefaultNamedElement", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("DefaultNamedElement", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/PackageEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/PackageEditPartCN.java
index 78788673165..d1a7537cce4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/PackageEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/PackageEditPartCN.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -216,8 +216,8 @@ public class PackageEditPartCN extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Package";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferrenceContantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferrenceContantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferrenceContantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferrenceContantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new PackageNodePlateFigure(store.getInt(preferrenceContantWitdh), store.getInt(preferrenceContantHeight));

 		return result;

 	}

@@ -776,15 +776,15 @@ public class PackageEditPartCN extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Package", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Package", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Package", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Package", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Package", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Package", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Package", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Package", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/PackageEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/PackageEditPartTN.java
index 43436779cf2..30b4dee9bf0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/PackageEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/PackageEditPartTN.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -217,8 +217,8 @@ public class PackageEditPartTN extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Package";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferrenceContantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferrenceContantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferrenceContantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferrenceContantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new PackageNodePlateFigure(store.getInt(preferrenceContantWitdh), store.getInt(preferrenceContantHeight));

 		return result;

 	}

@@ -777,15 +777,15 @@ public class PackageEditPartTN extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Package", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Package", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Package", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Package", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Package", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Package", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Package", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Package", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ShapeNamedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ShapeNamedElementEditPart.java
index b92fb00600f..509f5261b1b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ShapeNamedElementEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ShapeNamedElementEditPart.java
@@ -49,7 +49,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractShapeEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -202,8 +202,8 @@ public class ShapeNamedElementEditPart extends AbstractShapeEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "NamedElement";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -718,15 +718,15 @@ public class ShapeNamedElementEditPart extends AbstractShapeEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("NamedElement", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("NamedElement", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("NamedElement", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("NamedElement", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("NamedElement", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("NamedElement", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("NamedElement", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("NamedElement", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ShortCutDiagramEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ShortCutDiagramEditPart.java
index b758a90fcd0..f93b82ecf13 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ShortCutDiagramEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/ShortCutDiagramEditPart.java
@@ -51,7 +51,7 @@ import org.eclipse.papyrus.infra.core.editorsfactory.PageIconsRegistry;
 import org.eclipse.papyrus.infra.core.services.ServiceException;

 import org.eclipse.papyrus.infra.gmfdiag.common.utils.ServiceUtilsForEditPart;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractShortCutDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShortCutDiagramEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.figure.node.DiagramNodeFigure;

@@ -202,8 +202,8 @@ public class ShortCutDiagramEditPart extends AbstractShortCutDiagramEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "ShortCutDiagram";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -364,15 +364,15 @@ public class ShortCutDiagramEditPart extends AbstractShortCutDiagramEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ShortCutDiagram", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ShortCutDiagram", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ShortCutDiagram", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ShortCutDiagram", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("ShortCutDiagram", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("ShortCutDiagram", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("ShortCutDiagram", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("ShortCutDiagram", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectClassifierEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectClassifierEditPartTN.java
index fda9c0bc1dd..7c7ed1afcd9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectClassifierEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/SubjectClassifierEditPartTN.java
@@ -41,7 +41,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -213,8 +213,8 @@ public class SubjectClassifierEditPartTN extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "Classifier";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -862,15 +862,15 @@ public class SubjectClassifierEditPartTN extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Classifier", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Classifier", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Classifier", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Classifier", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("Classifier", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("Classifier", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("Classifier", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("Classifier", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseAsRectangleEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseAsRectangleEditPartTN.java
index 929375c959c..0bc0480ddb2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseAsRectangleEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseAsRectangleEditPartTN.java
@@ -43,7 +43,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.ChangeStereotypedShapeEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

@@ -216,8 +216,8 @@ public class UseCaseAsRectangleEditPartTN extends NamedElementEditPart {
 	protected NodeFigure createNodePlate() {

 		String prefElementId = "UseCase";

 		IPreferenceStore store = UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

-		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.WIDTH);

-		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferenceConstantHelper.HEIGHT);

+		String preferenceConstantWitdh = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.WIDTH);

+		String preferenceConstantHeight = PreferenceInitializerForElementHelper.getpreferenceKey(getNotationView(), prefElementId, PreferencesConstantsHelper.HEIGHT);

 		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(store.getInt(preferenceConstantWitdh), store.getInt(preferenceConstantHeight));

 		return result;

 	}

@@ -927,15 +927,15 @@ public class UseCaseAsRectangleEditPartTN extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("UseCase", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("UseCase", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("UseCase", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("UseCase", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("UseCase", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("UseCase", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("UseCase", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("UseCase", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseEditPartTN.java
index c55b4ed3b97..7d6b2f489e8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseEditPartTN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseEditPartTN.java
@@ -42,7 +42,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -929,15 +929,15 @@ public class UseCaseEditPartTN extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("UseCase", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("UseCase", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("UseCase", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("UseCase", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("UseCase", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("UseCase", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("UseCase", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("UseCase", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseInComponentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseInComponentEditPart.java
index 632cd740dba..fc418a3e37f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseInComponentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseInComponentEditPart.java
@@ -42,7 +42,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -929,15 +929,15 @@ public class UseCaseInComponentEditPart extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("UseCase", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("UseCase", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("UseCase", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("UseCase", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("UseCase", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("UseCase", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("UseCase", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("UseCase", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseInPackageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseInPackageEditPart.java
index 163c10cb413..3c388b54374 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseInPackageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseInPackageEditPart.java
@@ -42,7 +42,7 @@ import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.jface.preference.PreferenceConverter;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

 import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

@@ -929,15 +929,15 @@ public class UseCaseInPackageEditPart extends NamedElementEditPart {
 		if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

 			String prefColor = null;

 			if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("UseCase", PreferenceConstantHelper.COLOR_LINE);

+				prefColor = PreferencesConstantsHelper.getElementConstant("UseCase", PreferencesConstantsHelper.COLOR_LINE);

 			} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("UseCase", PreferenceConstantHelper.COLOR_FONT);

+				prefColor = PreferencesConstantsHelper.getElementConstant("UseCase", PreferencesConstantsHelper.COLOR_FONT);

 			} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {

-				prefColor = PreferenceConstantHelper.getElementConstant("UseCase", PreferenceConstantHelper.COLOR_FILL);

+				prefColor = PreferencesConstantsHelper.getElementConstant("UseCase", PreferencesConstantsHelper.COLOR_FILL);

 			}

 			result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));

 		} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {

-			String prefGradient = PreferenceConstantHelper.getElementConstant("UseCase", PreferenceConstantHelper.COLOR_GRADIENT);

+			String prefGradient = PreferencesConstantsHelper.getElementConstant("UseCase", PreferencesConstantsHelper.COLOR_GRADIENT);

 			GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));

 			if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {

 				result = new Integer(gradientPreferenceConverter.getTransparency());

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/AbstractionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/AbstractionPreferencePage.java
index 1011b4ba1d5..55788236edd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/AbstractionPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/AbstractionPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

@@ -51,7 +51,7 @@ public class AbstractionPreferencePage extends AbstractPapyrusLinkPreferencePage
 		String key = UseCaseDiagramEditPart.MODEL_ID + "_Abstraction";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ActorPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ActorPreferencePage.java
index a6885a33107..facd059050a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ActorPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ActorPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.usecase.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class ActorPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = UseCaseDiagramEditPart.MODEL_ID + "_Actor";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 80);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 60);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 80);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 60);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/AssociationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/AssociationPreferencePage.java
index bc1fe02fc3d..0173ed20166 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/AssociationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/AssociationPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

@@ -51,7 +51,7 @@ public class AssociationPreferencePage extends AbstractPapyrusLinkPreferencePage
 		String key = UseCaseDiagramEditPart.MODEL_ID + "_Association";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ClassPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ClassPreferencePage.java
index ba7f68f51b6..c923dd8efab 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ClassPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ClassPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 

@@ -53,26 +53,26 @@ public class ClassPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = UseCaseDiagramEditPart.MODEL_ID + "_Class";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 200);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 400);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 200);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 400);

 		Map<String, Boolean> map = getStaticCompartmentVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ClassifierPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ClassifierPreferencePage.java
index c56be34556c..3ce23ac9ac1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ClassifierPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ClassifierPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 

@@ -53,26 +53,26 @@ public class ClassifierPreferencePage extends AbstractPapyrusNodePreferencePage
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = UseCaseDiagramEditPart.MODEL_ID + "_Classifier";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 200);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 400);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 200);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 400);

 		Map<String, Boolean> map = getStaticCompartmentVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/CommentPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/CommentPreferencePage.java
index 1c6c9ad3cfa..88b5d3d34df 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/CommentPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/CommentPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.usecase.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class CommentPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = UseCaseDiagramEditPart.MODEL_ID + "_Comment";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ComponentPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ComponentPreferencePage.java
index 77d858a2bf1..2705dc94de2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ComponentPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ComponentPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 

@@ -53,26 +53,26 @@ public class ComponentPreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = UseCaseDiagramEditPart.MODEL_ID + "_Component";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 200);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 400);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 200);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 400);

 		Map<String, Boolean> map = getStaticCompartmentVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ConstraintPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ConstraintPreferencePage.java
index c59f37b987f..b75b35c4b2c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ConstraintPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ConstraintPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.usecase.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class ConstraintPreferencePage extends AbstractPapyrusNodePreferencePage
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = UseCaseDiagramEditPart.MODEL_ID + "_Constraint";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/DefaultNamedElementPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/DefaultNamedElementPreferencePage.java
index 450f4783c9b..784f7e43f70 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/DefaultNamedElementPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/DefaultNamedElementPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.usecase.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class DefaultNamedElementPreferencePage extends AbstractPapyrusNodePrefer
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = UseCaseDiagramEditPart.MODEL_ID + "_DefaultNamedElement";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 100);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 50);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 100);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 50);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/DependencyPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/DependencyPreferencePage.java
index ab717cd44f3..60b595352f9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/DependencyPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/DependencyPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

@@ -51,7 +51,7 @@ public class DependencyPreferencePage extends AbstractPapyrusLinkPreferencePage
 		String key = UseCaseDiagramEditPart.MODEL_ID + "_Dependency";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ExtendPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ExtendPreferencePage.java
index 1c060952e48..07a4240e013 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ExtendPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ExtendPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

@@ -51,7 +51,7 @@ public class ExtendPreferencePage extends AbstractPapyrusLinkPreferencePage {
 		String key = UseCaseDiagramEditPart.MODEL_ID + "_Extend";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ExtensionPointPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ExtensionPointPreferencePage.java
index e3a81a337c8..9e31c3c9304 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ExtensionPointPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ExtensionPointPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.usecase.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class ExtensionPointPreferencePage extends AbstractPapyrusNodePreferenceP
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = UseCaseDiagramEditPart.MODEL_ID + "_ExtensionPoint";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/GeneralizationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/GeneralizationPreferencePage.java
index 246a52dafa5..b87a6b0ced6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/GeneralizationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/GeneralizationPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

@@ -51,7 +51,7 @@ public class GeneralizationPreferencePage extends AbstractPapyrusLinkPreferenceP
 		String key = UseCaseDiagramEditPart.MODEL_ID + "_Generalization";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/IncludePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/IncludePreferencePage.java
index 3dc3b988f4f..c973d077369 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/IncludePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/IncludePreferencePage.java
@@ -18,7 +18,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

@@ -51,7 +51,7 @@ public class IncludePreferencePage extends AbstractPapyrusLinkPreferencePage {
 		String key = UseCaseDiagramEditPart.MODEL_ID + "_Include";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/InterfacePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/InterfacePreferencePage.java
index 6b192122ebb..9cb0d0e8baa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/InterfacePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/InterfacePreferencePage.java
@@ -18,7 +18,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 

@@ -53,26 +53,26 @@ public class InterfacePreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = UseCaseDiagramEditPart.MODEL_ID + "_Interface";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 200);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 400);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 200);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 400);

 		Map<String, Boolean> map = getStaticCompartmentVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/NamedElementPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/NamedElementPreferencePage.java
index 9c3dc6e963d..07bbf633ec1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/NamedElementPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/NamedElementPreferencePage.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.usecase.preferences;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 

@@ -45,15 +45,15 @@ public class NamedElementPreferencePage extends AbstractPapyrusNodePreferencePag
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = UseCaseDiagramEditPart.MODEL_ID + "_NamedElement";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/PackageImportPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/PackageImportPreferencePage.java
index 85ab2946230..75e8251af08 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/PackageImportPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/PackageImportPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

@@ -51,7 +51,7 @@ public class PackageImportPreferencePage extends AbstractPapyrusLinkPreferencePa
 		String key = UseCaseDiagramEditPart.MODEL_ID + "_PackageImport";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/PackageMergePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/PackageMergePreferencePage.java
index eb9dda3fbb6..5c8f16ce114 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/PackageMergePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/PackageMergePreferencePage.java
@@ -18,7 +18,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

@@ -51,7 +51,7 @@ public class PackageMergePreferencePage extends AbstractPapyrusLinkPreferencePag
 		String key = UseCaseDiagramEditPart.MODEL_ID + "_PackageMerge";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/PackagePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/PackagePreferencePage.java
index be475aedfd1..0ead5a6ddfd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/PackagePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/PackagePreferencePage.java
@@ -18,7 +18,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 

@@ -53,26 +53,26 @@ public class PackagePreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = UseCaseDiagramEditPart.MODEL_ID + "_Package";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 150);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 150);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.WIDTH), 150);

+		store.setDefault(PreferencesConstantsHelper.getElementConstant(key, PreferencesConstantsHelper.HEIGHT), 150);

 		Map<String, Boolean> map = getStaticCompartmentVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/RealizationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/RealizationPreferencePage.java
index 05b941b610d..3bf6523eb4a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/RealizationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/RealizationPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

@@ -51,7 +51,7 @@ public class RealizationPreferencePage extends AbstractPapyrusLinkPreferencePage
 		String key = UseCaseDiagramEditPart.MODEL_ID + "_Realization";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ShortCutDiagramPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ShortCutDiagramPreferencePage.java
index 883b1966873..57d18c70136 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ShortCutDiagramPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/ShortCutDiagramPreferencePage.java
@@ -18,7 +18,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

@@ -49,21 +49,21 @@ public class ShortCutDiagramPreferencePage extends AbstractPapyrusNodePreference
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = UseCaseDiagramEditPart.MODEL_ID + "_ShortCutDiagram";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 20);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 20);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/UsagePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/UsagePreferencePage.java
index a71ca604e77..60f8de7b509 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/UsagePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/UsagePreferencePage.java
@@ -18,7 +18,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

@@ -51,7 +51,7 @@ public class UsagePreferencePage extends AbstractPapyrusLinkPreferencePage {
 		String key = UseCaseDiagramEditPart.MODEL_ID + "_Usage";

 		Map<String, Boolean> map = getStaticLabelVisibilityPreferences();

 		for(String role : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, role, PreferenceConstantHelper.LABEL_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, role, PreferencesConstantsHelper.LABEL_VISIBILITY);

 			store.setDefault(preferenceName, map.get(role));

 		}

 	}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/UseCasePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/UseCasePreferencePage.java
index 77fafd54d90..34d7b6c9e10 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/UseCasePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/UseCasePreferencePage.java
@@ -18,7 +18,7 @@ import java.util.TreeMap;
 

 import org.eclipse.jface.preference.IPreferenceStore;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.UseCaseDiagramEditPart;

 import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;

 

@@ -53,26 +53,26 @@ public class UseCasePreferencePage extends AbstractPapyrusNodePreferencePage {
 	 */

 	public static void initDefaults(IPreferenceStore store) {

 		String key = UseCaseDiagramEditPart.MODEL_ID + "_UseCase";

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);

-		store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);

+		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 = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);

+			String preferenceName = PreferencesConstantsHelper.getLabelElementConstant(key, name, PreferencesConstantsHelper.COMPARTMENT_VISIBILITY);

 			store.setDefault(preferenceName, map.get(name));

 		}

 		map = getStaticCompartmentTitleVisibilityPreferences();

 		for(String name : map.keySet()) {

-			String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);

+			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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));

-		//org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);

+		//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.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());

+		//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.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLViewProvider.java
index f0c76a30b45..325a04d9dc5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLViewProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/providers/UMLViewProvider.java
@@ -55,7 +55,7 @@ import org.eclipse.jface.preference.PreferenceConverter;
 import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

 import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

 import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

 import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AbstractionEditPart;

 import org.eclipse.papyrus.uml.diagram.usecase.edit.parts.AbstractionNameEditPart;

@@ -1435,8 +1435,8 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	private void initFontStyleFromPrefs(View view, final IPreferenceStore store, String elementName) {

-		String fontConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.FONT);

-		String fontColorConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_FONT);

+		String fontConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.FONT);

+		String fontColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_FONT);

 		FontStyle viewFontStyle = (FontStyle)view.getStyle(NotationPackage.Literals.FONT_STYLE);

 		if(viewFontStyle != null) {

 			FontData fontData = PreferenceConverter.getFontData(store, fontConstant);

@@ -1453,7 +1453,7 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	private void initForegroundFromPrefs(View view, final IPreferenceStore store, String elementName) {

-		String lineColorConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_LINE);

+		String lineColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_LINE);

 		org.eclipse.swt.graphics.RGB lineRGB = PreferenceConverter.getColor(store, lineColorConstant);

 		ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getLineStyle_LineColor(), FigureUtilities.RGBToInteger(lineRGB));

 	}

@@ -1462,9 +1462,9 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 	 * @generated

 	 */

 	private void initBackgroundFromPrefs(View view, final IPreferenceStore store, String elementName) {

-		String fillColorConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_FILL);

-		String gradientColorConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.COLOR_GRADIENT);

-		String gradientPolicyConstant = PreferenceConstantHelper.getElementConstant(elementName, PreferenceConstantHelper.GRADIENT_POLICY);

+		String fillColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_FILL);

+		String gradientColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_GRADIENT);

+		String gradientPolicyConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.GRADIENT_POLICY);

 		org.eclipse.swt.graphics.RGB fillRGB = PreferenceConverter.getColor(store, fillColorConstant);

 		ViewUtil.setStructuralFeatureValue(view, NotationPackage.eINSTANCE.getFillStyle_FillColor(), FigureUtilities.RGBToInteger(fillRGB));

 		FillStyle fillStyle = (FillStyle)view.getStyle(NotationPackage.Literals.FILL_STYLE);

diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/META-INF/MANIFEST.MF b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/META-INF/MANIFEST.MF
index 67ab3a3f0ff..ab037dd30bb 100644
--- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",

  org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",

  org.eclipse.papyrus.infra.emf;bundle-version="1.0.0",

- com.google.guava;bundle-version="10.0.1",

+ com.google.guava;bundle-version="11.0.0",

  org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.0",

  org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.300",

diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/queries/GetContainedDiagrams.java b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/queries/GetContainedDiagrams.java
index 265ee913f9e..7354ad1f1c6 100644
--- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/queries/GetContainedDiagrams.java
+++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/queries/GetContainedDiagrams.java
@@ -12,9 +12,13 @@
  */
 package org.eclipse.papyrus.uml.modelexplorer.queries;
 
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
 
-import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.facet.infra.query.core.exception.ModelQueryExecutionException;
 import org.eclipse.emf.facet.infra.query.core.java.IJavaModelQuery;
 import org.eclipse.emf.facet.infra.query.core.java.ParameterValueList;
@@ -23,9 +27,6 @@ import org.eclipse.papyrus.views.modelexplorer.NavigatorUtils;
 import org.eclipse.papyrus.views.modelexplorer.queries.AbstractEditorContainerQuery;
 import org.eclipse.uml2.uml.Element;
 
-import com.google.common.base.Function;
-import com.google.common.base.Predicate;
-
 /**
  * Get the collection of all contained diagrams
  * FIXME : delete this class when the bug EMF-Facet 365744 will be corrected!
@@ -35,19 +36,21 @@ import com.google.common.base.Predicate;
 @Deprecated
 public class GetContainedDiagrams extends AbstractEditorContainerQuery implements IJavaModelQuery<Element, Collection<org.eclipse.gmf.runtime.notation.Diagram>> {
 
-	public Collection<org.eclipse.gmf.runtime.notation.Diagram> evaluate(final Element context, final ParameterValueList parameterValues) throws ModelQueryExecutionException {
-		Predicate<EStructuralFeature.Setting> p = new Predicate<EStructuralFeature.Setting>() {
-			public boolean apply(EStructuralFeature.Setting arg0) {
-				return arg0.getEObject() instanceof Diagram ;
-			}
-		};
-		Function<EStructuralFeature.Setting, Diagram> f = new Function<EStructuralFeature.Setting, Diagram>() {
+	public Collection<Diagram> evaluate(final Element context, final ParameterValueList parameterValues) throws ModelQueryExecutionException {
+		List<Diagram> result = new ArrayList<Diagram>();
+		Iterator<EObject> roots = NavigatorUtils.getNotationRoots(context);
+		if(roots == null) {
+			return result;
+		}
 
-			public Diagram apply(EStructuralFeature.Setting arg0) {
-				return (Diagram)arg0.getEObject();
+		while(roots.hasNext()) {
+			EObject root = roots.next();
+			if(root instanceof Diagram) {
+				if(EcoreUtil.equals(((Diagram)root).getElement(), context)) {
+					result.add((Diagram)root);
+				}
 			}
-			
-		};
-		return NavigatorUtils.findFilterAndApply(context, p, f);
+		}
+		return result;
 	}
 }
diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/queries/IsDiagramContainer.java b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/queries/IsDiagramContainer.java
index 547e4d8b4c7..09086c714b5 100644
--- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/queries/IsDiagramContainer.java
+++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/src/org/eclipse/papyrus/uml/modelexplorer/queries/IsDiagramContainer.java
@@ -12,17 +12,17 @@
  */

 package org.eclipse.papyrus.uml.modelexplorer.queries;

 

+import java.util.Iterator;

+

 import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.util.EcoreUtil;

 import org.eclipse.emf.facet.infra.query.core.exception.ModelQueryExecutionException;

 import org.eclipse.emf.facet.infra.query.core.java.IJavaModelQuery;

 import org.eclipse.emf.facet.infra.query.core.java.ParameterValueList;

 import org.eclipse.gmf.runtime.notation.Diagram;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.papyrus.views.modelexplorer.NavigatorUtils;

 import org.eclipse.papyrus.views.modelexplorer.queries.AbstractEditorContainerQuery;

 

-import com.google.common.base.Predicate;

-

 /**

  * FIXME : delete this class when the bug EMF-Facet 365744 will be corrected!

  * 

@@ -33,13 +33,19 @@ public class IsDiagramContainer extends AbstractEditorContainerQuery implements
 

 

 	public Boolean evaluate(final EObject context, ParameterValueList parameterValues) throws ModelQueryExecutionException {

-		Predicate<EObject> p = new Predicate<EObject>() {

+		Iterator<EObject> roots = NavigatorUtils.getNotationRoots(context);

+		if(roots == null) {

+			return false;

+		}

 

-			public boolean apply(EObject arg0) {

-				return arg0 instanceof Diagram && ((Diagram)arg0).getElement() == context;

+		while(roots.hasNext()) {

+			EObject root = roots.next();

+			if(root instanceof Diagram) {

+				if(EcoreUtil.equals(((Diagram)root).getElement(), context)) {

+					return true;

+				}

 			}

-		};

-

-		return NavigatorUtils.any(context, NotationPackage.eINSTANCE.getDiagram(), false, p);

+		}

+		return false;

 	}

 }

diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/META-INF/MANIFEST.MF
index f859c0a0e94..5ea0d3074be 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/META-INF/MANIFEST.MF
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/META-INF/MANIFEST.MF
@@ -12,7 +12,6 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.nattable.model;bundle-version="1.0.0",

  org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0",

- org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.2.1",

  org.eclipse.papyrus.infra.nattable;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.core;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.0",

@@ -21,7 +20,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.tools;bundle-version="1.0.0",

  org.eclipse.jface,

  org.eclipse.core.expressions,

- org.eclipse.swt

+ org.eclipse.swt,

+ org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.4.0"

 Export-Package: org.eclipse.papyrus.uml.nattable,

  org.eclipse.papyrus.uml.nattable.config,

  org.eclipse.papyrus.uml.nattable.dataprovider,

diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLFeatureCellEditorConfig.java b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLFeatureCellEditorConfig.java
index 5c9201287ce..ec321760dad 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLFeatureCellEditorConfig.java
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/src/org/eclipse/papyrus/uml/nattable/config/UMLFeatureCellEditorConfig.java
@@ -7,6 +7,7 @@ import org.eclipse.emf.ecore.impl.DynamicEObjectImpl;
 import org.eclipse.jface.viewers.ILabelProvider;

 import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;

 import org.eclipse.nebula.widgets.nattable.data.convert.DefaultDisplayConverter;

+import org.eclipse.nebula.widgets.nattable.data.convert.DefaultDoubleDisplayConverter;

 import org.eclipse.nebula.widgets.nattable.data.convert.DisplayConverter;

 import org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter;

 import org.eclipse.nebula.widgets.nattable.data.validate.IDataValidator;

@@ -410,6 +411,9 @@ public class UMLFeatureCellEditorConfig extends EStructuralFeatureEditorConfig {
 		int editorKind = getFeatureIdentifier(table, axisElement);

 		IDisplayConverter converter = null;

 		switch(editorKind) {

+		case SINGLE_REAL:

+			converter = new DefaultDoubleDisplayConverter();

+			break;

 		case SINGLE_UML_REFERENCE:

 			converter = new DisplayConverter() {

 

@@ -495,4 +499,4 @@ public class UMLFeatureCellEditorConfig extends EStructuralFeatureEditorConfig {
 	public String getEditorConfigId() {

 		return EDITOR_CONFIG_ID;

 	}

-}

+}
\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/META-INF/MANIFEST.MF
index 7d0d8fed985..523fba84d65 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.controlmode.profile/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Require-Bundle: org.eclipse.core.commands,
  org.eclipse.papyrus.infra.services.controlmode;bundle-version="1.0.0",

  org.eclipse.emf.workspace,

  org.eclipse.papyrus.uml.tools;bundle-version="1.0.0",

- com.google.guava;bundle-version="10.0.1",

+ com.google.guava;bundle-version="11.0.0",

  org.eclipse.papyrus.infra.core;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.0.0",

diff --git a/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/src/org/eclipse/papyrus/uml/extensionpoints/standard/RegisteredElementExtensionPoint.java b/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/src/org/eclipse/papyrus/uml/extensionpoints/standard/RegisteredElementExtensionPoint.java
index 834b1256020..32444e59545 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/src/org/eclipse/papyrus/uml/extensionpoints/standard/RegisteredElementExtensionPoint.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.extensionpoints/src/org/eclipse/papyrus/uml/extensionpoints/standard/RegisteredElementExtensionPoint.java
@@ -50,7 +50,7 @@ public abstract class RegisteredElementExtensionPoint {
 
 	/**
 	 * Creates a new AbstractExtensionPoint.
-	 * 
+	 *
 	 * @param configElt
 	 *        the configuration element for the extension point
 	 * @param ordinal
@@ -71,7 +71,7 @@ public abstract class RegisteredElementExtensionPoint {
 
 	/**
 	 * Returns the given value for the specified element
-	 * 
+	 *
 	 * @param defaultValue
 	 *        value given to the property if it is not already set
 	 * @param isRequired
@@ -82,8 +82,7 @@ public abstract class RegisteredElementExtensionPoint {
 	 *        name of the property
 	 * @return the value of the given property, or the specified defaultValue
 	 */
-	protected static String getAttribute(IConfigurationElement configElt, String name, String defaultValue,
-			boolean isRequired) {
+	protected static String getAttribute(IConfigurationElement configElt, String name, String defaultValue, boolean isRequired) {
 		String value = configElt.getAttribute(name);
 
 		if(value != null) {
@@ -101,13 +100,13 @@ public abstract class RegisteredElementExtensionPoint {
 
 	/**
 	 * Returns the icon associated to the given configuration element
-	 * 
+	 *
 	 * @return the icon which path is in extension
 	 */
 	protected Image getImage(String iconPath, IConfigurationElement configElement) {
 
 		// no image associated to this plug-in
-		if(iconPath == null) {
+		if(iconPath == null || "".equals(iconPath)) { //$NON-NLS-1$
 			return null;
 		}
 
@@ -125,7 +124,7 @@ public abstract class RegisteredElementExtensionPoint {
 
 	/**
 	 * Get the image associated to the registered element
-	 * 
+	 *
 	 * @return an icon for the transformation or <code>null</code> if no icon is associated to the
 	 *         profile
 	 */
@@ -135,7 +134,7 @@ public abstract class RegisteredElementExtensionPoint {
 
 	/**
 	 * Returns the name of the extension point
-	 * 
+	 *
 	 * @return the name of the extension point
 	 */
 	public String getName() {
@@ -144,7 +143,7 @@ public abstract class RegisteredElementExtensionPoint {
 
 	/**
 	 * Sets the name of the extension point
-	 * 
+	 *
 	 * @param name
 	 *        the name to set
 	 */
@@ -154,7 +153,7 @@ public abstract class RegisteredElementExtensionPoint {
 
 	/**
 	 * Returns the description of the extension point
-	 * 
+	 *
 	 * @return the description of the extension point
 	 */
 	public String getDescription() {
@@ -163,7 +162,7 @@ public abstract class RegisteredElementExtensionPoint {
 
 	/**
 	 * Sets the description of the extension point
-	 * 
+	 *
 	 * @param description
 	 *        the description to set
 	 */
@@ -173,7 +172,7 @@ public abstract class RegisteredElementExtensionPoint {
 
 	/**
 	 * Returns the provider of the extension point
-	 * 
+	 *
 	 * @return the provider of the extension point
 	 */
 	public String getProvider() {
@@ -182,7 +181,7 @@ public abstract class RegisteredElementExtensionPoint {
 
 	/**
 	 * Sets the provider of the extension point
-	 * 
+	 *
 	 * @param provider
 	 *        the provider to set
 	 */
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/META-INF/MANIFEST.MF
index d29f4c2c48c..5ee50c10ba4 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.emf;bundle-version="1.0.0",

  org.eclipse.emf.edit;bundle-version="2.9.0",

  org.eclipse.emf.transaction;bundle-version="1.4.0",

- com.google.guava,

+ com.google.guava;bundle-version="11.0.0",

  org.eclipse.uml2.uml;bundle-version="4.1.0",

  org.eclipse.papyrus.uml.tools;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.widgets;bundle-version="1.0.0",

diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/ui/SwitchProfileDialog.java b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/ui/SwitchProfileDialog.java
index f890f74f24a..a172fb66fa7 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/ui/SwitchProfileDialog.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/src/org/eclipse/papyrus/uml/modelrepair/ui/SwitchProfileDialog.java
@@ -23,11 +23,12 @@ import java.util.Set;
 

 import org.eclipse.core.resources.IFile;

 import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.NullProgressMonitor;

 import org.eclipse.emf.common.util.URI;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.resource.Resource;

 import org.eclipse.emf.ecore.util.EcoreUtil;

+import org.eclipse.emf.ecore.xmi.XMLResource;

+import org.eclipse.emf.ecore.xmi.impl.URIHandlerImpl.PlatformSchemeAware;

 import org.eclipse.emf.transaction.RecordingCommand;

 import org.eclipse.emf.transaction.TransactionalEditingDomain;

 import org.eclipse.jface.dialogs.IDialogConstants;

@@ -46,8 +47,10 @@ import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;

 import org.eclipse.jface.viewers.ViewerCell;

 import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.infra.core.resource.IReadOnlyHandler;

 import org.eclipse.papyrus.infra.core.resource.ModelSet;

 import org.eclipse.papyrus.infra.core.services.ServiceException;

+import org.eclipse.papyrus.infra.emf.readonly.ReadOnlyManager;

 import org.eclipse.papyrus.infra.emf.resource.DependencyManagementHelper;

 import org.eclipse.papyrus.infra.emf.resource.Replacement;

 import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;

@@ -223,7 +226,11 @@ public class SwitchProfileDialog extends SelectionDialog {
 	}

 

 	protected void updateControls() {

-

+		String newTitle = "Switch profile location";

+		if(!profilesToEdit.isEmpty()) {

+			newTitle += " *";

+		}

+		getShell().setText(newTitle);

 		getButton(APPLY_ID).setEnabled(!profilesToEdit.isEmpty());

 

 		boolean enableBrowse = !viewer.getSelection().isEmpty();

@@ -272,6 +279,45 @@ public class SwitchProfileDialog extends SelectionDialog {
 			}

 		});

 

+		Map<String, Object> saveOptions = new HashMap<String, Object>();

+		final Map<Object, Object> targetMap = new HashMap<Object, Object>();

+		for(Map.Entry<Resource, Resource> resourceMap : profilesToEdit.entrySet()) {

+			targetMap.put(resourceMap.getKey().getURI(), resourceMap.getValue().getURI());

+		}

+

+		saveOptions.put(XMLResource.OPTION_URI_HANDLER, new PlatformSchemeAware() {

+

+			@Override

+			public URI deresolve(URI uri) {

+				URI resourceURI = uri.trimFragment();

+

+				if(targetMap.containsKey(resourceURI)) {

+					Object target = targetMap.get(resourceURI);

+					if(target instanceof URI) {

+						URI targetURI = (URI)target;

+						if(uri.fragment() != null) {

+							targetURI = targetURI.appendFragment(uri.fragment());

+						}

+						return targetURI;

+					}

+				}

+

+				return super.deresolve(uri);

+			}

+		});

+

+		IReadOnlyHandler handler = ReadOnlyManager.getReadOnlyHandler(editingDomain);

+		for(Resource resource : modelSet.getResources()) {

+			if(handler.anyReadOnly(new URI[]{ resource.getURI() }).get()) {

+				continue;

+			}

+			try {

+				resource.save(saveOptions);

+			} catch (IOException ex) {

+				Activator.log.error(ex);

+			}

+		}

+

 		profilesToEdit.clear();

 		updateControls();

 		viewer.refresh();

@@ -323,11 +369,7 @@ public class SwitchProfileDialog extends SelectionDialog {
 	protected void okPressed() {

 		applyPressed();

 

-		try {

-			modelSet.save(new NullProgressMonitor());

-		} catch (IOException ex) {

-			Activator.log.error(ex);

-		}

+

 		super.okPressed();

 	}

 

@@ -488,6 +530,7 @@ public class SwitchProfileDialog extends SelectionDialog {
 		if(getSelectedResource() != targetResource) {

 			profilesToEdit.put(getSelectedResource(), targetResource);

 			updateControls();

+			applyPressed(); //Immediatly apply to avoid confusion

 		} else {

 			MessageDialog.openWarning(getShell(), "Nothing changed", "Nothing to change");

 		}

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.profile/META-INF/MANIFEST.MF
index 64715c7915e..25b579de3db 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.1.0
  org.eclipse.papyrus.infra.emf;bundle-version="1.0.0",

  org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.300",

  org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0",

- com.google.guava;bundle-version="10.0.1"

+ com.google.guava;bundle-version="11.0.0"

 Export-Package: org.eclipse.papyrus.uml.profile,

  org.eclipse.papyrus.uml.profile.constraints,

  org.eclipse.papyrus.uml.profile.definition,

diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.search.ui/META-INF/MANIFEST.MF
index 706e0a3795c..5eeb2caa4ba 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/META-INF/MANIFEST.MF
@@ -10,7 +10,6 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.emf;bundle-version="2.6.0",

  org.eclipse.ui.ide;bundle-version="3.8.100",

  org.eclipse.papyrus.infra.emf;bundle-version="1.0.0",

- org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.3.0",

  org.eclipse.papyrus.uml.tools;bundle-version="1.0.0",

  org.eclipse.uml2.uml;bundle-version="4.0.100",

  org.eclipse.papyrus.infra.services.viewersearch;bundle-version="1.0.0",

@@ -21,8 +20,10 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0",

  org.eclipse.ocl.examples.xtext.essentialocl;bundle-version="3.3.0",

  org.eclipse.ocl.examples.xtext.essentialocl.ui;bundle-version="3.3.0",

- org.eclipse.ocl.examples.xtext.console

-Export-Package: org.eclipse.papyrus.uml.search.ui.providers,

+ org.eclipse.ocl.examples.xtext.console,

+ org.eclipse.ltk.ui.refactoring;bundle-version="3.7.100"

+Export-Package: org.eclipse.papyrus.uml.search.ui.actions,

+ org.eclipse.papyrus.uml.search.ui.providers,

  org.eclipse.papyrus.uml.search.ui.query,

  org.eclipse.papyrus.uml.search.ui.results,

  org.eclipse.papyrus.uml.search.ui.validator

diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/Messages.java b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/Messages.java
index a429c3d292e..9a1cd027295 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/Messages.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/Messages.java
@@ -51,6 +51,8 @@ public class Messages extends NLS {
 

 	public static String PapyrusSearchPage_12;

 

+	public static String PapyrusSearchPage_13;

+

 	public static String PapyrusSearchPage_14;

 

 	public static String PapyrusSearchPage_15;

@@ -151,6 +153,16 @@ public class Messages extends NLS {
 

 	public static String ReplaceDialog_4;

 

+	public static String ReplaceRefactoring_0;

+

+	public static String ReplaceRefactoring_1;

+

+	public static String ReplaceRefactoring_2;

+

+	public static String ReplaceRefactoring_3;

+

+	public static String ReplaceRefactoring_4;

+

 	public static String ResultContentProvider_0;

 

 	public static String ResultContentProvider_10;

diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/actions/ReplaceAction.java b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/actions/ReplaceAction.java
index 5cde7e08c7f..47aa2a5c67e 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/actions/ReplaceAction.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/actions/ReplaceAction.java
@@ -30,12 +30,12 @@ public class ReplaceAction extends Action {
 	 * Creates the replace action to be

 	 * 

 	 * @param shell

-	 *        the parent shell

+	 *            the parent shell

 	 * @param resultPage

-	 *        .getInput()

-	 *        the file search page to

+	 *            .getInput()

+	 *            the file search page to

 	 * @param selection

-	 *        the selected entries or <code>null</code> to replace all

+	 *            the selected entries or <code>null</code> to replace all

 	 */

 	public ReplaceAction(Shell shell, PapyrusSearchResultPage resultPage, Object[] selection) {

 		fShell = shell;

diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/manager/PapyrusSearchTextManager.java b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/manager/PapyrusSearchTextManager.java
new file mode 100644
index 00000000000..de6b4f62df3
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/manager/PapyrusSearchTextManager.java
@@ -0,0 +1,101 @@
+/*****************************************************************************

+ * 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:

+ *  CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.search.ui.manager;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.HashMap;

+import java.util.List;

+

+import org.eclipse.jface.dialogs.MessageDialog;

+import org.eclipse.papyrus.uml.search.ui.Messages;

+import org.eclipse.papyrus.uml.search.ui.providers.ParticipantTypeAttribute;

+import org.eclipse.papyrus.uml.search.ui.providers.ParticipantTypeElement;

+import org.eclipse.papyrus.uml.search.ui.query.PapyrusAdvancedQuery;

+import org.eclipse.papyrus.uml.search.ui.query.PapyrusQuery;

+import org.eclipse.papyrus.views.search.scope.ScopeEntry;

+import org.eclipse.search.ui.ISearchQuery;

+import org.eclipse.swt.widgets.Display;

+

+/**

+ *Manage the search depending on user choices.

+ *

+ */

+public class PapyrusSearchTextManager {

+

+	private Collection<ScopeEntry> fScopeEntries;

+

+	private boolean fIsCaseSensitive;

+

+	private boolean fIsRegularExpression;

+

+	private String fQueryText;

+

+	public PapyrusSearchTextManager(Collection<ScopeEntry> scopeEntries, boolean isCaseSensitive, boolean isRegularExpression, String queryText) {

+		fScopeEntries = scopeEntries;

+		fIsCaseSensitive = isCaseSensitive;

+		fIsRegularExpression = isRegularExpression;

+		fQueryText = queryText;

+	}

+

+	public ISearchQuery manageSimpleSearch(boolean searchAllStrings, Object[] umlMetaClassesArray) {

+		if(fQueryText.isEmpty()) {

+			MessageDialog.openError(Display.getCurrent().getActiveShell(), Messages.PapyrusSearchPage_29, Messages.PapyrusSearchPage_30);

+			return null;

+		} else {

+			PapyrusQuery query = new PapyrusQuery(fQueryText, fIsCaseSensitive, fIsRegularExpression, fScopeEntries, umlMetaClassesArray, searchAllStrings);

+			return query;

+		}

+

+	}

+

+	public ISearchQuery manageAdvancedSearch(HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>> participantsList, Object[] checkedElements, boolean searchForAllSter) {

+		List<ParticipantTypeElement> participantsToEvaluate = getParticipantsToEvaluate(participantsList);

+

+

+		if(participantsToEvaluate.size() == 0) {

+

+			MessageDialog.openError(Display.getCurrent().getActiveShell(), Messages.PapyrusSearchPage_31, Messages.PapyrusSearchPage_32);

+			return null;

+		} else {

+			if(fQueryText.isEmpty()) {

+				for(Object participantChecked : checkedElements) {

+					if(participantChecked instanceof ParticipantTypeAttribute) {

+						MessageDialog.openError(Display.getCurrent().getActiveShell(), Messages.PapyrusSearchPage_33, Messages.PapyrusSearchPage_34);

+						return null;

+					}

+				}

+			}

+

+			PapyrusAdvancedQuery query = new PapyrusAdvancedQuery(fQueryText, fIsCaseSensitive, fIsRegularExpression, fScopeEntries, participantsToEvaluate.toArray(), searchForAllSter);

+			return query;

+		}

+	}

+

+	private List<ParticipantTypeElement> getParticipantsToEvaluate(HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>> participantsList) {

+		List<ParticipantTypeElement> participantsToEvaluate = new ArrayList<ParticipantTypeElement>();

+

+		for(ParticipantTypeElement element : participantsList.keySet()) {

+			if(element.isChecked()) {

+				participantsToEvaluate.add(element);

+				for(ParticipantTypeAttribute attributesToEvaluate : participantsList.get(element)) {

+					if(attributesToEvaluate.isChecked()) {

+						participantsToEvaluate.add(attributesToEvaluate);

+					}

+				}

+			}

+		}

+		return participantsToEvaluate;

+	}

+}

diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/messages.properties b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/messages.properties
index 2f19d527713..3fcc2a68c0d 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/messages.properties
+++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/messages.properties
@@ -16,6 +16,7 @@ PapyrusSearchPage_1=Query issue
 PapyrusSearchPage_10=Deselect All

 PapyrusSearchPage_11=Simple search

 PapyrusSearchPage_12=Advanced search

+PapyrusSearchPage_13=Search for elements with exactly all the specified stereotypes

 PapyrusSearchPage_14=Select subelements

 PapyrusSearchPage_15=Refresh types

 PapyrusSearchPage_16=Search only in name attribute

@@ -73,6 +74,11 @@ ReplaceDialog_1=Replace\:
 ReplaceDialog_2=With\: 

 ReplaceDialog_3=WARNING\: replace action is not undoable if resource containing the match is not already open in an editor. 

 ReplaceDialog_4=Failed to save resource\: 

+ReplaceRefactoring_0=Replace

+ReplaceRefactoring_1=Please indicate the new value which should replace the original.

+ReplaceRefactoring_2=Original and new strings are same.

+ReplaceRefactoring_3=&Replace:

+ReplaceRefactoring_4=&With:

 ResultContentProvider_0=The plug-in 

 ResultContentProvider_10=The plug-in 

 ResultContentProvider_11=\ contributed an invalid extension for 

diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/pages/PapyrusSearchPage.java b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/pages/PapyrusSearchPage.java
index 044a4a815e7..46e7cfc58f2 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/pages/PapyrusSearchPage.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/pages/PapyrusSearchPage.java
@@ -19,7 +19,9 @@ import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.regex.PatternSyntaxException;
 
 import org.eclipse.core.runtime.IAdaptable;
@@ -140,10 +142,6 @@ import com.google.inject.Injector;
  */
 public class PapyrusSearchPage extends DialogPage implements ISearchPage, IReplacePage, MetaModelManagerListener {
 
-	public PapyrusSearchPage() {
-	}
-
-
 	private HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>> participantsList = new HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>>();
 
 	private Collection<Stereotype> availableStereotypes;
@@ -154,10 +152,6 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 
 	private static final String SEARCH_ISSUE = Messages.PapyrusSearchPage_1;
 
-	private static final String SEARCH_IN_ALL_STRINGS = Messages.PapyrusSearchPage_2;
-
-	private static final String SEARCH_IN_STEREOTYPE_ATTRIBUTES = Messages.PapyrusSearchPage_3;
-
 	private Text searchQueryText;
 
 	private Text oclContext;
@@ -191,8 +185,6 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 
 	private static final int TEXT_QUERY_KIND = 0;
 
-	private static final int OCL_QUERY_KIND = 1;
-
 	private static final int SIMPLE_SEARCH = 0;
 
 	private static final int ADVANCED_SEARCH = 1;
@@ -205,17 +197,13 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 
 	protected Composite textQueryComposite;
 
-	protected Composite textQueryComposite2;
-
-
-
 	private Composite advancedSearchComposite;
 
-	protected Group grpSearchFor;
-
 	private Composite textQueryFieldsComposite;
 
-	protected ParticipantTypeContentProvider participantTypeContentProvider = new ParticipantTypeContentProvider();
+
+	private Button fBtnSearchForAllSelected;

+

 
 
 
@@ -270,7 +258,7 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 
 
 
-		grpSearchFor = new Group(textQueryComposite, SWT.NONE);
+		Group grpSearchFor = new Group(textQueryComposite, SWT.NONE);

 		grpSearchFor.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1));
 		grpSearchFor.setLayout(new GridLayout(1, false));
 		grpSearchFor.setText(Messages.PapyrusSearchPage_8);
@@ -296,9 +284,9 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 				}
 
 				if(searchKind.getSelectionIndex() == ADVANCED_SEARCH) {
-					if(participantsList.size() == 0) {
+					participantsList.clear();

 						createResultList();
-					}
+

 					createAdvancedSearch();
 				} else {
 					simpleSearch();
@@ -391,7 +379,7 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 		participantTypesTree.setLayoutData(chechboxTreeViewerGridData);
 
 		participantTypesTreeViewer = (CheckboxTreeViewer)participantTypesTree.getViewer();
-		participantTypesTreeViewer.setContentProvider(participantTypeContentProvider);
+		participantTypesTreeViewer.setContentProvider(new ParticipantTypeContentProvider());

 		participantTypesTreeViewer.setLabelProvider(new ParticipantTypeLabelProvider());
 		participantTypesTreeViewer.setSorter(new ViewerSorter());
 		participantTypesTreeViewer.setCheckStateProvider(new ICheckStateProvider() {
@@ -504,6 +492,8 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 
 			@Override
 			public void mouseUp(MouseEvent e) {
+				participantsList.clear();

+				createResultList();

 
 				createAdvancedSearch();
 
@@ -557,33 +547,47 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 
 			}
 		});
+

+		fBtnSearchForAllSelected = new Button(advancedSearchComposite, SWT.CHECK);

+		fBtnSearchForAllSelected.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));

+		fBtnSearchForAllSelected.setText(Messages.PapyrusSearchPage_13);

 	}
 
 	protected void selectAllSubSter(final ParticipantTypeElement elementParent, final List<ParticipantTypeAttribute> attributeParentList) {
-		//		for(Object element : result) {
-		//			if(element instanceof Stereotype) {
-		//				List<Class> superTypes = ((Stereotype)element).getSuperClasses();
-		//				for(Class type : superTypes) {
-		//					((Stereotype)elementParent).getName();
-		//
-		//					if(((Class)type).getName().equals(((Stereotype)elementParent).getName())) {
-		//						participantTypesTreeViewer.setChecked(element, true);
-		//
-		//					}
-		//				}
-		//			}
-		//		}
+

 		ProgressMonitorDialog dialog = new ProgressMonitorDialog(getShell());
 		IRunnableWithProgress computeAvailableTypes = new IRunnableWithProgress() {
 
 			public void run(IProgressMonitor thePM) throws InterruptedException {
 				for(Object element : participantsList.keySet()) {
 					if(element instanceof ParticipantTypeElement) {
+						checkAllSubSter((ParticipantTypeElement)element, elementParent, attributeParentList);

+

+					}

+				}

+

+

+			}

+

+		};

+

+

+		try {

+			dialog.run(true, true, computeAvailableTypes);

+		} catch (InvocationTargetException e) {

+			e.printStackTrace();

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+

+

+	}

+

+	protected void checkAllSubSter(ParticipantTypeElement element, ParticipantTypeElement elementParent, List<ParticipantTypeAttribute> attributeParentList) {

 						if(((ParticipantTypeElement)element).getElement() instanceof Stereotype) {
 							List<Class> superTypes = ((Class)((ParticipantTypeElement)element).getElement()).getSuperClasses();
 
 							if(superTypes.contains(elementParent.getElement())) {
-								//					participantTypesTreeViewer.setChecked(element, true);
 								((ParticipantTypeElement)element).setChecked(true);
 
 
@@ -602,10 +606,20 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 							}
 						}
 					}
-				}
 
+	protected void selectAllSubUML(final ParticipantTypeElement elementParent, final List<ParticipantTypeAttribute> attributeParentList) {

+

+		ProgressMonitorDialog dialog = new ProgressMonitorDialog(getShell());

+		IRunnableWithProgress computeAvailableTypes = new IRunnableWithProgress() {

+

+			public void run(IProgressMonitor thePM) throws InterruptedException {

+				for(Object element : participantsList.keySet()) {

+					if(element instanceof ParticipantTypeElement) {

+						checkAllSubUML((ParticipantTypeElement)element, elementParent, attributeParentList);

 
 			}
+				}

+			}

 
 		};
 
@@ -621,14 +635,8 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 
 	}
 
-	protected void selectAllSubUML(final ParticipantTypeElement elementParent, final List<ParticipantTypeAttribute> attributeParentList) {
-
-		ProgressMonitorDialog dialog = new ProgressMonitorDialog(getShell());
-		IRunnableWithProgress computeAvailableTypes = new IRunnableWithProgress() {
 
-			public void run(IProgressMonitor thePM) throws InterruptedException {
-				for(Object element : participantsList.keySet()) {
-					if(element instanceof ParticipantTypeElement) {
+	protected void checkAllSubUML(ParticipantTypeElement element, ParticipantTypeElement elementParent, List<ParticipantTypeAttribute> attributeParentList) {

 						if(((ParticipantTypeElement)element).getElement() instanceof EClass) {
 							List<EClass> superTypes = ((EClass)((ParticipantTypeElement)element).getElement()).getEAllSuperTypes();
 
@@ -651,23 +659,7 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 								}
 							}
 						}
-					}
-				}
-
-
-			}
-
-		};
 
-		try {
-			dialog.run(true, true, computeAvailableTypes);
-		} catch (InvocationTargetException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		} catch (InterruptedException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
 	}
 
 
@@ -691,6 +683,19 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 	}
 
 
+	public Object[] getMetaClassesList() {

+		Set<EObject> umlMetaClasses= new HashSet<EObject>();

+
+		for(EClassifier eClassifier : UMLPackage.eINSTANCE.getEClassifiers()) {

+			if(eClassifier instanceof EClass) {

+				umlMetaClasses.add(eClassifier);

+			}

+		}

+		return umlMetaClasses.toArray();

+

+	}

+

+

 	protected void createOCLSearchQueryField(EObject root) {
 
 		Composite client = queryComposite;
@@ -719,7 +724,7 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 				if(currentScope != null) {
 
 					try {
-						EObject root = ((UmlModel)currentScope.getModelSet().getModel(UmlModel.MODEL_ID)).lookupRoot();
+						((UmlModel)currentScope.getModelSet().getModel(UmlModel.MODEL_ID)).lookupRoot();

 
 						ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(Display.getCurrent().getActiveShell(), labelProvider, new OCLContextContentProvider());
 						dialog.setTitle(Messages.PapyrusSearchPage_19);
@@ -757,6 +762,7 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 		oclEditor.getViewer().getTextWidget().addVerifyKeyListener(new VerifyKeyListener() {
 
 			public void verifyKey(VerifyEvent e) {
+				// System.out.println("verifyKey: " + e.keyCode);

 				if(e.keyCode == SWT.KEYPAD_CR || e.keyCode == SWT.CR) {
 					if((e.stateMask & (SWT.CTRL | SWT.SHIFT)) == 0) {
 						e.doit = false;
@@ -913,8 +919,7 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 				if(selectedObject instanceof IOutlineNode) {
 					if(selectedObject instanceof EObjectNode) {
 						EObjectNode selectedObjectNode = (EObjectNode)selectedObject;
-						@SuppressWarnings("unused")
-						URI eObjectURI = selectedObjectNode.getEObjectURI();
+						selectedObjectNode.getEObjectURI();

 						contextObject = null; // FIXME
 												// metaModelManager.loadResource(eObjectURI,
 												// null, null);
@@ -952,6 +957,37 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 		});
 	}
 
+
+	private Collection<ScopeEntry> createScopeEntries(Collection<URI> scope) {
+		Collection<ScopeEntry> results = new HashSet<ScopeEntry>();
+
+		for(URI resource : scope) {
+
+			ScopeEntry scopeEntry = new ScopeEntry(resource);
+
+			results.add(scopeEntry);
+
+		}
+
+		return results;
+	}
+	
+	private List<ParticipantTypeElement> getParticipantsToEvaluate(HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>> participantsList) {
+		List<ParticipantTypeElement> participantsToEvaluate = new ArrayList<ParticipantTypeElement>();
+
+		for(ParticipantTypeElement element : participantsList.keySet()) {
+			if(element.isChecked()) {
+				participantsToEvaluate.add(element);
+				for(ParticipantTypeAttribute attributesToEvaluate : participantsList.get(element)) {
+					if(attributesToEvaluate.isChecked()) {
+						participantsToEvaluate.add(attributesToEvaluate);
+					}
+				}
+			}
+		}
+		return participantsToEvaluate;
+	}
+	
 	public boolean performAction() {
 
 		if(queryKind.getSelectionIndex() == TEXT_QUERY_KIND) {
@@ -994,7 +1030,7 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 							}
 						}
 
-						QueryInfo info = new QueryInfo(searchQueryText.getText(), btnCaseSensitive.getSelection(), btnRegularExpression.getSelection(), participantsToEvaluate, scope);
+						QueryInfo info = new QueryInfo(searchQueryText.getText(), btnCaseSensitive.getSelection(), btnRegularExpression.getSelection(), participantsToEvaluate, scope, fBtnSearchForAllSelected.getSelection());
 						query = CompositePapyrusQueryProvider.getInstance().createAdvancedSearchQuery(info);
 
 					}
@@ -1045,6 +1081,7 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 
 	public boolean performReplace() {
 		if(queryKind.getSelectionIndex() == TEXT_QUERY_KIND) {
+			if(container.getSelectedScope() == ISearchPageContainer.SELECTION_SCOPE) {

 			if(validateRegex()) {
 				if(searchQueryText.getText().length() == 0) {
 					MessageDialog.openError(Display.getCurrent().getActiveShell(), Messages.PapyrusSearchPage_36, Messages.PapyrusSearchPage_37);
@@ -1070,8 +1107,19 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 								for(ParticipantTypeAttribute attributesToEvaluate : participantsList.get(element)) {
 									if(attributesToEvaluate.isChecked()) {
 										participantsToEvaluate.add(attributesToEvaluate);
+											boolean canDoReplace = false;

+											if(attributesToEvaluate.getElement() instanceof EAttribute) {

 										Object value = element.getElement().eGet((EAttribute)attributesToEvaluate.getElement());
-										if(!(value instanceof String)) {
+												if(value instanceof String) {

+													canDoReplace = true;

+												}

+											} else if(attributesToEvaluate.getElement() instanceof Property) {

+												Property property = (Property)attributesToEvaluate.getElement();

+												if(UMLUtil.isString(property.getType())) {

+													canDoReplace = true;

+												}

+											}

+											if(!canDoReplace) {

 											MessageDialog.openError(Display.getCurrent().getActiveShell(), Messages.PapyrusSearchPage_40, Messages.PapyrusSearchPage_41);
 											return false;
 										}
@@ -1080,7 +1128,7 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 							}
 						}
 					}
-					QueryInfo info = new QueryInfo(searchQueryText.getText(), btnCaseSensitive.getSelection(), btnRegularExpression.getSelection(), participantsToEvaluate, scope);
+					QueryInfo info = new QueryInfo(searchQueryText.getText(), btnCaseSensitive.getSelection(), btnRegularExpression.getSelection(), participantsToEvaluate, scope, fBtnSearchForAllSelected.getSelection());
 					query = CompositePapyrusQueryProvider.getInstance().createAdvancedSearchQuery(info);
 
 				}
@@ -1104,14 +1152,17 @@ public class PapyrusSearchPage extends DialogPage implements ISearchPage, IRepla
 					}
 				});
 
-				NewSearchUI.runQueryInForeground(container.getRunnableContext(), query);
-
+					NewSearchUI.removeQuery(query);

 				return true;
 			} else {
 				MessageDialog.openError(Display.getCurrent().getActiveShell(), SEARCH_ISSUE, REGULAR_EXPRESSION_ILLFORMED);
 				return false;
 			}
 		} else {
+				MessageDialog.openWarning(Display.getCurrent().getActiveShell(), Messages.PapyrusSearchPage_27, Messages.PapyrusSearchPage_28);

+				return false;

+			}

+		} else {

 			MessageDialog.openWarning(Display.getCurrent().getActiveShell(), Messages.PapyrusSearchPage_42, Messages.PapyrusSearchPage_43);
 			return false;
 		}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/providers/AttributeMatchLabelProvider.java b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/providers/AttributeMatchLabelProvider.java
index d133e3adf43..2182ad93585 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/providers/AttributeMatchLabelProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/providers/AttributeMatchLabelProvider.java
@@ -26,6 +26,7 @@ import org.eclipse.papyrus.views.search.results.AttributeMatch;
 import org.eclipse.swt.graphics.Image;

 import org.eclipse.uml2.uml.Class;

 import org.eclipse.uml2.uml.Element;

+import org.eclipse.uml2.uml.EnumerationLiteral;

 import org.eclipse.uml2.uml.Property;

 import org.eclipse.uml2.uml.Stereotype;

 

@@ -72,18 +73,8 @@ public class AttributeMatchLabelProvider implements IFilteredLabelProvider {
 					Class containingClass = source.getClass_();

 					if(containingClass instanceof Stereotype) {

 						if(target instanceof Element) {

-

-							Object tagValue = ((Element)target).getValue((Stereotype)containingClass, ((Property)attributeMatch.getMetaAttribute()).getName());

-

-							if(tagValue instanceof String) {

-								String value = (String)tagValue;

-								int end = attributeMatch.getOffset() + attributeMatch.getLength();

-								return printResult(value.substring(attributeMatch.getOffset(), end), value, attributeMatch.getOffset(), attributeMatch.getLength(), source.getName());

-							} else {

-								String value = String.valueOf(tagValue);

-								int end = attributeMatch.getOffset() + attributeMatch.getLength();

-								return printResult(value.substring(attributeMatch.getOffset(), end), value, attributeMatch.getOffset(), attributeMatch.getLength(), source.getName());

-							}

+							String value = getStringValueOfProperty(((Element)target), (Stereotype)containingClass, (Property)attributeMatch.getMetaAttribute());

+							return printResult(value.substring(attributeMatch.getOffset(), attributeMatch.getLength()), value, attributeMatch.getOffset(), attributeMatch.getLength(), source.getName());

 

 						}

 					}

@@ -120,4 +111,15 @@ public class AttributeMatchLabelProvider implements IFilteredLabelProvider {
 		return false;

 	}

 

+	private String getStringValueOfProperty(Element element, Stereotype stereotype, Property property) {

+		Object value = element.getValue(stereotype, property.getName());

+		if(value instanceof String) {

+			return (String)value;

+		} else if(value instanceof EnumerationLiteral) {

+			return ((EnumerationLiteral)value).getName();

+		} else {

+			return String.valueOf(value);

+		}

+	}

+

 }

diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/providers/ParticipantTypeContentProvider.java b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/providers/ParticipantTypeContentProvider.java
index 07b4ea93a44..90747d62b36 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/providers/ParticipantTypeContentProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/providers/ParticipantTypeContentProvider.java
@@ -31,9 +31,6 @@ public class ParticipantTypeContentProvider implements ITreeContentProvider {
 

 

 

-	private EPackage ePackage = null;

-

-

 	private HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>> participantsList = new HashMap<ParticipantTypeElement, List<ParticipantTypeAttribute>>();

 

 

@@ -59,11 +56,7 @@ public class ParticipantTypeContentProvider implements ITreeContentProvider {
 			return ((HashMap)inputElement).keySet().toArray();

 		}

 

-		//		for(Object obj : (Collection<Object>)inputElement) {

-		//			result.add(obj);

-		//		}

-

-

+		

 		return result.toArray();

 	}

 

@@ -75,40 +68,6 @@ public class ParticipantTypeContentProvider implements ITreeContentProvider {
 		}

 		return null;

 

-		//		List<ParticipantTypeAttribute> result = new ArrayList<ParticipantTypeAttribute>();

-		//		if(parentElement instanceof ParticipantTypeElement) {

-		//

-		//			if(((ParticipantTypeElement)parentElement).getElement() instanceof EClass) {

-		//				//			result.addAll(((EClass)parentElement).getEAllAttributes());

-		//				for(EObject eAttribute : ((EClass)((ParticipantTypeElement)parentElement).getElement()).getEAllAttributes()) {

-		//					ParticipantTypeAttribute attribute = new ParticipantTypeAttribute(eAttribute, ((ParticipantTypeElement)parentElement));

-		//

-		//					result.add(attribute);

-		//

-		//				}

-		//

-		//

-		//			} else if(((ParticipantTypeElement)parentElement).getElement() instanceof Stereotype) {

-		//

-		//						for(Property property : ((Stereotype)((ParticipantTypeElement)parentElement).getElement()).getAllAttributes()) {

-		//							if(!property.getName().startsWith("base_")) {

-		//								if(property.getType() instanceof Element) {

-		//		

-		//									if(UMLUtil.isBoolean(property.getType()) || UMLUtil.isString(property.getType()) || UMLUtil.isInteger(property.getType()) || UMLUtil.isReal(property.getType()) || UMLUtil.isUnlimitedNatural(property.getType()) || property.getType() instanceof Enumeration) {

-		//										//						result.add(property);

-		//										ParticipantTypeAttribute attribute = new ParticipantTypeAttribute(property, (ParticipantTypeElement)parentElement);

-		//		

-		//										result.add(attribute);

-		//		

-		//		

-		//									}

-		//								}

-		//							}

-		//				}

-		//			}

-		//		}

-		//		

-		//		return result.toArray();

 	}

 

 	public Object getParent(Object element) {

diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/providers/ResultLabelProvider.java b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/providers/ResultLabelProvider.java
index 989ede3387c..1ceb4662045 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/providers/ResultLabelProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/providers/ResultLabelProvider.java
@@ -42,7 +42,6 @@ public class ResultLabelProvider extends LabelProvider {
 		if(element instanceof AbstractResultEntry) {

 			return labelProviderService.getLabelProvider().getText(((AbstractResultEntry)element).elementToDisplay());

 		}

-

 		return ""; //$NON-NLS-1$

 	}

 

diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/PapyrusAdvancedQuery.java b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/PapyrusAdvancedQuery.java
index a0309c2fd13..32fcbbcd602 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/PapyrusAdvancedQuery.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/PapyrusAdvancedQuery.java
@@ -52,6 +52,7 @@ import org.eclipse.papyrus.views.search.scope.ScopeEntry;
 import org.eclipse.search.ui.ISearchResult;

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.Enumeration;

+import org.eclipse.uml2.uml.EnumerationLiteral;

 import org.eclipse.uml2.uml.Property;

 import org.eclipse.uml2.uml.Stereotype;

 import org.eclipse.uml2.uml.util.UMLUtil;

@@ -97,11 +98,13 @@ public class PapyrusAdvancedQuery extends AbstractPapyrusQuery {
 

 	private List<Property> propertyList;

 

+	private boolean searchForAllSter;

 

 

 

 

-	public PapyrusAdvancedQuery(String searchQueryText, boolean isCaseSensitive, boolean isRegularExpression, Collection<ScopeEntry> scopeEntries, Object[] participantsChecked) {

+

+	public PapyrusAdvancedQuery(String searchQueryText, boolean isCaseSensitive, boolean isRegularExpression, Collection<ScopeEntry> scopeEntries, Object[] participantsChecked, boolean searchForAllSter) {

 		this.propertyList = new ArrayList<Property>();

 		this.sources = new HashSet<Object>();

 		this.searchQueryText = searchQueryText;

@@ -109,6 +112,7 @@ public class PapyrusAdvancedQuery extends AbstractPapyrusQuery {
 		this.isRegularExpression = isRegularExpression;

 		this.scopeEntries = scopeEntries;

 		this.participantsChecked = participantsChecked;

+		this.searchForAllSter = searchForAllSter;

 		results = new PapyrusSearchResult(this);

 

 		participantsList = new HashMap<EObject, List<EAttribute>>();

@@ -156,14 +160,26 @@ public class PapyrusAdvancedQuery extends AbstractPapyrusQuery {
 					EObject root = umlModel.lookupRoot();

 

 					Collection<EObject> participants = ParticipantValidator.getInstance().getParticipants(root, participantsList.keySet().toArray());

+					Collection<EObject> stereotypesParticipants = ParticipantValidator.getInstance().getParticipantsStereotype(root, stereotypeList.keySet().toArray());

 

+					if(searchForAllSter) {

+

+						if(participantsList.keySet().size() == 0) {

+							stereotypesParticipants = getElementsWithAllSter(stereotypesParticipants);

+							evaluateStereotypes(stereotypesParticipants, scopeEntry);

+						} else {

+							participants = getElementsWithAllSter(participants);

+							evaluate(participants, scopeEntry);

+						}

+

+					} else {

+						evaluate(participants, scopeEntry);

+						evaluateStereotypes(stereotypesParticipants, scopeEntry);

+					}

 

-					evaluate(participants, scopeEntry);

 

-					Collection<EObject> stereotypesParticipants = ParticipantValidator.getInstance().getParticipantsStereotype(root, stereotypeList.keySet().toArray());

 

 

-					evaluateStereotypes(stereotypesParticipants, scopeEntry);

 				}

 			} catch (NotFoundException e) {

 				Activator.log.error(Messages.PapyrusQuery_0 + scopeEntry.getModelSet(), e);

@@ -174,6 +190,29 @@ public class PapyrusAdvancedQuery extends AbstractPapyrusQuery {
 		return Status.OK_STATUS;

 	}

 

+	private Collection<EObject> getElementsWithAllSter(Collection<EObject> initialParticipants) {

+		Collection<EObject> participantsToKeep = new ArrayList<EObject>();

+		for(EObject participants : initialParticipants) {

+			if(participants instanceof Element) {

+				int numberOfStereotypeToBeApplied = stereotypeList.size();

+				int numberOfStereotypeMatching = 0;

+				if(numberOfStereotypeToBeApplied == ((Element)participants).getAppliedStereotypes().size()) {

+					for(Stereotype stereotypeToBeApplied : stereotypeList.keySet()) {

+						for(Stereotype stereotypeApplied : ((Element)participants).getAppliedStereotypes()) {

+							if(EcoreUtil.equals(stereotypeToBeApplied, stereotypeApplied)) {

+								numberOfStereotypeMatching++;

+							}

+						}

+					}

+					if(numberOfStereotypeMatching == numberOfStereotypeToBeApplied) {

+						participantsToKeep.add(participants);

+					}

+				}

+			}

+		}

+		return participantsToKeep;

+	}

+

 	/**

 	 * Evaluate if the value matches the pattern

 	 * 

@@ -321,15 +360,11 @@ public class PapyrusAdvancedQuery extends AbstractPapyrusQuery {
 									for(Property property : propertyList) {

 										for(Property property2 : (stereotypeList.get(stereotypeSelected))) {

 											if(EcoreUtil.equals(property, property2)) {

-												Object value = ((Element)participant).getValue(stereotype, property.getName());

+

+												String value = getStringValueOfProperty((Element)participant, stereotype, property);

+

 												if(value != null) {

-													if(value instanceof String) {

-														String stringValue = (String)value;

-														evaluateAndAddToResult(stringValue, property, pattern, participant, scopeEntry, stereotype);

-													} else {

-														String stringValue = String.valueOf(value);

-														evaluateAndAddToResult(stringValue, property, pattern, participant, scopeEntry, stereotype);

-													}

+													evaluateAndAddToResult(value, property, pattern, participant, scopeEntry, stereotype);

 												}

 											}

 										}

@@ -343,10 +378,22 @@ public class PapyrusAdvancedQuery extends AbstractPapyrusQuery {
 

 

 		}

+

 		findInDiagram(scopeEntry);

 

 	}

 

+	private String getStringValueOfProperty(Element element, Stereotype stereotype, Property property) {

+		Object value = element.getValue(stereotype, property.getName());

+		if(value instanceof String) {

+			return (String)value;

+		} else if(value instanceof EnumerationLiteral) {

+			return ((EnumerationLiteral)value).getName();

+		} else {

+			return String.valueOf(value);

+		}

+	}

+

 	public List<Property> getStereotypesAttributes(Object parentElement) {

 		List<Property> result = new ArrayList<Property>();

 		if(parentElement instanceof Stereotype) {

diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/PapyrusOCLQuery.java b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/PapyrusOCLQuery.java
index c94f09d3674..6e9a377efed 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/PapyrusOCLQuery.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/PapyrusOCLQuery.java
@@ -17,6 +17,8 @@ import java.util.ArrayList;
 import java.util.Collection;

 import java.util.HashSet;

 import java.util.Set;

+import java.util.regex.Matcher;

+import java.util.regex.Pattern;

 

 import org.eclipse.core.runtime.IProgressMonitor;

 import org.eclipse.core.runtime.IStatus;

@@ -51,7 +53,6 @@ import org.eclipse.ocl.examples.pivot.utilities.PivotUtil;
 import org.eclipse.ocl.examples.xtext.console.messages.ConsoleMessages;

 import org.eclipse.ocl.examples.xtext.essentialocl.ui.model.BaseDocument;

 import org.eclipse.osgi.util.NLS;

-import org.eclipse.papyrus.uml.search.ui.Activator;

 import org.eclipse.papyrus.uml.search.ui.Messages;

 import org.eclipse.papyrus.uml.search.ui.results.PapyrusSearchResult;

 import org.eclipse.papyrus.views.search.results.AbstractResultEntry;

@@ -128,16 +129,19 @@ public class PapyrusOCLQuery extends AbstractPapyrusQuery {
 						IProgressService progressService = PlatformUI.getWorkbench().getProgressService();

 						EvaluationRunnable runnable = new EvaluationRunnable((BaseResource)state, expression);

 						runnable.run(new NullProgressMonitor());

+						//						progressService.busyCursorWhile(runnable);

 						return runnable.getValue();

 					}

 				});

 			} catch (Exception e) {

-				Activator.log.error(e);

+				//				MessageDialog.openError(Display.getCurrent().getActiveShell(), "Error", e.getMessage());

 			}

 			if(value instanceof InvalidValueException) {

 				InvalidValueException exception = (InvalidValueException)value;

+				//				MessageDialog.openError(Display.getCurrent().getActiveShell(), "Error", exception.getMessage());

 				Throwable cause = exception.getCause();

 				if((cause != null) && (cause != exception)) {

+					//					MessageDialog.openError(Display.getCurrent().getActiveShell(), "Error", cause.getMessage());

 				}

 			} else if(value != null) {

 				CollectionValue collectionValue = ValuesUtil.isCollectionValue(value);

@@ -147,25 +151,28 @@ public class PapyrusOCLQuery extends AbstractPapyrusQuery {
 							ModelMatch match = new ModelElementMatch(elementValue, scopeEntry);

 							fResults.add(match);

 						}

+						//						System.err.println("Found : " + ValuesUtil.stringValueOf(elementValue));

 					}

 				} else {

 					if(value instanceof EObject) {

 						ModelMatch match = new ModelElementMatch(value, scopeEntry);

 						fResults.add(match);

 					}

+					//					System.err.println("Found : " + ValuesUtil.stringValueOf(value));

 				}

+			} else {

+				//				MessageDialog.openError(Display.getCurrent().getActiveShell(), "Error", ValuesUtil.stringValueOf(value));

+

 			}

 

 		} catch (Exception e) {

 			result = false;

 

-			Activator.log.error(e);

-

-			//			if(e.getLocalizedMessage() == null) {

-			//				//				MessageDialog.openError(Display.getCurrent().getActiveShell(), "Error", e.getClass().getName());

-			//			} else {

-			//				//				MessageDialog.openError(Display.getCurrent().getActiveShell(), "Error", e.getLocalizedMessage());

-			//			}

+			if(e.getLocalizedMessage() == null) {

+				//				MessageDialog.openError(Display.getCurrent().getActiveShell(), "Error", e.getClass().getName());

+			} else {

+				//				MessageDialog.openError(Display.getCurrent().getActiveShell(), "Error", e.getLocalizedMessage());

+			}

 		}

 

 		return result;

@@ -209,7 +216,7 @@ public class PapyrusOCLQuery extends AbstractPapyrusQuery {
 				monitor.subTask(ConsoleMessages.Progress_Extent);

 				PivotEnvironmentFactory envFactory = new PivotEnvironmentFactory(null, metaModelManager);

 				PivotEnvironment environment = envFactory.createEnvironment();

-				PivotEvaluationEnvironment evaluationEnvironment = envFactory.createEvaluationEnvironment();

+				EvaluationEnvironment evaluationEnvironment = envFactory.createEvaluationEnvironment();

 				Object contextValue = metaModelManager.getIdResolver().boxedValueOf(contextObject);

 				evaluationEnvironment.add(DomainUtil.nonNullModel(expressionInOCL.getContextVariable()), contextValue);

 				// if (modelManager == null) {

@@ -222,6 +229,17 @@ public class PapyrusOCLQuery extends AbstractPapyrusQuery {
 				try {

 					// metaModelManager.setMonitor(monitor);

 					CancelableEvaluationVisitor evaluationVisitor = new CancelableEvaluationVisitor(monitor, environment, evaluationEnvironment, modelManager2);

+					//					evaluationVisitor.setLogger(new DomainLogger() {

+					//

+					//						public void append(final @NonNull String message) {

+					//							OCLConsolePage.this.getControl().getDisplay().asyncExec(new Runnable() {

+					//

+					//								public void run() {

+					//									OCLConsolePage.this.append(message, ColorManager.DEFAULT, false);

+					//								}

+					//							});

+					//						}

+					//					});

 					value = evaluationVisitor.visitExpressionInOCL(expressionInOCL);

 				} catch (InvalidValueException e) {

 					value = e;

@@ -274,6 +292,138 @@ public class PapyrusOCLQuery extends AbstractPapyrusQuery {
 		return Status.OK_STATUS;

 	}

 

+	/**

+	 * Evaluate if the value matches the pattern

+	 * 

+	 * @param value

+	 *        the value to evaluate

+	 * @param attribute

+	 *        the attribute has the value

+	 * @param pattern

+	 *        the pattern that is searched

+	 * @param participant

+	 *        the element that contains the value

+	 * @param scopeEntry

+	 *        the scopeEntry that contains the participant

+	 */

+	protected void evaluateAndAddToResult(String value, Object attribute, Pattern pattern, Object participant, ScopeEntry scopeEntry) {

+

+		value = value != null ? value : ""; //$NON-NLS-1$

+

+		Matcher m = pattern.matcher(value);

+

+		//		if(isRegularExpression) {

+		//			if(m.matches()) {

+		//				int start = m.start();

+		//				int end = m.end();

+		//				ModelMatch match = new AttributeMatch(start, end, participant, scopeEntry, attribute);

+		//

+		//				fResults.add(match);

+		//			}

+		//		} else {

+		//			while(m.find()) {

+		//				int start = m.start();

+		//				int end = m.end();

+		//				AttributeMatch match = new AttributeMatch(start, end, participant, scopeEntry, attribute);

+		//				fResults.add(match);

+		//			}

+		//		}

+

+

+	}

+

+	/**

+	 * Try to find elements that match in the participants

+	 * 

+	 * @param participants

+	 * @param scopeEntry

+	 */

+	protected void evaluate(Collection<EObject> participants, ScopeEntry scopeEntry) {

+

+		//		for(EObject participant : participants) {

+		//

+		//			String query = searchQueryText;

+		//			if(searchQueryText.equals("")) { //$NON-NLS-1$

+		//				query = ".*"; //$NON-NLS-1$

+		//			}

+		//

+		//			Pattern pattern = PatternHelper.getInstance().createPattern(query, isCaseSensitive, isRegularExpression);

+		//

+		//			if(pattern != null) {

+		//				if(searchAllStringAttributes) {

+		//

+		//					for(EAttribute attribute : participant.eClass().getEAllAttributes()) {

+		//						Object value = participant.eGet(attribute);

+		//

+		//						if(value instanceof String) {

+		//							String stringValue = (String)value;

+		//							evaluateAndAddToResult(stringValue, attribute, pattern, participant, scopeEntry);

+		//						}

+		//					}

+		//

+		//				} else {

+		//					if(participant instanceof NamedElement) {

+		//						String umlElementName = ((NamedElement)participant).getName();

+		//						umlElementName = umlElementName != null ? umlElementName : ""; //$NON-NLS-1$

+		//

+		//						evaluateAndAddToResult(umlElementName, UMLPackage.eINSTANCE.getNamedElement_Name(), pattern, participant, scopeEntry);

+		//					}

+		//				}

+		//				if(searchStereotypeAttributes) {

+		//					if(participant instanceof Element) {

+		//						EList<Stereotype> stereotypes = ((Element)participant).getAppliedStereotypes();

+		//						for(Stereotype stereotype : stereotypes) {

+		//							for(Property stereotypeProperty : stereotype.getAllAttributes()) {

+		//								if(!stereotypeProperty.getName().startsWith("base_")) {

+		//									Object value = ((Element)participant).getValue(stereotype, stereotypeProperty.getName());

+		//									if(value != null) {

+		//

+		//										if(value instanceof String) {

+		//											String stringValue = (String)value;

+		//											evaluateAndAddToResult(stringValue, stereotypeProperty, pattern, participant, scopeEntry);

+		//										}

+		//									}

+		//								}

+		//							}

+		//

+		//						}

+		//					}

+		//				}

+		//

+		//			}

+		//		}

+		//

+		//		//Now, find in diagram and others the elements we found

+		//		ViewerSearchService viewerSearcherService = new ViewerSearchService();

+		//		try {

+		//			viewerSearcherService.startService();

+		//

+		//			//Get sources elements that matched

+		//			Set<Object> sources = new HashSet<Object>();

+		//			for(AbstractResultEntry match : fResults) {

+		//				if(match instanceof AttributeMatch) {

+		//					sources.add(((AttributeMatch)match).getTarget());

+		//				} else {

+		//					sources.add(match.getSource());

+		//				}

+		//			}

+		//

+		//			//Get viewer of these sources

+		//			Map<Object, Map<Object, Object>> viewersMappings = viewerSearcherService.getViewers(sources, scopeEntry.getModelSet());

+		//

+		//			//Add viewers to results

+		//			for(Object containingModelSet : viewersMappings.keySet()) {

+		//				for(Object view : viewersMappings.get(containingModelSet).keySet()) {

+		//					Object semanticElement = viewersMappings.get(containingModelSet).get(view);

+		//					ViewerMatch viewMatch = new ViewerMatch(view, scopeEntry, semanticElement);

+		//					fResults.add(viewMatch);

+		//				}

+		//			}

+		//

+		//		} catch (ServiceException e) {

+		//			Activator.log.error(Messages.PapyrusQuery_5 + scopeEntry.getModelSet(), e);

+		//		}

+	}

 

 	public String getLabel() {

 		return Messages.PapyrusQuery_6;

diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/PapyrusQuery.java b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/PapyrusQuery.java
index d65a2827e10..ec6dfd20d77 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/PapyrusQuery.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/PapyrusQuery.java
@@ -133,7 +133,7 @@ public class PapyrusQuery extends AbstractPapyrusQuery {
 	 * @param scopeEntry

 	 *        the scopeEntry that contains the participant

 	 */

-	protected void evaluateAndAddToResult(String value, Object attribute, Pattern pattern, Object participant, ScopeEntry scopeEntry) {

+	protected void evaluateAndAddToResult(String value, Object attribute, Pattern pattern, Object participant, ScopeEntry scopeEntry, Stereotype stereotype) {

 

 		value = value != null ? value : ""; //$NON-NLS-1$

 

@@ -143,7 +143,7 @@ public class PapyrusQuery extends AbstractPapyrusQuery {
 			if(m.matches()) {

 				int start = m.start();

 				int end = m.end();

-				ModelMatch match = new AttributeMatch(start, end, participant, scopeEntry, attribute, null);

+				ModelMatch match = new AttributeMatch(start, end, participant, scopeEntry, attribute, stereotype);

 

 				fResults.add(match);

 			}

@@ -151,7 +151,7 @@ public class PapyrusQuery extends AbstractPapyrusQuery {
 			while(m.find()) {

 				int start = m.start();

 				int end = m.end();

-				AttributeMatch match = new AttributeMatch(start, end, participant, scopeEntry, attribute, null);

+				AttributeMatch match = new AttributeMatch(start, end, participant, scopeEntry, attribute, stereotype);

 				fResults.add(match);

 			}

 		}

@@ -190,7 +190,7 @@ public class PapyrusQuery extends AbstractPapyrusQuery {
 

 						if(value instanceof String) {

 							String stringValue = (String)value;

-							evaluateAndAddToResult(stringValue, attribute, pattern, participant, scopeEntry);

+							evaluateAndAddToResult(stringValue, attribute, pattern, participant, scopeEntry, null);

 						}

 					}

 

@@ -203,7 +203,7 @@ public class PapyrusQuery extends AbstractPapyrusQuery {
 

 									if(value instanceof String) {

 										String stringValue = (String)value;

-										evaluateAndAddToResult(stringValue, stereotypeProperty, pattern, participant, scopeEntry);

+										evaluateAndAddToResult(stringValue, stereotypeProperty, pattern, participant, scopeEntry, stereotype);

 									}

 								}

 							}

@@ -215,7 +215,7 @@ public class PapyrusQuery extends AbstractPapyrusQuery {
 						String umlElementName = ((NamedElement)participant).getName();

 						umlElementName = umlElementName != null ? umlElementName : ""; //$NON-NLS-1$

 

-						evaluateAndAddToResult(umlElementName, UMLPackage.eINSTANCE.getNamedElement_Name(), pattern, participant, scopeEntry);

+						evaluateAndAddToResult(umlElementName, UMLPackage.eINSTANCE.getNamedElement_Name(), pattern, participant, scopeEntry, null);

 					}

 				}

 

@@ -255,12 +255,17 @@ public class PapyrusQuery extends AbstractPapyrusQuery {
 		}

 	}

 

+

+	public Set<AbstractResultEntry> getResults() {

+		return fResults;

+	}

+

 	public String getLabel() {

 		return Messages.PapyrusQuery_6;

 	}

 

 	public boolean canRerun() {

-		return true;

+		return false;

 	}

 

 	public boolean canRunInBackground() {

diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/QueryInfo.java b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/QueryInfo.java
index 1f0251bcec8..9f1d79c69d5 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/QueryInfo.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/QueryInfo.java
@@ -32,6 +32,8 @@ public class QueryInfo {
 	private boolean searchAllStringAttributes;
 
 	private Collection<? extends ParticipantTypeElement> participantTypes;
+	
+	private boolean searchForAllSter;
 
 	private Collection<URI> scope;
 
@@ -53,6 +55,7 @@ public class QueryInfo {
 	public QueryInfo(String queryText, boolean caseSensitive, boolean regularExpression, boolean searchAllStringAttributes, Collection<URI> scope) {
 		super();
 
+		
 		this.queryText = queryText;
 		this.caseSensitive = caseSensitive;
 		this.regularExpression = regularExpression;
@@ -72,10 +75,12 @@ public class QueryInfo {
 	 *        whether the {@code queryText} is to be taken as a regular expression
 	 * @param participantTypes
 	 *        the participant types (identifying specific metaclasses and/or attributes) to include in the search
+	 * @param searchForAllSter
+	 *        stereotype application must all applied or not
 	 * @param scope
 	 *        the domain-specific search scope
 	 */
-	public QueryInfo(String queryText, boolean caseSensitive, boolean regularExpression, Collection<? extends ParticipantTypeElement> participantTypes, Collection<URI> scope) {
+	public QueryInfo(String queryText, boolean caseSensitive, boolean regularExpression, Collection<? extends ParticipantTypeElement> participantTypes, Collection<URI> scope,boolean searchForAllSter) {
 		super();
 
 		this.queryText = queryText;
@@ -84,6 +89,7 @@ public class QueryInfo {
 		this.searchAllStringAttributes = false;
 		this.participantTypes = participantTypes;
 		this.scope = scope;
+		this.searchForAllSter = searchForAllSter;
 	}
 	
 	/**
@@ -97,6 +103,7 @@ public class QueryInfo {
 		this.regularExpression = original.regularExpression;
 		this.searchAllStringAttributes = original.searchAllStringAttributes;
 		this.participantTypes = original.participantTypes;
+		this.searchForAllSter = original.searchForAllSter;
 		this.scope = scope;
 	}
 
@@ -123,6 +130,11 @@ public class QueryInfo {
 	public Collection<URI> getScope() {
 		return scope;
 	}
+	
+	public boolean isSearchForAllSter() {
+		return searchForAllSter;
+	}
+
 
 	/**
 	 * Creates a new instance encapsulating query parameters for the specified partition (strict subset) of my {@linkplain #getScope() scope}.
diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/WorkspaceQueryProvider.java b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/WorkspaceQueryProvider.java
index 18318084408..5296eec748d 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/WorkspaceQueryProvider.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/query/WorkspaceQueryProvider.java
@@ -51,7 +51,7 @@ public class WorkspaceQueryProvider implements IPapyrusQueryProvider {
 
 	public AbstractPapyrusQuery createAdvancedSearchQuery(QueryInfo queryInfo) {
 		Collection<ScopeEntry> scopeEntries = createScopeEntries(queryInfo.getScope());
-		return new PapyrusAdvancedQuery(queryInfo.getQueryText(), queryInfo.isCaseSensitive(), queryInfo.isRegularExpression(), scopeEntries, queryInfo.getParticipantTypes().toArray());
+		return new PapyrusAdvancedQuery(queryInfo.getQueryText(), queryInfo.isCaseSensitive(), queryInfo.isRegularExpression(), scopeEntries, queryInfo.getParticipantTypes().toArray(),queryInfo.isSearchForAllSter());
 	}
 
 
diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/results/PapyrusSearchResult.java b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/results/PapyrusSearchResult.java
index b64c82da64c..0afcb88d95d 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/results/PapyrusSearchResult.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/search/ui/results/PapyrusSearchResult.java
@@ -28,6 +28,7 @@ import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.emf.common.util.URI;

 import org.eclipse.emf.ecore.EAttribute;

 import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

 import org.eclipse.jface.resource.ImageDescriptor;

 import org.eclipse.papyrus.infra.core.utils.EditorUtils;

 import org.eclipse.papyrus.uml.search.ui.Activator;

@@ -49,7 +50,9 @@ import org.eclipse.search.ui.text.MatchFilter;
 import org.eclipse.ui.IEditorPart;

 import org.eclipse.ui.ide.ResourceUtil;

 import org.eclipse.uml2.uml.Element;

+import org.eclipse.uml2.uml.EnumerationLiteral;

 import org.eclipse.uml2.uml.Property;

+import org.eclipse.uml2.uml.Stereotype;

 

 import com.google.common.base.Objects;

 import com.swtdesigner.ResourceManager;

@@ -167,22 +170,20 @@ public class PapyrusSearchResult extends AbstractTextSearchResult implements IEd
 			if(match instanceof AbstractResultEntry) {

 				if(((AbstractResultEntry)match).getSource() != null) {

 					if(match instanceof AttributeMatch) {

-

+						Object attribute = ((AttributeMatch)match).getMetaAttribute();

 						String value = null;

 						EObject target = (EObject)((AbstractResultEntry)match).getSource();

-						if(((AttributeMatch)match).getMetaAttribute() instanceof EAttribute) {

+						if(attribute instanceof EAttribute) {

 

-							EAttribute attribute = (EAttribute)((AttributeMatch)match).getMetaAttribute();

-							value = String.valueOf(target.eGet(attribute));

-						} else if(((AttributeMatch)match).getMetaAttribute() instanceof Property) {

+							value = String.valueOf(target.eGet((EStructuralFeature)attribute));

+						} else if(attribute instanceof Property) {

 

-							Property attribute = (Property)((AttributeMatch)match).getMetaAttribute();

-							value = (String)((Element)((AbstractResultEntry)match).getSource()).getValue(((AttributeMatch)match).getStereotype(), attribute.getName());

+							value = getStringValueOfProperty((Element)((AbstractResultEntry)match).getSource(), ((AttributeMatch)match).getStereotype(), ((Property)attribute));

 

 

 						}

 						if(value != null && !this.getQuery().isRegularExpression()) {

-							if(value.length() >= match.getOffset() + match.getLength()) {

+							if(value.length() >= match.getLength() - match.getOffset()) {

 								int end = match.getOffset() + match.getLength();

 								value = value.substring(match.getOffset(), end);

 								if(this.searchQuery.isCaseSensitive()) {

@@ -226,7 +227,7 @@ public class PapyrusSearchResult extends AbstractTextSearchResult implements IEd
 				}

 			}

 		}

-		// Now get Viewers

+		// Now get Viewer

 		for(Match match : matchList) {

 			if(match instanceof ViewerMatch) {

 				Object source = ((ViewerMatch)match).getSemanticElement();

@@ -238,7 +239,8 @@ public class PapyrusSearchResult extends AbstractTextSearchResult implements IEd
 		}

 

 		return (Match[])matchToKeep.toArray(new Match[matchToKeep.size()]);

-

+		//		return ((PapyrusQuery)searchQuery).getfResults().toArray(new Match[matchToKeep.size()]);

+		//

 	}

 

 	public Match[] computeContainedMatches(AbstractTextSearchResult result, IEditorPart editor) {

@@ -274,6 +276,16 @@ public class PapyrusSearchResult extends AbstractTextSearchResult implements IEd
 		return count;

 	}

 

+	private String getStringValueOfProperty(Element element, Stereotype stereotype, Property property) {

+		Object value = element.getValue(stereotype, property.getName());

+		if(value instanceof String) {

+			return (String)value;

+		} else if(value instanceof EnumerationLiteral) {

+			return ((EnumerationLiteral)value).getName();

+		} else {

+			return String.valueOf(value);

+		}

+	}

 

 

 }

diff --git a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/stereotypecollector/StereotypeCollector.java b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/stereotypecollector/StereotypeCollector.java
index 09e2def3e46..ab63bc3a987 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/stereotypecollector/StereotypeCollector.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.search.ui/src/org/eclipse/papyrus/uml/stereotypecollector/StereotypeCollector.java
@@ -35,6 +35,7 @@ import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.emf.ecore.util.EcoreUtil;

 import org.eclipse.jface.viewers.ISelection;

 import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.papyrus.infra.core.resource.ModelSet;

 import org.eclipse.papyrus.infra.emf.utils.BusinessModelResolver;

 import org.eclipse.papyrus.infra.onefile.model.IPapyrusFile;

 import org.eclipse.search.ui.ISearchPageContainer;

@@ -111,7 +112,7 @@ public class StereotypeCollector implements IStereotypeCollector {
 		}

 

 		for(URI uri : umlResources) {

-			ResourceSet resourceSet = new ResourceSetImpl();

+			ModelSet resourceSet = new ModelSet();

 			Resource resource = resourceSet.getResource(uri, true);

 

 			TreeIterator<EObject> UMLResourceContentIterator = resource.getAllContents();

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF
index ca8c455256c..d61e4cd0c19 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Require-Bundle: org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.0",
  org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.0",

  org.eclipse.uml2.uml.profile.l2;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0",

- com.google.guava;bundle-version="10.0.1",

+ com.google.guava;bundle-version="11.0.0",

  org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.core;bundle-version="1.0.0",

  org.eclipse.papyrus.uml.tools;bundle-version="1.0.0",

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/plugin.xml b/plugins/uml/org.eclipse.papyrus.uml.service.types/plugin.xml
index 13046a3e86d..c7adb3478ad 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/plugin.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/plugin.xml
@@ -236,10 +236,13 @@
 	</metamodelType>
 	
 	<!-- IMetamodelType for Class -->
-	<metamodelType id="org.eclipse.papyrus.uml.Class" name="UML::Class"
-		eclass="Class"
-		edithelper="org.eclipse.papyrus.uml.service.types.helper.ClassEditHelper"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+	<metamodelType
+       eclass="Class"
+       edithelper="org.eclipse.papyrus.uml.service.types.helper.ClassEditHelper"
+       icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
+       id="org.eclipse.papyrus.uml.Class"
+       kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+       name="UML::Class">
 			<param name="semanticHint" value="UML::Class"/>
 	</metamodelType>
 	
@@ -322,9 +325,12 @@
 	</metamodelType>
 	
 	<!-- IMetamodelType for Component -->
-	<metamodelType id="org.eclipse.papyrus.uml.Component" name="UML::Component"
-		eclass="Component"
-		kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType" >
+	<metamodelType
+       eclass="Component"
+       edithelper="org.eclipse.papyrus.uml.service.types.helper.ComponentEditHelper"
+       id="org.eclipse.papyrus.uml.Component"
+       kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
+       name="UML::Component">
 			<param name="semanticHint" value="UML::Component"/>
 	</metamodelType>
 	
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/ConnectorReorientCommand.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/ConnectorReorientCommand.java
index f81d55a8295..429345018f0 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/ConnectorReorientCommand.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/ConnectorReorientCommand.java
@@ -82,8 +82,12 @@ public class ConnectorReorientCommand extends ConnectorReorientSemanticCommand {
 		} else {
 			oppositeEndView = null;
 		}
-		setNewPartWithPort(findNewPartWithPort());
-		setOppositePartWithPort(findNewOppositePartWithPort());
+		if(getNewPartWithPort() == null) {
+			setNewPartWithPort(findNewPartWithPort());
+		}
+		if(getOppositePartWithPort() == null) {
+			setOppositePartWithPort(findNewOppositePartWithPort());
+		}
 	}
 
 	//	/**
@@ -233,8 +237,11 @@ public class ConnectorReorientCommand extends ConnectorReorientSemanticCommand {
 	 * @return the new {@link Connector} end graphical parent.
 	 */
 	protected Element getEndParent(View endView) {
-		EObject parent = ViewUtil.getContainerView(endView).getElement();
-		return (parent instanceof Element) ? (Element)parent : null;
+		if(endView != null) {
+			EObject parent = ViewUtil.getContainerView(endView).getElement();
+			return (parent instanceof Element) ? (Element)parent : null;
+		}
+		return null;
 	}
 
 
@@ -253,9 +260,6 @@ public class ConnectorReorientCommand extends ConnectorReorientSemanticCommand {
 				// Only add PartWithPort for assembly (not for delegation)
 				if(!EcoreUtil.isAncestor(ViewUtil.getContainerView(this.newEndView), this.oppositeEndView)) {
 					partWithPort = (Property)newEndParent;
-				} else {
-					int i = 0;
-					i++;
 				}
 			}
 		}
@@ -270,7 +274,7 @@ public class ConnectorReorientCommand extends ConnectorReorientSemanticCommand {
 	protected Property findNewOppositePartWithPort() {
 		Property partWithPort = null;
 		Element oppositeEndParent = getEndParent(this.oppositeEndView);
-		if(this.oppositeEndView.getElement() instanceof Port) {
+		if(this.oppositeEndView != null && this.oppositeEndView.getElement() instanceof Port) {
 			// Only look for PartWithPort if the role is a Port.
 
 			if((oppositeEndParent != null) && (oppositeEndParent instanceof Property) && !(oppositeEndParent instanceof Port)) {
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/ConnectorReorientSemanticCommand.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/ConnectorReorientSemanticCommand.java
index 58d11fbcf60..2034a61fa5c 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/ConnectorReorientSemanticCommand.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/ConnectorReorientSemanticCommand.java
@@ -101,6 +101,7 @@ public class ConnectorReorientSemanticCommand extends EditElementCommand {
 	 */

 	protected void initFields() {

 		this.newPartWithPort = (Property)getRequest().getParameter(ConnectorUtils.PART_WITH_PORT);

+		this.oppositePartWithPort = (Property)getRequest().getParameter(ConnectorUtils.OPPOSITE_PART_WITH_PORT);

 	}

 

 	/**

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ComponentEditHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ComponentEditHelper.java
new file mode 100644
index 00000000000..bd4d634d0e5
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ComponentEditHelper.java
@@ -0,0 +1,87 @@
+/*****************************************************************************

+ * 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:

+ * 

+ * 		Patrick Tessier (CEA LIST) Patrick.Tessier@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.uml.service.types.helper;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EReference;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

+import org.eclipse.uml2.uml.Component;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * this helper has been specified in order to prevent to create or move a component into a component by using the role

+ * "nestedClassifier". The good role is "packagedElement"

+ *

+ */

+public class ComponentEditHelper extends ElementEditHelper {

+

+	@Override

+	protected ICommand getCreateCommand(CreateElementRequest req) {

+		// overload the creation in order to prevent to create or move a component into a component by using the role

+		// "nestedClassifier"

+		EObject owner= req.getContainer();

+		EReference eref=req.getContainmentFeature();

+		if(owner!=null &&!canCreate(owner, eref)) {

+			// Abort creation.

+			return UnexecutableCommand.INSTANCE;

+		}

+		if(owner instanceof Component && eref==null){

+			req.setContainmentFeature(UMLPackage.eINSTANCE.getComponent_PackagedElement());

+		}

+		return super.getCreateCommand(req);

+	}

+

+	@Override

+	protected ICommand getMoveCommand(MoveRequest req) {

+		// overload the creation in order to prevent to create or move a component into a component by using the role

+		// "nestedClassifier"

+		for(Object elementToMove : req.getElementsToMove().keySet()) {

+			if( elementToMove instanceof Component && (UMLPackage.eINSTANCE.getClass_NestedClassifier().equals(req.getTargetFeature((EObject)elementToMove)))){

+				return UnexecutableCommand.INSTANCE;

+			}

+			if( elementToMove instanceof Component && req.getTargetFeature((EObject)elementToMove)==null){

+				req.setTargetFeature((EObject)elementToMove, (UMLPackage.eINSTANCE.getComponent_PackagedElement()));

+			}

+		}

+		

+		return super.getMoveCommand(req);

+	}

+	@Override

+	protected ICommand getSetCommand(SetRequest req) {

+		// overload the creation in order to prevent to create or move a component into a component by using the role

+		// "nestedClassifier"

+		EObject eobject=req.getElementToEdit();

+		if( eobject instanceof Component && (UMLPackage.eINSTANCE.getComponent_PackagedElement().equals(req.getFeature()))){

+			return UnexecutableCommand.INSTANCE;

+		}

+		return super.getSetCommand(req);

+	}

+	/**

+	 * test if it is possible to create a component into a given container and with the given containment feature

+	 * @param owner the owner of the component, can be null

+	 * @param eref the containment feature, can be null

+	 * @return false if the container is a component and the feature "nestedClassifier"

+	 */

+	protected boolean canCreate(EObject owner,EReference eref) {

+		if(owner instanceof Component && UMLPackage.eINSTANCE.getClass_NestedClassifier().equals(eref)){

+			return false;

+		}

+		return true;

+	}

+}

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ExceptionHandlerEditHelper.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ExceptionHandlerEditHelper.java
index e229e33f29d..d8b6ca987e2 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ExceptionHandlerEditHelper.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/ExceptionHandlerEditHelper.java
@@ -34,6 +34,7 @@ import org.eclipse.uml2.uml.ActivityNode;
 import org.eclipse.uml2.uml.ExceptionHandler;

 import org.eclipse.uml2.uml.ExecutableNode;

 import org.eclipse.uml2.uml.ObjectNode;

+import org.eclipse.uml2.uml.Type;

 

 /**

  * Edit helper class for binary {@link ExceptionHandler}

@@ -46,6 +47,7 @@ public class ExceptionHandlerEditHelper extends ElementEditHelper {
 	@Override

 	protected ICommand getReorientRelationshipCommand(ReorientRelationshipRequest req) {

 		return new ExceptionHandlerReorientCommand(req);

+	

 	}

 

 	/**

diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/utils/ConnectorUtils.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/utils/ConnectorUtils.java
index a1655de4e81..e80e554f039 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/utils/ConnectorUtils.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/utils/ConnectorUtils.java
@@ -45,6 +45,8 @@ public class ConnectorUtils {
 	 */

 	public static final String PART_WITH_PORT = "partWithPort"; //$NON-NLS-1$

 

+	public static final String OPPOSITE_PART_WITH_PORT = "oppositePartWithPort"; //$NON-NLS-1$

+

 	/**

 	 * Tries to find a common structure container view for source and target.

 	 * 

diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/namereferences/NameReferencesHelper.java b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/namereferences/NameReferencesHelper.java
index 08825f930b1..e562072f60b 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/namereferences/NameReferencesHelper.java
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/src/org/eclipse/papyrus/uml/tools/namereferences/NameReferencesHelper.java
@@ -135,6 +135,8 @@ public class NameReferencesHelper extends TextReferencesHelper {
 

 	public void dispose() {

 		this.listener.dispose();

+		this.resourceSet = null;

+		this.baseResource = null;

 	}

 

 	private class ChangeDispatcher extends AdapterImpl {

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/.classpath b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/.classpath
new file mode 100644
index 00000000000..8a8f1668cdc
--- /dev/null
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<classpath>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

+	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="output" path="bin"/>

+</classpath>

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/.project b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/.project
new file mode 100644
index 00000000000..fbbdbae5e78
--- /dev/null
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.papyrus.views.modelexplorer.newchild</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.jdt.core.javabuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.ManifestBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.SchemaBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.pde.PluginNature</nature>

+		<nature>org.eclipse.jdt.core.javanature</nature>

+	</natures>

+</projectDescription>

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/.settings/org.eclipse.jdt.core.prefs b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..f287d53cf45
--- /dev/null
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1

+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6

+org.eclipse.jdt.core.compiler.compliance=1.6

+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

+org.eclipse.jdt.core.compiler.source=1.6

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/META-INF/MANIFEST.MF b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..4b007830bed
--- /dev/null
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/META-INF/MANIFEST.MF
@@ -0,0 +1,23 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.views.modelexplorer.newchild;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.eclipse.papyrus.views.modelexplorer.newchild.Activator
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.emf.transaction,
+ org.eclipse.papyrus.infra.core,
+ org.eclipse.papyrus.infra.emf,
+ org.eclipse.papyrus.uml.service.types,
+ org.eclipse.papyrus.infra.core.log,
+ org.eclipse.gmf.runtime.common.core,
+ org.eclipse.gmf.runtime.emf.type.core,
+ org.eclipse.papyrus.infra.services.edit,
+ org.eclipse.papyrus.infra.tools,
+ org.eclipse.papyrus.infra.gmfdiag.commands,
+ org.eclipse.papyrus.infra.newchild;bundle-version="1.0.0"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/about.html b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/about.html
new file mode 100644
index 00000000000..82d49bf5f81
--- /dev/null
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

+<title>About</title>

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>June 5, 2007</p>	

+<h3>License</h3>

+

+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

+indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

+apply to your use of any object code in the Content.  Check the Redistributor's license that was 

+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

+indicated below, the terms and conditions of the EPL still apply to any source code in the Content

+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

+

+</body>

+</html>

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/build.properties b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/build.properties
new file mode 100644
index 00000000000..653ec3c3daf
--- /dev/null
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/build.properties
@@ -0,0 +1,8 @@
+source.. = src/

+output.. = bin/

+bin.includes = META-INF/,\

+               .,\

+               plugin.xml,\

+               about.html,\

+               plugin.properties

+src.includes = about.html

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/plugin.properties b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/plugin.properties
new file mode 100644
index 00000000000..8dc65aa0f5f
--- /dev/null
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################

+# 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:

+#     Patrick Tessier (CEA LIST) - Initial API and implementation

+##################################################################################

+pluginName=Papyrus view model explorer new child (Incubation)

+providerName=Eclipse Modeling Project

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/plugin.xml b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/plugin.xml
new file mode 100644
index 00000000000..8ab412ae377
--- /dev/null
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/plugin.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<?eclipse version="3.4"?>

+<plugin>

+<extension    point="org.eclipse.ui.menus">

+                  <menuContribution

+               allPopups="false"

+               locationURI="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup">

+                     <dynamic

+                           class="org.eclipse.papyrus.views.modelexplorer.newchild.DynamicNewChild"

+                           id="org.eclipse.papyrus.views.modelexplorer.newchild.dynamic">

+                     </dynamic>

+         </menuContribution>

+      </extension>

+</plugin>

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/src/org/eclipse/papyrus/views/modelexplorer/newchild/Activator.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/src/org/eclipse/papyrus/views/modelexplorer/newchild/Activator.java
new file mode 100644
index 00000000000..de509f173b0
--- /dev/null
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/src/org/eclipse/papyrus/views/modelexplorer/newchild/Activator.java
@@ -0,0 +1,67 @@
+/*****************************************************************************

+ * Copyright (c) 2011 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *		

+ *		CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.views.modelexplorer.newchild;

+

+import org.eclipse.papyrus.infra.core.log.LogHelper;

+import org.eclipse.ui.plugin.AbstractUIPlugin;

+import org.osgi.framework.BundleContext;

+

+/**

+ * The activator class controls the plug-in life cycle

+ */

+public class Activator extends AbstractUIPlugin {

+

+	/** The plug-in ID**/

+	public static final String PLUGIN_ID = "org.eclipse.papyrus.views.modelexplorer.newchild"; //$NON-NLS-1$

+

+	// The shared instance

+	private static Activator plugin;

+	/** The log service */

+	public static LogHelper log;

+	

+	/**

+	 * The constructor

+	 */

+	public Activator() {

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

+	 */

+	public void start(BundleContext context) throws Exception {

+		super.start(context);

+		plugin = this;

+		log = new LogHelper(plugin);

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

+	 */

+	public void stop(BundleContext context) throws Exception {

+		plugin = null;

+		super.stop(context);

+	}

+

+	/**

+	 * Returns the shared instance

+	 *

+	 * @return the shared instance

+	 */

+	public static Activator getDefault() {

+		return plugin;

+	}

+

+}

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/src/org/eclipse/papyrus/views/modelexplorer/newchild/DynamicNewChild.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/src/org/eclipse/papyrus/views/modelexplorer/newchild/DynamicNewChild.java
new file mode 100644
index 00000000000..073a15080d5
--- /dev/null
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/src/org/eclipse/papyrus/views/modelexplorer/newchild/DynamicNewChild.java
@@ -0,0 +1,116 @@
+/*****************************************************************************

+ * Copyright (c) 2011 CEA LIST.

+ *

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *		

+ *		CEA LIST - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.views.modelexplorer.newchild;

+

+

+import java.util.ArrayList;

+import java.util.Iterator;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.jface.action.IContributionItem;

+import org.eclipse.jface.viewers.ISelection;

+import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;

+import org.eclipse.papyrus.infra.newchild.CreationMenuFactory;

+import org.eclipse.papyrus.infra.newchild.CreationMenuRegistry;

+import org.eclipse.papyrus.infra.newchild.ElementCreationMenuModel.Folder;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.widgets.Menu;

+import org.eclipse.ui.ISelectionService;

+import org.eclipse.ui.IWorkbench;

+import org.eclipse.ui.IWorkbenchWindow;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.ui.actions.CompoundContributionItem;

+import org.eclipse.ui.menus.CommandContributionItem;

+import org.eclipse.ui.menus.CommandContributionItemParameter;

+

+/**

+ * This class has in charge to create menu from elementCreationMenuModel

+ *

+ */

+public class DynamicNewChild extends CompoundContributionItem  {

+

+	protected TransactionalEditingDomain editingDomain;

+	protected CreationMenuRegistry creationMenuRegistry;

+	/**

+	 * 

+	 * Constructor.

+	 *

+	 */

+	public DynamicNewChild() {

+		creationMenuRegistry = new CreationMenuRegistry();

+	}

+

+	/**

+	 * 

+	 * Constructor.

+	 *

+	 * @param id

+	 */

+	public DynamicNewChild(String id) {

+		super(id);

+	}

+	

+	

+	 protected IContributionItem[] getContributionItems() {

+	        return new IContributionItem[0];

+	    }

+	

+	  public boolean isDynamic(){

+	        return true;

+	    }

+

+	

+	

+	public void fill(Menu menu, int index) {

+		super.fill(menu, index);

+		EObject eObject= getSelection();

+		CreationMenuFactory creationMenuFactory= new CreationMenuFactory(editingDomain);

+		ArrayList<Folder> folders= creationMenuRegistry.getRootFolder();

+		Iterator<Folder> iterFolder= folders.iterator();

+		while (iterFolder.hasNext()) {

+			Folder currentFolder= iterFolder.next();

+			creationMenuFactory.populateMenu(menu, currentFolder,eObject);

+		}

+

+	}

+

+

+

+	

+	/**

+	 * getSelected eObject in the model explorer

+	 * @return eObject or null

+	 */

+	protected EObject getSelection(){

+		ISelectionService selectionService = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService();

+		ISelection selection = selectionService.getSelection();

+

+		if(selection instanceof IStructuredSelection) {

+			Object selectedobject = ((IStructuredSelection)selection).getFirstElement();

+			if(selectedobject instanceof IAdaptable) {

+				EObject selectedEObject = (EObject)((IAdaptable)selectedobject).getAdapter(EObject.class);

+				try {

+					editingDomain =ServiceUtilsForEObject.getInstance().getService(org.eclipse.emf.transaction.TransactionalEditingDomain.class, selectedEObject);

+				} catch (Exception ex) {

+					System.err.println("impossible to get the Transactional Editing Domain "+ex);

+				}

+				return selectedEObject;

+			}

+		}

+		return null;

+	}

+}

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/META-INF/MANIFEST.MF b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/META-INF/MANIFEST.MF
index 76bf51a77a5..1d3763c0b95 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/META-INF/MANIFEST.MF
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/META-INF/MANIFEST.MF
@@ -3,10 +3,6 @@ Require-Bundle: org.eclipse.emf.converter;bundle-version="2.5.0",
  org.eclipse.emf.ecore.editor;bundle-version="2.6.0",

  org.eclipse.emf.workspace.ui;bundle-version="1.3.0",

  org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.0",

- org.eclipse.emf.facet.infra.browser;bundle-version="0.1.0",

- org.eclipse.emf.facet.infra.browser.custom;bundle-version="0.1.0",

- org.eclipse.emf.facet.infra.common.core;bundle-version="0.1.0",

- org.eclipse.emf.facet.infra.facet;bundle-version="0.1.0",

  org.eclipse.papyrus.views.modelexplorer;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.services.controlmode.history;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.services.resourceloading;bundle-version="1.0.0",

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.widgets/META-INF/MANIFEST.MF b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.widgets/META-INF/MANIFEST.MF
index cd606db5661..02239cbe08f 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.widgets/META-INF/MANIFEST.MF
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.widgets/META-INF/MANIFEST.MF
@@ -3,15 +3,11 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

  org.eclipse.papyrus.infra.widgets;bundle-version="1.0.0",

  org.eclipse.papyrus.views.modelexplorer;bundle-version="1.0.0",

- org.eclipse.emf.facet.infra.browser;bundle-version="0.1.0",

- org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.1.0",

  org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.0",

- org.eclipse.emf.facet.infra.facet;bundle-version="0.1.0",

  org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",

  org.eclipse.gmf.runtime.emf.core;bundle-version="1.4.1",

  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0"

 Export-Package: org.eclipse.papyrus.views.modelexplorer.widgets

 Bundle-Vendor: %providerName

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF
index 7e7817dcf78..9a13baf6c69 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF
@@ -40,18 +40,18 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",

  org.eclipse.emf.facet.infra.query.core,

  org.eclipse.papyrus.infra.emf;bundle-version="1.0.0",

- com.google.guava;bundle-version="[10.0.0,12.0.0)",

+ com.google.guava;bundle-version="11.0.0",

  org.eclipse.papyrus.infra.widgets;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.services.semantic;bundle-version="1.0.0",

  org.eclipse.emf.ecore,

  org.eclipse.papyrus.infra.services.navigation;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.tools;bundle-version="1.0.0",

- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.0"

+ org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.0.0.qualifier

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/ModelExplorerView.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/ModelExplorerView.java
index c70fd28ac87..23cb924faef 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/ModelExplorerView.java
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/ModelExplorerView.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2010, 2013 CEA LIST.

  *

- * 

+ *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -115,13 +115,13 @@ import com.google.common.collect.Lists;
  * Papyrus Model Explorer associated to one {@link IMultiDiagramEditor}.

  * This ModelExplorer is linked to one single {@link IMultiDiagramEditor}. It doesn't change its

  * source when the current Editor change. To allow to explore different Model, use a {@link ModelExplorerPageBookView}.

- * 

+ *

  */

 public class ModelExplorerView extends CommonNavigator implements IRevealSemanticElement, IEditingDomainProvider, IPageLifeCycleEventsListener {

 

 	/**

 	 * The context of the LabelProviderService used by this view

-	 * 

+	 *

 	 * @see {@link LabelProviderService}

 	 */

 	public static final String LABEL_PROVIDER_SERVICE_CONTEXT = "org.eclipse.papyrus.views.modelexplorer.labelProvider.context";

@@ -169,9 +169,9 @@ public class ModelExplorerView extends CommonNavigator implements IRevealSemanti
 

 		/**

 		 * This method is called when the editor input is changed from the ISaveAndDirtyService.

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.infra.core.lifecycleevents.IEditorInputChangedListener#editorInputChanged(org.eclipse.ui.part.FileEditorInput)

-		 * 

+		 *

 		 * @param fileEditorInput

 		 */

 		public void editorInputChanged(FileEditorInput fileEditorInput) {

@@ -181,9 +181,9 @@ public class ModelExplorerView extends CommonNavigator implements IRevealSemanti
 

 		/**

 		 * The isDirty flag has changed, reflect its new value

-		 * 

+		 *

 		 * @see org.eclipse.papyrus.infra.core.lifecycleevents.IEditorInputChangedListener#isDirtyChanged()

-		 * 

+		 *

 		 */

 		public void isDirtyChanged() {

 			firePropertyChange(IEditorPart.PROP_DIRTY);

@@ -194,9 +194,9 @@ public class ModelExplorerView extends CommonNavigator implements IRevealSemanti
 	private final List<IPropertySheetPage> propertySheetPages = new LinkedList<IPropertySheetPage>();

 

 	/**

-	 * 

+	 *

 	 * Constructor.

-	 * 

+	 *

 	 * @param part

 	 *        The part associated to this ModelExplorer

 	 */

@@ -225,7 +225,7 @@ public class ModelExplorerView extends CommonNavigator implements IRevealSemanti
 

 	/**

 	 * Handle a selection change in the editor.

-	 * 

+	 *

 	 * @param part

 	 * @param selection

 	 */

@@ -256,7 +256,7 @@ public class ModelExplorerView extends CommonNavigator implements IRevealSemanti
 

 	/**

 	 * look for the path the list of element (comes from the content provider) to go the eObject

-	 * 

+	 *

 	 * @param eobject

 	 *        that we look for.

 	 * @param objects

@@ -381,7 +381,7 @@ public class ModelExplorerView extends CommonNavigator implements IRevealSemanti
 

 		// The EMF Facet MeasureItem Listener is incompatible with the NavigatorDecoratingLabelProvider. Remove it.

 		// Symptoms: ModelElementItems with an EMF Facet Overlay have a small selection size

-		// Removal also fixes bug 400012: no scrollbar although tree is larger than visible area  

+		// Removal also fixes bug 400012: no scrollbar although tree is larger than visible area

 		Collection<Listener> listenersToRemove = new LinkedList<Listener>();

 		for(Listener listener : tree.getListeners(SWT.MeasureItem)) {

 			if(listener.getClass().getName().contains("org.eclipse.emf.facet.infra.browser.uicore.internal.CustomTreePainter")) {

@@ -488,15 +488,15 @@ public class ModelExplorerView extends CommonNavigator implements IRevealSemanti
 			//Ignore

 		}

 	}

-	

+

 	@Override

 	protected CommonViewer createCommonViewer(Composite aParent) {

 		CommonViewer viewer = super.createCommonViewer(aParent);

-		ViewerColumn column = (ViewerColumn) viewer.getTree().getData(Policy.JFACE + ".columnViewer");

+		ViewerColumn column = (ViewerColumn)viewer.getTree().getData(Policy.JFACE + ".columnViewer");

 		column.setEditingSupport(new DirectEditorEditingSupport(viewer));

 		return viewer;

 	}

-	

+

 

 	TreeItem currentItem;

 

@@ -591,9 +591,9 @@ public class ModelExplorerView extends CommonNavigator implements IRevealSemanti
 

 	/**

 	 * Return the control used to render this View

-	 * 

+	 *

 	 * @see org.eclipse.papyrus.views.modelexplorer.core.ui.pagebookview.IPageBookNestableViewPart#getControl()

-	 * 

+	 *

 	 * @return the main control of the navigator viewer

 	 */

 	public Control getControl() {

@@ -643,7 +643,7 @@ public class ModelExplorerView extends CommonNavigator implements IRevealSemanti
 

 	/**

 	 * Run in a UI thread to avoid non UI thread exception.

-	 * 

+	 *

 	 * @param event

 	 */

 	private void handleResourceSetChanged(ResourceSetChangeEvent event) {

@@ -805,7 +805,7 @@ public class ModelExplorerView extends CommonNavigator implements IRevealSemanti
 

 	/**

 	 * Return true if the component is already disposed.

-	 * 

+	 *

 	 * @return

 	 */

 	public boolean isDisposed() {

@@ -815,7 +815,7 @@ public class ModelExplorerView extends CommonNavigator implements IRevealSemanti
 

 	/**

 	 * Retrieves the {@link IPropertySheetPage} that his Model Explorer uses.

-	 * 

+	 *

 	 * @return

 	 */

 	private IPropertySheetPage getPropertySheetPage() {

@@ -869,7 +869,7 @@ public class ModelExplorerView extends CommonNavigator implements IRevealSemanti
 

 	/**

 	 * {@inheritDoc}

-	 * 

+	 *

 	 * @return the EditingDomain used by the properties view

 	 */

 	public EditingDomain getEditingDomain() {

@@ -892,7 +892,7 @@ public class ModelExplorerView extends CommonNavigator implements IRevealSemanti
 

 	/**

 	 * Expands the given CommonViewer to reveal the given elements

-	 * 

+	 *

 	 * @param elementList

 	 *        The elements to reveal

 	 * @param commonViewer

@@ -922,7 +922,7 @@ public class ModelExplorerView extends CommonNavigator implements IRevealSemanti
 					tmp = tmp.eContainer();

 				}

 

-				Iterable<EObject> reverseParents = Iterables.reverse(parents);

+				Iterable<EObject> reverseParents = Lists.reverse(parents);

 

 				// reveal the resource if necessary

 				Resource r = null;

@@ -945,11 +945,11 @@ public class ModelExplorerView extends CommonNavigator implements IRevealSemanti
 				 * in the good order. This is a lot faster than going through the whole tree

 				 * using getChildren of the ContentProvider since our Viewer uses a Hashtable

 				 * to keep track of the revealed elements.

-				 * 

+				 *

 				 * However we need to use a dedicated MatchingItem to do the matching,

 				 * and a specific comparer in our viewer so than the equals of MatchingItem is

 				 * used in priority.

-				 * 

+				 *

 				 * Please refer to MatchingItem for more infos.

 				 */

 				EObject previousParent = null;

@@ -986,7 +986,7 @@ public class ModelExplorerView extends CommonNavigator implements IRevealSemanti
 

 	/**

 	 * Selects the given ISelection in the given CommonViwer

-	 * 

+	 *

 	 * @param structuredSelection

 	 *        The ISelection to select

 	 * @param commonViewer

@@ -1003,7 +1003,7 @@ public class ModelExplorerView extends CommonNavigator implements IRevealSemanti
 

 	/**

 	 * Selects and, if possible, reveals the given ISelection in the given CommonViwer

-	 * 

+	 *

 	 * @param selection

 	 *        The ISelection to select

 	 * @param viewer

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/NavigatorUtils.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/NavigatorUtils.java
index 4f9281f8222..eabfb7a9e43 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/NavigatorUtils.java
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/NavigatorUtils.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * 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
@@ -101,7 +101,7 @@ public class NavigatorUtils {
 		public RootsIterator(Iterator<Resource> resources) {
 			this.resources = resources;
 			if(resources.hasNext()) {
-				inner = resources.next().getAllContents();
+				inner = resources.next().getContents().iterator();
 			}
 		}
 
@@ -115,7 +115,7 @@ public class NavigatorUtils {
 			}
 
 			while(resources.hasNext()) {
-				inner = resources.next().getAllContents();
+				inner = resources.next().getContents().iterator();
 				if(inner.hasNext()) {
 					return true;
 				}
@@ -135,7 +135,7 @@ public class NavigatorUtils {
 			}
 
 			while(resources.hasNext()) {
-				inner = resources.next().getAllContents();
+				inner = resources.next().getContents().iterator();
 				if(inner.hasNext()) {
 					return inner.next();
 				}
@@ -188,10 +188,12 @@ public class NavigatorUtils {
 		if(element.eResource() == null) {
 			return null;
 		}
+		if(element.eResource().getResourceSet() == null) {
+			return null;
+		}
 		return new ResourcesIterator(element.eResource().getResourceSet(), fileExtension);
 	}
 
-
 	/**
 	 * Represents an iterator over the notation resources of a ResourceSet
 	 * 
@@ -385,10 +387,10 @@ public class NavigatorUtils {
 	//
 	//	/**
 	//	 * Gets the object name or empty string.
-	//	 * 
+	//	 *
 	//	 * @param object
 	//	 *            the object
-	//	 * 
+	//	 *
 	//	 * @return the object name or empty string
 	//	 */
 	//	// @unused
@@ -402,10 +404,10 @@ public class NavigatorUtils {
 	//
 	//	/**
 	//	 * Gets the object name.
-	//	 * 
+	//	 *
 	//	 * @param object
 	//	 *            the object
-	//	 * 
+	//	 *
 	//	 * @return the object name
 	//	 */
 	//	// @unused
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/preferences/NavigatorPreferencePage.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/preferences/NavigatorPreferencePage.java
index 08e9c308621..5d9d306c0ef 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/preferences/NavigatorPreferencePage.java
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/preferences/NavigatorPreferencePage.java
@@ -35,22 +35,22 @@ public class NavigatorPreferencePage extends AbstractPapyrusNodePreferencePage {
 

 		// String elementName = "Model Explorer";

 		// PreferenceConverter.setDefault(store,

-		// PreferenceConstantHelper.getElementConstant(elementName,

-		// PreferenceConstantHelper.COLOR_FILL), new

+		// PreferencesConstantsHelper.getElementConstant(elementName,

+		// PreferencesConstantsHelper.COLOR_FILL), new

 		// org.eclipse.swt.graphics.RGB(255, 255, 255));

 		// PreferenceConverter.setDefault(store,

-		// PreferenceConstantHelper.getElementConstant(elementName,

-		// PreferenceConstantHelper.COLOR_LINE), new

+		// PreferencesConstantsHelper.getElementConstant(elementName,

+		// PreferencesConstantsHelper.COLOR_LINE), new

 		// org.eclipse.swt.graphics.RGB(0, 0, 0));

 		//

 		// // Set the default for the gradient

-		// store.setDefault(PreferenceConstantHelper.getElementConstant(elementName,

-		// PreferenceConstantHelper.GRADIENT_POLICY), false);

+		// store.setDefault(PreferencesConstantsHelper.getElementConstant(elementName,

+		// PreferencesConstantsHelper.GRADIENT_POLICY), false);

 		// GradientPreferenceConverter gradientPreferenceConverter = new

 		// GradientPreferenceConverter(new org.eclipse.swt.graphics.RGB(255,

 		// 255, 255), new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);

-		// store.setDefault(PreferenceConstantHelper.getElementConstant(elementName,

-		// PreferenceConstantHelper.COLOR_GRADIENT),

+		// store.setDefault(PreferencesConstantsHelper.getElementConstant(elementName,

+		// PreferencesConstantsHelper.COLOR_GRADIENT),

 		// gradientPreferenceConverter.getPreferenceValue());

 

 	}

diff --git a/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/regex/PatternHelper.java b/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/regex/PatternHelper.java
index 2ad1497849b..96495a60fed 100644
--- a/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/regex/PatternHelper.java
+++ b/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/regex/PatternHelper.java
@@ -35,14 +35,13 @@ public class PatternHelper {
 	 * @return the helper

 	 */

 	public final static PatternHelper getInstance() {

-

-		if(PatternHelper.instance == null) {

+		

 			synchronized(PatternHelper.class) {

 				if(PatternHelper.instance == null) {

 					PatternHelper.instance = new PatternHelper();

 				}

 			}

-		}

+		

 		return PatternHelper.instance;

 	}

 

diff --git a/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/results/AbstractResultEntry.java b/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/results/AbstractResultEntry.java
index fc5ca9fb494..5fdc926872d 100644
--- a/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/results/AbstractResultEntry.java
+++ b/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/results/AbstractResultEntry.java
@@ -266,5 +266,8 @@ public abstract class AbstractResultEntry extends Match {
 		return this.getClass().getSimpleName() + "(" + super.hashCode() + ") : source -> " + source; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
+	public URI getURI() {

 
+		return uriSource;

+	}

 }
diff --git a/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/results/AttributeMatch.java b/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/results/AttributeMatch.java
index 0a7996d6c0b..6434bc83e45 100644
--- a/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/results/AttributeMatch.java
+++ b/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/results/AttributeMatch.java
@@ -33,7 +33,7 @@ public class AttributeMatch extends ModelMatch {
 	 * The element containing the value of the attribute that matches

 	 */

 

-	protected URI uriSource;

+

 

 	protected Object attribute;

 

@@ -182,4 +182,9 @@ public class AttributeMatch extends ModelMatch {
 		this.stereotype = stereotype;

 	}

 

+	public URI getURISource() {

+

+		return uriSource;

+	}

+

 }

diff --git a/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/results/ModelElementMatch.java b/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/results/ModelElementMatch.java
index 122f40dd1a0..c560deb82dc 100644
--- a/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/results/ModelElementMatch.java
+++ b/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/results/ModelElementMatch.java
@@ -39,17 +39,7 @@ public class ModelElementMatch extends ModelMatch {
 

 	@Override

 	public boolean equals(Object obj) {

-		//		if(obj instanceof ModelElementMatch) {

-		//			if(super.equals(obj)) {

-		//

-		//				return true;

-		//

-		//			}

-		//			return false;

-		//

-		//		} else {

-		//			return false;

-		//		}

+

 		return super.equals(obj);

 	}

 

diff --git a/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/scope/ScopeCollector.java b/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/scope/ScopeCollector.java
index 74f22d98d04..091fa55d35c 100644
--- a/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/scope/ScopeCollector.java
+++ b/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/scope/ScopeCollector.java
@@ -38,10 +38,10 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.papyrus.views.search.Activator;

 import org.eclipse.search.ui.ISearchPageContainer;

 import org.eclipse.ui.IWorkingSet;

-
+

 public class ScopeCollector implements IScopeCollector {

 

-	private static final ScopeCollector instance = new ScopeCollector();

+	private static ScopeCollector instance = new ScopeCollector();

 

 	private final Iterable<? extends IScopeProvider> scopeProviders;

 	

@@ -52,6 +52,15 @@ public class ScopeCollector implements IScopeCollector {
 	}

 

 	public final static ScopeCollector getInstance() {

+

+

+		

+			synchronized(ScopeCollector.class) {

+				if(ScopeCollector.instance == null) {

+				ScopeCollector.instance = new ScopeCollector();

+

+			}

+		}

 		return ScopeCollector.instance;

 	}

 

diff --git a/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/validator/ParticipantValidator.java b/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/validator/ParticipantValidator.java
index ddc4a7825df..e592897ece8 100644
--- a/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/validator/ParticipantValidator.java
+++ b/plugins/views/org.eclipse.papyrus.views.search/src/org/eclipse/papyrus/views/search/validator/ParticipantValidator.java
@@ -36,11 +36,11 @@ public class ParticipantValidator implements IParticipantValidator {
 

 	public final static ParticipantValidator getInstance() {

 

-		if(ParticipantValidator.instance == null) {

+		

 			synchronized(ParticipantValidator.class) {

-				if(ParticipantValidator.instance == null) {

-					ParticipantValidator.instance = new ParticipantValidator();

-				}

+			if(ParticipantValidator.instance == null) {

+				ParticipantValidator.instance = new ParticipantValidator();

+

 			}

 		}

 		return ParticipantValidator.instance;

diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/icons/configuration.gif b/plugins/views/properties/org.eclipse.papyrus.views.properties/icons/configuration.gif
new file mode 100644
index 00000000000..0b1be97b8cf
--- /dev/null
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/icons/configuration.gif
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/plugin.xml b/plugins/views/properties/org.eclipse.papyrus.views.properties/plugin.xml
index d77f6d46bcd..196b74c3bfb 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties/plugin.xml
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/plugin.xml
@@ -84,4 +84,72 @@
             class="org.eclipse.papyrus.views.properties.storage.workspace.WorkspaceContextStorageProvider">

       </provider>

    </extension>

+   <extension

+         point="org.eclipse.ui.menus">

+         <menuContribution

+    allPopups="false"

+    locationURI="popup:org.eclipse.ui.popup.any?after=additions">

+	<command

+       commandId="org.eclipse.papyrus.views.properties.deploy"

+       icon="icons/configuration.gif"

+       style="push">

+	    <visibleWhen

+	          checkEnabled="false">

+	       <with

+	             variable="selection">

+	          <iterate

+	                ifEmpty="false"

+	                operator="and">

+	             <adapt

+	                   type="org.eclipse.core.resources.IFile">

+	                <or>

+	                   <test

+	                         property="org.eclipse.core.resources.extension"

+	                         value="ctx">

+	                   </test>

+	                </or>

+	             </adapt>

+	          </iterate>

+	       </with>

+	    </visibleWhen>

+	</command>

+ <command

+       commandId="org.eclipse.papyrus.views.properties.undeploy"

+       icon="icons/configuration.gif"

+       style="push">

+    <visibleWhen

+          checkEnabled="false">

+       <with

+             variable="selection">

+          <iterate

+                ifEmpty="false"

+                operator="and">

+             <adapt

+                   type="org.eclipse.core.resources.IFile">

+                <or>

+                   <test

+                         property="org.eclipse.core.resources.extension"

+                         value="ctx">

+                   </test>

+                </or>

+             </adapt>

+          </iterate>

+       </with>

+    </visibleWhen>

+ </command>

+</menuContribution>

+   </extension>

+   <extension

+         point="org.eclipse.ui.commands">

+      <command

+            defaultHandler="org.eclipse.papyrus.views.properties.handler.DeployCustomizationHandler"

+            id="org.eclipse.papyrus.views.properties.deploy"

+            name="Deploy properties view configuration">

+      </command>

+      <command

+            defaultHandler="org.eclipse.papyrus.views.properties.handler.UndeployCustomizationHandler"

+            id="org.eclipse.papyrus.views.properties.undeploy"

+            name="Disable properties view configuration">

+      </command>

+   </extension>

 </plugin>

diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/Activator.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/Activator.java
index c84e5b1c0c4..abf146a7087 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/Activator.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/Activator.java
@@ -12,6 +12,10 @@
 package org.eclipse.papyrus.views.properties;

 

 import org.eclipse.core.runtime.IPath;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.core.runtime.IStatus;

+import org.eclipse.core.runtime.Status;

+import org.eclipse.core.runtime.jobs.Job;

 import org.eclipse.jface.resource.ImageRegistry;

 import org.eclipse.papyrus.infra.core.log.LogHelper;

 import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager;

@@ -54,7 +58,18 @@ public class Activator extends AbstractUIPlugin {
 		super.start(context);

 		plugin = this;

 		log = new LogHelper(plugin);

-		ConfigurationManager.init();

+

+		Job startProperties = new Job("Starting Configuration Manager") {

+

+			@Override

+			protected IStatus run(IProgressMonitor monitor) {

+				ConfigurationManager.getInstance();

+				return Status.OK_STATUS;

+			}

+		};

+

+		startProperties.setSystem(true);

+		startProperties.schedule();

 	}

 

 	/**

diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/creation/PropertyEditorFactory.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/creation/PropertyEditorFactory.java
index 8364885ebdb..4e86109ca2b 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/creation/PropertyEditorFactory.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/creation/PropertyEditorFactory.java
@@ -84,7 +84,7 @@ public class PropertyEditorFactory implements ReferenceValueFactory {
 

 		IStructuredSelection selection = new StructuredSelection(source);

 

-		ViewConstraintEngine constraintEngine = ConfigurationManager.instance.constraintEngine;

+		ViewConstraintEngine constraintEngine = ConfigurationManager.getInstance().getConstraintEngine();

 		Set<View> views = constraintEngine.getViews(selection);

 		if(!views.isEmpty()) {

 			EditionDialog dialog = new EditionDialog(widget.getShell(), true);

@@ -130,7 +130,7 @@ public class PropertyEditorFactory implements ReferenceValueFactory {
 	public Object edit(Control widget, Object source) {

 		IStructuredSelection selection = new StructuredSelection(source);

 

-		ViewConstraintEngine constraintEngine = ConfigurationManager.instance.constraintEngine;

+		ViewConstraintEngine constraintEngine = ConfigurationManager.getInstance().getConstraintEngine();

 

 		Set<View> views = constraintEngine.getViews(selection);

 		if(!views.isEmpty()) {

diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/extensions/ContextExtensionPoint.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/extensions/ContextExtensionPoint.java
index 4a4898693f4..09c0732cbee 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/extensions/ContextExtensionPoint.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/extensions/ContextExtensionPoint.java
@@ -49,7 +49,7 @@ public class ContextExtensionPoint {
 				URI uri = URI.createURI("ppe:/context/" + e.getContributor().getName() + "/" + contextResource); //$NON-NLS-1$ //$NON-NLS-2$

 				//URI uri = URI.createPlatformPluginURI(e.getContributor().getName() + "/" + contextResource, true); //$NON-NLS-1$

 

-				ConfigurationManager.instance.addContext(uri, isCustomizable);

+				ConfigurationManager.getInstance().addContext(uri, isCustomizable);

 			} catch (IOException ex) {

 				Activator.log.error("The plugin " + e.getContributor() + " contributed an invalid extension for " + EXTENSION_ID, ex); //$NON-NLS-1$//$NON-NLS-2$

 			} catch (Exception ex) {

diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/extensions/EnvironmentExtensionPoint.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/extensions/EnvironmentExtensionPoint.java
index c76f07fc5d4..48056b38d54 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/extensions/EnvironmentExtensionPoint.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/extensions/EnvironmentExtensionPoint.java
@@ -43,7 +43,7 @@ public class EnvironmentExtensionPoint {
 			URI uri = URI.createURI("ppe:/environment/" + e.getContributor().getName() + "/" + environmentResource); //$NON-NLS-1$ //$NON-NLS-2$

 			//URI uri = URI.createPlatformPluginURI(e.getContributor().getName() + "/" + environmentResource, true); //$NON-NLS-1$

 			try {

-				ConfigurationManager.instance.addEnvironment(uri);

+				ConfigurationManager.getInstance().addEnvironment(uri);

 				ConstraintsManager.instance.addEnvironment(uri); //We also add it to the constraints extension point, which we "extend"

 			} catch (IOException ex) {

 				Activator.log.error("The plugin " + e.getContributor() + " contributed an invalid " + "extension for " + EXTENSION_ID, ex); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$

diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/handler/DeployCustomizationHandler.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/handler/DeployCustomizationHandler.java
new file mode 100644
index 00000000000..b10598d9c88
--- /dev/null
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/handler/DeployCustomizationHandler.java
@@ -0,0 +1,162 @@
+/*****************************************************************************

+ * 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:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.views.properties.handler;

+

+import java.util.Iterator;

+

+import org.eclipse.core.commands.AbstractHandler;

+import org.eclipse.core.commands.ExecutionEvent;

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.commands.IHandler;

+import org.eclipse.core.resources.IFile;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.core.runtime.IStatus;

+import org.eclipse.core.runtime.MultiStatus;

+import org.eclipse.core.runtime.Status;

+import org.eclipse.core.runtime.jobs.IJobChangeEvent;

+import org.eclipse.core.runtime.jobs.Job;

+import org.eclipse.core.runtime.jobs.JobChangeAdapter;

+import org.eclipse.emf.common.util.URI;

+import org.eclipse.jface.dialogs.MessageDialog;

+import org.eclipse.jface.viewers.ISelection;

+import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.papyrus.views.properties.Activator;

+import org.eclipse.papyrus.views.properties.contexts.Context;

+import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager;

+import org.eclipse.swt.widgets.Shell;

+import org.eclipse.ui.handlers.HandlerUtil;

+import org.eclipse.ui.statushandlers.StatusManager;

+

+

+/**

+ * Handles the Deploy Properties View Configuration command

+ * 

+ * Deploys the selected Properties view configuration (*.ctx file) into the current workspace

+ * 

+ * @author Camille Letavernier

+ * 

+ */

+public class DeployCustomizationHandler extends AbstractHandler implements IHandler {

+

+	public Object execute(ExecutionEvent event) throws ExecutionException {

+		ISelection currentSelection = HandlerUtil.getCurrentSelection(event);

+		if(!(currentSelection instanceof IStructuredSelection) || currentSelection.isEmpty()) {

+			return null;

+		}

+

+		final IStructuredSelection selection = (IStructuredSelection)currentSelection;

+

+		final Shell activeShell = HandlerUtil.getActiveShell(event);

+

+		Job job = new Job("Deploy properties view configuration") {

+

+			@Override

+			protected IStatus run(IProgressMonitor monitor) {

+				monitor.beginTask("Deploying selected configurations", selection.size());

+

+				return doExecute(selection, monitor);

+			}

+		};

+

+		job.addJobChangeListener(new JobChangeAdapter() {

+

+			@Override

+			public void done(final IJobChangeEvent event) {

+				activeShell.getDisplay().asyncExec(new Runnable() {

+

+					public void run() {

+						if(event.getResult().isOK()) {

+							MessageDialog.openInformation(activeShell, "Success", event.getResult().getMessage());

+						} else if(event.getResult().getSeverity() < IStatus.ERROR) { //Errors are already logged

+							StatusManager.getManager().handle(event.getResult(), StatusManager.SHOW);

+						}

+					}

+				});

+			}

+		});

+

+		job.setUser(true);

+		job.schedule();

+

+		return null;

+	}

+

+	protected IStatus doExecute(IStructuredSelection selection, IProgressMonitor monitor) {

+		Iterator<?> selectionIterator = selection.iterator();

+

+		MultiStatus result = new MultiStatus(Activator.PLUGIN_ID, IStatus.OK, "The properties view configuration has been successfully deployed and activated", null);

+

+		while(selectionIterator.hasNext()) {

+			Object selectedElement = selectionIterator.next();

+			if(selectedElement instanceof IAdaptable) {

+				IFile selectedFile = (IFile)((IAdaptable)selectedElement).getAdapter(IFile.class);

+				if(selectedFile == null) {

+					monitor.worked(1);

+					result.add(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The selected element is not a file"));

+					continue;

+				}

+

+				monitor.subTask("Deploy " + selectedFile.getFullPath().removeFileExtension().lastSegment());

+

+				URI emfURI = null;

+				if(selectedFile.getFullPath() != null) {

+					emfURI = URI.createPlatformResourceURI(selectedFile.getFullPath().toString(), true);

+				} else if(selectedFile.getRawLocation() != null) {

+					emfURI = URI.createFileURI(selectedFile.getRawLocation().toString());

+				}

+

+				if(emfURI == null) {

+					monitor.worked(1);

+					result.add(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The selected element is not a valid properties view configuration"));

+					continue;

+				}

+

+				try {

+					Context context = ConfigurationManager.getInstance().getContext(emfURI);

+					if(context == null) {

+						monitor.worked(1);

+						result.add(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "The selected element doesn't contain a valid Properties view configuration"));

+						continue;

+					}

+

+					if(ConfigurationManager.getInstance().getContexts().contains(context)) {

+						monitor.worked(1);

+						result.add(new Status(IStatus.WARNING, Activator.PLUGIN_ID, "The selected configuration is already deployed"));

+						continue;

+					}

+

+					ConfigurationManager.getInstance().addContext(context, true, true);

+				} catch (Exception ex) {

+					result.add(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "An error occurred during the deployment", ex));

+					monitor.worked(1);

+					continue;

+				}

+

+				monitor.worked(1);

+				result.add(new Status(IStatus.OK, Activator.PLUGIN_ID, "The properties view configuration has been successfully deployed and activated"));

+			}

+		}

+

+		if(result.getChildren().length == 1) {

+			return result.getChildren()[0];

+		} else { //Merge the result and specify an appropriate message based on the result

+			if(result.isOK()) {

+				return result;

+			} else {

+				MultiStatus actualResult = new MultiStatus(Activator.PLUGIN_ID, result.getCode(), "Some errors occurred during the deployment", result.getException());

+				actualResult.merge(result);

+				return actualResult;

+			}

+		}

+	}

+}

diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/handler/UndeployCustomizationHandler.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/handler/UndeployCustomizationHandler.java
new file mode 100644
index 00000000000..c2532cbece2
--- /dev/null
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/handler/UndeployCustomizationHandler.java
@@ -0,0 +1,149 @@
+/*****************************************************************************

+ * 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:

+ *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.views.properties.handler;

+

+import java.util.Iterator;

+

+import org.eclipse.core.commands.AbstractHandler;

+import org.eclipse.core.commands.ExecutionEvent;

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.commands.IHandler;

+import org.eclipse.core.resources.IFile;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.core.runtime.IStatus;

+import org.eclipse.core.runtime.Status;

+import org.eclipse.core.runtime.jobs.IJobChangeEvent;

+import org.eclipse.core.runtime.jobs.Job;

+import org.eclipse.core.runtime.jobs.JobChangeAdapter;

+import org.eclipse.emf.common.util.URI;

+import org.eclipse.emf.ecore.util.EcoreUtil;

+import org.eclipse.jface.dialogs.MessageDialog;

+import org.eclipse.jface.viewers.ISelection;

+import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.papyrus.views.properties.Activator;

+import org.eclipse.papyrus.views.properties.contexts.Context;

+import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager;

+import org.eclipse.swt.widgets.Shell;

+import org.eclipse.ui.handlers.HandlerUtil;

+

+

+public class UndeployCustomizationHandler extends AbstractHandler implements IHandler {

+

+	public Object execute(ExecutionEvent event) throws ExecutionException {

+

+		ISelection currentSelection = HandlerUtil.getCurrentSelection(event);

+		if(!(currentSelection instanceof IStructuredSelection) || currentSelection.isEmpty()) {

+			return null;

+		}

+

+		final IStructuredSelection selection = (IStructuredSelection)currentSelection;

+

+		final Shell activeShell = HandlerUtil.getActiveShell(event);

+

+

+		Job undeploy = new Job("Disabling properties view configuration") {

+

+			@Override

+			protected IStatus run(IProgressMonitor monitor) {

+				IStatus result = doExecute(selection, monitor);

+				if(result.isOK()) {

+					monitor.subTask("Refreshing properties view configuration");

+					ConfigurationManager.getInstance().update();

+				}

+				return result;

+			};

+

+		};

+

+		undeploy.addJobChangeListener(new JobChangeAdapter() {

+

+			@Override

+			public void done(final IJobChangeEvent event) {

+				activeShell.getDisplay().asyncExec(new Runnable() {

+

+					public void run() {

+						if(event.getResult().isOK()) {

+							MessageDialog.openInformation(activeShell, "Success", event.getResult().getMessage());

+						} else {

+							MessageDialog.openWarning(activeShell, "Error", event.getResult().getMessage());

+						}

+					}

+				});

+			}

+		});

+

+

+		undeploy.setUser(true);

+		undeploy.schedule();

+

+		return null;

+	}

+

+	protected IStatus doExecute(IStructuredSelection selection, IProgressMonitor monitor) {

+		Iterator<?> selectionIterator = selection.iterator();

+

+		//Update is a long running task. Do it only once, in a job, at the end of the action.

+		boolean needsUpdate = false;

+

+		monitor.beginTask("Disabling configurations", selection.size());

+

+		while(selectionIterator.hasNext()) {

+			Object selectedElement = selectionIterator.next();

+			if(selectedElement instanceof IAdaptable) {

+				IFile selectedFile = (IFile)((IAdaptable)selectedElement).getAdapter(IFile.class);

+				if(selectedFile == null) {

+					monitor.worked(1);

+					continue;

+				}

+

+				monitor.subTask("Disable " + selectedFile.getFullPath().removeFileExtension().lastSegment());

+

+				URI emfURI = null;

+				if(selectedFile.getFullPath() != null) {

+					emfURI = URI.createPlatformResourceURI(selectedFile.getFullPath().toString(), true);

+				} else if(selectedFile.getRawLocation() != null) {

+					emfURI = URI.createFileURI(selectedFile.getRawLocation().toString());

+				}

+

+				if(emfURI == null) {

+					monitor.worked(1);

+					continue;

+				}

+

+				try {

+

+					for(Context deployedContext : ConfigurationManager.getInstance().getContexts()) {

+						if(ConfigurationManager.getInstance().isCustomizable(deployedContext)) { //Should always be true

+							if(EcoreUtil.getURI(deployedContext).trimFragment().equals(emfURI)) {

+								ConfigurationManager.getInstance().deleteContext(deployedContext, false);

+								needsUpdate = true;

+								break;

+							}

+						}

+					}

+

+					monitor.worked(1);

+				} catch (Exception ex) {

+					Activator.log.error(ex);

+				}

+			}

+		}

+

+		if(needsUpdate) {

+			return new Status(IStatus.OK, Activator.PLUGIN_ID, "The selected properties view configuration has been successfully disabled");

+		} else {

+			return new Status(IStatus.WARNING, Activator.PLUGIN_ID, "The selected properties view configuration is not deployed");

+		}

+	}

+

+}

diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/preferences/Preferences.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/preferences/Preferences.java
index 3f154ceeec6..914f64dde69 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/preferences/Preferences.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/preferences/Preferences.java
@@ -59,7 +59,7 @@ public class Preferences extends PreferencePage implements IWorkbenchPreferenceP
 		Label label = new Label(self, SWT.NONE);

 		label.setText(Messages.Preferences_Contexts);

 

-		final ConfigurationManager configurationManager = ConfigurationManager.instance;

+		final ConfigurationManager configurationManager = ConfigurationManager.getInstance();

 

 		contextState.init();

 

@@ -106,8 +106,8 @@ public class Preferences extends PreferencePage implements IWorkbenchPreferenceP
 

 	@Override

 	public void performDefaults() {

-		for(Context context : ConfigurationManager.instance.getContexts()) {

-			boolean applied = ConfigurationManager.instance.isPlugin(context);

+		for(Context context : ConfigurationManager.getInstance().getContexts()) {

+			boolean applied = ConfigurationManager.getInstance().isPlugin(context);

 			Button checkbox = checkboxes.get(context);

 			if(checkbox != null) {

 				checkbox.setSelection(applied);

@@ -120,9 +120,9 @@ public class Preferences extends PreferencePage implements IWorkbenchPreferenceP
 	private String getLabel(Context context) {

 		String qualifier;

 

-		if(ConfigurationManager.instance.isPlugin(context)) {

+		if(ConfigurationManager.getInstance().isPlugin(context)) {

 			qualifier = Messages.Preferences_Plugin;

-		} else if(ConfigurationManager.instance.isMissing(context)) {

+		} else if(ConfigurationManager.getInstance().isMissing(context)) {

 			qualifier = "missing";

 		} else {

 			qualifier = Messages.Preferences_Custom;

@@ -152,15 +152,15 @@ public class Preferences extends PreferencePage implements IWorkbenchPreferenceP
 		public boolean saveContext() {

 			for(Entry<Context, Boolean> entry : contexts.entrySet()) {

 				if(entry.getValue()) {

-					ConfigurationManager.instance.enableContext(entry.getKey(), false);

+					ConfigurationManager.getInstance().enableContext(entry.getKey(), false);

 				} else {

-					ConfigurationManager.instance.disableContext(entry.getKey(), false);

+					ConfigurationManager.getInstance().disableContext(entry.getKey(), false);

 				}

 			}

 

-			ConfigurationManager.instance.update();

+			ConfigurationManager.getInstance().update();

 

-			Collection<ConfigurationConflict> conflicts = ConfigurationManager.instance.checkConflicts();

+			Collection<ConfigurationConflict> conflicts = ConfigurationManager.getInstance().checkConflicts();

 

 			if(changeOccured && !conflicts.isEmpty()) {

 				String errorMessage = Messages.Preferences_ConflictWarning1;

diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/ConfigurationManager.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/ConfigurationManager.java
index 9ee9e8cb4d3..154f36814fa 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/ConfigurationManager.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/ConfigurationManager.java
@@ -110,12 +110,21 @@ public class ConfigurationManager {
 	/**

 	 * The global constraint engine

 	 */

-	public ViewConstraintEngine constraintEngine;

+	private ViewConstraintEngine constraintEngine;

 

 	/**

 	 * The singleton instance

 	 */

-	public final static ConfigurationManager instance = new ConfigurationManager();

+	private final static ConfigurationManager instance = new ConfigurationManager();

+

+	public static ConfigurationManager getInstance() {

+		synchronized(instance) {

+			if(!instance.started) {

+				instance.start();

+			}

+		}

+		return instance;

+	}

 

 	private ConfigurationManager() {

 		constraintEngine = new ViewConstraintEngineImpl();

@@ -140,10 +149,10 @@ public class ConfigurationManager {
 		new EnvironmentExtensionPoint();

 

 		loadCustomContexts();

-		

+

 		// now that we have loaded the custom contexts, we can migrate the preferences from a

 		// previous version (if required)

-		if (new PreferencesMigrator(this).process(preferences)) {

+		if(new PreferencesMigrator(this).process(preferences)) {

 			savePreferences();

 		}

 	}

@@ -204,7 +213,7 @@ public class ConfigurationManager {
 

 				public void contextsAdded(Collection<? extends Context> contexts) {

 					List<Context> appliedContexts = new java.util.ArrayList<Context>(contexts.size());

-					

+

 					for(Context next : contexts) {

 						boolean applied = findDescriptor(next).isApplied();

 

@@ -214,15 +223,15 @@ public class ConfigurationManager {
 							appliedContexts.add(next);

 						}

 					}

-					

-					if (!appliedContexts.isEmpty()) {

+

+					if(!appliedContexts.isEmpty()) {

 						notifyContextChanges(appliedContexts, ContextEventType.ADDED);

 					}

 				}

 

 				public void contextsChanged(Collection<? extends Context> contexts) {

 					List<Context> appliedContexts = new java.util.ArrayList<Context>(contexts.size());

-					

+

 					for(Context next : contexts) {

 						boolean applied = findDescriptor(next).isApplied();

 

@@ -232,15 +241,15 @@ public class ConfigurationManager {
 							appliedContexts.add(next);

 						}

 					}

-					

-					if (!appliedContexts.isEmpty()) {

+

+					if(!appliedContexts.isEmpty()) {

 						notifyContextChanges(appliedContexts, ContextEventType.CHANGED);

 					}

 				}

 

 				public void contextsRemoved(Collection<? extends Context> contexts) {

 					List<Context> appliedContexts = new java.util.ArrayList<Context>(contexts.size());

-					

+

 					for(Context next : contexts) {

 						boolean wasApplied = findDescriptor(next).isApplied();

 

@@ -252,8 +261,8 @@ public class ConfigurationManager {
 							appliedContexts.add(next);

 						}

 					}

-					

-					if (!appliedContexts.isEmpty()) {

+

+					if(!appliedContexts.isEmpty()) {

 						notifyContextChanges(appliedContexts, ContextEventType.REMOVED);

 					}

 				}

@@ -262,23 +271,23 @@ public class ConfigurationManager {
 

 		return contextStorageProviderListener;

 	}

-	

+

 	private void notifyContextChanges(Collection<Context> contexts, IContextStorageProviderListener.ContextEventType eventType) {

-		if (contexts.size() == 0) {

+		if(contexts.size() == 0) {

 			throw new IllegalArgumentException("Empty contexts collection");

 		}

-		

+

 		StringBuilder list = new StringBuilder();

 		Iterator<Context> iter = contexts.iterator();

-		if (contexts.size() > 1) {

+		if(contexts.size() > 1) {

 			list.append("\n");

 		}

 		list.append(iter.next().getName());

-		while (iter.hasNext()) {

+		while(iter.hasNext()) {

 			list.append("\n");

 			list.append(iter.next().getName());

 		}

-		

+

 		String pattern;

 		switch(eventType) {

 		case ADDED:

@@ -292,7 +301,7 @@ public class ConfigurationManager {
 			break;

 		}

 		final String message = NLS.bind(pattern, list);

-		

+

 		Display.getDefault().asyncExec(new Runnable() {

 

 			public void run() {

@@ -362,16 +371,18 @@ public class ConfigurationManager {
 			// is based on this context

 			@SuppressWarnings("serial")

 			EcoreUtil.CrossReferencer xrefs = new EcoreUtil.CrossReferencer(preferences) {

+

 				{

 					crossReference();

 					done();

 				}

+

 				@Override

 				protected boolean crossReference(EObject eObject, EReference eReference, EObject crossReferencedEObject) {

 					return eReference == PreferencesPackage.Literals.CONTEXT_DESCRIPTOR__PROTOTYPE;

 				}

 			};

-			

+

 			// breadth-first search for a copied context that is enabled but missing, where

 			// no other traceable copy is enabled and accessible

 			Queue<ContextDescriptor> queue = new java.util.LinkedList<ContextDescriptor>();

@@ -507,7 +518,7 @@ public class ConfigurationManager {
 			}

 		}

 	}

-	

+

 	/**

 	 * Programmatically register a new context to this ConfigurationManager.

 	 * Most of the time, new contexts should be registered through {@link ContextExtensionPoint}.

@@ -523,24 +534,30 @@ public class ConfigurationManager {
 	 * @see ConfigurationManager#addContext(URI)

 	 */

 	public void addContext(Context context, boolean apply, boolean isCustomizable) {

+

+		URI contextURI = EcoreUtil.getURI(context);

+		if(contexts.containsKey(contextURI)) {

+			throw new IllegalArgumentException("This properties view configuration is already deployed");

+		}

+

 		customizableContexts.put(context, isCustomizable);

-		contexts.put(EcoreUtil.getURI(context), context);

+		contexts.put(contextURI, context);

 

 		updatePrototype(context);

-		

+

 		ContextDescriptor desc = findDescriptor(context);

-		if (desc.isDeleted()) {

+		if(desc.isDeleted()) {

 			desc.setDeleted(false); // can't be deleted any longer

 			savePreferences();

 		}

-		

+

 		//If the context is not customizable, then it must always be applied

 		if(apply || !isCustomizable) {

 			enableContext(context, true);

 		} else {

 			disableContext(context, true);

 		}

-		

+

 		// as we have added a new context, it may be an applied copy of some

 		// other context that was implicitly enabled because of the missing copy

 		reconcileEnabledContexts();

@@ -569,10 +586,10 @@ public class ConfigurationManager {
 	public void disableContext(Context context, boolean update) {

 		disableContext(context, update, true);

 	}

-	

+

 	private void disableContext(Context context, boolean updateEngine, boolean updatePreferences) {

 		final boolean missing = isMissing(context);

-		

+

 		if(!missing && !isCustomizable(context)) {

 			throw new IllegalStateException("Non-customizable contexts cannot be disabled. Trying to disable " + context.getName());

 		}

@@ -609,14 +626,14 @@ public class ConfigurationManager {
 	public void enableContext(Context context, boolean update) {

 		enableContext(context, update, true);

 	}

-	

+

 	private void enableContext(Context context, boolean updateEngine, boolean updatePreferences) {

 		final boolean missing = isMissing(context);

-		

-		if (!missing) {

+

+		if(!missing) {

 			enabledContexts.add(context);

 		}

-		

+

 		//Update the preferences if requested

 		ContextDescriptor descriptor = findDescriptor(context);

 		if(updatePreferences && !descriptor.isApplied()) {

@@ -644,12 +661,13 @@ public class ConfigurationManager {
 		boolean result = !isMissing(context) && contextStorageRegistry.getStorageProvider(context) == IContextStorageProvider.NULL;

 		return result;

 	}

-	

+

 	/**

-	 * Queries whether the specified {@code context} is a proxy for a missing context.  That is a

+	 * Queries whether the specified {@code context} is a proxy for a missing context. That is a

 	 * context that is expected to exist but is (temporarily) unavailable.

 	 * 

-	 * @param context a context

+	 * @param context

+	 *        a context

 	 * @return whether it represents a missing context

 	 */

 	public boolean isMissing(Context context) {

@@ -754,7 +772,7 @@ public class ConfigurationManager {
 		}

 		return result;

 	}

-	

+

 	/**

 	 * Obtains proxies (not the EMF kind) for all contexts that the system knows about

 	 * but are currently unavailable.

@@ -763,15 +781,15 @@ public class ConfigurationManager {
 	 */

 	public Collection<Context> getMissingContexts() {

 		List<Context> result = new java.util.ArrayList<Context>();

-		

-		for (ContextDescriptor next : preferences.getContexts()) {

-			if (!next.isDeleted() && (getContext(next.getName()) == null)) {

+

+		for(ContextDescriptor next : preferences.getContexts()) {

+			if(!next.isDeleted() && (getContext(next.getName()) == null)) {

 				Context missing = ContextsFactory.eINSTANCE.createContext();

 				missing.setName(next.getName());

 				result.add(missing);

 			}

 		}

-		

+

 		return result;

 	}

 

@@ -899,23 +917,38 @@ public class ConfigurationManager {
 	 *        The context to delete

 	 */

 	public void deleteContext(Context context) {

-		findDescriptor(context).setDeleted(true); // explicitly deleted (not missing)

 		deleteContext(context, true);

 	}

-	

-	private void deleteContext(Context context, boolean updatePreferences) {

+

+	/**

+	 * Disable, then unregisters a Context. The Context won't be available anymore in the framework

+	 * (not even in the Preferences page). This method <strong>won't</strong> delete the context's files

+	 * on the file system.

+	 * 

+	 * @param context

+	 *        The context to delete

+	 * @param updateEngine

+	 *        If set to true, the ConstraintEngine will be updated.

+	 *        If set to false, you will need to call {@link #update()} manually

+	 */

+	public void deleteContext(Context context, boolean updateEngine) {

+		findDescriptor(context).setDeleted(true); // explicitly deleted (not missing)

+		deleteContext(context, updateEngine, true);

+	}

+

+	private void deleteContext(Context context, boolean updateEngine, boolean updatePreferences) {

 		if(!isCustomizable(context)) {

 			throw new IllegalStateException("Non-customizable contexts cannot be deleted. Trying to delete " + context.getName());

 		}

 

 		Resource resource = context.eResource();

 		contexts.remove(EcoreUtil.getURI(context));

-		disableContext(context, true, updatePreferences);

+		disableContext(context, updateEngine, updatePreferences);

 		root.getContexts().remove(context);

 

 		resource.unload();

 		resourceSet.getResources().remove(resource);

-		

+

 		// as we have deleted this context, it may have been a copy of

 		// some other context that now should be implicitly enabled

 		reconcileEnabledContexts();

@@ -923,13 +956,13 @@ public class ConfigurationManager {
 

 	private boolean reconcileEnabledContexts() {

 		boolean result = false;

-		

-		for (Context next : contexts.values()) {

-			if (!next.eIsProxy()) {

+

+		for(Context next : contexts.values()) {

+			if(!next.eIsProxy()) {

 				boolean isApplied = isApplied(next);

-				if (isApplied != enabledContexts.contains(next)) {

+				if(isApplied != enabledContexts.contains(next)) {

 					// it is implicitly enabled?

-					if (isApplied) {

+					if(isApplied) {

 						result = enabledContexts.add(next) || result;

 					} else {

 						result = enabledContexts.remove(next) || result;

@@ -937,19 +970,12 @@ public class ConfigurationManager {
 				}

 			}

 		}

-		

-		if (result) {

+

+		if(result) {

 			update(); // update the engine

 		}

-		

-		return result;

-	}

 

-	/**

-	 * Initializes the ConfigurationManager instance. This method should be called only once

-	 */

-	public static void init() {

-		instance.start();

+		return result;

 	}

 

 	/**

@@ -1049,12 +1075,12 @@ public class ConfigurationManager {
 

 	public boolean isCustomizable(Context propertyViewConfiguration) {

 

-		if (isMissing(propertyViewConfiguration)) {

+		if(isMissing(propertyViewConfiguration)) {

 			// missing contexts are implicitly customizable.  Only customizable

 			// contexts can go missing in the first place

 			return true;

 		}

-		

+

 		if(customizableContexts.containsKey(propertyViewConfiguration)) {

 			return customizableContexts.get(propertyViewConfiguration);

 		}

@@ -1064,4 +1090,8 @@ public class ConfigurationManager {
 		//disable customization tools for this one...

 		return false;

 	}

+

+	public ViewConstraintEngine getConstraintEngine() {

+		return constraintEngine;

+	}

 }

diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/DefaultDisplayEngine.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/DefaultDisplayEngine.java
index 3aef1916d67..3e90438af7b 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/DefaultDisplayEngine.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/DefaultDisplayEngine.java
@@ -206,7 +206,7 @@ public class DefaultDisplayEngine implements DisplayEngine {
 		EObject tab = section.eContainer();

 		Context context = (Context)tab.eContainer();

 		if(context.eResource() == null) {

-			context = ConfigurationManager.instance.getContext(context.getName());

+			context = ConfigurationManager.getInstance().getContext(context.getName());

 			Activator.log.warn("No resource for Context : " + context + " ; refreshing the model"); //$NON-NLS-1$ //$NON-NLS-2$

 		}

 

diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/ViewConstraintEngineImpl.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/ViewConstraintEngineImpl.java
index 0da14628b8f..1dd6e927198 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/ViewConstraintEngineImpl.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/runtime/ViewConstraintEngineImpl.java
@@ -28,9 +28,9 @@ import org.eclipse.papyrus.views.properties.contexts.View;
 public class ViewConstraintEngineImpl extends DefaultConstraintEngine<View> implements ViewConstraintEngine {

 

 	@Override

-	public void refresh() {

+	public synchronized void refresh() {

 		constraints.clear();

-		Collection<Context> contexts = ConfigurationManager.instance.getEnabledContexts();

+		Collection<Context> contexts = ConfigurationManager.getInstance().getEnabledContexts();

 		for(Context context : contexts) {

 			addContext(context);

 		}

diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/widgets/AbstractPropertyEditor.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/widgets/AbstractPropertyEditor.java
index ed7f32b4195..c222cc5b896 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/widgets/AbstractPropertyEditor.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/widgets/AbstractPropertyEditor.java
@@ -344,7 +344,7 @@ public abstract class AbstractPropertyEditor implements IChangeListener, Customi
 			return null;

 		}

 		Context context = getContext();

-		return ConfigurationManager.instance.getProperty(propertyPath, context);

+		return ConfigurationManager.getInstance().getProperty(propertyPath, context);

 	}

 

 	private Context getContext() {

diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/widgets/MultiReferenceEditorWithPropertyView.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/widgets/MultiReferenceEditorWithPropertyView.java
index 2de25ba451b..4ecdc462e35 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/widgets/MultiReferenceEditorWithPropertyView.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/widgets/MultiReferenceEditorWithPropertyView.java
@@ -130,7 +130,7 @@ public class MultiReferenceEditorWithPropertyView extends AbstractListEditor imp
 	public void selectionChanged(SelectionChangedEvent event) {

 		ISelection selection = event.getSelection();

 

-		Set<View> views = ConfigurationManager.instance.constraintEngine.getViews(selection);

+		Set<View> views = ConfigurationManager.getInstance().getConstraintEngine().getViews(selection);

 		displayEngine.display(views, propertiesComposite, selection, SWT.NONE);

 		this.layout();

 		propertiesComposite.layout();

diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/widgets/ViewEditor.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/widgets/ViewEditor.java
index e4d5c3bd02f..e1d03005da8 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/widgets/ViewEditor.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/widgets/ViewEditor.java
@@ -116,7 +116,7 @@ public class ViewEditor extends AbstractPropertyEditor {
 	private View resolveView() {

 		String contextName = viewPath.substring(0, viewPath.indexOf(":")); //$NON-NLS-1$

 		String viewName = viewPath.substring(viewPath.indexOf(":") + 1); //$NON-NLS-1$

-		Context context = ConfigurationManager.instance.getContext(contextName);

+		Context context = ConfigurationManager.getInstance().getContext(contextName);

 		for(View view : context.getViews()) {

 			if(view.getName().equals(viewName)) {

 				return view;

diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/xwt/XWTTabDescriptorProvider.java b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/xwt/XWTTabDescriptorProvider.java
index 9e618d63056..d2aa3ccc120 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/xwt/XWTTabDescriptorProvider.java
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/src/org/eclipse/papyrus/views/properties/xwt/XWTTabDescriptorProvider.java
@@ -100,7 +100,7 @@ public class XWTTabDescriptorProvider implements ITabDescriptorProvider {
 			this.previousSelection = selection;

 			this.previousPart = part;

 

-			ViewConstraintEngine constraintEngine = ConfigurationManager.instance.constraintEngine;

+			ViewConstraintEngine constraintEngine = ConfigurationManager.getInstance().getConstraintEngine();

 

 			List<ITabDescriptor> descriptors = new LinkedList<ITabDescriptor>();

 

diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly-tests/build.rmap b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly-tests/build.rmap
index b044c80f8d3..f1513e1d164 100644
--- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly-tests/build.rmap
+++ b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly-tests/build.rmap
@@ -48,6 +48,14 @@
       </rm:uri>

     </rm:provider>

     

+      <!-- tablemigration -->

+    <rm:provider componentTypes="osgi.bundle" readerType="local">

+      <rm:uri format="{0}/extraplugins/tablemigration/{1}">

+        <bc:propertyRef key="local.repository"/>

+        <bc:propertyRef key="buckminster.component"/>

+      </rm:uri>

+    </rm:provider>

+    

     <rm:provider componentTypes="osgi.bundle" readerType="local">

       <rm:uri format="{0}/tests/junit/extraplugins/{1}">

         <bc:propertyRef key="local.repository"/>

@@ -142,7 +150,7 @@
     <!-- M2M ATL -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("M2M ATL",0) -->

-      <rm:uri format="{0}/mmt/atl/updates/milestones/3.4/">

+      <rm:uri format="{0}/mmt/atl/updates/milestones/3.5/">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -150,7 +158,7 @@
     <!-- EMFT MWE -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("EMFT MWE",0) -->

-      <rm:uri format="{0}/modeling/emft/mwe/updates/milestones/S201311120431/mwe">

+      <rm:uri format="{0}/modeling/emft/mwe/updates/releases/R201312110307/mwe">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -158,7 +166,7 @@
     <!-- M2M QVT-OML -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("QVT Operational",0) -->

-      <rm:uri format="{0}/mmt/qvto/updates/milestones/3.4.0/S201310010741">

+      <rm:uri format="{0}/mmt/qvto/updates/milestones/3.4.0/S201312170057">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -166,7 +174,7 @@
     <!-- M2T Acceleo -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("M2T ACCELEO",0) -->

-      <rm:uri format="{0}/modeling/m2t/acceleo/updates/milestones/3.4/S201310011247">

+      <rm:uri format="{0}/modeling/m2t/acceleo/updates/milestones/3.5/S201312161520">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -174,7 +182,7 @@
     <!-- MDT OCL -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("MDT OCL 4.2",0) -->

-      <rm:uri format="{0}/modeling/mdt/ocl/updates/milestones/4.2.0/S201311111846">

+      <rm:uri format="{0}/modeling/mdt/ocl/updates/milestones/4.2.0/S201312151125">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -182,7 +190,7 @@
     <!-- EMF Facet -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("EMF Facet",0) -->

-  <rm:uri format="{0}/facet/updates/integration/0.4.0/I201311091044/">

+  <rm:uri format="{0}/facet/updates/integration/0.4.0/I201312171230/">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>    

@@ -190,7 +198,7 @@
     <!-- MoDisco -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("MoDisco",0) -->

-      <rm:uri format="{0}/modeling/mdt/modisco/updates/integration/0.12.0/I201311091050/">

+      <rm:uri format="{0}/modeling/mdt/modisco/updates/integration/0.12.0/I201312170811/">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>    

@@ -214,7 +222,7 @@
     <!-- M2T Xpand -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("M2T XPAND",0) -->

-      <rm:uri format="{0}/modeling/m2t/xpand/updates/milestones/S201311120517/">

+      <rm:uri format="{0}/modeling/m2t/xpand/updates/milestones/S201312170329/">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -222,7 +230,7 @@
     <!-- TMF Xtext, Xtend -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("TMF Xtext, Tools Xtend",0) -->

-      <rm:uri format="{0}/modeling/tmf/xtext/updates/milestones/head/S201311121244/">

+      <rm:uri format="{0}/modeling/tmf/xtext/updates/releases/head/R201312110906/">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -238,7 +246,7 @@
     <!-- EMF Compare -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("EMF COMPARE",0) -->

-      <rm:uri format="{0}/modeling/emf/compare/updates/milestones/2.2/S201310020659">

+      <rm:uri format="{0}/modeling/emf/compare/updates/milestones/2.2/S201312170800">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -246,11 +254,11 @@
     <!-- EMF Transaction, EMF Validation -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("EMF TRANSACTION",0) -->

-      <rm:uri format="{0}/modeling/emf/transaction/updates/releases">

+      <rm:uri format="{0}/modeling/emf/transaction/updates/milestones">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

       <!-- updateFrom("EMF VALIDATION",0) -->

-      <rm:uri format="{0}/modeling/emf/validation/updates/releases">

+      <rm:uri format="{0}/modeling/emf/validation/updates/milestones">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -266,7 +274,7 @@
     <!-- GMP -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("GMF Runtime",0) -->

-      <rm:uri format="{0}/modeling/gmp/gmf-runtime/updates/releases">

+      <rm:uri format="{0}/modeling/gmp/gmf-runtime/updates/milestones">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -274,7 +282,7 @@
     <!-- GMF Notation -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("GMF Notation",0) -->

-      <rm:uri format="{0}/modeling/gmp/gmf-notation/updates/releases">

+      <rm:uri format="{0}/modeling/gmp/gmf-notation/updates/milestones">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -290,7 +298,7 @@
     <!-- Subversive -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("Subversive",0) -->

-      <rm:uri format="{0}/technology/subversive/1.1/luna-site/">

+      <rm:uri format="{0}/technology/subversive/2.0/luna-site/">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -298,7 +306,7 @@
     <!-- WST -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("WebTools",0) -->

-      <rm:uri format="{0}/webtools/downloads/drops/R3.6.0/S-3.6.0M3-20131111173244/repository/">

+      <rm:uri format="{0}/webtools/downloads/drops/R3.6.0/S-3.6.0M4-20131217131919/repository/">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -314,7 +322,7 @@
     <!-- Eclipse Platform Milestones -->

 	<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

 		<!-- updateFrom("Eclipse",0) -->

-		<rm:uri format="{0}/eclipse/updates/4.4milestones/S-4.4M3-201310302000/">

+		<rm:uri format="{0}/eclipse/updates/4.4milestones/S-4.4M4-201312121600/">

 			<bc:propertyRef key="eclipse.downloads"/>

 		</rm:uri>

 	</rm:provider>

diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly/build.rmap b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly/build.rmap
index a896a4b5072..03de5099ef9 100644
--- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly/build.rmap
+++ b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly/build.rmap
@@ -34,6 +34,14 @@
       </rm:uri>

     </rm:provider>

     

+    <!-- tablemigration -->

+    <rm:provider componentTypes="osgi.bundle" readerType="local">

+      <rm:uri format="{0}/extraplugins/tablemigration/{1}">

+        <bc:propertyRef key="local.repository"/>

+        <bc:propertyRef key="buckminster.component"/>

+      </rm:uri>

+    </rm:provider>

+    

     <!-- dsml-validation -->

     <rm:provider componentTypes="osgi.bundle" readerType="local">

       <rm:uri format="{0}/extraplugins/dsml.validation/{1}">

@@ -256,7 +264,7 @@
     <!-- M2M ATL -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("M2M ATL",0) -->

-      <rm:uri format="{0}/mmt/atl/updates/milestones/3.4/">

+      <rm:uri format="{0}/mmt/atl/updates/milestones/3.5/">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -264,7 +272,7 @@
     <!-- EMFT MWE -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("EMFT MWE",0) -->

-      <rm:uri format="{0}/modeling/emft/mwe/updates/milestones/S201311120431/mwe">

+      <rm:uri format="{0}/modeling/emft/mwe/updates/releases/R201312110307/mwe">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -272,7 +280,7 @@
     <!-- M2M QVT-OML -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("QVT Operational",0) -->

-      <rm:uri format="{0}/mmt/qvto/updates/milestones/3.4.0/S201310010741">

+      <rm:uri format="{0}/mmt/qvto/updates/milestones/3.4.0/S201312170057">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -287,7 +295,7 @@
     <!-- M2T Acceleo -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("M2T ACCELEO",0) -->

-      <rm:uri format="{0}/modeling/m2t/acceleo/updates/milestones/3.4/S201310011247">

+      <rm:uri format="{0}/modeling/m2t/acceleo/updates/milestones/3.5/S201312161520">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -295,7 +303,7 @@
     <!-- MDT OCL -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("MDT OCL 4.2",0) -->

-      <rm:uri format="{0}/modeling/mdt/ocl/updates/milestones/4.2.0/S201311111846">

+      <rm:uri format="{0}/modeling/mdt/ocl/updates/milestones/4.2.0/S201312151125">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -303,7 +311,7 @@
     <!-- EMF Facet -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("EMF Facet",0) -->

-       <rm:uri format="{0}/facet/updates/integration/0.4.0/I201311091044/">

+       <rm:uri format="{0}/facet/updates/integration/0.4.0/I201312171230/">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>    

@@ -311,7 +319,7 @@
     <!-- MoDisco -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("MoDisco",0) -->

-      <rm:uri format="{0}/modeling/mdt/modisco/updates/integration/0.12.0/I201311091050/">

+      <rm:uri format="{0}/modeling/mdt/modisco/updates/integration/0.12.0/I201312170811/">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>    

@@ -335,7 +343,7 @@
     <!-- M2T Xpand -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("M2T XPAND",0) -->

-      <rm:uri format="{0}/modeling/m2t/xpand/updates/milestones/S201311120517/">

+      <rm:uri format="{0}/modeling/m2t/xpand/updates/milestones/S201312170329/">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -343,7 +351,7 @@
     <!-- TMF Xtext, Xtend -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("TMF Xtext, Tools Xtend",0) -->

-      <rm:uri format="{0}/modeling/tmf/xtext/updates/milestones/head/S201311121244/">

+      <rm:uri format="{0}/modeling/tmf/xtext/updates/releases/head/R201312110906/">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -359,7 +367,7 @@
     <!-- EMF Compare -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("EMF COMPARE",0) -->

-       <rm:uri format="{0}/modeling/emf/compare/updates/milestones/2.2/S201310020659">

+       <rm:uri format="{0}/modeling/emf/compare/updates/milestones/2.2/S201312170800">

       <!-- rm:uri format="{0}/modeling/emf/compare/updates/milestones/2.0" -->

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

@@ -369,11 +377,11 @@
     <!-- EMF Transaction, EMF Validation -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("EMF TRANSACTION",0) -->

-      <rm:uri format="{0}/modeling/emf/transaction/updates/releases">

+      <rm:uri format="{0}/modeling/emf/transaction/updates/milestones">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

       <!-- updateFrom("EMF VALIDATION",0) -->

-      <rm:uri format="{0}/modeling/emf/validation/updates/releases">

+      <rm:uri format="{0}/modeling/emf/validation/updates/milestones">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -389,7 +397,7 @@
     <!-- GMP -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("GMF Runtime",0) -->

-      <rm:uri format="{0}/modeling/gmp/gmf-runtime/updates/releases">

+      <rm:uri format="{0}/modeling/gmp/gmf-runtime/updates/milestones">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -397,7 +405,7 @@
     <!-- GMF Notation -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("GMF Notation",0) -->

-      <rm:uri format="{0}/modeling/gmp/gmf-notation/updates/releases">

+      <rm:uri format="{0}/modeling/gmp/gmf-notation/updates/milestones">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -421,7 +429,7 @@
     <!-- Subversive -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("Subversive",0) -->

-      <rm:uri format="{0}/technology/subversive/1.1/luna-site/">

+      <rm:uri format="{0}/technology/subversive/2.0/luna-site/">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -429,7 +437,7 @@
     <!-- WST -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("WebTools",0) -->

-      <rm:uri format="{0}/webtools/downloads/drops/R3.6.0/S-3.6.0M3-20131111173244/repository/">

+      <rm:uri format="{0}/webtools/downloads/drops/R3.6.0/S-3.6.0M4-20131217131919/repository/">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -437,7 +445,7 @@
     <!-- Eclipse Platform Milestones -->

 	<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

 		<!-- updateFrom("Eclipse",0) -->

-		<rm:uri format="{0}/eclipse/updates/4.4milestones/S-4.4M3-201310302000/">

+		<rm:uri format="{0}/eclipse/updates/4.4milestones/S-4.4M4-201312121600/">

 			<bc:propertyRef key="eclipse.downloads"/>

 		</rm:uri>

 	</rm:provider>

@@ -448,6 +456,12 @@
         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

+    

+     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

+      <rm:uri format="{0}/nattable/releases/1.0.1/repository/">

+        <bc:propertyRef key="eclipse.downloads"/>

+      </rm:uri>

+  	  </rm:provider>

 

     <!-- Papyrus Richtext -->

 <!--     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false"> -->

diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly-tests/build.rmap b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly-tests/build.rmap
index b02fbbf7ec4..6ea2922aad9 100644
--- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly-tests/build.rmap
+++ b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly-tests/build.rmap
@@ -200,7 +200,7 @@
     <!-- M2M ATL -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("M2M ATL",0) -->

-      <rm:uri format="{0}/mmt/atl/updates/milestones/3.4/">

+      <rm:uri format="{0}/mmt/atl/updates/milestones/3.5/">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -208,7 +208,7 @@
     <!-- EMFT MWE -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("EMFT MWE",0) -->

-      <rm:uri format="{0}/modeling/emft/mwe/updates/milestones/S201311120431/mwe">

+      <rm:uri format="{0}/modeling/emft/mwe/updates/releases/R201312110307/mwe">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -216,7 +216,7 @@
     <!-- M2M QVT-OML -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("QVT Operational",0) -->

-      <rm:uri format="{0}/mmt/qvto/updates/milestones/3.4.0/S201310010741">

+      <rm:uri format="{0}/mmt/qvto/updates/milestones/3.4.0/S201312170057">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -232,7 +232,7 @@
     <!-- M2T Acceleo -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("M2T ACCELEO",0) -->

-      <rm:uri format="{0}/modeling/m2t/acceleo/updates/milestones/3.4/S201310011247">

+      <rm:uri format="{0}/modeling/m2t/acceleo/updates/milestones/3.5/S201312161520">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -240,7 +240,7 @@
     <!-- MDT OCL -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("MDT OCL 4.2",0) -->

-      <rm:uri format="{0}/modeling/mdt/ocl/updates/milestones/4.2.0/S201311111846">

+      <rm:uri format="{0}/modeling/mdt/ocl/updates/milestones/4.2.0/S201312151125">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -248,7 +248,7 @@
     <!-- EMF Facet -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("EMF Facet",0) -->

-       <rm:uri format="{0}/facet/updates/integration/0.4.0/I201311091044/">

+       <rm:uri format="{0}/facet/updates/integration/0.4.0/I201312171230/">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>    

@@ -256,7 +256,7 @@
     <!-- MoDisco -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("MoDisco",0) -->

-      <rm:uri format="{0}/modeling/mdt/modisco/updates/integration/0.12.0/I201311091050/">

+      <rm:uri format="{0}/modeling/mdt/modisco/updates/integration/0.12.0/I201312170811/">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>    

@@ -280,7 +280,7 @@
     <!-- M2T Xpand -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("M2T XPAND",0) -->

-      <rm:uri format="{0}/modeling/m2t/xpand/updates/milestones/S201311120517/">

+      <rm:uri format="{0}/modeling/m2t/xpand/updates/milestones/S201312170329/">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -288,7 +288,7 @@
     <!-- TMF Xtext, Xtend -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("TMF Xtext, Tools Xtend",0) -->

-      <rm:uri format="{0}/modeling/tmf/xtext/updates/milestones/head/S201311121244/">

+      <rm:uri format="{0}/modeling/tmf/xtext/updates/releases/head/R201312110906/">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -304,7 +304,7 @@
     <!-- EMF Compare -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("EMF COMPARE",0) -->

-      <rm:uri format="{0}/modeling/emf/compare/updates/milestones/2.2/S201310020659">

+      <rm:uri format="{0}/modeling/emf/compare/updates/milestones/2.2/S201312170800">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -312,11 +312,11 @@
     <!-- EMF Transaction, EMF Validation -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("EMF TRANSACTION",0) -->

-      <rm:uri format="{0}/modeling/emf/transaction/updates/releases">

+      <rm:uri format="{0}/modeling/emf/transaction/updates/milestones">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

       <!-- updateFrom("EMF VALIDATION",0) -->

-      <rm:uri format="{0}/modeling/emf/validation/updates/releases">

+      <rm:uri format="{0}/modeling/emf/validation/updates/milestones">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -332,7 +332,7 @@
     <!-- GMP -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("GMF Runtime",0) -->

-      <rm:uri format="{0}/modeling/gmp/gmf-runtime/updates/releases">

+      <rm:uri format="{0}/modeling/gmp/gmf-runtime/updates/milestones">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -340,7 +340,7 @@
     <!-- GMF Notation -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("GMF Notation",0) -->

-      <rm:uri format="{0}/modeling/gmp/gmf-notation/updates/releases">

+      <rm:uri format="{0}/modeling/gmp/gmf-notation/updates/milestones">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -356,7 +356,7 @@
     <!-- Subversive -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("Subversive",0) -->

-      <rm:uri format="{0}/technology/subversive/1.1/luna-site/">

+      <rm:uri format="{0}/technology/subversive/2.0/luna-site/">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -364,7 +364,7 @@
     <!-- WST -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("WebTools",0) -->

-      <rm:uri format="{0}/webtools/downloads/drops/R3.6.0/S-3.6.0M3-20131111173244/repository/">

+      <rm:uri format="{0}/webtools/downloads/drops/R3.6.0/S-3.6.0M4-20131217131919/repository/">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -372,7 +372,7 @@
     <!-- Eclipse Platform Milestones -->

 	<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

 		<!-- updateFrom("Eclipse",0) -->

-		<rm:uri format="{0}/eclipse/updates/4.4milestones/S-4.4M3-201310302000/">

+		<rm:uri format="{0}/eclipse/updates/4.4milestones/S-4.4M4-201312121600/">

 			<bc:propertyRef key="eclipse.downloads"/>

 		</rm:uri>

 	</rm:provider>

diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.rmap b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.rmap
index 30c81a133c2..cc2ff02f6f7 100644
--- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.rmap
+++ b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.rmap
@@ -128,6 +128,13 @@
       </rm:uri>

     </rm:provider>

     

+    <rm:provider componentTypes="osgi.bundle" readerType="local">

+      <rm:uri format="{0}/plugins/infra/gmfdiag/css/{1}">

+        <bc:propertyRef key="local.repository"/>

+        <bc:propertyRef key="buckminster.component"/>

+      </rm:uri>

+    </rm:provider>

+    

     <!-- /INFRA -->

 

     <rm:provider componentTypes="osgi.bundle" readerType="local">

@@ -397,7 +404,7 @@
     <!-- M2M ATL -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("M2M ATL",0) -->

-      <rm:uri format="{0}/mmt/atl/updates/milestones/3.4/">

+      <rm:uri format="{0}/mmt/atl/updates/milestones/3.5/">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -405,7 +412,7 @@
     <!-- EMFT MWE -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("EMFT MWE",0) -->

-      <rm:uri format="{0}/modeling/emft/mwe/updates/milestones/S201311120431/mwe">

+      <rm:uri format="{0}/modeling/emft/mwe/updates/releases/R201312110307/mwe">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -413,7 +420,7 @@
     <!-- M2M QVT-OML -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("QVT Operational",0) -->

-      <rm:uri format="{0}/mmt/qvto/updates/milestones/3.4.0/S201310010741">

+      <rm:uri format="{0}/mmt/qvto/updates/milestones/3.4.0/S201312170057">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -429,7 +436,7 @@
     <!-- M2T Acceleo -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("M2T ACCELEO",0) -->

-      <rm:uri format="{0}/modeling/m2t/acceleo/updates/milestones/3.4/S201310011247">

+      <rm:uri format="{0}/modeling/m2t/acceleo/updates/milestones/3.5/S201312161520">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -437,7 +444,7 @@
     <!-- MDT OCL -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("MDT OCL 4.2",0) -->

-      <rm:uri format="{0}/modeling/mdt/ocl/updates/milestones/4.2.0/S201311111846">

+      <rm:uri format="{0}/modeling/mdt/ocl/updates/milestones/4.2.0/S201312151125">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -445,7 +452,7 @@
     <!-- EMF Facet -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("EMF Facet",0) -->

-      <rm:uri format="{0}/facet/updates/integration/0.4.0/I201311091044/">

+      <rm:uri format="{0}/facet/updates/integration/0.4.0/I201312171230/">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>    

@@ -453,7 +460,7 @@
     <!-- MoDisco -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("MoDisco",0) -->

-      <rm:uri format="{0}/modeling/mdt/modisco/updates/integration/0.12.0/I201311091050/">

+      <rm:uri format="{0}/modeling/mdt/modisco/updates/integration/0.12.0/I201312170811/">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>    

@@ -477,7 +484,7 @@
     <!-- M2T Xpand -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("M2T XPAND",0) -->

-      <rm:uri format="{0}/modeling/m2t/xpand/updates/milestones/S201311120517/">

+      <rm:uri format="{0}/modeling/m2t/xpand/updates/milestones/S201312170329/">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -485,7 +492,7 @@
     <!-- TMF Xtext, Xtend -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("TMF Xtext, Tools Xtend",0) -->

-      <rm:uri format="{0}/modeling/tmf/xtext/updates/milestones/head/S201311121244/">

+      <rm:uri format="{0}/modeling/tmf/xtext/updates/releases/head/R201312110906/">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -501,7 +508,7 @@
     <!-- EMF Compare -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("EMF COMPARE",0) -->

-      <rm:uri format="{0}/modeling/emf/compare/updates/milestones/2.2/S201310020659">

+      <rm:uri format="{0}/modeling/emf/compare/updates/milestones/2.2/S201312170800">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -509,11 +516,11 @@
     <!-- EMF Transaction, EMF Validation -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("EMF TRANSACTION",0) -->

-      <rm:uri format="{0}/modeling/emf/transaction/updates/releases">

+      <rm:uri format="{0}/modeling/emf/transaction/updates/milestones">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

       <!-- updateFrom("EMF VALIDATION",0) -->

-      <rm:uri format="{0}/modeling/emf/validation/updates/releases">

+      <rm:uri format="{0}/modeling/emf/validation/updates/milestones">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -529,7 +536,7 @@
     <!-- GMP -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("GMF Runtime",0) -->

-      <rm:uri format="{0}/modeling/gmp/gmf-runtime/updates/releases">

+      <rm:uri format="{0}/modeling/gmp/gmf-runtime/updates/milestones">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -537,7 +544,7 @@
     <!-- GMF Notation -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("GMF Notation",0) -->

-      <rm:uri format="{0}/modeling/gmp/gmf-notation/updates/releases">

+      <rm:uri format="{0}/modeling/gmp/gmf-notation/updates/milestones">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -553,7 +560,7 @@
     <!-- Subversive -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("Subversive",0) -->

-      <rm:uri format="{0}/technology/subversive/1.1/luna-site/">

+      <rm:uri format="{0}/technology/subversive/2.0/luna-site/">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -561,7 +568,7 @@
     <!-- WST -->

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

       <!-- updateFrom("WebTools",0) -->

-      <rm:uri format="{0}/webtools/downloads/drops/R3.6.0/S-3.6.0M3-20131111173244/repository/">

+      <rm:uri format="{0}/webtools/downloads/drops/R3.6.0/S-3.6.0M4-20131217131919/repository/">

         <bc:propertyRef key="eclipse.downloads"/>

       </rm:uri>

     </rm:provider>

@@ -569,7 +576,7 @@
     <!-- Eclipse Platform Milestones -->

 	<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">

 		<!-- updateFrom("Eclipse",0) -->

-		<rm:uri format="{0}/eclipse/updates/4.4milestones/S-4.4M3-201310302000/">

+		<rm:uri format="{0}/eclipse/updates/4.4milestones/S-4.4M4-201312121600/">

 			<bc:propertyRef key="eclipse.downloads"/>

 		</rm:uri>

 	</rm:provider>

diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.table.feature/.project b/releng/rcp/org.eclipse.papyrus.rcp.feature/.project
index 3f79683aa05..3ceac2f77b2 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.table.feature/.project
+++ b/releng/rcp/org.eclipse.papyrus.rcp.feature/.project
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.infra.table.feature</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.pde.FeatureBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.FeatureNature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.rcp.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.feature/.settings/org.eclipse.m2e.core.prefs b/releng/rcp/org.eclipse.papyrus.rcp.feature/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/releng/rcp/org.eclipse.papyrus.rcp.feature/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.feature/build.properties b/releng/rcp/org.eclipse.papyrus.rcp.feature/build.properties
new file mode 100644
index 00000000000..e11b8a96f0f
--- /dev/null
+++ b/releng/rcp/org.eclipse.papyrus.rcp.feature/build.properties
@@ -0,0 +1,7 @@
+bin.includes = feature.xml,\
+               feature.properties,\
+               license.html
+#root.win32.win32.x86 = win32
+#root.win32.win32.x86_64 = win64
+#root.linux.gtk.x86 = linux32
+#root.linux.gtk.x86_64 = linux64
\ No newline at end of file
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.properties b/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.properties
new file mode 100644
index 00000000000..6695a516cbf
--- /dev/null
+++ b/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.properties
@@ -0,0 +1,132 @@
+

+# "licenseURL" property - URL of the "Feature License"

+# do not translate value - just change to point to a locale-specific HTML page

+licenseURL=license.html

+

+# "license" property - text of the "Feature Update License"

+# should be plain text version of license agreement pointed to be "licenseURL"

+license=\

+Eclipse Foundation Software User Agreement\n\

+February 1, 2011\n\

+\n\

+Usage Of Content\n\

+\n\

+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\

+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\

+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\

+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\

+NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\

+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\

+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\

+OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\

+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\

+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\

+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\

+\n\

+Applicable Licenses\n\

+\n\

+Unless otherwise indicated, all Content made available by the\n\

+Eclipse Foundation is provided to you under the terms and conditions of\n\

+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\

+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\

+For purposes of the EPL, "Program" will mean the Content.\n\

+\n\

+Content includes, but is not limited to, source code, object code,\n\

+documentation and other files maintained in the Eclipse Foundation source code\n\

+repository ("Repository") in software modules ("Modules") and made available\n\

+as downloadable archives ("Downloads").\n\

+\n\

+       - Content may be structured and packaged into modules to facilitate delivering,\n\

+         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\

+         plug-in fragments ("Fragments"), and features ("Features").\n\

+       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\

+         in a directory named "plugins".\n\

+       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\

+         Each Feature may be packaged as a sub-directory in a directory named "features".\n\

+         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\

+         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\

+       - Features may also include other Features ("Included Features"). Within a Feature, files\n\

+         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\

+\n\

+The terms and conditions governing Plug-ins and Fragments should be\n\

+contained in files named "about.html" ("Abouts"). The terms and\n\

+conditions governing Features and Included Features should be contained\n\

+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\

+Licenses may be located in any directory of a Download or Module\n\

+including, but not limited to the following locations:\n\

+\n\

+       - The top-level (root) directory\n\

+       - Plug-in and Fragment directories\n\

+       - Inside Plug-ins and Fragments packaged as JARs\n\

+       - Sub-directories of the directory named "src" of certain Plug-ins\n\

+       - Feature directories\n\

+\n\

+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\

+Provisioning Technology (as defined below), you must agree to a license ("Feature \n\

+Update License") during the installation process. If the Feature contains\n\

+Included Features, the Feature Update License should either provide you\n\

+with the terms and conditions governing the Included Features or inform\n\

+you where you can locate them. Feature Update Licenses may be found in\n\

+the "license" property of files named "feature.properties" found within a Feature.\n\

+Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\

+terms and conditions (or references to such terms and conditions) that\n\

+govern your use of the associated Content in that directory.\n\

+\n\

+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\

+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\

+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\

+\n\

+       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\

+       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\

+       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\

+       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\

+       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\

+       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\

+\n\

+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\

+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\

+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\

+govern that particular Content.\n\

+\n\

+\n\Use of Provisioning Technology\n\

+\n\

+The Eclipse Foundation makes available provisioning software, examples of which include,\n\

+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\

+the purpose of allowing users to install software, documentation, information and/or\n\

+other materials (collectively "Installable Software"). This capability is provided with\n\

+the intent of allowing such users to install, extend and update Eclipse-based products.\n\

+Information about packaging Installable Software is available at\n\

+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\

+\n\

+You may use Provisioning Technology to allow other parties to install Installable Software.\n\

+You shall be responsible for enabling the applicable license agreements relating to the\n\

+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\

+in accordance with the Specification. By using Provisioning Technology in such a manner and\n\

+making it available in accordance with the Specification, you further acknowledge your\n\

+agreement to, and the acquisition of all necessary rights to permit the following:\n\

+\n\

+       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\

+          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\

+          extending or updating the functionality of an Eclipse-based product.\n\

+       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\

+          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\

+       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\

+          govern the use of the Installable Software ("Installable Software Agreement") and such\n\

+          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\

+          with the Specification. Such Installable Software Agreement must inform the user of the\n\

+          terms and conditions that govern the Installable Software and must solicit acceptance by\n\

+          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\

+          indication of agreement by the user, the provisioning Technology will complete installation\n\

+          of the Installable Software.\n\

+\n\

+Cryptography\n\

+\n\

+Content may contain encryption software. The country in which you are\n\

+currently may have restrictions on the import, possession, and use,\n\

+and/or re-export to another country, of encryption software. BEFORE\n\

+using any encryption software, please check the country's laws,\n\

+regulations and policies concerning the import, possession, or use, and\n\

+re-export of encryption software, to see if this is permitted.\n\

+\n\

+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n

+########### end of license property ##########################################

diff --git a/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml b/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml
new file mode 100644
index 00000000000..37af39613b7
--- /dev/null
+++ b/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<feature

+      id="org.eclipse.papyrus.rcp.feature"

+      label="Papyrus RCP Feature"

+      version="1.0.0.qualifier"

+      provider-name="Eclipse Modeling Project">

+

+   <description url="http://www.eclipse.org/papyrus">

+      This package contains Papyrus and a collection of Eclipse Modeling
+Project components, including EMF, GMF, MDT XSD/OCL/UML2, M2M,
+M2T, and EMFT elements. It includes a complete SDK, developer
+tools and source code. Note that the Modeling package includes
+some incubating components, as indicated by feature numbers less
+than 1.0.0 on the feature list.

+   </description>

+

+   <copyright>

+      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

+   </copyright>

+

+   <license url="%licenseURL">

+      %licence

+   </license>

+

+   <url>

+      <discovery label="Luna" url="http://download.eclipse.org/releases/luna/"/>

+      <discovery label="Eclipse Platform 4.4" url="http://download.eclipse.org/eclipse/updates/4.4"/>

+   </url>

+

+   <requires>

+      <import feature="org.eclipse.amalgam.discovery"/>

+      <import feature="org.eclipse.cvs"/>

+      <import feature="org.eclipse.egit"/>

+      <import feature="org.eclipse.egit.import"/>

+      <import feature="org.eclipse.emf.cdo.epp"/>

+      <import feature="org.eclipse.emf.compare.ide.ui.source"/>

+      <import feature="org.eclipse.emf.compare.source"/>

+      <import feature="org.eclipse.emf.ecoretools.design"/>

+      <import feature="org.eclipse.emf.eef.codegen.ecore-feature"/>

+      <import feature="org.eclipse.emf.query.sdk"/>

+      <import feature="org.eclipse.emf.sdk"/>

+      <import feature="org.eclipse.emf.transaction.sdk"/>

+      <import feature="org.eclipse.emf.validation.sdk"/>

+      <import feature="org.eclipse.epp.package.common.feature"/>

+      <import feature="org.eclipse.equinox.p2.user.ui"/>

+      <import feature="org.eclipse.gef.sdk"/>

+      <import feature="org.eclipse.gmf.runtime.sdk"/>

+      <import feature="org.eclipse.help"/>

+      <import feature="org.eclipse.jdt"/>

+      <import feature="org.eclipse.mylyn.bugzilla_feature"/>

+      <import feature="org.eclipse.mylyn.context_feature"/>

+      <import feature="org.eclipse.mylyn.ide_feature"/>

+      <import feature="org.eclipse.mylyn.java_feature"/>

+      <import feature="org.eclipse.mylyn.pde_feature"/>

+      <import feature="org.eclipse.mylyn.wikitext_feature"/>

+      <import feature="org.eclipse.mylyn_feature"/>

+      <import feature="org.eclipse.ocl.all.sdk"/>

+      <import feature="org.eclipse.emf.cdo.dawn.sdk"/>

+      <import feature="org.eclipse.papyrus.sdk.feature"/>

+      <import feature="org.eclipse.papyrus.extra.sources.feature"/>

+      <import feature="org.eclipse.pde"/>

+      <import feature="org.eclipse.rcp"/>

+      <import feature="org.eclipse.sdk"/>

+      <import feature="org.eclipse.uml2.sdk"/>

+      <import feature="org.eclipse.xsd.sdk"/>

+   </requires>

+

+   <plugin

+         id="org.eclipse.papyrus.rcp"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"/>

+

+</feature>

diff --git a/releng/rcp/org.eclipse.papyrus.rcp.feature/license.html b/releng/rcp/org.eclipse.papyrus.rcp.feature/license.html
new file mode 100644
index 00000000000..5ef681156be
--- /dev/null
+++ b/releng/rcp/org.eclipse.papyrus.rcp.feature/license.html
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />

+<title>Eclipse Foundation Software User Agreement</title>

+</head>

+

+<body lang="EN-US">

+<h2>Eclipse Foundation Software User Agreement</h2>

+<p>February 1, 2011</p>

+

+<h3>Usage Of Content</h3>

+

+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

+

+<h3>Applicable Licenses</h3>

+

+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code

+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

+

+<ul>

+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

+      and/or Fragments associated with that Feature.</li>

+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

+</ul>

+

+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

+including, but not limited to the following locations:</p>

+

+<ul>

+       <li>The top-level (root) directory</li>

+       <li>Plug-in and Fragment directories</li>

+       <li>Inside Plug-ins and Fragments packaged as JARs</li>

+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

+       <li>Feature directories</li>

+</ul>

+

+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the

+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

+that directory.</p>

+

+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

+

+<ul>

+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>

+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

+       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

+</ul>

+

+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

+

+

+<h3>Use of Provisioning Technology</h3>

+

+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse

+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or

+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to

+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a

+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>

+   (&quot;Specification&quot;).</p>

+

+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the

+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology

+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the

+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>

+

+<ol>

+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology

+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based

+       product.</li>

+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be

+       accessed and copied to the Target Machine.</li>

+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable

+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target

+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern

+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such

+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>

+</ol>

+

+<h3>Cryptography</h3>

+

+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

+

+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>

+</body>

+</html>

diff --git a/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml b/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml
new file mode 100644
index 00000000000..5964327ff2c
--- /dev/null
+++ b/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>org.eclipse.papyrus.rcp.master</artifactId>
+		<groupId>org.eclipse.papyrus</groupId>
+		<version>1.0.0-SNAPSHOT</version>
+		<relativePath>../org.eclipse.papyrus.rcp.master</relativePath>
+	</parent>
+	<groupId>org.eclipse.papyrus.features</groupId>
+	<artifactId>org.eclipse.papyrus.rcp.feature</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+	<packaging>eclipse-feature</packaging>
+</project>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.master/.project b/releng/rcp/org.eclipse.papyrus.rcp.master/.project
new file mode 100644
index 00000000000..7cc3cdc1a8b
--- /dev/null
+++ b/releng/rcp/org.eclipse.papyrus.rcp.master/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.rcp.master</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.master/.settings/org.eclipse.ltk.core.refactoring.prefs b/releng/rcp/org.eclipse.papyrus.rcp.master/.settings/org.eclipse.ltk.core.refactoring.prefs
new file mode 100644
index 00000000000..b196c64a341
--- /dev/null
+++ b/releng/rcp/org.eclipse.papyrus.rcp.master/.settings/org.eclipse.ltk.core.refactoring.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.master/.settings/org.eclipse.m2e.core.prefs b/releng/rcp/org.eclipse.papyrus.rcp.master/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/releng/rcp/org.eclipse.papyrus.rcp.master/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.master/.settings/org.eclipse.ocl.modelregistry b/releng/rcp/org.eclipse.papyrus.rcp.master/.settings/org.eclipse.ocl.modelregistry
new file mode 100644
index 00000000000..2fb76f2a8e8
--- /dev/null
+++ b/releng/rcp/org.eclipse.papyrus.rcp.master/.settings/org.eclipse.ocl.modelregistry
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="ASCII"?>
+<mreg:ModelRegistrySettings xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:mreg="http://www.eclipse.org/ocl/1.0/ModelRegistry"/>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.master/pom.xml b/releng/rcp/org.eclipse.papyrus.rcp.master/pom.xml
new file mode 100644
index 00000000000..5f7aec84040
--- /dev/null
+++ b/releng/rcp/org.eclipse.papyrus.rcp.master/pom.xml
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.eclipse.papyrus</groupId>
+	<artifactId>org.eclipse.papyrus.rcp.master</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
+
+	<!-- tycho requires maven >= 3.0 -->
+	<prerequisites>
+		<maven>3.0</maven>
+	</prerequisites>
+
+
+	<properties>
+		<tycho-version>0.19.0</tycho-version>
+	</properties>
+	<repositories>
+		<!-- configure p2 repository to resolve against -->
+		<repository>
+			<id>Luna</id>
+			<layout>p2</layout>
+			<url>http://download.eclipse.org/releases/luna</url>
+		</repository>
+		<repository>
+			<id>papyrus-main</id>
+			<layout>p2</layout>
+			<url>${papyrus.repo.main}</url>
+		</repository>
+		<repository>
+			<id>papyrus-extras</id>
+			<layout>p2</layout>
+			<url>${papyrus.repo.extras}</url>
+		</repository>
+		<repository>
+			<id>cdo-dawn</id>
+			<layout>p2</layout>
+			<url>http://download.eclipse.org/modeling/emf/cdo/drops/R20130918-0029</url>
+		</repository>
+		<repository>
+			<id>xpand-1.4.1</id>
+			<layout>p2</layout>
+			<url>http://download.eclipse.org/modeling/m2t/xpand/updates/milestones/S201308130726</url>
+		</repository>
+		<repository>
+			<id>xpand-2.0.0</id>
+			<layout>p2</layout>
+			<url>http://download.eclipse.org/modeling/m2t/xpand/updates/milestones/S201312170329</url>
+		</repository>
+		<repository>
+			<id>eclipse-update</id>
+			<layout>p2</layout>
+			<url>http://download.eclipse.org/eclipse/updates/4.4</url>
+		</repository>
+		<!-- <repository> -->
+		<!-- <id>subversive 0.7</id> -->
+		<!-- <layout>p2</layout> -->
+		<!-- <url>http://download.eclipse.org/technology/subversive/0.7/update-site/</url> -->
+		<!-- </repository> -->
+	</repositories>
+	<build>
+		<plugins>
+			<plugin>
+				<!-- enable tycho build extension -->
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-maven-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<extensions>true</extensions>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-versions-plugin</artifactId>
+				<version>${tycho-version}</version>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>target-platform-configuration</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<environments>
+						<environment>
+							<os>linux</os>
+							<ws>gtk</ws>
+							<arch>x86_64</arch>
+						</environment>
+						<environment>
+							<os>linux</os>
+							<ws>gtk</ws>
+							<arch>x86</arch>
+						</environment>
+						<environment>
+							<os>win32</os>
+							<ws>win32</ws>
+							<arch>x86_64</arch>
+						</environment>
+						<environment>
+							<os>win32</os>
+							<ws>win32</ws>
+							<arch>x86</arch>
+						</environment>
+						<!-- <environment>
+							<os>macosx</os>
+							<ws>cocoa</ws>
+							<arch>x86_64</arch>
+						</environment> -->
+					</environments>
+				</configuration>
+			</plugin>
+			<!-- enable source bundle generation -->
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-source-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<executions>
+					<execution>
+						<id>plugin-source</id>
+						<goals>
+							<goal>plugin-source</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<!-- <plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-compiler-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<compilerArgument>-err:-forbidden</compilerArgument>
+					<compilerArgument>-warn:+forbidden</compilerArgument>
+				</configuration>
+			</plugin> -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
+				<version>2.5</version>
+				<configuration>
+					<encoding>UTF-8</encoding>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	<modules>
+		<module>../org.eclipse.papyrus.rcp</module>
+		<module>../org.eclipse.papyrus.rcp.feature</module>
+		<module>../org.eclipse.papyrus.rcp.product</module>
+	</modules>
+</project>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.product/.project b/releng/rcp/org.eclipse.papyrus.rcp.product/.project
new file mode 100644
index 00000000000..996f921eba3
--- /dev/null
+++ b/releng/rcp/org.eclipse.papyrus.rcp.product/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.rcp.product</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.product/.settings/org.eclipse.m2e.core.prefs b/releng/rcp/org.eclipse.papyrus.rcp.product/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/releng/rcp/org.eclipse.papyrus.rcp.product/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.product/README.txt b/releng/rcp/org.eclipse.papyrus.rcp.product/README.txt
new file mode 100644
index 00000000000..1fd2f9f63d0
--- /dev/null
+++ b/releng/rcp/org.eclipse.papyrus.rcp.product/README.txt
@@ -0,0 +1,19 @@
+One of the things you need to check are the icon paths in your .product file. 
+There are unfortunately three possible ways of interpreting this path:
+
+  1) Eclipse's product editor interprets these as project-relative paths (e.g., 
+     treating them as if they were prefixed with "platform:/plugin").  
+
+  2) PDE/Build interprets the paths relative to the workspace root (e.g., 
+     treating them as if they were prefixed with "platform:/base").
+
+  3) Tycho interprets them as paths in the local workspace, relative to its
+     current build location set by the active mojo.  The tycho-p2-publisher-plugin, 
+     which is responsible for publishing the product definition to a p2 repository, 
+     uses "${project.build.directory}/products/${product-id}" as its current build location.
+
+So you need to ensure your path names are relative to #3.  Note that the paths specified using the Eclipse
+product editor have a leading "/", which causes tycho-p2-publisher-plugin to attempt resolve
+the icons relative to the root directory. 
+
+Check https://bugs.eclipse.org/bugs/show_bug.cgi?id=349421 for more details. 
\ No newline at end of file
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.product/category.xml b/releng/rcp/org.eclipse.papyrus.rcp.product/category.xml
new file mode 100644
index 00000000000..9b15c158e56
--- /dev/null
+++ b/releng/rcp/org.eclipse.papyrus.rcp.product/category.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+   <feature url="org.eclipse.papyrus.rcp.feature_1.0.0.qualifier.jar" id="org.eclipse.papyrus.rcp.feature" version="1.0.0.qualifier"/>
+</site>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.p2.inf b/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.p2.inf
new file mode 100644
index 00000000000..c71c0269901
--- /dev/null
+++ b/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.p2.inf
@@ -0,0 +1,14 @@
+instructions.configure=\
+	org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/eclipsec.exe);\
+	org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/eclipse.exe);\
+	org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/Eclipse.app/Contents/Resources/Eclipse.icns);\
+	org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/Eclipse.app/Contents/Resources);\
+	org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/Eclipse.app/Contents/Info.plist);\
+	org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/Eclipse.app/Contents/MacOS);\
+	org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/Eclipse.app/Contents);\
+	org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/Eclipse.app);\
+	org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/eclipse);\
+	addRepository(type:0,name:Eclipse Luna,location:http${#58}//download.eclipse.org/releases/luna/);\
+	addRepository(type:1,name:Eclipse Luna,location:http${#58}//download.eclipse.org/releases/luna/);\
+	addRepository(type:0,name:Eclipse Platform 4.4,location:http${#58}//download.eclipse.org/eclipse/updates/4.4);\
+	addRepository(type:1,name:Eclipse Platform 4.4,location:http${#58}//download.eclipse.org/eclipse/updates/4.4);
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product b/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product
new file mode 100644
index 00000000000..863e5585733
--- /dev/null
+++ b/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<?pde version="3.5"?>

+

+<product name="Papyrus" uid="org.eclipse.papyrus.rcp.product" id="org.eclipse.papyrus.rcp.product" application="org.eclipse.ui.ide.workbench" version="1.0.0.qualifier" useFeatures="true" includeLaunchers="true">

+

+   <aboutInfo>

+      <image path="/org.eclipse.papyrus.rcp/icons/papyrus_lg.png"/>

+      <text>

+         Papyrus
+
+Version: 1.0.0
+
+(c) Copyright Eclipse contributors and others 2000, 2013.  All rights reserved.
+Visit http://www.eclipse.org/platform
+
+This product includes software developed by the
+Apache Software Foundation http://www.apache.org/

+      </text>

+   </aboutInfo>

+

+   <configIni use="default">

+   </configIni>

+

+   <launcherArgs>

+      <programArgs>-showsplash org.eclipse.papyrus.rcp --launcher.XXMaxPermSize 256m --launcher.defaultAction openFile</programArgs>

+      <vmArgs>-Xms128m -Xmx900m</vmArgs>

+      <vmArgsMac>-Xdock:icon=../Resources/papyrus.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>

+   </launcherArgs>

+

+   <windowImages i16="/org.eclipse.papyrus.rcp/icons/papyrus16.png" i32="/org.eclipse.papyrus.rcp/icons/papyrus32.png" i48="/org.eclipse.papyrus.rcp/icons/papyrus48.png" i64="/org.eclipse.papyrus.rcp/icons/papyrus64.png" i128="/org.eclipse.papyrus.rcp/icons/papyrus128.png"/>

+

+   <splash

+      location="org.eclipse.papyrus.rcp"

+      startupProgressRect="0,330,460,20"

+      startupMessageRect="7,4,445,16"

+      startupForegroundColor="9C9E9F" />

+   <launcher name="papyrus">

+      <linux icon="../org.eclipse.papyrus.rcp/icons/icon.xpm"/>

+      <macosx icon="../org.eclipse.papyrus.rcp/icons/papyrus.icns"/>

+      <solaris/>

+      <win useIco="true">

+         <ico path="../org.eclipse.papyrus.rcp/icons/papyrus.ico"/>

+         <bmp/>

+      </win>

+   </launcher>

+

+   <vm>

+   </vm>

+

+   <license>

+        <url>http://eclipse.org/legal/epl/notice.php</url>

+        <text>

+   Eclipse Foundation Software User Agreement
+February 1, 2011
+
+Usage Of Content
+
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY &quot;CONTENT&quot;).
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR
+NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS
+OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
+BELOW, THEN YOU MAY NOT USE THE CONTENT.
+
+Applicable Licenses
+
+Unless otherwise indicated, all Content made available by the
+Eclipse Foundation is provided to you under the terms and conditions of
+the Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.
+
+Content includes, but is not limited to, source code, object code,
+documentation and other files maintained in the Eclipse Foundation source code
+repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available
+as downloadable archives (&quot;Downloads&quot;).
+
+      - Content may be structured and packaged into modules to facilitate delivering,
+         extending, and upgrading the Content. Typical modules may include plug-ins (&quot;Plug-ins&quot;),
+         plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).
+       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)
+         in a directory named &quot;plugins&quot;.
+       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.
+         Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.
+         Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version
+         numbers of the Plug-ins and/or Fragments associated with that Feature.
+       - Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files
+         named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.
+
+The terms and conditions governing Plug-ins and Fragments should be
+contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and
+conditions governing Features and Included Features should be contained
+in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;). Abouts and Feature
+Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:
+
+       - The top-level (root) directory
+       - Plug-in and Fragment directories
+       - Inside Plug-ins and Fragments packaged as JARs
+       - Sub-directories of the directory named &quot;src&quot; of certain Plug-ins
+       - Feature directories
+
+Note: if a Feature made available by the Eclipse Foundation is installed using the
+Provisioning Technology (as defined below), you must agree to a license (&quot;Feature 
+Update License&quot;) during the installation process. If the Feature contains
+Included Features, the Feature Update License should either provide you
+with the terms and conditions governing the Included Features or inform
+you where you can locate them. Feature Update Licenses may be found in
+the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the
+terms and conditions (or references to such terms and conditions) that
+govern your use of the associated Content in that directory.
+
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
+
+       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)
+       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)
+       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)
+       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)
+       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)
+       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)
+
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License
+is provided, please contact the Eclipse Foundation to determine what terms and conditions
+govern that particular Content.
+
+Use of Provisioning Technology
+
+The Eclipse Foundation makes available provisioning software, examples of which include,
+but are not limited to, p2 and the Eclipse Update Manager (&quot;Provisioning Technology&quot;) for
+the purpose of allowing users to install software, documentation, information and/or
+other materials (collectively &quot;Installable Software&quot;). This capability is provided with
+the intent of allowing such users to install, extend and update Eclipse-based products.
+Information about packaging Installable Software is available at
+http://eclipse.org/equinox/p2/repository_packaging.html (&quot;Specification&quot;).
+
+You may use Provisioning Technology to allow other parties to install Installable Software.
+You shall be responsible for enabling the applicable license agreements relating to the
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+in accordance with the Specification. By using Provisioning Technology in such a manner and
+making it available in accordance with the Specification, you further acknowledge your
+agreement to, and the acquisition of all necessary rights to permit the following:
+
+       1. A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute
+          the Provisioning Technology on a machine (&quot;Target Machine&quot;) with the intent of installing,
+          extending or updating the functionality of an Eclipse-based product.
+       2. During the Provisioning Process, the Provisioning Technology may cause third party
+          Installable Software or a portion thereof to be accessed and copied to the Target Machine.
+       3. Pursuant to the Specification, you will provide to the user the terms and conditions that
+          govern the use of the Installable Software (&quot;Installable Software Agreement&quot;) and such
+          Installable Software Agreement shall be accessed from the Target Machine in accordance
+          with the Specification. Such Installable Software Agreement must inform the user of the
+          terms and conditions that govern the Installable Software and must solicit acceptance by
+          the end user in the manner prescribed in such Installable Software Agreement. Upon such
+          indication of agreement by the user, the provisioning Technology will complete installation
+          of the Installable Software.
+
+Cryptography
+
+Content may contain encryption software. The country in which you are
+currently may have restrictions on the import, possession, and use,
+and/or re-export to another country, of encryption software. BEFORE
+using any encryption software, please check the country&apos;s laws,
+regulations and policies concerning the import, possession, or use, and
+re-export of encryption software, to see if this is permitted.
+
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.

+         </text>

+   </license>

+

+   <plugins>

+   </plugins>

+

+   <features>

+      <feature id="org.eclipse.platform"/>

+      <feature id="org.eclipse.equinox.p2.user.ui"/>

+      <feature id="org.eclipse.rcp.configuration"/>

+      <feature id="org.eclipse.papyrus.rcp.feature"/>

+   </features>

+

+   <configurations>

+      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />

+      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />

+      <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />

+      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />

+      <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />

+      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />

+      <plugin id="org.eclipse.update.configurator" autoStart="true" startLevel="3" />

+      <property name="org.eclipse.update.reconcile" value="false" />

+      <property name="osgi.bundles.defaultStartLevel" value="4" />

+   </configurations>

+

+</product>

diff --git a/releng/rcp/org.eclipse.papyrus.rcp.product/plugin_customization.ini b/releng/rcp/org.eclipse.papyrus.rcp.product/plugin_customization.ini
new file mode 100644
index 00000000000..333fab9da76
--- /dev/null
+++ b/releng/rcp/org.eclipse.papyrus.rcp.product/plugin_customization.ini
@@ -0,0 +1 @@
+org.eclipse.ui/SHOW_PROGRESS_ON_STARTUP = true
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml b/releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml
new file mode 100644
index 00000000000..f7eace2a76c
--- /dev/null
+++ b/releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml
@@ -0,0 +1,62 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>org.eclipse.papyrus.rcp.product</artifactId>
+	<packaging>eclipse-repository</packaging>
+	<parent>
+		<groupId>org.eclipse.papyrus</groupId>
+		<artifactId>org.eclipse.papyrus.rcp.master</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+		<relativePath>../org.eclipse.papyrus.rcp.master</relativePath>
+	</parent>
+	<properties>
+		<product-id>org.eclipse.papyrus.rcp.product</product-id>
+	</properties>
+	<version>1.0.0-SNAPSHOT</version>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-p2-repository-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<includeAllDependencies>true</includeAllDependencies>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-p2-director-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<profile>org.eclipse.papyrus</profile>
+					<formats>
+						<linux>tar.gz</linux>
+						<macosx>tar.gz</macosx>
+						<solaris>tar.gz</solaris>
+					</formats>
+					<products>
+						<product>
+							<id>${product-id}</id>
+							<rootFolder>papyrus</rootFolder>
+						</product>
+					</products>
+				</configuration>
+				<executions>
+					<execution>
+						<id>materialize-products</id>
+						<goals>
+							<goal>materialize-products</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>archive-products</id>
+						<goals>
+							<goal>archive-products</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
\ No newline at end of file
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/.classpath b/releng/rcp/org.eclipse.papyrus.rcp/.classpath
new file mode 100644
index 00000000000..f6e5811e42c
--- /dev/null
+++ b/releng/rcp/org.eclipse.papyrus.rcp/.classpath
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<classpath>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

+	<classpathentry kind="output" path="bin"/>

+</classpath>

diff --git a/releng/rcp/org.eclipse.papyrus.rcp/.project b/releng/rcp/org.eclipse.papyrus.rcp/.project
new file mode 100644
index 00000000000..5a657096653
--- /dev/null
+++ b/releng/rcp/org.eclipse.papyrus.rcp/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.rcp</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.acceleo/.settings/org.eclipse.jdt.core.prefs b/releng/rcp/org.eclipse.papyrus.rcp/.settings/org.eclipse.jdt.core.prefs
index af0f20f97a5..af0f20f97a5 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.acceleo/.settings/org.eclipse.jdt.core.prefs
+++ b/releng/rcp/org.eclipse.papyrus.rcp/.settings/org.eclipse.jdt.core.prefs
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/.settings/org.eclipse.m2e.core.prefs b/releng/rcp/org.eclipse.papyrus.rcp/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/releng/rcp/org.eclipse.papyrus.rcp/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/META-INF/MANIFEST.MF b/releng/rcp/org.eclipse.papyrus.rcp/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..0c35fbe43c2
--- /dev/null
+++ b/releng/rcp/org.eclipse.papyrus.rcp/META-INF/MANIFEST.MF
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Papyrus
+Bundle-SymbolicName: org.eclipse.papyrus.rcp;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.eclipse.e4.ui.css.swt.theme
+Eclipse-BundleShape: dir
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/build.properties b/releng/rcp/org.eclipse.papyrus.rcp/build.properties
new file mode 100644
index 00000000000..22f786ca503
--- /dev/null
+++ b/releng/rcp/org.eclipse.papyrus.rcp/build.properties
@@ -0,0 +1,7 @@
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               splash.bmp,\
+               icons/,\
+               plugin_customization.ini
+               
\ No newline at end of file
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/icons/icon.xpm b/releng/rcp/org.eclipse.papyrus.rcp/icons/icon.xpm
new file mode 100644
index 00000000000..0ef25026ece
--- /dev/null
+++ b/releng/rcp/org.eclipse.papyrus.rcp/icons/icon.xpm
@@ -0,0 +1,303 @@
+/* XPM */

+static char * C:\Users\fn224852\Workspaces\Keulkeul\org_eclipse_papyrus_rcp\icons\icon_xpm[] = {

+"256 256 44 1",

+" 	c None",

+".	c #98BF06",

+"+	c #1C99B6",

+"@	c #88AA08",

+"#	c #75910B",

+"$	c #76910B",

+"%	c #87A908",

+"&	c #97BE06",

+"*	c #7D9C0B",

+"=	c #546411",

+"-	c #3A4315",

+";	c #212218",

+">	c #19171A",

+",	c #1E1D19",

+"'	c #333916",

+")	c #495712",

+"!	c #809F0A",

+"~	c #90B408",

+"{	c #4C5B11",

+"]	c #1A181A",

+"^	c #4D5C11",

+"/	c #8FB308",

+"(	c #78950B",

+"_	c #242519",

+":	c #262818",

+"<	c #8BAE08",

+"[	c #7C9B0B",

+"}	c #373F15",

+"|	c #8AAD08",

+"1	c #202019",

+"2	c #8BAD08",

+"3	c #363E15",

+"4	c #323816",

+"5	c #7D9C0A",

+"6	c #96BC06",

+"7	c #576910",

+"8	c #282B18",

+"9	c #252619",

+"0	c #647A0F",

+"a	c #84A509",

+"b	c #60750E",

+"c	c #495612",

+"d	c #495512",

+"e	c #677E0E",

+"                                                                                                                                                                                                                                                                ",

+"                                                                                                                                                                                                                                                                ",

+"                                                                                                                                                                                                                                                                ",

+"                                                                                                                                                                                                                                                                ",

+"                                                                                                                                                                                                                                                                ",

+"                                                                                                                                                                                                                                                                ",

+"                                                                                                                                                                                                                                                                ",

+"                                                                                                                                                                                                                                                                ",

+"                                                                                                                                                                                                                                                                ",

+"                                                                                                                                                                                                                                                                ",

+"                                                                                                                                                                                                                                                                ",

+"                                                                                                                                                                                                                                                                ",

+"                                                                                                                                                                                                                                                                ",

+"                                                                                                                                                                                                                                                                ",

+"                                                                                                                                                                                                                                                                ",

+"                                                                                                                                                                                                                                                                ",

+"                                                                                                                                                                                                                                                                ",

+"                                                                                                                                                                                                                                                                ",

+"                                                                                                                                                                                                                                                                ",

+"                                                                                                                                                                                                                                                                ",

+"                                                                                                                                                                                                                                                                ",

+"                                                                                                                                                                                                                                                                ",

+"                                                                                                                                                                                        ...........                                                             ",

+"                                                                                                                                                                            .............................                                                       ",

+"                                                                                                                                                                      ......................................                                                    ",

+"                                                                                                                                                                  ............................................                                                  ",

+"                                                                                                                                                               .................................................                                                ",

+"                                                                                                                                                            ......................................................   ++                                         ",

+"                                                                                                                                                         ...........................................................  ++++                                      ",

+"                                                                                                                                                       ..............................................................  ++++++                                   ",

+"                                                                                                                                                     .................................................................   +++++                                  ",

+"                                                                                                                                                   ....................................................................   ++++++                                ",

+"                                                                                                                                                 .......................................................................   ++++++                               ",

+"                                                                                                                                                .........................................................................   ++++++                              ",

+"                                                                                                                                              ............................................................................  +++++++                             ",

+"                                                                                                                                             ..............................................................................  +++++++                            ",

+"                                                                                                                                            ...............................................................................   +++++++                           ",

+"                                                                                                                                           .................................................................................   +++++++                          ",

+"                                                                                                                                         ...................................................................................   ++++++++                         ",

+"                                                                                                                                        .....................................................................................   +++++++                         ",

+"                                                                                                                                       ......................................................................................   ++++++++                        ",

+"                                                                                                                                       ........................................@#$%&..........................................   ++++++++                       ",

+"                                                                                                                                      .....................................*=-;>>>>,')!.......................................   +++++++++                      ",

+"                                                                                                                                     ....................................~{]>>>>>>>>>>]^/......................................  +++++++++                      ",

+"                                                                                                                             >>>>>  ....................................(_>>>>>>>>>>>>>>:<.....................................   +++++++++                     ",

+"                                                                                                                    >>>>>>>>>>>>>   ....................................'>>>>>>>>>>>>>>>>{.....................................   ++++++++++                    ",

+"                                                                                                               >>>>>>>>>>>>>>>>>>  ....................................[>>>>>>>>>>>>>>>>>}.....................................   ++++++++++                    ",

+"                                                                                                          >>>>>>>>>>>>>>>>>>>>>>  .....................................|>>>>>>>>>>>>>>>>>)......................................   ++++++++++                   ",

+"                                                                                                     >>>>>>>>>>>>>>>>>>>>>>>>>>>  ......................................'>>>>>>>>>>>>>>>1%......................................   +++++++++++                  ",

+"                                                                                                 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>   ......................................23>>>>>>>>>>>>>45.......................................   +++++++++++                  ",

+"                                                                                             >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>  ........................................678>>>>>>>>>90&.........................................  ++++++++++++                 ",

+"                                                                                         >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>   ...........................................abcddd^ea............................................  +++++++++++++                ",

+"                                                                                      >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>  .................................................................................................   ++++++++++++                ",

+"                                                                                    >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>  .................................................................................................   +++++++++++++               ",

+"                                                                                 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>   .................................................................................................   +++++++++++++               ",

+"                                                                              >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>   .................................................................................................   ++++++++++++++              ",

+"                                                                           >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>  ..................................................................................................   ++++++++++++++              ",

+"                                                                         >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>  ..................................................................................................   +++++++++++++++             ",

+"                                                                       >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>  ..................................................................................................   +++++++++++++++             ",

+"                                                                     >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>   ...................................................................................................  ++++++++++++++++            ",

+"                                                                   >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>   ...................................................................................................  ++++++++++++++++            ",

+"                                                                >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>  ...................................................................................................  +++++++++++++++++           ",

+"                                                              >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>  ...................................................................................................  +++++++++++++++++           ",

+"                                                             >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>  ...................................................................................................  ++++++++++++++++++          ",

+"                                                           >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>  ...................................................................................................  ++++++++++++++++++          ",

+"                                                         >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>   ..................................................................................................  +++++++++++++++++++         ",

+"                                                        >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>   .................................................................................................   +++++++++++++++++++         ",

+"                                                      >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>   .................................................................................................   ++++++++++++++++++++        ",

+"                                                    >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>   ................................................................................................   ++++++++++++++++++++        ",

+"                                                   >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>   ................................................................................................   ++++++++++++++++++++        ",

+"                                                 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>   ...............................................................................................   +++++++++++++++++++++       ",

+"                                                >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>   ...............................................................................................   +++++++++++++++++++++       ",

+"                                               >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>   ..............................................................................................  ++++++++++++++++++++++       ",

+"                                             >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>   .............................................................................................  +++++++++++++++++++++++      ",

+"                                            >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>    ............................................................................................  +++++++++++++++++++++++      ",

+"                                           >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>    ...........................................................................................  ++++++++++++++++++++++++     ",

+"                                         >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>    .........................................................................................   ++++++++++++++++++++++++     ",

+"                                        >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>   ........................................................................................   ++++++++++++++++++++++++     ",

+"                                       >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>    ......................................................................................   ++++++++++++++++++++++++     ",

+"                                      >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>    ....................................................................................  ++++++++++++++++++++++++++    ",

+"                                     >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>                 .................................................................................   ++++++++++++++++++++++++++    ",

+"                                    >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>                             ...............................................................................   ++++++++++++++++++++++++++    ",

+"                                   >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>                                       ............................................................................   ++++++++++++++++++++++++++    ",

+"                                  >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>                                                 ........................................................................  ++++++++++++++++++++++++++++   ",

+"                                 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>                                                          ...................................................................  ++++++++++++++++++++++++++++   ",

+"                                >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>                                                                      ..........................................................   ++++++++++++++++++++++++++++   ",

+"                               >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>                                                                               .....................................................   ++++++++++++++++++++++++++++   ",

+"                              >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>                                                                                    ...................................................  ++++++++++++++++++++++++++++++  ",

+"                             >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>                                                                                        ..................................................  ++++++++++++++++++++++++++++++  ",

+"                            >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>                                                                                             ................................................   ++++++++++++++++++++++++++++++  ",

+"                           >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>                                                                                               ................................................   ++++++++++++++++++++++++++++++  ",

+"                          >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>                                                                                                   ...............................................  +++++++++++++++++++++++++++++++  ",

+"                         >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>                                                                                                     ..............................................   +++++++++++++++++++++++++++++++  ",

+"                         >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>                                                                                                         .............................................  +++++++++++++++++++++++++++++++++ ",

+"                        >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>                                                                                                           ............................................   +++++++++++++++++++++++++++++++++ ",

+"                       >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>                                                                                                             ............................................   +++++++++++++++++++++++++++++++++ ",

+"                      >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>                                                                                                               ............................................  ++++++++++++++++++++++++++++++++++ ",

+"                      >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>                                                                                                                 ...........................................   ++++++++++++++++++++++++++++++++++ ",

+"                     >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>                                                                                                                   ...........................................   ++++++++++++++++++++++++++++++++++ ",

+"                    >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>                                                                                                                     ..........................................   +++++++++++++++++++++++++++++++++++ ",

+"                    >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>                                                                                                                      ...........................................   +++++++++++++++++++++++++++++++++++ ",

+"                   >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>                                                                                                                        ...........................................  +++++++++++++++++++++++++++++++++++++",

+"                  >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>                                                                                                                         ..........................................   +++++++++++++++++++++++++++++++++++++",

+"                  >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>                                                                                                                          ...........................................  ++++++++++++++++++++++++++++++++++++++",

+"                 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>                                                                                                                           ..........................................   ++++++++++++++++++++++++++++++++++++++",

+"                >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>                                                                                                                             ..........................................  +++++++++++++++++++++++++++++++++++++++",

+"                >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>                                                                                                                             ..........................................   +++++++++++++++++++++++++++++++++++++++",

+"               >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>                                                                                                                               ..........................................  ++++++++++++++++++++++++++++++++++++++++",

+"               >>>>>>>>>>>>>>>>>>>>>>>>>>>>>                                                                                                                               ..........................................   ++++++++++++++++++++++++++++++++++++++++",

+"              >>>>>>>>>>>>>>>>>>>>>>>>>>>>>                                                                                                                               ...........................................  +++++++++++++++++++++++++++++++++++++++++",

+"              >>>>>>>>>>>>>>>>>>>>>>>>>>>                                                                                                                                ...........................................   +++++++++++++++++++++++++++++++++++++++++",

+"             >>>>>>>>>>>>>>>>>>>>>>>>>>>                                                                                                                                 ...........................................  ++++++++++++++++++++++++++++++++++++++++++",

+"            >>>>>>>>>>>>>>>>>>>>>>>>>>>                                                                                                                                 ...........................................   ++++++++++++++++++++++++++++++++++++++++++",

+"            >>>>>>>>>>>>>>>>>>>>>>>>>>                                                                                                                                 ............................................  +++++++++++++++++++++++++++++++++++++++++++",

+"            >>>>>>>>>>>>>>>>>>>>>>>>                                                                                                                                   ...........................................   +++++++++++++++++++++++++++++++++++++++++++",

+"           >>>>>>>>>>>>>>>>>>>>>>>>                                                                                                                                   ............................................  ++++++++++++++++++++++++++++++++++++++++++++",

+"           >>>>>>>>>>>>>>>>>>>>>>>                                                                                                                                   ............................................   ++++++++++++++++++++++++++++++++++++++++++++",

+"          >>>>>>>>>>>>>>>>>>>>>>>                                                                                                                                   .............................................  +++++++++++++++++++++++++++++++++++++++++++++",

+"          >>>>>>>>>>>>>>>>>>>>>>                                                                                                                                    ............................................  ++++++++++++++++++++++++++++++++++++++++++++++",

+"         >>>>>>>>>>>>>>>>>>>>>>                                                                                                                                    .............................................  +++++++++++++++++++++++++++++++++++++++++++++ ",

+"         >>>>>>>>>>>>>>>>>>>>>                                                                                                                                    .............................................  ++++++++++++++++++++++++++++++++++++++++++++++ ",

+"        >>>>>>>>>>>>>>>>>>>>>                                                                                                                                    .............................................   ++++++++++++++++++++++++++++++++++++++++++++++ ",

+"        >>>>>>>>>>>>>>>>>>>>                                                                                                                                     .............................................  +++++++++++++++++++++++++++++++++++++++++++++++ ",

+"        >>>>>>>>>>>>>>>>>>>                                                                                                                                     .............................................  ++++++++++++++++++++++++++++++++++++++++++++++++ ",

+"       >>>>>>>>>>>>>>>>>>>                                                                                                                                     .............................................   ++++++++++++++++++++++++++++++++++++++++++++++++ ",

+"       >>>>>>>>>>>>>>>>>>                                                                                                                                     ..............................................  +++++++++++++++++++++++++++++++++++++++++++++++++ ",

+"       >>>>>>>>>>>>>>>>>                                                                                                                                      .............................................  ++++++++++++++++++++++++++++++++++++++++++++++++++ ",

+"      >>>>>>>>>>>>>>>>>                                                                                                                                      .............................................   ++++++++++++++++++++++++++++++++++++++++++++++++++ ",

+"      >>>>>>>>>>>>>>>>                                                                                                                                       .............................................  ++++++++++++++++++++++++++++++++++++++++++++++++++  ",

+"      >>>>>>>>>>>>>>>                                                                                                                                       .............................................  +++++++++++++++++++++++++++++++++++++++++++++++++++  ",

+"     >>>>>>>>>>>>>>>                                                                                                                                       ..............................................  +++++++++++++++++++++++++++++++++++++++++++++++++++  ",

+"     >>>>>>>>>>>>>>>                                                                                                                                       .............................................  ++++++++++++++++++++++++++++++++++++++++++++++++++++  ",

+"     >>>>>>>>>>>>>>                                                                                                                                       .............................................  +++++++++++++++++++++++++++++++++++++++++++++++++++++  ",

+"    >>>>>>>>>>>>>>                                                                                                                                       .............................................   ++++++++++++++++++++++++++++++++++++++++++++++++++++   ",

+"    >>>>>>>>>>>>>                                                                                                                                        .............................................  +++++++++++++++++++++++++++++++++++++++++++++++++++++   ",

+"    >>>>>>>>>>>>                                                                                                                                        .............................................  ++++++++++++++++++++++++++++++++++++++++++++++++++++++   ",

+"    >>>>>>>>>>>>                                                                                                                                       .............................................   ++++++++++++++++++++++++++++++++++++++++++++++++++++++   ",

+"   >>>>>>>>>>>>                                                                                                                                        ............................................   ++++++++++++++++++++++++++++++++++++++++++++++++++++++    ",

+"   >>>>>>>>>>>                                                                                                                                        .............................................  +++++++++++++++++++++++++++++++++++++++++++++++++++++++    ",

+"   >>>>>>>>>>                                                                                                                                        .............................................  ++++++++++++++++++++++++++++++++++++++++++++++++++++++++    ",

+"   >>>>>>>>>>                                                                                                                                        ............................................  +++++++++++++++++++++++++++++++++++++++++++++++++++++++++    ",

+"  >>>>>>>>>>                                                                                                                                        ............................................   ++++++++++++++++++++++++++++++++++++++++++++++++++++++++     ",

+"  >>>>>>>>>                                                                                                                                         ............................................  +++++++++++++++++++++++++++++++++++++++++++++++++++++++++     ",

+"  >>>>>>>>>                                                                                                                                        ............................................  ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++     ",

+"  >>>>>>>>                                                                                                                                         ...........................................  ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++      ",

+"  >>>>>>>>                                                                                                                                        ...........................................  +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++      ",

+"  >>>>>>>                                                                                                                                        ...........................................   +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++      ",

+" >>>>>>>                                                                                                                                         ...........................................  +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++       ",

+" >>>>>>>                                                                                                                                        ...........................................  ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++       ",

+" >>>>>>                                                                                                                                         ..........................................  +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++       ",

+" >>>>>>                                                                                                                                        ..........................................  +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++        ",

+" >>>>>                                                                                                                                         .........................................   +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++        ",

+" >>>>                                                                                                                                         ..........................................  +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++         ",

+" >>>>                                                                                                                                         .........................................  ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++         ",

+" >>>                                                                                                                                         .........................................   ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++         ",

+">>>>                                                                                                                                         .........................................  ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++          ",

+">>>                                                                                                                                         .........................................  +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++          ",

+">>>                                                                                                                                         ........................................   ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++           ",

+">>>                                                                                                                                        .........................................  +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++           ",

+">>                                                                                                                                         ........................................  +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++            ",

+">>                                                                                                                                        ........................................   +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++            ",

+">                                                                                                                                         ........................................  +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++             ",

+"                                                                                                                                         ........................................   +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++             ",

+"                                                                                                                                         ........................................  +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++              ",

+"                                                                                                                                        ........................................   +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++              ",

+"                                                                                                                                        ........................................  +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++               ",

+"                                                                                                                                       ........................................   +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++               ",

+"                                                                                                                                       ........................................  +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++                ",

+"                                                                                                                                      ........................................   ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++                 ",

+"                                                                                                                                      ........................................  +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++                 ",

+"                                                                                                                                      .......................................   ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++                  ",

+"                                                                                                                                     ........................................  ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++                   ",

+"                                                                                                                                     .......................................   ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++                   ",

+"                                                                                                                                    ........................................   +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++                    ",

+"                                                                                                                                    ........................................  +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++                     ",

+"                                                                                                                                    .......................................   +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++                     ",

+"                                                                                                                                   ........................................  +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++                      ",

+"                                                                                                                                   ........................................  ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++                       ",

+"                                                                                                                                  ........................................   +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++                        ",

+"                                                                                                                                  ........................................  ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++                        ",

+"                                                                                                                                  ........................................  +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++                         ",

+"                                                                                                                                 ........................................   ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++                          ",

+"                                                                                                                                 ........................................   +++++++++++++++++++++++++++++++++++++++++++++++++++++++++                           ",

+"                                                                                                                                 ........................................  ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++                           ",

+"                                                                                                                                ........................................   +++++++++++++++++++++++++++++++++++++++++++++++++++++++++                            ",

+"                                                                                                                                ........................................   ++++++++++++++++++++++++++++++++++++++++++++++++++++++++                             ",

+"                                                                                                                                ........................................  ++++++++++++++++++++++++++++++++++++++++++++++++++++++++                              ",

+"                                                                                                                               .........................................  +++++++++++++++++++++++++++++++++++++++++++++++++++++++                               ",

+"                                                                                                                               ........................................   ++++++++++++++++++++++++++++++++++++++++++++++++++++++                                ",

+"                                                                                                                               ........................................   +++++++++++++++++++++++++++++++++++++++++++++++++++++                                 ",

+"                                                                                                                              .........................................   ++++++++++++++++++++++++++++++++++++++++++++++++++++                                  ",

+"                                                                                                                              .........................................  ++++++++++++++++++++++++++++++++++++++++++++++++++++                                   ",

+"                                                                                                                              ........................................   +++++++++++++++++++++++++++++++++++++++++++++++++++                                    ",

+"                                                                                                                              ........................................   ++++++++++++++++++++++++++++++++++++++++++++++++++                                     ",

+"                                                                                                                             .........................................   +++++++++++++++++++++++++++++++++++++++++++++++++                                      ",

+"                                                                                                                             .........................................  +++++++++++++++++++++++++++++++++++++++++++++++++                                       ",

+"                                                                                                                             .........................................  ++++++++++++++++++++++++++++++++++++++++++++++++                                        ",

+"                                                                                                                             .........................................  +++++++++++++++++++++++++++++++++++++++++++++++                                         ",

+"                                                                                                                            .........................................   ++++++++++++++++++++++++++++++++++++++++++++++                                          ",

+"                                                                                                                            .........................................   ++++++++++++++++++++++++++++++++++++++++++++                                            ",

+"                                                                                                                            .........................................   +++++++++++++++++++++++++++++++++++++++++++                                             ",

+"                                                                                                                            .........................................   ++++++++++++++++++++++++++++++++++++++++++                                              ",

+"                                                                                                                           ..........................................   +++++++++++++++++++++++++++++++++++++++++                                               ",

+"                                                                                                                           ..........................................  +++++++++++++++++++++++++++++++++++++++++                                                ",

+"                                                                                                                           ..........................................  +++++++++++++++++++++++++++++++++++++++                                                  ",

+"                                                                                                                           .........................................   ++++++++++++++++++++++++++++++++++++++                                                   ",

+"                                                                                                                           .........................................   +++++++++++++++++++++++++++++++++++++                                                    ",

+"                                                                                                                          ..........................................   +++++++++++++++++++++++++++++++++++                                                      ",

+"                                                                                                                          ..........................................   ++++++++++++++++++++++++++++++++++                                                       ",

+"                                                                                                                          ..........................................   ++++++++++++++++++++++++++++++++                                                         ",

+"                                                                                                                          ..........................................   +++++++++++++++++++++++++++++++                                                          ",

+"                                                                                                                          ..........................................   +++++++++++++++++++++++++++++                                                            ",

+"                                                                                                                          ..........................................   ++++++++++++++++++++++++++++                                                             ",

+"                                                                                                                         ...........................................   ++++++++++++++++++++++++++                                                               ",

+"                                                                                                                         ...........................................   ++++++++++++++++++++++++                                                                 ",

+"                                                                                                                         ...........................................   ++++++++++++++++++++++                                                                   ",

+"                                                                                                                         ...........................................   ++++++++++++++++++++                                                                     ",

+"                                                                                                                         ...........................................   ++++++++++++++++++                                                                       ",

+"                                                                                                                         ...........................................   +++++++++++++++++                                                                        ",

+"                                                                                                                         ...........................................   +++++++++++++++                                                                          ",

+"                                                                                                                         ...........................................   ++++++++++++                                                                             ",

+"                                                                                                                         ...........................................   ++++++++++                                                                               ",

+"                                                                                                                         ...........................................   +++++++                                                                                  ",

+"                                                                                                                        ............................................   +++++                                                                                    ",

+"                                                                                                                        ............................................   ++                                                                                       ",

+"                                                                                                                        ............................................                                                                                            ",

+"                                                                                                                        ............................................                                                                                            ",

+"                                                                                                                        .........................................                                                                                               ",

+"                                                                                                                        .....................................                                                                                                   ",

+"                                                                                                                        .................................                                                                                                       ",

+"                                                                                                                        .............................                                                                                                           ",

+"                                                                                                                        ........................                                                                                                                ",

+"                                                                                                                         .................                                                                                                                      ",

+"                                                                                                                          .......                                                                                                                               ",

+"                                                                                                                                                                                                                                                                ",

+"                                                                                                                                                                                                                                                                ",

+"                                                                                                                                                                                                                                                                ",

+"                                                                                                                                                                                                                                                                ",

+"                                                                                                                                                                                                                                                                ",

+"                                                                                                                                                                                                                                                                ",

+"                                                                                                                                                                                                                                                                ",

+"                                                                                                                                                                                                                                                                ",

+"                                                                                                                                                                                                                                                                ",

+"                                                                                                                                                                                                                                                                ",

+"                                                                                                                                                                                                                                                                ",

+"                                                                                                                                                                                                                                                                ",

+"                                                                                                                                                                                                                                                                ",

+"                                                                                                                                                                                                                                                                ",

+"                                                                                                                                                                                                                                                                ",

+"                                                                                                                                                                                                                                                                ",

+"                                                                                                                                                                                                                                                                ",

+"                                                                                                                                                                                                                                                                ",

+"                                                                                                                                                                                                                                                                ",

+"                                                                                                                                                                                                                                                                ",

+"                                                                                                                                                                                                                                                                ",

+"                                                                                                                                                                                                                                                                "};

diff --git a/releng/rcp/org.eclipse.papyrus.rcp/icons/papyrus.icns b/releng/rcp/org.eclipse.papyrus.rcp/icons/papyrus.icns
new file mode 100644
index 00000000000..931bc1217bf
--- /dev/null
+++ b/releng/rcp/org.eclipse.papyrus.rcp/icons/papyrus.icns
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/icons/papyrus.ico b/releng/rcp/org.eclipse.papyrus.rcp/icons/papyrus.ico
new file mode 100644
index 00000000000..ef635cc908f
--- /dev/null
+++ b/releng/rcp/org.eclipse.papyrus.rcp/icons/papyrus.ico
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/icons/papyrus.svg b/releng/rcp/org.eclipse.papyrus.rcp/icons/papyrus.svg
new file mode 100644
index 00000000000..b0139f9ee14
--- /dev/null
+++ b/releng/rcp/org.eclipse.papyrus.rcp/icons/papyrus.svg
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="256"
+   height="256"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="papyrus.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.99999999"
+     inkscape:cx="98.541937"
+     inkscape:cy="421.45466"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1324"
+     inkscape:window-height="995"
+     inkscape:window-x="196"
+     inkscape:window-y="335"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-796.36218)">
+    <g
+       id="g3897"
+       inkscape:export-xdpi="3.8683043"
+       inkscape:export-ydpi="3.8683043"
+       transform="matrix(0.68769854,0,0,0.68769854,-93.851334,781.47584)">
+      <path
+         style="fill:#98bf06;fill-opacity:1"
+         clip-path="none"
+         d="m 408.97162,54.007189 c -26.21801,0.525114 -54.90464,6.033768 -74.33433,25.001884 -11.73097,11.961376 -19.27216,32.850907 -8.22812,47.623117 12.26616,15.24526 33.19469,18.1222 51.5,19.75 9.98482,1.20261 15.93883,11.82567 12.41905,21.10367 -3.98575,14.71792 -16.02793,24.70108 -23.8251,37.27133 -29.41059,43.10377 -52.60154,92.68463 -55.28458,145.54029 -0.46747,8.17781 -1.90972,12.30723 9.44599,11.16979 18.61764,-1.32328 37.08148,-4.89613 54.83899,-10.64758 -3.53804,-42.07217 7.88427,-86.56369 36.68745,-118.1875 20.0335,-24.58532 37.189,-52.17015 46.78133,-82.60045 6.34035,-24.15242 9.81281,-52.079963 -3.25043,-74.649501 -9.39375,-16.109223 -28.95526,-22.422386 -46.75025,-21.37505 z"
+         id="path2987-4"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccccccccc" />
+      <path
+         clip-path="none"
+         sodipodi:nodetypes="sscscsssssss"
+         inkscape:connector-curvature="0"
+         id="path2987-1"
+         d="m 392.78412,82.319689 c -4.65185,0.2088 -8.92238,1.77276 -11.09375,4.125 -0.97268,1.05368 -1.368,1.89239 -1.4375,3.15625 -0.0709,1.29031 0.18899,2.0884 0.96875,3.125 1.53115,2.03545 4.47449,3.43158 8.5,4 1.67701,0.23681 4.5534,0.22825 6.28125,0 1.49012,-0.19685 3.98118,-0.7703 4.71875,-1.09375 2.26284,-0.9923 3.10321,-1.49557 4.15625,-2.5 1.34906,-1.28678 1.86275,-2.48545 1.78125,-4.0625 -0.0657,-1.27297 -0.49177,-2.17933 -1.5625,-3.25 -2.10445,-2.10437 -5.70429,-3.31968 -10.28125,-3.5 -0.67484,-0.0266 -1.3667,-0.0298 -2.03125,0 z"
+         style="fill:#19171a;fill-opacity:1" />
+      <path
+         style="fill:#19171a;fill-opacity:1"
+         clip-path="none"
+         d="m 325.56537,85.475939 c -53.40066,4.647009 -108.83756,22.459411 -145.7999,63.113601 -26.6642,29.24111 -42.13429,68.31937 -43.29385,107.8239 1.50901,3.93551 6.09608,-11.94132 9.28591,-15.52472 25.70637,-47.60497 73.03762,-81.35547 125.10367,-94.44372 21.44373,-5.73511 43.65566,-8.38935 65.82917,-8.34406 -17.66304,-4.92809 -23.58309,-26.95325 -16.19886,-42.345682 1.07845,-3.593733 4.15315,-7.2029 5.07386,-10.279319 z"
+         id="path2987-7"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccc" />
+      <path
+         style="fill:#1c99b6;fill-opacity:1"
+         clip-path="none"
+         d="m 444.90912,60.132189 c 6.36987,5.135024 13.85183,11.568139 17.29314,19.896545 10.24546,22.494396 6.64465,48.570146 0.008,71.564536 -10.93284,32.92456 -30.42714,62.35128 -52.92597,88.44517 -23.56528,30.73566 -32.93274,70.97672 -29.46875,109.2499 56.66437,-19.26375 105.93814,-64.6337 122.56209,-123.03701 14.4371,-48.63801 3.73497,-103.37143 -26.79437,-143.735831 -6.7716,-10.746143 -15.99194,-19.687077 -28.99536,-21.692472 -0.62433,0.07133 -1.04379,-0.798706 -1.67866,-0.690838 z"
+         id="path2987-0"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/icons/papyrus128.png b/releng/rcp/org.eclipse.papyrus.rcp/icons/papyrus128.png
new file mode 100644
index 00000000000..8f4be4dec3b
--- /dev/null
+++ b/releng/rcp/org.eclipse.papyrus.rcp/icons/papyrus128.png
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/icons/papyrus16.png b/releng/rcp/org.eclipse.papyrus.rcp/icons/papyrus16.png
new file mode 100644
index 00000000000..2e7df2585e8
--- /dev/null
+++ b/releng/rcp/org.eclipse.papyrus.rcp/icons/papyrus16.png
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/icons/papyrus256.png b/releng/rcp/org.eclipse.papyrus.rcp/icons/papyrus256.png
new file mode 100644
index 00000000000..f5f2aa10773
--- /dev/null
+++ b/releng/rcp/org.eclipse.papyrus.rcp/icons/papyrus256.png
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/icons/papyrus32.png b/releng/rcp/org.eclipse.papyrus.rcp/icons/papyrus32.png
new file mode 100644
index 00000000000..f2609c1c58a
--- /dev/null
+++ b/releng/rcp/org.eclipse.papyrus.rcp/icons/papyrus32.png
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/icons/papyrus48.png b/releng/rcp/org.eclipse.papyrus.rcp/icons/papyrus48.png
new file mode 100644
index 00000000000..b17118b95e9
--- /dev/null
+++ b/releng/rcp/org.eclipse.papyrus.rcp/icons/papyrus48.png
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/icons/papyrus64.png b/releng/rcp/org.eclipse.papyrus.rcp/icons/papyrus64.png
new file mode 100644
index 00000000000..9e3d56bfb63
--- /dev/null
+++ b/releng/rcp/org.eclipse.papyrus.rcp/icons/papyrus64.png
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/icons/papyrus_lg.png b/releng/rcp/org.eclipse.papyrus.rcp/icons/papyrus_lg.png
new file mode 100644
index 00000000000..e3f1513c1d7
--- /dev/null
+++ b/releng/rcp/org.eclipse.papyrus.rcp/icons/papyrus_lg.png
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/icons/splash.svg b/releng/rcp/org.eclipse.papyrus.rcp/icons/splash.svg
new file mode 100644
index 00000000000..1173a78a152
--- /dev/null
+++ b/releng/rcp/org.eclipse.papyrus.rcp/icons/splash.svg
@@ -0,0 +1,2000 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.2"
+   width="460"
+   height="350"
+   id="svg2"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="splash.svg"
+   inkscape:export-filename="C:\Users\fn224852\Desktop\splash.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1378"
+     id="namedview289"
+     showgrid="false"
+     inkscape:zoom="2.3149106"
+     inkscape:cx="115.99809"
+     inkscape:cy="178.58881"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4328"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient4178">
+      <stop
+         style="stop-color:#8a8d8e;stop-opacity:1;"
+         offset="0"
+         id="stop4180" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop4182" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5467">
+      <stop
+         style="stop-color:#1f211c;stop-opacity:1;"
+         offset="0"
+         id="stop5469" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop5471" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4142">
+      <stop
+         style="stop-color:#99a3a6;stop-opacity:1;"
+         offset="0"
+         id="stop4144" />
+      <stop
+         style="stop-color:#99a3a6;stop-opacity:0;"
+         offset="1"
+         id="stop4146" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4131">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop4133" />
+      <stop
+         style="stop-color:#cfcfcf;stop-opacity:1;"
+         offset="1"
+         id="stop4136" />
+    </linearGradient>
+    <inkscape:path-effect
+       effect="skeletal"
+       id="path-effect5995"
+       is_visible="true"
+       pattern="m 42.95724,199.50163 c 21.810573,-2.35044 67.00436,-7.86778 67.00436,-7.86778 0,0 -44.203563,11.14525 -65.87091,12.34855 -21.667347,1.2033 -117.044805,-2.81425 -117.044805,-2.81425 0,0 94.100783,0.68392 115.911355,-1.66652 z"
+       copytype="single_stretched"
+       prop_scale="1"
+       scale_y_rel="false"
+       spacing="0"
+       normal_offset="0"
+       tang_offset="0"
+       prop_units="false"
+       vertical_pattern="false"
+       fuse_tolerance="0"
+       pattern-nodetypes="zczcz" />
+    <linearGradient
+       id="linearGradient4373">
+      <stop
+         style="stop-color:#80ffff;stop-opacity:1;"
+         offset="0"
+         id="stop4375" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop4377" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4141">
+      <stop
+         style="stop-color:#009dd4;stop-opacity:1;"
+         offset="0"
+         id="stop4143" />
+      <stop
+         style="stop-color:#009dd4;stop-opacity:0;"
+         offset="1"
+         id="stop4145" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4133">
+      <stop
+         style="stop-color:#009dd4;stop-opacity:1;"
+         offset="0"
+         id="stop4135" />
+      <stop
+         style="stop-color:#042531;stop-opacity:1;"
+         offset="1"
+         id="stop4137" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6610">
+      <stop
+         id="stop6612"
+         style="stop-color:#ffffff;stop-opacity:0.2"
+         offset="0" />
+      <stop
+         id="stop6614"
+         style="stop-color:#5e53c7;stop-opacity:0.1882353;"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4210">
+      <stop
+         id="stop4212"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4214"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4004">
+      <stop
+         id="stop4006"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="0" />
+      <stop
+         id="stop4008"
+         style="stop-color:#000000;stop-opacity:0.30136988"
+         offset="1" />
+    </linearGradient>
+    <inkscape:path-effect
+       effect="skeletal"
+       id="path-effect3221"
+       is_visible="true"
+       pattern="M 0,0 1,0"
+       copytype="single_stretched"
+       prop_scale="1"
+       scale_y_rel="false"
+       spacing="0"
+       normal_offset="0"
+       tang_offset="0"
+       prop_units="false"
+       vertical_pattern="false"
+       fuse_tolerance="0" />
+    <inkscape:path-effect
+       effect="skeletal"
+       id="path-effect3204"
+       is_visible="true"
+       pattern="M 0,0 1,0"
+       copytype="single_stretched"
+       prop_scale="1"
+       scale_y_rel="false"
+       spacing="0"
+       normal_offset="0"
+       tang_offset="0"
+       prop_units="false"
+       vertical_pattern="false"
+       fuse_tolerance="0" />
+    <pattern
+       id="sand_bitmap"
+       height="256"
+       width="256"
+       patternUnits="userSpaceOnUse">
+      <!-- Seamless texture provided by FreeSeamlessTextures.com -->
+      <!-- License: creative commons attribution -->
+      <image
+         xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAQIAIwAjAAD/2wBDAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEB AQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/2wBDAQEBAQEBAQEBAQEBAQEBAQEBAQEB AQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/wAARCAEEAQQDASIA AhEBAxEB/8QAHQAAAgIDAQEBAAAAAAAAAAAABgcFCAADBAkBAv/EAEIQAAICAAUDBAECBAQFAwEI AwUGBAcBAwgVFgAXJQIRFCYnITUYJDZFEzE3RgkSQVVWKFF1ZTQ4R1dhZmd2hYaV/8QAGQEAAgMB AAAAAAAAAAAAAAAAAgMAAQQF/8QAOxEAAgIBAwMDBAEBBgUDBQEAAQIDERIEEyEAIjEjMkEUQlFh M0MFJFJicYE0U5GhsRVjcnOCwtHh8P/aAAwDAQACEQMRAD8Ar2yC6nrRLre36+zv8FjfJLYn0bZB gQtC2h3u4oHp+yKrW0NbD2BMsbb3w64E0YW+XkMeAhurjgABgAqKg8D+wPiSrpH8dDjAu7T5aNj0 2SsC7aXa4dIVPT9c2MJPRa3wZBEy1IVJQAyq2sEECns9ls+KN9Jdqv2Bgfl9gAfowVFHg6/gWo1U jP03kqf4TW7CYVbOcPmuSxLKK/H62+HW6fLHh1RDH74h2Z3kF+7xvlXI/aIAA58f8+Hwrcp9cviv e5eVVtJu6SSiMCS7I9esn8L6QUKGGD7gnsj5+OD2n9tOLdQE1dXZqzOOwSrjlugD5/nwDz4yRyYT GWZ2dIzIkkfpSNAtbIViXwu3s0w8cfmRLG7wPGmCPNGS2WW45He/gY320LNfnp5J490gZeTm1LDC UPYKGky9N92WQY4HbTQ721qgMOC1zCGnuBCZ8Cj9Q/A+CoaHtn4u4OAPeAAMG/4vi7NM9H5VoJ+o e30rsPlWo2sJAxhIiB2hN55FMEIb5ChrYcc4QVKwIFqJ7N4sZwfm1oo/gPAY8B6WNT2YDr65DJmv baJZzkHq7s+BsIephyh/s3aHdBwcEOGHtRgmHOHwJ3BidNtAwYj9rkkF5/3+/dSNZ0W0XJID1LX1 V0m+SnugYkgAh1OwmHIUXlRf5wzqEtSyEMehqtD3BWjwyLPZtXZhjw7BLR/6H+fnj/UncR4zxzOr yo6ahDD2LAcNwpIztHNXGQfTnHtqsj1IizrLpp4FKRPC8WdHHh8wCoSVMqUkxyJddwahSUjq9fz6 fmD7frGNTK27RrNkaM7lresnxyQ7BfAMMgYmCE9kUB2+VKPfIKejPKur8m4T+/7+A+g4b/2HEdwz bMvJzxuC/kOlgNXJA8lWVftn8NJRhsaKYH2TW91mA8xh/kB6lY0zc1doJowM1VxsHx8Agn+A8B6Y T44ajHyv63zWjPsh8UgLIJTlUbIrKbV1XsLSBQx0NDW4b5Mr9wg8/nnENmRigp5RvzYk7B+Xd/8A Pr/ZUczLV6farQgVLV3zzD/YVHuAH5aeBKCYoFwXjN8J/wAOtyDh7kFKCtoyNyizBm9hQlqVDbqC ffj+D9ifYRKqxsxf1JFTCNMkjv70yYyLIPtaSSWucQOco6wH04Ux2kdmkZspJKwAV8QkQx5oxxJd nLLiuOp7QU3dXsIC2vhK7LGsI3dzxppPWwwh7uKUNbUWYQXLIZHD8f8AB21fbVXjTM0CxiMDdnc0 DAP1B1FwHYH7AqrM5qFTazG2Dm1utmFxxN3dHtS2k/uR257N1KH+GHrdDwQ+SHK07lnLgwWSlNsw xHpMI7bAA5/ivnz6Cgit4PBCwcwzb4HFbs5oW5K9dDsBaFOq3yLXtc02yVet1Wt2oH4+Ham1gAg3 BZrN83TY7RduDoPPsP3/AKgbwHslg2o1WqGuZAW4tqNpap2qZHbA+nOVLVzwevw7IH1IB6THGEdD r89Bhi3loFE2b97w597f54ABkkZpSxZ33akJL5xo7UHijehnhxk2KXa0oHUiXEMmSJg5S0jrOseS MzVX4s0CeeoEdl1PKrMwBynBtGq5KNp7IDcn4nxQPfgWyEE+G+La2tkDBzkEBHrf2ab4Gk0c27c4 2B+QQHn0HrdYGXDq+4JkCxk82H7wVLYKuSiODuYV1evHxoodgZEMPzx9HmAf7HtgxDFszNwnm14f rv8AwFBwAdiu6B3wxUsAo1v82xnxkd2gOnj69Q1eLLPSltgrdP8Ah2oyD2SuQJHvgYWVkXxnfAjt SZz9/wD7BhPtge6FwpdibVWcNVQyS2ryPDcVdshlJbDXJ5bsCtzEwNMD1/g842fbUEwzoyu0LNQH OEuxzgOwAP39gaiuVRvObqlVhqIroX92GX45yI8iupuJK0jOMcc6F3e2I7+B7sgP145vhg0vV9d2 WLtoW0WTGVK5yadbHCt3YwvMmnypbC7Sp6/al2p4dDtSv1uCeYENGuAn7/ZvdISQZ/8Ar4+AAPy/ WlPeE/tWktr5Dwo1Xs5tlh0myLYqdkKUjYe1w18OyPlDhw49bnNqfPgzMVkoLZif9bdogB/wGL97 2ET2tkr6liWUGuAlErSwgktgtSq3BeMNCuvFLkW8A8yGyQ1tPZEcC49udsRilojNjCJO+cBQff36 XinDqsWYcE0XqEbZlXje08hquaSWMNErTgh1fMIQ/eYt/wA4jtrABBzNsw4KT9tkeMGA+A+/e3Sr fZlWR8N2Z2QKM5HjGGLxpa5XZyGQxAXk3wJKrTRrde4k4ovtrN6OF0a7TZDfjqxcN0cBeY4bNVZJ PMmG22VdPyR9hTAKawlbGhjzCG4B/r7JBn19WjUYt+31dX7QdkzZvYN/4DboDgICqINstBI07V7R YauCcO6Upttgw1NTxZr5LQ0jfoZCG+TIemPh8PssngZ3BsWho5zvfCd/2Df9/PoPR5UavX4GPk2X aF5OyHdwdlE1+yDWBecKv5YeoeGwGFswYmMmzg59X74H4wLaBjNvdXeA2AAf8Bh1DvkiWkPhJNgV KbsKkYcnlFe2E4cbq8WWF/DYFtwfFuGtjzEFtsDEGyowx8fBhPukE2NB/fwADwBQiNZsCHldKdlR L2a8TGmOWFmk4ys9w4JGTcC9vYknGfnNODImPGN2vNn/AEPQ2tslfxYeynrU7M1yHpynHiHnV+Jm AXxIcnKq0+h32Yth2S0DDUer/UPVbJ9oVyZM4k1cEOIP0FB6YTQv2AMtQbWmqB2W3y7qZGlmB2hj 9XbKAV2FolIfez5kNwTx4Z4Pd6fhjHmr/wBN8Cef7RH9/AbAAG6PpNDqWHXzGr2Rv2lWpZLZHhu1 gpNb20m0NY1jJ5Awth3DkifDOHSLbO2ysyqv2ztRJSTZzE/v+H0E+AUuWhpaQhmEdoT7kJKSQt6h cENPYJaHYybXt2lDCeYQw9Vw09gW2rtf9wxJvnGWZ4CBDZz8Rffl9+9xZZvQGSN6KRbkMe3/ADVw kubZxjD1YsFzJQZKOiiZMpW2nGb508255+B6aVVcnnK/iuQO/JmXXLBMqWK1O0ym3xtr1f43J+GL tpI37j7JiyGOz5AxOn8ReDAwntiy8nMceD8AP7/+/gPWLUhYF6Wqhn59yEhum+6XwIWRzFhVRU8P a7DpF8qusA9bvkO+GRg3zj7Y1J9G4WgLrMm8GwiSbt0BsHXnvlo4sWLGvltKpJPSGRkYa335IU0/ dKyFvhjjbhM09hzKcHBnmACD3Pa3wmso/m3jf+AoJ/gL8feUxHvTTwLuyVPh/MrkapS7A+GwMK2B 0+yxbQH5gZW5gfvAHrqfZ75R4cmzfrWe9u3B+AgH7+wdNYRNOuWazKiOGKemmdCo3y9S8O44pjxw cuGCN49MxkCHTtMquQ9yK+nrNWjx9GRTKu1Jk9W3b0jUNluNIq8bX2oIlaIEytqVhI9e2pR9mmKv PKcpo4/MMB5kOaQmc834J+vA/BpN2BHgAffQB9+QOp4oUj0YMsg9TZi4zGahu9hMCHnGOz55o2H5 jBMMGXxDmYMiq+bBOT3ni7R+KrR2Q6APoP8ApFsB88F6mL007tFJ2rX1nUBarbZC2kMHCCC8HsZX lyhcNwqtDhvictr6fOQ7QAo75xlpQ6z/AN7Y7/sB/wDz60ttmB3JH1gdy9MbYq3S7JK9H0+NSfw8 XKpGUh2QwTHx8oeq09ghzuH8H/GaHaKMMOOxsJsIDYAFRPp/pChhcLwu2mkqZpz/AHlGMldsZqL2 VbHnIMOFx5Esx3HSVI3VyilPRAxxs1353YIHGNfdn2myX3MsuYBtqwdS1tZKk4VdWUdkGuESq5V8 WEeiGNQOzmEOqzFfrYLVLcAF5sgmTfFcY9PARJpN43+3fP8AAUEAEx3BPA2w4ZtjGKUtUMt+Yzv4 d7N4ueiK8rbw74HreyE/S+HVW2r1Kuds4GLrMmDq7TxSfPwL9h7c+2CHTx5SkZie25q2pMunit5K 6QW3ZgiLcUDwMpW7A4B63T3xDYJqqPcLLo9bWRnKNs3s39+7ur9uH6i6gSC3Nrlwya0qAPvAFlUb CHt5KSkTItjCRcWyOYLbI4Vut2An8Dx5wYRka0GgmMtTtd/UAD8uoIDpjIsb4Rj21hH+bCk936of B8/A6EllfdkXEGtxiadaxxzjo4/IXuN0R5HMjiVoeVUbqrW0cOAldEsji1TE15TY2ipbtsa2rHAO L4iRLg4enU9t9aHTAu3iiH6VgJi7JWL93e386voTBh9rOswi5mKulB8ZCQF3yalsJHJXXcDuhyUM tbabzBbrdbW7HDp5gGpJ9DQbIRlm0Gjc3h25vh+In4AA5AwPx2n12LMolzGD2oNSZM2JFr2oD+l5 fYb4PXGw2PEQ0/jWpun6TxtHlaliQgw1pnFlBeB3wYK3vdCfULYAAA31UTNN9l13Q4YVTJvSvArF JXmhqZLAsyIrnrY1BRa3p8PD+uQ8bI8edBQyaxuhPfDlouxz9UH9T58+vezkQEOoe2jCLubchx3X Pct7tpwcccPLX014dtCytSTHT1A4IvTvnsbsd+FqTDuN5MOCOUpRZ05WlgWQ7VeyaqtOua1Dl+Oy LbgVDi3N4PU5MToQeZauKGPZJ+kxw9sCXeQmj4PBo2EeGAAfww5Bj05cut67FWhkmRbI2u0+4alb JF2Oy/FhvltMJ60Fuv5l8GHCbD+YqvloqTUyDdQotWqAYj2ibCHOAoL9sC/z6oq6uCOU4utlHNqU oeUkxi25GK/ELdjJtgi1eH7vn5UDj1uCeHwDnaB57oDBmLtSYT9/P7Bx8/04Ed0IVBDMLcXFJsIp T5PvQNr3UAWfGgX8qKYT9ntStoagw+/IENV2ys3wqzDHje0r8RYH/wDPfykTBvqIoc3aERuzSxK7 SJjsyu8rx54ZSYoq8ZG2Fi1xFmRFdqTTupWT/lxsfVjq+d7FO+xjt+1i3QfeFgR7Lp92cldJpOsW hVUkghXqewLy3UqGkWNXKHaD7MhuFwPjBvkBvtqufvKvpfZyYPuib7uvz99+Ae2EbHq900tOFb02 m2ENfNZFesvdAC+acGxbu2kXer7Qocjg3iE9bmVhyqfYCmcMExhRDZkY4lG9O5xg8+AxAb+vs5sH j6zMMsqoLCNpGbDGlk+zlWQpvkWXE5QtuCe4Mi2yWoP7cttfvuzsxMWhjN8wxCHACDz5A9z/AEEr dLlKWsTm9VLdAh81bpxIR7OQ1eWYixWza2Rfh42mHZa2HrgJtHwHhkWUYoLRmZ4NpOx8+38+AQd/ 6IPI6RkN2cYs49c5SwRneW+Mdy055AYcXYopGSpZbmW9wg5RtYXHF6GVU2XaKNddjhMT8qQ7QMrO jW07PjJ/D81YUOwuEoW2AXxbr9cMUPD2ZwZAc9QPPBgmMaGju+j/AIu2AB9/P/5klgLY8pHpOxtO VzWRdkUxUrYv8kYK9cO16QU+YRw7Vw0O4GBkBgbgrSBtgzjHnEn/AH8fQfP+fFcyyHQoCW3fNGjY dLB6KU0d2Q4zEtgUNhPckT09kDmGSYQhwUOBdNOrayMF+TBmzfBz78/7AggH7qNtyGKDVgHbRfCZ koxJ2/t68WE4Jp6srGFbfMDLdwODJxvgbA+KvBhlXlHjg/NgiOg/2AAg4dCgYbOYxdclwuwkYMZj S6F491mhd+BXRllZJokjedJMDnGZQ7Sc5usMcseWfbwznDEAGyemdWdgXZfqFZyYLJEgKaZNqa/a j5S9I92k1dqXT6h7Ot6kDD4nv6HO7Pnwd2M3dCh0ZZB2jVxtH2DgP+rwDpbslgQ01Hh90M6SNQw5 uXGJO1f2a4yrG1Hi651UJ9kTLIMUPw+yUdD5aDW1lmKU2zM29hODn18Bbp9+Xz9RdM7vAUsGo74d wN8EtJZQ9TjCwWcyVf5Qo7vlXw19bMUPMT0PkgNDYLaCGOTq6vWfhDfB7dPn9/8APH+g/T22QndH zmPKrHTwNimI13UuTDv68yASl86c7k7X2Qh3wnvhghMgwLAnI4e8llXtAnb7xaPNnjYOP+3uA6WF iYxSO2yiTRh4YJbj08nOSBcVv454LUTXVqrs0q3DJhC/v5L5BP8Ahx/Vw/kn5XbiV5e7HA2201aH KP1B13i9hEVusAPukfIHOXob9LdT8gjm1haevVOyAls+h3tA2Fxz3DOyk9pdTeTLJo+Wsxl5fVEg erLAnOvJ6yb0qfS+2zquZNEesPH0D8mJkhCFK3RJTUctAWI/orkrLjLPrppuhBJcRxR2kL6xIkt8 MRDFQREjJxMQCkqVnTcP7Zv0dUTFfpnb8paYn+T5FH//AHCB/wCntTNpA7MAzPvAZE0S1bTVZ5qz XH46v/IOXJY2n/Jsu7uNzJdkJLvAJB2C2DFS6lsbGPLY8PMD7w4ckrn+QnLZO8vxmM+7O6Mfxt3D wAAAfh08XXenO42pDMp5KHV7GMuORtshTmCxaQrvie4B+YXYHW17lVSEKleHCoFl8VyaMd4T7oP3 5B+/AOgnTm65+pDBlGQaNCF7fagktHSaxq+vocpWuJyil7AMfqtslgf0+pVXxn33NmvBJ2TgNu4v 2GCDwEAzrMX1tjOElJu063Gt5qqbYav1FTLAXocopyiua343DMPt2ByF2I8C0La3gZxfbCXhEmqz 58BbvALdQUEBUcuw2AbJBStJ7dtFI20xtsqt+7JQfxfPTZAsrZOUzPuZzFHlyoFCKFLrm8i1XQqz 0pQ7RmTx5KyzNYxhtq5CS77xnSKnmOUVhq8qhjoaHMhp/MFqch3BWn+r7RyYnwnHEHsAA+wYn/AB NgENVGkGxDFQJrhUqemklKwqvaj2n8sngebq9y4L4e1HAPZEPEPg2/AanzxYt5Wfwm7gwH34B+p7 p2VnD0xuSmSsbW5cBvODV7Vzu0Lcyhy3PHKwjtSp4+kmRDfHzAgycD+f2rWSenOryfBki0cTn0F+ 8+fAdLF4qcO5UuhhothMjVFmG4iQHQ1+pw1IgZaHY1PVfDcDOm8xuC21gSAGx2QZWZRXJ/hM27Az /gMPbDf4TFqJHV88FxbF0ygeQcRuDb6bUbVPa1JgH8rl3LIljQIpT1EQuA9yKjcNHImIwy4IbJrx bjt6cwcWjz8tb0yMeopSZDJIap59zXK47xF0+1kBQ6rX63qtat8xZDBMOcwUoKG8jNrRmZHCbJ5/ H3Pn18/0bKcNkXKztruNnMlDq+TGs14GgKfiBz0V3lFHDmFV0myzK3X/AOQX6WnMhNGFFLfZnh2N 8H8BwE+hYoOKTrdoFmcvSjXJqhwlnZVb3HbKdDqZf+GBlXyLtB8ILb5ySaHXw+/OEA4h8ZuRXZsT nhAQDgGP/tAkCHKGRWq8oSQLgPXBJs1HMKyOXuADKpwor8gmLYeZVfMA9V2XaCiq7YzK4vcznCP7 /wDQfsHUKyoxkUueWLq8eAZxLJE7juf3bSnGuzgW3npjd4RWZGdaBdGytGigkjQrQrb3WUNkc/NL 46MI/r02LhSYGaKxtG7AS0g2EjkgKfDmoloMVilFt/2gPM/o6dArCfgyIwspj9485jv/AB/2PIOw LEfMrhIvtVi6lWWKA0tO0WLX11uOm+Hv8qIB4GPMJzInoUvFjtTGrp8JPw3R8eRrwb3s5z73wfvZ BQGcjnHhjRwLu+DY1zJqGSLcwAsEQOmxZe/B0CWYcDDg4OAb8gHoEMYsq6HUDMbdqudvv4DYAKCf 3+SX8ul4tNnlxDrFkfLWMakIjQYabf8AmW0BU0NDMMENwreYYT+HNW3zwkPbOLvIwG7Wib3/AH8+ AqLYNgZIGyXMYuXRGS7MM4oA5UMtuyapcshytcrWO40IMKotyq1bW5tYErVt/iHcCasGjYpA6dw8 NNtTO08VUk6S7CynYavK4G4Lw2c9pzXmj5hAO4WRMD2RX8ycpOCGD7ZvO1rLz92NgwP7/v8AiA67 I4exCinXwHNrfHOnzLRthH/iQ5EYrm5buuQCyL62HDmJgcehtXD/AJyGsvNXtAsYDCJJsGA38/yD f+iSyEev6rR85jF8bVQIEYWIHocdehNB4SB2cgY5JDZP9hsGMGYsjFcoTJ7IEdgePgNg+g9btRGY lUEYfGiy7ySUnvkbEmM49V7CyPlSlsPh08tuC2hmFtPwR+4Flg2TFmKFGZGBhEk3+rB/QP36CWJg KCNjUsSxLUk20FyVYlLyN7l5RXwsWORZRoVjAt2co6Or7T4Z4UQZYn80bAC2ByTQpnMjwr1e2Zyl cjh2lrSt+3oewnCt9PcOVbS9XMWt+BsheZNh7xBn2gBeIaysvgsmNeDZsI8c+fgHH6i+/Nogl1/l Ph5XSLsJVlWo0aw2hYTJZ9OWm4i9PbRFZON1At2oYhj1tV7wXS7w1nlO2M6OkpJvf+PnvvwDB+Rl 6ahUOeQSQxrJbXxSybRikFXOMKYZ8sa4wJ64CFjrZgxxBP2NuvA9XMxGWVf6Mc4TV3d0AAP7+eAd RxBsR858uCvmi5kCyKMmDYkfOtSp6cMVKeYXIAtuLJ2HhmE/h7U2p7bs/JnxXsz97uyj9/fwHsAw Pvyw8jGKaUppnLrJsyGKWOSMUELbkLZZc0AFx8HPIYtYxI0mJ3Yo8VacDbkSQ3kiG3xAsWec+3ha 5D1Or19ysysoCkhxrzsF2By2B8oHUBYU0XKrIAmrZ8PcFbuDInjw6PuGxoYx55Rxg4bCef8AAAN/ 2DpnVm8r6bl2ohnmq2nZoGxrCHB2m6F6YLFrwGJ/qQth6T+yAwNwfT+M2gU4Nwm0fff8F8ByA/j0 BtCG+Ntf39muSqNrEeq21YY8ZMES1ooeLXKLDj63MGE98W09k/iHT60tSHwZDwGLPNvZ44D/ANNg 6YVTvmYhsA5IV7ISSVl6b1thYK9pNfEoYsp/FA5cfpMOyMoeyKfT1V8r9Sag7NzxXGW/+E9PDxyB Aft/oTrKyTSNMhl3UEixyfUNFBq0khmhkZS0EKRp7QtiIWWuu0Dq4pY0k0yg7GoO40eQyj2zhTvJ xhn8DBvBs8X1Xts4X8gwuHsmyE9ymRZa/wDkCIyxVdhioYf8VOHzC7hDBvn9SkyfFyfOHbzj+AAA AB/FBP4RpgHYgZTD1ouX8bPZR64xP4YD16txT6RaBSGv44uCfDmEFu1FK8PnBxgxDwWd8STZs4AA fofft/xajAnuGUtsosDMk1jmgSVZODhalkO8zGm6nPRQ6+yU/DuDZ8Pg1L5x8J1nTbQU2PZTZx+Q f9v7/wBYvmKvcmDOgT6TNh9hCe1YnzDDMsY8WAlA/A29Dh6kIY+Z8/YYVb/tYyoObf2DYMcP3/oA MInJd3vCszeNEeP9b5/0H46zgBJQYEeTxhmu1uUVuuXqqF+eW6W6uDsjNKJ567r+si1BlnfET3wC rsM1XfBIt8ML8xbmODIYHzIMDfmoPwa5GjnJw2Edjn7Bz4Av9G18DylQZk2udSVSv1Y6h1UJbFoM mTqQdw7ketgC5QuHrnau4FtfMI54gBOe35QRkY47OwR44CfAfQefdJ9beFe6Y/xbBtR2uCLW62JX jK3W9OODRUrYrtDJX+K3T9cMifTzhcVD4tqPhudotCMz72b4OfQWA/4BBP8AVtK/W83WRYiSuWrD k2dzBkr1w7Vp9sPpRoE1fEMsG8LbJaj5YMz8gNqP7LOkt8eiYPezewoPIEF+PgH4/nlbZ1MItI6h T3viIOfApTuZ/rbxKA2xYU+NdzTBkkzmkl7gq5benNf8Qchs7XO3794M9bW3TqRDtHMDK6fxKwhp iVMk0jHMODhWXxXzT0UlmE9kMfRFtgtQ4Ar/AAOLaz/QxM5aJz/rwHfz/RWPsRLgC0OekGFLN+GS Ex0nJX1SZKV+ecksBbMGJnJB8ztKQxnY/wBL4+wRJCc+X9//AH8/i2tRFTzIpRPuQMkyQKbqQQLY tCjT1oO6HKi6j6vVw/MA5hbMJ7AhtSHcE+j5iMM9mZmBm/B7+ggH4Bz7gNS8swwWMyh9hDxmqA4E hK+tskgsYltFTi32HX4cwHcNnX2Q5ZY9S7kYVA0WgMWcPOHAGwcBPgOfH9ajCIXKjIeWdztlMaoV 3ZlrPytUPNmkMuUh7Nu3jTzleZIy8L4rx8/kddhiRlhqPmFA1kBEl3p/VFp7q8PeVgr0O+IqnQ5T cHBDZFvSXNT2TYWAC87YivlojBmx9kzgGogHd1Bfv1uAvj5ikh3NaCuh0mngdaS3E0j39WNr/MlR S13K7gwWRDZNGaeh/MVe0ClBsgmTV0OzMEc3slHnwFu7A/AMMX6tLYplHx0W7MfUNSas6n5Kmrw1 tHpxDq+xnem4u4WQH5gtwqv2OBV4EHgMWSj4zLPNv38/sAA+Aw388rPLmGWDOMgpkkxZeTGsK2AO lZGYWSxtQS9UrkHsBwMJ+oS1Fth7qT3Ch1X/AFkKLX5swdjiCAP0G/Px4+f6zPzgU8QsuEX/ALik GWPP/L2U2POQ7QfLAhXtzzfhiuOOMbUI3Js3uU5K0McCbOVCuk0owafj9M2/VTI2nnEmbiSKOfGC WHqYo27FMYPmU8n2pjX4exq0wUmpbJ4XIrswwHVxvfD4B/fgADYOnmlnA554t88BZKufLLslliL9 kV6Q+YKcpcWVZFH8DMGFtbT2SnSDABeO7+6Pmnonwn7wAPnz6CggPY+kzjYltrINAudejbgxcJLu 8WpW7REcHyLLaKvDsBiYYhsjJiyPF8WBdMFkp/gdoVnZjxvf9ffQaiAcBAM6HHdbW1GUnedyO1kW RKmVukB2TJr9hre0NX1ZSqvQ2APMcLgquYApPYWDfFsmUQnxm/e6ueP07unkAAfwkm4rZsqSIIcc 5FDSbkZBjRmsZbtvRoFMDw+XbI/bgO50mDrGvMksE9XKi/O3tcpfOY7l+W1Dpc4Gp+YBgQ1Jb2F/ YTBh2V+SASks8VDj5jJMp+GHIBziH8DttZizfDQTszCrrROe3u/VEfPgN/WItfMNpXBcigXZ8uQC ciMFbpIfH+IJpLIcXTen3BQ62HT3xfhnJ/LUfc9raLMeXhJ2MHUXd3nx/YAPXyY8UfZZBJFrmmNs yW1krdgre4KH0360bIlXJqEKWMn19D2iZMshPToL5YPzpjMs2gh0b7nAdXeAfj/aLgL91vAMmZPY KrPFOfrcC8m3Z4fH2yHV9jcxfHxxMcwmXCHIIc5CsCBzDbCgu31mq0jfAZ9+Pvz8A2BB6FJu0sXT BnZ2Ltt4WFYgDFsqjWR77eIwtd1ibH7c/wDwjyq+1b7xWUjRxj/5k/bRgcy8HxcsTOzc1PWwMBDr d3jw74H8wfPiWhq04fcNV88fA6+yI8Bwn1y4MyMr/jP6TaP4i9sH73t3o8ISFNSsCt56kyVvZzQe CWFp/WzFoUjcEUp2bctwp/TGYQ5neCHA4f8AAcFmzOL8mR0lJCfr9+v1BQQCCsct0eK+pbBcDXYb p9Iyaud6/cM7hEIoBxixbUwmXByTZx5hqUbgtq1Q9QLLQ+LPOEkI7+fP/QeA9WPR63bavT2WUiZN jy1aGgiKP/4ldZF20QnOdfRIreOT5tViLsfcLTVbKQHxrMWcLVxVZowV22MFgBfqj5+/88wYAItx o9mNpZolCVtCfGKOPeVu65Jtu0grjuXdPBIrLuPp0xmn242jUk54RiVpUUih43WW7NlboeAiLdfM ypMt8aD2SNMTw6TyglW8gTMFuVhHvh4GIeoRkcIdXhwc+j324tr7yK6NZhzmzs8bAeP1G/ddlN5g +wafs5ozXy0SSiB7IsFkIdficClS6cK5aZvzKfDzE9kx4O+N55HhLJPniy8vGyJIPfz/APYAHRVe C/DMvlAy8rOqUO0IY0TR8MPbEu7GhDsIWBZHAPdkOGtsi/DtTS0PgTkOzLfvhD2zZKu4OfAPz8fP /QcVuLS7QVzDsrq+ck5NI2EaLI8wbHs1DKIbFFrkyv8AbdDZEIPYAejzw89Orfa6HF4fSgmLyfwQ d/3/AOglIQVXEZPG6bgaffkiJ9s7yYJlt0cUwXMvea49xRbaSVMHEMiNjmuP1GJW4PJwzyW37wtD ta7E8YyEuvnyvA6Qt6b7PqAbSaQYr0bYBbgYFsKWzg48wmB3Cn0+ZBgD1JHmLIx8F2YzbIE4PsB/ wHQdcOoSr1ep85yMtVtGMnJUl6tyWm9opzdBbZFKsg/Z09kTw6/24ocgpKq2TswW0VmsnEg2E58A Qfvx9+6NylmSOcLZnngQO714S4/TLUvxPigV9XFh0+Y+Qw8wPPMQVJwQzkNG4GLGI2CTaJs6AX35 BP7Bz7qXswWr/SWNcT1KG5Z1S1kj2cq4RKrTalYXKL3QmB/hp/zw4OfR74DT1nDdHkYDwdt8/VCP PwHwAxKzmKOplaSyBDzlJce47DjHLtoc/PP4Sz9uatCESs2mF1kQVxH+xy58gf6G4tCHdVtlVmBs Y/N0y4MjvlZZtngapbR1yoNrC2TLiRBB2PPF6eSUqsyWROJC5B2eegerKKEWkuy4GcjKnR/X6es6 8kJ1rNtuRxjOM08R84lFyCgVlm1HDBq6lPJw2Y/JDZ+QGbnHNn5WGSjzlGAJlwXu2hBRWhLxSBYP qwmZqanZ0mpU7Y9WFRTSrtA4qCtC93mgKv55NeAdZmY8kgk+SYtLyfz/AMN1ZMeLW4FBuE9DcIyS GfLIEtGdpXpewnxypGIBpIxaCe4TLVfA48PqaQ6/rQHZFZExf5MBhHak3hBfkDfwPgEHI9b3QUS2 qK7mLAWyieRR3gbW6fbBjs3ccqUtkA8xktStw9oTAdZuEGCHRkWrydGswP8AfQHnwHAQHRfMy0My vuB6Lk3Yk5W9ltPFnTB8uHFsZIlKz4whw6fcENkcK3VZ4+BBMDGb+HNmZgenjZEffz+PID/sfiO7 FsK6OSeLBmX9qEY+f2F9qTxKEBA6mrGlGOYzKrsiGYT4femv9PEHAnb/ALVn/mk/iI/QaCAQe7vR XE2ZGBeEqZXd8M447vSgYsO2/wCWz5Hp9AQyBTltI3cErL1O3ccmx7+ztrgA8m+km4Q63bY5i2q+ zjdqSiSkJz7ITh7DMFvlZOQF8XzDIIZJgerw6rZa/Pp1xWRhRoJ7FzZ23/YOfH9/AdWVzGB8yWCk zS5Sem8lXzsk2wYo3RzV+zi6vbCib+NodkakJgdewggbAun5gxmQxfJgfhP3/FfP7AA6X2ZT7o5O hK2haeEmUjkkohgC1VvEMFJTDXJ4wQZYeNkQ4ZDZAKepI6eTrPTm+DEZHScUk4AxPvx8/iAx6Go6 XADD69Pcqf63zUKyCo9qzk9TmFLaSGiUn/MMcbQ0PeIPb898ys/obMTB4fR2D/Lz+waGETqVY3dc 3KtDi/4pY7ux7rqjVc2tJHVg2LivhWi5uvO7BL4vigPDXfFFYeGD3BPQ8pqvVJrR2shhDmLDDr0M qB7ccbcIdwuC3qEZGAOqwLQUp3BnkorrOHCfNn9/58/H+rUOgekzLrf0Btu1bs4KyDayX6ruCwVO H8oTLV63+yWQyXWn8wONq/AajCNUCsLWVl41D+cqLz/aIB4CompRsuwyDoehymctgU3TG7fIr3Tq oJAerxbZXMqGPiTHAxMcCE14xX7MVZjNWYsWzb4E5th9+xwx2Drkr9gq8DX9evgsbW9wW0HNtkdJ GOFezGimxMUX3QMMlD3AhsjhVbU+484MVmjd0OcvATGk+AoP9gAAD65A9xymTCZ3RIVxyPEsMjEm x8RqpFeGv7aJQLbyghMI0zZ3kwqqIAXFrysgmxQHg5cHYc4pq/8AguVhIbIHu7OQKyDwya+77DfC 9qClOC+Hp+ZMhmCK21QLQQzhhGJvmLzwZ19rUftgP9osMD7882B0fTzRXuXQUyNpjbUmtxK/QIGj 6yhORR3vipcPhWo+PkNDIfA3CpUdbZqgFq7MtPBu7KuOPwB/YP8Av1J5hxbMx1VSrkC716m2QybO YqtXXocqxncC5B2CyLIhh6rDpyHVdl0fypPrPa6v8G7BEkGe8+fQd/w6sIDqqt74wmVzpVv52Q7Q JRlOOnrlsVOyIQCXUotk5JM1OVvM3DtyhsCjcRgmjK5RZZvxc71XjsAA+/c+6GMCaRjJgIQh3Fke kMC0BCUrv8mnyXEn2NlQFnaM4A+2rP54U+PjxXn56rSPrMxdOZWNLAWrTNVYA+EYXjOv8gkPiaKs JDtpwX3yHDW7gZCHFXxfUp1Vk1lnaLMGA+EhLU4CfAL5/wABgVUeDH1UwZNQVfbS3bcpD08VlbF5 TE+nE+ULXgLTMHsifMxDshEOcPD1L6y8vgtZJ2p4XHE+ggD6CAxXwHG2ENSeWGzldIyX9kVxvcFw Y7rH6hK3fE3lG8WDDDuC2hw19PBttYPm8bZcm2Eke7DfOcfAANgAAMTBQfLRznt1MxdNVA2CBs6P 9qM57uhLDQpysFBfqxPtOyMETARg21fp5eGN5eMVcWsoxx2NY4nzzBgwH8McGTLKquHhfBaydGiO NmxaySRXdEDEnwbri63Mp8QwdzQVfb8i+SW45HNc31G3LTXarR+t5rS1LdnSj2oi4yA3OpdsT2gW WRBhgeY4et1XMYIc6tCNaWqyPPF0NZxqurvypv4Dz5/Hf5GlHiPbWWn1+90yNs7SNRtx05bB5IR6 9MagdT6Rp9TU+wOBob5MD/EeJ+n+lnjDg3vUBLEIDw90G+z4DkDBg/jauyWIpTD1fKSeyWQBMXqp p9S0baDY+K6bqaKNFqL6G4GdPb4hL6ej1oQn3guWYTtB8erMRwnnO0WwYANg2C0WoN4R7Ut2dFqv R2zaWFdcHRA9hBli429yiei2auLjpczC0k+nU3Cepv6krYPK20i0h6OnLsCnkL2xPr3/AC+k9HTP GGY7bruvp2hGzYIn0yTGYFilUXEUiSwyWVlRyqMKSUxK7QNjcKwSivfH5A/y+oI3+f48fnIUosgW rgVO4ANGVvJ0u1ySbVOwDFSp5aZYtXqZ60Jae+LcwOZ28xOodwgVwt/aOTc42R2R8D6CAA8B2BBd kx0sQWDG3dlWok5WoyjRtI1fUunUxDQwNnlhdoMtfp63MW5ignzEd8IWXTrIMZmi+CYyq0kJaPgP P9ot/wCmO2PkB80eDavfKfUqNt52NRLQybUX2xvlK1xi4vsn0ljMMWTaAYHQ9ovbwns4tWpp5x3t J2QCv4nkHH9T8aT0AW5pCiKzjbKSyuCxZdccnpqyKga1xntqI01g9DrtW5jHcM2e4bgfAwJpNlZx rusvNI2ilAscAGKDYHp9R48lY8lWMh49SCJZpHERzK1ubaxzSXHPa4uzLW2QEa2x0K38oZEmSRAj Ksn8U6AAEnA3tZGuBlbe3HlQENTE9crxvq/Nrak4QGY7cvSbCjl4h4ovW1Q4deZGTtY30mvslxcP 1D8b3MoUJjARsJqHtTYPPgOQbDO1ePIE7HSRgejQudPve7FPGztMbRcbihppbfjA+ZwMOYDD4gSt SBCCY+hlMBZw2E4O/AD4ABwHnwBt/wAvPOJ+VqWarspN3DrYmwE+ZU+0Ve5aj6HKPo8xMhwoafzz YSCic5yTV2jjPCTbt4AAfAHz/sAD1s+75zmZcarW1GJZ9NGlPBEMAGCZYzjYbPST4Qw41ZMIzX6e qIdn1qjGGYW03ItDDmFpG0c+/YoJ8+wc+6pNE0cWpbTqg1Ev1Goik1M0siQTvtZSlpXfZgWl9OPC GP7I1yNqXVkarSjVTTbUTxxvtLQOlA7laj9tqAeSQTwK67HCHqEUqTvJ7UodJ1LWjs22FondtOod gQz0S2MBbh3gmWphZMwgHeMWECDh4oz4TrPEGFdjX5eqMAA5BhiAraEufVHTFf2/jU1MqSHF1Aqb agNxIcqRE1yhxhb0St4xMqwPMYFtqguFaNAhn3S0Mec4cJOIOIDDkCAgYn7bOCep2W+GMLLo1SL6 lodo3JIs5bj6cA9S2Mwpr7M7wOC3ZEOZ/qWPgQXwozK/GRlV6h+yZxBfvAn8d/6SdT6sMzKvit0N SQ7ImVfahGJGyarV2FwV7lbAIGGPD2QtsiEtp5jtLaAH/a7RUBPhLsk+A9z/AD4+fxasEj6aWPWF NZLLM8gjSM6fCNscYSwebIrzTkLd8qPmF4vqc9I4iT6ZIFYyfUgyKe+asYsMu2k7uReXXHX1V0nZ dVp9NvmnuSki4d6iXCwtVA9s7xtFTq4tPcHCZvFJp6+YeDw+eccBnKOTb4EpL2P7+fAcB3/okODz IZLW5TvWMka5NSAkV/UrsrsKELq/fkN8IVBdmFkIfH2TlvwGpPWeLPgwZiku3n8f+wYdWEMNF8tG WeumuUMJScCq7jqdomB5FDbWBsLVABML+EQxDT2T+RfHC2gfBhgtXRlne/8AfwAAgr+GB/GqNsPk htOMjRYMw2eu4PJd7YuDOYFMxsJZxV7UITHCZZC24D5jxWlP7GycG7N7mj8IN4/X/wCvz770VNIC UzTT8Nw+EiyNWbyR4mtwBcRkaxayfijIB6mffJiCcfCRRwxxoRZ9uLG75DEV22ZjuAPzQ55SSK9q UPmp5KvSFbrZmWYaHK44oGGQDsj5vCGPT0fVLYCHOmclFtJTY3Z2SQgBBwQd/wDPgONYsBsgWwhn kOwthUgMmpzLtnBmDsjKpx8aMSCfDRLguyZw9WA474yM3eQVwXhKSk2p2i594DYEEwZDhyxl8+7q 4EIhvhhtiWQ4DZDEHigflFGRfT3CZMod8YN8bavgQa3GDOL9zAZtJdjqDgfP7B4DpbuDAr5MwPaE rO7MLjIyO4dPMVfLDvivQ2oupXz5gdb+Fe9oPnuQfDieM/oZGqt2djeL8B/Xn2wPyWCvE0YN5oUQ 1yJ2w2SBf6f5HPF9MUSBkmkgfA6lY3KHOkUUytQXiW1IP24eG6mEchT6SYW6WMqq3nRckbcYeHYS +7p4uVMlcDYIa2GlzGRgZK5Uk9DtTAYMKFKzqAH+LjgDHfvAAF/okruQ+IcxqbaMSSVBZo1tYaXy FuOkJ4torI9XLJ98/h7ZDC+n3EetFDeGSzKzabk4ycq4IEOHwFugcai7Q1F0VZY/UQZxdgO5VKqt Fbu/cGZnr6R8W0WwCLMMC3ZC3ZEO4CEzftH9SzjFmE1fTm8oyObSTfAe7tRffgHPljvi2BVxuVAZ LIsKxqrCL2ke1EOv0lwKFNQm1h2C4NPeoSk64W3BkOHq/padW6z344NZnNjYPz/AUHwHP42ZVkaP ccuyILA5TGzeLechxX7s3wsLHGwl9loj9vEgLqe1JL7K+Tg2XHiuTCpDlXhnACm5tP3ZDulJ5DcA eGwLy2etF3rkWyL8Ot6gpO1E+wYcG27QbVV8ZifPFmoAfNucH8EEBbp+okJC6FbsyuzZCZ/inpIE Dakn5DXTPHlsC+MLQr9r0OGh1u+ByFko8/VhUv1m3xZSs3kGESecW7/v5B2E+n6/sTaqyT5TvuTs BmJBZfqxbkWwyC5S+5Sgw/Cn3x8DGCExVtohQ9jbn71fuaPVwT9/QbdAH/AH56oiiGFHsh6pa3QL aq9VkxHBPDsFm88fIb4UWx8yyIa2yUO4c4AuDbO3N5q/nTz3Rq5IR9gfgHvi/dOj3GKs39RESQjv il2iQoik7fTTNqTE4Z+5suB7EpYyipxjHI2Eie0dy4nzf/Y9dlmNGoAWn21eaRhW4DTSS08WEHdq lsl3ZGgC2K75ajAycDW3x8p+YcfLB+DT6MzcCJkgbsk8HYD9RH/Pv+wGtzrdXn3DOxAy6C1Q6brU JMQ7crAmMjTbSnFPIagYMGbUuFOr8RqZA4KbUYWXpn5ytdr/AGxP8CPYP6Diefp87l1vnXIBW4sO yFWtLCSXfnkwh8NotosBFzF9DZJlJmHBfWwe4AWpk7v1f3fRkc3aKSb+/IPPt/3+tNk6jK7zaTMV y+VXerJqHdm2JIdr+X3fdE1soeUtuFpp4dbxmV+H+eQQ3f6N/oactGrqu7uoIA/sCD58pAjyKCHw T3CNN1JMsKXctMXjo5pi1F1N89RJHUOM0FyYYTNh7MeZYaayc7UZ9pDGzlxZCEntp60aHr4XU1bx J9cSogesaxslhtQmr6g+eYdtkMuxw8GBbBgT55rmDGd8KVCjYpWofFIAvz9i/YAD2B7jmD0dXfGo XPJVKHbUKrpY+sLIjiXBNQ2FX4ewJ5ih4fD/ALz3Q2Nkt8YUK2ZsZs3sbBz4+fP7/wBbbGSG3Toc yhlBtFKak60PVMAfwIxBU7HlJ0y97s0+4yqGvvCrIJL1YT7eh1UtYeumSnuC9VWmfU+nwXp9Hr5B 6cO0rIsjKiW1LoK1Alkab3a9V5gqTOeBVEezDbQuk2CkmSyNmmJ/wIBGAqwnmzMH3FYBhLs4Piff kHf8T78fSS8DYRpJnMiBBJIFgXS6e8GRVQRxSNvHCNI13aNuojA6mCTK5mDnacljLFEkgknxMcbP EibpfaemZRhXC956NsyHMd9N54A2wq3pnUOq2TLXyVkEEeZYxSJKctvDhzBiWY2dHPV/Ze8syzTY v23sIEOcf2E/z5BP9VvsSu5HNFWeGrFkhq54bEvAC7D6cvloTF4DpzmVeYcLhuxPQyAcHuHwZnbN ouTznCauOVEfAL6Dv5/oqSxaW+D3XiWqhtrEoHQLZV6f4+kJ5+0LNin63T4b5SZiqw9gOCruD5Vb ITxF2g8s2yAzewfqA8BsEw2ZlfrlsKtcrg0lWFqw6TLJ9boWndefIrRqEVzyGw4ofeCZajB85D4l amGKzte5g+bG0dB2AAf2BB2AkVoGfCXJFfUuqbm5j624RdLV7wANH2XXNA5G+odpZIkjdtuxH2xn CKKMYpzj/HZ7j7iPiz0pGlQ5cYDB5pVlg1WqzDTQMmVjQ13UwwJ6CWBM5cRkLubn6mZ4m04/oy1u Iuz0r1yZBpaPVJPrdwUiMQAyQl0FnRPn0XTeoLOmn5o7ZziIcbKmYV+1adWbYsZbKIjefiZIBt9T mEmZdeERgaUJyMit1D0QlAQN+AchRfWWZDU6ZnSzqkQlDrtsqcTHshsKxGOW4thaq6Fi+BZoxp4G pm0hZjRY7nk8Wa2zV0TVmrIvmxMWSn2g7uBJDr7UUEs9kAqSQPshJX6yD1zXOsVnqVPIQ9QtwWoy OFgGLGA3A24bYstBSs8dk1e9qwGO/wCJ8AAf+kktrdmNAvOsqoHZbD1fwBhtiYeHXHZCuriRauhk ENkmYsiG4MntqAbaPcOMixaMjd0fvB9BP+3PT/VzZhA5d3YcfXJgktns52rEOxkniwTAtoLRHKGv w6HfFtwqpwQzlSkLawTybzV/JnnhKSbB/X8bdx+g1FSdkrcmBeHYDV5IlkwKfW3dPmaaZC8HtByi NAuY4GNQhit2RkX3wG2j+VJ+57WLKA3bwb8g/qA+/H7j5VlSJFhheJoi43MrsMU9m3ItDGTvqz2n oZEaAsJN4TOjpIcZYPIXE+rGM8eeF8XRI4HT4o6o1M8l17clN2QtrcpVshTq+wjFbid+tCmyltQ6 /MTHvjb4Ph3FgPQ3j3rPa/ypsmJy3eQAOA+3UCt0HZFg1fbWVAhjc5Sm/L1UW1WxBhDq8lerlXcL AW4e8WRuAdHtshS0GY8kxdy7n+oRHAAD4D9/YAClfFup814DudS2RW+oSwc4avMMyk6nsJlFykdD PUN8xPviny7gnofzyCG8YlBloVejPNqfdng/4AAf5912Ols35UFgOGUUyXZq0qnjbZU7VpqyLYfJ UVeV2lkT3AP8xkwq6H8BP74Q+75QoT93Z3q54AVEf2Dnz91ZSfHH09ReqR6kTsjgBPYEyO66fYuU ednlceVs8LMql5Yc4WiDiXKR52ruR8VEe5XctN7R3Guu2r4epSoLEh6jLL43qu08LcZTj2ENsCwl spFthDcqfHuEMxDEbhvkBg+DtjMLaCazikm+DgPPn9/2AAUg0pgXE/OtVMMVck79H7Xnlsewhygt sKWMnjzFqB1vjZAxO4fiq7mTq8oTRjmO9nAFQnwH0H9exPZMtDr8PlyYdbtSbT6kJYJhJfsKt5Vj 05cnJGCHMD2rDW18Pv4A/O4ys2gLRvN1cb98OA+f8/A0mPpOxh/yqvarafJ55Sd3AwnI7Y4VzK4u LtQ+h/khkhp8OC+ETyr72Z+TKg3pJ7qIOwAD58+wYH2FVaOQCPaQPg0atcbYlcSi0NusiSLa7BsV 1cbZOrNI8rp/Gzn+Oypah85UAeRWNc9cZxXTxZStspNmcDfM5Sd18C4fL+LEiAD62wQ7IW4c0xhz mAnocExybtezYnHdJSf6BQX7wADqefEcgLIElyfYKTYVg1XUtex6TOh4j4eV9QiuL5A497E9PZCD hOUrAPPFkEyRQoss1V7IbeAAAAfAAPAHyQOQy7GH16kJodbuCfqQJO7BUpi0Het65lbomshBjW6r MXxMX2RIPD59coawTxaPaq7R72PH7BsB/YOg/MU2QCyWdlKRiStqTUgLyvMJc3T0xyLSgMwetrcO yQ/eBw5a4PiPMWeUC0UpwnwYAAAP7+A6EsZFVEdHcWyB2MecbVi4OLeaNiu2hzz0cYVKxzFPGXwf H1Iwc4z2m8cgQ3HuJx56ZC/gDaOePm8BE8XW9FLt8O28O6GeiyyjmYHwzFkQzEP4c7j9l1yt8Z2v jO9hPPoO/nwD9j0Hg7cKdr69i20NSbCF0yEYh+SHIL1wVy0MIGMHxMVv3U5i4B/xeB5IMZygvjLw bx2NBAef6G7Yr9LgKhJt00sjIyHgKSkK7I1WAJW3w9WRSVZDAHrcOYDvlgWoqnx88GnvItXKDOcb JsZ/2P8An9g6tEQtys7VUyUBoT7srHWlMf5ceHfzBcYe0N2q+UYIJ8NDhvjgPMVy+e6rD2z7NWYJ KSTfPn5Bfv7B1meOI7U0t6nZmjQSQ930t6U6YpIPmNMQ7TWPOOA93Wjc1MMewgjiWf10h1EUS7iP WLLKkaSGgDlutLWS4YgtkjVdHzWOn4aGmgWTVFqDD2jE4rYV4WFiKoiJQ8WYPZJtJmK3fPh0eBHt 1VoaMzFKvZhndEJaOH34+/eAAdQ9ZnF9jeHxotDloF3wrYs4ab7CT14OLx7oK8NfDobhs8zZ58D4 ECH9DF1mzG+1wRH4/wABfT/n+gOv7cvyvnDUVm18qVc+VfZyTET7Oqzt6YaIpauSkxfrfklV/DcG Sd3hrTZxnA0NZJvAQIkPGP1/wCDsEwpMDopZmTLtAkEdq5qtkXh9P3YwNlkK8pIFoa38Oq6fcDEx fmQTy+PVfd5QxfGTpu0TfgPoPWponD6hZVCsXSMSXebmKKWONVoCOMbpVFybCibOVDLv20LYwtso E/ion2mycjXiq5qj1x3BQdm2NX92GagTwjIBG1uJ75WFIE1u0JrZV55Q5JEsiZvC/wBxgNoTzu5L NoXJUCz4QIc37fz/APl0pVPi+VZBJjSEM5DnocYTHSSQ93cHKVWSuUiWAYDrfciyF8ucsun1LZ8R lNFCfBzZtJB7B5/f/AXLqOzB7kvh81jhjUOvs6yBNfn3Ae2d+ANmuUXkDgYmbOyDw7VP+ecD7Zug x57XHHZ4599fPn8OhC9KyfIoOvZ+aHjKtjHiUr/Gdh8MPKKMP08hDZPmGPrcFtHz1VwGborrDMcC JP7Av/2Df7kjZiEbtw8HzlkB8cVWP5PnpQkRVDZXl8Hiqr/W7v8AXQHV7Jbjvkfjl2JZN3aVhtsG KxmWxLhtFtfFTeH9yKTquEYcDOw87gsjM8k6v2w5wlJB4PyDv5/pkMFwWYkA8m0KqcIw1jLoCQPf IcesrIsZX3W2k8gn/DcGOYwTJwFwA2NyYZ9G8J+v7/wI+/cBFQ6mj5S/kwMmseSXdDW3cPn5xCwo blXNgq7SyD4YeyOH7h3U5hsbgT4uLWSeyec/397n9gjay095ltWxnVJKJSVUqhbsHdltXiTFYWW4 uyXByQxhvFgGAbawVKqh9saVdGJ/SQgPfwGG/wD64TBRRd8UHbnV4RihGlWLxtubFjiuOScXkGCS PJRVWS7k43HBy7c+zijWI5+RDjtUCvKzMkXm1Wk5OaYCV7YKq1R5cwCULlHLh4eZzEw4J0P6eBa1 sZuvOeD/AEkHi/fv+wP3Ta1cI98C3CmVdodqupm2q9q4sHfBtHrzIeKJEXkneAO+GIcP4c5SYAIM OMehTQMeXg2b8/4FB2AAA6CDhDMqVPmBU341hRbCIiqHaklHpGGUA2FXMVPcLIZJmD5ZHzYKHX6k cMI6y+U3UAyqwuybBv4A/wDof6nVZSpVSQFGWp1AxLhPPS4dgN1tWe1ONn42DZwsLPMVWx1bjjBi 2KDUVIKHHWc0DSWAB2ws/H0+kB6fev8AFh9a4pFCK7b2zxR05xlfhbxk52qsfa+V/bjyz6fueA+i 5cmQS9uEnaWjUWc8KFt2+4dv5F6v9fKENPMu7tgN22TsAG1B8twfFd3V94X1u4Jhit3DkgKh2CpV VD3N8tBZRng2bCHH4AA2DYACD04Msu4ARd2ccmJMyvhrsp0O7/jIPKixCibDYFsut1u4B+YNR5fb VX7MLtBGGHAnvsB9+9/7BAuDorqVwQ5VfGEqyEgPJ4uhuG09r5USxxdbj+Nvi2YhuEPcP0ZCayUt DHfPu1q/l48fQcd/6O2BHrdXrsOZFvkavb9fFtSthVWzEMO0AV5Nrn6finocxk+Z8+wJ7wuEyZQX cDyjVckhAb8A/oE/gf6ilZIoRHmfqEWSEumGaWtMBkx5/Hxx+R0bLiShaMvFUTKjZ1tgAMTQrOzQ o1R5PSImCx8CHTLHXy0tzJWdGluDINYK9ZHyS2IYFPIIeoSbDm2piyA/0OBybyrtHJvxdwj6Cgnw G/4dOD15YddD3Mhi69qW7JWoRS0tPDJMI3HW8WxomBQwwMkyYthw6+4NUBwbUcOMrNpKMyy8G6u2 NBfrdAPwA+A39G8sKZshqTrHzpNYqRiLLHmLCeFMw0Pi8U4e4mMP5yGQZJwFwPX8HJo3KCbNsmyP ADfz/tv/AB9wPCvszZW9jK7sk/4pJSSLYaphiWyIcUTdzRD/AKbcK3W8XCubMYAOLITrNofGZZOO wTwCCfP7Af38BH9Mr83fcvbItV7H5xv57TdD8dLdY3LSe+8UwAuR86Gyi/O5j3NfZh7WvhVpdbr8 Uw7FKlarRZLBvL8H5o2PYVbtEqwhfJKvvi7EO1A4f3gzyGINwRmfErUCyj7JiDAIPn2DfwB9zWBc BGn6rVYEqwnasUjOCfxAVu+B2ExFTeL3ItkGRP1IGDFb/DtTuA2/DWVndBgw54Q5wHwD8fPoHSBI L74kA/gHlBbMQFuMkbmSV7YhyoglyPWoQXEOHdlkWQnh52mnfpzIT8p5wIESePgN/wDbz/Q2jslF wJFhCzMwIRyoY1eDh2qrizJcoGJFF2RX63ageh+YD2Sq3xfwOMnOWj7NsnCfPnz/ACA+APgCmVnk LqrncreVFyzxIwvlQuNvXBu/iui7QgVnQ7SJHp4nbbG2p9okb0xjxZdksNwDzTmsyYvq4eyLBM1K khwNnJNZEFUDSAiYLqUS+REMiycwDzFtgD2MBo+y4P5fFq5P8o4Wjz7f/wB/4D0ziOY6KVkWdaGV xuYBZPlmA9StFOLavUooXbS38NPQ4dbhmDuMBT3xHQ+M/WWc4ECJINgPnwG/H2BB6p+DuwOeqfEN zxJmOS3V0St8mwiBdbQ1d3li4bgHmMhia+EMIM+ruKraNwMoz7GkhP6AAH0HpkVIj5QYWelJqTUt hVBp2QZfcGx63LOFItAnG2g7jNQ8LH7qDobV2/PPDgso1X7ZsZvhCMAPoOwPx/8AQZEcbcRO642o tQkg3ZHv+No0taAp8hZsFORXUjki5eNnSq+lnDYJFdbm4QG93ZjyKxJ89G1fpbplZS2pJqq7Ox75 NZV+YMSCwdoq+JXNNw+YTYdwTLIITQbangQVqE0ZDQ2ZGBuxvfNgAb+ffwABBZCun6f5+og8BtWp K3mV81MkvsOnp4mGe7e3JaKeQreHW5jgdgTIM/BuNsiy8tHk9lCHDnaLfwACotgP0zT19sY6Dzmg DZq3VeqUPqrXkeznD4jIm207pqunr7hW7ItskNwW/wD0vtkANub4r9sweITUPwF/38AAQfAOaOno W10nOd2qSHbdRRJhIHpiu2VWLaCyaBfCAdbsit5k1wQ2qAQbQbIzDPy//qibB/8Afz+GwTcncyHd 2x6mmEjGWCSXUdgxaKWBajHmORXfMF7VMRkQgUxEtA8tpp5md4fQh0+r2F0rmbM+pNJOUkiwAj21 OchcBUmQsjMpFwmLk8CSW3eEyWFW8P5C8tgSiRaOMNfW5i38yGQhgyDBWnw9sV3x5WXgJVzsc3/H f9/AdO1pZF93F1i7vgEJMP16kxKPzoa+kbpKtiUhmHAwHsd8T9wD1z575aMs+TJ/1t58AAftgAAO hpgmCyj4n/AmIMxda0mXZCqkXQvQ90sIWm8g2e4PmXxvCq2sFtHHBmKe+nomcCG3YHjwH37B9NoO +WpUupwPfpmnwZmuYepB3kOAEe2fF0+rwGuqrX+ecwmcgtRqtpfUgb5WfF1f+tu6NV8/QQHgD6EA jKjKHkV3dUeN2WaWHcjl2wynaZa9gosXrkCubEPHGkcUZSBC6sgcxNUcVFYxuwyXjmbZcD4BU8UN lCD4LtBp7P4O9Mu9e05wca4UvTr5Up53pwotEHxPT7Uh1u4PkECQfAe2W++Xw8//AAADYPoPQHXb RZGqWo0M7Aajbsx5NkLy/D1RMFhMgGxtPYqLM+YGrfvYyV+4Th9fz/mW+zCyqMzI5zvZv/5dP0Hv +wceXXdqWhQ5e6VeG7aV6DHNrDTAC68bCWotENsUooYJ7itskPb5mo1Dr881dy1hoKds/wBkxww3 /wAAfAdMhzrBHC3IyOQugWSvavW42mUPkVLaG8ABVZHsEMcYDzIcyYPm4qTAenOJP8Dk8UerUl2O P2wPx8A/Yvx+KNK3pNKh1JzUS6afcrCbTxz6addt9SuoX6iNpEy1G1QF+pfUb6kCSVVcRLjMA4CG OSXmNkA9N4xi2LxxQ7nNrajqPvkJdM96yINb/wDEKdqyz1VST0uzHCgWj1adReou31MBDC2BqBsd RcbNlS2u3GQpF9CU4WmJzc4FY0evwzFCnm8+RLYC2dXlUNTGmMctg/VbdnxK3ZiANenQItpMVGG2 ByVMF4VBVrNH5LhqCpkitrthB4UdlDqkKC7hQWXNzYwl49UXH0pqbnSPRXhILUUFO4BYFfGP6P8A 1/XTfo9TfeJy33f3bVeeP/a/fj/QfPHlYPR78V0OwpQvKJHs0wElPB6gUd3mAVesilIGCBgPDmGP viOBH1pajh+LiiOM5v8A2AAfAYbA/ALpLavcmbWbgVM1jGG2DSajU7wBsin6ctSVpfU5SH2/mLRi +Fu1POQOW6c+MvNyFVl6/T9/9jwA/v8A0sVsfMsGYhxQ1GoFzGe27DT9YochhcXPhCarsfbdbW4c xDH1Wj2WwKQP/S9DZqzRzZsIct3wB8+/AH5+h6rX6zXLQMMaQ4RqH7MElPlTSHd4fZHa+Sdk3x8s it2Oeh9y05D4eTGdr9sOJPCTnAbdPgACCfP9NlEbpJt4GsF1LLFKkcyNdRTPEk+Eb0bDA5kGiMT0 pJpEkhLSyO7ZYEvCXXERlsI5ZIty+C2LDEhb8i8sfRuCuDVpn2/Kdqv0i2CdsiXZGpuyKfsJP2Fe qa46g7jzNQlbp5kdMggcIBvk4zDHBmxdko3vx88f8CfxPqu1WDVgZQyVabwpHqvmVtTrAn5zBL4a +CbQrlw/1UmOAdf4rPIbGyM2BRXJsyObwSdg58A/YD/ViqD1AQ1JHretK0slbrdy0ureoSQBJI9s LYErfNX3LZCe+Q6rD1uHr8PAbSHwTFmE+LjFnmxv+vkH9D/2B2VcnuCblnQ1jGJOTmUPGr0gYr22 L55kLrJXKN94J/G3BD29bav4gJ9cwyYyryjw890QnOT4DgL8AAIPVaM6uRQmo0yRalHmggjieJtW I9PvkTrg80g+pjjikKSyPs5iPMyxzRrcwh08jSaZpn0+ALTBJWgjk1ccMMke7LHFYgkndclU7uzZ WLIVWORfliQCFeuTaNpPOr62hthGGNPXyyHFKO9oVJDHp63D2ett4Vjw/Txu6MsK4t5WQaS7JNVo O/n9/wCfHz/wYSTtP7+7WBpMtTTOYOutcHwIFbCmF29ilOOci4l0TabfcMRiAF6ebj5+upZMnWLN iUO2f67POAV6wV/1V8CYTuMdmQw9jVfbYsoBG50pwW4i+n5LjEmAcVO5DxhgDmK2+Yt1fNeMWCeD ZGfdBfJkdJSdPDwffvd+P1FwHrcyCqrykejdPHZ/sypKqkw3xqovhPs1btDadhh2hp7odPZK3ZHC GjwGBt40TRrk5xWfm3bCoj5/wHVTORJp9OrOfqv7rqEQRHYjSF5RqHVp45JI1wIYRxPjlbsvaHuM 4wSSGJPSjOphkUY57pGaFe6scFprN2TiOhWyGio59kO1jTxtJw65tSLZtHmXCp15DTUNhA2ghsG8 PlJzGQeYnNvA94JsyG9swzmwM2EAIO/gOP7BhaFToxPtq6GOoV3gNv2hW9xtchbGIBZOQ5d2ptTV WnTMLrqx8W4GIJtrCfiHZsHwXgN2NKu1HqJBwAAP0P4VkFuj4GDh0hShympXMJNOOGoTT28JC2Kq /nh6k2BkT7TD2mh0/DeKlHz7U3N5q/c98q60QhwBz7HtD7H+hsG8A6zr+7GOs6ltGHPshJl9nzyu Jh4lKnFxdwhmJiFZG4LfBLQ4OGWKzV2jjKP+tVW7boBf2B+fkDDQY3ZlcnN22omaqusgGqz+Txfn 556ESoFXcO4jchCMcZFxwcnuvHImq5smx1a50T7NFo9nVCGzpNpriHqZrJorCyGCWnuTkkfLrdfx shPDuAf4bx2PfK5ME8VfEZ5tJSdgAAD6CwIJ8AATK2rmMogqmbuW7aPC842WkNQ0hEMWNu1cyjA9 DDsiHZDIvmPn798PFn54sjN7Bm9/5Af/ALB1DrYuRAV2Q8BatSAem8pSpFpcDw8tDq8Wj2NK/G9q XwnmE8g4I/b/ALjS7yWeTrOxhDeCO/efPoOHv05Q5BYvi1dQemDTlpwtB8a0mpF9P0sMfe0OBqav WACn+myGMRCRJjC+I10U9bLSGW7eGVc8kcUnEKcfcV/1L5/0gT3qXClKkc+buMfURLyzlhj5XIY1 uA+45Uw489LbE5Osm154mkyBxikk7TitfxYtwbzB+KMQpthQCp8c5UNcJR4IJIUmHIJCerlLClAU 4fDmMifagef25bWCA8OCKsi2lm2PYwmwc+/z/UPjXBV4am08NfGTJDzyQ2IPalUwJhpp5tsYC4EI kNb4e4L6eq9r60+YMqDiyM8nLRCez8fQT4A+A98Fut0+8XwDJPgunxsOBZFkL0gPpvT2GY+WhEPN FVL/AMyYhzA4/FqxH8HW3lm2tZ/ZDZzf35+fgCC/Hz9q9OWnm8tTzfW2n4VYszT+MrfJOhQNmHUg JXFOMERFUjza+5mKe5qMloszVc0+m4sX61CaxZqOHx9HoYn43X4PMYPSbBP1YV8WaeTR/TOKng9N EK16Epsk7fG3J92T2grmQCYMF2YJtxI5FMqy8RsTjJHtSx5RyU2LNeWBoAA5CUNksTT6Y7qWWNdy TG1JMTECBcGEOeAu4u0IY6HQ61jMZF/8lVeeVVsYsobQMJ4YBDYRB/7Af6YVscsgCw7bVTKN7Snn aWnkUkhLMIjlTh6VDT4bIt1XT1qOEMGe4G1Vu81A+DOMo4Q2knKiP4c+P9I2ZVbw5J+/AZiBfwut wlTfDySFx4XcVbKbfTFgLdbmOHl6/mVz2vPdnxjyr1ezE0c4k7Gg7Af2DwAAw0/5cOe4bwrraS+W Eef2zh74PrKYLlRLGck8eGMMhjkhAM1PjABasSfFxaMjYu3NufIOGL8AfkE/1HdFK90ImjveiMt7 eWGDK+A7+GwfHtonE5cCyO1yNG7JK7OhddsclMgBbXXbZscE8dKsPzD/ABMmByqTDAnm1sYPhuCQ YaAKnzLj+C38xPZHCZ8Ageaw6ys7WtbGE5v7+Afv0PgE/qkkNkCjg5loZJIE8khVNXr5wV9PaeLr lsaCm30/Mp+bahj4ZwDeHavnFvlGi3vNm+Dn7dqLz/6L9xgBxTnpYHlucpQ7GDu0Roag+0zLurC2 BcqY4J9qGENbh/DsaeQn2Mt/lDc2be6uwOb/ALAA9mDDFSsliNClpjMaZIFepJivhwNTITANgCTF jOTC5RS9fwuBzDExgDtQBffHhjJ/fFlG+km/2AB0rHF12/U2pzE/GNR9haX7rxodnzl7hXJJ/G+4 yRZoSmbVk6FcYxQ+/I93214JNDRlkLIgNDIBgblqDPQ9SDYwXNZ1P/DaIolX+Z2TmMiHDW+B78Pb UeYTGFBYxZBhKu/ER/YAH0E+AmZgN0IMh7NTTqS1WNVaSp2gq92Wx8PAYlXoYZgZLUDshiHYDJie q7FquBm2vxhzzZw+Aw590jaTeF9jsAZX0AwyO1g5xJdjh8B/DxZQsU2dfriW4Q+N/wD4ftyqHWfq 4ys+bbJjsH37z/TyZB180i0HhcU87Pk9DjVlHVT+0w7k4Qe05si/2TMVWtw2Dip7tLBh7ntYwZsj sc/7Bv8AiBAFuq0rKGQTSaYyDTO+M+DYFGCUbyxaxfbQ5N9QBjGsjDFI7WQ3ljJahk+Lxod3zl4F ckg8gr2+PVa5stkjDagPMjvYGdgjqYdocrCPC4Y9bqtwWw7gPZAe3z2pwt8YL4yMBm/yp9+QfP47 BpbGFDiqdYgaHwk52cNrd37qLceW4NAGJdwtQ2e1A62HsneDnD7axmMyyL/Y9kN/5f8AYOmohtBQ yL1ONtlrY2zqqVUnuhfBIg2GEMpYRQpiwvi2YrcOnkIXbRgQzkx5t/gePuEdggM/77A/Hz/SMvvI h0w7zVdicNODU2gVykn/ALeLF2zbiq+18ZLkAWjMxDseLPDHQNvqU8MUenusUXAG6pWHswr5+3q/ YMGCo2JQmQh0GLyBNM7XvSVGZZAlDcsYWtrt/wCJs+2SghY5FGULbfqeK3cvt5sDH8i7+K5+vAdH Y0uGLrrJbVVXr2pUjlTUPLB+LqbRKcCBgwyOEwxwM2Bq7574jI3kxm9nKu/ER/8AYAHswrQmOEDM SWjKTglnZttMjCOfElo/mijDKTWXeLIhoeLjYEyDAq/ir4jIz4rjGY5dgQ2DQT6D9Bw38+h6/bP8 J0AlLGMsjKuJ8ZskAbIHiGQXqCLfEDWBMQ9PbhMT2CHAQ+7U5bWWflDN9JSXZH2B+4Cffn/qYBsE lDJ3M0WDW7a7BXwHbNT51hXQ8VWLAiXIXt8NPfKruCkiEyDdVwKQMO9LPF1l5Oc2CHf7/iAwAH1y QOBnu71O71uynHcCcXHJFR4FFg2VGgvNirxikcvFk6MC6VlgLKEZd8ZzG4tiwBz0S2K2Mkrm0oMS Nh6bauPNGTVYds+U5SxYtbH2OHrdkquYQcad1Sp89HZFkZzy3/OGzgM+g4oPd0Bv58vRyLQUhzba ih1vOdzxJhPsj5U7Yn1fFl1ye5AYuwxfFWLY9bVdPC8h/MrPHngwZ9JCVW/vz8fQX4/v/S3pq6JC 46ZM/FJW7PDOFkfHJcGEwpVXywNczF4OyTA8z+lUOwLa+s7XaBMYj2jV3n/3/C3cepceUIWr3ClJ tGhCTRnG2FPrGvXhTZPr1o3Jdi/dgdDDwqrIh1XUsPgAzHaApzlmRncIkvJ/6CggAB/kCJ58MtKk br2RuZiOx88iBGfuxxOR49w46csGZMryI+JmpUN1tbV2eOGzBArjE+b47ZDRWc9srwNbXG2rKrdt Xw4F2kUNDKdvnLUYtsHzHC1A9Jjw9jXz/Iw1lGKcGWeEm7RePoJ/YEHzwFIVMttsCn7Gyhq2HTZj tL0zpNzNGppPTTok9LQyNqLaH8QP8zCfR6lVcMYsoe2DOEm/Ae+/v2OHTskWRQ+U8qgFsydR9Atq 5UzuYZQ94zIeFSldSot7ATLIpMutVuuzMNPOmBSCTGV4Fk9tRgfCMQIHYfoHH/UCWDSdXxbAZBd0 38pJ9jKtbie5HB15baLar0DpfcB9kMq2+GHBf2NSr+BXIfk1X9oGY4buxJOAEF+3/E+APn7DxlXV BtPgZJVl08xO4MbZXcRxtndMInkwxUMRkpJGJlkErD6oN/FJFqIo8cMVTIRnUkhI5ZkGRTLdYj2F TpmU+l2WYzmjT4+c2tWwm0TX+cyWREmi2helC8SENOfIa2n+DnWhAVWQm8vgsZ4T+gQG/wDnwAA+ NociYhtm12hMk1K23NUpZfQpg/Z5X2i2n20GTExcD5W/D2pSQG1VMcG7yrJN4SdPH7/wDYD/AFdn Uoj6G8ripnT6SoExmkpQkeYT0eWt8DU0NyqtgmB3Bw5IPZJyGQPYQ0bEWieyO7Wj78+Pr4A/7nuk jYleSIGXDaCafY9Vq5inKceKZT7f+Gfu6zU0VXC/WxlvTzLIwGNhXx6rzrDEWzPJz6S8AV8CAQT6 CAP4MaSOSobdNz7nSgKrwMu73c8ihR5vhWLQsWEeeFcSnOwaFqcVw8c+6+3xVmiFqBobk+Ozkev6 SthnxJxDmKruCwthiqZ5DcB4ZDpNPZDFgWo8T0/YwwwnTdoLPBwgTg4AB/v7f+raEK3h0OpodaT1 tuA5qeS4O32RH40Bitkp8hkJhiYYZJhBksYDqQ4P/VCuzI1Vm97qt+4Cf39BQT3U9W6mYsBsJLia Nrc9dLjGl1+hw7AXpkXFePORi4A75Scy1PZkxQyHbkPWe1lCYvmxtJ1GIIDnwDgIBB6ajxvDHcj5 bUDJ2G1TEa2JCTDsBscHNNXotczWAPyWtrgfMU85AXx5wP2z7ydzEcJsiPUXgD6Cfw6YdRlMkAXF IxkzAQrIZCU2nR4oY8Nu3yVlkzyFFKOVGGREaZmDvLMrLAV7HeT+R3GRJ8JQrzfPPSxyylmXJpva dNx4bGzqNVH+YHQ7gTy3ZtNd3xoMWhdlqLfwzNwcHbXDY7IF2YrvhNGBu3uc4ChIIDz+/hLK8V/o oQqgnzs6xzNTZNBXxX+TcxmnQ4qVqaOoaIQW2Wh9SFJy39l2D4FpreKOhXuTeTgQ5iDfj1RMGHAT 7Af05+n+p7HdKxbYlkKRKA4EuUAT1blmSMhpJ5NwcIcOyLI3hPY1UCwAK5W9zvgWs75dgQJsHviA AIOADrsIK6XLIEjMXOCckQ0lsV69+OWh2hTbZ3GcB6HDZKHcE6v6rncPfON+wt8swm8WjsgPtF// AH5IgiIZcNMULiQIunwxkaWCWRidw5Z7KKBQwonnx0Y1U8U8Uunk1IdYzEWfUZ4OIpIZQPSH9Od1 u/uB+Oq5ZOj9/sXI9DAwWeiVxP8ATmzh+ZWvqebuFwq5kxiU3MMo4TJqFyzU7MXV1ikGYID1x8zN z8gV6IsDLz5Q2GOl5+dWS9QQZYQBMIFEjTGeHLSz6a9ThlmqT1dphGRa+OHFJURRDlWKmiAcFwGL FZeaOgz61rs/nyJ04+TCsGByPYbtnR5ae+54Sb5OwBZtbNZn9/J+f31YecgH6mfwD7/9P1+j/wBT 1BWJmA+BzFd8GpOc2krIEkYbIjy3AUmqUWUyd4Lgh1uthl/4L4PA1zNZnkp7jEe7AgRHPgAGKDhf uwoOiz0DLPlC9LB0l+1CJJ8GwEIlqZ9Z4jCbXXRRwXzFKPgYQZHQrigv90I4fH2fcXfDFJq44fxx wPAWDj/TPT8xHzbgJJq5kkk+mxtkO7hwOyF4xV6YJrmxg7DakKq0O1YbBZBz8lnDBPgYtZWTlo7I jgeAgD/7AA419LLtFwEsp8yW3ULYIckp6ZpgGv2xwV4tsJsvh8OyE9PhJ7BT7wh2hPp1OrPT0UKL Kzwm0aTBW6f7RIO/8/fiVlSKVgsJchQ7TH3+axFcVzfJux+OgDNIyxNuND/y0XKvHlsl81xx+a8D rS6Q1splpK472otnly1H+stP/wAOnxKfcloO74+cfhh4adqDcNnR6WuD4C3WYxoF6hRm+YJIN+t2 oj9ur4DYD6rvBH1UUjD4u+JJsDYw2Swjr41FWBE5lFtjV+eT/mLdVzHAOQmVzAntvMCaMTaBlmA3 Z2Cfl3gID8RIKCVOmmCaj0nkqT4hyXykWokvWvQKGQs2GermvbFAmCEyHw8PuC3BfGCpUcz2ztBo ediNhN8AID8f4CAAdWWkEKzzUsDUDRQ+ocDAW71U2BP1IK7D8VydiguH8O7HDUJT8ywJirBvA9QO JNZKfo8b2EOVF+iCA/TpBkMVSsn1KJNtyCBs5IY+A0rpQ5jobyZDbLL3NlwcabtxB00ztCHUyt2S Tir0ufFPyMDidy2OK40a9mB1TtrRamUuc/W20OpU2Yz7UsiJMlPlZXdKZK/T9SEwwtmGFbsa2h4+ d4xXQybN7drgb8fAH/AY7/O2JSdiHrVre5K006sky6Rsa2dOx+jcivTH8PuAtXDr9Ph0OqzGKeyP F0j+D8mRnwpZiyEdgl2doj79/QO/n6+zHyZlWXNrpcre25soCEU2i6yRCIYxaCwr4ZCGhmFvga+4 NQ+v59VmHlmZ0J4ZkcIlGwmOwb97bAfszVDVfVMH6MJoFmXXUNXVugyTSekGcA8spTjBqUEkDZZ+ qpDmp/21Asn1rTx6hPqF75j6Ut3wYF/FAYMD2/mA2nUFS8+PzIYlcix7njhTLweWU18VZtlrJ6RE cbvWAQSnKioa9yaSsRVY15N3xW8hWCnwin3t4I07SdGYNleaL3adX9hBWi2dOMZ9DwG/Fve1sxAh 0ieAVkbLkuetBT0+l1SUlJfee4sIA/6l9eTOotgvDT7qLfK6u5vCFymnV2rHT/WWQkMMsXGEJpWq yCG4WmZh4APUb97LBsncvFoZSnt3SeDyCffsevsgevhkOsZS5yTlBIGw1fqjSbA/HKavOXG+eVuy GIb5YEydZdoWYjrYy38FcYsnMQl2HPAH9+P1FUXUkHU67KZucLstktGt80dJthfTyVsJMyKhpFI1 zSZAxDQ1vjQ8xPQ2DnK2zFOB4rOARJ4OfPv39fb/ANGNyU8+xHZGf/DQjo185WeLFUTZvjOEx9mA /Oce54qqthXg35sn9UW/qstDMinJmU75xtV5Ut1lHT8hPSE/YZabFMOENDmVXDW2Bb+evz/hjCdo adEZZ7XO1o7+AP8AgMfsCCW6LTxbQSn5VhSSWnhkZBMfJtSOWvipWheA20nj5i3DT0Iw4LbUQT58 4Nj4rjJw4ExBfr+IvAYuYXZCmazFXKA1iyab2glJiDzxgPLmPqbXqa5OLhMT+IMjgQhtSGv91Iaz teAwmcCb28AD6DsG/wCwdbUoxMAuBgoUyUmyBdm1KkV/qip9PsJbq9DdyiG4EJhiq2SHMXzHZWwF JqDsyzjijI29G3bz6DsD8/c+6HTyuIZVCPGkcm2qMLd68vCooSIeMXGPHx0UkcUrxK8kbPNt7Yg9 KOPMdyzyDMJIuKdmJok8/ietRDYANHtVvgST/MM6exumVfpO1PiQ9OZWIh10uEJtb3A+B09gD2NW n/pYicZq8nWaz7WgE/r4Afw3/f6OI9BqaRYFWT221DZ/TmebZbfkqtTNi20SndDlIZAOyfMh2QQD 1zA1ATzn9UNCNsbt2uBv2DB2i2DYOnxl3rCV47UGPIdb0yx167Ni/UkMgWW7HFqcopaloWohTDEw yvp9xdjz3w2ZGfFdmJ2pza66rQd/AAKiP7B1PGEyGertPilKrq6yExjCS6nqWYnlpiueuM9KMcws hkDh0/6PAcOVOCystGIxG3v9UHwD9wHA+AkxDKIw7wzPzAzrEtOoU5gSzxZYZiwD8gkjiyQKkhnX CesQ8auTG0bAZpIMTedAqftomjfG4WDR65p9kU0hqU2TKAv7EwUaBIezk0S65V8CKG+B2QzMHhoM 9Pno1PkybQr1msvHsE8/v/AT6+fP7ygd8KJYZtCvhK1FdPf17Gwg5D5hQ8pvltwx7K+WQY+vsldH iB6xoaN7PdZs3CbsN7+/cBAAAB/3FGQhYDRhnMaQeCKmahsksfNfE/uR8VIfP2eFZG8TCD5sI+ej uDyzC1cYTObJseL9+/gAGwMFPKFE2GBXCgdTD1pYTapL8xwX2xbTabd/ih+YUnjMhwyC3VZ4hAtR k3PBoeWY5gk72f8AoJ/f9gACUdGEjm8nRAKqsvJuz4rxQ+eeOg+oR+xGeLLyyP5qqvtH7r/U/nqN mAktIoPvdLuAk7uVYsi8QloavzCU+Vkrq6fxtDxfIfIOKz3CyzhhZGfWVh4OBN8AAO7p8B7HsRZs HlLGy08AemNoEWYNqhBww4kHAnkho42QmOFJ4p62R4qpL57EwTZmgoM3w3+wMCCf38BsHUOUQjHa M8BM16ScJUxSiGPhh5YeLFlnq5XPh2oHZHBwHuFjYsD4dp8YTFtG5o/5RBn0HgPn34AAnleQttEN PFi5jb3VD8eMVu4XRzw9hLjSpg8xitzFtbX+1d8WBPBuHGSm5vKOEN+2P37fz+HTSzRvbO6vG7LP JE1I9Y4FWq3+8UQMb+bAAnuw07IA7IjxozZSDI8iSWhuAUtemlGzXdwBTKyW56/k2rAWxoeVMtGv dO8NqIsLILtBesauU8e4Miehh0MfDg4p7bXLgjk1coM2O0f+qBiv/wBgYRTMquUYyaHsYYt1vdzU NYZBgkn8wQ00Tw1PIMlbmIcLmBhVgWi2g2QYzFBZNG3urrsBnkE+AAfv3Um6ZmYLsB8Q3evUmt3K Z4eYSDr1VuQHfgLIPhhmSn94X8a5nsKGj2QjDGj/AFxd7R9wB9+fkLnwAB05rYr/AGaqrU2Gt1K7 Kf20TQ6rMsiWnoZ4SBlGF9DDmJhiGvmK5odwrQ4HWbxF1cMZgbs7JOwH9/8AP7B0BkzpN3z3K7Ll IJFxwd3JGeFtS0oskX0alYAXC3VWLq+QPNH/AF8eSeqc6qA7hYwxxlD0NlJVe1Rqcjuw2PXrIh4b +BMD0/ups5hPcDmni0PD/aKHKMxwHik/fsd/PYbAfc1Xg49lq9Mrgagaul5STTl3D9NNkaf1Nkcn JstCUXr7gYeyFtkTw9qdj4EGt2YZ+M0Z4NJJt4Ac+4+A5+f6WItXj1yDs6AGZLkGvjIgO8fJDuBb htSu7RXMMeyTFtwW0PjYMDwNqhjHpX5ysvAQ2beMAHgN/wCfY3GtSYYA1XTN+03qWJUnqMcObj3C sq3xQxfExdjLbAhuHG4dkMAcGpMH84zcXxebM+7Xac+g+fxwPgHyahVVVEZSWZJEi1Bekb+PMv2+ njkuIybLJuVK8rGnzP1AkRnR45G0ynKeN0BEbFLF3bgDj5/V1X1GWIyc0zlyfQ9bvb41O3ehwzh1 hXALcrCq9pW6/tRP0xuFV1WQD9tLQ+CYJorOUWd8N4c4AH/bu5gA388rPWJrN1hp9J6cwNeqVP1B UqlfE/Jr0x2fQ+PJtjchW09kW7ItRgmQXxwodH5ysob5wYI7G3bfz78APn/P9KRQXrnDuatqG0rV iSrFn0pP1ULwFjIL34bSGix4bAHmocOt7I+FBxHvjUYGPO6f7J/r4/5/790txEgPGtcRaF51XKTq gZDeMiwtNQZ3fERXtcDFcOebyHhiG9lgHoFl2MHs1ZaODrB3A2lb/iB9/Pn+q2kZgAs5dEjdX/l2 Z2NEUcbMVfkB7HC482jTGQRgRhJXeSymykqNhg0b2+5VNlwoQkcnKhcdxZFe7mSzrVsYlbVzVfcz svV8huGmeWybpYVyVft8wOHmrcNwmvGJADVYcmzK5QYz/wBbA/3/ANz4DquzReGqTJmJK4m2cEaq +mamu+DTs4lPFvlOXIhmF8P8P8kMCfv1wQDk0Y8i8Bgw5shs5+h/+wdMFbXqv3DJsYynuz4uB7+l /wCDDV2GZXNOCdNB6b3UWw9buAfeOWjkNVh1n2v+zb2E9+0X+Z/rjESQaRfDVaukHUhhkz+W3Ivh z1fqaeCsaJXKaHX5i3MuAQHT1o4pL56uXAmMF2hii7I7cH+wAN/Ac+6SI5os/T+o2BHNpoZmx08O xFHGiq1Ns+CzHF87ApcLY3f+JxMYtyFo9RPHJuySSdnqynFLsklU+3u7jfWA1dfFnGrUFfBipba7 Ym7CH2PRuoC7nBD7sJr5ZA58MfMmMpB7gz2ADY1wMzyUKo3B/wAXI58AfQWA/wCfQYGwEPLSNPdP wJdkEg4FkJWE0JLIHX1q5Pviu4EPwmYZDDAYtTs9Wk6Y8o1oWgT9gmKSdQfvx8B0eUXV96Ma3DSa 0oF/ZGNJN07HrHOkWFMVzynv0xxT5geGYY7RDg9uAz3AYzU20cmB727HOA7+APn+QPyfqtDKVVH1 OJrdk21WCQqv8tX1IJ8d3h8NLW0r2QwLYdwe4cxxZLGA1/sZhnZSgtaKHHYJzh/fvP7AAP8ARGF3 ErI9YzTWK87kLRjnIcjcJHBuq4uxQmjVRGylkkhWKOZhFGg2pYZWZzFEuN4KoBz8khhiVL+78Ibv YFkapU3THV1kJE0ZdxBVVpF3TFdXh4HnBgtSt4a2ycfw4k37GhkyaGhsxP8AZDj8/AAHAV8AggBW n7QuS1cxVzbVs5tcANbjXdPqtkYG1bigdhira+4VXMT7UZLBfOedpTm2PLQhjFk46pKScAH/AGAb Afx63Mg9PqCl7OMu9hSaf5UpQ63rE9IXlsWmlvih6fmB4Yean/Dg0s4AQd8DWb+KBmWXkJdiS8b+ vv3/AE62xmySLr8Or3Sn3HW7QAuSsgwG/iC9sKGkcyqtgmQ3CyA+I9beP2MPzkXaH0c27VccPnwA Dfz/AJ+2eLFmUJLg5QhlHFFOQbNZWbFfA5vwMZlVXiCw6YjG5GNSTAkdpahuSA3tpxeTix1JVAKj 6lqQPJEW5tJh6BDf6dpCHWLgkrcrU+7IlyXAPuBkL1xT5iAhKoK8QTxiz4oVoE8AnpdqTA+7AAQM V/A/isswPQdy0nkwEivbIG0/C1aJDxnDR8sOhymx8Q0/h8yG4MnHjJwCwXxXJjgqHpyWdQuyBHaq 34/v4BAPoOwM2TmK+LAH+eh6eLaQ0M5bA+t5lbyrsTbQs09KD2AYp+1FuGH/AJ5t+eCcBiNV9NrL N924OAP7+g/fwHX0xV9brF4AYqRkqUPNJDUiwCUNplmJQFhlC7s5gt8kidn3CnYFwT/mExhRX8Gb 8H9BPnz/ALoOORg8cpZDNDjMJoyoxj5rJUf+r4AY4qEscHLjSJKAOWOUO17Ih4x7riiiur8Nl4sE c2jbchWzPZ7mA1UnoDJpufLaU+B1LaNZMiETLC9PtqfD3gwGDfMOIZDfU8ms3ILGIyOECdq9gfsO fAEHqy0e+flXBYUqwKxGodX2QyS3DJ09o9sGK5F1khy1tgDmKrW3yHV62cfKvPWNW6M8+ywio5vm 3PtgAP5/36ZDZX+ZYy3fGuvKz2RcXA7Ip1/c1/cemRbGrKxmgxyRkuCt63Q2BwOT1/BHuCoBnF3p ZOG/B4P+HPj+/gAClCMiG0WJMgFGp/vJSrF/dyHAzAlDld7qbAoe8YGIcwOPMToC++HGQZ7oe2f1 sE4CffsQD9v/AFdBjKsLbTumASMbTm/mVLaqrt5N23IA6GPdj+nzXcSGaMtNKdyBcv8ADMw3DeJy zaQ2Bjjze5f5JkZBKFOhhSBOOcMTi2FZURZdjV+PKNU3Md5oxSMIxlOyIQiJnM/qw9A1kBDWvOke uQdKBVKObgJKznQIQtGsq7aHtXXrGvWlErF5ZWpDrkFptJN4MCq2LOxsaPkATXpvsTIzFz0k2wpl K+RN9EvPyFnJEYZWfGg+qGJG502lPkWfk8cn8+Ok7jDgcAcAWTQ/1sf+Oq0HHyZfD6ku6GtxaTQ+ 6IlfJXlyFwpGpd0iTCAeq63hh1uwO4wFfpZqcFkYrtAyzDiTzYGg/wBAoOwdW09fdRXMQ2iKY0uP ltaY41ZV+Ntqv2GGmlGFyira+yIa2GDp9gTAfnsK3ZllpfKg/vgI+BfvPgD5/oPh5jhaCGSDNuTU teoY1bE1uhzF+snByq8TEF4kFrAxDD2RvCqeHeYWCau0IyMDCJPOPP7AAAdcZhOeBbQn5rkq1vai 4NUl6n+1afEcEOK7s74t9k3AOHZOPhzk8g+TeM9+FcZsdXOrtv8AwHwHTJysm4ZAkvoy7kB3dx4J MMdvamisylDnkDhgtXkaKKQwXw66hJpJBIg0zQLIBqdNIDpdTpNT/eF7JBqUmjuyrRGlZVvHj5Vg 5i3pplV4/h59zLdsXRW7s72En02UYbulTB9b6kNPYcOGq/2UrAbdnrMYUFsxPwloo+//AOT8f6PJ 9qL+TImNFtDbRZLfyZPyOYPBaYKTUh8AzHBDQ63vgPMxDwVJggI8Pym2Mxw3ibR0HsGAQUEAePn3 xYGZS93Xo60hmuNS1u7zNTNmo9e1vX66HfLa09nq5mJ/JA/w4ZCZ34cLa+YzUarlBhNH+78BPgD5 8+AQQADjkWQ6QKzuAe+VjaNhSiSTYRiZW4/gZQWWfFfh6GyIThjZBAw1VLjWnG9r7NrJN4N1cbCW 6Aw2B+Pn37pYCtGoCPvZqlsuG1nQqrbdR8e9PTsqvd0To2RLOiIyM7RRvNLH2YUY1llbYkGfa65e eVPFG6PWeoC1XhJUharGW+3oN4q+vXxos2Grvks9Kqv5jgyIb5W7B7gbQREen3mzKbq95GVW7BAm /oL9v/sffuqrUWnyEggGXLaW+6laGJLZtwcfLcCl3CU18h1eHMLftDHp87kCHanBkYWUJvPCTbv9 BfgB8/8AriyFOh67Pj2+K0Hqchob4tlmDTq1EKcMHgIlyAhx5iZT8MPMT1uxlKrm2q4ZPug0PPOE mrsAYB+PnwGCDsHUOLZLwQ2TOn6aQ5LJY6rf94h20ru8Kxk1TilJi/MW4eAdbtBbB4r885Mo0W0V fZm+BAex8/AAH7YT4Dq0XPcEOy+4U22haUOcbunklnwFMvgc85eBVPatG2Miwx5KyyNFJEjnDNWW KCDPGhRYi77QCTYrIaAeU0ZMqyw9tWdb+SN28lvDu4yosuLKp8hai2yMjJw+ZB++Kq3cCN2bZiYN 3NpJzHgB/wDEfnzZbH5dfB09klVjGAhskaXDGLCYBLIeQ6yPRQ+8cwhzMGBwgz0/BVmjbMxfBjN5 tJB/19/t8+H6n19fukO7O7Gqya9PEtpcEO5pCOYPW0vOTRDYeSJ8xkQx8wH9tamQmzFENlrMGku1 XcBPgNgPn2DYDVGhWfKcKlPAXx2L2DlG1QAHyZ/AicphjaX09wxrirFu1GRgMfAYIOIcoUrBXt8m DNu2OLBUW/sABgAbAaurQxiCN48ssBKMHhrC805vO7HcKxvm+AK4yM7ncwxrGDdQ5VeD7i+Pnt/H XJaDQUFujhRkqq2S1E2vUCnLYT2qMJW3LUYkbpuD58wwyQ18wjntN56Djtiuh4kzn0nABi/AOfeA QtNd4L6kyVi5W0kySUUxJiVe7Eg9hQ0I9wOLMvD6eyOAev2ScBIYA1sZumFmDAn+lZ/gP7/ieAFT WvtGbDPVUkOrvnDyRJ3/AMaG4WFMfFdIcvhj5iEHT6rMD3AHA4kq2TZnsr+c3ukzmwfv+wYvyrre 1HwADyQwsaEs5ImLcveLUR3dkcorY+NEMfDM3Ah4LbgHOTyAJVMcG4uTJfSfPoOIE+/b+f6kZKhU BxdETdXz4Jaef/75GZylcZ45H3EWVciwV9lv4g64VVZ/LWfaD4oUOb4Ox9bq9q1PVenO6clAGik9 tXmAlbauvb80MKa+Q94rd85gHTpk5TQK0BcZZtrGLIMJaLtv+wHwPuwIKCLTGRPnq56AZJDHbKJK TCr0y1I93GJQASLF2o4GO6lJh+QBwdLOD4D4yTFq254/dge//wBQHz4EBx2g2dguSXTRmrpJya0V Qleq8Ozh6RMGShIFomL5hwZafQ5g/wA8wITvue6C/Y54QHv4ABv4A/07LMh0PXw/4DRqo08TLafU CJaLIByJYdNsZTF2hgQmBw9kbxaENHbWBSgp6wzbosoqO7BcN/7ugOPvwHpK6mNGhR5Uz1r6iXTq 8WRlk3RLPgpdJIY03ogiSR8ckMwLBXfTA7srB0TTJDHKUatqMZbKng5cCQg9vj99D7ws1cV0e1nf 6lkZD5qNX7zkZLjXBl0jK1iRMKoxJt+EJNrqGuhxxH1HtjGrQ0j6R2Pqs40d9GIM96MM02weoXcB gOkYdM2WZcFE8Luxbr1Xpmvaf1CGavilq51BTCDKhzLssgPR5jltwVK1B8EYor/o7hNiAPwA/wDX z+wKfUownbBt4FrfO6hBkw9njofqEY8clAS262KxgUIMyQoiGOtSG9rwL/mR/wDmZiS1h6fUFNr2 KHgwYrx0/hb1w031IuSElNrpqf6rfIY2ZdF/ZOsivYYGpYlntAdfmXu4p7ItjoSrWdoKbutrAzF8 Gc5CGucgAB/E+AQfcAyBZI29SeaZJZp5ADHuSBJJd1InkzXLbMhUNiMrJxXpbtHNJNKUhiWLaikC kh5HjjjiaVErvzEYLLkNu6yfKweq/D7LUyWw2cyNTGq1cvVv8xwr1baIrDY/JPmLe8dkx9qQf4sP 4jHzBZFtDw8nObOzyg8f93722CsZSq74Rw6Gk1zVa2ebc6NL/wAFkR0hD+VEsauQ49PWzDIYDj6r g8gAtTITGNH1lH5sb58AQQD9bvn8Y28Ecdcld17aGaBN1iTW7As2pySfU68IAyq9KFHBfvhPT3Bb mD63BTyB6cybmrtCz5urgmwP2HgH4AAAWKSx+oS8ymdXObnb9FshbLDzyTfCnZEqm14CruDhfDh3 4MOBDlSGQA2pDZvF8mR3Z3Sfv2P7Af6GLEIqK6epkriRtuSKSGV43Ro6a/aCDkPcRXbZkuW9uPFM ryJHJxHUbRuexkjyqO6axbXS/jlVh5At3OJNlqS3xszxJ3IOyTyExKtuXYxT8J1u+Id8TMFuehp6 HeC2ss1X03uf3bz/AP1fvcABrdF2RcEg+Lys42BzbIuOvQ6HcweXDqWuWE8eT2BPMVXZDIYIcV7g cqTyaz2v+j2ib+gv37+A4D01MzTnDXKbY5V0nuK21YRthq+2qNreLMFxSz4rw2CZW9kOEyHYENHP fAhLazjV+2LLwECJLxv/AN+PoOwdJ9taNUDG8WplRc6rSQG1BlOZ+TTKO2YuSbqaF6jFsfpvT2RP D3wPMA60uF8VU/bLkfWZZB3YkhDmwAD6CwHwAA+cSojGPchlmGmZJISYpETZC7rOXljilwDoRtSP 7jlha5grZNDupKqI4jB07dkcbY7aiPHjHFrJbvvwtcyQqrNQFdI4eeFziIdIs0LZsdcvLPiB4qvZ h/FOf1x8DTUOyGFwOfltpxJLT4rec97rqxAYAFugAD9sGMllg1+UUocM72FRVelLItp3rYxbVLu9 byjynbVX8gY8GRkT1vGacn1/ypwJsyx3fRnfD6Og7Af8+gdPfU+O9CtbZcVBrJ3pWNTDGpcr0+LD uGvhE0+AUIOOtQPiiGG8/LVJ+LBYz4z4q9XrCxhhg7pHAMMDy+f4+ATUhTW3G2APtknEmgrCQHdo ZLOYF4OUixHLjfzFsuyGGRfmHFLibVxndBlmE3j/AFUAIP8AQP2BguNp3jcNH9O8qSJHJlu45xvE x22VY3rcDVIjeKGNk9Nk2A6iJ91BjuKVxvGWGVecmr+Jh4PuJ+KIohw7FqV4aoDmeJXNpLh207mK rqu2C3A64tg8BhuDJMT3yGydyIFaEHw4hLL1V6GzbFve9gAADYOfdb7ImHa5zM7NtDO+ZAmcTvgl Z1btkOLtDR8wfD4eY5hxsHB4HOfCbyLtAZ7b2bOn0E/5/HE/0wo7I6Zws9Xxm4H/AOek2ku2A+Dr JiLb4mrzRKTyIdkcIcOYnuE5SuADOh8ZF4o2+cKq79g3/wA/0pZGOUGtyG+McyNui2bU2BbziCR3 GTe428EWRDQ7IDQx/nqPIQec/aFnE4ESLRR6ifgG/wDnwHQkqJZpMacQx54vLtttA1hC8jxQ3uG9 pVyoZ5YriUHqGOIdqPMcR7sN3AH8ZViPxZvx02ocx5Frd2IbbXoQlXyTaKQ8OyePh3BxeJz1DT+B snzJY8wqwGE9BME0ah7k/rbulhsB8Af9uP8AS95BCcjjIpUiBk5OUkuy9V57JqBhLi2hITYvME8w YhOCJw8G2j3ydM/a2Zm+7bJsGKCfPv3gJJHOajG23LJdzNnSZkXV0S3BwD1vdyfYwtsxaLs2dPrd 8hp6fNeKWYENqcNzq9Xedj7pBEc+g7+A4DwLrTMdJrat9qotPNuF3EtSDDX+cSX7YtVNu6skPnlf 4h9MbJSZn4e/YNtqGLMeavfO5jwb7pI5/oUfKJ9xt2Y4mMQTVo5o7xzEeBBqRZY6LEdl33UsZanj bJ4Mr9cx1JDQj7lOfEZupX+3s7WviHaF+2KH1AV6xmRuJ5pDjVPcnaOJfE0BLu5NZF987qWpW918 bsbvBPVQ6MTaFcYLB8JdufW79+2ABj0n4Zy3CjJnGaqMVuYPTJMsPZAFH4eUtphi/D424THCYHHz J1lr6i1B+c90ODPBvhJw+/b/AFFv/IAF6pAezNOdsDLubZi3p7q98ktqO7ZweIttDQvSleq2Bw7V zKrMD/gz9SGANQWUZoaBn+9jiCAfj59+ftg6SbJmUWpL9VocVVjW1qgmXGJsi2s6RcYepa51CaX3 wPaExPhoZd8YA7x3QPYLayMV9zGHNjdkd+AfoAftgt0NJJBMjajTSzTQvgoeGTP1IzjMjDEVtyBo wwJzxLUtY9TUrPG0MMsCZruhg0PrsXl31Y9/ru0cqNI9x1kvab6FbEF0m22pT6lQ9ekhtlnkCspA 2vU+VgUaBJQpVae+sjhSaHD558BAbZ1kExituayc7o1dgf4Cvn/Y/v6rkZcNDQxuU0TH/HKyUBeq ca1EHcO0OSnUvJE9xiUmYmMpCYqga/RPJk6v4MjA7RSTbx/X4Dz9RAHYU2OquzNZprtvzuHdqnsD WAtmEgxXNoUg0HqrHh7Ip4xcHIIdjceAznwmMF1esjDjtzYHi/eAqMBsHUbI+PbS+BpKBMCXAuNS lMtAbDr9HmafZRYXV6e4LbIGmskIgyHANgNoMPWbPclX8mBpNXBPvwAAf58f61bnpwRu288WeEzC pBnt5Z8nP2rj7caPm+EqOdThwHdFMX/M27o52MazPGJ8+b56nhdqPjHUde1KnVXpL066oA5u+bYP Xwr3GnnrGmaQFdkcDDhW7JMhkIeLbqArOd953QYzc2CJNV4n0EBsB8/7KW0LYsS+XAOUzVsbZ2bD W4iuSs7TvU8yLKXkIX/JzGQwn9r6eakMhAOYrNvtDSzI1VpPa44AAH37/wA+cEeu5FLWxZ0WUeJc jyJNe2DeVPtAlku6KplKHtQeydh2QN8AxB2+BB4N+ZOTfdqTOfv/AGiAP+HRHT90U/3s1QwFca/q upskt1lT4ft/YTJKV2zSq0GR0O0w4eG4J63ObV98eDHiyjMipBukwfn363d/AffkSYaYTSNvOgeF I1j/AJFzyLBpebjWhsx4DbJfubLg4y+pIjiiUOEllmcjNBHFGZC0cXbt1gQwzYMGU2MKeC1AVHej Rp7AUvb8Mk4bMNEWBDd6vE4/FYUOrzDiYmUOYDh7AZK5rSwICraizxe0FoY8d7eDoPPrd8Af391w G3U3gdvioH3PWrTKaIwunAvad2WDXy1p8PJKxbS0nsweWXp+aoN/bUht729Vo+PmHdQ3aKQbt7Hg OO/efpRV9D1PY0NkrmKh6kKrq88SSK/3IfYVcRQNm7CtpxiF4dPr9bBcwP2NM/F5Xa3g3/QPn8D5 8A/gLOB6juOBRdcakQucSZfmKdhBhx7uaYpHUZcVNgXBeqyZMMMkxwtRHuhgntJkYMwF2YzAjYW7 MV9/AANgQffpbRKZQpeFJotVJKjSLqpYxHrsFGEk7CJpBFDKkscDvt7iNIwGCto3nkjLR7xSaHTa eZIvpVAfRxLGHP0mMYgSQpqDNtR4QxzNg+B6p8ZaA+oYqRfVX/h/N18BcidNXYbjXxXOqRLDRxkv OkQq7W1A2p3QQyxFcDZ8JOgkfQ+TQ02MJyuLDg6nlAx2RnTcyCeqt3Fg8yuKyqnNTlUPERwcZMVd U3E4MBZxzYkL0rk9ZbQK6WDFIXrjMQ6WEBBRkOKaywcQXCyxGGT6c66BfVMbWLJSbU5AWDjRrE1f HH7P5HXElYLLIsg0m4sjq+WkDNmrYtbb4s3dmhfcaHFbbYZAbkLMWNPQ6lcLGzqBqe+KTAo7u4K8 VsZ4r44WnZBhlcIbhMau6Fl1X9ZwfCbMDSdUTtVeCCeAH7dxQetxCn148HmARdpkqZ1BQ1uwsEms DHvqMPMMpnWx5gwxw3DmGAQ84IhtwWVlWtDAm8BLR/7AfYKiAP3VnFZskSqnMZVfDKuuDudpveCH +CYLOFcuTBSNc3Ynww/JNnq8PBAELaarUWXkoUvIZgb2T78ffgB8/wAgwQ+MyqzzIBV1dDjZLc7P +I9P4OWDlHy2N04fMWw62t7gH+BpvvjEztjQURucc2/QBz7/AHB1h0k27Gjp27XokFonywAIa4pX xu/B8fBbnHsarT7TMFVzDI7PEVMsQF4ZD1YVzq15HjmxyOq92AvuikL0xtoYaEybkqWNfK/atwVu JfENod7GTofezF87qQx5gH3AQ2oPyYoLGE+bf5/XwAA+APnyS3LIZJRAOLfNPZvT2+Xxx60JlkWB LZJSuWptyWyHA7thh09xcO9K/AnWQsMuozuZZtqXZ/Xx8+f8Af6xkMTKqONVagSbIt7CS+OYmJ9h MhR8EOVc4sFbraGYmMjAH+AQgQcO2ZTdCRw3vYM/z4+fAbBsFqF/LqSfD2GVqcJWdFJSWG+CQG8E jADYy85Sg/GzCfMMMhCZ+L8Hhk8oU5Mcq427YgNg38/7bBrYyx6qA9wSOGSAs+7LhH6e2AiQyRkr 32JUN2MMe68ymNIZHjjh733HuLFBI9ZM75HHKhiMT4PSZQnmO0Q69XBdM1KnpoEIJR7IyrYvnmSH LlAZg+Gn2QhvlkMCGcUh6kq3Yzdr7kZlo4E84goJ9+t3YAGwGpQxlu9uPi5PGkk+VMW2wwquxhIf ClSsIs8yMBhDrek2Snx4eah8SR4ZPgb5xk54TfwGwbB5/qT4utHk/JbWMwgWE7n41e1+4WF292vk IFNW2CGY09uH18PBPME8Hhp6ZuBrP73i87+/ff8ApSrcxCXEMwuT9yASoaQJT2Q8HXlw8h90Dz4v zORzIfH4bVAsA8D2xZ/GZOq//IPv3H/P4yyRyMIhgnaBHBEFjQg81GsgjS7HsRMvuugV1rI9BZBk 7I6GVjcj5GM27sDI+NcCSRqJOONtkeIeZYDHW54g+reDVV8xkU6fJXAvy4dIgacPAZifDZLgh1un r4dHx03oc4wsszRaCz5sJ7YbB4B+6kmysng88E/+HhQ9wU5ZzQHbRIdJhtMQwUoewhYDTfYFwTLI MMktgho8Bf007PwZoV/7JaP5dQUHf8eAgAmO0EHJwdnx8fHdVtAkyWEHSXztlz2pVNXihwC3vAdk D/MrkCwNtcrQxZ4GTrMHV3CarAIOPHz4ABsAGHru2Fev7apZDdn9VSLOqWIn0PM1EFltyOr0UWYH 1uHsik2QPaAfgZCfOD9jWi0NsBhMMcNgPgAC/v8Ah1qni2I4XEaZ1G0emdc9uSSgpMtj1IMS80eA xiDyZHbxbNE6s7BjeUIlE3JMn+XD4xv3ZNeVUKrq0QiOYn2QeXNhdjD5pdtGvU48Nj2En21dzxfE pPIbOZZLUhuEyceTz1qJ6yTaKvqDfDYRKOAD5/8AoE/j0mVdsT4zJYRRcyWTCtDwSvXBqhyJcKUL iSmgOoTLIDp5iYvrUH6G8bmMKNFZk98N1d9+P7+A58fAGDBVYPTSl1UuXxMNnmRJf4lXkr+q+wkI CrLzRV63aHeAPW6e+OCccA2h85bZifF3nY+bXZz7YPdC4Cf6kcuyO0tuZItcUHb5WcNbI4cOrsNP uUosmi7gXzBhwW2VDHzFXcHw4n0b4uoGZ582Dx/oH+/qjhY59zyKmFLp2uqvYLmuNn1MeDnmfbjz RbcpHVHy7ULrkdw1ii8ityjZ5rHgE9QWa6A4tZ51IpC2pGLBz4zuHApFgFob4mu55XtRwtSt2Sk3 wxX/AIBgn1zgzLKHqMWRhzzaOggN/Ab/AL/0EpbRSdc0GYsEo+US4ZphblkNOqTaCRZG/CHJDcHG HD+HfAer+K2WwUt8wneZRD8HvZvtHsFu+AP7+1DDALpvMpmLzy2rOsamba7PodV8hT8a5K1zaHcD upDZPx+HsbFOgcb3MWLJ7HshwHyAB/X3gFLHt2v0jT+SqV3Drct8VYzDIs488MIcoBYSj44WA4If 4rZPhvFaWApVWh1msi3zbNkdsMT6Dv5/nwDrRGz2dwuiDUxuXR8aDhqBXHuPbxyOifnEDl9nYiX8 xqVxGX+Tn45LE9oHQHMj6kKqqv5WbDQM8yyah0jvMS8MBqX+HSUnp9PrfdQO4L7IjoZ/uoyE3nnh NmeXbZHjn4BB4Dh1aKY6Mi5NZD3JFJkY3AbYSPqEMNFesgBN+XYwciyIdqVWh7gHnASECDW6M81f cnGQbsb33339BAe5/pevi2wLrhMDMd5qVnC6frcsr5z7Hdy9oCmEDF28wtobInzR4fnlf8VmE8EM XZntaPCfoO/7AhYn+rWkhFEKJNO01T7q04oraYp11f8AJzX6py1yPpVnfRI4NjpZZe1vq9Lxx1eg TVqzqdfGZa31JB+lgwOoDF6gB70455GilaMOyQJKgdhpXpyTVLuV2Y2SDi12eBXLIYnHfCvrI+2Z b5d1i06RqE+NwRufccfHd5688pFbvFgyBsU8NNl7BDkpZBks5XxDlCjDFFzPhp8x8Q5g9ctRSYJ4 OEzfff3v38B+gDYNgfC+jQz1b5zIr5PG1d2CKZA8eX7YZLupGX8WyO2ye4WQYMD5kBScYAP6yUGE yfNgiT5894Dfz/SlHvke1QeUUrmZZBhIW1tIaCRjj33KhnyVMsCHadVmGTh/wXxf/nFhGV0NZJ9r sXc5v/4j2DYEF8V2vzLHS7gbXKZGZA1etteyNXTvS5YOAtBUi20YXzFDviehp4/5z4QfOBsyy0U3 +9728Pz8/AH7wHTZFxs37yPSngt5scWW5d0fxSbb+w3Vdt2M8MzDEqMtzztT1jiQe47Zu748VR8/ A44L48NMAlGiwpDIhpDs2K7tnL/zK5PFgNc8vDzMZi3DX7gB1KOfDnB1lDfKzKcJSQhxB2A/9+fu oxgrewVLMJ1emrYwxk3MNSJFtAVdImi0O40OLuHA3xkcLUX+VcefOYDLM4GMWarSQgSqwDAAQfoI Dpy6pZAtjqutwNczBx7BbpwSPmZ3b1wjHWxDsZw+YyGHu1Ia+YeABCfBZOc1eLZhhxJq7YwGwf8A Woj6m0/5ZieUtq1ClVyVVt06qImQBJGGwMhnogu0A7gHoZw3ityExqPWhdM7k15K+2IxxJNuwM+A AAEFAfvfrPNOzQK4R5sskQIZVwrHZhO3LHeVv3tftNJ8F0KpuMmSR+1WLty8bVmgFfNAk2aIujdd DZys0NNzM5cAocbNngfMW04ODCYu4pMuRDZCG8Pn1vEw1AV8D8zc+UEvN/ePPf5P3IDA4cD4NhKK ZmKL4uDRrCrjUOyCxgWsMKHKDp6HDZKTMQsA4Oy/gKvBhgsoT2Pe6uBnwB/+n37phR49qttD0CGq BkoqHZa3GbNP4GjY4lPaLasIDYwdwmWpyQPyDY7LX/dP5NV74zDEfZN8+g7/AOfwPqQfmpykhy7o WLgHAMqmkikrZzpph2UKlu1de3KGnYVxMqCJ+9tkCBBqwnWYsmNetl9SQcYEHABjvwE/1od42UCQ vUm9EIlfDPExWxcqwGNihifJ56FWOeCsnZsTWkQjuw9KRk1+3hr4/H5f6upyJ9gTNPrHXo2Grvhq vUckYviJMA0kJ4bDI+y3MtNbsBwVYCe2gw7NxdoWazOcJNo4D28A+n9gqvdGZXdyOFtZtaTGShw1 tKUOOTr2v20wLFyyibMH2Qt1u+GJjB8Gy/gNUzkyELZkbuibCG/xF1YoWh6IItRzDzvalf5+rQlf +nyhlAbS8X+IvS/hugZPZO9reySyDh/Et8CDDZWa5GhZZ8OE2hwIAfqIAfwXzx9P2BU8fNyyR5WM 2QSnzKK7gMmS0CQ9XuVZFKlRHAwn91FsOQ4q+VepVXxm3/syy8ah/wDqAPn/AO/1E6Fy0JfHONoW dMMcLDFBk2aPkMJLX2kY/gZI14V1Qvg6NNFJchzCcq2HpgY8juzJ5rEW5g7RbivR9YoZ6wrRzk6p G2IQQxpASn2MerIDF28xDtRbZOPuFqPlfb44M21q7NZlqcJdvcBwHtCA38BV1xT7EMsmSm5tkMjt lDYy9V9b2Q4MNkNDl2vKPnchDmGOeDpmCIvoZwOT/wB873vhzf8AYEEBsC/0wijAUocWZXZ4Bbhr bsEr2v3yt5Esw+AWFo+GwMaHcExkQyCGDfU+fOcCdmIauTGbIbSAaCBfqEwPgOegLFVXYGZQVbh9 UsowSPZo1Ss2v4bsHlh/5vUDbSePmQ+H8bIOAM9XzajiFlZVyjMzeENvHPgHAQCCfw6QZjQMkTd7 okmYx3S3tYcGsO7jm8hRFDp2ywYqs5Wu1mjekSQe8O39OWOxsyU3LSdvHVM3BgshttAw+NEMaeaB ra2ELOVbQlsktNYHJo4+t1u9uEOq9nNqXwDYcYzbWMWQaT+m/n9g/YOo14rpLcjA356rXFbmT0nu xnGCMvnh6zXKKYT/AKeh6kMWCt0aA4Ad4WWZX7mEwZvZAXPvbf373PuDVo6A1KxE8zVWdq9PBrCU kgzpv1OvC8tpp7mSG4p8O1FuYYWyENIn1/PrjBGwQ33H8o+c2B+59gAQX5BWIMgV08OB+UUGjVrh MlhjzKfMNheLVyRaDQt2hDQ3xPW4ZAxzyBUsFw2ztezE9ktFJeOfAMEHwGwakAECJAm3CbISGCXf kkJUTO0MqxZwTRFo1VZDnkzErgA6mSZZi8w3nimEJb2FyaKNXfjjIkcmNm8KyF5B2V3XdN1VYlwX TFfGPJvM83THm1GV4EuF8VKJFoYcfwNkmTDDAYxbcLa3d5GK9yLTMcwSAm/0GfAc+fkJ+6TMyzHz NpdkMgclAre2tOpsTIsIC4JCHUp6wnxomV/MT2TGyJt4Pm/YobXyZFxKVmso4QJV2KDv78APv3Vj wWnDVHRFZ46lq9BKKtVWqZTvlWXM6pqnreubQuKiGlawfWQvaqGXsBw7Z1AeVKsWGgozrLM8HEkF j6f0w5DgAYKvSOcUO4WFX1g8bT1w8/qYC04dkWEhyiktNcjC/wBh+5DHW7BaiO908pI7Kzk7kuRG GA97SQfH78AH/YB0lFDRnHCeGKoGWMxRxnSRcSBUihXbxkLpy0mWIYYWVIsZmKK2cM3NZIOZ3xuh Yvdx5H2FB7r4sUpoepAWDGu75bVXNQtpUrNtAbwdIW2ixpYur8V8P3U2dDr9k98J7wyWbWb4UJkz gTE3/wDuDf8AqSgUeQtq5E+vq5uCyBuaeoqXfBL7DwMA7q7kH5gyJweZMIB1We4wAbJ71erk+DhP 7/bu/gAD8AAQMys4eVbGzQBqAHbYdWqY/THbQaIyK8WwpQsPxsxCreGHsBbB3Sn3wcmdjWi5FlZR wlo7H3dYOAoNunz/AE7GSPXbbYFkHoqStja+cBrvfAYNUCm4FEPTgeFwx8PeJhgOPT657gIljTNz V3zFmRwiSE2A/gAP7Afx6kZaNICVyyUF1ghxjMdpsxhMzht2/dbbmXtTHlrkI7K60hplDHJ2ckbs jvS5Z0lLiMAG5N8VLHp8Iqn1v+Wo1nVpnVc72BW4ej1NbKPkQCBcGBPcJlqckr9bx08b68LbwzFC gx5OJKSkg9/qI/h2iQj/AFuV1Nnq9XJSq+shbW2iYSu6Qq6kK3dzBRWli2gPX8yZ4cwQl+PA6jIa zujQjMxzzaO/H37ABz/7AbR8u2KqkEqbH/Gs4WSNiTGc7OFeuBQ8plDzi4VuY+ZdgdP5V2v2PAZw PcyQNJdwnPj4DD78fQeoGZfK/mnFUWxku2KGhv6lHA1Wjyw74r6ZSiHah9wMMlbvi24OGqitGE81 GBmoUoLWSe972DAIAABbuIDqmkpWbZSS3Mqh+bjcJhga/kkwbFPuxvIV0UUKs6nfmR19jZ3yACOK HiRI5PPOGPF5Cq2rRvtdtaKwcke6aQpYa7UwqPE6Gq6nylJ+l9JuZ1sZ8bCY4R90MTLHc5wwqMWG u3sM2L6nowqSZJCJgahlJMnOvRxZqKrLrREB2O2PUsqBmrs2AmzmVezobSYSMhtZ5QBnZhGFXgDg kw5+mbIcszB0jS3g7FPxG5oKECTFmSPVnXOT+2Y4lWPZvABL+p0ougBdbxq/NWf9fNaJP7MiaR2Q 0rMWUbOqNAkEDnT/AKHSwmKdkafbYMVfSztJrKwQMksQyWSmLuDOQEsmylse4dt2RwW2Bb37CfB/ 2uTGA6T/AM8QCDjsAEB1VEhX4dyU6xss8Nq64M3OpSJaFhViwNgeubQmW0BuCv8AT3yRjwDr0yuY DhAnQlkYrq7MzVX9JOe2/n+mQwHV8OLyQy5T+ngwL06u7YrslhK9hWRcibqEAnmQgXhzQ4f6fBQ6 uAnMWYmr7Z4PELsHPn7fwG/9XY076U3wrp/tW/f4qGTS7eaqgc4tRbsBemJqu2aVSiGPmLbgH9vh 88o88D8Yh7mTOVdV/BwCCfX+fAPAdCWX6YPOghhlaYQbs8W3G8n9MFs2xvu+DX76XGAzIjl5FKI8 Y072Y8j3BzjzeK4njw3Hx1VGsw6e0R2R3qqpdnXIdgcwWzFTsJf6RbVSB+eB3yGt1WQmcTr98g8G eUN8ZlkGkmknwHPuA/r1PJ7A0am18bQ4Gq7IsJoW3+zQ7JqQHu5ix65bIt8GLQuH7gHmbPBgYd1L HGPO10bZm9u30Hf+Qfr0gaXmR5UfOFq4G41t3hya9eGri9ZIcrdmhNXB5i4GXh62wvgOfv1VoZMY hqywM+k7Hv58Bv4DpkSGBgyhcOUm3AyadcrmpYxnWEviQ9cxmxNKTK+Ww7gtw4fw2ptXzzUHGcXV 2ZGObJvu/gT4D+wVqF+pZZL/ALzC6nSqZthGjU8wyy4SdntyGHfx7ceU6eVEKB3cadgd8xxbsgxx CYxZpndtfetfu+rOWRbkjTmpuBnVAHGkor4SlyD1qWRgYqWxqytCN9PDrbJDh8DBHp/B2R5ZlcX2 zOO2yO4A+/AP0AdNQJVC2eH9tAy1RS2esJbs28A56wL5m0Ohy9PoFcX4a2hp8vbpiOBYa0nWojM1 YNKys8JtGrngAwY8BXz7+BAV1aFqyNdaHYSbqWyVtkQ0O7EhouB2MCeGtES0LGrev63Qk7h9br75 Yz4wQAYf9RdQfSMLR3/n3uAAb/0mVPlAvWWt2M7jQlkHhslTp+pSWpBIMVKelpqaHn1Wnp5in63o 8P20+qh/KIfnDex7/wCfPvx8BsBwLGiPJG6CWFMp42jExj8BAIs03s6ezlHgR4fPtfIiExKiSrpJ XCRBjsyN7ci6U+ONjEZEnI8iuSogyZYsOBaEh2CQ8owt1k0DbIHiZYFoU/lMlgBzFJ3yH5h9SHqQ OZyb7MTOWjvfAV9Bfn7wB9+h4ZDMlUPYS2rgX8a5HjfyLIqWjpa2r1evIZSHV8OH8NPuBgmI9t/x DzrIZrg4vUCNvaSbxPgD6CA4D1ZWetPh1Js1oU0Rcr7uER1NT75XZInCJouXygB8IahEMQoWotDp cFSUCFOrbNWhXkpIFdaTaXv7IAAAwIHVRROsJ8pO/wCJqApLSKOzcyRcSSOqsaqt1q2dMoUWnMZG WZT5UV6JemvLYYb4VTBRGw9TIURjgM4j8gQMV9/Xz2PTlPcx2N8rKty4Bs9r/LfZef8Aib8eOuZV MkbuNPSLIYzLjhGSNyQNh6sYpcGxTKzwK5grosRTDUeqoZmsVusTyeMsKtmSHZFmrYu2rYTXJ8r/ AIeGcE9kHh65rS0alRuM8XKPAwH3RCVX+/8A/gNuqTh2JZdh0/m1zLtEC+VWEE0+tmGCWyAVeXw2 FYAdPcHxbtTkiOpV/wAqQyZNXpsaT/0TB26ggD799B2DMrUZqDsVCs7UhqLdlJVA6kG27ldOARiy GUPWaK1BTK/h9hi9bp7hjakDgdcoQxZq8m8k9j/f9/Xz/gD/AFueK7aKgtCGkNnyaxclUlp7qdqf LgYXBypuIeFw2AxDQ7UcOY9nIFPqSq4VBZunNWZlg5aKS7nD4Du6A4+fAP2R23IJIpSjTBDG6I4l haNsfqo5DSb0aBYg60mWQ5WudkIeKVdRGHVFaNopyu28eoW9raNsUkJLU/ONDta+2pZB8eK5vC5k gyNr+yAyTGYV+wjzAJMajIrDKKMhBP1Ifs3zPgEPnB7MRkMo81mDCGzaPv8AwDwHVtLQ5RFy4djV fWMnOtomgCY9PpKe2B5UVhA3Itj7U42YMTB5hV248DmeywLRhmPez9OfAAHAdg68/qIaQ+mB0tRY Tr/rdKn6qGxr0/WpW4CZNFprCTTHtge8LImB4ZAy1AV/DANgiq74MWfuqQ8b97H9/wCrxyNXinSJ hVK2gYkp89kCKa/MiaZ6nMSlep4sWGPhmA+EMwwYNQ/lvw+MVdtn7Ib59+It/wAbdPgDklxMSLnE 8TiRo43xjaM1tMqYnDMh75bwOoJFkjkaRkkRkwjSaPKeIt7t1i4yypcbA9p56XtfsEcMnmADlnDc k9CUmxHfBrxEDnotTnpS3V9V7xaieyD0Nq7XwEbbFmm1dZ4O7JLsbP8Atv8Aigv3RhX9NaiKqvit 3zJhm4bxslOB6ffGheh6gikQWUmMBhbW3x77wQ4J4fANzBnF3z/e3gUE+AAAP38Jh3Q4XLU7JFsa YEG1oB3ZHMDWAsYrlzvnmcxf5hDuB8mD/wAlj0O1FtYwQyiyT3vmxw/v4DAB+/2Vqd0U6vcK3ikM iNSem58G3GvXkq7SHFi2Ha7I/nGQO4frOn1/3HT+Mi/Kd0UkJv8A9+ft/AAABI+GmlKwb6LnPSpu IkYKiQRS2Nxz2kJgmZHla6YY4tTqYiHwrbQOy+pLIhtEeLIbWVtRzk8HjjqOIR7gi1vDd2M8tJ8u zmS419qs6REWnKudUt8DLg/idTk9b03zMVt4beewWQnUDRQ6yjcJ4Thifxt1+AH34+A8/WRg1ANt gEtUAZJSYYGyHZ4ockeT1NPTalr080Q7QMIaGtrcwhxU9YAEFg89m2hmGnTlXG/PgD/7Dv74uBfT +6lqMdBc+uatGQ22R63r13LSz0r5V8TF+ZvC2nvg+YDxYLLnIYza2hZeXi0jiSj8Bt1BwAP2wAI1 4qrVpQUuyaWTXCroYuwo1e2g7ae5DYtNFXrzRYyIPD91IYd8HGFWA4QPh8ZfChNm+7OzxsG/vx/o 5FjbuNzvK7ySBu2R4wUyaSTuLbNjEYC9w8jnrFJuKpSJnKRQiEKzZVmF9QmhhGoXvajj2+erLL9b x23TvUrm+GDZ61bCJyzA2t63iMkpXXgMqHiyGLIZIbh8yCh/P3gnyho2z3NhDfPj/wC/n0EBpVg8 yjbwaVcW7INeJuMlTTx2rOmIqE0RcFcCnsER8b1BkDDzN4T1+2vh1mzbXhjjSVXO3PvA/wBAvwFJ 1nZHZHTJZ1JC0MmNihjVe2BzYepzVdyLRav9rgQ6HmWRMX4cCARno8xlJIe6DPd2N++G/n/fgPWn UoUB188OxkWnqVSriq2pC+H0Zh7jtSnLkXgLlDIMjJ3UmJ7B87h7a8GCZMpyZmR/NvADgG/7B59O oVxGyxSCR82UZLhH2YAl5LbDLLgYm6Jv46eFV1jKx+tgheXLhklC5R448XiO7I+Ca6h09806JBRb aJ7I7HosN2EuDUYDiZiHY6RUsWav1uHMVuYhsCG1T7AwVVsXxcXznZOE+A2B+4CeAHljqIIJ/wAy vbQTa3CLdVDW1tshPzpGzyrlE02U1CMG8cw3ggtvDbaClyQX+L6gGbIk1dx/YN/38+fAMhDq+wJe W7afAwfnYZDZIg/JrfhEzdJaurshGHDrf7J9HQ08FyR5Zyj4828j90at38Bv+B8+AAIJspx9Ocvv wxkFWyDDkeoqIj0/VZh3mNCJXr5Yy2P+G4h5gdg7qgV/e/Jq/OcLUSUmrcD/AL/l38QnyZywRpg6 udiExom4EykjjyLZJ53cguP2EXzYEwsygKyYI7agO5xzx27QCmrxy1mr9t8dVK/xNMGkHVnnY6ag ITVPWDs2sLghgXgt/MtgyKhj5iGH1H0m+V+nQoDAeuJbZxgvHawWOP8A7AMf0P3YslgtStJGo+Ba tY1dYWUtY04vmHut2FOi6fdKNSlIQAvDQqHMOKdNR21PwhMiNp7uTHAo8HPd3ffcAwYe+DAlCOnN bgZRK1cpVQE5zPYCWAl78kaAJaV+PxEzZ1vH5ljcfgPGFmM/jCYI394AHz4DfwCD7GxiRHDVPVd3 HraW0Or+0uNXhzAZ3cOBy/iOFgTFsxdifW69DgqQ9DnJ7NWaurE/uxtJwAbB5/fz/VmRXkjKn2ZB 2FpIshChkQgCOPGwSY4lzsZDtFaIEWOBhbl496J4pDFLGTJGYlZlkiawMyQoK3iVJN2GccmZh4xi h5ucSJNFhpLZZENDaIhi0LaltKuH+HDhzN4YJjU+Ve20DDGM4t8szYwlXhDn/wBAAbBW+HXcwNWa TYwEx8POmSVMwBmWgJQ4ibukVk+IH90+Gvw1VtXyE7k1ZiyhRZ837cBfj/uA4Af7AZRbAq6oZDHj ZIySrdTMd2jHD0P5YE8t2AYslPT3BPATPweeamRnZsRZNm82EeAADYN/wP7Bi37NFZ38Ust2N5wY kNXlfIzkeWyPkoS+NEMgY+GyGJjgtg8PgVzCJ2+hq/nUnwe/oID3AefODcFen/Jytt/T+xzx99nj 4x8m+s7csxzy7GesarHAV5PnP/bEijd9WWqBMtjUznrdfWY9hc4o1VNqZRs2pdQ7AoLCdp7xmTcG 5ktSq8FlOEY1Lb4EHT4t5xxxrO1MDKRyD1erFA9L7ifwq4RYbst2y6V09aYL4tPKktz9FtmpVXPK RK8WVPV6dTq/cTJcL6WJexsgGgqVprWFmISreArH1YhQZ63F9fxQvbB+K0uv6fFUf/iwLIZLOtAP GUzFhNThXtkOUpdjSpjBVdkMhiYtuCFy0h9P5MUV1lmBmwuni1D+GwW6f8+AT9iIce36Xs98tC2l sMGT7sqdfGoa9K5ldzY0IZjtu+WRD4ds5w8QqXmH7UMGebOf/wCvv3V1pi4Cqn0z8aWORLeNzVq4 sY7vHNn2HgjjqsWCKWYFo3WWSSCW0kjQUzBse7CxQoe6uOlLR9gSHdwGxNaWq7bc6pRt8yM5bHqc yxjxZovmyWCHcFbzKHcLAWwf5peA4wYU7Po+yGwhwB4Dr0aW3nm48OxoRjhOox8uwSQSdPbwwvnd BerlEZF9wDmA92LZGY8QGBtasBmnq0KvqAni7cJtXz+wYVF79VFS0ewKQzKx1c95glhWCHsiIPSX ZfYVuxpQmVFMEIi3yNbmEHEJt8A4h9zN0GLLwE+8b+A3/p8C7Qy2Mm4H01VUpgbuREvDJajEuZKs aXY13OA8OyJ8y1GQgY+v84cdsfODPPhDaP8AYD4BgAc+wRIYpJGeJ0WFqThs41AreheShhdx4vib pu0Y8tjWVUIdXz2ZWxfdj9NjHtuDHKmWdNww7aAB7yetGYvg81DW021VZtA5uTX7COLpJgt4FTKN D5s6fDp9bTyH8hV88HuYwXydZBm/9v4IH7/1yC7oMUijtXIw8k8pHq3qd4DrTRE/F9xpkWyGAzDW 7IW9wDnLMT+KmOcCygxZ4Sb/AH/wGH0EAziFbyIC+HM2XDG6b0jhJatzDteGHA+JlNnIrdbvktDm r8y1B6+eag4zte0DEZ4CGzbx5+3T/UPTen9bcnjOgRXBJtS7mtksIhbVY1/L5QerICr4j63DsiGh spBwsZttCBYxjuYLQ/6J2T3f/Pr+wAAC9tAmcxwviMVeTmiEPIrL888fBvoRuKzFVSZFQiUyJjJB G2FyNHbV7eFy76JyWuilTOaZ2i6CVyO+S/1WLh1LLHZLUHLB9QUVeA1LMAc8mMjhCTqrajyeB+YU GcX8Gk+DPYn18/sCD0oFcfDMlA6a52RKZKlzrId8XyG4WFDrloloaYY7qXBW4dk1IfDBtuPbkxyZ oVxgzhOybAfAef8AP9DY9LcM5wam1SG2RXr5nMlx1Otnl9dTygsSBKGPh/DDzFCr085/INRkYzFE MmzHEkIbOH9gPgD/AIDBV1uYOWM4TAzvnabxoGvVt3kNWlfURvD5SKQ0NCdaKGHDB1uY4Q/nr/Bw /fJYuRGZnjzZwCA8Af3/AGByRNDul5M0SFI8qx25PslrI3Vt22PPuHnqAxkRssXYzq6tmLbbxsUF Fe8G7PPNfHVjHBOTaCcmqrj6UlMcgCWy5MKQnXBSdiCYAk2KGmhon1tTYQHYzZsOPPw9WfHWAa0k j/RnZUFTWwgmPkwcrOudauWh67iEqyZNEumm/Myt2ZsVBlwAtY94iFd8H+hlKGs44mDAOSrhR6Rn GTJfLToUGKTzYa3lDYxhhOMGUWn5udA8gDsG0+RDkFvp6sgqLrcNXfiz/wCb1JEzKrCaFQQCBmTQ OPF8XWX4Hjqsd6tEMpQ8OexgbRAwLHSVMhajtV+o+HGPO75K2+yA+LJVb5/PT7AAnE9GeSgv+yef fkAAAAHwD91ajUbYF6ZofuXEakm4IGm/Srp7p+q08xETwB7CMUW7RT4bIHshbIOEI8P5VMWSfFxm xu92cHQf0+g7/jDvD5DpDT/fy5fCS7NWoyvhtOGKZPB1OHFTZabzAgnmIdkGGTzlaEFKueCvIt8Z lhH/ABcD4CA59USC/H35/aiKPbF2xE9civlJnoGdTgkOk50B37tVzYSa0cfmIafVZdlH4Tj1gPuJ hZRlfEmT9kkIDPsADHtFsABBBm0m7BAWQTTI8iRTxRJI8cUukjmmhEQj3IIxqEZ5SfJQKosnpCCV opZTIyVgHVGoo7WYkuu4SU4BoY4+Gy4SaAQF6ka7sI8nQwlPzxtXFu3unsOJcLuFy8ANw4W+nrfz DBBb36v54P6zzwmT/wA7UAAO0WwAPPw7jDj5rrMfLGQ4yfSMwbxdDo1XrLi5SspUoOP+h1u+ByKG jgV/4LgzYoavzlG3s3gf5Af/AGDYYdLX63SJAFDd3aNSeV2cteOBu0O73YBKMNoPj5X7IHhw+yfJ AdLEIFV85RmgqzLJyrgjs8Yb+BP7/wBaVs5aF0w85cyhpJqypqBZtwDciQ2GCiGw1zGW6v5LwOGn /VT1f1o8TGblFoE9jNhPP7AAqL/f2qJolWZQ+qk23QK0jmN5IxHDHHIWpss9pmxr0zYye76JllaO As6DLOliOUa0Y/alLgTfPJyFDiupjT2vslckQ+r7TdcFSPlv1j3CreZW5hTZHvVBXtDgHzZ4bI+L cwhZBxSYG2uYfGforzvaRVzw/cBP/Xz/ALL1gfLQMsCe+NDI/gbauB2s1fPEseYW0LUzz4yj3Cq2 Sq3C1HAw1dn56otjCfPHkZveyPGwf2DkHWRGtk0e2olaoK0xC5LbWNkafHc7pvsCwbTTpTY+NGm9 wDWQ+ImIge+NTYPsq0zD08vgwYSx4TV5vj79hx9+xxwmFMwbvOOHsFnT6uyTFhSbYMWr+TTD5V7Y 5NDJYD38x8p/j9qNWnjT/P54MGIauM8J4M+/L5/3590Ikkj1UqvppBDhDWsVs86zuJ4sRUkFjKbc 9fcvbi2+9DRoUK7yLMjsFjft3I+0JIGs1lRtcTXHcb6ku75Dj55XlGLRtqh69ZGuyK9ifW5SJX1o HlseI7qKBhP2d4AMCHBXBvA2fawdXBMcX7gL8AP47+f4hYbVfUCo30SBobBwrW6yNO6hw9KNMOE0 Poi4yyhP4hZC0yJ58PY/z8WtZZSZVCGf6X4m8PfABjhgwH2rW+le7DIDOlUEeJB60p+46nqd2s6v 5aeeKLyG5Mg9DQ7UqtwcCEMHPX60tRPJrLQLWSYPY0kHv78g7+fP4ACQ5alb3c6Pmwsjtf8AqCyX awk92PXAvGFh8UqlqWGwMi3ZCeyJ5CaqtvLYK33fV1cZj/Yz/wD/ABC/ADk242aSG1hkdmEg59c4 fTivyPU5vnjjqsXkgGcrnBEjKg1HIh/kWROcsu0qchhTcNl21XW46Wh1HcCQ5ZJtw1Ap8ZTz6rto gwvljPi9V9cuJCyLIrdPQsXCZBgONtU7MZuUboT+7VcD/YNg8/1aiv8Ag55cVUNXA36qlHZtYY9V qtsV6XchcuUeDsDg4p/zXDAOq7eeNmGYmhq9Z7GbSf09t/4C/n+lupkCAG3EkXKVAu/NS2po/bGv 5bIUV149Lhr4eq1uEYZN4araX3xHZBgxDVhjN/Wxzf8Aj/6fqeClvLXA4eqnJklWEBVf5gPTJhhM K4uW5VzZJBD2d8cFtgT2qAQUnhkZmZDaFl5d7RpN2N/v+ADABvwszyqzYP2O0qh1xwkfApgbPpxU cI/gsTlz02Mq0cYSNC4RQV04ztI/fI57ccclxWjlbdwrlJnKnQ7uU09jPKo4PlLZuzanau5DYhi3 NhlVLMIODIyIcN8sCHvzg3I/OSiuMJ+ESHZHQUHf+0WwbA5suv5DHV9naXz1bxpiGn3ZYV8w7Uj1 lDcj1T10erb8DrTIt8gQ7GBJ5A5W/JihRZ3zzZz9P2A+fwroYB02rkXw8GAu7tlATlOO8O5kdTDJ kqXXKvDX5lwcDQ/raqeYEPkm2PnBmbZAnsAAAAH7A/H5m1LIYNPrYk2/VWSNDu9erez5OcjqbHFi 3erxXzeDCHM+GP4O+L4E3MJ7piSJg3YJV3/f/wBgASR5JGjd5HZIrkhZGwuNCiGJgQ39KSRA98bl leCpGOPY3Iydt/UglFZZI2IYXYrLj4NAfPTC8IeKsgGdZBsa26iiUzEOSMy5kXTnEe3KEQ+Xs62y J63xJfrQHgTrPHtAzI5ve+0R9BAH/wBgQfkOxMwM6ATMqzuExQ7JEkHg9flrUfE3ECe7Pp8N8+Gh r8ydWmCkqzMHko+I3B/N0ef8A+vx/orX09nih+G1+NdryINT/MDIaSY5GLV16xlcPaExOW4b57rd 4AbBng1v6Gh2+MBmzaSjn/P/ALB1JWQ4U3FqdbPZTsMPXSYtGIQPUavr0xNQ69q9Dh/MMGIZiGnz XilnA81J/GeULLMc2NJOH0G3QH35gw6WZdzULK8jSwy3CFSO73MbZjnxjXaK7rPIrlgCBHjRMcc7 dTlHIYzF7GpbvPu47ePOXCraajTLpR74TMrOdu/GTaPskviQpsidUrFV4tkTtn1UTEMwnw508eB2 dGGInGUbuiDN7/v5/j+O/vxhMDNFaB2rSXcjhJqUoksjCYubOIqbIUtGXbQun0/gYcO+GGDtzPq9 8VbJeWZYV/YHj/597AH5B6JLIR7AApieZnh71D/W2xgcA7BLhnoqm0K/84YWw6fD8HP4HYzIzYoe LMTeDQT/ANj6+wb/ANOwpRZ+eQtrvdMN1Kep9AXtUC2HIXG4M8VsTQMMfDcA9VmWRwwaoFwdxoZR ZtCryazsmHgAC/8A9g6vdQSRtOiSYzGeOV1y+nktQAi8emOMEsY0eTfF7DCtrBOxI5MYwBIgPdn3 cu92z/5bo115+lLQMYLb2eKbat2OyIAn5mdX9ZGLQq8tY3dReDp4eFMmJ7IC08Ve2zphMYrlP3zE J9C/YNgP9ejTQh1EFsCmQzHcBLVRV42rrN5INsisodjWgvHnK4B7In1VDcFtvZAQFggTnD+l7MJg 6u2Sq/YAA56fP9IxkL3FlaNb+SkizEgPp/LscWx7BspXrHCr2m17tTw9POMRiwxfGAO1KU+pp+FF 8pKIwwHhj/y4Y1Fv/PcMcK+B09X4uSyjwGNDijYym4QwwdehtEVesaXSaeYWjBeHuDJOPp55qW7M eezdZkwfmweFugNgQf2AZWabblEm3g8qRSgeoa2sikilZIvtyCOMvknFaAJUlIv8iI5N+Luh45r4 6PMcuqxcgblXdDG2QmrZuwl8O7D7CMFALvSJRPIfNmBmSyF8O1PlXvmH+jhQn9JN7Hv/AO/8B6fB i3Fs8h17K/02yiTIw2BcGopgiQz132ahtE1fcNPdVskxDsD23Gy+NozNzwmT96udkf6/4A+/AACl xB6b7VV3Z3V2pA0u2pCJcgmV7X6o+RWhetD4fw6rT6rT/shwEQbbG3Puh9mOJITnAD7Bv/7BAp+j cwGIWEkZph2p+y63CNjwHQ2hT3RDs2UrB18xMQ3wwnuDJvzgpUdyZ5aOMs3m9jfkH2Qdg2AALDcn 3TKioayEhweL21ac+7n7hWJPTHWRIyQaR0jaF+e/TniMVYrHu5s3fAFWQO4LIsxuMNWa052m9k1D u1tRA7VcxBeuBElKb5p9DMKfcHJOH+CqW0G0GYRmZ7q/9fyiD7u+f3/6DI1/pDbKRF8SUnapbatV wZLNDw0NPEoZQoWAi6fI8k+yTN5VJ5A9jM+h8ZZvuxs5/T4B+AAD/UdM1EOCRYEyvmjJN3+G+SkV vZ8xfYUNDiu6vXKGPDrkOYn/AAHA4esEC1TNzVyjNvnv/wCfH8D/AE7BdoIBRHSa5KLdXAdS1Pkp bANcTAkxXP8AEzTdoMjAyWRW5gRyDYwOoD4OBSzFfUY84HAiSk+2/wD7/wCfBJ2jMSrA8MT7VyM8 SwJndetK8W5WJulFDyBY6jRxysZhMjojsiiS4n7cbyS5MfIoWfHnpb1Bp0sQU4XxmlAJsaxmKmLW uNmF0dkpuuWGualUOeQ3BkQjA9bnqR88jiBgzEqMGWpaHNQew4sHtgwMHTCHsAfKX3DgVGslVcPb anuBbuaOJfFfRG2RZVPp9VmIlqKD4oTDlL3hZcH3rMo+cGOBEk2DQPfnwA8/vz8q0dodE2QePaab ashPvh2bRJjJuaOvPdXoctEaE9guBw0xQ0N8IMliwP4eGpb2xCaOTWpjdqSD+ggD/Uk6Za3YIfTr UC4k204ZpJsiB3DlAkOm1ykIdymKvmLd2UnT8zupsI+2qBMdsxdNjKgtThPB/wBgP/sD8+WOV9Sw ek00rmVZdLJNFIXMMEUv1Bl08e/HJtRsEXHHuBbkEhE6QwSCEoJo4UhZp33I13tUQJNO+KXIu+SW rtxA53Ow1Q09Mnhx2bpzhLdhZRery1oPmTW/8QbO0UOLPoY+q5mjRjmBkCyOyzeQB4jFhoV7gZUa r9lwYN/P+wDDEBWSszKW225nC2imWTOtsPgWaKfPV/LW2ixnZ8KQyAcOnmA5i0JiqBIHuSDFl8fO MnElJ2PYD3/0C7FfvEOtCAEXpuznZbTYaS7tFqab3iI4dpROqBDDj0OyFtDhvloVXXL5sP0Zl05+ MOcJNgz+Hn9g+g05qevo/YsPm9saBDz0lb5RMcHCzQ8tXbJR6YQfDFwIVkTN4OdwLL2cmjC1dmJ+ EdvoJ/DHtF5+QyK67is6h67pI8HeiPdHk2FXx3NYJ9tV1UxVTSLSRViAckbPD2yUMsaAPbxx1uMI 8fKSzBTNvhJrcCBjahEcO1GJb5+Qruput1+YHrd8hmeH/AsA8qsnY1oF2YMB4mzZwAA9+fH9/Pm2 ZW6Hdy+TcsU+nMmzA63xe7O8HewXY1TuQsOwTKfodbcIa/alc6h8LpBp7yzofJhiO7G/dfAYvyC/ AN/PuYHwPKj21ArllSU/DVFW6mjWp8enIct8U3KuTCfcFVPgeq2QgGeDxD50MnyhoeUYHSYT6CAP 26/eAP8AUC2VPJbVutx7QBsipXLjZa6FUP8AL2Jod6lF2QQhob4Y/MD5OstPQ525vPKGW3+E9rt/ 7RAF8+/bAfMzJlG0ARHjdSrhfUeQ1hHIwbuz7grUMCCMWyNQKyq0Mwt0rj/CSL80bv8A28fNjpPr avHlL6qkZU1kT7LMKS8r2EBthTcL5KCbHlLfJEPTGnzOXw7G4+2qpis2amr4wswGE9njYAH7AA3+ 4Ec5p6PL5JXn17bSq7uDbLYJjU0JFqIbRplQyj4wVW4ODJvA9PeMbQqaxuM2Y+FGZm83vmwb+A/r 7qosN8dHdTJWDdOEa1EOzWSsmiyCW71XFPXIUPTE8O+Pkx8XHC4EgDgeBp5P2KDBiOECWjaiCA2A A/AAHVhMu2FOximdZdQTW1PDblZt8B2S2GH+JaLYRSxnz+G9wDzE+1CH5aYJ+mTtAsvmDy8nOE3Z pzfgB8AAPnwD8fUsdujBqSK8ImSJ42yxvcR0MZrAY7UcPk5Z9uNRsPVs4bmCll4kEYsOiP8Abnal jR9o4NdB5BfmpDAebT2c7OE6q9pRhrtIE4PkUSri4bgHfDFwUnM+HXJ+e+I8zckPjOGOyBEfE+g8 +fgAB+63GDAuvo8Olii3GajND1u7yGrOYNmlHhN8C8LP42+WS4Ibg+HLLX54N8GcDtEYznAng+An 19B4C/P3SHTyEh3uBP0t9zlJksxwC8HPGKvbO6IF3GAKfIdyDFDXxDIVvQJ4eBVRH5QV7MeKr7XO 2we3P+fW70/q7uxL4vn6frBD38ePB63XlepbOtjeJUXTg+HsbQZNQlbskyk7gwOHk++ONrNZq9yP LzvYQIcwfrd2AAg+fcsjR8CV8zWcakRyR1WO4tP7ucefIY/6UImDFCyMiuyJNG2ccmOAJU0vixY5 q/PSyHMhYquJzBB01EbSOtCeusz24D7yzMmaQdDg/LnzsxnBM6S4GlhulC80OSYhObnBBcwhPzGV XB+lTPgzBjOotvs+0KKIxa9s6qXGx2oYLh4YMCtY9aU/6stcjY5olLHHgdotS05lykZPFg80YXnK a7AGp0lVSQPpZwSgOfG3OlhYKHo61vHMeg0rofZyj4rkpoU1CwbroNyY8mlJokcmjwauhdfBr4HR 6YBlW0oBlMYFJrdos5t0yo8yyOEOB5904YtHvMWzFkB74ILdjPlP0PYzIsrKu0dzHirggRHPvwA/ sCCg0H1vR6rqNSHveVatwVdMV3Y3Ere1LCaEi1K5tpIcnNwYDFVzKfqtDq+ZBunznJ7fpto09LII IESQZ9Bfj4DgNRey2F35mZTANFuWm9StQDXsdTrfOQ7QbLgrA9sKaHcIdkWQ+Pkxwh78wAWowjM1 oFGbfDdXJKOAqLYUFCAHwHXYLzL8nwzCvPzgg1DmBGG6BrUwNhi0LkSBYqanp/G63tQwn8qbV9ta WQWs3JpzRibwb5sj93foPPj+J+kkmVAkUU2n7I5YhLHhHDIe1NhCT2RRqkeGQ9obLuoPkljdizum oLuzyBHrzjiDwaqmAPzya452zyAuLhkLjIdHPdOEiJaSt2aIU2/Cm5UpNmfDfLrpSY3p+OB6r0NV TyZN9KM2Ly6pLsDP+yEA/r7qfvBbuQ9YifKaKNCUDm5ykp1u1EiERaAtCQLtqk1+H23cA6Gvb4pO E9HXGZ5aKvFrJ027UmcPnz4ABv4EAATNyxNQFStkJcdz2quZaA2Spo/Gw6PMAxZYFymEGUwt8PD7 y8KQ8CDhlGZDKcZ//wAB9+8+bWpXavFs25rQAnpNbmUka75GdRo/TgtxSgipdnYHAx4eGnreDa3g Tjh2zV2gZb5zhITYH23ePoPgOjvUTx4zQpGskItV5vcx8hgY2wCg98beSRjzkCYqC8Tv2YiSOQ26 ycBkZa7MaFGznfhce7sh2BI1N3oM053TkoFelA6kptE0CnxIasUsKLV8weyQ3AOtmPmVyh2BPVoY zlDRyZIdtkBn/wD4A+YL7IptFfgZ5SwlIQ0OFosMdDvggW2toKplXrfAplPvtJhyHwQDgesbc+Lt CM8nDfa7gR8/UWwH9g6cFiU+yvkd81aRe5DhqMsitlMhnOGg+Y+OVcpCHaEMetw0/UJcIdgMI6Gn gKrhcZF05UCMctGrkl4AH8H4+AP7/gh6novTflaT2Se5NVXJJ6G23HU8MP2ncXKVbGwra+4GDNVW pMHQu0vaRHD8ZaBZMnanuExxAP2we4AB0lHiiSMaOZItO7rDGrQ7tTngxgmSPxxbeDY7RRtrxTtL K2ph3pnQ6xhuzRbenbGstp1uQURJGbw4piGJ6hhY9byrYhxQ2cpahIAd/wDDoVgO74MisKvUrgPh w1uyFtPcIYP9Jy3tnF7MRnjujSe//QefbCfARDpJfFzVIeXNRle+ZZLQs5wJDa3LYyk2vAMWGwTD PauH5lq7fIfwyYwosecN8JOf5IOwdNSZX+n9SILeVZa42zDIFS+QSs6PbBg8L1CYJsNhfE98MfMs CWqoaeenB0YYU3MY8JITDf8AYP8AMB1XsfVdPrF8ccsvJN2QhzLsiSVuwh8tkVnKXXL5NX5jgyVs t3ZV62jgXCBB3NGKDGZGB75sfgNg38B7MESlp2EnvhZygjmKQ7ePrIkSS+zPlWKZk8MMT0u2dII0 XshmjxG5EKyIv+R47vAe2+fNWLYQNgq+1a/au1TUcG18ytrDH065y+p2RujvxdkT4eCeh2qHXw6r hYFDgzFZMzRzjZNk4Rz4AfAbBiB6shV5yOkPr5WmUeSRtwXxqHofUhSV5L5aq1faTwsO4BzEzjd2 OBid9tVcFni4uzNjxN8439+9n7FB7vCqO2LF8Wxp1Tav0x1LyRPk2xU5IkwNlb/F1jOWD4QmVvDM Bw5APXClcCGD5MslLQRmbmu9nT4BBfgCDsB/pP61FO1FdofM0zxLOF1ibKsBin46QnlE1Tq+KZcN 4T/5wgY/n4FjTBn1fk3hAhx+AHz4DYPP5dQkWsnh0L6fcTT7OsemGmkE6SxS6aDa+piE4l2po9Um Z24nMD4TSSRw6tM30kE2ojmhDy5aRoSYmLwNW9Mrywy+mtJgQi7hZrK4jqyENPvC6SoIWBzn9VV7 sd2xwQ1sh2HTa5sJ8KLdX2o9h4a24L6f/wCn89OT2YYUQxayDCYm/v3t59+x6qKv1fYm1jcoXXvJ dI2cEU3C2obxEsgW5RBZ58HzA5hbMGGB82Gr21H+zbojM2+e7wfAc/8A2DqBru/Zb4YPHotwLdkS qxCL1H5x54SFuxnLs123YXBbW63mbgt7CvgXhkJjBfuT83+wfv2/89JLA1UA5MyHVVeobs4WUqku 4CeBaPYXV9hAShget42Rw9DH1u8YEG2DubMri7MrL6TsX9gQfAdOibuc1jeKqSdU8aot4CV/7zUn JykxTdoUnZ0kmEKot9lLZlbbeRZHxLmGOKGC42xAEZY7VEBmzNZvimGZENj+ZqimGRsnThZGcXeC xjS+Vu6kSgcenshik3zcFu1fAtQcmsi7PWBfZOk6uB7/AL9ifft/6shV8gxYJWyAzG4LeckAkB3e A95D5dbuXHj2zr/A6ffLIT2DfOYNuzvLPyhZ2PujqHR37tFsG/sHIN0fPOHnRPpu37+JIcWyQjAw JK2Qicoxqh8saZXxeHT8Rwl18HrmtdJ9tNT3gzNAtaJnOEhEb6CAAHz6/wBBMNkpd3sQwLSK3reZ ap9kiNFhTK/l88pGsgKuhp7IGfA74HT4dqQK/bZwazGZ8V3nfAlXJRz8RAT4AAg9RttWDBo1ljjR Jt2GIVR7DLtLHs33YhhNmQR24nIUVqLCFNl5IGgCUh3BEkojN3ee8AG4xKZUc6WBOOjwpI57FccL jmWWeSeL2on2QW3WK7i7kZB8Nx4fM2/CCBHviOtrBPi6yM5s7Ygz4Du6f38+AwmJi2KbdhFpFkak JjGtkiw9PT1dImVfdzvaB763g4MnJCHzm0e2g2TDaxazZmxmzbwA3/z6D59y2pDW4EdEsUoYqXTe hut1u9XpKq03xjYz3Q2AKaRWpiffFcOJD4CnWEBqrdnWVi42YmcC4b4AQWAAgAGBAfkKoAexCB5T D/4QdbxUs5bUyEyt9qZGgXU55XTyHzLU09/cOVNpCpYK2Mt/a9zB747c+QkE/sDAfQcdcTGJJTEd OXMz7uqkcYRgY4q617JLbJL7yo7lx6U+bOGljd0H086bXfIYzMkUpEdi9rdRicuSQOPPTszK7uy7 myk3KBcy3xKgUktIsk8Y2cDY1hSmh9H1uhuBhwhWDMVZ+oCe8snBkO0CexpKTaIPYH4+AAbByDJg +s4D5aiuBQ3ZVtBDN1OQh0/Itik/5s6LDV/DcHCZMcLA5xyACDtTc6a4MinDbsE59/1AH+pi0HCG UvQPYKunXZc1VU/GiMAEO8NlVtFcFqvF2QQT3DGx3CZy+4qHq+6UdPZv9TMUc39459wH32DpA5ty La5qYybQVxo3O4RJd2BVA0/Z0w8eXot3WQwJ8yq2SyIhGZakBPgTmTk3eUZ3Uq60auOcBP7Bz7f+ lqqxKgREwRA6iNbd9+WSUhZLG/t2FJwjxsGjnS07bhNjvkrJ/N4kVxx+T89RsdbS7fmQ3yvafsiY eAyWwwyMkiwltNAlYqu+EIb5gHhzE+H7788THlmFq7Nsft/sEAAP/QerErUz8brlI5tBILIYcVJT R6xv6v8AUJgmnlIohmG+4BDIxrbe/wCEEDZ9tKq1ijlEPH3SQgVIYEHkD8e56gL6UeOYJFf0yuAX e/QFX21aImwJuSPE8yQ3dDV1sfMT4a2tvhAPcUCv59jPiyM5RubxVxurXhB++nz9RP3R4UrN0tUg eisecyae7GshSbF8kSML0yuQIjUZFtQe+Mgfklbr7I1ASAHAOMZygtGWd7SXbDf37DAB+wgjqFIS J0TNirtLnv8AC27rtrt58b2mt/EfqnrQdwV3IPtbCPHGRayA7j3x2NuT7cj2m+jYWLvTNzEO2srJ fxpQOgSueTB6QnlFdTfMBBCYnmA7iHIB657f1NYzhwZ8V3kZ+pvYKif/AKDsHXG0FKTd9hFlLDsi ma0renLCshkPNDvCtraTzQY7qIbhpLZdJY/+wzpjMyq9X2+zAwZs2Dx7uoPgD+/pkwQa60MaaYGt yn38xS2TJs1gJODRZtwWN8TdHwen91E/jbBW/LWHnAdZWUPDjGGyd8Me/m/8+AcBYVZpfo+ZMsGg oeoen65zrsxkLaq8Kb5KaF485QyHw637qIdXmKdAsH8mjXk+C3nY3Y2k2oeAH+fHwGwHyZ5O8kY5 Y+jjE+5Vf1HhliGPxtM95d9UtrRY7J87Ts+7/wAvZx4x+d3PzkMAl92XbgOHqkumt7+1Sbwk2Qk1 iSrIheT4X+HXKtZr24sp8xiyOCehkZk7cALxtZN8aOTI4RJ8A/IP4iP4sHS3h2QHMr8NIF7I7baE rKQYJELNRAMVIodyQ/hzLUMahGRg4rAHgbGDjEYor3lWWybI8bA/H8H7YD5/qs24bO0roKlC0xen UMCF6jJdULWrZKuGu04tTrRZKcwubyyPywYxT9jHerED663ILA30jMPU7Ivr9fpPH8a/QgOGLWIJ epD+A8kLTVR2Q/8Ah9kiVsR6ZcFfh74+VlFfLIX4epDeEOt2Fwarpo+BeEPkwsXtmHCQm/279+wX 0BB6izTCWUNAgRpk2GR5RlBJe2XWV5rkUKcnUruWAQMR0mRIyyJE2TxbTTLVd6n33ZrdN8c4BPLX w5stLKWWtjW1jT9/zWRtYR5Kwo8RDcqvlq6uhr9bh9SCGZQ+H9y098v7c2Z8rCoEbAHsmwIP9AgP Y/S0PIFrZhqbVewm2nzwG2ncen8fEmBfHnI8+jzC2YmTEO8GSDPHnjhgmzFBbMsg7RwCHP7+A+/A G0vmXiuVMDaGnNw7nWWNN0j/AIKSPiCEMovFHyn+NzDAdxrdxDNTbeE+4kNGJ4q7MT/KJv8AEWwb 9z5Bfd3eSo7GqcOLumsfmOWSNXt45QWfGhDXnwWh8DmcwmB1/GxgLee1FuHd9oV+c8JdjSOfoM+f 2DYD4BaMQsgYu6F9uJ0js4REUrLlwRnxzzdfHTpRHJLEVk2nVAjptRUKqiTEkN3be4NVcEWbCWjL RzyvT9rV8ypIJchklOt4ZhPXpjk5LzkLfONuEzUIhw9n4kv1pOMM/PLkZll43vYvaoth2BBPn2oc uBgTe7VSgaZSXaKk0mw/4yTYDCYFyohSkWRg0xzHFD1CJ+KeqtqgB2fEXtbyMB0mb7VgAGID8uoJ /qHBp7YGmVLbVXodSw1y8iTvHsijNN7C+xRdZWhV80hW4cwYmLdf2ojga/Q4IfcxdDjGc4b3zgP/ AMAfVUS3KAR5aUm2UnKLtYWckREewQFb4mJL3pQsfmC/VZd8riuJY6JXNlJ9l1YhjGVX06WWynaT SHbYAFuYAQB8/UQAo4qMYkdJKtUwkie3bEqjCOR6yINE1WJoNzVzSRtaOBBlMCTUstxvRkeo4m/i KrQJGe5wRibBFcxmHks9PXKTjJ5RV5DX6TnODDMfGhhKxUMgGfIYhbML4dVbWCeDmcZK7ngDq7e0 fgIA+/HwHT4HMGnu0GhDqWBcxujRcO7OP1vYNsFk98TaR0llFsgt8kh2pC3ifUt4AdW/cx5Q9s2O rkk2c4C/W7sDAA2B/WoyQzNXzL4KIdFanLBuaNMvhVtOj2EP8XSIU4HwNDp98pOG4GK5rOwJ9jYD Hko0C7MOA+6OL9ihe/gN/rHdAtgV2yqyaGHW0mwbgNqafRuS3ryeUtB3cj34rcOSMi2wLaq21/dL UyorOL+jBAgRJBgH6ouAvwDwClmimktDqC8e7Mszx715GMlN3JNwdo5xXGxwb4ZhLplWU7MkI2YZ UbukHBCs4/pX3UO7OiARXdPEZlIWW+Hmh8mYUDd1MqTYQA6rq/tjtyetdNV4ZBbDsjgnrZDnH8UF tHJvY1Dq9ZGf6WvB8Agr4AAA3/o8bDFmV6PrGxophAcHxP0uqZjJDh8VtoTZZ+unBg09h6rvitw9 gVs1AbgA1zZHu0PjMzHO6JvYAAAB5/gOCqtRXsRyZGqwWOq4qRlBwhaNnHzFm97pSmLrl87PzA7I HfLgW7Usuv221JmLML2wmc+7vHIOQYoL8f6CnWRMUo4evmima37qw+Q2AHPV+WfMTzCruRiv9N+N bw63ML9cUD/9vDs5P6yyvGLsceEFBAffvAdGY2EkY1KpqEjhOnqVMJH07Y3G00DQyuaUczNNjdxi PJ81bzLkYht5PHJiD2LJFlgyJQxrNrFm+ORXMvZdW5NqHhzW/ouh2EwyFFOwzhGpsVYkCxljKmrY 45iiw513LZR5ZUyuZRiVXqqyeh1f1IhBV/VlIh8KnRQtfJOdKd/tS9mEmKDJeQ+IQit10VWWfAHp FsE2UwXVMM7LLsFlMcgO3Fj9gzJ0vOiFMo4UikUgQPBVblgFkYhDl8bnVxpqCiFB/aMKFVwhigKx xLSYxouZpEFKOfH+/VvJuOznXQAuxY83ySCfDD9/H5/PVjdPuq+0NOtlqt5Lk1Bs1omDdR0dqrh3 bbIOjIauKiYGWTG4IkKn/wCfHahwjIy2ZWHpRxmPpxwB4+kFhjhyBft6fBvGkys1hKrm39KUc+rN Zq+LHTnRYsKVQ9siD2AfHglWF1suQDeqy0CmDkSy8MaaWvU8Ou9emoQC9UB3H/mAsMRpvmZc9x00 rmpbcj1SgYxav2UPivQ65fKnirH54rdwQw5jjZv+F+tN4GDOUEyYP8Jo79/QNB1F4DjouRZFyj9Q Z6et23ajR3ILY21MIr3KJW6afVu0HCyLItR8/JFc1on74yM1Z/iAnzY2knF8+AAc/P8ATWMUchjE sweN9KzgLtXu7uJbufckOJzk7cu3tHQAMyQlsBn9RWD51sbAN9q1luAj8V83wVR8w4h0fpLY4qfW 54zYXxB6TeVX3ytPljFmgCydyN4ZEIx9qA3hS2IcnWb4UebMBhOEvHaI+fYH5+6D7oIODHHW7G1f DSQ233y2ki0Id8D69lngNZC3xwX1tlfHBPZHCZah6n3yj/8AS8XUAwHaIM3VYBCf8D4DHz+jTYJs udZhLO0y6cFFZzSSDYDOnUEkMSEKsb+HVgRH+qbep74d27x3MI1PDu0XZeFxvO+e+IRfr9AX39Cx PbC28vLpd3Q1Vinkq3agOTV1saX69VZFT9ka6bE0AtuEyt3wOn4L6G1IdoUs8TBlmPloec3t24Dy DsGf2DYACyRNEs7OHCGNYgsVxokssqxxadJ54nkTexmWUHCoypObAM24pEmKB3QTHGVlzjeooIz9 U2QutoGPjjJx9tnSYR7crShw+n2oHWTeWgBwf4hEC4VupzKb+WLivhBwshwTzCeQW8KlvD/cyv3y Znje0gGg8BQUHpD6fwZjuYyLlDgbae2ivQgm6Ji5Gr3hsoTEPMZCyO6kNk7gGMW0eP5ITwfLQWeD hLsSdgAAP7Bv6wV7YOaeKnsmpZWTW946eDo0S8WEH/KgG2hJSuUPgdbh7s+ZszUBcFJq2x54vWe+ BN7BgAB+3dg3/n1hbUfNUGaDGvnNquWzOHyx7tZAewg6bXImkdnHw3DSuHMU+wefHnoMMYTFq5N5 Bdr3Y4/bB+r91NN9TImqL6WNNMrvlMh9Cfbx9V5cfSkezlDjJtED1JM+0JhEuy6zXMmAdcP4ZJfc l5d+OA57S1+B8rG+Qa3b8dPnodPqWktDJVIp2QefGAs4NEVslFKrYLIquyA7KnkMLUgOF8TmQXwN WZ/728f/AJun37YHB3PcL4X8nNsat0ADPMSYgdJhh2wxEfBMp8W6/cOHww4ccyTj+m+eqp40ZV6u TJvHCeD+ffgHgOkbX9sW4LpujaM0+1WbT0fUU2u5DWMNqcsntFc7WBp/tuHY6TZC7B3UUkD+HJ83 O5Pcn4QJv78g8f2A/wBM3NIw1xPIwAN/aXc8DXFb0lPyNwlCMT1e78yMH0KrOR4RLFtkdPsax2dm s9YxKYGjaUDQH19PgMcV/DoIGdYoY4E1MSR7kMM0s0ru+zM0TSSPO0skjvgrMzS8WBX3G5QrySSh oS7JE77AxTuyAASzhVHmzl+BXQI+HNP9qkaS7QUO7MgbJCae3i7MmQkQwJ5sKAZhDkkMO+PjAt7C wgf6ZVxiyT2T22CokA+g8B6vI0K6/msB6/Qsz+F4Dnch23J1IdqinIWhomV+hmQ9bre/uE4Cnnnh k3N8KLOPCQhz8vHj7BsD8gdUVV2VfsKZDXD0NAzrBG3ZLtBqquRzw9yFXizG9P43DmQ+N8D4Gjwx gxXFszMDCG/9/L59+935+7B7YYzXBVdzK3Gds2GtxFcatsFsGKlOibGisjAYmQw9kTN4gnvo8xm4 HV7MT4Ukm/38AfP+AwLTQyymHPUOUjhbKT+0huR3HjRkOSZZ35NY4nzlwyaaNmlIgSN9RuYx6U/T xjIrZqpOV4rxZJ8dTDxQ9UV8vra5S6TetkXmAq2zVfVQNr8StgZSRcguHX5in4aHMhp5g421+eeH 0YTfFcY8nObJPaI/sB9+4Ev9PLU5MqvvQ1LoG5kFkVzAy7le+NSFPrxcDKKyykwe4rfeB8TyDI8W X9qp4YMFq6ws+aq7fz59+AH37pDrFLg8b7VWipRq3X1qVW2qZ/AxkNjIB1QFjr5yCIuPnJJm8I/b 6AEEMyyVaBgz6Sk7AAxQT+IDgPR7X9R1/p9rOwjVfOA18sF27xvGfXuoGJakr4loWNMIJ5in6r2e r0P84T50KsydoC/a1AjtjwE+gfiJ+fj4AjNu6qSRZkZFQ5Nec6zz00kE/jmGNdPKkn9TfcYJtXIs t/do4nV1zcSNGFx07IhARoDZ8yGeNxXaYkbnLFeKGwSIBiZAUqxQGp3yYsOtzGdg2Q7QTK9qXUZV a/DpNDDsrIwODW28DajBNGQ2gYT3vHYuA7/j/kANcu2LYsZgZMMqoKBr1ysJkl1+yTa/rIwLlWbY 0Wk19bcNN624Pi/sYFPnqqGs2YLKDBm91cbeAB9BAHz/AIBgEDBSPPQq9umparrcuB5t2PzhrAvX Yhn+/AGa4Q7IMOBh8YJljbe2o8xZvJoq+s3nhCSb+gn/AGPoL8f63WBIcGO2GrN1DmIySxmFsTgq hw9Th4tYWFKsaYwB1vuQyp7g4YkCFlhA6yTV7QswZ3R2Tf8A79wFBAP3S3CLgkmZ30V4ESWUbv8A zC+mgdJZo4skDSKH2sxajcFihoNi9OsyxSJXts2rXfN0eKHzzz1pQyCW0VncFXi9K9OHq5MWjp7M 3CejsRhpu5eTZTgnskyZT7JcFf1ZXJC0DyqhE1lXKPLzsnucAAPv2G/7/MXJyzTclZ0BtqsbYQuE Ns2p6Oh2eWuCkbaU/i2Qnvi3cHAw4+t3h8Xz1O3AsrO1s2x7HaX6oPn/AN/W2+WQBB8RnuFxpKRW 40QvmD5D5hQ8JAxWRwhVWYhQzHJHiewAZ3J0bi/gzeO+ef8AAb+f6MTC2ya3LQMVJKDv92X7c3cK 0bCsIeWW00ow7CtfMQ3BwcK3YJlOnh9LeM7X8GZtl4ThwHf0E+fPgOjcvuBHV44V8F5d3DLGyBgg 54vkWQP2egZrWR43y1LY1kLjf85pYyIul7h5I589LyoNbeqdJrC5NHFI0mOo0PcmNJV+0uxiLiTw s1oB7hMfbIm2Pdbitza2Halq4h4DCaEU5zVwMLz1gqI8AxP4YnrpumWy2C0GEiwWSSen6UUm+dQF /LdPu61FKab020C5AxagdPfU9g7Vnk+AEMDCauhrKzvZtJ39B/r4/v8A1Uu/JGoy1CCrZb4GGgWi vglTx87UUj/MQxdhAk5b+JW6G+TENxW1WB8Cq+dcnF4DN7B7Hv8AsAD260z5FF5XD56kkuteq/bZ IV1UDW7Y4npS9qMQ2T5kzUhdlwfzhzAhZZwxWZNo4yjfdkjYAADfv38+tFSNY5EO3uWzs/dnJ2Fn mm4q8hguBqmNnpsTb7OsvKLMsG2aSQIDcQdQO3bkVHFk5hSvbWXTgqO2I9crcOKBJKKeUrxSpyON rGyYjhzKvbalLezzE/TfMtRhcHgDo/8AndzSZPc3nsl/X3gEHwCD1MWQHjlBeSru7Ut39AfBruYr 12Hy+eWgjgVdkX1vjafMMkMLGn7DOcSfi3lmR7Rxw2DtEAt1BAeASV0WBDnqYeuU2nv8FoW34sQh 2cYSEM8Ud7Gpt94fDmae7Th8ENwKPnzpbNyfF5ZfuwRHAb+AX+QY7+bx9Tbo5L7gkBqx035wan9S FmyFugUehluWUiWM0J7hDcFuHT8OwHyuXzTfscPxbQU90qrrseEE/j/sEAg1htyISuac5NeISitc c5ZWfkVj83xHcSqVd8aKkmixEe3DLI9CrwzUVYyJuxdAkp+HdjGj2EBv3UIyf4QGSWq5UJK5ZPuT siLuSk2C+PD0nty3ObR/mCbM+Ifg9kN9ovsADgIDYEPRbRcjvV9faZFfVc2p1QJMZscAL5HXq3uS pWwXY4dgW4bhqcezC+YgqXEoKe87XzkmDCVcko+wAD4DwD90apcywLAX7ajZVD6kANyaewlDODg4 L93UOrgUjRvXKfX5hkxZA7gQXP8A1Iad5sxZZu6CysHLRN/7+P8A9/YGTVbAPYzmrTsjqudqlqpV 1IKbAnmKXtiYmyl3mVb2i+MlqU/T4fjYOyq/n0etvKy+f3s3+/gD/gMcerf6eW1aCH+76mHVaeFV qOLViVIuwWa2N0M3ncsDsqyxFeNFp5ZN2IxTMZO/UQHHFncqfdbEDE4i+WB6pmDv1HDD9RWaZtR2 fEevKuYXi2mpXXlur3J3i2M+L+nsx2rD7etwXxPbZzgzPPF0ZZB/i7z79bvPkEB1blBda5DItKPG RLtmRRVMMamj29qPgzXz0uEV+coTjDe73xUYT8/K1z4QQkysrMvn1C/SFOAzSRsOB3HFBAL59NAj AOBUYetGOpZNnSs6UWT3b5DDiBTdQgH4jAZW5i2thx61O5ghbwsrPa953yrnZJBgLdQT/Pum+jLF qBhdBFNQRKPVaadQUifXt5GRDi0HnfT6Bb8FDTe4S6Uqwc4YUvPUq4iMxNDWMFlIBmziPivv/H8X 0DhgeoVsXMauezUMZtuJtssIQDp4nSaWeQYm5IlTZsZhtxcV6ftcPmUptGlkyRp6Mok9SVZYoljf CmjlYBvKt2MDXy6L8zJ4fU7KgEiVkHnZkYa/tSvbAUzEuU7ngN8MGEPWAhocNgp85AcIHG+DK6uT Wt7SaueP+/n35gPz1BrUNjhp+odNSacJIYhkr1H1FJ7O2OAF8LRQNbjrUZGRkrdkr6Y1VLV98bOU JvlXVozHPNnPoPgN/Pn38jvlN2MLPoZS4Dbtq0D3JLDuGTcEszKV9Qp5otS8LIT5gfeF9wnf+oek JizwOrxnauru6JzYF9B8+/dAbQrw1LUoYTW1PJAZUNtrKv1Ua0S63PSpco9WxCJNhuEPj63ghuEB VmDCgsWs2YD8ID8//kAfsIrKrTTOe85zMf8AFRXt/VWebPnxx1A7SOqEIUOzBErpntRrlQBtcvPP C/H46FSFqXZPrPOSM0CbfK1DkogdJSa/pyZV4HT3KsaYAtSyO1a24D0NVPD3w4+cZpxXJ2Zzbwf/ AIFsHU8t5bRAYIZ60ANpTFymUm+a3mpNPqYfvcvSrkrcehh0NkuCyCHautKPPHHDjNNlPvDsD4Py ABUSD3dP+/ZltlPqRzHUZXw2T/ObsrmFrURWW11M7q6uZIIdkB4YeYwbG22BsdVrNmbWTKA3bzmH n9gxx2DsdZCnfCG+Cs0C7Eh42LUxh2VR8uWeTSwAXahAw+J7jDDuC3BgL8DGYs9m1fjJw3gbB/fj 6Dz4B0KhQyMomil+dQDt6hvaQzSd2cnJDviMuO0dX7M2llSRxjlG5E2BuxTWlZ1yaN0PFc/B63aF jKdemZ6ToVqWpVrATpHqUPV4kP8AKti0K52+yO9lkVsnuEz4GwfMrS8mnc2bZAmxgEH/ACYN/wAY 4eHrNXMae6Cv0abGpr4/qdoMd5WwpvmIynAPMOSQw6GH29kd5458p1PJoxQWLJo/CTd4VCfAfQQH UbDbcVwYBzVJDSd0AxpZA8YcC1kSuWafTxhPLh1uGHhp/FYCeB+Y87WLJk/u2+IOwf38/wBNqzFN 4codez812JWcxu0aXX8OZIlh022q9q9DW098quGYmVuvmGo8ngWrc3lXKcZ5sbCbA/8Ad33QX8Af jNPDJErFF0yRSMZS9auJ4ojFEVOJ+ojb6hjNHcX8aAscrUwsc2YvbmXBWY+yeNwM0d+NmsRRxlys 8DHnfX0O2L3um5zzHMUrmioYRheNQlnK8QxUrQ702muHbcPqoMUOnkEOxu+F007xmzHwWsPIT/Sv wADA/sHQQHzKzssXcEqtMk2BrRwJWEHzrODqbIrlPlVKyr+8UPdkx8T5jVUie2waG/iFKNBNZOJJ u7LU7RH7dPn6D3/oPqej3yLbB5Sl5xK2jyS23GQZHyt15k55XospDH7P/Jw2CGc89AWxjNugsYcC b0DP7BhsD959kD4bbXMyY5VVeVtJ+aepxhMWFk2RDDuYCZcj5ZA++Phsi2yODG8W2n3T2TWcbQ1G I3Bzf+4H5f8A8qi6jlo1jZncZIEAds/4yOfC1efI54+ehja8/TztDG3djhISua+DeHHPF3fFUQSt VbJtcBOanPWfp5pg56mhri56XbT85Z7tn4Zh6cV9bpNzpmmpkgZo+xpJSQ+hPWuZgtf2dihYQxub JwmGS+daazTbTsGukoecueqK/l1sCykOKuXox59Bz4AbOly38CNrJXzlrONHqUWwr3BT60aD3phZ mzLnrVlkOBQFZPBjs63jSxULKE0LMn9n7khPHvf6pc25FtiLPNDrH9RIOMIeOP8AiQPFDxtfv/x+ 6I2Sm4cCm7UuSjPjdqnDVpZqPW4FgYZloVLETVdPIOFbsjJcENwfAZ7iU4M8rHjFnm/+/j4DYD/d 3rjp/Vo8AV9wlVU4Eraba9Umyt3B8V1NPFLH8FtoB6f4HMW2RPq/GcBsACbWidZq5RmGPGyGznPj +wAN/QT/AGIalV8VstRSqDONhyiSDLMFeslkL0yr3yWrtHb/AJ4YfDCevmFVS4HVaezDBTQsozwE dTaOAqK3V/B+fgFRL+5LYENXywwuzKrSaBK3NW8tHyjzR3IKNEs9p9fE+q3wwhrX2Q4B1IQGpkwe Xyhyay8UmEq33+/fiLrnavSx6vRrFKJp0imik1Kx8R6qNbKwzpz2bgSZe41PDG9HCjrj1DxSvJF6 c0kMkKTDmSDcwBkiNCpBiCrfH/fpe2BbDQ+NCG+T6lGpOVTLb2nmEqnicDV2FNlbeYcK31CODHcE OdbVP21iyf8AqgFE2b7sbwYPAIPsffj+6vLEIXcLtmAxu2/Hsl/LVwkw6PiGMe7D4Mhp8xbqvZ/D zkPgcEwsrCG0LJMGk/RwADn2B/z/AE4KrF3gkVZDM3mYCZ1BanDZa6EMxV8uHUoGzSjQ4D4eMznk z+eUuBwLUt9GKK/sjhNk8A/IL8g/YOoxgIA1ePXtjIeyE3ya7cwJTE9SDgUOwhb4n4MjJM44HImA ajb4FqMExe1k1kHV+yAwB/EB/kf6ILcSiMI+oEJqSJ845NkjtjOK5O2fYlc0eeOaAxdpZw7abeXe BTCQb3KbaZNuVttn3JVr+evtqaalNIaIcBCPNtzZoH4mn8a7SKnZEMXbB4WtsBgxVbIybhNVR9wA XmYzLL4rk98djYRH3/YD4Df+qu5jIhJsOZPihySTF+NEMc2HpCHFfIjQAmEFuZ3UqvcODn6/5wh8 F5QzLIMI7pO//wBA8B8+aq9gOtoVfcAe+Hx/hoTtZHKNNMyRd3yqHiXI5PieYQ7UfGQPADgwDhPa v6oKExm9pBvf/wBgwP8An+2RWYeuVuHlWqyEq97YqV3MAExjEfH0XfO1mGBbZE+HD7fwzk4eeVbI ZifPCbNj+Lu7r8g4gPc/sDjKMVSUp2WyQZ5YxviFaePEfyY9gy4CPyb6DaVHkMIdEO3TOlf3iKWO ZaFnLbiEZPIv6j4w72FYlqNFS2DLSCj5UqGezlIvH1OAVezZkWxhPcaYnslqVXMQzA+1AYFwqU5L /F/aBnRwgTg78AQvoJ8+AxD7ouSGuauObhrmZD6QyG7CMMjVYHPKbq++dPoyG3p7IyOFVrjAtnG3 geExmGXIr1mT72uwR4PH+An/AD4AAW1dqy0mVPVVs1nYCNK1MXmGoxqEaaq4zYTEm1NSVnknM9Of QlVw5502PPejMHwkiyGu0Kz9Jz1hDCTiBNA1vMw9Prw/bpW9PuSvXrHETyUMC+Wgw4mGrUBZtj2g m2FSItlT0/eL4DzHANOgOCGdrd5t9pfFms/ChNg8+wbB4BUTLJbRxumX08McxX02ouGaPxuVYLCx Vryb4OVXWwWSZCd10RqB3KpSaNY4Gmo3fhas7tP7ACpum3yAUA04NM6hHZeR0kw0YbXbS+m3cYYD Fq2Rw9kYDFcz2CAqp4wX9GZtkSbRxAeA8+Aw6jbYOAxd2NVS03nXY+MbU/wx43JkVkYqUDqEpGxq 3YIbgnvidC42DqVw7jF2ZZ9u2e+f38AeX/PgEGST0+OZ0Z1jXwZDf3yUkjojwezg6nW9XxV6U0OM 9PMQ7shrbA+79aGHD+xqG+cmSDYRJqtBfj6CAPgEI+fakxbvy31OyHK0Jlfu1g0bSdI3RDarAiB6 QlacE2pTBC1JgeGHT1/g8BfunuqTWWhX5MDtIJjwHHYH7YD+wFGZI43lkffdppLDLjG1FAMwp3DV 8bcsfzllxiuTCUwIIn9IqGKDcA0kZ70YdtVkKPN3445rGjsAtNzM6BaBgI1JsONLq8PnXR8Mmr0i ecjFXw7gmMiIHX7JvB8wbQcPbEMWs2Yj2iku4M+AP+ft3YOrKg9OesDTzXkOr2KlDVZKWsZbrIxM T6mU+UWNYUWuLIHmE9kmslkWAZn0PYAA7cAzbBbyTBmzfsAQT5+ouP7AfqwRM6w3Z8zq60y2SNtR j0r05a7hScwzp8p+LyKnJfP4Le93At2qnsmD5AIU84vKxhg8Yg3bELx/2Xz9vHwHRJRdqQ21X706 vtVG8ZtY05Q1Xja3jsL5ckq7leuWQddtVoa38O0A7UBsCA1GMHkV3M5yECOwP9PAAMEHojLP2vgj bTqVWstQI15SOA8Y42c2o2ce0Y8gqwqmAd1yoFlEXfHwsqHcilr1AyAqRQjLEHIKgrWYtgwmLdI2 qk1+Gn2RaRZHJzHDgdXypepZXhuEwwnmO5K8tnKH4HBT1lmVqbWWZ4q43qHOb/UR/E+wcB6fGW0X BKB39WlaAVIPlHn9eYAK2nxLJKC7uA/MT0+q6fh1XqE3iEBT4Hwydv1fh94/F2CCA2AAAQPbqSjk FcoprZmLnVtZNg2dHs0xalYmWyt4tiiQJRbcK3WtPdwPkwc+Az3dqd+X1cWjIxzzdVvwD6Dv4B+Q ZhTeNQBm2KxKaeD2pBw1Sra2JRwOdHU5kpolOVc/cHxDcA9qfMBcfrT6ys8XebM9jaT58B4A+g8+ BoxqjmpR0DxSbaajEJIkscryO20bSTbVWfEbNWRJlSvaQxqVdkRo6yVI8R3VV9x/H/c/nqNkMFfp FR0/XL5W9tJNtVLhcVPtUJX+Y5Hl60HxPX+BmFuY4D+8SH/IzBgxoFvOx737/QUHYPPgIDNOalIF qZ2bTb3aIeAyLctfdrIR4kOpQMRNPQyDgtrnGw7At/AXp86GzbW0LKMctE3sewex8/sGIBz23adm PYvkVlWpZD3rCzvitNhuAYTWwquWFOrrFwEwxCeyUkn4bDQBDFlG1o02j+uynMcd/fgOIDFgALdT oNksFlyQM+YEodtyQdhR69PPBYxzJhPSjA9kW4eGzMGxnl9tBmRiML3NmeMTbs8b/wCAP+f6kOl0 2mjG7NqZNx5XDa+YNIMpmlKI+IuOLdEca0NuFIUtiufV6k6mWbKKKCDFIlZIY9uPmOKQEJkcaMmN WbAu+aCrh41euD5mzZw0wLT6uEp621B7YWxYuIhK7IwclcGRDDj/AJ2JA9BsgmT5Rtm9pJt4/Lr8 Aw58f6ZCVWbxUFiJ7G5IalnVLkm7YITbmsCG+AamLCzwdgT94re7FseHrmtB6F72YMV2gYM5s7Gz iCAXwDBv4BfPxrYPMAUcbFrRDW9PZlktGWGPTKvE0/jci9ckVPcEJwMcwZGAP89fnqsMn+G+S8J5 s8HwCCffsAGPUk2MludklV8fCUkxVSrJpwOqjSC9zKKJVuSMAdkZafmrY8wqgeeA3Dk74rrOxpJu k/7B+ngG66DFJYUkvPGEsk0um1C7nhoVifvojuVm/wANEWelaTUM8gkMMcTxxu6E/wAHATITihY4 GJ+O8Ub6XqO6A4CnkxWNPG3YZSTfKK3ANCnfB4DE5Q+DzD5ZFbmE8eng9PCf7Mm5tFXPKycSbs3x BxAb/sADoqKVPX5Q5DXANnJN/I7UD7b/AOCn0jVYt8LCyuoVfmzDFkQ3DGn4KkwPlHrZN5oe+Fl5 Bm9kObA++A+/dJ+s4an8cDm02kuwfVdMsiVHDZVgU6HPUO8FUMw4vmJin3DugYwn4Hq4DrBOz0Nm R8UnHtXivoJ5f2D9eqw9QWXrRXdLWnBI0j5AmtdJGHptiwl+AxJ4sTqCVYbev4XZY9jWnb5+FghL 8EJDaFrEbcH/ADJfqOHfZgYsV70+heXhaTGQFBWNZbUOGnW8QMu9tokjj35UfGPLGBNCVqruyK5S GMBdx3YVlha0KHLHnqUtCt0eVU9VvkCYyXBppSYtIh7mDq6RMq89LQ2hwX7UvihltPsget4vg/g9 V2+TV3xZsw53SN8+3/H9EHn0kwC6Pv23MkXRlhEq9rTmyn2xW5CQtprRw2+Idf1UYcKTT7U7qdlV 8DaiGjI2NyE7yRwgT6CfP93QD90X6jyi+GqLUhEi6e6L01JOq5bhvAdWklpli2Ok1yrsY9Ph6fET /lnrVcUPiicQeRiuh0+LNmbsSnjHgC+/AcAADr7mXYPlWZMsvWRk2RYbvDdq9V7O00vFYp6a+ahA ItbcGSGGuAOHT1tVUgAKdDqD8Dk98Nmwm/gAAAAg7A/HwaSXseOXU2UWPk72n1Mg4jWfT9ni3KHd OIL8G6EfaEjrggTMkAy7ckTsVEkccmL3XZk2IvgYiup3LsjLaIc2pc2yLjT5+kUbcaBT9hPDFSfD RIGmr4cGOq4bJZFV8wgtq+h1y+cZfcBay7hAnugsCDUXAdgfuq1ArUOWWj0+LPIY24MpDbacq/Uj Z1sQ8D2n2Imxe+C3VWL4Y5BMtRDsGf8AM3N80l6eifCau7Vc+Qd/t0/9BY7Tq0F0PWGbQdcVwbrG qhl11Rq3JWbW9T9+GikbuTrIXnGHRCe+uB9bVnysB7UGxeUL2GnMO12OKCwYY4797RzA8IbbZle6 QaHhqLJeenvsM4WRedLO8toVtR7lvDhD5ghoe4J6OBX/AMqLK0UaGYYc/h4ScD6EAAcBPn9/gCRS osmncTFJJImPsMcW2J2ievUCh4y3C0WU83wSF3iMoe4g8ccilauSW9pSb4ywfmvPxzRfFyJafbVP rdfSq+Nh4gck7h1RwaBMwWr0irnnAeYQzFD3YyJ63O4fq0BvhOzBbReSyD2Q3hsC/wABqLf+qozK 0shIh2Qxttem7CbVRbbHBqA1vLQwLkvVyL+n491E8OPZK5Ar4HBkeSf0b8omwhwAf/sG/gLdZliF MpXMymMDaNJ5RhTsJes6Xx7uhFUwCbdjhfFD0+nzHwf86BR4GcyIvPP97Vd5/wAABAHwHSZQ7caI FgMoaxryCVvFhg6ycALiPw7clNR9tFHxwZE+YyWQHT5kGevodjSyfF+TcHSQiTgAqIAAXwHgMZAN RLIsQR5EbLPKX1EyleULC+B2owJSuGLcqTlyAFTyQRZyDMumKxgJuRiMeI3jzXLDnFshdnjjpzGD FqUjHAhmNPoElK1LaeJdkVuStBsDFLGLJpRwp+rN4TzAcfMOAdQDaccEbi6usjP6JRsX3YMH5A4C fRoNPvjT7aGSr5R5kVbaahkSyLgznCnA4EpXp6pbUsEOtuFV7R8JqukhS1cGHlmaNzZuE73v4B+5 8/IL9sCZQx9oJF5w90h1LcyvMJMNgHkntk4Vyh1keKGB/beHW+pBcX3BqQ0+lniGMsxXKLDzgbw8 /j+vn/d5VGl3RFpewrk16krj73NaTYcgPYVbCTDm5O8Vyb+SLa24Pu3hzlLL7bj3fGC6u/ZHb/V7 wCD59ghj25NaqRxhJPp55b1JeOZ5IhGQpaaeVJEEAaVHiircjoyUSrjlLDpy8tudwCJl9SCMGPbR yrPG15NRSRvacgvFm3cQOkb8ZlViEdstqrewg6qYr8SHApq9Ywvh6fDfNnZCH8gvvkEwzE1coMFg zf8AYAC/v/791x7Qy5Riwt5Gksmr+ANivkw2iwoZQ8v7otj3BwT7Uh1tX62jto+Achs5MXthPHwg Q+g8Bxw3/oE1ENrAh2YBlNFhMtkZRhkXrILzGihn1Xi2xbRVPsCZvFVob4voljNvwHiGzDCnjNk7 o1Xif/ER8ABP9BJCyGhNrf5WzySSvabs12QeT2gTDFi/uQchDrdwZFtb842kN95MTKFCbz5tJ3/2 PgD+wdCI2Rknd5i8qK7ESUD+B7ft55+b6tmbZMZCAR1ShKkGRW9yS/UvHt7Ux7vOV9RqvZj5Xzwk T6HanYPAT4zFW9qLaew4y3Li9jJ9fzE9Dp+H/qNZaeeBoS0M3Tc9kSXYGggEI+AqPwB+YYJgOvtW lzXJPquMh5ucNlr7JM8xFPMMTyHMKgMIi2v4HEO0Lagw1mzUNXWVkHVwQ2cPgH8+AAe5/q3V4ab0 djZHZH5st2plU+EXh6HZ2l9smRSjZKPVXX7JwNwp+tx8wH3APckGe3+WJv8A8+Pvz9wDpV1Wh1/q CsgCZi1vGrdIG1uvcw1USCxhXcq9uSuUOwJhgxvENwQ9hp98eFsXRr5ue+BKSOPHaI/wF+8/0wvA 2cwkQ7+O86RYYYEYWM2yvJq5XGvm+FqrR+kRSJWA/AIAPwPwOrKaV9AtJ6iRV12Kul3FfrXM1E2a Fp6IoK9uamQ/qrIZ6QWIP0+m0apsQ+BJSBpCSYA52BTIAsZTARlthEaTyGWC3s+dUMzLap2gTzYi JQz/ABFb1H/SbBlLfWbbQ7ELjZwQLGh+tlEUsWUq8lSwMaDlJ3oKC8kkUlZCzlZLT61tqjGUBOzq 1FKoM1kAAnCrPHNZGvPPJ8H8dUZbJOPn9/8A86O2Uwhu4uyKlZ8mpc5kPah3en7hcbYLmIuqDT2V iw6vWrsTzEMOQcAfH3y8HyzGYpaFZjO6VopKP7n+7v790wtNa/Qd8SGRtuSybas7WvakZhpekhqu pocq0JZ6m08fMrfkjJDIGK5ss/2dhk0Yo0PSyDNJAQGfwfj+/wCwH+q60+ro9llbafAKeNJZsMld 0h2ya/d4ZSxrYaItkWBMfEQPagchDgvloKSPyZmV1d5t9HwtII8AH4Bv58/gAPz2ZWdoOS/RpRDy X/UsBaqBYbgsOyVaJL7jUNbVXw9ohreBhDX0+xgHaVVMbYrtBMZ5vfAB/wA+A+ggAWGUpHDBq5kC PHg23u+JYpTp2X6bUenqdoLIQY6MYJWSqBNNIktTaSA1WcDcxmwKYgrzIlHbeuzJu1suJit09kfA de6bnGwtnqADaNsNBICrFlsoUrJDimCEN8mJ5iEP2OBYAGCHZhavyYn2u2Q5wHYP38AAKbkujTI7 gz90Zd1rjgGh6oZSRYShp30zPYGTVCHFxgVWn3uhXwt4wwZ6BZQJOp+zMabGvGDrjg84H8GDFgwf 0F9CswfaljSK9QxbKMGu7haImwFZkH2FW6GebHIohj04OYQ94sCtziHxKctkxj5V+BM4E1Du2/7B wE/v/uH6d490JFduyaKJDUlcMdvSF5J5Cs1vgdxgZVq88ZE9btRaX3yxuPtpxb2xoaEZGeTYM3v4 ACAPgOA9FBpoocliWGDcueeGCleHVzySS6ggD+LPJF+7PbsY410DzM1ROrzuONx5B2ooURRqu2cY 4owqKuR8E8XQXsjLujNFjXKVMbQLRZCSWX8TBBeDgQOoUCLD2gtmPhh3AeYBqTAeRg61WYto4yd9 7RwAPz9+wANgf0Ok3+8yrhb+lah1Iwh6ewnMDxcewvmMqke0rhhxBluBPWx9WUfZdwHlWtyZNoV9 PIw5hshx9AfQT/H+jDVowWfpzmW0ByiSRXraHku6PM09vCQn6g4tDVffHb+7K3Mck+yI9aWAAOOD NUCHuYw4btFJBvx8+g/v+wVQOMmvhSltWjxocI1M1pcFXae08Dkr8tPps82U2ecGBkp+1HxPrcfj zxgbeN7Y0Pe2I92G0nDj78f/ANvn7llmnQCFYXhblZL3YF0jY7kqyKBIsjUuBSCTbxaxZXoTFCrE MZg6bEKtW3uT+psvamWM4jc4SSTEsMiMhc/fmW0T7MT7kXKTJQ219Ny7AhjWCkTFXIdsOSvZBBkf WSt8Jg8N4/g9kDCbTV7N2rNpGH//AHz9qEcpajJcFb2WH1ULbraF8aS2ExYVwXB/NK4kCrwyMN8o dPT5jA4b8vnkfkyMVaBn5ROWicfn4AfwAH8fYbONFbu7gSTcq2km5sqtyTvZDhZDhyQDSN86gmhw IOEOq0Mw+MGFxdwLL5JWaM0bmzbIknPAbBsAA/v69rJLIQJlMhuzLtfzbDwbMFuvV/8Ao2zXxDQ+ NuFqLbgtkJn5QgVWyLNltAtGWTmO9+58/wA+5B54ZAs0bl0RnwKMzrnlmVANWtY4nizdjkVyyNdi SN1dzuOqxSI23VmmLJTZeVoZD5+TwSTLkDlK/ZA9NwwieuEpKm8GENPbHBXsa2FdNZB5jjcPT2n1 eG36wB4OYUZhbQTZv2TkH/YOA9agaev20cA5qG7GyTJC+W4BzFkNkwXF54UcCDInokO1A4+Z5D2W 6zZvyYMwSQjsD/7C/AH7ojfK3bN0uWy21kf3YNpiksOlbOr28F7tK5Lya5cfhoa4tviGnh0cCwKU FkZeL8GWQnNjewPx9BQcD/gJ4GnlDymeiz4dXWdXyHGiWABZCBaYUsYTXNjQ2AzDmKEMw4MiOhp/ cUPWbNaHaBG3u7KTB/2DYAB8+pVVI21D+nGzl28NszrhQ+3PayPNLmWHC0AYy+ovxtOj5AVJwLpH +y77jTXQ4FdL05R94C1umdV/MAml20batqwk+t8lXLTALkw88Q+YfcGSqx/3yv7aOIf1dDJvJwIa 3w+/YbAv8+xX4GjzDZQ96Ld/TyQQlarhGiEDJ6MprZ75fKFvZ5hhOZJg+GqodgKVH2pxnlDNwf8A v4DwB9f2E/ZA4n0vQTgyJDu4WjbSlUqlLH2FfCOkGBaakPlyLa8yJ8N8Qoa+YVZ7ApHA/JtRn2be 3arjiDbu/wDH0E+A6orqM1GGIoNDyU2wls9aBgKJsgCk1ekWPF7eygNkOExwDmVswP2Oy08fhVay zC/cn5sJagDwHAfY+fNWklD4ineMxs45LyPW0K4q8X+T/wBOi2YoX3gH2krtd8sCcRwcR7q/wjnp 2UmDXwLJT6mGpkbZEpVsiXp3Q5iOw79K1YJspkHwk/khgwPhtYFP4rDJk1f8vgggQ3j/AP0FAwbV mA5hl0ST1fXBaEM87NsS0GrJHsMz5UQpw9hY7Hp+Hxtg4r/P1ynrKzqMKbmd7o84AYbAgn0HYD6T ZGR81BSOWu9p3ZQzRxtTsBqWqnpzdK5LJsVktB8D8krcywGNh4k8Mgzi6vj2OCf1Bv8AwF+Ae/Sx ZIdqGkPTHqHTeSJLHaZJhaE/Jju7gLTRLRV5hwD8wDmAw8M8AR6Hccxmt8pxjfcUlJeNgfj9un9/ PdHhLqJZJw/9GRV0bpEd52CBEmzRpIrpsWidbJbMNS0l2RI2Ss9yu8dkkePPYxDVllTcfb1dcfaD Q+A73ylx2tFwY5gReqe7O6GFkVL290lxRDB9PmLdkD7Irmen2X3I4yr/AJMB2iEdkbnx9+P8+fuv qWPoPKqu8rz1YXNGhHkOioket6lgS2R8PO4t8cOHp8N8hp9gGPgMClvCMslEOs8KrdglXPB9+/8A c/0gWw4tNDwttspwf7mPODawmLgVXBIQ4vcJNAvn5gW5lwByCGCgL7a8IbyTQ9sRqrChOcL78wPw D9/YBswD0v1LqAzraKDZJKr5jbEMWcNV3eG+Hl+K+Pjgnsdb2R4/524KfJFkYLfbM8I7JP8AT+IA /sB/rK0MepTELtuZt5dvsdOFtdMyjb03xuFITu9mQAQdPE7ws4d7zQqgYxPG8b4YyOkcst3RIVih HJBN9rydKLyzxgDmq9nP7Ux2oSd6fagNTrzJXNjS1eLaY+YtmK3mPlocqtqn7LeITyMV8dQow59J B7+A/QB4ADmKa3hpzod3nuwTnmcEwaGSGHs2ZYwtslFIXzA7IhzE9Ph1yAQICr+6C3n82BHa8LdQ T+wIIDfwF0jBRgY7AhrkaiBpKubC08YWBQ9EU+whhYvTghvhggyd7JjhDwMe2oBE+YTvLgZMl7gw nAfP/wCWOAHIeA9X1eYAocM2SSMGSnBzU+WDWRhyA1PUot8nmFuGt3Zjw+uQNP8Az2TjPA1nY/8A p4ABv/Aej3FEiiQPJtujq0a5I1GiFexd8WceD8c8W0e1W21PJnUO3LFjtyyR8xSou2ThZIaTIGji EDNXs4LbDxTGyx6rGGhkpcE7Cnr/AMx8illcpyBbM8wsgPAh/PYIAPtnwPjIwHib2M/wE/8A5b/G 5lkTHK1KZaCiTGPIaSyKbTNJamCycr6c3cXKmEQ92TGR83BwVa0r98R0Pa1er2as3g1hvngPoO/g OnkPB2e0GHBczXYJnd1ED8wAU/5gsWw1KrzB8MOtlw5j7xUv1Wk1kYU4N7G+1xzz/gMeQdV1Fw6b V6vs4zlXlf2SeslkrLhNhB2JkV9L9hLBRkYA76tl5iePh/AP6ecDLMTFoZNZO44OxzgH9P7/ALA5 gsiyqjojypgqpPV2ASSdvkgkUKF35HSo3+nl000g3EgfMm8K5Xgmm91f7V4N9SR2i/4pbYzq10R1 729qq8n5eq8lQIazflIYloTENgsdwT6rY7IwmA1Ng7cLdmPOHGWbGrsEkHUQAAA/VfPgIdwT2wC+ J+/WQShlE4lLaKBsgg7h00+JTWiGwLcMPjZEMgycS+Aq47YUKM3uk8338Bv4A/v/AESVNflQV7S9 2GbLfBrhfudV1ZVPp1p9fSWQCBiAXKHw98ZA8wwPshqQ3DTS8B1mzUN8ZsQZsGbww4CvgQF+8B66 9TGZaj5R9e2Mr1jonTw1wVdZ1P3xRtD8kPHpcWr09ftRk1OTFuEwYTp7gA42z8nuT9fCHNgt7nwA AAP9L0ciiYq6f3mMvEZ5UiJbci08oZZJZod3HMqQo7e0kjMU3URugEqS7V7MxWJcL8kR3k1RpZ21 rstvOXAhuEewSCquFHBts6fksgmt9nkO4er7QiXyUmcPqsw4Ia2wJ6rqHHz3gOTGPn2ZHNO3gP8A YL9v59+1PmLbk4PlSq9MkmUyHjFngk+PEN9pFzYUOm6T/nK3hmGP3VVJgUZy4Ms0YUGWY8JFopPA QL8APnkAAwH00fT3BDiHtRibYUaZxV/7PLd8csqtNcpdoXIhsDGyVWYEWqwQ523nka1EYn/TOyVc ER0E+g7AfAPz8AbLhRmmsDXa2dM6hFtb1StV+2wkGNK5hsuy+EKhotNoZGE3mC5nuA+2K3OOCOnL PA3vkx1KdXZ4XwCFv6+BX9gNpYmdcdQ7zah0STCtRu5D1SbKbWdKALe8f1ytUkjBURoEhoRqilaj NYqT3XjjwaF2eB0jqrMELQBtVXns52dp+QN3CjclfsJklFGGVbTg4TLsDuCfZFgMiqBHHvhs6xzw YM83diOAxP7AfPn+uM6LmVplkosDJkwyA03Ztfks5gLQ9+r2xkMOQfGTupVa3vEF8T+Kw/q6usjN 79/6Bfj/AOmPWmZR+WGIZ0oW7yT0DO2myDzJxOYhyl5ycltfDuAd8Tw9gTAaGwwHjDgzQ0bYDN75 +/gPf32CHkTBZ63K9PLgBJr0yqrglHJLbREhxRe1yk74fdSG+cwT+Wr75O2wZ9G/zNg/f/582LBS oUHRsAqmz7zW2h4Pv7qI8Y8gknoVijDxGRcNQjiR2ssVjQDNqAF1kOL5vpnVQwFDJRvHi88knHg+ 0tCTVY9I/iMlWFd28MCGHtSn9MQevzE7b0OuU95WbkaKz2M2kuyOA+gr+/8AUYlvAho08OC5mQ36 2mf8UBlzOk4GE7T7MqYUnv7JC0xvkS4HFwnTx4E37rNNqwwliFxxxAAQGOADAAAxVjI203Xy/DKA VW/iVXDVKWHMBx8St4vy9QTQnuExkQw7IYYDEECnVo1BifKEPnKObdgm/vyD/q774Xvw1R5euu0w 9xwNFFBAqHpqv6nD4zTNZTJNYV8BrkM/2PdiHakxjX8AaCv3S0p6yjq5R3rM3gEq8HjjsB7Fgxx6 AywiQFNNaR+quoEGz/HXuTUSQZySFu+RHasVyReCxMlLC31W4aji5O4I4E+67X2ZVQHfkRa1z55U uYBn+1dGKThiBckltL2AtjWCvU8o5CYtoGF4PVacYT7UX4bwevCfOmDPdXJvOyJJsGg9on5+AX51 ZzVJckd8mW1bQoa6vjHUpvBfrGGrxHCua5Xqlq/bzAcOyU+XHw2oCwPirDeXlDKec82cPgH4/sH0 DrSjxw9GWjTLlm5zahxckHqEM1JDX5a2hAZaa0Ia+nh1sOY7XzJ1tJ75OW7yrNXV9zqvsm7A0E+A t1A3/f8ApwPFN2QmvF5BWhbG1KmHkAqrvle1/YRg9/XnHvhp+EMz8w42sEBVZHlmF8mJ+ENnLdYD +G/7B1FRWnzZtyHZCxiaWvTnI3kU4Hztx2f0BQ6hZo42TB4nE0rFWFYyLt7bjzeFtY4vIWRXSBF3 ADn3RUpqgg8avSbIt1kYpk9GXq3fD0TUvXMz4fbd8MUmPMcuH2XagcZwNXJ4A975w/cffvvwDob0 92Q0Pl4LeaBoG9XDUjMdrC0/5NM0uvTNPoF3POcMhMuBPZLUmOEwHS1X1ps/fLFX1M6enjB28/v/ AIACA2BkNhRkrlPtrZrgW4R6Z/DLqQqV2q9IrdXPd7uXuD44Vun3xCIOEFSYJ6OYRbMaFf8AKf8A fwGL9jsHAT8CltD4UtyZqlqVwvUwxh0iwrQtQOHbDFjPhZ7irbBMmGGRwmXAh2MQr/Y8eMtHGd8x pQJ4AAv7+/bB1nMG5FGGLl5EMKTZYfU4yum1NIA2G7GIpUanw3HSm9zNBVZyt27PLKY1AWOF1heW NkW2/wCW6sLF2psY0bcUFnUS0513Q7WtrTgrvCTfLgitSlqhvjUJUF0Kr6CAqOZcIZpE0XeKwkN2 Vhd86zCAex80fMYnYTPhlDzE1y8cGctnXlV611CsyezNQHR0p6g5kqwrXyW9zFBayuyeNc/Rarrm m1tmfDA5uIFjeR/jxjkcpILf4jYtn15+9cfDMbvXIkZ0Y06gADVTACgBxwBh/wDrn/f8cwtqQabR wgg8j8HssXX681+fx07Fe1KTtBLMEKvPah6ZytN9tO+oBkDuGnBb1GVzTj2+TKfT8XCq0Kq+2+/E EOq1soTFvmqsmcq4JwhgAH0E/wA+39BsW2WxIp+zLCF1VbUmk0hkUkgfMZK/sO7bQi3GBih6vp98 vitgxghDVQNf2WqzFkm0Vf2zeLRCBKrfn6oX76DsGCxHyMyqhjU0TySTVavWAReX2RqV69h6gqvS LGtBbtBwrdbh1XMIMiO+af8AUtxtmxF2gss3a5JNnP3/AGBBAYr7IqdL1MT4afo8u52QLId3C7Cy O4zB5YOdtCnNRgHCv94W32biwfBgV++KrIs1mrtGnqzP7Fz/AGBBfufY9NEWDf3iRGQamN43QRDZ 87RYRxRgxw92UjEmmFKKNqV5CjtE+DrplUIYRLu+pBFSsdPPjIN3JI6XcIIy7bClfJCu7i+ZWDWM a1LLJEi1gXYn5DYYTQOJRomDvmY1vVZghDBqRHlS34u0GZG9zeGJ8+A3/f8ApwA8yl4qfqoozVeS bTxnm1sL+ntJDiQ9cnl4o5THCGYW9nDsC3BUvOVWL5RuYztdsmwfv+/8BwrqcOQ7GpevWhcdqlAn gQRhq9kp94lsiuepx8PKDhScSt4czh62cqXlsFOZfxezMxwJ+wPwDYH7kD91PbhHDV3cEANZz/ny mqri1kVXXshTuCxld3ixQ46H2fW3AOPMQYE9tVXCzBn5yRtkq524/wC58/h58AmHTqY63Js/qZGV 9z2SQytFJEyle+NqRnFplwPtsvfUsoYlEXchVnhQY3HKfScvzd09DHjnnqBr+jnjUOwp+n0XkIDg GZBrxZBi1LobPlRV5XtBPHp5hwMw7TT+6kDnhzjIyrxfbP8ArbYNgfj6D0mWBTvS0EusRll2p3gS ElbU2CsWQwWh2NaC80K8MhMDh/vg/nDan0thW9mbpgjEzgPznAffz/TrZNKi3d0xDtXTQn2QHFp9 J2E4WokkCxgCed5QGGwTLsQ08PiQ9qzT60nB0YYr85Z/Nu2B/gIDwHn2HIfJjk4AbBnuwRklDWRI rbhRCvJlcgWHSqLT18PM42tmXBkalK0OKzHknzzkyOEScAe/nz/AT/T0eWTb1CMjoEldXd9qePHa sDT0+efH9VccR7suMbLGd3M4THCuBJBqaBB/wZbX/bc/ddB+Y0HbBKU/PgadPmBVvS7Ep9br1fSN qV0hETYTA+U/dkxDWx/zrLT/AJz4MsxoaBn3bm2B/wDYP1AdbbIeKrq+0NLs/S+72QefDCkWj2pe VkRLIx0+qd8Sg6eYhmK3TzHzFX+RVUNmRimCys+E8Bv/AD4+e2Dpho9kGLBhodN1ynyVuVUtkXHZ BJw3YxSMqImyuPsggwhsnIFt4n8tOMhNH9uTA97dgewIOGAAAwH8a6smFXtDASqqVYSSNaPjO7wH iOHw5QFIaJRggyOC3DhzF8xYz44NrXthQZtmx/d+en+ffv4DqEYkiZLh0qRrJz78vafHaBgb93n9 dNkXMqsJymneR4z42628hXORNija1V1+LIr7RZjuDA2W5XN2fqC8luwl9wsJwr292jabGtBPq/vx W5hDrdghzkNPfJzJWVGtFoLKzR3Nt8X35BfgH9/UhyOyGWgDVRREGuFqzG1TaSVSp69DsYCJlAQ/ JOH2Qnp497sayl/GnXyshgvtmT3t2d0f2P8AnwABBPzy3VchyHp/PLOlPjbkoAlGziTRL37ESBQz HGzPdSGhkA848vqWzo3A8Rmx/wClfPtgQefdKpwp4HTbpnGf8ZtG0PWNOWw8JNPh+eK9jKdjckX+ SOFV2QYIB+5Y89+rMLQxjNVZv+gefILB+/n1LExjZrhEhdpY0h8GTsVGZr/oxrGg47zZtfHRSSqW 7O9B7X8ZeL7ear/U/wDnqwDIQbKgzMkXcirZFeiyf4v+WrxDAEW2WgVDkOYWpDmri+YR1K8KH5h5 Rosz8XY9q7dQX79/38+NR7oj1AQMGcow7KrdZFbie7Q0ww1XaAteTbGW1+t1u+JlPsjBMOVLX0+c YGeK84kpLscAP+D8ggD/AESKdmNlQTIYuVcBJ200niQlHA2E0XE4OdXidRjkhj1u+HCk2R8X0M5U pDuoYZyf3mjTqT4M+AxxAc+38+scyt6jXOYYZVP1dksaStxGjOs4OkBxcX7QHsB8UDCeYQx8OCeX 31Hrf752y3wI7ffgADgJ8AwIJ90kkQiDMXj2k09SZ7u8J/prngkUCRMt/vRIJq20ydcl6oaaeaeL RQRJLqZNSY1hG1DGzxQvIiyb0qRvngwUtLHt9xG5dBnLbQHM2Bqust31LpNkWrnP4mwEmHZAh8A2 gkAabZB9JoSFT4cwPWwbbaF0wnCzN0q9ZeXirjiT/X3/AOmlkMA9Xw+k6Rt/Jq6uLehskut945DT 9XptxvkV8sD5lkTWWt8WM42kOK7YMF85Jgzbsb9n5BP+f6GwH8Peayw7Qo0bW+JSsdPC9qwA21YC QHAFFP4odf8A2fZ6fT+5dgXxY0wpWSGriyZz32M/v4AB1iPT4cNp/wBJeoIzXqkqaRtStkcgD0nb DYY1Ld2LuF1vYH5IuzTehr8M4B55XKfzmr1es3o4ECG/PsGwb+g1FhkWWDYTVxy7aTlpoAdPtyTY 6YZwvozLuS39MtRyGHc3Di3pm3vptSsr6QxoZosYpdueKZFwrBllhaSN8+6wrdmPk302mRosTQ9D 1IaLaWA1LYbbdkanEdqs4ewp9ocsKRZnG7UD7xD4HBUhz4qhyayrUPZgzZKTNmz78gW6A8AA6ajR X8xoeFuuWlVXE+y6HSbusi1E+p0iq+42nur3xwYGRkT2RPWyDgDbU9DgzEYYhi+cvDt2u38/9fP9 U/MR2RtzDttJC3JAwK9kpEcw7J5bhsViV1eGPren0Nkhh2AxVfMICNMJjGl8/ZDZsG/e58+Aw+vm 0PsmruCqBSGS0q3SD1SrxAESX2wyftC7tVVNGN4fDDg4TfB8wso5DrMYUq9mWeE7IcAbB+h/z+vb UNIYlSHy0gRP5JIYtNGznkVnVgc4C1trvpCSMSSxuqC+BUa90acDnbkVHs+ccaF2CRbzBalMrGK7 3Abr1cG1xMr4lDj8lKPn3z8bdk3FPmfMOT6P7xGCWPKP1+knNgAc+Afv69KI+ZFkGGjh9bpNIraS 20dkmKfLTLkqWZYwGGvhw9kGENwIGJx7lqriMZnwpwbm1XY44gD6Dz4Bv4CxTwQKaLdRFAxSlhVd qhsGZTdhWAHqtXXkMo5RCljQ09cshEuCyDI58ONxA8jp4x5+8jAZs2bB+Ax8BsB+Hjvj5d0O5kOt KTGnhV5DbD1ENTKnxENWixJT4HH2p3ImMncCnoNluGniq+DM1Xoby81UkhOcH0G3QHPgADHpZ/kj kXuSTaxOUqE7lg/xyR3jQPdd3wFo5MjZnWVZDczPnJxWINFRXz7W54/NfmBr+QHrSYHlHluyEMpX rsWXyR5XEh+Glv5NwmJ8yYYh88eHxwPfMJ1BV5Tc6PCJJs4fAP2C/i/AD/XHbCdcjkt0/Q7kSpPO DIg1haA40jXpmK0CXxomL4cwHcHyG4B/n8tVVsmjVeVRhhwIb/YD/wB+wXz4APy70S1xfh83ZDSG m2H29+GBMMMw9KYU1X3AOthw8wwnmEbcFI4uIzy0bm8nHZJ5z/X78/H9/PyRgUjlA9nSmh2STy5n Rngg+KpBhcJLlQ3Mltw/nE9khsAexp6+BR5iysboMGfsZz3YAD9yD9VJFFNqBqJf6ErGNPPqbLQF 8v8A6U8i44/cTfFGNNIujm0kcaCGVEjdUGFxiWKbE+bG5DGwPGIUjnKwHo+n/SfbTZEocoHG5z4t kmEOSzh7vW5Rp36uf6w5JMZXDnAG8KzqtbJjBdX7Z7OxvwCCf+gnz/TORx+k+grgSYrk7f4IYa/t i/amorTPSO1i+0toJ/MFtD4eHT4YN8T3wHMJrNoIjyjWok/+P1FjgfwPr9FXyRQdBXYBPBiT/qcT IenivSGSHV4jIBilpR4O4Q/uBgOvw2rmFaTTCKTF93xiObdquBn/AO/nwHtd6qGAXYNZqoupaxjO 1aNVkbhnWov2bcFyHizmUZHCYHp+4HwOwIbVpaXwPk3kqLWXnvZaITj5/YNgP9outUkjlmRp0kSR I3YRdu3eVLEbbavnI02dLwuPOdI2DA7SZphnFINxO+SGJch2ZVmW+PB/xWKu2YDq88+adTL4qjal pskt0ijvlzSIkOxjynXNjIc9bre1LTMBx8OdZdgbHMJ4FFcYjg+Em9/QQHPj6Dbr8AganqOq9Oep QbSyakktYCuSJWEO09p8e2A/A7NiuVqD1unzETjdgVv2lcHyuXzkxQXtmyYfqf8AP7B0/SOZo5TQ mpRWZ5moayNTWc31lW+muvXFemgU1T9PIwDhgyPTIt4TJsDF8Ic3RmjB6Rt6COqOwYvwDn5/DDqu FuB6fqpLduOgeNmQ7v8Azie4MExoF7WeMMCf8xPhht4eMU9SrkMTWd093jZDewYe337gAC1ZXyoM MXZCxXCQY1yj22N/cKPgc9UI8GgdezTyyZqYprCbwWwRgMqxBBsXbcCubx5cyaUOWFVV+uGnhOt/ n9sdzrgcMWQ9V66e2fjcPTGHmVvPmNTavn+Sc5pu0NzwN72jn/oJ/gPn6dA7MFtsPODJpg2yC3YK JjmM4gkQ7QtCp3KKyXBvFJGE8wQquqzyeeazCyTKFMSZzZDZz3AH/fwPRUDbCESyFWwc2yP8A8Yr dTkKsNoiTGgC2WMBMMIf4bIoJ7BM4iQstH40TF7pvm9mznAT/AUE/h0+GSRdDlUdtO644EklylqV 8h74sIewhxVX2ELcjBC1IdVp9PhyEz5/LQe2VAUocYs/dvAvwB+P9RW2kGIsyOiRoe1Fu8i8tNj5 FDDmjyD5ORUdobWkhhfIg5O2GGOEdLlfN94xoWTfBeY0r6rKC3jTI7h1JqzbUUq9kMiHU7vUFS1K kPjkh2BW9bzS7g4YLc4FqQ+CtlCYvc1nhJsIjnz/AIDf+fdU6oeOHcih5DulqbeBvi07mK9r1flh wMotd+zp8yGt3wHwHuH++E/F5V0Pk2yWi7gwADYAAA+f9uys3Su8oxc10njzJamoKYSYVdPp+pxM zFN+LTdVkK35g4WQyMBi4tPA/TxVb4M+0LPBwiSko58B4DwGHTOjhl93ZK9FpjIOfCkwJLT7OTzI nhsqJY138PZJgcO+Mi/DBnk5SnB9PTNV74875shvn+AD/vwC4zKFCS4F5CGZo02kaQVmyozGOPOx YknXkcFqNAFjJeVGdscVCM2b7fG2ka0t4d2R4skcCuWon2Q0QKvrHKV31tuwpMq5gYbCA4Vk4OVS 6WhdSzCC24VvMT1tgD2NAr+f/Uz4rrOAMIk/ftg/fz/IF6rlBbQ8fKApLJcGa4Ru5FPslbiTCI0F nKUhkE+Ghhw8NxfDgIehvG2ExbQ875zbYwGwYgUHz6Cwlut7AsfT3WLHlU+S7cNVx17V6Tk0fbAa LcbDFsZ9cO6ifdlb8gWwd0/avJi8GdFBm0nwD8AfuA+A6CXSs49fHO32SyDTGVW6AkGKfs5orHng u2EPeCEP4bh8weYrm+F488ODMsq5RY2M5vZw+AAH/oL8f6VDCpd8QibaZ9iEZUVFEqzxH8gxySVZ BA7bce9cz750jdj5qvAybKVvnmSR/NqFtsrFadzEMzcmnuVUr5UrJFbyUSQ1LZivVsoCLHlf+cDh 0+HCITAdtMDaDm4DKvKclR7R2Tz/AOvaI/j1SfMIaf6bsw9VQuZjMulDQL5kWFVYdsDgZUSxgMOw A8OHajJMX2S1J5DTTBWxjMrq6MMtTA2cxAfl1+QQH2C10NkpdjsCww1l3lJJW/D48YqUwrsO142a +PjgQmLYeyON8D4lwIGHRkYpwYYjhEkIj93dg/r7DryStyh81ceDzlZedGW3yvX9tkNUNo/2m5Ab I42HhvhhwITK5nuM9qZEZZfPs3CcP3//AKH8OrgLTtOI80/iXviljzkYNthNxY8kkxYpIt+DaDiw nrTxwsUSRJM8GWWycNstkMOPcAOTxY69adJn/Fc08adE+wU9DfdcNG+k/bjQ7NNcqNe6Nz6YDZi4 dZHfFUDDqrjG0iCHrYVcDZctgj7lnzhU7NzvV6cPX6MnKzqm1hHQtfFRifOY6XQp4gDBzZyt6LTb lBOiyTOdMP8AqL1bKVXWSpOVbN/oK+hzX2pQLHFL0SWEmqrJT1BFeDChZ1nk0muLsU18KIWOKbOl bFbFLlsi6BoGhfHAvhseqxRFwvFFF5eaAF+3pq6eDFi6oNW9tVhquW6kojuFp5lV8BzdOFaQ5Ncq ZM/DIPcSq4YhDPuISprRug3CxZ3xCt8XveOKPvwEDhhifA9cdRlLEzUvT3Uu8XHQNS9/qy1AZ1YM EpbocXXrkmh19PcLhQ7UrceXuLb8YLJue6I2+JIQ3hv79sG/nwHTsh6g6ztpLs6tG3OW6rQ2q2lP UQyZO0uDRTensWhw8GT4dbp8wgHsatGDg4jk2BQmTwNu3+dRcBAb/j0kyhBwV3BVdwOntbGhs5bw sh2VE93MRD1OCnvug4Q0+yENwuAxBgL/ABUwMsy+MVl5B0m7Vd2DAHwFRAD/AOXTePTJIiiOY0jP FptQc9Q+1Dpo2EisDLL7VIzlOGZC+SSK7rxtIXR5cokl1ccku2c88SqQyQRmsWsKq+RZ6gUukz5S s74Ut+fzCa+SbDT2RbHsMOz3KwnKm+YXAhvl2Ib4wTJwEeBVbIZidoPhMmcNhN88/UIA/UT8/dWD stDELldB81ZiYWSMT5VfU/CAu+o6HE1AqTOrqEB8hWPinTIGNPNtYPbsIwZactFGKWoEC0qbYAQD BetzH/lQFXqvIWJftmaj3HNdo1bvcxjYLXJJ2Nsh06W2OStVa/hqErdbiVuRZUiCwIcGYsrNYFRt mA0rVEknD4A+fxfj9u9Kxo1E3IuVtTIuUNoqHbVPrde6Rxteo6nMrm7q9Q1dbTw8OHqEDzLA/o98 nWp+6I3B/Ngz+wH0DYMdgZNxHp5RPCiajUnEM/e2QQGFkobMjEDbmyfCm9Nr4qP05XSSJ89NCrkn tj9IVuLJzuxrlcsWKZAp6grptFHgPX0ebjedY1KHzbI+WPMODA779aAnGKtr5gOHpPh/w+IjwJxw WbMaNzZv87U/f9g/fzyn7czKHaKYv2AeSbClOyS2K+oSYObLUtoCvVzEW/yoH1IfMX98UrAgTvs3 KFkYc7ohNgwfkHE/jz7rsOHEOpRZKh21PoHJlTJKQR0orce7odjFWFDsat94T6Tsit3BPhVy2jx7 UZZkZoKExlVuwS7PvwAAf59j0q4YdLsZwGsbHp7dgK5T9b1lV+dYdgS7gAi6n36YvJ+8akK3hp+A SAPbbUMMxPi4smDNhOcP3AQGIABj0oJ9RYVZiiuyWkX8102meCfM1HJIhfLba9oLXNgmO2UVXhMk iK6szSiOO+HSWKWCPccxs6MquNrMMS2QBG7QzHStCg0Dcl2SZjQkmyysNAtDYtq1SiXyVD2dPqtw pPw9xe6kDcCe18GJnAgTfMd/PgN/Ab+NugcRYxAxQVgtSk7LjgELEKfmRxJhXaF5olB2BbDodqQ4 bAHsZ8cO3NbjBlYFBgtHSd8OH8bd/fz790bKCWwVphMY2Oh0hIsZ8G2a8NUOv75muRQSrvsPtWtL d2IbIvzEdD+ecT+5nPGYn/EO7cH/AH/YN/2BgnGDNd9Pb5LpamVt3zbmuNIr92yU+JDuS0FOrwAf mBgxT9qJzgHncfstUTyaNaDQsowNJ7JgwB8/wE/59+eHwlWJBjhOYS13neNMRQqqPFnz56GONWka yjZJkMGyxww4PA92XB/R454EI+ZV6RS9YZR6yJJltAhC2neGH0/lmRoV4j5FTyEOq0Ot3AxYC3O7 H2ZxsnZivaFG2/wnezh8AwbA+/fgDUT48ygrwW7uKIdtW00OBtejzA9XtYe2nITFTQ7BZEP+TfGC JBQ7gAgw6yMfMLLGWoEtE28AAGAABj7nz4pDzNK8Wq0+AApi/qZTXarl4OyOFfxIdjgVPX0mp7BZ Biq5kMwQD07Ar8CDcO5jQ0MzNgb2TDYEEAgn9/YD6+XxdoLifZCQ4kltVPWcpTKefBqeJMHkOJFl zE+yK3fEOYYYA5w9885MGFN0WSZw4Eq5HQQGL8vr5/f8c7ZzLK5TF2TBnWLZkOQDEo+T1hGsjkUc sAOLsVtRoYUDoqKgjjVHiltxiVUmNzjmbot4xNBuadmoy66Dd74uzKUg9o2Rpo1XNtOID4BeJf8A D4hpGoK2lsgHQ9Zlwe9fQ/r/APODLyxfEbfPNo78fPgEHwGB9GyDjY0avLIvh8o0bpXV0NSXrgM1 6rloiGr4Hk2iK/DQ7Hp9kXE9bB8fPPAd5KfefNpPOV9+AgT+PgMOOG0ZlS13Dt+1Q6iBiob+JHzF sPEZLGKcoKPg9kuBCp+7ENgMHFJfbTaftiuLJjDlXBO6gDj+wb+/P3T+c5ifF0v15V/bG0YZmsac bLYW63IXHW9oIf8ADketRPY0O7Fsun8kriliAEEYrNmfBbMMqs2k4f0Cgn9/AAOij242iiwmk3pI wzZblSCSKR5KoVmYlGN/vI1RYytKLaRBhwmZqkNBUB5vCjZ48jgfKlBi49lg63qrKMbbb4EavL4F VR3et+GiYtjQ8N4fIaeyL7KDrTto1IdZ1mUGdzAeyJO/4AD4A/iAAH+xXkL6ZIZDOnhDq6wl1VW3 cgSr22fPAYhS0JlgB63uDRnQ4cetg6lHUtBrZZGWhcoz+9vG/wDs/H0EB0YOCO4OwMbPq5wZE+yl sa73g1XYvu6eLQ7ZfSj5X9b2R2fD3AP+DP8AnvBhZKNCuTJo7vaIQHsB+ocH4/1I1PDXP4SIbRaC E2VW2LZJrHvc1OVESumiqIwFPgGGW+KHe4Z9asZsnzjnGGa46ceSn6++OGK/gAwfmD1MYMiPPLO0 2cjGOKOHHVq702zGNxqkmk3HUfdyOMLYQp3YooDt5wx7zzygxiAWZLYp2+V+Df6rlfLduVGGjjSm VailktGIRsH2Eqh3eGeV6RxV4fzA4dwMMg/Y7LH2W8B2ZmVyiMzb2bCYH3/YD4B+xx6cEy1Cjuh/ 4SvT6kyWgHZPj3ldi+j4WNV+wi+Ph5i24QzBDEGhsDbBDowxDFsyyD2R2/YNgP8AgOhtTrtbaLEa jTcyWQqlLr03xLQSdnYVsWUpyLaCGQmVW+GHBw4ejT6PPI5hGRrkV2ZZeLRCf7+/YEFg64xZVkaF fJd0NkN0y0WpGlr4epaHYYb4hNhSkbgIB2QPDDmLBZMIDh85bWdr7mebNVccQT+P37pZw74wqM4+ nzRZLkiM2YXcXDt/jYr3U9N4rlibsapOUdImeRBIRcb4YEvC1i5EyoNXp5eGzoI2HUZAyr5OVmgS WdYKTyyQNyQ/+o3xWhbITfmWQyw0/AH4FHZGas2j7OCCbJ+n0Hz/ALnk1bsRoqNbgPmdUqJWieFE yKrWx8RblJve4pMT3AxM09sjeQZHhDYJ7xVayzPmO5gwn3g+A8B9g60mChB3tAPXMWt5Om98PVdE aIedYBaYeKFmiVMIMj4+zTK0vhzkBPbZzITJi0N6WfCBPZ+58g4bAA6nrEugWZsGvMqoNPdXaezK 3UrC0WrXzxYXKQJa5KbcGEPDcFtkZCDhB7XW0c4yTaBb0TRzbtsfAX7+vt/fowYMSRmkFCJNncxj IBWJWzFydpwWvU55XDkYFBGAZU+pdoJ3kbFNtMfWmajUEeR3Y678k71x5UrQQW3yZbUtjuwaenoa TEthwviQ2ODkUa9+Q19bmLbJVcMcyQZ9gKX0blCGzDKruwIEBn/AYYIJ/wBySHSenNcsV2sEFqWJ Idl6eyTDdHbG+F4OUAtkqua3X4ZhkmbOnh/n88gshMYh7nUDw7JPn/v3gP0c1lunf23LC1SngLa+ z743Wr9RQ2n1OyFcC7gYq2QquGHMLcxgDqvH1FVWxm6CxjNve98+APz8A4CfwPocfU+Yrh1Vpn6e yTJAtpA7T0PYVPy8a5PCZUV8TzEPCGZmcw4GQ7VTLMWShSoFk5+UQdRH+Anz/IMOmjcjXcCvHIEY xo6ETrHGUxjEF92ORBbcX4GPQoyyPS2NtEDs026jSc5SO+CbOdDFcXuj3dvNutREyGLsx2cr4tpS zu1cntPMQ9N7ZuiakIbRDr8xW/Z+yIdfvnPGCf3IZhnF2as3h27XWofwt0AAQPvwCt+nNksDSrbk OAx3NJG5VAjROpBwloEuHQ/eOILDD1sPagdkuAeyUDZdwAUd8GDCiHxn/RMG/bD9gw3/AK46vT6b SAV/HqVuCiqTiXA7MNfWEh1eJmK7RU8VXmU8+IQeyFu7F9ktTj885/QaujewQIbR/wAu8+39+QUG XdO39l5Cqpz9K6SZgVvaFrmLsuan7jL2g0MIGIt4mENlWg5gcyBD9IPs5bWXjniMtfdklHPcBPr5 9+xAAKliSVFSR0KDyEOd2EDWe3G42kQVZ7y32U1whoyJIUQuKJLyFNuMY5uBg2dWLHb/AKm66jrg ZB6lYB4C+W02w3xwNiU/+JZHti1HJXsIpbVqML5T74tzDA5kqvtdAVWV5ZqvQ0ZZw3tJB7AfPn37 n3TOV3hPDJxLUEhquktqKDNPCRX7sNR2Ha7apECLQiH8Qm8MjJR4euHxPsyuQ6yzPiGsjLUdtPFo vH6AP9/Hw8oYrOql8O+Rc6nBuU1IEQheWcj1OyNAGnLaKGHCZDTnyG+EG9HQx9aPCG8rP8RlZrOD skm3jYH7gJ/+oAkfDbKpzHZSXHyQBrncncfNJUfLmWNKYZT4HT7sD6teN2oAhnAI+y4LIMrMpVyy jI9XO1oo4AAAP7/+/wAJcqioPYiqT+axAP68Hjni+elIFCu7i0XHI37bPHHzdV/2+enwvhw9QVWN /hy+PYWVnNlxq2TnD2xwVwRapQKenmafcENwshgMA55BtR/vNXq9ZjNkScDngF9BP/Qajre0C7Qb fhWXKAEsZ4eN3AQ69YC0woAXijkHT/sYeHyBkgz6/fAQcZ9oRsN8N/8ATDEAf2AA8dOanXaYUMV8 pE7ISdSLtZDDT4Fwsj5ttSlMDF4/s6fQ+ntbIMk4CwPlcviNjqLFvJM5dnNjh8/UR8+AwPn+kEuO ifFHtQEC7Sluy1tt4O7VK4d4KRA1Pciu+L6f8y1IbIOsgGfTwKoH3MWLszYzfe1Hvw+ggAHAQCC/ RxWTASB2xaNHTDOPwrhsmq+bFGuBZvi1X2ESbema8WxzxrC+LW7sfI4Hzd9EiWUsBIKOytXOd8OB qKq6Yr3nXgd389tbRt6GyB9ncPhtR6wJ+zLLy+K4z25sk7AAAYsGPgD7CqcolLiuqytUum/vwBmV K2VfQ9SoHD4tX2FYwswwOHL3xkcCHgbBUge5/Q3n+idj5B+uwdQLpbDgx6hENjyiRsMZZAneBkGB 5lP7DWVci1tfW+Np9kBuSHLar7s6tvNmY7mMBu2ynH4AvoPPt/A9ZIT1dj3gUUPDOW/JYXlPsKr0 fi/c0ohuLAHhzA5gwQh2MpD+KB1l55QzDPCb5sHtsG/9DGGeOEzLsu6afUlPfjll2ZUl1/ixHz28 dNm21mmWF96p3hjOOG4YggLe5sbzHHdX5qyE/pvKWJYKmt1KeatgXA4SWvnocjjcXTnp7aU1wr9D Q7gsjeCBiCPr88qmCbMUKYoxw2EduAn9/AAN/AAHZHFjuNjSmVZ1gctAqUQfZC3YAmnxcpsiyoY+ HW+GnuZVfJGo9R6kq2R3ftGr/BhEl2w8AggN/PgD6ZtmRXbQYDz4thSVtjSVKInuCTILGFcXXu67 fChw5sPmBg42p++cZ++POxhAlo8B2DBBx/f7UOPyEPR2eVzOCBQJkOpCdTGkVVcF6IetCWLKQ2AM tw63+Gvvhyyx7bPhs3KFcmsgwgT6CAP/AL/hh0yaCdtp4dLCsM8zQkqtSfZvMkv2btx2MTWC8kHp UcscSMjO5miQvKUbDKihUEd9eGo2eSeDfR5orr+9L4YLCzTIcbWKa1EkhorFUz2FPPRbCV9QMMgZ 8wYsghDeG2wHuctrDNQ7S8oyPV3gwADHYD76AAdJ9wU47OQMZp6jQiHcGTwjblu+N4cpUSLSK38O JyRkMJ7JXPMUOAno1Z4i3nY0k3SZwAgn0Hf/AL8g1XT6zF1nmKvcGGbT4thjV6v2TOpct/8Aea0+ lFtfZTCfDW2UgYqs8Q+dMswYhvjyMePuwNBAYgAHgen9Iug2kMfctNGoBjKzgjbX+NV2BbDI5Jol yV7IIJ8NbmUnDHrc5Sq+fOh1AzCijOzHAmN2I/AefbBv4DoYjqYmldVtJnV9O8BzkSAxxROA1LgZ xEhBo0VqjVk3wdVhKvA/OQdfFlCObF+D+KsfnrzA1h3rq3arkzpj2KVqfNxVkDkYV7pFU6Oi1eCj TvTKPer1FVKXYMorXlhE55mcVc0o3jFLwZ03JKTBw3Ex6IEfOvaFV16hkuU5ZogjateZDm4znnMr ahr6ryp6wr/0mxQaONWl5IvJKZ7BHejYhwkznSpk+KHKZhfcl0QICyYcDJzrUo0yKiDTf2lSIijO aXOlVR3ZFjkaN2xNnya6Xvany2r0ztwWdXQKx4JICxKoBrgAAUTx0j2FfXqtrunrfUgQyJYzZkao M+A1evJzPSZTCFM+un3ZfKAiUPNhkGGaZmOBpbYe58qwonprnOyqvWoq3XuX6lr13s0w6eq11Rf8 UzUJp/twGIkI6gw6jUKRJRE2uajOOmQsVdUB4OwuubVKUmhyZ3Ei4TsT8YeFEqrtFgC4L2sM0PLm 5M/Os65esdxHI4dg6pCFcMQwFvwGuwP0DXQxACRaAF6qzXFn8n9/vrzyvhnKaX6t0v2TSPpGKViX F/wvgF82E5zgohyLn23VCzuKxcILNyXmEyCMhCMAFRXFhE7IF5YxSjgB/rWcBcj5WdJt/d2k+kj9 64WvgqRg7A0NLUcPChUUVmKcpg9T3lB5h4euGRheCslCZ+PCsMjnKeALLkOo+Hj6cnLVMv1KuZnW daoif/UylnB9LqQ632uLg4ZfDDk8EEcnrY6I39jSsyqzRzaXbYqC0eWeWBItcqGWNXQvwOqfZyoh tWkt2a8a9TV0kng4rOnYqYzPB5ieZbxgUkX9amVyZuYxLYf1lAogp6FIMahJ2ZOGw8yYvy/RkenL wGq0gt9v/wDEAtWgsy4LlrGs/Tp5q5rnAaWsApWcUy9+hyW3dasAqPB+jALnN9fO5z1tVdkI4mLG UJ4oAOFwctdCwQmXnWdGpO2OTxHKw58MuGLD/MtnE+RZo9YSAPAA4XwK+B1fgOjZmQm/8WDLeXFu uxh0Xy78tehnS8M1dsg8uvsQs5IzUdmjC656UidjZQ9eAlnUflqMQZlMoUQbTISfJGQMI9YdMF/t hmo6jes8MtQzuoFmLKbziI5QIiQUkSxXOlZlfpuQPaI/qUa7L5HrzjJZAEZuSn5xHPzBkQLCTsfQ rejOs6W7u0+pyZmqd6yYmrq6smvA/wCnWuNVWNMVC3d4gC+U8158n/qevxBQhObQFm5/pnHIosCe QJkJZhEvVCXvQ81pZNe1SBtuPGjZWXND2yRVfVn5TY6rxANObsZxEcwZc5cITAWcwUitFlut21Mo n6jXwmTTrZRX1wMTxUlkCCBBUFqo7MFSD8kwR9cNWgl2qYtBDE4sAiFWqXNnCiOK1X2Wm51nTfEU jj3Lhi33LY5o+RdC6PPz1U/8h/2//Drj08V2GubT/dToyyiAj0q4TT1AHJyl6BIJCzo1yKLu9nvQ RWPQKkR5vqA+mcTUFPMzM7D1jVWfh65/qLNYhdaQyTsQzl1ppfTrcEAlsoZd1cA3yFw6Fi56YDLG CVTJhT0gwo7a874BAVYXr9c+AcIG48/OUFCPO9MkTkHxjDnWdU5P0+q5P8x/8gf+Olp7l/2/8J16 drS7AxbLKFBc0ip+iCna+myNmrJObCjeg5WitWTgif8AMuys6cn+tdWHe4XZ5FoXqXMa9yHHPEsG CpjPBCs2NTfPi41T/wAB/SjrNX55whaLw42wWz1phY2AnVKv62jItLJOREWv/QTijlDJn5dcruTn Sg+fkF8YGYbD7nsjAXGy86zpEABkjsX6qHn8i6P+o/PVt7JP3GwP7Bqwf0fkdVcql6MO/qxRhnp9 FaAIFNaVLBXcK1IMAcoqtFyUbW1OXJ6wxs0aYS8hctCvHYmvsSEfmG6/FRoIbBKVlT0j8PTm2cpU PM1FBKJsC5nGyHM1n1/X1lzvTjZDsu+kmyWRDMOLj6yRVSOAGeZlzmlZiHQ8zNP4m0sjKlZyKXWf 8AVgMzrOtOpASKB1AVtpUyXhsHYZJYo4tQyW6ahYNDpOmJMmpsk+t8m/ON+fz89UytHLJrr7bGny OyMefWkbIR5ceD6SOAQ5kyy9QuV7ZEnLaVPIXWHD1hHpRAYjfRiQxyJIUdFFsGUc9MaJnR7o6m9Y lx3jSw+zpfqUa2f7XXrlrV7c6rVYIBxMqanpSwsTCD6XQ162VwgciK6bkcSz+keeixiKyZdwcePB jsXp9UDOs6VIB9XEa5F0fkfxeD8dPj50Oqvmtpx+nUPiw/DLZxbyLNEdJj/hxMbrq10o3ERebEsZ IYtOtbW4IrZrqB6ZUJijxSxChcsjkGZkcjPjlhRYfYrCNalPNiZSRYHpywxixlluZwg09HbGdX8q ihutYnXz87xi2ka1rAyq/IG+HMnpacmY1aZsj/mscMaT5i2fKwO/Tlmg2oQFXXFezBqfgBYh2StQ 8r151nStP36PU59/r/f3ebvzfmhf5rpuoJjnUxkxk3eHb4269tfk9b82dbbDYo/OZ9QluNExqqSq vQwzj2XV86SePRR+ql5HuTNh20y47kzwSxtrh+rMdY7EGLhWsiMYwprKEqHqWrGaSaaVtRGqiw65 sLPlxhKyW01egUXRxKZXzPFFamVRjzGZWgGk9UEZoFIr9cToNfVCjrGUDU0ivirKs7OUjsBLNzs6 zqRABYgAAO7xx8p0pv8AinPycbPyeekJOqZUOimCnSvpmy1OvILq9jf1gZGcXmvgErqAnAjwuKPy FTPUoNhLeMr1Lw1bFQ3CKaJZlnc8MwlkwvQFZUKvjNJGl2ZNanNmL3Doh1328wH2nPVy5wMV0ak7 ISqdX1cj6lXJzBwOOGOZXqIlpmBOwR80LBkpDwnbm15bJnWdaGJyXk8SykfosYsiPwTQs/NC+lx+ 50+xkgDJ9jBdzEMvghbOIIIFmvJ6M12vjmm3UPXUSmrmulJw1FjoHptiSIbx8Gean0eASTK0eDzo QCLKTGNi9fqMjbAOJuaBIuYZsaxhXP8AVHM52Ho/cKp14dqHuNe9JA9NOk9Jz/Zti2UUmxCVhW61 W1odzdUbsQfyUsfmA8onOuBe9RqC1Iq8kvAaAXliRTTEih07BXzrOssYB1IcgF3giLuR3MVyxLN5 Yrk2JJNWaqz04E/T6Hk8GQD9BtnID8BqF15oX46SOqK0PSQS7/PjK3qZS9FIaXdPN8V8IVkiNBiD n6QeupTm4Sy8yWRcJyqXiAs0yypmcz4LDe5MLG7tww62To5iFEUssEa+0Q6V9YCQ7Na5c03UDbq3 kyo+UokFgeNkaIy1zTsrIWDioVHEMkhLnm6+mDT+BkL66wPEFvLF5U7IEmxmdZ1usnT6ZiSWbPJi bZqaKrJ5NWas8Wfz1kcAzoSBZu/37fP56YFZ+gZcFHWtcjGK2tlY3ILRzSPV2F1DhGWn7I0zVhbL bXZT04tEo3krpUk0T1Wd6BJwZOKI8YcDNTikiLiSzFZYzW0riTR9vjWZgz2I5Is2lo4VkMkHlGW1 8ZZRpLAmFlLe5DKBHmF8LDieoYLkRJqH6yeXnFiaWRIESsifnWdZk92m/USgfoApQH4A/HU1juul 1GLMtyMTixFm15NEWf2eeoW4dZ1zhE+6a+F+tUHgytE6fXw9IGANnLHCSAsNqeMDyCAaaP8AUKUi I2yyecWV1jLAiPkCRuQIjiBRNzGNd1aJUIl3UlpjlHzLUuErW0y1Nftjz1JmL5GW4t5DXkCjkxZo CxSWRTkLRGSkqhORG9C/lGsuaEi5UM7FG5kofIzrOsWpJTVRRoSkazR4opKotizSilFnk0Oeugiq wkyUNUMlZAGrVLq78/PVoNEv/Dg08anKU7kv3pYxx30OTMB9OUuwa3zMrNhxcyIU9GcQKttdtjWb m4SjEvIjSDrGTxEA8gOpgfSJUl1eBC86zrOu3HLKFUCSSuPvb8p++uPJHGXclEJLMSSqkk35Jr9D /p1//9k= "
+         y="0"
+         x="0"
+         id="image9"
+         height="260"
+         width="260" />
+    </pattern>
+    <linearGradient
+       id="linearGradient6545">
+      <stop
+         id="stop6547"
+         style="stop-color:#98bf0c;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6549"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6538">
+      <stop
+         id="stop6540"
+         style="stop-color:#009bba;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6542"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6545-3">
+      <stop
+         id="stop6547-7"
+         style="stop-color:#98bf0c;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6549-2"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6538-0">
+      <stop
+         id="stop6540-1"
+         style="stop-color:#009bba;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6542-6"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="211.48451"
+       y1="139.51218"
+       x2="289.52884"
+       y2="139.51218"
+       id="linearGradient5172"
+       xlink:href="#linearGradient6545-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.67894695,0,0,0.67894695,-132.5412,834.53756)" />
+    <linearGradient
+       id="linearGradient6545-5">
+      <stop
+         id="stop6547-75"
+         style="stop-color:#98bf0c;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6549-4"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="412.14142"
+       y1="139.51155"
+       x2="490.24442"
+       y2="139.51155"
+       id="linearGradient4372"
+       xlink:href="#linearGradient6538-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.67894695,0,0,0.67894695,-168.35757,834.53756)" />
+    <linearGradient
+       id="linearGradient6538-1">
+      <stop
+         id="stop6540-2"
+         style="stop-color:#009bba;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6542-0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="223.24297"
+       y1="401.69296"
+       x2="315.60474"
+       y2="401.69296"
+       id="linearGradient4012"
+       xlink:href="#linearGradient4487-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.49804243,0,0,0.49804243,-78.106449,768.45912)" />
+    <linearGradient
+       id="linearGradient4487-2">
+      <stop
+         id="stop4489-8"
+         style="stop-color:#009bba;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4491-2"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="347.35028"
+       y1="401.69296"
+       x2="439.60474"
+       y2="401.69296"
+       id="linearGradient4009"
+       xlink:href="#linearGradient4479-83"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.49804243,0,0,0.49804243,-78.106449,768.45912)" />
+    <linearGradient
+       id="linearGradient4479-83">
+      <stop
+         id="stop4481-8"
+         style="stop-color:#98bf0c;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4483-5"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="55.648441"
+       y1="55.286293"
+       x2="121.55995"
+       y2="55.286293"
+       id="linearGradient4030"
+       xlink:href="#linearGradient4487-2-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,881.19552)" />
+    <linearGradient
+       id="linearGradient4487-2-1">
+      <stop
+         id="stop4489-8-4"
+         style="stop-color:#009bba;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4491-2-6"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="55.648441"
+       y1="121.94369"
+       x2="121.56413"
+       y2="121.94369"
+       id="linearGradient4032"
+       xlink:href="#linearGradient6545-0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,881.19552)" />
+    <linearGradient
+       id="linearGradient6545-0">
+      <stop
+         id="stop6547-71"
+         style="stop-color:#98bf0c;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6549-7"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="223.24297"
+       y1="401.69296"
+       x2="315.60474"
+       y2="401.69296"
+       id="linearGradient3314"
+       xlink:href="#linearGradient4487-2-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.49804243,0,0,0.49804243,-78.106449,768.45912)" />
+    <linearGradient
+       id="linearGradient4487-2-3">
+      <stop
+         id="stop4489-8-8"
+         style="stop-color:#009bba;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4491-2-0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="347.35028"
+       y1="401.69296"
+       x2="439.60474"
+       y2="401.69296"
+       id="linearGradient3316"
+       xlink:href="#linearGradient4479-83-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.49804243,0,0,0.49804243,-78.106449,768.45912)" />
+    <linearGradient
+       id="linearGradient4479-83-1">
+      <stop
+         id="stop4481-8-2"
+         style="stop-color:#98bf0c;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4483-5-5"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="62.679543"
+       y1="956.05841"
+       x2="71.789589"
+       y2="956.05841"
+       id="linearGradient4345"
+       xlink:href="#linearGradient4487-3"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient4487-3">
+      <stop
+         id="stop4489-1"
+         style="stop-color:#009bba;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4491-6"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="92.944977"
+       y1="981.64661"
+       x2="102.05502"
+       y2="981.64661"
+       id="linearGradient4353"
+       xlink:href="#linearGradient6078"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient6078">
+      <stop
+         id="stop6080"
+         style="stop-color:#98bf0c;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6082"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="22.183777"
+       y1="27.31698"
+       x2="70.705658"
+       y2="27.31698"
+       id="linearGradient4272"
+       xlink:href="#linearGradient6078"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3086">
+      <stop
+         id="stop3088"
+         style="stop-color:#98bf0c;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3090"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="106.01667"
+       y1="103.86177"
+       x2="154.61449"
+       y2="103.86177"
+       id="linearGradient4282"
+       xlink:href="#linearGradient4487-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,879.19552)" />
+    <linearGradient
+       id="linearGradient3093">
+      <stop
+         id="stop3095"
+         style="stop-color:#009bba;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3097"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="16.449018"
+       y1="135.66661"
+       x2="88.674927"
+       y2="135.66661"
+       id="linearGradient3922"
+       xlink:href="#linearGradient4487-3-3"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient4487-3-3">
+      <stop
+         id="stop4489-1-8"
+         style="stop-color:#009bba;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4491-6-3"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="83.350334"
+       y1="49.941151"
+       x2="155.54698"
+       y2="49.941151"
+       id="linearGradient3932"
+       xlink:href="#linearGradient6078-7"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient6078-7">
+      <stop
+         id="stop6080-1"
+         style="stop-color:#98bf0c;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6082-0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="43.760551"
+       y1="52.473763"
+       x2="134.20866"
+       y2="52.473763"
+       id="linearGradient4095"
+       xlink:href="#linearGradient4487-3-8"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient4487-3-8">
+      <stop
+         id="stop4489-1-2"
+         style="stop-color:#009bba;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4491-6-4"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="43.862331"
+       y1="133.38464"
+       x2="134.20866"
+       y2="133.38464"
+       id="linearGradient4097"
+       xlink:href="#linearGradient4479-83-9"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient4479-83-9">
+      <stop
+         id="stop4481-8-4"
+         style="stop-color:#98bf0c;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4483-5-8"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="43.787216"
+       y1="52.463245"
+       x2="134.31081"
+       y2="52.463245"
+       id="linearGradient3967"
+       xlink:href="#linearGradient4487-3-8-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.70651779,0,0,0.88283587,1.859904,877.81349)" />
+    <linearGradient
+       id="linearGradient4487-3-8-3">
+      <stop
+         id="stop4489-1-2-4"
+         style="stop-color:#009bba;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4491-6-4-8"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="43.787216"
+       y1="52.463245"
+       x2="134.31081"
+       y2="52.463245"
+       id="linearGradient3958"
+       xlink:href="#linearGradient6169"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.70651779,0,0,0.88283587,50.134786,964.85367)" />
+    <linearGradient
+       id="linearGradient6169">
+      <stop
+         id="stop6171"
+         style="stop-color:#98bf0c;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6173"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4487-2-17">
+      <stop
+         id="stop4489-8-40"
+         style="stop-color:#009bba;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4491-2-9"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4479-83-4">
+      <stop
+         id="stop4481-8-8"
+         style="stop-color:#98bf0c;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4483-5-82"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="402.6611"
+       cy="411.26151"
+       r="129.67412"
+       fx="402.6611"
+       fy="411.26151"
+       id="radialGradient4264"
+       xlink:href="#linearGradient4210"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5673273,-0.25384922,0.13252016,0.81821157,-664.8311,27.187906)" />
+    <radialGradient
+       cx="-18.32745"
+       cy="57.731464"
+       r="59.258755"
+       fx="-18.32745"
+       fy="57.731464"
+       id="radialGradient4274-0"
+       xlink:href="#linearGradient4210-0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.54123709,0,26.485054)" />
+    <linearGradient
+       id="linearGradient4210-0">
+      <stop
+         id="stop4212-7"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4214-2"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="-18.32745"
+       cy="57.731464"
+       r="59.258755"
+       fx="-18.32745"
+       fy="57.731464"
+       id="radialGradient4340"
+       xlink:href="#linearGradient4210-0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.64494713,-0.10070217,0.16513894,0.56100761,-16.040927,23.498059)" />
+    <radialGradient
+       cx="-18.32745"
+       cy="57.731464"
+       r="59.258755"
+       fx="-18.32745"
+       fy="57.731464"
+       id="radialGradient4274-5"
+       xlink:href="#linearGradient4210-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.54123709,0,26.485054)" />
+    <linearGradient
+       id="linearGradient4210-2">
+      <stop
+         id="stop4212-1"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4214-4"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="-18.32745"
+       cy="57.731464"
+       r="59.258755"
+       fx="-18.32745"
+       fy="57.731464"
+       id="radialGradient4340-8"
+       xlink:href="#linearGradient4210-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.54123709,0,26.485054)" />
+    <radialGradient
+       cx="-18.32745"
+       cy="57.731464"
+       r="59.258755"
+       fx="-18.32745"
+       fy="57.731464"
+       id="radialGradient4340-8-6"
+       xlink:href="#linearGradient4210-2-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.54123709,0,26.485054)" />
+    <linearGradient
+       id="linearGradient4210-2-4">
+      <stop
+         id="stop4212-1-6"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4214-4-8"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="-18.32745"
+       cy="57.731464"
+       r="59.258755"
+       fx="-18.32745"
+       fy="57.731464"
+       id="radialGradient4415"
+       xlink:href="#linearGradient4210-2-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.54123709,0,26.485054)" />
+    <radialGradient
+       cx="-18.32745"
+       cy="57.731464"
+       r="59.258755"
+       fx="-18.32745"
+       fy="57.731464"
+       id="radialGradient4340-8-8"
+       xlink:href="#linearGradient4210-2-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.54123709,0,26.485054)" />
+    <linearGradient
+       id="linearGradient4210-2-3">
+      <stop
+         id="stop4212-1-5"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4214-4-5"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="-18.32745"
+       cy="57.731464"
+       r="59.258755"
+       fx="-18.32745"
+       fy="57.731464"
+       id="radialGradient4415-1"
+       xlink:href="#linearGradient4210-2-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.54123709,0,26.485054)" />
+    <radialGradient
+       cx="-18.32745"
+       cy="57.731464"
+       r="59.258755"
+       fx="-18.32745"
+       fy="57.731464"
+       id="radialGradient4340-8-84"
+       xlink:href="#linearGradient4210-2-0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.54123709,0,26.485054)" />
+    <linearGradient
+       id="linearGradient4210-2-0">
+      <stop
+         id="stop4212-1-54"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4214-4-7"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="-18.32745"
+       cy="57.731464"
+       r="59.258755"
+       fx="-18.32745"
+       fy="57.731464"
+       id="radialGradient4415-1-4"
+       xlink:href="#linearGradient4210-2-3-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.54123709,0,26.485054)" />
+    <linearGradient
+       id="linearGradient4210-2-3-9">
+      <stop
+         id="stop4212-1-5-9"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4214-4-5-0"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="-18.32745"
+       cy="57.731464"
+       r="59.258755"
+       fx="-18.32745"
+       fy="57.731464"
+       id="radialGradient6618"
+       xlink:href="#linearGradient4210-2-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.65151222,0.04277634,0.03936026,0.47213658,-8.6592181,31.25831)" />
+    <radialGradient
+       cx="124.29823"
+       cy="80.847961"
+       r="150.92255"
+       fx="124.29823"
+       fy="80.847961"
+       id="radialGradient6622"
+       xlink:href="#linearGradient6610"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2952826,-0.73392069,1.5862587,2.799558,-218.16556,-67.610244)"
+       spreadMethod="pad" />
+    <radialGradient
+       cx="-18.32745"
+       cy="57.731464"
+       r="59.258755"
+       fx="-18.32745"
+       fy="57.731464"
+       id="radialGradient6678"
+       xlink:href="#linearGradient4210-2-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.65151222,0.04277634,0.03936026,0.47213658,-8.6592181,31.25831)" />
+    <inkscape:path-effect
+       effect="skeletal"
+       id="path-effect5995-2"
+       is_visible="true"
+       pattern="m -179.11142,85.176985 c 21.81058,-2.35044 67.00436,-5.70787 67.00436,-5.70787 0,0 -45.49951,7.749765 -67.16686,8.953065 -21.66734,1.2033 -115.74885,0.581235 -115.74885,0.581235 0,0 94.10078,-1.47599 115.91135,-3.82643 z"
+       copytype="single_stretched"
+       prop_scale="1"
+       scale_y_rel="false"
+       spacing="0"
+       normal_offset="0"
+       tang_offset="0"
+       prop_units="false"
+       vertical_pattern="false"
+       fuse_tolerance="0"
+       pattern-nodetypes="zczcz" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4133-6"
+       id="radialGradient4149-6"
+       cx="14.18369"
+       cy="-69.930733"
+       fx="14.18369"
+       fy="-69.930733"
+       r="229.28766"
+       gradientTransform="matrix(1.8102804,0.70679848,-0.55095767,1.4111345,-47.516314,102.16427)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient4133-6">
+      <stop
+         style="stop-color:#009dd4;stop-opacity:1;"
+         offset="0"
+         id="stop4135-6" />
+      <stop
+         style="stop-color:#042531;stop-opacity:1;"
+         offset="1"
+         id="stop4137-2" />
+    </linearGradient>
+    <inkscape:path-effect
+       effect="skeletal"
+       id="path-effect5995-0"
+       is_visible="true"
+       pattern="m 42.95724,199.50163 c 21.810573,-2.35044 67.00436,-7.86778 67.00436,-7.86778 0,0 -44.203563,11.14525 -65.87091,12.34855 -21.667347,1.2033 -117.044805,-2.81425 -117.044805,-2.81425 0,0 94.100783,0.68392 115.911355,-1.66652 z"
+       copytype="single_stretched"
+       prop_scale="1"
+       scale_y_rel="false"
+       spacing="0"
+       normal_offset="0"
+       tang_offset="0"
+       prop_units="false"
+       vertical_pattern="false"
+       fuse_tolerance="0"
+       pattern-nodetypes="zczcz" />
+    <inkscape:path-effect
+       effect="skeletal"
+       id="path-effect5995-0-1"
+       is_visible="true"
+       pattern="m 42.95724,199.50163 c 21.810573,-2.35044 67.00436,-7.86778 67.00436,-7.86778 0,0 -44.203563,11.14525 -65.87091,12.34855 -21.667347,1.2033 -117.044805,-2.81425 -117.044805,-2.81425 0,0 94.100783,0.68392 115.911355,-1.66652 z"
+       copytype="single_stretched"
+       prop_scale="1"
+       scale_y_rel="false"
+       spacing="0"
+       normal_offset="0"
+       tang_offset="0"
+       prop_units="false"
+       vertical_pattern="false"
+       fuse_tolerance="0"
+       pattern-nodetypes="zczcz" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4131-5"
+       id="radialGradient4148-0"
+       cx="348.28326"
+       cy="70.297905"
+       fx="348.28326"
+       fy="70.297905"
+       r="201.43971"
+       gradientTransform="matrix(0.2679519,-1.0643832,1.6216596,0.52032408,94.223231,452.24627)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient4131-5">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop4133-5" />
+      <stop
+         style="stop-color:#cfcfcf;stop-opacity:1;"
+         offset="1"
+         id="stop4136-2" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4487-2-17"
+       id="linearGradient5041"
+       x1="55.58728"
+       y1="67.22374"
+       x2="25.171864"
+       y2="-0.58782423"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6078-7"
+       id="linearGradient5057"
+       x1="146.35838"
+       y1="97.311302"
+       x2="63.488171"
+       y2="-37.236683"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4487-2-17-0"
+       id="linearGradient5041-0"
+       x1="55.58728"
+       y1="67.22374"
+       x2="25.171864"
+       y2="-0.58782423"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient4487-2-17-0">
+      <stop
+         id="stop4489-8-40-0"
+         style="stop-color:#009bba;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4491-2-9-7"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(139.99999,6.5396972e-6)"
+       inkscape:collect="always"
+       xlink:href="#linearGradient6078-7-5"
+       id="linearGradient5057-2"
+       x1="146.35838"
+       y1="97.311302"
+       x2="63.488171"
+       y2="-37.236683"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient6078-7-5">
+      <stop
+         id="stop6080-1-5"
+         style="stop-color:#98bf0c;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6082-0-2"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(139.99999,-1.0896973e-6)"
+       y2="-0.58782423"
+       x2="25.171864"
+       y1="67.22374"
+       x1="55.58728"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5079"
+       xlink:href="#linearGradient4487-2-17-0"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4487-2-17-6"
+       id="linearGradient5041-8"
+       x1="55.58728"
+       y1="67.22374"
+       x2="25.171864"
+       y2="-0.58782423"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient4487-2-17-6">
+      <stop
+         id="stop4489-8-40-4"
+         style="stop-color:#009bba;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4491-2-9-6"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(280.00002,4.5805664e-7)"
+       inkscape:collect="always"
+       xlink:href="#linearGradient6078-7-9"
+       id="linearGradient5057-8"
+       x1="146.35838"
+       y1="97.311302"
+       x2="63.488171"
+       y2="-37.236683"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient6078-7-9">
+      <stop
+         id="stop6080-1-8"
+         style="stop-color:#98bf0c;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6082-0-3"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(280.00002,4.5805664e-7)"
+       y2="-0.58782423"
+       x2="25.171864"
+       y1="67.22374"
+       x1="55.58728"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5079-5"
+       xlink:href="#linearGradient4487-2-17-6"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6078-7-58"
+       id="linearGradient5057-5"
+       x1="146.35838"
+       y1="97.311302"
+       x2="63.488171"
+       y2="-37.236683"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient6078-7-58">
+      <stop
+         id="stop6080-1-4"
+         style="stop-color:#98bf0c;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6082-0-0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-69.999989,70.000003)"
+       y2="-37.236683"
+       x2="63.488171"
+       y1="97.311302"
+       x1="146.35838"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5150"
+       xlink:href="#linearGradient6078-7-58"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4487-2-17-7"
+       id="linearGradient5041-4"
+       x1="55.58728"
+       y1="67.22374"
+       x2="25.171864"
+       y2="-0.58782423"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient4487-2-17-7">
+      <stop
+         id="stop4489-8-40-2"
+         style="stop-color:#009bba;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4491-2-9-1"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(69.999997,70.000001)"
+       y2="-0.58782423"
+       x2="25.171864"
+       y1="67.22374"
+       x1="55.58728"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5184"
+       xlink:href="#linearGradient4487-2-17-7"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="translate(-3.0646973e-6,140.00001)"
+       inkscape:collect="always"
+       xlink:href="#linearGradient4487-2-17-9"
+       id="linearGradient5041-9"
+       x1="55.58728"
+       y1="67.22374"
+       x2="25.171864"
+       y2="-0.58782423"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient4487-2-17-9">
+      <stop
+         id="stop4489-8-40-03"
+         style="stop-color:#009bba;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4491-2-9-0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-69.999989,70.000003)"
+       y2="-37.236683"
+       x2="63.488171"
+       y1="97.311302"
+       x1="146.35838"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5150-3"
+       xlink:href="#linearGradient6078-7-58-5"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient6078-7-58-5">
+      <stop
+         id="stop6080-1-4-0"
+         style="stop-color:#98bf0c;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6082-0-0-7"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="-37.236683"
+       x2="63.488171"
+       y1="97.311302"
+       x1="146.35838"
+       gradientTransform="translate(-69.999992,210.00001)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5223"
+       xlink:href="#linearGradient6078-7-58-5"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="translate(69.999997,70.000001)"
+       y2="-0.58782423"
+       x2="25.171864"
+       y1="67.22374"
+       x1="55.58728"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5184-8"
+       xlink:href="#linearGradient4487-2-17-7-3"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient4487-2-17-7-3">
+      <stop
+         id="stop4489-8-40-2-6"
+         style="stop-color:#009bba;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4491-2-9-1-4"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="-0.58782423"
+       x2="25.171864"
+       y1="67.22374"
+       x1="55.58728"
+       gradientTransform="translate(69.999992,210)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5267"
+       xlink:href="#linearGradient4487-2-17-7-3"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="translate(69.999997,70.000001)"
+       y2="-0.58782423"
+       x2="25.171864"
+       y1="67.22374"
+       x1="55.58728"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5184-1"
+       xlink:href="#linearGradient4487-2-17-7-9"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient4487-2-17-7-9">
+      <stop
+         id="stop4489-8-40-2-5"
+         style="stop-color:#009bba;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4491-2-9-1-5"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="-0.58782423"
+       x2="25.171864"
+       y1="67.22374"
+       x1="55.58728"
+       gradientTransform="translate(209.99999,210.00002)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5267-7"
+       xlink:href="#linearGradient4487-2-17-7-9"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6078-7-4"
+       id="linearGradient5057-3"
+       x1="146.35838"
+       y1="97.311302"
+       x2="63.488171"
+       y2="-37.236683"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient6078-7-4">
+      <stop
+         id="stop6080-1-0"
+         style="stop-color:#98bf0c;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6082-0-8"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(70.000007,210.00001)"
+       y2="-37.236683"
+       x2="63.488171"
+       y1="97.311302"
+       x1="146.35838"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5318"
+       xlink:href="#linearGradient6078-7-4"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6078-7-52"
+       id="linearGradient5057-1"
+       x1="146.35838"
+       y1="97.311302"
+       x2="63.488171"
+       y2="-37.236683"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient6078-7-52">
+      <stop
+         id="stop6080-1-3"
+         style="stop-color:#98bf0c;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6082-0-24"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(210.00001,210.00003)"
+       y2="-37.236683"
+       x2="63.488171"
+       y1="97.311302"
+       x1="146.35838"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5318-6"
+       xlink:href="#linearGradient6078-7-52"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="translate(69.999997,70.000001)"
+       y2="-0.58782423"
+       x2="25.171864"
+       y1="67.22374"
+       x1="55.58728"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5184-6"
+       xlink:href="#linearGradient4487-2-17-7-2"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient4487-2-17-7-2">
+      <stop
+         id="stop4489-8-40-2-9"
+         style="stop-color:#009bba;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4491-2-9-1-0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="-0.58782423"
+       x2="25.171864"
+       y1="67.22374"
+       x1="55.58728"
+       gradientTransform="translate(350.00001,69.999997)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5369"
+       xlink:href="#linearGradient4487-2-17-7-2"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="translate(69.999997,70.000001)"
+       y2="-0.58782423"
+       x2="25.171864"
+       y1="67.22374"
+       x1="55.58728"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5184-3"
+       xlink:href="#linearGradient4487-2-17-7-1"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient4487-2-17-7-1">
+      <stop
+         id="stop4489-8-40-2-1"
+         style="stop-color:#009bba;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4491-2-9-1-9"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="-0.58782423"
+       x2="25.171864"
+       y1="67.22374"
+       x1="55.58728"
+       gradientTransform="translate(349.99998,210.00001)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5369-9"
+       xlink:href="#linearGradient4487-2-17-7-1"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="translate(210.00001,210.00003)"
+       y2="-37.236683"
+       x2="63.488171"
+       y1="97.311302"
+       x1="146.35838"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5318-6-5"
+       xlink:href="#linearGradient6078-7-52-5"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient6078-7-52-5">
+      <stop
+         id="stop6080-1-3-6"
+         style="stop-color:#98bf0c;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6082-0-24-0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="-37.236683"
+       x2="63.488171"
+       y1="97.311302"
+       x1="146.35838"
+       gradientTransform="translate(280.00001,140.00004)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5420"
+       xlink:href="#linearGradient6078-7-52-5"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6078-7-52-5"
+       id="linearGradient5457"
+       x1="306.31415"
+       y1="189.24405"
+       x2="282.51758"
+       y2="2.6277814"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(4.1204272e-6,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4487-2-17-7-1"
+       id="linearGradient5465"
+       x1="336.48462"
+       y1="203.12489"
+       x2="335.16684"
+       y2="73.530258"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5467"
+       id="linearGradient5473"
+       x1="238.62624"
+       y1="155.18745"
+       x2="243.81149"
+       y2="91.254097"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       inkscape:collect="always"
+       id="filter5514"
+       x="-0.12008178"
+       width="1.2401636"
+       y="-0.018472944"
+       height="1.0369459">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.3162602"
+         id="feGaussianBlur5516" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter5526"
+       x="-0.010572113"
+       width="1.0211442"
+       y="-0.28897107"
+       height="1.5779421">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.5446967"
+         id="feGaussianBlur5528" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter5534"
+       x="-0.01101468"
+       width="1.0220294"
+       y="-0.30106789"
+       height="1.6021358">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.6093603"
+         id="feGaussianBlur5536" />
+    </filter>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter5514-1"
+       x="-0.12008178"
+       width="1.2401636"
+       y="-0.018472943"
+       height="1.0369459">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.3162602"
+         id="feGaussianBlur5516-8" />
+    </filter>
+    <linearGradient
+       gradientTransform="translate(-3.0646973e-6,140.00001)"
+       inkscape:collect="always"
+       xlink:href="#linearGradient4487-2-17-9-7"
+       id="linearGradient5041-9-1"
+       x1="55.58728"
+       y1="67.22374"
+       x2="25.171864"
+       y2="-0.58782423"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient4487-2-17-9-7">
+      <stop
+         id="stop4489-8-40-03-4"
+         style="stop-color:#009bba;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4491-2-9-0-0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="-0.58782423"
+       x2="25.171864"
+       y1="67.22374"
+       x1="55.58728"
+       gradientTransform="translate(248.09874,144.2953)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3311"
+       xlink:href="#linearGradient4487-2-17-9-7"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6078-7-52-5"
+       id="linearGradient3336"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(4.1204272e-6,0)"
+       x1="306.31415"
+       y1="189.24405"
+       x2="282.51758"
+       y2="2.6277814" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4487-2-17-7-1"
+       id="linearGradient3338"
+       gradientUnits="userSpaceOnUse"
+       x1="336.48462"
+       y1="203.12489"
+       x2="335.16684"
+       y2="73.530258" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5467"
+       id="linearGradient3340"
+       gradientUnits="userSpaceOnUse"
+       x1="238.62624"
+       y1="155.18745"
+       x2="243.81149"
+       y2="91.254097" />
+    <filter
+       inkscape:collect="always"
+       id="filter4174">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.0421996"
+         id="feGaussianBlur4176" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4178"
+       id="linearGradient4184"
+       x1="282.03552"
+       y1="237.49248"
+       x2="63.857231"
+       y2="153.68796"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <rect
+     style="fill:#ffffff;fill-opacity:1;stroke:#7b888c;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+     id="rect4140-7-0"
+     width="459"
+     height="349"
+     x="0.5"
+     y="0.5"
+     ry="0" />
+  <path
+     sodipodi:type="arc"
+     style="fill:#bcbcbc;fill-opacity:1;stroke:none;filter:url(#filter5514-1)"
+     id="path4559-0-7-8-6"
+     sodipodi:cx="230.92586"
+     sodipodi:cy="311.81781"
+     sodipodi:rx="175.3326"
+     sodipodi:ry="6.4146075"
+     d="m 406.25845,311.81781 a 175.3326,6.4146075 0 1 1 -350.665188,0 175.3326,6.4146075 0 1 1 350.665188,0 z"
+     transform="matrix(0,0.76112637,-1.5607472,0,504.55256,-0.76375969)" />
+  <path
+     sodipodi:type="arc"
+     style="fill:#bcbcbc;fill-opacity:1;stroke:none;filter:url(#filter5514)"
+     id="path4559-0-7-8"
+     sodipodi:cx="230.92586"
+     sodipodi:cy="311.81781"
+     sodipodi:rx="175.3326"
+     sodipodi:ry="6.4146075"
+     d="m 406.25845,311.81781 a 175.3326,6.4146075 0 1 1 -350.665188,0 175.3326,6.4146075 0 1 1 350.665188,0 z"
+     transform="matrix(0,0.76112637,-1.5607472,0,926.1545,-0.76375969)" />
+  <path
+     sodipodi:type="arc"
+     style="fill:#bcbcbc;fill-opacity:1;stroke:none;filter:url(#filter5526)"
+     id="path4559-0-7"
+     sodipodi:cx="230.92586"
+     sodipodi:cy="311.81781"
+     sodipodi:rx="175.3326"
+     sodipodi:ry="6.4146075"
+     d="m 406.25845,311.81781 a 175.3326,6.4146075 0 1 1 -350.665188,0 175.3326,6.4146075 0 1 1 350.665188,0 z"
+     transform="matrix(1.0942363,0,0,1.5607472,-25.732135,-457.31158)" />
+  <path
+     sodipodi:type="arc"
+     style="fill:#bcbcbc;fill-opacity:1;stroke:none;filter:url(#filter5534)"
+     id="path4559-0"
+     sodipodi:cx="230.92586"
+     sodipodi:cy="311.81781"
+     sodipodi:rx="175.3326"
+     sodipodi:ry="6.4146075"
+     d="m 406.25845,311.81781 a 175.3326,6.4146075 0 1 1 -350.665188,0 175.3326,6.4146075 0 1 1 350.665188,0 z"
+     transform="matrix(1.0942363,0,0,1.4255153,-21.867108,-120.90925)" />
+  <rect
+     style="fill:#ffffff;fill-opacity:1;stroke:#7b888c;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+     id="rect4140-7"
+     width="435.71756"
+     height="302.49915"
+     x="10.402513"
+     y="23.750427"
+     ry="0" />
+  <text
+     xml:space="preserve"
+     style="font-size:51.25284576000000000px;font-style:oblique;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#9a9d9e;fill-opacity:1;stroke:none;font-family:Lucida Sans;-inkscape-font-specification:Sans Oblique;filter:url(#filter4174)"
+     x="99.265663"
+     y="229.90959"
+     id="text3289-8"
+     sodipodi:linespacing="125%"><tspan
+       sodipodi:role="line"
+       id="tspan3291-2"
+       x="99.265663"
+       y="229.90959"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#9a9d9e;fill-opacity:1;font-family:Arial Narrow;-inkscape-font-specification:Arial Narrow Bold">Papyrus</tspan></text>
+  <rect
+     style="fill:url(#linearGradient5369);fill-opacity:1;stroke:none"
+     id="rect4061-1-4-49"
+     width="60"
+     height="60"
+     x="373.2088"
+     y="110.27831"
+     ry="14.117647" />
+  <rect
+     style="fill:url(#linearGradient5369-9);fill-opacity:1;stroke:none"
+     id="rect4061-1-4-5"
+     width="60"
+     height="60"
+     x="373.2088"
+     y="250.27832"
+     ry="14.117647" />
+  <rect
+     style="fill:url(#linearGradient5420);fill-opacity:1;stroke:none"
+     id="rect4061-1-9-6-5"
+     width="60"
+     height="60"
+     x="373.2088"
+     y="180.27832"
+     ry="14.117647" />
+  <rect
+     style="fill:url(#linearGradient5267);fill-opacity:1;stroke:none"
+     id="rect4061-1-4-4"
+     width="60"
+     height="60"
+     x="93.208786"
+     y="250.27832"
+     ry="14.117647" />
+  <rect
+     style="fill:url(#linearGradient5267-7);fill-opacity:1;stroke:none"
+     id="rect4061-1-4-47"
+     width="60"
+     height="60"
+     x="233.20879"
+     y="250.27832"
+     ry="14.117647" />
+  <rect
+     style="fill:url(#linearGradient5318);fill-opacity:1;stroke:none"
+     id="rect4061-1-9-8"
+     width="60"
+     height="60"
+     x="163.20879"
+     y="250.27832"
+     ry="14.117647" />
+  <rect
+     style="fill:url(#linearGradient5318-6);fill-opacity:1;stroke:none"
+     id="rect4061-1-9-6"
+     width="60"
+     height="60"
+     x="303.2088"
+     y="250.27832"
+     ry="14.117647" />
+  <rect
+     style="fill:url(#linearGradient5223);fill-opacity:1;stroke:none"
+     id="rect4061-1-9-5-6"
+     width="60"
+     height="60"
+     x="23.208786"
+     y="250.27832"
+     ry="14.117647" />
+  <rect
+     style="fill:url(#linearGradient5041-9);fill-opacity:1;stroke:none"
+     id="rect4061-1-7"
+     width="60"
+     height="60"
+     x="23.208786"
+     y="180.27832"
+     ry="14.117647" />
+  <rect
+     style="fill:url(#linearGradient5184);fill-opacity:1;stroke:none"
+     id="rect4061-1-4"
+     width="60"
+     height="60"
+     x="93.208786"
+     y="110.27831"
+     ry="14.117647" />
+  <rect
+     style="fill:url(#linearGradient5150);fill-opacity:1;stroke:none"
+     id="rect4061-1-9-5"
+     width="60"
+     height="60"
+     x="23.208786"
+     y="110.27831"
+     ry="14.117647" />
+  <rect
+     style="fill:url(#linearGradient5079);fill-opacity:1;stroke:none"
+     id="rect4061-1-1"
+     width="60"
+     height="60"
+     x="163.20879"
+     y="40.278313"
+     ry="14.117647" />
+  <rect
+     style="fill:url(#linearGradient5057-2);fill-opacity:1;stroke:none"
+     id="rect4061-1-9-4"
+     width="60"
+     height="60"
+     x="233.20879"
+     y="40.27832"
+     ry="14.117647" />
+  <rect
+     style="fill:url(#linearGradient5079-5);fill-opacity:1;stroke:none"
+     id="rect4061-1-5"
+     width="60"
+     height="60"
+     x="303.2088"
+     y="40.278313"
+     ry="14.117647" />
+  <rect
+     style="fill:url(#linearGradient5057-8);fill-opacity:1;stroke:none"
+     id="rect4061-1-9-1"
+     width="60"
+     height="60"
+     x="373.2088"
+     y="40.278313"
+     ry="14.117647" />
+  <g
+     transform="translate(0,-702.3608)"
+     id="layer1" />
+  <g
+     transform="translate(0,-702.3608)"
+     id="layer2"
+     style="display:inline" />
+  <g
+     transform="matrix(0.67199261,0,0,0.67199261,96.12914,-16.0749)"
+     id="flowRoot3968-7-0"
+     style="font-size:20px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#009ec0;fill-opacity:1;stroke:none;font-family:Sans" />
+  <g
+     id="g3330"
+     transform="translate(0,0.28967969)">
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:url(#linearGradient3336);fill-opacity:1;stroke:none"
+       id="path3031-7-5"
+       d="m 270.89196,239.20545 c -0.0639,-23.05204 9.54676,-45.04298 22.20054,-63.9186 3.59244,-6.13412 9.69281,-10.90495 11.21058,-18.11335 1.54544,-5.54285 -3.40626,-8.00556 -9.11895,-8.40739 -7.40037,-0.85781 -16.43064,-3.22597 -19.45355,-10.86571 -2.28339,-7.8022 2.84949,-16.02668 9.31952,-20.1318 7.20667,-4.59838 15.83114,-6.35644 24.2564,-6.89417 1.79208,-0.10323 2.13258,-0.19906 6.32105,0.0572 8.04141,0.33614 15.60142,5.83362 17.70242,13.71499 3.06535,10.66315 0.94049,22.19706 -3.08034,32.32141 -4.93188,11.91304 -12.37332,22.60843 -20.70789,32.3728 -9.62248,12.82801 -13.20778,29.36859 -11.94533,45.1779 -9.0432,2.67056 -22.24637,4.79479 -26.70445,4.68676 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:url(#linearGradient3338);fill-opacity:1;stroke:none"
+       id="path3029-6-0"
+       d="m 299.59461,233.85281 c -1.51577,-17.75955 3.5576,-36.48042 15.92624,-49.6506 9.03515,-11.5824 17.18928,-24.53651 20.13917,-39.11991 1.75417,-9.45871 1.98141,-20.58939 -4.75007,-28.25267 -1.21904,-1.45794 -6.64925,-4.35874 -1.94535,-2.66896 4.83272,1.3475 7.42599,4.27586 9.95344,7.78211 13.39279,17.26054 18.06599,41.04441 11.34875,61.92978 -7.28568,23.73809 -27.46701,42.14487 -50.67218,49.98025 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:url(#linearGradient3340);fill-opacity:1;stroke:none"
+       id="path3045-1-9"
+       d="m 198.02,194.91263 c 0.67464,-21.64902 11.89634,-42.85087 29.95998,-54.97968 14.33302,-9.85537 31.65018,-14.40823 48.80126,-15.96996 -2.94507,4.63376 -4.77207,10.93406 -2.06506,16.17765 1.55527,3.54954 6.32701,5.32428 5.76859,5.63436 -24.65703,0.0217 -50.10988,8.73105 -67.19398,27.01274 -6.38079,6.74189 -11.41439,14.6824 -15.22417,23.12777 -0.0552,-0.3311 -0.0409,-0.6683 -0.0467,-1.00288 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#1f211c;fill-opacity:1;stroke:none"
+       id="path3027-4-0"
+       d="m 304.16742,128.54496 c -1.39382,-0.15525 -2.51112,-0.51301 -3.30602,-1.05858 -0.35423,-0.24314 -0.74399,-0.67034 -0.90944,-0.99686 -0.13752,-0.27136 -0.15275,-0.35006 -0.15275,-0.78957 0,-0.4316 0.0167,-0.5224 0.1451,-0.78362 0.75916,-1.54581 3.62169,-2.5717 6.41463,-2.2989 1.61568,0.15781 2.8959,0.65051 3.67013,1.4125 0.51727,0.5091 0.66497,0.82865 0.66497,1.43878 0,0.61455 -0.14546,0.92433 -0.68967,1.46883 -1.0165,1.01703 -2.94915,1.65247 -4.9633,1.63193 -0.39571,-0.004 -0.78885,-0.015 -0.87365,-0.0246 z" />
+  </g>
+  <text
+     xml:space="preserve"
+     style="font-size:51.25284576000000000px;font-style:oblique;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#8a8d8e;fill-opacity:1;stroke:none;font-family:Lucida Sans;-inkscape-font-specification:Sans Oblique;stroke-opacity:1"
+     x="98.049896"
+     y="229.4922"
+     id="text3289"
+     sodipodi:linespacing="125%"><tspan
+       sodipodi:role="line"
+       id="tspan3291"
+       x="98.049896"
+       y="229.4922"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#8a8d8e;fill-opacity:1;font-family:Arial Narrow;-inkscape-font-specification:Arial Narrow Bold;stroke:none;stroke-opacity:1">Papyrus</tspan></text>
+  <rect
+     style="fill:url(#linearGradient5041);fill-opacity:1;stroke:none"
+     id="rect4061-1"
+     width="60"
+     height="60"
+     x="23.208786"
+     y="40.278313"
+     ry="14.117647" />
+  <rect
+     style="fill:url(#linearGradient5057);fill-opacity:1;stroke:none"
+     id="rect4061-1-9"
+     width="60"
+     height="60"
+     x="93.208786"
+     y="40.278313"
+     ry="14.117647" />
+  <path
+     style="fill:#ffffff;fill-opacity:1"
+     d="m 37.785122,86.076798 c -1.380272,-1.380272 0.04883,-2.80937 1.477925,-4.238469 0.04883,-2.809372 -4.189641,-1.331446 -4.140817,-4.140817 0.04883,-2.809372 5.618746,-0.09766 8.428118,-0.146483 2.907031,-5.667574 2.907031,-5.667574 5.765229,-8.525774 -1.331446,-4.189644 -11.091004,-8.232804 -13.851548,-10.993348 -2.760545,-2.760545 0.09766,-5.618744 4.287301,-4.287301 4.189644,1.331444 11.13983,5.423432 16.709747,8.135149 4.287302,-4.2873 10.003701,-10.003699 12.813072,-10.052526 2.809376,-0.04883 2.809376,-0.04883 2.760544,2.760544 -0.04883,2.809372 -5.765226,8.525771 -10.052527,12.813071 2.711717,5.569916 6.803708,12.520106 8.135149,16.709749 1.331441,4.189643 -2.907029,5.667572 -5.667571,2.90703 -2.760547,-2.760548 -5.423434,-11.139834 -9.613078,-12.471279 -2.858199,2.8582 -2.858199,2.8582 -8.525773,5.765229 -0.04883,2.809372 2.662887,8.37929 -0.146485,8.428117 -2.809372,0.04883 -1.331444,-4.189644 -4.140816,-4.140817 -1.429098,1.429099 -2.858197,2.858197 -4.23847,1.477925 z"
+     id="path4325"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccczzczzczzccccc" />
+  <path
+     style="fill:#ffffff;fill-opacity:1"
+     d="m 247.78512,86.076801 c -1.38027,-1.380275 0.0488,-2.809373 1.47792,-4.238472 0.0488,-2.809372 -4.18964,-1.331446 -4.14081,-4.140817 0.0488,-2.809372 5.61874,-0.09766 8.42811,-0.146483 2.90704,-5.667574 2.90704,-5.667574 5.76523,-8.525774 -1.33144,-4.189644 -11.091,-8.232804 -13.85154,-10.993348 -2.76055,-2.760545 0.0977,-5.618744 4.2873,-4.287301 4.18964,1.331444 11.13983,5.423432 16.70974,8.135149 4.28731,-4.2873 10.00371,-10.003699 12.81308,-10.052526 2.80937,-0.04883 2.80937,-0.04883 2.76054,2.760544 -0.0488,2.809372 -5.76523,8.525771 -10.05253,12.813071 2.71172,5.569916 6.80371,12.520106 8.13515,16.709749 1.33144,4.189648 -2.90703,5.667568 -5.66757,2.907028 -2.76055,-2.760546 -5.42343,-11.139832 -9.61308,-12.471277 -2.8582,2.8582 -2.8582,2.8582 -8.52577,5.765229 -0.0488,2.809372 2.66289,8.379288 -0.14648,8.428118 -2.80938,0.0488 -1.33145,-4.189645 -4.14082,-4.140818 -1.4291,1.429098 -2.8582,2.858198 -4.23847,1.477928 z"
+     id="path4325-1"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccczzczzczzccccc" />
+  <path
+     style="fill:#ffffff;fill-opacity:1"
+     d="m 247.78512,296.07681 c -1.38027,-1.38028 0.0488,-2.80937 1.47792,-4.23847 0.0488,-2.80938 -4.18964,-1.33145 -4.14081,-4.14082 0.0488,-2.80937 5.61874,-0.0977 8.42811,-0.14648 2.90703,-5.66758 2.90703,-5.66758 5.76523,-8.52578 -1.33144,-4.18964 -11.091,-8.2328 -13.85155,-10.99335 -2.76054,-2.76054 0.0977,-5.61874 4.28731,-4.2873 4.18964,1.33145 11.13983,5.42344 16.70974,8.13515 4.2873,-4.2873 10.0037,-10.0037 12.81307,-10.05253 2.80938,-0.0488 2.80938,-0.0488 2.76055,2.76055 -0.0488,2.80937 -5.76523,8.52577 -10.05253,12.81307 2.71172,5.56992 6.80371,12.52011 8.13515,16.70975 1.33144,4.18964 -2.90703,5.66757 -5.66757,2.90703 -2.76055,-2.76055 -5.42343,-11.13983 -9.61308,-12.47128 -2.8582,2.8582 -2.8582,2.8582 -8.52577,5.76523 -0.0488,2.80937 2.66289,8.37929 -0.14649,8.42812 -2.80937,0.0488 -1.33144,-4.18965 -4.14081,-4.14082 -1.4291,1.4291 -2.8582,2.8582 -4.23847,1.47793 z"
+     id="path4325-8"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccczzczzczzccccc" />
+  <g
+     id="g4481"
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     transform="matrix(0.5091023,0,0,0.5091023,144.46381,139.41678)">
+    <path
+       sodipodi:open="true"
+       sodipodi:end="6.2753732"
+       sodipodi:start="0"
+       transform="matrix(1.1684606,0,0,1.4393417,24.555104,1.2273496)"
+       d="m -39.70244,-3.5799496 c 0,7.5722906 -7.624064,13.7108446 -17.028822,13.7108446 -9.404759,0 -17.028822,-6.138554 -17.028822,-13.7108446 0,-7.5722904 7.624063,-13.7108454 17.028822,-13.7108454 9.352849,0 16.955237,6.073471 17.028302,13.6037359"
+       sodipodi:ry="13.710845"
+       sodipodi:rx="17.028822"
+       sodipodi:cy="-3.5799496"
+       sodipodi:cx="-56.731262"
+       id="path4355"
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       sodipodi:type="arc" />
+    <rect
+       ry="5.7463398"
+       y="7.4294286"
+       x="-46.696823"
+       height="42.61132"
+       width="9.9273682"
+       id="rect4357"
+       style="fill:#ffffff;fill-opacity:1;stroke:none" />
+    <path
+       id="path4355-2"
+       d="m -41.71875,-31.65625 c -14.88593,0 -27.3125,12.165728 -27.3125,27.71875 0,5.8895956 1.78644,11.271257 4.8125,15.71875 L -61.625,9.1875 c -2.588692,-3.7868125 -4.09375,-8.31513642 -4.09375,-13.125 0,-12.762065 10.570844,-23.5625 24,-23.5625 13.429157,0 23.9375,10.800435 23.9375,23.5625 0,4.80094155 -1.490947,9.3111849 -4.0625,13.09375 l 2.625,2.625 c 3.016999,-4.4471812 4.78125,-9.8298816 4.78125,-15.71875 0,-15.553022 -12.395319,-27.71875 -27.28125,-27.71875 z"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.22394896;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path4355-2-9"
+       d="m -41.71875,-39.15625 c -19.028066,0 -34.84375,15.492342 -34.84375,35.1875 0,7.9698277 2.593401,15.295179 6.9375,21.15625 L -67,14.5625 c -0.0049,-0.0065 0.0049,-0.02476 0,-0.03125 -3.90741,-5.206001 -6.21875,-11.6326688 -6.21875,-18.5 0,-16.904199 13.928709,-31.03125 31.5,-31.03125 17.571291,0 31.4375,14.127051 31.4375,31.03125 0,6.8673312 -2.292007,13.293999 -6.1875,18.5 l 2.625,2.625 c 4.3235528,-5.857746 6.90625,-13.1640124 6.90625,-21.125 0,-19.695158 -15.753184,-35.1875 -34.78125,-35.1875 z"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.72055769;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path4355-2-9-5"
+       d="m -41.71875,-46.65625 c -23.170201,0 -42.34375,18.850205 -42.34375,42.6875 0,10.0528755 3.409492,19.240224 9.09375,26.5 L -72.3125,19.875 c -5.250508,-6.605445 -8.375,-14.9056629 -8.375,-23.84375 0,-21.046336 17.255323,-38.53125 38.96875,-38.53125 21.713427,0 38.9375,17.484914 38.9375,38.53125 0,8.9380871 -3.1087171,17.238305 -8.34375,23.84375 l 2.625,2.65625 c 5.6724567,-7.260957 9.0625,-16.443642 9.0625,-26.5 0,-23.837295 -19.111048,-42.6875 -42.28125,-42.6875 z"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.40299034;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     id="g4481-4"
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     transform="matrix(0.5091023,0,0,0.5091023,424.46382,69.416785)">
+    <path
+       sodipodi:open="true"
+       sodipodi:end="6.2753732"
+       sodipodi:start="0"
+       transform="matrix(1.1684606,0,0,1.4393417,24.555104,1.2273496)"
+       d="m -39.70244,-3.5799496 c 0,7.5722906 -7.624064,13.7108446 -17.028822,13.7108446 -9.404759,0 -17.028822,-6.138554 -17.028822,-13.7108446 0,-7.5722904 7.624063,-13.7108454 17.028822,-13.7108454 9.352849,0 16.955237,6.073471 17.028302,13.6037359"
+       sodipodi:ry="13.710845"
+       sodipodi:rx="17.028822"
+       sodipodi:cy="-3.5799496"
+       sodipodi:cx="-56.731262"
+       id="path4355-3"
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       sodipodi:type="arc" />
+    <rect
+       ry="5.7463398"
+       y="7.4294286"
+       x="-46.696823"
+       height="42.61132"
+       width="9.9273682"
+       id="rect4357-1"
+       style="fill:#ffffff;fill-opacity:1;stroke:none" />
+    <path
+       id="path4355-2-2"
+       d="m -41.71875,-31.65625 c -14.88593,0 -27.3125,12.165728 -27.3125,27.71875 0,5.8895956 1.78644,11.271257 4.8125,15.71875 L -61.625,9.1875 c -2.588692,-3.7868125 -4.09375,-8.31513642 -4.09375,-13.125 0,-12.762065 10.570844,-23.5625 24,-23.5625 13.429157,0 23.9375,10.800435 23.9375,23.5625 0,4.80094155 -1.490947,9.3111849 -4.0625,13.09375 l 2.625,2.625 c 3.016999,-4.4471812 4.78125,-9.8298816 4.78125,-15.71875 0,-15.553022 -12.395319,-27.71875 -27.28125,-27.71875 z"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.22394896;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path4355-2-9-3"
+       d="m -41.71875,-39.15625 c -19.028066,0 -34.84375,15.492342 -34.84375,35.1875 0,7.9698277 2.593401,15.295179 6.9375,21.15625 L -67,14.5625 c -0.0049,-0.0065 0.0049,-0.02476 0,-0.03125 -3.90741,-5.206001 -6.21875,-11.6326688 -6.21875,-18.5 0,-16.904199 13.928709,-31.03125 31.5,-31.03125 17.571291,0 31.4375,14.127051 31.4375,31.03125 0,6.8673312 -2.292007,13.293999 -6.1875,18.5 l 2.625,2.625 c 4.3235528,-5.857746 6.90625,-13.1640124 6.90625,-21.125 0,-19.695158 -15.753184,-35.1875 -34.78125,-35.1875 z"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.72055769;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path4355-2-9-5-3"
+       d="m -41.71875,-46.65625 c -23.170201,0 -42.34375,18.850205 -42.34375,42.6875 0,10.0528755 3.409492,19.240224 9.09375,26.5 L -72.3125,19.875 c -5.250508,-6.605445 -8.375,-14.9056629 -8.375,-23.84375 0,-21.046336 17.255323,-38.53125 38.96875,-38.53125 21.713427,0 38.9375,17.484914 38.9375,38.53125 0,8.9380871 -3.1087171,17.238305 -8.34375,23.84375 l 2.625,2.65625 c 5.6724567,-7.260957 9.0625,-16.443642 9.0625,-26.5 0,-23.837295 -19.111048,-42.6875 -42.28125,-42.6875 z"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.40299034;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     id="g4481-41"
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     transform="matrix(0.5091023,0,0,0.5091023,354.46382,279.41679)">
+    <path
+       sodipodi:open="true"
+       sodipodi:end="6.2753732"
+       sodipodi:start="0"
+       transform="matrix(1.1684606,0,0,1.4393417,24.555104,1.2273496)"
+       d="m -39.70244,-3.5799496 c 0,7.5722906 -7.624064,13.7108446 -17.028822,13.7108446 -9.404759,0 -17.028822,-6.138554 -17.028822,-13.7108446 0,-7.5722904 7.624063,-13.7108454 17.028822,-13.7108454 9.352849,0 16.955237,6.073471 17.028302,13.6037359"
+       sodipodi:ry="13.710845"
+       sodipodi:rx="17.028822"
+       sodipodi:cy="-3.5799496"
+       sodipodi:cx="-56.731262"
+       id="path4355-1"
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       sodipodi:type="arc" />
+    <rect
+       ry="5.7463398"
+       y="7.4294286"
+       x="-46.696823"
+       height="42.61132"
+       width="9.9273682"
+       id="rect4357-3"
+       style="fill:#ffffff;fill-opacity:1;stroke:none" />
+    <path
+       id="path4355-2-8"
+       d="m -41.71875,-31.65625 c -14.88593,0 -27.3125,12.165728 -27.3125,27.71875 0,5.8895956 1.78644,11.271257 4.8125,15.71875 L -61.625,9.1875 c -2.588692,-3.7868125 -4.09375,-8.31513642 -4.09375,-13.125 0,-12.762065 10.570844,-23.5625 24,-23.5625 13.429157,0 23.9375,10.800435 23.9375,23.5625 0,4.80094155 -1.490947,9.3111849 -4.0625,13.09375 l 2.625,2.625 c 3.016999,-4.4471812 4.78125,-9.8298816 4.78125,-15.71875 0,-15.553022 -12.395319,-27.71875 -27.28125,-27.71875 z"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.22394896;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path4355-2-9-7"
+       d="m -41.71875,-39.15625 c -19.028066,0 -34.84375,15.492342 -34.84375,35.1875 0,7.9698277 2.593401,15.295179 6.9375,21.15625 L -67,14.5625 c -0.0049,-0.0065 0.0049,-0.02476 0,-0.03125 -3.90741,-5.206001 -6.21875,-11.6326688 -6.21875,-18.5 0,-16.904199 13.928709,-31.03125 31.5,-31.03125 17.571291,0 31.4375,14.127051 31.4375,31.03125 0,6.8673312 -2.292007,13.293999 -6.1875,18.5 l 2.625,2.625 c 4.3235528,-5.857746 6.90625,-13.1640124 6.90625,-21.125 0,-19.695158 -15.753184,-35.1875 -34.78125,-35.1875 z"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.72055769;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path4355-2-9-5-4"
+       d="m -41.71875,-46.65625 c -23.170201,0 -42.34375,18.850205 -42.34375,42.6875 0,10.0528755 3.409492,19.240224 9.09375,26.5 L -72.3125,19.875 c -5.250508,-6.605445 -8.375,-14.9056629 -8.375,-23.84375 0,-21.046336 17.255323,-38.53125 38.96875,-38.53125 21.713427,0 38.9375,17.484914 38.9375,38.53125 0,8.9380871 -3.1087171,17.238305 -8.34375,23.84375 l 2.625,2.65625 c 5.6724567,-7.260957 9.0625,-16.443642 9.0625,-26.5 0,-23.837295 -19.111048,-42.6875 -42.28125,-42.6875 z"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.40299034;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       inkscape:connector-curvature="0" />
+  </g>
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1"
+     d="m 114.72165,54.749909 c -2.71162,0.04016 -5.25081,0.532636 -7.46641,1.488911 -3.54496,1.530038 -6.27862,4.407841 -7.02384,8.288724 -1.338092,6.9685 0.31832,12.527778 2.49428,15.962763 a 1.8360513,1.8360513 0 0 0 1.50803,0.852368 l 1.74572,0.04098 c 0.83517,2.568777 3.24766,4.425751 6.09496,4.425751 2.74062,0 5.07769,-1.719296 5.99389,-4.138893 l 7.19868,0.169376 c 0.95936,2.330202 3.24931,3.969517 5.9256,3.969517 2.56834,0 4.78295,-1.509509 5.80539,-3.690858 l 1.85498,0.0437 a 1.8360513,1.8360513 0 0 0 0.34695,-0.02461 c 1.84293,-0.310863 3.89623,-1.028335 5.46389,-2.61994 1.56768,-1.591605 2.41234,-4.137718 1.80583,-7.100324 -0.41708,-2.037247 -1.85181,-3.635726 -3.71818,-5.351885 -1.86637,-1.71616 -4.25956,-3.446204 -6.88724,-5.065029 -5.25532,-3.237646 -11.35424,-6.018283 -16.10755,-6.838061 -1.71938,-0.296532 -3.408,-0.436621 -5.03498,-0.412523 z m 0.5819,3.677199 c 1.22633,0.0098 2.50961,0.125138 3.82747,0.35242 3.84801,0.663646 9.85442,3.295096 14.80715,6.346312 2.47635,1.52561 4.71144,3.158609 6.32718,4.644309 1.61574,1.485703 2.51494,2.925457 2.60901,3.384883 0.41573,2.030726 -0.0435,2.990151 -0.82777,3.786476 -0.75888,0.770449 -2.04524,1.306594 -3.32752,1.54355 l -1.18567,-0.02732 c -0.45703,-3.094263 -3.12446,-5.463887 -6.34084,-5.463887 -3.1144,0 -5.70763,2.221293 -6.28621,5.166108 l -6.57853,-0.155721 c -0.63828,-2.869351 -3.19611,-5.010387 -6.25343,-5.010387 -2.95458,0 -5.44086,1.998527 -6.18239,4.718066 l -0.53546,-0.01366 c -1.45608,-2.719076 -2.57401,-6.996578 -1.52169,-12.476798 0.5058,-2.63416 2.17641,-4.447201 4.87379,-5.611419 1.68586,-0.727634 3.769,-1.14222 6.07311,-1.180199 0.17281,-0.0028 0.34662,-0.0041 0.5218,-0.0026 z"
+     inkscape:connector-curvature="0"
+     id="path317" />
+  <path
+     id="path4601"
+     style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1"
+     d="m 44.721651,194.74989 c -2.71162,0.0402 -5.25081,0.53263 -7.46641,1.48891 -3.54496,1.53004 -6.27862,4.40784 -7.02384,8.28872 -1.33809,6.9685 0.31832,12.52778 2.49428,15.96277 a 1.8360513,1.8360513 0 0 0 1.50803,0.85236 l 1.74572,0.041 c 0.83517,2.56878 3.24766,4.42576 6.09496,4.42576 2.74062,0 5.07769,-1.7193 5.99389,-4.1389 l 7.19868,0.16938 c 0.95936,2.3302 3.24931,3.96952 5.9256,3.96952 2.56834,0 4.78295,-1.50951 5.80539,-3.69086 l 1.85498,0.0437 a 1.8360513,1.8360513 0 0 0 0.34695,-0.0246 c 1.84293,-0.31087 3.89623,-1.02834 5.46389,-2.61994 1.56768,-1.59161 2.41234,-4.13772 1.80583,-7.10033 -0.41708,-2.03724 -1.85181,-3.63572 -3.71818,-5.35188 -1.86637,-1.71616 -4.25956,-3.44621 -6.88724,-5.06503 -5.25532,-3.23765 -11.35424,-6.01828 -16.10755,-6.83806 -1.71938,-0.29653 -3.408,-0.43662 -5.03498,-0.41252 z m 0.5819,3.6772 c 1.22633,0.01 2.50961,0.12514 3.82747,0.35242 3.84801,0.66364 9.85442,3.29509 14.80715,6.34631 2.47635,1.52561 4.71144,3.15861 6.32718,4.64431 1.61574,1.4857 2.51494,2.92546 2.60901,3.38488 0.41573,2.03073 -0.0435,2.99015 -0.82777,3.78648 -0.75888,0.77045 -2.04524,1.30659 -3.32752,1.54355 l -1.18567,-0.0273 c -0.45703,-3.09427 -3.12446,-5.46389 -6.34084,-5.46389 -3.1144,0 -5.70763,2.22129 -6.28621,5.16611 l -6.57853,-0.15572 c -0.63828,-2.86935 -3.19611,-5.01039 -6.25343,-5.01039 -2.95458,0 -5.44086,1.99853 -6.18239,4.71807 l -0.53546,-0.0137 c -1.45608,-2.71908 -2.57401,-6.99658 -1.52169,-12.4768 0.5058,-2.63416 2.17641,-4.4472 4.87379,-5.61142 1.68586,-0.72763 3.769,-1.14222 6.07311,-1.1802 0.17281,-0.003 0.34662,-0.004 0.5218,-0.003 z"
+     inkscape:connector-curvature="0" />
+  <path
+     id="path4601-7"
+     style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1"
+     d="m 394.72167,194.74989 c -2.71162,0.0402 -5.25081,0.53264 -7.46641,1.48891 -3.54496,1.53004 -6.27862,4.40784 -7.02384,8.28873 -1.33809,6.9685 0.31832,12.52777 2.49428,15.96276 a 1.8360513,1.8360513 0 0 0 1.50803,0.85237 l 1.74572,0.041 c 0.83517,2.56877 3.24766,4.42575 6.09496,4.42575 2.74062,0 5.07769,-1.7193 5.99389,-4.13889 l 7.19868,0.16937 c 0.95936,2.3302 3.24931,3.96952 5.9256,3.96952 2.56834,0 4.78295,-1.50951 5.80539,-3.69086 l 1.85498,0.0437 a 1.8360513,1.8360513 0 0 0 0.34695,-0.0246 c 1.84293,-0.31086 3.89623,-1.02833 5.46389,-2.61994 1.56768,-1.5916 2.41234,-4.13772 1.80583,-7.10032 -0.41708,-2.03725 -1.85181,-3.63573 -3.71818,-5.35189 -1.86637,-1.71616 -4.25956,-3.4462 -6.88724,-5.06503 -5.25532,-3.23764 -11.35424,-6.01828 -16.10755,-6.83806 -1.71938,-0.29653 -3.408,-0.43662 -5.03498,-0.41252 z m 0.5819,3.6772 c 1.22633,0.01 2.50961,0.12514 3.82747,0.35242 3.84801,0.66365 9.85442,3.2951 14.80715,6.34631 2.47635,1.52561 4.71144,3.15861 6.32718,4.64431 1.61574,1.4857 2.51494,2.92546 2.60901,3.38488 0.41573,2.03073 -0.0435,2.99016 -0.82777,3.78648 -0.75888,0.77045 -2.04524,1.30659 -3.32752,1.54355 l -1.18567,-0.0273 c -0.45703,-3.09426 -3.12446,-5.46389 -6.34084,-5.46389 -3.1144,0 -5.70763,2.2213 -6.28621,5.16611 l -6.57853,-0.15572 c -0.63828,-2.86935 -3.19611,-5.01039 -6.25343,-5.01039 -2.95458,0 -5.44086,1.99853 -6.18239,4.71807 l -0.53546,-0.0137 c -1.45608,-2.71908 -2.57401,-6.99658 -1.52169,-12.4768 0.5058,-2.63416 2.17641,-4.4472 4.87379,-5.61142 1.68586,-0.72763 3.769,-1.14222 6.07311,-1.1802 0.17281,-0.003 0.34662,-0.004 0.5218,-0.003 z"
+     inkscape:connector-curvature="0" />
+  <path
+     style="font-size:12px;fill:#ffffff;fill-opacity:1;stroke:none"
+     d="m 43.810045,117.23326 c -1.206858,0 -2.176032,0.49074 -2.176032,1.09417 l 0,0.209 -5.274114,0 c -1.20667,0 -2.176033,0.96936 -2.176033,2.17603 l 0,34.82882 c 0,1.20667 0.969363,2.17603 2.176033,2.17603 l 5.052822,0 -6.970682,5.60605 8.679544,0 3.356254,-5.60605 13.449605,0 3.356253,5.60605 8.691838,0 -6.970682,-5.60605 5.040528,0 c 1.206671,0 2.188327,-0.96936 2.188327,-2.17603 l 0,-34.82882 c 0,-1.20667 -0.981656,-2.17603 -2.188327,-2.17603 l -5.274113,0 0,-0.209 c 0,-0.60343 -0.969175,-1.09417 -2.176033,-1.09417 l -18.785188,0 z m -4.352065,6.45434 27.489319,0 c 0.297719,0 0.540934,0.24321 0.540934,0.54094 l 0,12.19561 c 0,0.29771 -0.243215,0.54093 -0.540934,0.54093 l -27.489319,0 c -0.297719,0 -0.540935,-0.24322 -0.540935,-0.54093 l 0,-12.19561 c 0,-0.29773 0.243216,-0.54094 0.540935,-0.54094 z m 4.11848,19.59659 c 2.123482,0 3.843717,1.71229 3.860307,3.83572 l 0,0.0246 c 0,2.13526 -1.725039,3.87261 -3.860307,3.87261 -2.135268,0 -3.872601,-1.73735 -3.872601,-3.87261 0,-2.13527 1.737333,-3.8603 3.872601,-3.8603 z m 19.252359,0 c 2.123482,0 3.856011,1.71229 3.872601,3.83572 l 0,0.0246 c 0,2.13526 -1.737333,3.87261 -3.872601,3.87261 -2.135269,0 -3.860308,-1.73735 -3.860308,-3.87261 0,-2.13527 1.725039,-3.8603 3.860308,-3.8603 z"
+     id="rect2024"
+     inkscape:connector-curvature="0" />
+  <path
+     style="font-size:12px;fill:#ffffff;fill-opacity:1;stroke:none"
+     d="m 113.81005,257.23327 c -1.20686,0 -2.17604,0.49074 -2.17604,1.09417 l 0,0.209 -5.27411,0 c -1.20667,0 -2.17603,0.96936 -2.17603,2.17603 l 0,34.82882 c 0,1.20667 0.96936,2.17603 2.17603,2.17603 l 5.05282,0 -6.97068,5.60605 8.67954,0 3.35626,-5.60605 13.4496,0 3.35626,5.60605 8.69183,0 -6.97068,-5.60605 5.04053,0 c 1.20667,0 2.18833,-0.96936 2.18833,-2.17603 l 0,-34.82882 c 0,-1.20667 -0.98166,-2.17603 -2.18833,-2.17603 l -5.27411,0 0,-0.209 c 0,-0.60343 -0.96918,-1.09417 -2.17604,-1.09417 l -18.78518,0 z m -4.35207,6.45434 27.48932,0 c 0.29772,0 0.54093,0.24321 0.54093,0.54094 l 0,12.19561 c 0,0.29771 -0.24321,0.54093 -0.54093,0.54093 l -27.48932,0 c -0.29772,0 -0.54093,-0.24322 -0.54093,-0.54093 l 0,-12.19561 c 0,-0.29773 0.24321,-0.54094 0.54093,-0.54094 z m 4.11848,19.59659 c 2.12348,0 3.84372,1.71229 3.86031,3.83572 l 0,0.0246 c 0,2.13526 -1.72504,3.87261 -3.86031,3.87261 -2.13527,0 -3.8726,-1.73735 -3.8726,-3.87261 0,-2.13527 1.73733,-3.8603 3.8726,-3.8603 z m 19.25236,0 c 2.12348,0 3.85601,1.71229 3.8726,3.83572 l 0,0.0246 c 0,2.13526 -1.73733,3.87261 -3.8726,3.87261 -2.13527,0 -3.86031,-1.73735 -3.86031,-3.87261 0,-2.13527 1.72504,-3.8603 3.86031,-3.8603 z"
+     id="rect2024-9"
+     inkscape:connector-curvature="0" />
+  <path
+     style="font-size:12px;fill:#ffffff;fill-opacity:1;stroke:none"
+     d="m 393.81006,117.23326 c -1.20686,0 -2.17604,0.49074 -2.17604,1.09417 l 0,0.209 -5.27411,0 c -1.20667,0 -2.17603,0.96936 -2.17603,2.17603 l 0,34.82882 c 0,1.20667 0.96936,2.17603 2.17603,2.17603 l 5.05282,0 -6.97068,5.60605 8.67954,0 3.35626,-5.60605 13.4496,0 3.35626,5.60605 8.69183,0 -6.97068,-5.60605 5.04053,0 c 1.20667,0 2.18833,-0.96936 2.18833,-2.17603 l 0,-34.82882 c 0,-1.20667 -0.98166,-2.17603 -2.18833,-2.17603 l -5.27411,0 0,-0.209 c 0,-0.60343 -0.96918,-1.09417 -2.17604,-1.09417 l -18.78518,0 z m -4.35207,6.45434 27.48932,0 c 0.29772,0 0.54093,0.24321 0.54093,0.54094 l 0,12.19561 c 0,0.29771 -0.24321,0.54093 -0.54093,0.54093 l -27.48932,0 c -0.29772,0 -0.54093,-0.24322 -0.54093,-0.54093 l 0,-12.19561 c 0,-0.29773 0.24321,-0.54094 0.54093,-0.54094 z m 4.11848,19.59659 c 2.12348,0 3.84372,1.71229 3.86031,3.83572 l 0,0.0246 c 0,2.13526 -1.72504,3.87261 -3.86031,3.87261 -2.13527,0 -3.8726,-1.73735 -3.8726,-3.87261 0,-2.13527 1.73733,-3.8603 3.8726,-3.8603 z m 19.25236,0 c 2.12348,0 3.85601,1.71229 3.8726,3.83572 l 0,0.0246 c 0,2.13526 -1.73733,3.87261 -3.8726,3.87261 -2.13527,0 -3.86031,-1.73735 -3.86031,-3.87261 0,-2.13527 1.72504,-3.8603 3.86031,-3.8603 z"
+     id="rect2024-9-9"
+     inkscape:connector-curvature="0" />
+  <path
+     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:5.5999999;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+     d="m 209.6441,46.78695 c -1.2569,-1.256906 -2.59387,0.08215 -4.59962,2.087883 l -6.45201,6.452032 -2.43326,-2.433254 c -7.53521,7.535213 -15.07042,15.07042 -12.55868,22.605633 l 1.17737,1.177383 c -0.95477,0.843518 -1.73875,1.928926 -2.49602,3.061167 -1.38182,2.06599 -2.55837,4.448308 -3.42225,6.373538 -0.51172,1.140434 -1.69767,2.820255 -3.06118,3.626317 -1.36351,0.806082 -2.73606,1.107745 -5.07057,-0.392457 l -2.15068,3.343744 c 3.3598,2.159073 6.85084,1.871414 9.24633,0.455252 2.39549,-1.416147 3.87928,-3.619968 4.67812,-5.400225 0.81065,-1.806592 1.90725,-4.028253 3.07688,-5.777005 0.74583,-1.115098 1.55141,-1.899257 2.11928,-2.370437 l 0.9262,0.926199 c 7.5352,2.511734 15.07041,-5.023476 22.60562,-12.558689 l -2.41753,-2.417535 6.45201,-6.452032 c 2.00574,-2.005744 3.34489,-3.342605 2.08788,-4.599626 -1.25691,-1.256909 -2.59387,0.08214 -4.59962,2.087882 l -6.45202,6.452028 -5.19615,-5.196147 6.45201,-6.452023 c 2.00575,-2.005751 3.3449,-3.34261 2.08789,-4.599628 z"
+     id="path4801"
+     inkscape:connector-curvature="0" />
+  <path
+     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:5.5999999;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+     d="m 419.64411,256.78696 c -1.2569,-1.25691 -2.59387,0.0821 -4.59962,2.08788 l -6.45201,6.45204 -2.43326,-2.43326 c -7.53521,7.53522 -15.07042,15.07042 -12.55868,22.60564 l 1.17737,1.17738 c -0.95477,0.84352 -1.73875,1.92892 -2.49602,3.06117 -1.38182,2.06599 -2.55837,4.4483 -3.42225,6.37353 -0.51172,1.14044 -1.69767,2.82026 -3.06118,3.62632 -1.36351,0.80608 -2.73606,1.10775 -5.07057,-0.39246 l -2.15068,3.34375 c 3.3598,2.15907 6.85084,1.87141 9.24633,0.45525 2.39549,-1.41615 3.87928,-3.61997 4.67812,-5.40023 0.81065,-1.80659 1.90725,-4.02825 3.07688,-5.777 0.74583,-1.1151 1.55141,-1.89926 2.11928,-2.37044 l 0.9262,0.9262 c 7.5352,2.51174 15.07041,-5.02347 22.60562,-12.55869 l -2.41753,-2.41753 6.45201,-6.45203 c 2.00574,-2.00575 3.34489,-3.34261 2.08788,-4.59963 -1.25691,-1.25691 -2.59387,0.0821 -4.59962,2.08788 l -6.45202,6.45203 -5.19615,-5.19615 6.45201,-6.45202 c 2.00575,-2.00575 3.3449,-3.34261 2.08789,-4.59963 z"
+     id="path4801-0"
+     inkscape:connector-curvature="0"
+     inkscape:transform-center-x="60.480582"
+     inkscape:transform-center-y="-186.63452" />
+  <path
+     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:5.5999999;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+     d="m 209.6441,256.78695 c -1.2569,-1.25691 -2.59387,0.0822 -4.59962,2.08788 l -6.45201,6.45203 -2.43326,-2.43325 c -7.53521,7.53521 -15.07042,15.07042 -12.55868,22.60563 l 1.17737,1.17739 c -0.95477,0.84351 -1.73875,1.92892 -2.49602,3.06116 -1.38182,2.06599 -2.55837,4.44831 -3.42225,6.37354 -0.51172,1.14043 -1.69767,2.82026 -3.06118,3.62632 -1.36351,0.80608 -2.73606,1.10774 -5.07057,-0.39246 l -2.15068,3.34374 c 3.3598,2.15908 6.85084,1.87142 9.24633,0.45526 2.39549,-1.41615 3.87928,-3.61997 4.67812,-5.40023 0.81065,-1.80659 1.90725,-4.02825 3.07688,-5.777 0.74583,-1.1151 1.55141,-1.89926 2.11928,-2.37044 l 0.9262,0.9262 c 7.5352,2.51173 15.07041,-5.02348 22.60562,-12.55869 l -2.41753,-2.41754 6.45201,-6.45203 c 2.00574,-2.00574 3.34489,-3.3426 2.08788,-4.59962 -1.25691,-1.25691 -2.59387,0.0821 -4.59962,2.08788 l -6.45202,6.45203 -5.19615,-5.19615 6.45201,-6.45202 c 2.00575,-2.00576 3.3449,-3.34261 2.08789,-4.59963 z"
+     id="path4801-2"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     d="m 38.226706,296.88159 c 0.166338,0.16634 0.43793,0.16428 0.600023,-0.007 l 2.097004,-2.20834 6.68072,6.68072 c 1.509736,-2.32284 0.278163,-6.61573 -2.956849,-10.41698 0.0076,-0.007 0.01768,-0.006 0.02475,-0.0124 l 1.670185,-1.67018 3.272305,3.2723 c 0.548322,0.54833 1.431157,0.54834 1.97947,3e-5 l 3.068185,-3.06818 1.212424,1.21241 -3.272305,3.27231 9.37774,9.37775 14.264584,-14.26457 -9.377755,-9.37775 -2.245459,2.24547 -1.212431,-1.21243 2.041322,-2.04132 c 0.548322,-0.54832 0.548327,-1.43117 5e-6,-1.97947 l -2.004216,-2.00424 0.915506,-0.91549 1.144388,1.14439 c 0.271963,0.27196 0.705396,0.27195 0.977358,-10e-6 l 6.872488,-6.87247 c 0.271953,-0.27198 0.278154,-0.71159 0.0061,-0.98356 l -1.237171,-1.23718 c 0.447603,-1.38148 0.17905,-2.87674 -0.828907,-3.8847 -1.007951,-1.00797 -2.497021,-1.27034 -3.878524,-0.82273 l -1.243357,-1.24335 c -0.271963,-0.27197 -0.711592,-0.26578 -0.983555,0.007 l -6.872475,6.87247 c -0.271958,0.27196 -0.271972,0.70541 -9e-6,0.97737 l 1.144387,1.14438 -0.915509,0.91551 -2.004214,-2.00421 c -0.548318,-0.54832 -1.431158,-0.54832 -1.979471,-10e-6 l -2.041329,2.04133 -0.952625,-0.95262 2.24547,-2.24546 -9.377751,-9.37776 -14.264578,14.26458 9.377751,9.37774 3.27232,-3.27229 0.952615,0.95261 -3.068176,3.06818 c -0.548317,0.54831 -0.548322,1.43116 0,1.97948 l 3.27232,3.2723 -1.670189,1.67019 c -0.007,0.007 -0.0062,0.0173 -0.01235,0.0246 -3.801255,-3.235 -8.094141,-4.46658 -10.416979,-2.95683 l 6.680725,6.68073 -2.097008,2.20832 c -0.162088,0.17048 -0.160146,0.44607 0.0061,0.61241 l 1.756778,1.75679 z m 19.374084,-7.94263 -1.212428,-1.21243 5.4188,-5.41881 1.212428,1.21244 -5.4188,5.4188 z m -12.099531,-12.09952 -0.952619,-0.95263 5.418794,-5.4188 0.952625,0.95263 -5.4188,5.4188 z"
+     id="rect4833"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     d="m 318.22682,86.881578 c 0.16634,0.16634 0.43793,0.16428 0.60003,-0.007 l 2.097,-2.20834 6.68072,6.68072 c 1.50974,-2.32284 0.27816,-6.61573 -2.95685,-10.41698 0.008,-0.007 0.0177,-0.006 0.0247,-0.0124 l 1.67019,-1.67018 3.2723,3.2723 c 0.54832,0.54833 1.43116,0.54834 1.97947,3e-5 l 3.06819,-3.06818 1.21242,1.21241 -3.27231,3.27231 9.37774,9.37775 14.26459,-14.26457 -9.37776,-9.37775 -2.24546,2.24547 -1.21243,-1.21243 2.04133,-2.04132 c 0.54832,-0.54832 0.54832,-1.43117 0,-1.97947 l -2.00422,-2.00424 0.91551,-0.91549 1.14439,1.14439 c 0.27196,0.27196 0.70539,0.27195 0.97736,-1e-5 l 6.87249,-6.87247 c 0.27195,-0.27198 0.27815,-0.71159 0.006,-0.98356 l -1.23717,-1.23718 c 0.4476,-1.38148 0.17905,-2.87674 -0.82891,-3.8847 -1.00795,-1.00797 -2.49702,-1.27034 -3.87853,-0.82273 l -1.24335,-1.24335 c -0.27197,-0.27197 -0.7116,-0.26578 -0.98356,0.007 l -6.87247,6.87247 c -0.27196,0.27196 -0.27198,0.70541 -1e-5,0.97737 l 1.14438,1.14438 -0.91551,0.91551 -2.00421,-2.00421 c -0.54832,-0.54832 -1.43116,-0.54832 -1.97947,-10e-6 l -2.04133,2.04133 -0.95262,-0.95262 2.24547,-2.24546 -9.37776,-9.37776 -14.26457,14.26458 9.37775,9.37774 3.27232,-3.27229 0.95261,0.95261 -3.06817,3.06818 c -0.54832,0.54831 -0.54833,1.43116 0,1.97948 l 3.27232,3.2723 -1.67019,1.67019 c -0.007,0.007 -0.006,0.0173 -0.0124,0.0246 -3.80126,-3.235 -8.09414,-4.46658 -10.41698,-2.95683 l 6.68072,6.68073 -2.097,2.20832 c -0.16209,0.17048 -0.16015,0.44607 0.006,0.61241 l 1.75677,1.75679 z m 19.37409,-7.94263 -1.21243,-1.21243 5.4188,-5.41881 1.21243,1.21244 -5.4188,5.4188 z m -12.09953,-12.09952 -0.95262,-0.95263 5.41879,-5.4188 0.95263,0.95263 -5.4188,5.4188 z"
+     id="rect4833-0"
+     inkscape:connector-curvature="0" />
+</svg>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/plugin.xml b/releng/rcp/org.eclipse.papyrus.rcp/plugin.xml
new file mode 100644
index 00000000000..99008c544c5
--- /dev/null
+++ b/releng/rcp/org.eclipse.papyrus.rcp/plugin.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.3"?>
+<plugin>
+   <extension
+         id="product"
+         point="org.eclipse.core.runtime.products">
+      <product
+            application="org.eclipse.ui.ide.workbench"
+            description="Papyrus&#x0D;&#x0A;&#x0D;&#x0A;Version: 1.0.0&#x0D;&#x0A;&#x0D;&#x0A;(c) Copyright Eclipse contributors and others 2000, 2013.  All rights reserved.&#x0D;&#x0A;Visit http://www.eclipse.org/platform&#x0D;&#x0A;&#x0D;&#x0A;This product includes software developed by the&#x0D;&#x0A;Apache Software Foundation http://www.apache.org/"
+            name="Papyrus">
+         <property name="windowImages" value="icons/papyrus16.png,icons/papyrus32.png,icons/papyrus48.png,icons/papyrus64.png,icons/papyrus128.png"/> 
+         <property name="aboutImage" value="icons/papyrus_lg.png"/>
+         <property
+               name="appName"
+               value="Papyrus">
+         </property>
+         <property
+              name="introBrandingImage"
+              value="product:icons/intro-papyrus.png"/>
+         <property
+               name="introTitle"
+               value="Welcome to Papyrus">
+         </property>
+         <property
+               name="introBrandingImageText"
+               value="Papyrus">
+         </property>
+         <property
+               name="startupForegroundColor"
+               value="9C9E9F">
+         </property>
+         <property
+               name="startupMessageRect"
+               value="7,4,445,16">
+         </property>
+         <property
+               name="startupProgressRect"
+               value="0,330,460,20">
+         </property>
+         <property
+               name="preferenceCustomization"
+               value="plugin_customization.ini">
+         </property>
+         <property
+				name="cssTheme"
+				value="org.eclipse.e4.ui.css.theme.e4_default">
+		  </property>
+		  <property
+				name="applicationCSSResources"
+          value="platform:/plugin/org.eclipse.platform/images/">
+		  </property>
+    <property
+          name="aboutText"
+          value="Papyrus&#x0A;&#x0A;Version: 1.0.0&#x0A;&#x0A;(c) Copyright Eclipse contributors and others 2000, 2013.  All rights reserved.&#x0A;Visit http://www.eclipse.org/platform&#x0A;&#x0A;This product includes software developed by the&#x0A;Apache Software Foundation http://www.apache.org/">
+    </property>
+      </product>
+   </extension>
+</plugin>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/plugin_customization.ini b/releng/rcp/org.eclipse.papyrus.rcp/plugin_customization.ini
new file mode 100644
index 00000000000..731b27ba878
--- /dev/null
+++ b/releng/rcp/org.eclipse.papyrus.rcp/plugin_customization.ini
@@ -0,0 +1,20 @@
+# customization.ini 
+# sets default values for plug-in-specific preferences
+# keys are qualified by plug-in id
+# e.g., com.example.acmeplugin/myproperty=myvalue
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# "%key" are externalized strings defined in plugin_customization.properties
+# This file does not need to be translated.
+
+# Property "org.eclipse.ui/defaultPerspectiveId" controls the 
+# perspective that the workbench opens initially
+org.eclipse.ui/defaultPerspectiveId=org.eclipse.papyrus.infra.core.perspective
+
+# new-style tabs by default
+org.eclipse.ui/SHOW_TRADITIONAL_STYLE_TABS=false
+
+# put the perspective switcher on the top right
+org.eclipse.ui/DOCK_PERSPECTIVE_BAR=topRight
+
+# show progress on startup
+org.eclipse.ui/SHOW_PROGRESS_ON_STARTUP=true
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/pom.xml b/releng/rcp/org.eclipse.papyrus.rcp/pom.xml
new file mode 100644
index 00000000000..de5a5b12f8a
--- /dev/null
+++ b/releng/rcp/org.eclipse.papyrus.rcp/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>org.eclipse.papyrus.rcp.master</artifactId>
+    <groupId>org.eclipse.papyrus</groupId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../org.eclipse.papyrus.rcp.master</relativePath>
+  </parent>
+  <artifactId>org.eclipse.papyrus.rcp</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/splash.bmp b/releng/rcp/org.eclipse.papyrus.rcp/splash.bmp
new file mode 100644
index 00000000000..3a333acce30
--- /dev/null
+++ b/releng/rcp/org.eclipse.papyrus.rcp/splash.bmp
diff --git a/sandbox/ExternalResourceStereotypeApplication/org.eclipse.papyrus.uml.profile.externalresource.tests/src/org/eclipse/papyrus/uml/profile/externalresource/tests/AbstractChangeStrategyTests.java b/sandbox/ExternalResourceStereotypeApplication/org.eclipse.papyrus.uml.profile.externalresource.tests/src/org/eclipse/papyrus/uml/profile/externalresource/tests/AbstractChangeStrategyTests.java
index ca7d221a346..c3ec7b69438 100644
--- a/sandbox/ExternalResourceStereotypeApplication/org.eclipse.papyrus.uml.profile.externalresource.tests/src/org/eclipse/papyrus/uml/profile/externalresource/tests/AbstractChangeStrategyTests.java
+++ b/sandbox/ExternalResourceStereotypeApplication/org.eclipse.papyrus.uml.profile.externalresource.tests/src/org/eclipse/papyrus/uml/profile/externalresource/tests/AbstractChangeStrategyTests.java
@@ -15,11 +15,16 @@ package org.eclipse.papyrus.uml.profile.externalresource.tests;
 import static org.junit.Assert.fail;
 
 import java.io.IOException;
+import java.util.List;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.commands.operations.OperationHistoryFactory;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
@@ -40,12 +45,11 @@ import org.eclipse.uml2.uml.UMLPackage;
 import org.junit.Assert;
 import org.junit.Test;
 
-
 /**
  * Abstract class for all change strategy tests
  */
 public abstract class AbstractChangeStrategyTests extends AbstractExternalResourcesTest {
-	
+
 	@Test
 	public void testSaveAs() {
 		UmlModel umlModel = null;
@@ -57,7 +61,6 @@ public abstract class AbstractChangeStrategyTests extends AbstractExternalResour
 		}
 		Model rootModel = (Model)umlModel.getResource().getContents().get(0);
 		Assert.assertNotNull("Root model impossible to find", rootModel);
-		
 		URI resultURI = getResultURI();
 		try {
 			getModelSet(getURI()).saveAs(resultURI);
@@ -88,7 +91,6 @@ public abstract class AbstractChangeStrategyTests extends AbstractExternalResour
 	@Test
 	public void changeToOneFileOnlyStrategy() {
 		changeToStrategy(StrategyRegistry.getInstance().getStrategy(OneResourceOnlyStrategy.ID));
-		
 		// additionnal checks : strategy, location of the stereotype application, etc.
 		ModelSet resultModelSet = getModelSet(getResultURI());
 		UmlModel resultUmlModel = null;
@@ -100,22 +102,20 @@ public abstract class AbstractChangeStrategyTests extends AbstractExternalResour
 		}
 		Resource resultResource = resultUmlModel.getResource();
 		Model resultRootModel = (Model)resultResource.getContents().get(0);
-		
 		// test some stereotype applications
 		// Model::class1 should have <<classStereotype>> Applied (verify root level stererotype)
 		Class class1_ = (Class)resultRootModel.getPackagedElement(MODEL_CLASS1, true, UMLPackage.eINSTANCE.getClass_(), false);
 		EObject application = class1_.getStereotypeApplication(class1_.getAppliedStereotype(CLASS_STEREOTYPE_QN));
-		Assert.assertNotNull("No stereotype applied on "+ MODEL_CLASS1, application);
+		Assert.assertNotNull("No stereotype applied on " + MODEL_CLASS1, application);
 		Assert.assertNotNull(application.eResource());
 		URI stereotypeApplicationURI = application.eResource().getURI();
 		Assert.assertEquals("Stereotype is not in expected resource", getResultURI().trimFileExtension().appendFileExtension(OneResourceOnlyStrategy.PROFILE_DEFAULT_EXTENSION), stereotypeApplicationURI);
 		// check undo, check redo...
 	}
-	
+
 	@Test
 	public void changeToOneFilePerProfileStrategy() {
 		changeToStrategy(StrategyRegistry.getInstance().getStrategy(ResourcePerProfileStrategy.ID));
-		
 		// additionnal checks : strategy, location of the stereotype application, etc.
 		ModelSet resultModelSet = getModelSet(getResultURI());
 		UmlModel resultUmlModel = null;
@@ -127,21 +127,19 @@ public abstract class AbstractChangeStrategyTests extends AbstractExternalResour
 		}
 		Resource resultResource = resultUmlModel.getResource();
 		Model resultRootModel = (Model)resultResource.getContents().get(0);
-		
 		// test some stereotype applications
 		// Model::class1 should have <<classStereotype>> Applied (verify root level stererotype)
 		Class class1_ = (Class)resultRootModel.getPackagedElement(MODEL_CLASS1, true, UMLPackage.eINSTANCE.getClass_(), false);
 		EObject application = class1_.getStereotypeApplication(class1_.getAppliedStereotype(CLASS_STEREOTYPE_QN));
-		Assert.assertNotNull("No stereotype applied on "+ MODEL_CLASS1, application);
+		Assert.assertNotNull("No stereotype applied on " + MODEL_CLASS1, application);
 		Assert.assertNotNull(application.eResource());
 		URI stereotypeApplicationURI = application.eResource().getURI();
-		Assert.assertEquals("Stereotype is not in expected resource", getResultURI().trimFileExtension().appendFileExtension(EXTERNAL_RESOURCES_TEST_PROFILE+"Profile"), stereotypeApplicationURI);
+		Assert.assertEquals("Stereotype is not in expected resource", getResultURI().trimFileExtension().appendFileExtension(EXTERNAL_RESOURCES_TEST_PROFILE + "Profile"), stereotypeApplicationURI);
 	}
-	
+
 	@Test
 	public void changeToStandardStrategy() {
 		changeToStrategy(StrategyRegistry.getInstance().getStrategy(StandardApplicationLocationStrategy.ID));
-		
 		// additionnal checks : strategy, location of the stereotype application, etc.
 		ModelSet resultModelSet = getModelSet(getResultURI());
 		UmlModel resultUmlModel = null;
@@ -153,18 +151,17 @@ public abstract class AbstractChangeStrategyTests extends AbstractExternalResour
 		}
 		Resource resultResource = resultUmlModel.getResource();
 		Model resultRootModel = (Model)resultResource.getContents().get(0);
-		
 		// test some stereotype applications
 		// Model::class1 should have <<classStereotype>> Applied (verify root level stererotype)
 		Class class1_ = (Class)resultRootModel.getPackagedElement(MODEL_CLASS1, true, UMLPackage.eINSTANCE.getClass_(), false);
 		EObject application = class1_.getStereotypeApplication(class1_.getAppliedStereotype(CLASS_STEREOTYPE_QN));
-		Assert.assertNotNull("No stereotype applied on "+ MODEL_CLASS1, application);
+		Assert.assertNotNull("No stereotype applied on " + MODEL_CLASS1, application);
 		Assert.assertNotNull(application.eResource());
 		URI stereotypeApplicationURI = application.eResource().getURI();
 		Assert.assertEquals("Stereotype is not in expected resource", resultUmlModel.getResourceURI(), stereotypeApplicationURI);
 		// check undo, check redo...
 	}
-	
+
 	protected void changeToStrategy(IStereotypeApplicationLocationStrategy newStrategy) {
 		UmlModel umlModel = null;
 		// get The model. try to see applied stereotypes
@@ -175,8 +172,8 @@ public abstract class AbstractChangeStrategyTests extends AbstractExternalResour
 		}
 		Model rootModel = (Model)umlModel.getResource().getContents().get(0);
 		Assert.assertNotNull("Root model impossible to find", rootModel);
-		
-		ICommand command = ExternalResourceProfileUtils.createUpdateStereotypeApplicationsLocationCommand(rootModel, PapyrusStereotypeApplicationHelper.getCurrentLocationStrategy(rootModel), newStrategy);
+		IStereotypeApplicationLocationStrategy oldStrategy = PapyrusStereotypeApplicationHelper.getCurrentLocationStrategy(rootModel);
+		ICommand command = ExternalResourceProfileUtils.createUpdateStereotypeApplicationsLocationCommand(rootModel, oldStrategy, newStrategy);
 		Assert.assertNotNull("Impossible to create update command", command);
 		Assert.assertTrue("Command should be executable", command.canExecute());
 		IStatus status = null;
@@ -185,27 +182,36 @@ public abstract class AbstractChangeStrategyTests extends AbstractExternalResour
 		} catch (ExecutionException e1) {
 			fail(e1.getMessage());
 		}
-		
 		if(!status.isOK()) {
 			fail(status.getMessage());
 		}
+//		URI resultURI = getResultURI();
+//		try {
+//			getModelSet(getURI()).saveAs(resultURI);
+//		} catch (IOException e) {
+//			fail(e.getMessage());
+//		}
 		
-		URI resultURI = getResultURI();
 		try {
-			getModelSet(getURI()).saveAs(resultURI);
-		} catch (IOException e) {
-			fail(e.getMessage());
+			getModelSet(getURI()).save(new NullProgressMonitor());
+		} catch (IOException e1) {
+			fail(e1.getMessage());
 		}
 		checkModel(rootModel);
+		
 		// check current model still have right stereotypes/values
 		tearDownRegistry();
-		// try to load and read profiles in the result file
-		ModelSet resultModelSet = getModelSet(resultURI);
-		Assert.assertNotNull("TMP Model set should not be null", resultModelSet);
+		
+		// check result files
+		checkFiles(getResultURI(), newStrategy);
+		
+		// try to load and read models
+		ModelSet modelSet = getModelSet(getURI());
+		Assert.assertNotNull("TMP Model set should not be null", modelSet);
 		UmlModel resultUmlModel = null;
 		// get The result model. try to see applied stereotypes
 		try {
-			resultUmlModel = (UmlModel)resultModelSet.getModelChecked(UmlModel.MODEL_ID);
+			resultUmlModel = (UmlModel)modelSet.getModelChecked(UmlModel.MODEL_ID);
 		} catch (NotFoundException e) {
 			fail(e.getMessage());
 		}
@@ -216,12 +222,30 @@ public abstract class AbstractChangeStrategyTests extends AbstractExternalResour
 		Assert.assertNotNull(resultRootModel);
 		checkModel(resultRootModel);
 	}
-	
+
+	/**
+	 * @param resultURI
+	 * @param newStrategy
+	 */
+	public void checkFiles(URI resultURI, IStereotypeApplicationLocationStrategy newStrategy) {
+		List<String> resultFileNames = STRATEGY_FILE_NAMES_MAPPING.get(newStrategy.getIdentifier());
+		for(String fileName : resultFileNames) {
+			URI fileURI = getResultFolderURI().appendSegment(fileName);
+			IPath path = new Path(fileURI.toPlatformString(true));
+			IFile file  = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
+			if(file == null || !file.exists()) {
+				fail(fileName + " does not exists. URI: " + fileURI);
+			}
+		}
+	}
+
 	public URI getResultFolderURI() {
-		return URI.createPlatformResourceURI(getTestProjectName()+"/result", true);
+		// return URI.createPlatformResourceURI(getTestProjectName() + "/result", true);
+		return URI.createPlatformResourceURI(getTestProjectName(), true);
 	}
-	
+
 	public URI getResultURI() {
-		return getResultFolderURI().appendSegment("result.di");
+		// getResultFolderURI().appendSegment("result.di");
+		return getURI();
 	}
 }
diff --git a/sandbox/ExternalResourceStereotypeApplication/org.eclipse.papyrus.uml.profile.externalresource.tests/src/org/eclipse/papyrus/uml/profile/externalresource/tests/AbstractExternalResourcesTest.java b/sandbox/ExternalResourceStereotypeApplication/org.eclipse.papyrus.uml.profile.externalresource.tests/src/org/eclipse/papyrus/uml/profile/externalresource/tests/AbstractExternalResourcesTest.java
index 5214313bb6b..26ecb1bf78a 100644
--- a/sandbox/ExternalResourceStereotypeApplication/org.eclipse.papyrus.uml.profile.externalresource.tests/src/org/eclipse/papyrus/uml/profile/externalresource/tests/AbstractExternalResourcesTest.java
+++ b/sandbox/ExternalResourceStereotypeApplication/org.eclipse.papyrus.uml.profile.externalresource.tests/src/org/eclipse/papyrus/uml/profile/externalresource/tests/AbstractExternalResourcesTest.java
@@ -15,9 +15,12 @@ package org.eclipse.papyrus.uml.profile.externalresource.tests;
 import static org.junit.Assert.fail;
 
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.commands.operations.OperationHistoryFactory;
@@ -25,17 +28,14 @@ import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.emf.transaction.util.TransactionUtil;
 import org.eclipse.emf.workspace.EMFCommandOperation;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;
 import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
 import org.eclipse.papyrus.infra.core.resource.ModelSet;
@@ -49,15 +49,13 @@ import org.eclipse.papyrus.infra.core.services.ServiceNotFoundException;
 import org.eclipse.papyrus.infra.core.services.ServiceStartKind;
 import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
 import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
 import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResourceInitializerService;
 import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel;
 import org.eclipse.papyrus.junit.utils.PapyrusProjectUtils;
 import org.eclipse.papyrus.junit.utils.ProjectUtils;
-import org.eclipse.papyrus.uml.profile.externalresource.helper.ExternalResourceProfileUtils;
 import org.eclipse.papyrus.uml.profile.externalresource.helper.OneResourceOnlyStrategy;
-import org.eclipse.papyrus.uml.profile.externalresource.helper.PapyrusStereotypeApplicationHelper;
-import org.eclipse.papyrus.uml.profile.externalresource.helper.StrategyRegistry;
+import org.eclipse.papyrus.uml.profile.externalresource.helper.ResourcePerProfileStrategy;
+import org.eclipse.papyrus.uml.profile.externalresource.helper.StandardApplicationLocationStrategy;
 import org.eclipse.papyrus.uml.tools.commands.ApplyStereotypeCommand;
 import org.eclipse.papyrus.uml.tools.model.UmlModel;
 import org.eclipse.ui.IEditorPart;
@@ -68,9 +66,9 @@ import org.eclipse.ui.PlatformUI;
 import org.eclipse.uml2.uml.Class;
 import org.eclipse.uml2.uml.Model;
 import org.eclipse.uml2.uml.NamedElement;
+import org.eclipse.uml2.uml.Package;
 import org.eclipse.uml2.uml.Stereotype;
 import org.eclipse.uml2.uml.UMLPackage;
-import org.eclipse.uml2.uml.Package;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -159,7 +157,27 @@ public abstract class AbstractExternalResourcesTest {
 	public static final String ONE_RESOURCE_FOR_ALL_PROFILES_FOLDER = "OneResourceForAllProfiles";
 
 	public static final String ONE_RESOURCE_PER_PROFILE_FOLDER = "OneResourcePerProfile";
-
+	
+	public static final List<String> STANDARD_STRATEGY_FILE_NAMES = Arrays.asList(DI_FILE, UML_FILE, NOTATION_FILE,  
+		/* Class3.di */ CLASS3_MODEL_DI_FILE,  CLASS3_MODEL_NOTATION_FILE,  CLASS3_MODEL_UML_FILE, 
+		/* Package1_Class1.di */PACKAGE1_MODEL_DI_FILE, PACKAGE1_MODEL_NOTATION_FILE, PACKAGE1_MODEL_UML_FILE); 
+	
+	public static final List<String> ONE_RESOURCE_PER_PROFILE_FILE_NAMES = Arrays.asList(DI_FILE, NOTATION_FILE, UML_FILE, EXTERNAL_RESOURCES_TEST_PROFILE_EXTENSION_FILE, 
+		/* PACKAGE1*/ PACKAGE1_MODEL_DI_FILE, PACKAGE1_MODEL_NOTATION_FILE, PACKAGE1_MODEL_UML_FILE, PACKAGE1_EXTERNAL_RESOURCES_TEST_PROFILE_EXTENSION_FILE,
+		/* CLASS3*/ CLASS3_MODEL_DI_FILE, CLASS3_MODEL_NOTATION_FILE, CLASS3_MODEL_UML_FILE, CLASS3_EXTERNAL_RESOURCES_TEST_PROFILE_EXTENSION_FILE
+	);
+	
+	public static final List<String> ONE_RESOURCE_FOR_ALL_PROFILES_FILE_NAMES = Arrays.asList(DI_FILE, NOTATION_FILE, UML_FILE, ALL_PROFILES_FILE, 
+		/* PACKAGE1*/ PACKAGE1_MODEL_DI_FILE, PACKAGE1_MODEL_NOTATION_FILE, PACKAGE1_MODEL_UML_FILE, PACKAGE1_ALL_PROFILES_FILE,
+		/* CLASS3*/ CLASS3_MODEL_DI_FILE, CLASS3_MODEL_NOTATION_FILE, CLASS3_MODEL_UML_FILE, CLASS3_ALL_PROFILES_FILE
+	);
+	
+	public static final Map<String, List<String>> STRATEGY_FILE_NAMES_MAPPING = new HashMap<String, List<String>>(); {
+		STRATEGY_FILE_NAMES_MAPPING.put(OneResourceOnlyStrategy.ID, ONE_RESOURCE_FOR_ALL_PROFILES_FILE_NAMES);
+		STRATEGY_FILE_NAMES_MAPPING.put(ResourcePerProfileStrategy.ID, ONE_RESOURCE_PER_PROFILE_FILE_NAMES);
+		STRATEGY_FILE_NAMES_MAPPING.put(StandardApplicationLocationStrategy.ID, STANDARD_STRATEGY_FILE_NAMES);
+	}
+	
 	@Before
 	public void initializeRegistry() {
 		ResourcesPlugin.getWorkspace().getDescription().setAutoBuilding(false);
diff --git a/sandbox/ExternalResourceStereotypeApplication/org.eclipse.papyrus.uml.profile.externalresource.tests/src/org/eclipse/papyrus/uml/profile/externalresource/tests/oneresourceforallprofiles/OneResourceForAllProfilesTests.java b/sandbox/ExternalResourceStereotypeApplication/org.eclipse.papyrus.uml.profile.externalresource.tests/src/org/eclipse/papyrus/uml/profile/externalresource/tests/oneresourceforallprofiles/OneResourceForAllProfilesTests.java
index a7475756c15..252d0d677c2 100644
--- a/sandbox/ExternalResourceStereotypeApplication/org.eclipse.papyrus.uml.profile.externalresource.tests/src/org/eclipse/papyrus/uml/profile/externalresource/tests/oneresourceforallprofiles/OneResourceForAllProfilesTests.java
+++ b/sandbox/ExternalResourceStereotypeApplication/org.eclipse.papyrus.uml.profile.externalresource.tests/src/org/eclipse/papyrus/uml/profile/externalresource/tests/oneresourceforallprofiles/OneResourceForAllProfilesTests.java
@@ -37,7 +37,7 @@ public class OneResourceForAllProfilesTests extends AbstractChangeStrategyTests
 	 */
 	@Override
 	protected List<String> getModelFileNames() {
-		return Arrays.asList(DI_FILE, NOTATION_FILE, UML_FILE, ALL_PROFILES_FILE);
+		return ONE_RESOURCE_FOR_ALL_PROFILES_FILE_NAMES;
 	}
 
 	/**
diff --git a/sandbox/ExternalResourceStereotypeApplication/org.eclipse.papyrus.uml.profile.externalresource.tests/src/org/eclipse/papyrus/uml/profile/externalresource/tests/resourceperprofile/ResourcePerProfileTests.java b/sandbox/ExternalResourceStereotypeApplication/org.eclipse.papyrus.uml.profile.externalresource.tests/src/org/eclipse/papyrus/uml/profile/externalresource/tests/resourceperprofile/ResourcePerProfileTests.java
index 6701c6a2f6a..4344a4e6acc 100644
--- a/sandbox/ExternalResourceStereotypeApplication/org.eclipse.papyrus.uml.profile.externalresource.tests/src/org/eclipse/papyrus/uml/profile/externalresource/tests/resourceperprofile/ResourcePerProfileTests.java
+++ b/sandbox/ExternalResourceStereotypeApplication/org.eclipse.papyrus.uml.profile.externalresource.tests/src/org/eclipse/papyrus/uml/profile/externalresource/tests/resourceperprofile/ResourcePerProfileTests.java
@@ -36,10 +36,7 @@ public class ResourcePerProfileTests extends AbstractChangeStrategyTests {
 	 */
 	@Override
 	protected List<String> getModelFileNames() {
-		return Arrays.asList(DI_FILE, NOTATION_FILE, UML_FILE, EXTERNAL_RESOURCES_TEST_PROFILE_EXTENSION_FILE, 
-				/* PACKAGE1*/ PACKAGE1_MODEL_DI_FILE, PACKAGE1_MODEL_NOTATION_FILE, PACKAGE1_MODEL_UML_FILE, PACKAGE1_EXTERNAL_RESOURCES_TEST_PROFILE_EXTENSION_FILE,
-				/* CLASS3*/ CLASS3_MODEL_DI_FILE, CLASS3_MODEL_NOTATION_FILE, CLASS3_MODEL_UML_FILE, CLASS3_EXTERNAL_RESOURCES_TEST_PROFILE_EXTENSION_FILE
-			);
+		return ONE_RESOURCE_PER_PROFILE_FILE_NAMES;
 	}
 
 	/**
diff --git a/sandbox/ExternalResourceStereotypeApplication/org.eclipse.papyrus.uml.profile.externalresource.tests/src/org/eclipse/papyrus/uml/profile/externalresource/tests/standardstrategy/StandardStrategyTests.java b/sandbox/ExternalResourceStereotypeApplication/org.eclipse.papyrus.uml.profile.externalresource.tests/src/org/eclipse/papyrus/uml/profile/externalresource/tests/standardstrategy/StandardStrategyTests.java
index 5773a75ce99..9c8f958077f 100644
--- a/sandbox/ExternalResourceStereotypeApplication/org.eclipse.papyrus.uml.profile.externalresource.tests/src/org/eclipse/papyrus/uml/profile/externalresource/tests/standardstrategy/StandardStrategyTests.java
+++ b/sandbox/ExternalResourceStereotypeApplication/org.eclipse.papyrus.uml.profile.externalresource.tests/src/org/eclipse/papyrus/uml/profile/externalresource/tests/standardstrategy/StandardStrategyTests.java
@@ -12,21 +12,17 @@
  *****************************************************************************/
 package org.eclipse.papyrus.uml.profile.externalresource.tests.standardstrategy;
 
-import java.util.Arrays;
 import java.util.List;
 
 import org.eclipse.emf.common.util.URI;
+import org.eclipse.papyrus.uml.profile.externalresource.helper.ExternalResourceProfileUtils;
 import org.eclipse.papyrus.uml.profile.externalresource.tests.AbstractChangeStrategyTests;
+import org.junit.Test;
 
 /**
  * Test class for load/unload
  */
 public class StandardStrategyTests extends AbstractChangeStrategyTests {
-
-	
-	public static final List<String> FILE_NAMES = Arrays.asList(DI_FILE, UML_FILE, NOTATION_FILE,  
-		/* Class3.di */ CLASS3_MODEL_DI_FILE,  CLASS3_MODEL_NOTATION_FILE,  CLASS3_MODEL_UML_FILE, 
-		/* Package1_Class1.di */PACKAGE1_MODEL_DI_FILE, PACKAGE1_MODEL_NOTATION_FILE, PACKAGE1_MODEL_UML_FILE); 
 	
 	/**
 	 * {@inheritDoc}
@@ -41,7 +37,7 @@ public class StandardStrategyTests extends AbstractChangeStrategyTests {
 	 */
 	@Override
 	protected List<String> getModelFileNames() {
-		return FILE_NAMES;
+		return STANDARD_STRATEGY_FILE_NAMES;
 	}
 
 	/**
@@ -60,4 +56,13 @@ public class StandardStrategyTests extends AbstractChangeStrategyTests {
 		return  URI.createPlatformResourceURI(getTestProjectName() + "/" + CLASS3_MODEL_UML_FILE, true);
 	}
 	
+	
+	@Test
+	public void testFindStereotypeApplicationsByDefinition() {
+		
+		
+		// ExternalResourceProfileUtils.findStereotypeApplicationsByDefinition(profileApplication, oldStrategy)
+		
+		
+	}
 }
diff --git a/sandbox/ExternalResourceStereotypeApplication/org.eclipse.papyrus.uml.profile.externalresource/src/org/eclipse/papyrus/uml/profile/externalresource/helper/ExternalResourceProfileUtils.java b/sandbox/ExternalResourceStereotypeApplication/org.eclipse.papyrus.uml.profile.externalresource/src/org/eclipse/papyrus/uml/profile/externalresource/helper/ExternalResourceProfileUtils.java
index b5408dab312..802a38de3eb 100644
--- a/sandbox/ExternalResourceStereotypeApplication/org.eclipse.papyrus.uml.profile.externalresource/src/org/eclipse/papyrus/uml/profile/externalresource/helper/ExternalResourceProfileUtils.java
+++ b/sandbox/ExternalResourceStereotypeApplication/org.eclipse.papyrus.uml.profile.externalresource/src/org/eclipse/papyrus/uml/profile/externalresource/helper/ExternalResourceProfileUtils.java
@@ -13,9 +13,11 @@
 package org.eclipse.papyrus.uml.profile.externalresource.helper;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
@@ -44,17 +46,48 @@ public class ExternalResourceProfileUtils {
 	public static IStatus updateStereotypeApplicationsLocation(ProfileApplication profileApplication, IStereotypeApplicationLocationStrategy oldStrategy, IStereotypeApplicationLocationStrategy newStrategy) {
 		// 1. retrieve all stereotype applications concerned by the given profile application
 		// 2. move the stereotype application in their new containment list
+		Map<EClass, List<EObject>> allStereotypeApplications  = findStereotypeApplicationsByDefinition(profileApplication, oldStrategy);
+		
+		// now have a map of all definitions of stereotypes contained in the profile applied, now they should be moved according to the new strategy
+		for(Entry<EClass, List<EObject>> entry : allStereotypeApplications.entrySet()) {
+			EClass definition = entry.getKey();
+			for(EObject stereotypeApplication : entry.getValue()) {
+				// move the EObject in the new containment list
+				Element baseElement = UMLUtil.getBaseElement(stereotypeApplication);
+				List<EObject> containmentList = newStrategy.getContainmentList(baseElement, definition); 
+				if(!containmentList.contains(stereotypeApplication)) { // move the stereotype application only if it was not already there (to avoid useless moves) 
+					containmentList.add(stereotypeApplication); // move stereotype at the right place
+				};
+			}
+		}
+		
+		// update Eannotation that stores the new strategy
+		PapyrusStereotypeApplicationHelper.setCurrentLocationStrategy(profileApplication, newStrategy);
+		
+		return Status.OK_STATUS;
+	}
+	
+	/**
+	 * @param profileApplication
+	 * @return
+	 */
+	public static Map<EClass, List<EObject>> findStereotypeApplicationsByDefinition(ProfileApplication profileApplication, IStereotypeApplicationLocationStrategy oldStrategy) throws RuntimeException{
+		Map<EClass, List<EObject>> allStereotypeApplications = new HashMap<EClass, List<EObject>>();
+		
 		Resource modelResource = profileApplication.eResource();
 		if(modelResource == null) {
-			return new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Impossible to find model resource");
+			Activator.log.error("Profile Application is not in a resource. "+profileApplication, null);
+			return Collections.emptyMap();
 		}
 		ModelSet modelSet = null;
 		if(!(modelResource.getResourceSet() instanceof ModelSet)) {
-			return new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Trying to modify the stereotype application outside a Papyrus Model Set");
+			Activator.log.error("Trying to modify the stereotype application outside a Papyrus Model Set", null);
+			return Collections.emptyMap();
+			
 		} else {
 			modelSet = (ModelSet)modelResource.getResourceSet();
 		}
-		Map<EClass, List<EObject>> allStereotypeApplications = new HashMap<EClass, List<EObject>>();
+		
 		// For all resources, retrieve the containment list that should hold the stereotype application for the given profile, for all UML elements at the root of the resource (should test for all elements, but would be really slow)
 		// for all elements in the containment list that corresponds to the profile application, store in a new list
 		List<EClassifier> classifiers = profileApplication.getAppliedDefinition().getEClassifiers();
@@ -82,25 +115,9 @@ public class ExternalResourceProfileUtils {
 				allStereotypeApplications.put(definition, stereotypeApplications);
 			}
 		}
-		
-		// now have a map of all definitions of stereotypes contained in the profile applied, now they should be moved according to the new strategy
-		for(EClass definition : allStereotypeApplications.keySet()) {
-			for(EObject stereotypeApplication : allStereotypeApplications.get(definition)) {
-				// move the EObject in the new containment list
-				Element baseElement = UMLUtil.getBaseElement(stereotypeApplication);
-				List<EObject> containmentList =newStrategy.getContainmentList(baseElement, definition); 
-				if(!containmentList.contains(stereotypeApplication)) { // move the stereotype application only if it was not already there (to avoid useless moves) 
-					containmentList.add(stereotypeApplication); // move stereotype at the right place
-				};
-			}
-		}
-		
-		// update Eannotation that stores the new strategy
-		PapyrusStereotypeApplicationHelper.setCurrentLocationStrategy(profileApplication, newStrategy);
-		
-		return Status.OK_STATUS;
+		return allStereotypeApplications;
 	}
-	
+
 	public static ICommand createUpdateStereotypeApplicationsLocationCommand( ProfileApplication profileApplication, IStereotypeApplicationLocationStrategy oldStrategy, IStereotypeApplicationLocationStrategy newStrategy) {
 		if(profileApplication ==null) {
 			return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;
diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/src/org/eclipse/papyrus/cdo/uml/search/ui/tests/AdvancedTextSearchTest.java b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/src/org/eclipse/papyrus/cdo/uml/search/ui/tests/AdvancedTextSearchTest.java
index ebd462c8341..373b31f7e25 100644
--- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/src/org/eclipse/papyrus/cdo/uml/search/ui/tests/AdvancedTextSearchTest.java
+++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/src/org/eclipse/papyrus/cdo/uml/search/ui/tests/AdvancedTextSearchTest.java
@@ -46,7 +46,7 @@ public class AdvancedTextSearchTest extends AbstractPapyrusCDOSearchTest {
 		ParticipantTypeElement e = new ParticipantTypeElement(UMLPackage.Literals.STATE);
 		ParticipantTypeAttribute a = new ParticipantTypeAttribute(UMLPackage.Literals.NAMED_ELEMENT__NAME, e);
 
-		QueryInfo info = new QueryInfo("close", false, false, Arrays.asList(e, a), Collections.singleton(getTestFolderURI()));
+		QueryInfo info = new QueryInfo("close", false, false, Arrays.asList(e, a), Collections.singleton(getTestFolderURI()), false);
 
 		AbstractPapyrusQuery query = provider.createAdvancedSearchQuery(info);
 		query.run(new NullProgressMonitor());
@@ -65,7 +65,7 @@ public class AdvancedTextSearchTest extends AbstractPapyrusCDOSearchTest {
 		ParticipantTypeElement e2 = new ParticipantTypeElement(UMLPackage.Literals.ACTION);
 		ParticipantTypeAttribute a2 = new ParticipantTypeAttribute(UMLPackage.Literals.NAMED_ELEMENT__NAME, e2);
 
-		QueryInfo info = new QueryInfo("close", false, false, Arrays.asList(e1, e2, a1, a2), Collections.singleton(getTestFolderURI()));
+		QueryInfo info = new QueryInfo("close", false, false, Arrays.asList(e1, e2, a1, a2), Collections.singleton(getTestFolderURI()), false);
 
 		AbstractPapyrusQuery query = provider.createAdvancedSearchQuery(info);
 		query.run(new NullProgressMonitor());
@@ -82,7 +82,7 @@ public class AdvancedTextSearchTest extends AbstractPapyrusCDOSearchTest {
 		ParticipantTypeElement e = new ParticipantTypeElement(UMLPackage.Literals.PROPERTY);
 		ParticipantTypeAttribute a = new ParticipantTypeAttribute(UMLPackage.Literals.NAMED_ELEMENT__VISIBILITY, e);
 
-		QueryInfo info = new QueryInfo("public", true, false, Arrays.asList(e, a), Collections.singleton(getTestFolderURI()));
+		QueryInfo info = new QueryInfo("public", true, false, Arrays.asList(e, a), Collections.singleton(getTestFolderURI()), false);
 
 		AbstractPapyrusQuery query = provider.createAdvancedSearchQuery(info);
 		query.run(new NullProgressMonitor());
@@ -97,7 +97,7 @@ public class AdvancedTextSearchTest extends AbstractPapyrusCDOSearchTest {
 
 		ParticipantTypeElement e = new ParticipantTypeElement(UMLPackage.Literals.NAMED_ELEMENT);
 
-		QueryInfo info = new QueryInfo("bug", false, false, Collections.singleton(e), Collections.singleton(getTestFolderURI()));
+		QueryInfo info = new QueryInfo("bug", false, false, Collections.singleton(e), Collections.singleton(getTestFolderURI()), false);
 
 		AbstractPapyrusQuery query = provider.createAdvancedSearchQuery(info);
 		query.run(new NullProgressMonitor());
diff --git a/tests/junit/extraplugins/org.eclipse.papyrus.tests.extra/Extra Tests With Coverage.launch b/tests/junit/extraplugins/org.eclipse.papyrus.tests.extra/Extra Tests With Coverage.launch
new file mode 100644
index 00000000000..f9606b14751
--- /dev/null
+++ b/tests/junit/extraplugins/org.eclipse.papyrus.tests.extra/Extra Tests With Coverage.launch
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>

+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">

+<booleanAttribute key="append.args" value="true"/>

+<booleanAttribute key="askclear" value="false"/>

+<booleanAttribute key="automaticAdd" value="true"/>

+<booleanAttribute key="automaticValidate" value="false"/>

+<stringAttribute key="bootstrap" value=""/>

+<stringAttribute key="checked" value="[NONE]"/>

+<booleanAttribute key="clearConfig" value="true"/>

+<booleanAttribute key="clearws" value="true"/>

+<booleanAttribute key="clearwslog" value="false"/>

+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>

+<booleanAttribute key="default" value="true"/>

+<booleanAttribute key="includeOptional" value="true"/>

+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace-extra-coverage"/>

+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

+<listEntry value="/org.eclipse.papyrus.tests.extra/src/org/eclipse/papyrus/tests/extra/AllTests.java"/>

+</listAttribute>

+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

+<listEntry value="1"/>

+</listAttribute>

+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>

+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>

+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>

+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>

+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>

+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.tests.extra.AllTests"/>

+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>

+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.tests.extra"/>

+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -Xms1024m -Xmx4096m -DsuppressRawWhenUnchecked=true -XX:MaxPermSize=712M"/>

+<stringAttribute key="pde.version" value="3.3"/>

+<stringAttribute key="product" value="org.eclipse.sdk.ide"/>

+<booleanAttribute key="run_in_ui_thread" value="true"/>

+<booleanAttribute key="show_selected_only" value="false"/>

+<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>

+<booleanAttribute key="tracing" value="false"/>

+<booleanAttribute key="useCustomFeatures" value="false"/>

+<booleanAttribute key="useDefaultConfig" value="true"/>

+<booleanAttribute key="useDefaultConfigArea" value="false"/>

+<booleanAttribute key="useProduct" value="true"/>

+</launchConfiguration>

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF
index 86ee1ce6848..d4730e0e040 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

  org.eclipse.papyrus.infra.core;bundle-version="1.0.0",

  org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.0.0",

- org.eclipse.papyrus.uml.table.common;bundle-version="1.0.0",

  org.eclipse.papyrus.uml.diagram.timing;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0",

  org.eclipse.papyrus.junit.utils;bundle-version="1.0.0",

@@ -17,9 +16,6 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.emf.transaction;bundle-version="1.4.0",

  org.eclipse.gmf.runtime.common.core;bundle-version="1.7.0",

  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",

- org.eclipse.papyrus.uml.table.default;bundle-version="1.0.0",

- org.eclipse.papyrus.infra.table.instance;bundle-version="1.0.0",

- org.eclipse.papyrus.infra.table.common;bundle-version="1.0.0",

  org.eclipse.papyrus.infra.widgets;bundle-version="1.0.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.7.0",

  org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.7.0",

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/PageManagerTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/PageManagerTests.java
index 7a490f44436..bbe4bf7e3b5 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/PageManagerTests.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/PageManagerTests.java
@@ -11,12 +11,9 @@
  *****************************************************************************/

 package org.eclipse.papyrus.editor.integration.tests.tests;

 

-import org.eclipse.core.commands.ExecutionException;

 import org.eclipse.core.resources.IFile;

 import org.eclipse.core.resources.IProject;

 import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

 import org.eclipse.core.runtime.NullProgressMonitor;

 import org.eclipse.emf.common.command.Command;

 import org.eclipse.emf.common.command.CompoundCommand;

@@ -25,10 +22,8 @@ import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.edit.domain.EditingDomain;

 import org.eclipse.emf.transaction.RecordingCommand;

 import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

 import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;

 import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.notation.Diagram;

 import org.eclipse.papyrus.commands.DestroyElementPapyrusCommand;

@@ -38,7 +33,6 @@ import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.editor.integration.tests.Activator;

 import org.eclipse.papyrus.infra.core.extension.commands.IModelCreationCommand;

 import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.core.resource.sasheditor.SashModelUtils;

 import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageManager;

 import org.eclipse.papyrus.infra.core.sasheditor.editor.IPage;

 import org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer;

@@ -49,14 +43,11 @@ import org.eclipse.papyrus.infra.core.utils.DiResourceSet;
 import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;

 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.infra.table.instance.papyrustableinstance.PapyrusTableInstance;

 import org.eclipse.papyrus.junit.utils.EditorUtils;

 import org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand;

 import org.eclipse.papyrus.uml.diagram.clazz.UmlClassDiagramForMultiEditor;

 import org.eclipse.papyrus.uml.diagram.common.commands.CreateUMLModelCommand;

 import org.eclipse.papyrus.uml.diagram.timing.custom.UmlTimingDiagramForMultiEditor;

-import org.eclipse.papyrus.uml.table.defaultt.editor.DefaultNattableEditor;

-import org.eclipse.papyrus.uml.table.defaultt.handlers.CreateNattableEditorCommand;

 import org.eclipse.papyrus.uml.tools.model.UmlModel;

 import org.eclipse.papyrus.uml.tools.model.UmlUtils;

 import org.eclipse.swt.widgets.Display;

@@ -333,38 +324,9 @@ public class PageManagerTests extends AbstractEditorIntegrationTest {
 

 		final EObject tableContext = UmlUtils.getUmlModel(modelSet).getResource().getContents().get(0);

 

-		//FIXME: The create table command is not exposed. We need to use and override the handler to manipulate it programmatically

-		//and avoid opening a user dialog and relying on the current selection

-		ICommand createAndOpenTableCommand = new AbstractTransactionalCommand(editingDomain, "Create table", null) {

-

-			@Override

-			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-				CreateNattableEditorCommand createTableHandler = new CreateNattableEditorCommand() {

-

-					@Override

-					protected EObject getTableContext() {

-						return tableContext;

-					}

-				};

-				try {

-					createTableHandler.doExecute(registry, "TableName", "TableDescription");

-				} catch (Exception ex) {

-					throw new ExecutionException(ex.getMessage(), ex);

-				}

-				return CommandResult.newOKCommandResult();

-			}

-		};

-

-		testPageCreation(createAndOpenTableCommand, DefaultNattableEditor.class);

+		

 	}

 

-	@Test

-	public void testTableDeletion() throws Exception {

-		initModel("tableDeletion", "simple_table_model", getBundle());

-		ModelSet modelSet = editor.getServicesRegistry().getService(ModelSet.class);

-		final PapyrusTableInstance table = (PapyrusTableInstance)SashModelUtils.getSashModel(modelSet).getResource().getContents().get(1);

-		testPageDeletion(table, DefaultNattableEditor.class);

-	}

 

 	private void testPageCreation(ICommand creationCommand, Class<?> expectedEditorClass) throws Exception {

 		IPageManager pageManager = editor.getServicesRegistry().getService(IPageManager.class);

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus ALL tests With Coverage.launch b/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus ALL tests With Coverage.launch
index 45526bef9b7..c7141af8016 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus ALL tests With Coverage.launch
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus ALL tests With Coverage.launch
@@ -8,238 +8,10 @@
 <booleanAttribute key="clearConfig" value="true"/>

 <booleanAttribute key="clearws" value="true"/>

 <booleanAttribute key="clearwslog" value="false"/>

-<listAttribute key="com.mountainminds.eclemma.core.SCOPE_IDS">

-<listEntry value="=org.eclipse.papyrus.infra.widgets/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/xtend-gen"/>

-<listEntry value="=org.eclipse.papyrus.uml.textedit.common.xtext.ui/src"/>

-<listEntry value="=org.eclipse.papyrus.sysml.edit/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.alf.ui/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.uml.properties.tabbedproperties.comments/src"/>

-<listEntry value="=org.eclipse.papyrus.views.properties/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.sysml.diagram.requirement/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.services.resourceloading/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.diagram.activity/custom-src"/>

-<listEntry value="=org.eclipse.papyrus.customization/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.views.properties.model.edit/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.uml.import/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.diagram.statemachine/custom-src"/>

-<listEntry value="=org.eclipse.papyrus.infra.export/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.services.decoration/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/xtend-gen"/>

-<listEntry value="=org.eclipse.papyrus.sysml.diagram.ui/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.textedit.transition.xtext/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.uml.textedit.common.xtext/xtend-gen"/>

-<listEntry value="=org.eclipse.papyrus.uml.diagram.modelexplorer/src"/>

-<listEntry value="=org.eclipse.papyrus.views.properties/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.uml.alf/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.eclipse.project.editors/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.textedit.parameter.xtext/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.infra.emf.newchild/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.core.log/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.gmfdiag.css.model/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.alf/src"/>

-<listEntry value="=org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.uml.textedit.property.xtext/src"/>

-<listEntry value="=org.eclipse.papyrus.sysml.diagram.common/src-common-sysml"/>

-<listEntry value="=org.eclipse.papyrus.uml.textedit.message.xtext/xtend-gen"/>

-<listEntry value="=org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.discovery.ui/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.diagram.clazz/custom-src"/>

-<listEntry value="=org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/src"/>

-<listEntry value="=org.eclipse.papyrus.sysml.modelexplorer/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.uml.diagram.emftree/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.diagram.usecase/custom-src"/>

-<listEntry value="=org.eclipse.papyrus.customization/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.textedit.property.xtext.ui/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.views.documentation.view/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.textedit.state.xtext/xtend-gen"/>

-<listEntry value="=org.eclipse.papyrus.uml.commands/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.services.edit/src"/>

-<listEntry value="=org.eclipse.papyrus.sysml.diagram.internalblock/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.uml.service.types/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.textedit.parameter.xtext/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.widgets.toolbox/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.gmfdiag.navigation/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.gmfdiag.css.xtext/src"/>

-<listEntry value="=org.eclipse.papyrus.migration.properties.model/src"/>

-<listEntry value="=org.eclipse.papyrus.views.properties.model/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.infra.gmfdiag.properties/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.diagram.profile/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.onefile/src"/>

-<listEntry value="=org.eclipse.papyrus.sysml.diagram.common/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.uml.textedit.state.xtext.ui/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.table.properties/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.service.types/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.uml.tools.extendedtypes/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.sysml.service.types/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.textedit.state.xtext.ui/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.uml.diagram.icons/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.standard/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.modelexplorer.widgets/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.constraints.editor/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.uml.diagram.profile/custom-src"/>

-<listEntry value="=org.eclipse.papyrus.uml.diagram.statemachine/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.diagram.wizards/src"/>

-<listEntry value="=org.eclipse.papyrus.sysml.diagram.common/src-common-gmf"/>

-<listEntry value="=org.eclipse.papyrus.customization.paletteconfiguration/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.modelexplorer/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.infra.gmfdiag.css.model/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.views.modelexplorer.widgets/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/xtend-gen"/>

-<listEntry value="=org.eclipse.papyrus.uml.modelexplorer/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.uml.table.default/src"/>

-<listEntry value="=org.eclipse.papyrus.sysml.service.types/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.sysml.table.requirement/src"/>

-<listEntry value="=org.eclipse.papyrus.documentation.plugin/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.views.modelexplorer.resourceloading/src"/>

-<listEntry value="=org.eclipse.papyrus.sysml.diagram.common/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.textedit.state.xtext/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.ui.resources/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.services.markerlistener/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.tools/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.pastemanager/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.properties/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.uml.textedit.common.xtext/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.diagram.package/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.controlmode.profile/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.core.sasheditor.di/custom-src"/>

-<listEntry value="=org.eclipse.papyrus.uml.documentation/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.textedit.common.xtext/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.constraints/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.uml.diagram.clazz/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.queries.core.configuration.edit/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.infra.gmfdiag.widgets/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.discovery/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.services.validation/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.perspective/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.gmfdiag.commands/src"/>

-<listEntry value="=org.eclipse.papyrus.sysml.diagram.blockdefinition/src"/>

-<listEntry value="=org.eclipse.papyrus.editor/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.diagram.paletteconfiguration/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.gmfdiag.preferences/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.profile/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.tools.extendedtypes/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.diagram.deployment/custom-src"/>

-<listEntry value="=org.eclipse.papyrus.uml.templaterepository/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.properties/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.textedit.transition.xtext.ui/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.xwt/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.textedit.transition.xtext.ui/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.emf/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.standard.edit/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.infra.emf.editor/src"/>

-<listEntry value="=org.eclipse.papyrus.views.documentation.view.papyrus/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.alf/xtend-gen"/>

-<listEntry value="=org.eclipse.papyrus.views.documentation/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.diagram.usecase/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.core.sasheditor/src"/>

-<listEntry value="=org.eclipse.papyrus.sysml.properties/src"/>

-<listEntry value="=org.eclipse.papyrus.views.properties.model.editor/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.uml.diagram.menu/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.gmfdiag.css.palette/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.extendedtypes/src"/>

-<listEntry value="=org.eclipse.papyrus.outline.emftree/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.emf.embeddededitor/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.uml.extensionpoints/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/src"/>

-<listEntry value="=org.eclipse.papyrus.sysml.edit/custom-src"/>

-<listEntry value="=org.eclipse.papyrus.uml.textedit.state.xtext/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.uml.diagram.navigation/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.gmfdiag.dnd/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.textedit.parameter.xtext/xtend-gen"/>

-<listEntry value="=org.eclipse.papyrus.sysml.diagram.internalblock/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.table.widgets.celleditors/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.extendedtypes.emf/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.views.modelexplorer/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.textedit.message.xtext.ui/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.table.instance/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.appearance/src"/>

-<listEntry value="=org.eclipse.papyrus.sysml.diagram.common/src-common-uml"/>

-<listEntry value="=org.eclipse.papyrus.infra.gmfdiag.css/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.hyperlink/src"/>

-<listEntry value="=org.eclipse.papyrus.documentation.plugin/src"/>

-<listEntry value="=org.eclipse.papyrus.editor.perspectiveconfiguration/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.textedit.transition.xtext/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.uml.textedit.message.xtext/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.customization.properties/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.services.controlmode.history/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.queries.core.configuration/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.uml.diagram.common/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.core.sasheditor.di/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.textedit.property.xtext/xtend-gen"/>

-<listEntry value="=org.eclipse.papyrus.uml.ui.perspectiveconfiguration/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.oclconstraintevaluation/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.tools/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.core/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.diagram.dnd/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.diagram.package/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.infra.constraints.edit/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.infra.constraints/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.extendedtypes.emf/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.diagram.activity/src"/>

-<listEntry value="=org.eclipse.papyrus.customization.properties.model.xwt/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.services.resourceloading.preferences/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.extendedtypes/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.sysml/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.services.controlmode/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.resourceloading.profile/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.textedit.property.xtext.ui/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.gmfdiag.css.configuration/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.table.menu/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.gmfdiag.css.properties/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.table.modelexplorer/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.emf.appearance/src"/>

-<listEntry value="=org.eclipse.papyrus.sysml.facets/src"/>

-<listEntry value="=org.eclipse.papyrus.team.svn/src"/>

-<listEntry value="=org.eclipse.papyrus.sysml.table.allocation/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.documentation.profile/src"/>

-<listEntry value="=org.eclipse.papyrus.sysml.modelexplorer/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.emf.diagram.common/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.emf.readonly/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.diagram.common.palette.customaction/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.discovery.ui.menu/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.icons/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.infra.gmfdiag.css/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.uml.alf.ui/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.tools.utils/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.uml.textedit.property.xtext/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.customization.properties.generation/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.diagram.common.groups/src"/>

-<listEntry value="=org.eclipse.papyrus.uml.textedit.message.xtext.ui/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.uml.textedit.common.xtext.ui/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.customization.palette/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.table.common/src"/>

-<listEntry value="=org.eclipse.papyrus.customization.properties.generation/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.uml.textedit.message.xtext/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.queries.core/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.emf.newchild/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.infra.gmfdiag.outline/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.gmfdiag.css.xtext/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.uml.diagram.deployment/src"/>

-<listEntry value="=org.eclipse.papyrus.infra.gmfdiag.css.xtext/xtend-gen"/>

-<listEntry value="=org.eclipse.papyrus.infra.gmfdiag.common/src"/>

-</listAttribute>

 <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Papyrus ALL tests With Coverage"/>

 <booleanAttribute key="default" value="true"/>

 <booleanAttribute key="includeOptional" value="true"/>

-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>

+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace-coverage"/>

 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

 <listEntry value="/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java"/>

 </listAttribute>

@@ -253,10 +25,11 @@
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>

 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>

 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>

+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.tests.AllTests"/>

 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.tests"/>

 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -Xms1024m -Xmx4096m -DsuppressRawWhenUnchecked=true -XX:MaxPermSize=1024M"/>

+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -Xms1024m -Xmx4096m -DsuppressRawWhenUnchecked=true -XX:MaxPermSize=712M"/>

 <stringAttribute key="pde.version" value="3.3"/>

 <stringAttribute key="product" value="org.eclipse.platform.ide"/>

 <booleanAttribute key="run_in_ui_thread" value="true"/>

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus SysML tests With Coverage.launch b/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus SysML tests With Coverage.launch
new file mode 100644
index 00000000000..65091f47a5b
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus SysML tests With Coverage.launch
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>

+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">

+<booleanAttribute key="askclear" value="false"/>

+<booleanAttribute key="automaticAdd" value="true"/>

+<booleanAttribute key="automaticValidate" value="false"/>

+<stringAttribute key="bootstrap" value=""/>

+<stringAttribute key="checked" value="[NONE]"/>

+<booleanAttribute key="clearConfig" value="true"/>

+<booleanAttribute key="clearws" value="true"/>

+<booleanAttribute key="clearwslog" value="false"/>

+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Papyrus SysML tests With Coverage"/>

+<booleanAttribute key="default" value="true"/>

+<booleanAttribute key="includeOptional" value="true"/>

+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace-sysml-coverage"/>

+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

+<listEntry value="/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllSysMLTests.java"/>

+</listAttribute>

+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

+<listEntry value="1"/>

+</listAttribute>

+<mapAttribute key="org.eclipse.debug.core.environmentVariables">

+<mapEntry key="skip.long.junit.tests" value="false"/>

+</mapAttribute>

+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>

+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>

+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>

+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>

+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.tests.AllSysMLTests"/>

+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.tests"/>

+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -Xms1024m -Xmx4096m -DsuppressRawWhenUnchecked=true -XX:MaxPermSize=712M"/>

+<stringAttribute key="pde.version" value="3.3"/>

+<stringAttribute key="product" value="org.eclipse.platform.ide"/>

+<booleanAttribute key="run_in_ui_thread" value="true"/>

+<booleanAttribute key="show_selected_only" value="false"/>

+<booleanAttribute key="tracing" value="true"/>

+<booleanAttribute key="useCustomFeatures" value="false"/>

+<booleanAttribute key="useDefaultConfig" value="true"/>

+<booleanAttribute key="useDefaultConfigArea" value="true"/>

+<booleanAttribute key="useProduct" value="true"/>

+</launchConfiguration>

diff --git a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/src/org/eclipse/papyrus/customization/properties/tests/qvt/TransformationsTests.java b/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/src/org/eclipse/papyrus/customization/properties/tests/qvt/TransformationsTests.java
index a99b76a75c7..d7b08984e1c 100644
--- a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/src/org/eclipse/papyrus/customization/properties/tests/qvt/TransformationsTests.java
+++ b/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/src/org/eclipse/papyrus/customization/properties/tests/qvt/TransformationsTests.java
@@ -121,7 +121,7 @@ public class TransformationsTests {
 					EPackage ecorePackage = (EPackage)loadEMFModel(packageURI);

 					ModelExtent inPackage = new BasicModelExtent(Collections.singletonList(ecorePackage));

 

-					PropertiesRoot root = ConfigurationManager.instance.getPropertiesRoot();

+					PropertiesRoot root = ConfigurationManager.getInstance().getPropertiesRoot();

 					ModelExtent inRoot = new BasicModelExtent(Collections.singletonList(root));

 

 					LinkedList<ModelExtent> result = new LinkedList<ModelExtent>();

@@ -172,7 +172,7 @@ public class TransformationsTests {
 					}

 					ModelExtent inUml = new BasicModelExtent(Collections.singletonList(umlContext));

 

-					PropertiesRoot root = ConfigurationManager.instance.getPropertiesRoot();

+					PropertiesRoot root = ConfigurationManager.getInstance().getPropertiesRoot();

 					ModelExtent inRoot = new BasicModelExtent(Collections.singletonList(root));

 

 					LinkedList<ModelExtent> result = new LinkedList<ModelExtent>();

diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/META-INF/MANIFEST.MF
index f8d5bca14ed..605842aacc4 100644
--- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement.tests/META-INF/MANIFEST.MF
@@ -16,10 +16,10 @@ Require-Bundle: org.eclipse.ui,
 Export-Package: org.eclipse.papyrus.sysml.diagram.requirement.test,

  org.eclipse.papyrus.sysml.diagram.requirement.test.canonical,

  org.eclipse.papyrus.sysml.diagram.requirement.test.load

-Bundle-Vendor: %providerName

+Bundle-Vendor: Eclipse Modeling Project

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.0.0.qualifier

-Bundle-Name: %pluginName

+Bundle-Name: SysML Requirements Diagram Tests (Incubation)

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.sysml.diagram.requirement.test.A

  ctivator

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/META-INF/MANIFEST.MF
index 06d7a854c84..3c51746b7d4 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/META-INF/MANIFEST.MF
@@ -25,4 +25,4 @@ Bundle-Activator: org.eclipse.papyrus.uml.diagram.deployment.test.Acti
  vator

 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.deployment.tests

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

-

+Bundle-Localization: plugin

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/build.properties b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/build.properties
index ebe02751cbb..a8e3182967e 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/build.properties
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment.tests/build.properties
@@ -4,3 +4,4 @@ bin.includes = META-INF/,\
                .,\

                plugin.properties,\

                about.html

+src.includes = about.html

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg.tests/META-INF/MANIFEST.MF
index d71b07d28cf..50333dfd5cf 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.pkg.tests/META-INF/MANIFEST.MF
@@ -18,9 +18,10 @@ Export-Package: org.eclipse.papyrus.uml.diagram.pkg.tests,
  org.eclipse.papyrus.uml.diagram.pkg.tests.load

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.0.0.qualifier

-Bundle-Name: Tests

+Bundle-Name: Package Diagram Tests (Incubation)

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.pkg.tests.Activator

 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.pkg.tests

 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

+Bundle-Vendor: Eclipse Modeling Project

 

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/.project b/tests/recipes/extraplugins/uml/compare/CompareTestCases/.project
new file mode 100644
index 00000000000..6b5b9c81f4f
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>CompareTestCases</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+	</buildSpec>

+	<natures>

+	</natures>

+</projectDescription>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/ADD/01_SourceLeft_ClassDiagram_Operation_Added.di b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/ADD/01_SourceLeft_ClassDiagram_Operation_Added.di
new file mode 100644
index 00000000000..13cab8dc9d6
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/ADD/01_SourceLeft_ClassDiagram_Operation_Added.di
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

+  <pageList>

+    <availablePage>

+      <emfPageIdentifier href="01_SourceLeft_ClassDiagram_Operation_Added.notation#_r-5hIMhqEeKmlJkz37Cc-A"/>

+    </availablePage>

+  </pageList>

+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

+    <windows>

+      <children xsi:type="di:TabFolder">

+        <children>

+          <emfPageIdentifier href="01_SourceLeft_ClassDiagram_Operation_Added.notation#_r-5hIMhqEeKmlJkz37Cc-A"/>

+        </children>

+      </children>

+    </windows>

+  </sashModel>

+</di:SashWindowsMngr>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/ADD/01_SourceLeft_ClassDiagram_Operation_Added.notation b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/ADD/01_SourceLeft_ClassDiagram_Operation_Added.notation
new file mode 100644
index 00000000000..9eca670e917
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/ADD/01_SourceLeft_ClassDiagram_Operation_Added.notation
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_r-5hIMhqEeKmlJkz37Cc-A" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

+  <children xmi:type="notation:Shape" xmi:id="_uGCMwMhqEeKmlJkz37Cc-A" type="2008">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zONAc8hqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAdMhqEeKmlJkz37Cc-A" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_uGCMwshqEeKmlJkz37Cc-A" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_uGCMw8hqEeKmlJkz37Cc-A" visible="false" type="7017">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uGCM0shqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uGCM08hqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAdchqEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_uGCMxMhqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_uGCMxchqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uGCMxshqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCMx8hqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_uGCMyMhqEeKmlJkz37Cc-A" type="7018">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uGCM1MhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uGCM1chqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rkcu4MhsEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <children xmi:type="notation:Shape" xmi:id="_sAZEAMhsEeKmlJkz37Cc-A" type="3013">

+        <element xmi:type="uml:Operation" href="01_SourceLeft_ClassDiagram_Operation_Added.uml#_sAGwIMhsEeKmlJkz37Cc-A"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_sAZEAchsEeKmlJkz37Cc-A"/>

+      </children>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_uGCMychqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_uGCMyshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uGCMy8hqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCMzMhqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_uGCMzchqEeKmlJkz37Cc-A" visible="false" type="7019">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uGCM1shqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uGCM18hqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_uGCMzshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_uGCMz8hqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uGCM0MhqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCM0chqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_sSx28HekEeOVytl18_65_w" visible="false" type="compartment_shape_display">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_sSx28XekEeOVytl18_65_w"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sSx28nekEeOVytl18_65_w"/>

+    </children>

+    <element xmi:type="uml:Class" href="01_SourceLeft_ClassDiagram_Operation_Added.uml#_uEswAMhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCMwchqEeKmlJkz37Cc-A" x="115" y="85" width="286" height="63"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_xZRfIMhqEeKmlJkz37Cc-A" type="2008">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zONAcMhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAcchqEeKmlJkz37Cc-A" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_xZRfIshqEeKmlJkz37Cc-A" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_xZRfI8hqEeKmlJkz37Cc-A" visible="false" type="7017">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xZRfMshqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZRfM8hqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAcshqEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_xZRfJMhqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_xZRfJchqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xZRfJshqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfJ8hqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_xZRfKMhqEeKmlJkz37Cc-A" type="7018">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xZRfNMhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZRfNchqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_w7TpYMhtEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <children xmi:type="notation:Shape" xmi:id="_21mVcHekEeOVytl18_65_w" type="3013" fontName="Segoe UI" lineColor="0">

+        <element xmi:type="uml:Operation" href="01_SourceLeft_ClassDiagram_Operation_Added.uml#_sAGwIMhsEeKmlJkz37Cc-A"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_21mVcXekEeOVytl18_65_w"/>

+      </children>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_xZRfKchqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_xZRfKshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xZRfK8hqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfLMhqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_xZRfLchqEeKmlJkz37Cc-A" visible="false" type="7019">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xZXlwMhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZXlwchqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_xZRfLshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_xZRfL8hqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xZRfMMhqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfMchqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_sSx283ekEeOVytl18_65_w" visible="false" type="compartment_shape_display">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_sSx29HekEeOVytl18_65_w"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sSx29XekEeOVytl18_65_w"/>

+    </children>

+    <element xmi:type="uml:Class" href="01_SourceLeft_ClassDiagram_Operation_Added.uml#_xZFR4MhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfIchqEeKmlJkz37Cc-A" x="115" y="215" width="286" height="63"/>

+  </children>

+  <styles xmi:type="notation:DiagramStyle" xmi:id="_r-5hIchqEeKmlJkz37Cc-A"/>

+  <element xmi:type="uml:Model" href="01_SourceLeft_ClassDiagram_Operation_Added.uml#_r-nNQMhqEeKmlJkz37Cc-A"/>

+</notation:Diagram>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/ADD/01_SourceLeft_ClassDiagram_Operation_Added.uml b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/ADD/01_SourceLeft_ClassDiagram_Operation_Added.uml
new file mode 100644
index 00000000000..488b72f0f95
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/ADD/01_SourceLeft_ClassDiagram_Operation_Added.uml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_r-nNQMhqEeKmlJkz37Cc-A" name="model">

+  <packagedElement xmi:type="uml:Class" xmi:id="_uEswAMhqEeKmlJkz37Cc-A" name="A">

+    <ownedOperation xmi:type="uml:Operation" xmi:id="_sAGwIMhsEeKmlJkz37Cc-A" name="op"/>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Class" xmi:id="_xZFR4MhqEeKmlJkz37Cc-A" name="B">

+    <generalization xmi:type="uml:Generalization" xmi:id="_7-CeYMhqEeKmlJkz37Cc-A" general="_uEswAMhqEeKmlJkz37Cc-A"/>

+  </packagedElement>

+</uml:Model>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/ADD/01_SourceLeft_ClassDiagram_Operation_Added_Indirect.di b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/ADD/01_SourceLeft_ClassDiagram_Operation_Added_Indirect.di
new file mode 100644
index 00000000000..fa7066f6859
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/ADD/01_SourceLeft_ClassDiagram_Operation_Added_Indirect.di
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

+  <pageList>

+    <availablePage>

+      <emfPageIdentifier href="01_SourceLeft_ClassDiagram_Operation_Added_Indirect.notation#_r-5hIMhqEeKmlJkz37Cc-A"/>

+    </availablePage>

+  </pageList>

+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

+    <windows>

+      <children xsi:type="di:TabFolder">

+        <children>

+          <emfPageIdentifier href="01_SourceLeft_ClassDiagram_Operation_Added_Indirect.notation#_r-5hIMhqEeKmlJkz37Cc-A"/>

+        </children>

+      </children>

+    </windows>

+  </sashModel>

+</di:SashWindowsMngr>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/ADD/01_SourceLeft_ClassDiagram_Operation_Added_Indirect.notation b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/ADD/01_SourceLeft_ClassDiagram_Operation_Added_Indirect.notation
new file mode 100644
index 00000000000..71e16e3c3f6
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/ADD/01_SourceLeft_ClassDiagram_Operation_Added_Indirect.notation
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_r-5hIMhqEeKmlJkz37Cc-A" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

+  <children xmi:type="notation:Shape" xmi:id="_uGCMwMhqEeKmlJkz37Cc-A" type="2008">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zONAc8hqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAdMhqEeKmlJkz37Cc-A" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_uGCMwshqEeKmlJkz37Cc-A" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_uGCMw8hqEeKmlJkz37Cc-A" visible="false" type="7017">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uGCM0shqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uGCM08hqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAdchqEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_uGCMxMhqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_uGCMxchqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uGCMxshqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCMx8hqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_uGCMyMhqEeKmlJkz37Cc-A" type="7018">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uGCM1MhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uGCM1chqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rkcu4MhsEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <children xmi:type="notation:Shape" xmi:id="_sAZEAMhsEeKmlJkz37Cc-A" type="3013">

+        <element xmi:type="uml:Operation" href="01_SourceLeft_ClassDiagram_Operation_Added_Indirect.uml#_sAGwIMhsEeKmlJkz37Cc-A"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_sAZEAchsEeKmlJkz37Cc-A"/>

+      </children>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_uGCMychqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_uGCMyshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uGCMy8hqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCMzMhqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_uGCMzchqEeKmlJkz37Cc-A" visible="false" type="7019">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uGCM1shqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uGCM18hqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_uGCMzshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_uGCMz8hqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uGCM0MhqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCM0chqEeKmlJkz37Cc-A"/>

+    </children>

+    <element xmi:type="uml:Class" href="01_SourceLeft_ClassDiagram_Operation_Added_Indirect.uml#_uEswAMhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCMwchqEeKmlJkz37Cc-A" x="115" y="85" width="286" height="63"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_xZRfIMhqEeKmlJkz37Cc-A" type="2008">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zONAcMhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAcchqEeKmlJkz37Cc-A" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_xZRfIshqEeKmlJkz37Cc-A" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_xZRfI8hqEeKmlJkz37Cc-A" visible="false" type="7017">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xZRfMshqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZRfM8hqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAcshqEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_xZRfJMhqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_xZRfJchqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xZRfJshqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfJ8hqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_xZRfKMhqEeKmlJkz37Cc-A" type="7018">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xZRfNMhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZRfNchqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_w7TpYMhtEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_xZRfKchqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_xZRfKshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xZRfK8hqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfLMhqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_xZRfLchqEeKmlJkz37Cc-A" visible="false" type="7019">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xZXlwMhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZXlwchqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_xZRfLshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_xZRfL8hqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xZRfMMhqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfMchqEeKmlJkz37Cc-A"/>

+    </children>

+    <element xmi:type="uml:Class" href="01_SourceLeft_ClassDiagram_Operation_Added_Indirect.uml#_xZFR4MhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfIchqEeKmlJkz37Cc-A" x="115" y="215" width="286" height="63"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_cCCWUMnfEeKsgtz7UQsIQA" type="2008">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_cz4C8MnfEeKsgtz7UQsIQA" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cz4C8cnfEeKsgtz7UQsIQA" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_cCCWUsnfEeKsgtz7UQsIQA" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_cCCWU8nfEeKsgtz7UQsIQA" visible="false" type="7017">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_cCCWYsnfEeKsgtz7UQsIQA" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cCCWY8nfEeKsgtz7UQsIQA" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_cCCWVMnfEeKsgtz7UQsIQA"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_cCCWVcnfEeKsgtz7UQsIQA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_cCCWVsnfEeKsgtz7UQsIQA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cCCWV8nfEeKsgtz7UQsIQA"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_cCCWWMnfEeKsgtz7UQsIQA" type="7018">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_cCCWZMnfEeKsgtz7UQsIQA" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cCCWZcnfEeKsgtz7UQsIQA" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cz4C8snfEeKsgtz7UQsIQA" key="visible" value="true"/>

+      </eAnnotations>

+      <children xmi:type="notation:Shape" xmi:id="_kKmY4MnfEeKsgtz7UQsIQA" type="3013">

+        <element xmi:type="uml:Operation" href="01_SourceLeft_ClassDiagram_Operation_Added_Indirect.uml#_sAGwIMhsEeKmlJkz37Cc-A"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_kKmY4cnfEeKsgtz7UQsIQA"/>

+      </children>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_cCCWWcnfEeKsgtz7UQsIQA"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_cCCWWsnfEeKsgtz7UQsIQA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_cCCWW8nfEeKsgtz7UQsIQA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cCCWXMnfEeKsgtz7UQsIQA"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_cCCWXcnfEeKsgtz7UQsIQA" visible="false" type="7019">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_cCMHUMnfEeKsgtz7UQsIQA" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cCMHUcnfEeKsgtz7UQsIQA" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_cCCWXsnfEeKsgtz7UQsIQA"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_cCCWX8nfEeKsgtz7UQsIQA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_cCCWYMnfEeKsgtz7UQsIQA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cCCWYcnfEeKsgtz7UQsIQA"/>

+    </children>

+    <element xmi:type="uml:Class" href="01_SourceLeft_ClassDiagram_Operation_Added_Indirect.uml#_cBSvcMnfEeKsgtz7UQsIQA"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cCCWUcnfEeKsgtz7UQsIQA" x="115" y="335" width="286" height="63"/>

+  </children>

+  <styles xmi:type="notation:DiagramStyle" xmi:id="_r-5hIchqEeKmlJkz37Cc-A"/>

+  <element xmi:type="uml:Model" href="01_SourceLeft_ClassDiagram_Operation_Added_Indirect.uml#_r-nNQMhqEeKmlJkz37Cc-A"/>

+</notation:Diagram>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/ADD/01_SourceLeft_ClassDiagram_Operation_Added_Indirect.uml b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/ADD/01_SourceLeft_ClassDiagram_Operation_Added_Indirect.uml
new file mode 100644
index 00000000000..fe92db8d6d9
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/ADD/01_SourceLeft_ClassDiagram_Operation_Added_Indirect.uml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_r-nNQMhqEeKmlJkz37Cc-A" name="model">

+  <packagedElement xmi:type="uml:Class" xmi:id="_uEswAMhqEeKmlJkz37Cc-A" name="A">

+    <ownedOperation xmi:type="uml:Operation" xmi:id="_sAGwIMhsEeKmlJkz37Cc-A" name="op"/>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Class" xmi:id="_xZFR4MhqEeKmlJkz37Cc-A" name="B">

+    <generalization xmi:type="uml:Generalization" xmi:id="_7-CeYMhqEeKmlJkz37Cc-A" general="_uEswAMhqEeKmlJkz37Cc-A"/>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Class" xmi:id="_cBSvcMnfEeKsgtz7UQsIQA" name="C">

+    <generalization xmi:type="uml:Generalization" xmi:id="_gfsNYMnfEeKsgtz7UQsIQA" general="_xZFR4MhqEeKmlJkz37Cc-A"/>

+  </packagedElement>

+</uml:Model>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/ADD/02_SourceLeft_ClassDiagram_Operation_Added.di b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/ADD/02_SourceLeft_ClassDiagram_Operation_Added.di
new file mode 100644
index 00000000000..3c37426f1e6
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/ADD/02_SourceLeft_ClassDiagram_Operation_Added.di
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

+  <pageList>

+    <availablePage>

+      <emfPageIdentifier href="02_SourceLeft_ClassDiagram_Operation_Added.notation#_r-5hIMhqEeKmlJkz37Cc-A"/>

+    </availablePage>

+  </pageList>

+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

+    <windows>

+      <children xsi:type="di:TabFolder">

+        <children>

+          <emfPageIdentifier href="02_SourceLeft_ClassDiagram_Operation_Added.notation#_r-5hIMhqEeKmlJkz37Cc-A"/>

+        </children>

+      </children>

+    </windows>

+  </sashModel>

+</di:SashWindowsMngr>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/ADD/02_SourceLeft_ClassDiagram_Operation_Added.notation b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/ADD/02_SourceLeft_ClassDiagram_Operation_Added.notation
new file mode 100644
index 00000000000..e8b344df7c3
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/ADD/02_SourceLeft_ClassDiagram_Operation_Added.notation
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_r-5hIMhqEeKmlJkz37Cc-A" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

+  <children xmi:type="notation:Shape" xmi:id="_uGCMwMhqEeKmlJkz37Cc-A" type="2008">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zONAc8hqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAdMhqEeKmlJkz37Cc-A" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_uGCMwshqEeKmlJkz37Cc-A" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_uGCMw8hqEeKmlJkz37Cc-A" visible="false" type="7017">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uGCM0shqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uGCM08hqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAdchqEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_uGCMxMhqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_uGCMxchqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uGCMxshqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCMx8hqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_uGCMyMhqEeKmlJkz37Cc-A" type="7018">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uGCM1MhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uGCM1chqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rkcu4MhsEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <children xmi:type="notation:Shape" xmi:id="_sAZEAMhsEeKmlJkz37Cc-A" type="3013">

+        <element xmi:type="uml:Operation" href="02_SourceLeft_ClassDiagram_Operation_Added.uml#_sAGwIMhsEeKmlJkz37Cc-A"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_sAZEAchsEeKmlJkz37Cc-A"/>

+      </children>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_uGCMychqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_uGCMyshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uGCMy8hqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCMzMhqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_uGCMzchqEeKmlJkz37Cc-A" visible="false" type="7019">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uGCM1shqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uGCM18hqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_uGCMzshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_uGCMz8hqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uGCM0MhqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCM0chqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_sSx28HekEeOVytl18_65_w" visible="false" type="compartment_shape_display">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_sSx28XekEeOVytl18_65_w"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sSx28nekEeOVytl18_65_w"/>

+    </children>

+    <element xmi:type="uml:Class" href="02_SourceLeft_ClassDiagram_Operation_Added.uml#_uEswAMhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCMwchqEeKmlJkz37Cc-A" x="115" y="85" width="286" height="63"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_xZRfIMhqEeKmlJkz37Cc-A" type="2008">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zONAcMhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAcchqEeKmlJkz37Cc-A" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_xZRfIshqEeKmlJkz37Cc-A" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_xZRfI8hqEeKmlJkz37Cc-A" visible="false" type="7017">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xZRfMshqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZRfM8hqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAcshqEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_xZRfJMhqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_xZRfJchqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xZRfJshqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfJ8hqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_xZRfKMhqEeKmlJkz37Cc-A" type="7018">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xZRfNMhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZRfNchqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_w7TpYMhtEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_xZRfKchqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_xZRfKshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xZRfK8hqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfLMhqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_xZRfLchqEeKmlJkz37Cc-A" visible="false" type="7019">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xZXlwMhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZXlwchqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_xZRfLshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_xZRfL8hqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xZRfMMhqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfMchqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_sSx283ekEeOVytl18_65_w" visible="false" type="compartment_shape_display">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_sSx29HekEeOVytl18_65_w"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sSx29XekEeOVytl18_65_w"/>

+    </children>

+    <element xmi:type="uml:Class" href="02_SourceLeft_ClassDiagram_Operation_Added.uml#_xZFR4MhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfIchqEeKmlJkz37Cc-A" x="115" y="215" width="286" height="63"/>

+  </children>

+  <styles xmi:type="notation:DiagramStyle" xmi:id="_r-5hIchqEeKmlJkz37Cc-A"/>

+  <element xmi:type="uml:Model" href="02_SourceLeft_ClassDiagram_Operation_Added.uml#_r-nNQMhqEeKmlJkz37Cc-A"/>

+</notation:Diagram>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/ADD/02_SourceLeft_ClassDiagram_Operation_Added.uml b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/ADD/02_SourceLeft_ClassDiagram_Operation_Added.uml
new file mode 100644
index 00000000000..bfd1a03b815
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/ADD/02_SourceLeft_ClassDiagram_Operation_Added.uml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_r-nNQMhqEeKmlJkz37Cc-A" name="model">

+  <packagedElement xmi:type="uml:Class" xmi:id="_uEswAMhqEeKmlJkz37Cc-A" name="A">

+    <ownedOperation xmi:type="uml:Operation" xmi:id="_sAGwIMhsEeKmlJkz37Cc-A" name="op"/>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Class" xmi:id="_xZFR4MhqEeKmlJkz37Cc-A" name="B"/>

+</uml:Model>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/ADD/02_SourceLeft_ClassDiagram_Operation_Added_Indirect.di b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/ADD/02_SourceLeft_ClassDiagram_Operation_Added_Indirect.di
new file mode 100644
index 00000000000..4bb4e875195
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/ADD/02_SourceLeft_ClassDiagram_Operation_Added_Indirect.di
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

+  <pageList>

+    <availablePage>

+      <emfPageIdentifier href="02_SourceLeft_ClassDiagram_Operation_Added_Indirect.notation#_r-5hIMhqEeKmlJkz37Cc-A"/>

+    </availablePage>

+  </pageList>

+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

+    <windows>

+      <children xsi:type="di:TabFolder">

+        <children>

+          <emfPageIdentifier href="02_SourceLeft_ClassDiagram_Operation_Added_Indirect.notation#_r-5hIMhqEeKmlJkz37Cc-A"/>

+        </children>

+      </children>

+    </windows>

+  </sashModel>

+</di:SashWindowsMngr>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/ADD/02_SourceLeft_ClassDiagram_Operation_Added_Indirect.notation b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/ADD/02_SourceLeft_ClassDiagram_Operation_Added_Indirect.notation
new file mode 100644
index 00000000000..8443911f4bb
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/ADD/02_SourceLeft_ClassDiagram_Operation_Added_Indirect.notation
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_r-5hIMhqEeKmlJkz37Cc-A" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

+  <children xmi:type="notation:Shape" xmi:id="_uGCMwMhqEeKmlJkz37Cc-A" type="2008">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zONAc8hqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAdMhqEeKmlJkz37Cc-A" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_uGCMwshqEeKmlJkz37Cc-A" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_uGCMw8hqEeKmlJkz37Cc-A" visible="false" type="7017">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uGCM0shqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uGCM08hqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAdchqEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_uGCMxMhqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_uGCMxchqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uGCMxshqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCMx8hqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_uGCMyMhqEeKmlJkz37Cc-A" type="7018">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uGCM1MhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uGCM1chqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rkcu4MhsEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <children xmi:type="notation:Shape" xmi:id="_sAZEAMhsEeKmlJkz37Cc-A" type="3013">

+        <element xmi:type="uml:Operation" href="02_SourceLeft_ClassDiagram_Operation_Added_Indirect.uml#_sAGwIMhsEeKmlJkz37Cc-A"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_sAZEAchsEeKmlJkz37Cc-A"/>

+      </children>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_uGCMychqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_uGCMyshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uGCMy8hqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCMzMhqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_uGCMzchqEeKmlJkz37Cc-A" visible="false" type="7019">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uGCM1shqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uGCM18hqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_uGCMzshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_uGCMz8hqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uGCM0MhqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCM0chqEeKmlJkz37Cc-A"/>

+    </children>

+    <element xmi:type="uml:Class" href="02_SourceLeft_ClassDiagram_Operation_Added_Indirect.uml#_uEswAMhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCMwchqEeKmlJkz37Cc-A" x="115" y="85" width="286" height="63"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_xZRfIMhqEeKmlJkz37Cc-A" type="2008">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zONAcMhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAcchqEeKmlJkz37Cc-A" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_xZRfIshqEeKmlJkz37Cc-A" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_xZRfI8hqEeKmlJkz37Cc-A" visible="false" type="7017">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xZRfMshqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZRfM8hqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAcshqEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_xZRfJMhqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_xZRfJchqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xZRfJshqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfJ8hqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_xZRfKMhqEeKmlJkz37Cc-A" type="7018">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xZRfNMhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZRfNchqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_w7TpYMhtEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_xZRfKchqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_xZRfKshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xZRfK8hqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfLMhqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_xZRfLchqEeKmlJkz37Cc-A" visible="false" type="7019">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xZXlwMhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZXlwchqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_xZRfLshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_xZRfL8hqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xZRfMMhqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfMchqEeKmlJkz37Cc-A"/>

+    </children>

+    <element xmi:type="uml:Class" href="02_SourceLeft_ClassDiagram_Operation_Added_Indirect.uml#_xZFR4MhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfIchqEeKmlJkz37Cc-A" x="115" y="215" width="286" height="63"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_cCCWUMnfEeKsgtz7UQsIQA" type="2008">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_cz4C8MnfEeKsgtz7UQsIQA" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cz4C8cnfEeKsgtz7UQsIQA" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_cCCWUsnfEeKsgtz7UQsIQA" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_cCCWU8nfEeKsgtz7UQsIQA" visible="false" type="7017">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_cCCWYsnfEeKsgtz7UQsIQA" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cCCWY8nfEeKsgtz7UQsIQA" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_cCCWVMnfEeKsgtz7UQsIQA"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_cCCWVcnfEeKsgtz7UQsIQA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_cCCWVsnfEeKsgtz7UQsIQA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cCCWV8nfEeKsgtz7UQsIQA"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_cCCWWMnfEeKsgtz7UQsIQA" type="7018">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_cCCWZMnfEeKsgtz7UQsIQA" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cCCWZcnfEeKsgtz7UQsIQA" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cz4C8snfEeKsgtz7UQsIQA" key="visible" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_cCCWWcnfEeKsgtz7UQsIQA"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_cCCWWsnfEeKsgtz7UQsIQA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_cCCWW8nfEeKsgtz7UQsIQA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cCCWXMnfEeKsgtz7UQsIQA"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_cCCWXcnfEeKsgtz7UQsIQA" visible="false" type="7019">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_cCMHUMnfEeKsgtz7UQsIQA" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cCMHUcnfEeKsgtz7UQsIQA" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_cCCWXsnfEeKsgtz7UQsIQA"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_cCCWX8nfEeKsgtz7UQsIQA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_cCCWYMnfEeKsgtz7UQsIQA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cCCWYcnfEeKsgtz7UQsIQA"/>

+    </children>

+    <element xmi:type="uml:Class" href="02_SourceLeft_ClassDiagram_Operation_Added_Indirect.uml#_cBSvcMnfEeKsgtz7UQsIQA"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cCCWUcnfEeKsgtz7UQsIQA" x="115" y="335" width="286" height="63"/>

+  </children>

+  <styles xmi:type="notation:DiagramStyle" xmi:id="_r-5hIchqEeKmlJkz37Cc-A"/>

+  <element xmi:type="uml:Model" href="02_SourceLeft_ClassDiagram_Operation_Added_Indirect.uml#_r-nNQMhqEeKmlJkz37Cc-A"/>

+</notation:Diagram>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/ADD/02_SourceLeft_ClassDiagram_Operation_Added_Indirect.uml b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/ADD/02_SourceLeft_ClassDiagram_Operation_Added_Indirect.uml
new file mode 100644
index 00000000000..67a973ed4ae
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/ADD/02_SourceLeft_ClassDiagram_Operation_Added_Indirect.uml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_r-nNQMhqEeKmlJkz37Cc-A" name="model">

+  <packagedElement xmi:type="uml:Class" xmi:id="_uEswAMhqEeKmlJkz37Cc-A" name="A">

+    <ownedOperation xmi:type="uml:Operation" xmi:id="_sAGwIMhsEeKmlJkz37Cc-A" name="op"/>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Class" xmi:id="_xZFR4MhqEeKmlJkz37Cc-A" name="B"/>

+  <packagedElement xmi:type="uml:Class" xmi:id="_cBSvcMnfEeKsgtz7UQsIQA" name="C">

+    <generalization xmi:type="uml:Generalization" xmi:id="_gfsNYMnfEeKsgtz7UQsIQA" general="_xZFR4MhqEeKmlJkz37Cc-A"/>

+  </packagedElement>

+</uml:Model>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/DELETE/01_SourceLeft_ClassDiagram_Operation_Deleted.di b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/DELETE/01_SourceLeft_ClassDiagram_Operation_Deleted.di
new file mode 100644
index 00000000000..5f1f305ce36
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/DELETE/01_SourceLeft_ClassDiagram_Operation_Deleted.di
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

+  <pageList>

+    <availablePage>

+      <emfPageIdentifier href="01_SourceLeft_ClassDiagram_Operation_Deleted.notation#_r-5hIMhqEeKmlJkz37Cc-A"/>

+    </availablePage>

+  </pageList>

+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

+    <windows>

+      <children xsi:type="di:TabFolder">

+        <children>

+          <emfPageIdentifier href="01_SourceLeft_ClassDiagram_Operation_Deleted.notation#_r-5hIMhqEeKmlJkz37Cc-A"/>

+        </children>

+      </children>

+    </windows>

+  </sashModel>

+</di:SashWindowsMngr>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/DELETE/01_SourceLeft_ClassDiagram_Operation_Deleted.notation b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/DELETE/01_SourceLeft_ClassDiagram_Operation_Deleted.notation
new file mode 100644
index 00000000000..a477be144a3
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/DELETE/01_SourceLeft_ClassDiagram_Operation_Deleted.notation
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_r-5hIMhqEeKmlJkz37Cc-A" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

+  <children xmi:type="notation:Shape" xmi:id="_uGCMwMhqEeKmlJkz37Cc-A" type="2008">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zONAc8hqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAdMhqEeKmlJkz37Cc-A" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_uGCMwshqEeKmlJkz37Cc-A" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_uGCMw8hqEeKmlJkz37Cc-A" visible="false" type="7017">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uGCM0shqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uGCM08hqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAdchqEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_uGCMxMhqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_uGCMxchqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uGCMxshqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCMx8hqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_uGCMyMhqEeKmlJkz37Cc-A" type="7018">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uGCM1MhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uGCM1chqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rkcu4MhsEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <children xmi:type="notation:Shape" xmi:id="_sAZEAMhsEeKmlJkz37Cc-A" type="3013">

+        <element xmi:type="uml:Operation" href="01_SourceLeft_ClassDiagram_Operation_Deleted.uml#_sAGwIMhsEeKmlJkz37Cc-A"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_sAZEAchsEeKmlJkz37Cc-A"/>

+      </children>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_uGCMychqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_uGCMyshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uGCMy8hqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCMzMhqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_uGCMzchqEeKmlJkz37Cc-A" visible="false" type="7019">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uGCM1shqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uGCM18hqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_uGCMzshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_uGCMz8hqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uGCM0MhqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCM0chqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_sSx28HekEeOVytl18_65_w" visible="false" type="compartment_shape_display">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_sSx28XekEeOVytl18_65_w"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sSx28nekEeOVytl18_65_w"/>

+    </children>

+    <element xmi:type="uml:Class" href="01_SourceLeft_ClassDiagram_Operation_Deleted.uml#_uEswAMhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCMwchqEeKmlJkz37Cc-A" x="115" y="85" width="286" height="63"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_xZRfIMhqEeKmlJkz37Cc-A" type="2008">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zONAcMhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAcchqEeKmlJkz37Cc-A" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_xZRfIshqEeKmlJkz37Cc-A" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_xZRfI8hqEeKmlJkz37Cc-A" visible="false" type="7017">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xZRfMshqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZRfM8hqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAcshqEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_xZRfJMhqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_xZRfJchqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xZRfJshqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfJ8hqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_xZRfKMhqEeKmlJkz37Cc-A" type="7018">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xZRfNMhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZRfNchqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_w7TpYMhtEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_xZRfKchqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_xZRfKshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xZRfK8hqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfLMhqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_xZRfLchqEeKmlJkz37Cc-A" visible="false" type="7019">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xZXlwMhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZXlwchqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_xZRfLshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_xZRfL8hqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xZRfMMhqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfMchqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_sSx283ekEeOVytl18_65_w" visible="false" type="compartment_shape_display">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_sSx29HekEeOVytl18_65_w"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sSx29XekEeOVytl18_65_w"/>

+    </children>

+    <element xmi:type="uml:Class" href="01_SourceLeft_ClassDiagram_Operation_Deleted.uml#_xZFR4MhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfIchqEeKmlJkz37Cc-A" x="115" y="215" width="286" height="63"/>

+  </children>

+  <styles xmi:type="notation:DiagramStyle" xmi:id="_r-5hIchqEeKmlJkz37Cc-A"/>

+  <element xmi:type="uml:Model" href="01_SourceLeft_ClassDiagram_Operation_Deleted.uml#_r-nNQMhqEeKmlJkz37Cc-A"/>

+</notation:Diagram>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/DELETE/01_SourceLeft_ClassDiagram_Operation_Deleted.uml b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/DELETE/01_SourceLeft_ClassDiagram_Operation_Deleted.uml
new file mode 100644
index 00000000000..bfd1a03b815
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/DELETE/01_SourceLeft_ClassDiagram_Operation_Deleted.uml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_r-nNQMhqEeKmlJkz37Cc-A" name="model">

+  <packagedElement xmi:type="uml:Class" xmi:id="_uEswAMhqEeKmlJkz37Cc-A" name="A">

+    <ownedOperation xmi:type="uml:Operation" xmi:id="_sAGwIMhsEeKmlJkz37Cc-A" name="op"/>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Class" xmi:id="_xZFR4MhqEeKmlJkz37Cc-A" name="B"/>

+</uml:Model>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/DELETE/01_SourceLeft_ClassDiagram_Operation_Deleted_Indirect.di b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/DELETE/01_SourceLeft_ClassDiagram_Operation_Deleted_Indirect.di
new file mode 100644
index 00000000000..aec7a39043a
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/DELETE/01_SourceLeft_ClassDiagram_Operation_Deleted_Indirect.di
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

+  <pageList>

+    <availablePage>

+      <emfPageIdentifier href="01_SourceLeft_ClassDiagram_Operation_Deleted_Indirect.notation#_r-5hIMhqEeKmlJkz37Cc-A"/>

+    </availablePage>

+  </pageList>

+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

+    <windows>

+      <children xsi:type="di:TabFolder">

+        <children>

+          <emfPageIdentifier href="01_SourceLeft_ClassDiagram_Operation_Deleted_Indirect.notation#_r-5hIMhqEeKmlJkz37Cc-A"/>

+        </children>

+      </children>

+    </windows>

+  </sashModel>

+</di:SashWindowsMngr>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/DELETE/01_SourceLeft_ClassDiagram_Operation_Deleted_Indirect.notation b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/DELETE/01_SourceLeft_ClassDiagram_Operation_Deleted_Indirect.notation
new file mode 100644
index 00000000000..8cf865f83d4
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/DELETE/01_SourceLeft_ClassDiagram_Operation_Deleted_Indirect.notation
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_r-5hIMhqEeKmlJkz37Cc-A" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

+  <children xmi:type="notation:Shape" xmi:id="_uGCMwMhqEeKmlJkz37Cc-A" type="2008">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zONAc8hqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAdMhqEeKmlJkz37Cc-A" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_uGCMwshqEeKmlJkz37Cc-A" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_uGCMw8hqEeKmlJkz37Cc-A" visible="false" type="7017">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uGCM0shqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uGCM08hqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAdchqEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_uGCMxMhqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_uGCMxchqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uGCMxshqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCMx8hqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_uGCMyMhqEeKmlJkz37Cc-A" type="7018">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uGCM1MhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uGCM1chqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rkcu4MhsEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <children xmi:type="notation:Shape" xmi:id="_sAZEAMhsEeKmlJkz37Cc-A" type="3013">

+        <element xmi:type="uml:Operation" href="01_SourceLeft_ClassDiagram_Operation_Deleted_Indirect.uml#_sAGwIMhsEeKmlJkz37Cc-A"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_sAZEAchsEeKmlJkz37Cc-A"/>

+      </children>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_uGCMychqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_uGCMyshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uGCMy8hqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCMzMhqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_uGCMzchqEeKmlJkz37Cc-A" visible="false" type="7019">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uGCM1shqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uGCM18hqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_uGCMzshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_uGCMz8hqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uGCM0MhqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCM0chqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_qpE3wHewEeOufdfpP6CyRA" visible="false" type="compartment_shape_display">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_qpE3wXewEeOufdfpP6CyRA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qpE3wnewEeOufdfpP6CyRA"/>

+    </children>

+    <element xmi:type="uml:Class" href="01_SourceLeft_ClassDiagram_Operation_Deleted_Indirect.uml#_uEswAMhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCMwchqEeKmlJkz37Cc-A" x="115" y="85" width="286" height="63"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_xZRfIMhqEeKmlJkz37Cc-A" type="2008">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zONAcMhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAcchqEeKmlJkz37Cc-A" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_xZRfIshqEeKmlJkz37Cc-A" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_xZRfI8hqEeKmlJkz37Cc-A" visible="false" type="7017">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xZRfMshqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZRfM8hqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAcshqEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_xZRfJMhqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_xZRfJchqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xZRfJshqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfJ8hqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_xZRfKMhqEeKmlJkz37Cc-A" type="7018">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xZRfNMhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZRfNchqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_w7TpYMhtEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_xZRfKchqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_xZRfKshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xZRfK8hqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfLMhqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_xZRfLchqEeKmlJkz37Cc-A" visible="false" type="7019">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xZXlwMhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZXlwchqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_xZRfLshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_xZRfL8hqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xZRfMMhqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfMchqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_qpE3w3ewEeOufdfpP6CyRA" visible="false" type="compartment_shape_display">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_qpE3xHewEeOufdfpP6CyRA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qpE3xXewEeOufdfpP6CyRA"/>

+    </children>

+    <element xmi:type="uml:Class" href="01_SourceLeft_ClassDiagram_Operation_Deleted_Indirect.uml#_xZFR4MhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfIchqEeKmlJkz37Cc-A" x="115" y="215" width="286" height="63"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_cCCWUMnfEeKsgtz7UQsIQA" type="2008">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_cz4C8MnfEeKsgtz7UQsIQA" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cz4C8cnfEeKsgtz7UQsIQA" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_cCCWUsnfEeKsgtz7UQsIQA" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_cCCWU8nfEeKsgtz7UQsIQA" visible="false" type="7017">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_cCCWYsnfEeKsgtz7UQsIQA" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cCCWY8nfEeKsgtz7UQsIQA" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_cCCWVMnfEeKsgtz7UQsIQA"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_cCCWVcnfEeKsgtz7UQsIQA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_cCCWVsnfEeKsgtz7UQsIQA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cCCWV8nfEeKsgtz7UQsIQA"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_cCCWWMnfEeKsgtz7UQsIQA" type="7018">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_cCCWZMnfEeKsgtz7UQsIQA" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cCCWZcnfEeKsgtz7UQsIQA" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cz4C8snfEeKsgtz7UQsIQA" key="visible" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_cCCWWcnfEeKsgtz7UQsIQA"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_cCCWWsnfEeKsgtz7UQsIQA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_cCCWW8nfEeKsgtz7UQsIQA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cCCWXMnfEeKsgtz7UQsIQA"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_cCCWXcnfEeKsgtz7UQsIQA" visible="false" type="7019">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_cCMHUMnfEeKsgtz7UQsIQA" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cCMHUcnfEeKsgtz7UQsIQA" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_cCCWXsnfEeKsgtz7UQsIQA"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_cCCWX8nfEeKsgtz7UQsIQA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_cCCWYMnfEeKsgtz7UQsIQA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cCCWYcnfEeKsgtz7UQsIQA"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_qpOBsHewEeOufdfpP6CyRA" visible="false" type="compartment_shape_display">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_qpOBsXewEeOufdfpP6CyRA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qpOBsnewEeOufdfpP6CyRA"/>

+    </children>

+    <element xmi:type="uml:Class" href="01_SourceLeft_ClassDiagram_Operation_Deleted_Indirect.uml#_cBSvcMnfEeKsgtz7UQsIQA"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cCCWUcnfEeKsgtz7UQsIQA" x="115" y="335" width="286" height="63"/>

+  </children>

+  <styles xmi:type="notation:DiagramStyle" xmi:id="_r-5hIchqEeKmlJkz37Cc-A"/>

+  <element xmi:type="uml:Model" href="01_SourceLeft_ClassDiagram_Operation_Deleted_Indirect.uml#_r-nNQMhqEeKmlJkz37Cc-A"/>

+</notation:Diagram>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/DELETE/01_SourceLeft_ClassDiagram_Operation_Deleted_Indirect.uml b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/DELETE/01_SourceLeft_ClassDiagram_Operation_Deleted_Indirect.uml
new file mode 100644
index 00000000000..67a973ed4ae
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/DELETE/01_SourceLeft_ClassDiagram_Operation_Deleted_Indirect.uml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_r-nNQMhqEeKmlJkz37Cc-A" name="model">

+  <packagedElement xmi:type="uml:Class" xmi:id="_uEswAMhqEeKmlJkz37Cc-A" name="A">

+    <ownedOperation xmi:type="uml:Operation" xmi:id="_sAGwIMhsEeKmlJkz37Cc-A" name="op"/>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Class" xmi:id="_xZFR4MhqEeKmlJkz37Cc-A" name="B"/>

+  <packagedElement xmi:type="uml:Class" xmi:id="_cBSvcMnfEeKsgtz7UQsIQA" name="C">

+    <generalization xmi:type="uml:Generalization" xmi:id="_gfsNYMnfEeKsgtz7UQsIQA" general="_xZFR4MhqEeKmlJkz37Cc-A"/>

+  </packagedElement>

+</uml:Model>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/DELETE/02_SourceLeft_ClassDiagram_Operation_Deleted.di b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/DELETE/02_SourceLeft_ClassDiagram_Operation_Deleted.di
new file mode 100644
index 00000000000..8c7b099ce95
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/DELETE/02_SourceLeft_ClassDiagram_Operation_Deleted.di
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

+  <pageList>

+    <availablePage>

+      <emfPageIdentifier href="02_SourceLeft_ClassDiagram_Operation_Deleted.notation#_r-5hIMhqEeKmlJkz37Cc-A"/>

+    </availablePage>

+  </pageList>

+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

+    <windows>

+      <children xsi:type="di:TabFolder">

+        <children>

+          <emfPageIdentifier href="02_SourceLeft_ClassDiagram_Operation_Deleted.notation#_r-5hIMhqEeKmlJkz37Cc-A"/>

+        </children>

+      </children>

+    </windows>

+  </sashModel>

+</di:SashWindowsMngr>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/DELETE/02_SourceLeft_ClassDiagram_Operation_Deleted.notation b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/DELETE/02_SourceLeft_ClassDiagram_Operation_Deleted.notation
new file mode 100644
index 00000000000..116389ef0ea
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/DELETE/02_SourceLeft_ClassDiagram_Operation_Deleted.notation
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_r-5hIMhqEeKmlJkz37Cc-A" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

+  <children xmi:type="notation:Shape" xmi:id="_uGCMwMhqEeKmlJkz37Cc-A" type="2008">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zONAc8hqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAdMhqEeKmlJkz37Cc-A" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_uGCMwshqEeKmlJkz37Cc-A" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_uGCMw8hqEeKmlJkz37Cc-A" visible="false" type="7017">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uGCM0shqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uGCM08hqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAdchqEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_uGCMxMhqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_uGCMxchqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uGCMxshqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCMx8hqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_uGCMyMhqEeKmlJkz37Cc-A" type="7018">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uGCM1MhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uGCM1chqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rkcu4MhsEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <children xmi:type="notation:Shape" xmi:id="_sAZEAMhsEeKmlJkz37Cc-A" type="3013">

+        <element xmi:type="uml:Operation" href="02_SourceLeft_ClassDiagram_Operation_Deleted.uml#_sAGwIMhsEeKmlJkz37Cc-A"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_sAZEAchsEeKmlJkz37Cc-A"/>

+      </children>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_uGCMychqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_uGCMyshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uGCMy8hqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCMzMhqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_uGCMzchqEeKmlJkz37Cc-A" visible="false" type="7019">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uGCM1shqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uGCM18hqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_uGCMzshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_uGCMz8hqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uGCM0MhqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCM0chqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_sSx28HekEeOVytl18_65_w" visible="false" type="compartment_shape_display">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_sSx28XekEeOVytl18_65_w"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sSx28nekEeOVytl18_65_w"/>

+    </children>

+    <element xmi:type="uml:Class" href="02_SourceLeft_ClassDiagram_Operation_Deleted.uml#_uEswAMhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCMwchqEeKmlJkz37Cc-A" x="115" y="85" width="286" height="63"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_xZRfIMhqEeKmlJkz37Cc-A" type="2008">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zONAcMhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAcchqEeKmlJkz37Cc-A" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_xZRfIshqEeKmlJkz37Cc-A" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_xZRfI8hqEeKmlJkz37Cc-A" visible="false" type="7017">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xZRfMshqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZRfM8hqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAcshqEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_xZRfJMhqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_xZRfJchqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xZRfJshqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfJ8hqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_xZRfKMhqEeKmlJkz37Cc-A" type="7018">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xZRfNMhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZRfNchqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_w7TpYMhtEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <children xmi:type="notation:Shape" xmi:id="_21mVcHekEeOVytl18_65_w" type="3013" fontName="Segoe UI" lineColor="0">

+        <element xmi:type="uml:Operation" href="02_SourceLeft_ClassDiagram_Operation_Deleted.uml#_sAGwIMhsEeKmlJkz37Cc-A"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_21mVcXekEeOVytl18_65_w"/>

+      </children>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_xZRfKchqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_xZRfKshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xZRfK8hqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfLMhqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_xZRfLchqEeKmlJkz37Cc-A" visible="false" type="7019">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xZXlwMhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZXlwchqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_xZRfLshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_xZRfL8hqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xZRfMMhqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfMchqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_sSx283ekEeOVytl18_65_w" visible="false" type="compartment_shape_display">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_sSx29HekEeOVytl18_65_w"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sSx29XekEeOVytl18_65_w"/>

+    </children>

+    <element xmi:type="uml:Class" href="02_SourceLeft_ClassDiagram_Operation_Deleted.uml#_xZFR4MhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfIchqEeKmlJkz37Cc-A" x="115" y="215" width="286" height="63"/>

+  </children>

+  <styles xmi:type="notation:DiagramStyle" xmi:id="_r-5hIchqEeKmlJkz37Cc-A"/>

+  <element xmi:type="uml:Model" href="02_SourceLeft_ClassDiagram_Operation_Deleted.uml#_r-nNQMhqEeKmlJkz37Cc-A"/>

+</notation:Diagram>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/DELETE/02_SourceLeft_ClassDiagram_Operation_Deleted.uml b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/DELETE/02_SourceLeft_ClassDiagram_Operation_Deleted.uml
new file mode 100644
index 00000000000..488b72f0f95
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/DELETE/02_SourceLeft_ClassDiagram_Operation_Deleted.uml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_r-nNQMhqEeKmlJkz37Cc-A" name="model">

+  <packagedElement xmi:type="uml:Class" xmi:id="_uEswAMhqEeKmlJkz37Cc-A" name="A">

+    <ownedOperation xmi:type="uml:Operation" xmi:id="_sAGwIMhsEeKmlJkz37Cc-A" name="op"/>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Class" xmi:id="_xZFR4MhqEeKmlJkz37Cc-A" name="B">

+    <generalization xmi:type="uml:Generalization" xmi:id="_7-CeYMhqEeKmlJkz37Cc-A" general="_uEswAMhqEeKmlJkz37Cc-A"/>

+  </packagedElement>

+</uml:Model>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/DELETE/02_SourceLeft_ClassDiagram_Operation_Deleted_Indirect.di b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/DELETE/02_SourceLeft_ClassDiagram_Operation_Deleted_Indirect.di
new file mode 100644
index 00000000000..215f3f5c26f
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/DELETE/02_SourceLeft_ClassDiagram_Operation_Deleted_Indirect.di
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

+  <pageList>

+    <availablePage>

+      <emfPageIdentifier href="02_SourceLeft_ClassDiagram_Operation_Deleted_Indirect.notation#_r-5hIMhqEeKmlJkz37Cc-A"/>

+    </availablePage>

+  </pageList>

+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

+    <windows>

+      <children xsi:type="di:TabFolder">

+        <children>

+          <emfPageIdentifier href="02_SourceLeft_ClassDiagram_Operation_Deleted_Indirect.notation#_r-5hIMhqEeKmlJkz37Cc-A"/>

+        </children>

+      </children>

+    </windows>

+  </sashModel>

+</di:SashWindowsMngr>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/DELETE/02_SourceLeft_ClassDiagram_Operation_Deleted_Indirect.notation b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/DELETE/02_SourceLeft_ClassDiagram_Operation_Deleted_Indirect.notation
new file mode 100644
index 00000000000..db7c78c0d81
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/DELETE/02_SourceLeft_ClassDiagram_Operation_Deleted_Indirect.notation
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_r-5hIMhqEeKmlJkz37Cc-A" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

+  <children xmi:type="notation:Shape" xmi:id="_uGCMwMhqEeKmlJkz37Cc-A" type="2008">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zONAc8hqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAdMhqEeKmlJkz37Cc-A" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_uGCMwshqEeKmlJkz37Cc-A" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_uGCMw8hqEeKmlJkz37Cc-A" visible="false" type="7017">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uGCM0shqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uGCM08hqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAdchqEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_uGCMxMhqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_uGCMxchqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uGCMxshqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCMx8hqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_uGCMyMhqEeKmlJkz37Cc-A" type="7018">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uGCM1MhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uGCM1chqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rkcu4MhsEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <children xmi:type="notation:Shape" xmi:id="_sAZEAMhsEeKmlJkz37Cc-A" type="3013">

+        <element xmi:type="uml:Operation" href="02_SourceLeft_ClassDiagram_Operation_Deleted_Indirect.uml#_sAGwIMhsEeKmlJkz37Cc-A"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_sAZEAchsEeKmlJkz37Cc-A"/>

+      </children>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_uGCMychqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_uGCMyshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uGCMy8hqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCMzMhqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_uGCMzchqEeKmlJkz37Cc-A" visible="false" type="7019">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uGCM1shqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uGCM18hqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_uGCMzshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_uGCMz8hqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uGCM0MhqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCM0chqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_kWeRQHewEeOufdfpP6CyRA" visible="false" type="compartment_shape_display">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_kWeRQXewEeOufdfpP6CyRA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kWeRQnewEeOufdfpP6CyRA"/>

+    </children>

+    <element xmi:type="uml:Class" href="02_SourceLeft_ClassDiagram_Operation_Deleted_Indirect.uml#_uEswAMhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCMwchqEeKmlJkz37Cc-A" x="115" y="85" width="286" height="63"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_xZRfIMhqEeKmlJkz37Cc-A" type="2008">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zONAcMhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAcchqEeKmlJkz37Cc-A" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_xZRfIshqEeKmlJkz37Cc-A" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_xZRfI8hqEeKmlJkz37Cc-A" visible="false" type="7017">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xZRfMshqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZRfM8hqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAcshqEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_xZRfJMhqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_xZRfJchqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xZRfJshqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfJ8hqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_xZRfKMhqEeKmlJkz37Cc-A" type="7018">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xZRfNMhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZRfNchqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_w7TpYMhtEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_xZRfKchqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_xZRfKshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xZRfK8hqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfLMhqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_xZRfLchqEeKmlJkz37Cc-A" visible="false" type="7019">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xZXlwMhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZXlwchqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_xZRfLshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_xZRfL8hqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xZRfMMhqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfMchqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_kWoCQHewEeOufdfpP6CyRA" visible="false" type="compartment_shape_display">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_kWoCQXewEeOufdfpP6CyRA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kWoCQnewEeOufdfpP6CyRA"/>

+    </children>

+    <element xmi:type="uml:Class" href="02_SourceLeft_ClassDiagram_Operation_Deleted_Indirect.uml#_xZFR4MhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfIchqEeKmlJkz37Cc-A" x="115" y="215" width="286" height="63"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_cCCWUMnfEeKsgtz7UQsIQA" type="2008">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_cz4C8MnfEeKsgtz7UQsIQA" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cz4C8cnfEeKsgtz7UQsIQA" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_cCCWUsnfEeKsgtz7UQsIQA" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_cCCWU8nfEeKsgtz7UQsIQA" visible="false" type="7017">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_cCCWYsnfEeKsgtz7UQsIQA" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cCCWY8nfEeKsgtz7UQsIQA" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_cCCWVMnfEeKsgtz7UQsIQA"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_cCCWVcnfEeKsgtz7UQsIQA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_cCCWVsnfEeKsgtz7UQsIQA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cCCWV8nfEeKsgtz7UQsIQA"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_cCCWWMnfEeKsgtz7UQsIQA" type="7018">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_cCCWZMnfEeKsgtz7UQsIQA" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cCCWZcnfEeKsgtz7UQsIQA" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cz4C8snfEeKsgtz7UQsIQA" key="visible" value="true"/>

+      </eAnnotations>

+      <children xmi:type="notation:Shape" xmi:id="_kKmY4MnfEeKsgtz7UQsIQA" type="3013">

+        <element xmi:type="uml:Operation" href="02_SourceLeft_ClassDiagram_Operation_Deleted_Indirect.uml#_sAGwIMhsEeKmlJkz37Cc-A"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_kKmY4cnfEeKsgtz7UQsIQA"/>

+      </children>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_cCCWWcnfEeKsgtz7UQsIQA"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_cCCWWsnfEeKsgtz7UQsIQA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_cCCWW8nfEeKsgtz7UQsIQA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cCCWXMnfEeKsgtz7UQsIQA"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_cCCWXcnfEeKsgtz7UQsIQA" visible="false" type="7019">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_cCMHUMnfEeKsgtz7UQsIQA" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_cCMHUcnfEeKsgtz7UQsIQA" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_cCCWXsnfEeKsgtz7UQsIQA"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_cCCWX8nfEeKsgtz7UQsIQA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_cCCWYMnfEeKsgtz7UQsIQA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cCCWYcnfEeKsgtz7UQsIQA"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_kWoCQ3ewEeOufdfpP6CyRA" visible="false" type="compartment_shape_display">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_kWoCRHewEeOufdfpP6CyRA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kWoCRXewEeOufdfpP6CyRA"/>

+    </children>

+    <element xmi:type="uml:Class" href="02_SourceLeft_ClassDiagram_Operation_Deleted_Indirect.uml#_cBSvcMnfEeKsgtz7UQsIQA"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cCCWUcnfEeKsgtz7UQsIQA" x="115" y="335" width="286" height="63"/>

+  </children>

+  <styles xmi:type="notation:DiagramStyle" xmi:id="_r-5hIchqEeKmlJkz37Cc-A"/>

+  <element xmi:type="uml:Model" href="02_SourceLeft_ClassDiagram_Operation_Deleted_Indirect.uml#_r-nNQMhqEeKmlJkz37Cc-A"/>

+</notation:Diagram>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/DELETE/02_SourceLeft_ClassDiagram_Operation_Deleted_Indirect.uml b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/DELETE/02_SourceLeft_ClassDiagram_Operation_Deleted_Indirect.uml
new file mode 100644
index 00000000000..fe92db8d6d9
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Operation/DELETE/02_SourceLeft_ClassDiagram_Operation_Deleted_Indirect.uml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_r-nNQMhqEeKmlJkz37Cc-A" name="model">

+  <packagedElement xmi:type="uml:Class" xmi:id="_uEswAMhqEeKmlJkz37Cc-A" name="A">

+    <ownedOperation xmi:type="uml:Operation" xmi:id="_sAGwIMhsEeKmlJkz37Cc-A" name="op"/>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Class" xmi:id="_xZFR4MhqEeKmlJkz37Cc-A" name="B">

+    <generalization xmi:type="uml:Generalization" xmi:id="_7-CeYMhqEeKmlJkz37Cc-A" general="_uEswAMhqEeKmlJkz37Cc-A"/>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Class" xmi:id="_cBSvcMnfEeKsgtz7UQsIQA" name="C">

+    <generalization xmi:type="uml:Generalization" xmi:id="_gfsNYMnfEeKsgtz7UQsIQA" general="_xZFR4MhqEeKmlJkz37Cc-A"/>

+  </packagedElement>

+</uml:Model>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Property/ADD/01_SourceLeft_ClassDiagram_Property_Added.di b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Property/ADD/01_SourceLeft_ClassDiagram_Property_Added.di
new file mode 100644
index 00000000000..500da246de9
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Property/ADD/01_SourceLeft_ClassDiagram_Property_Added.di
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

+  <pageList>

+    <availablePage>

+      <emfPageIdentifier href="01_SourceLeft_ClassDiagram_Property_Added.notation#_r-5hIMhqEeKmlJkz37Cc-A"/>

+    </availablePage>

+  </pageList>

+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

+    <windows>

+      <children xsi:type="di:TabFolder">

+        <children>

+          <emfPageIdentifier href="01_SourceLeft_ClassDiagram_Property_Added.notation#_r-5hIMhqEeKmlJkz37Cc-A"/>

+        </children>

+      </children>

+    </windows>

+  </sashModel>

+</di:SashWindowsMngr>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Property/ADD/01_SourceLeft_ClassDiagram_Property_Added.notation b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Property/ADD/01_SourceLeft_ClassDiagram_Property_Added.notation
new file mode 100644
index 00000000000..796a03e2412
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Property/ADD/01_SourceLeft_ClassDiagram_Property_Added.notation
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_r-5hIMhqEeKmlJkz37Cc-A" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

+  <children xmi:type="notation:Shape" xmi:id="_uGCMwMhqEeKmlJkz37Cc-A" type="2008">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zONAc8hqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAdMhqEeKmlJkz37Cc-A" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_uGCMwshqEeKmlJkz37Cc-A" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_uGCMw8hqEeKmlJkz37Cc-A" type="7017">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uGCM0shqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uGCM08hqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAdchqEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <children xmi:type="notation:Shape" xmi:id="_0XXn8MhqEeKmlJkz37Cc-A" type="3012">

+        <element xmi:type="uml:Property" href="01_SourceLeft_ClassDiagram_Property_Added.uml#_0W_NcMhqEeKmlJkz37Cc-A"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_0XXn8chqEeKmlJkz37Cc-A"/>

+      </children>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_uGCMxMhqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_uGCMxchqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uGCMxshqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCMx8hqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_uGCMyMhqEeKmlJkz37Cc-A" visible="false" type="7018">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uGCM1MhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uGCM1chqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_uGCMychqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_uGCMyshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uGCMy8hqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCMzMhqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_uGCMzchqEeKmlJkz37Cc-A" visible="false" type="7019">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uGCM1shqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uGCM18hqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_uGCMzshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_uGCMz8hqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uGCM0MhqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCM0chqEeKmlJkz37Cc-A"/>

+    </children>

+    <element xmi:type="uml:Class" href="01_SourceLeft_ClassDiagram_Property_Added.uml#_uEswAMhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCMwchqEeKmlJkz37Cc-A" x="115" y="85" width="286" height="63"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_xZRfIMhqEeKmlJkz37Cc-A" type="2008">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zONAcMhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAcchqEeKmlJkz37Cc-A" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_xZRfIshqEeKmlJkz37Cc-A" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_xZRfI8hqEeKmlJkz37Cc-A" type="7017">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xZRfMshqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZRfM8hqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAcshqEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <children xmi:type="notation:Shape" xmi:id="_84CBcMhqEeKmlJkz37Cc-A" type="3012">

+        <element xmi:type="uml:Property" href="01_SourceLeft_ClassDiagram_Property_Added.uml#_0W_NcMhqEeKmlJkz37Cc-A"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_84CBcchqEeKmlJkz37Cc-A"/>

+      </children>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_xZRfJMhqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_xZRfJchqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xZRfJshqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfJ8hqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_xZRfKMhqEeKmlJkz37Cc-A" visible="false" type="7018">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xZRfNMhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZRfNchqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_xZRfKchqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_xZRfKshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xZRfK8hqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfLMhqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_xZRfLchqEeKmlJkz37Cc-A" visible="false" type="7019">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xZXlwMhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZXlwchqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_xZRfLshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_xZRfL8hqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xZRfMMhqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfMchqEeKmlJkz37Cc-A"/>

+    </children>

+    <element xmi:type="uml:Class" href="01_SourceLeft_ClassDiagram_Property_Added.uml#_xZFR4MhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfIchqEeKmlJkz37Cc-A" x="115" y="215" width="286" height="63"/>

+  </children>

+  <styles xmi:type="notation:DiagramStyle" xmi:id="_r-5hIchqEeKmlJkz37Cc-A"/>

+  <element xmi:type="uml:Model" href="01_SourceLeft_ClassDiagram_Property_Added.uml#_r-nNQMhqEeKmlJkz37Cc-A"/>

+</notation:Diagram>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Property/ADD/01_SourceLeft_ClassDiagram_Property_Added.uml b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Property/ADD/01_SourceLeft_ClassDiagram_Property_Added.uml
new file mode 100644
index 00000000000..3f069a0ba1c
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Property/ADD/01_SourceLeft_ClassDiagram_Property_Added.uml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_r-nNQMhqEeKmlJkz37Cc-A" name="model">

+  <packagedElement xmi:type="uml:Class" xmi:id="_uEswAMhqEeKmlJkz37Cc-A" name="A">

+    <ownedAttribute xmi:id="_0W_NcMhqEeKmlJkz37Cc-A" name="p" visibility="public">

+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0iiWIMhqEeKmlJkz37Cc-A" value="1"/>

+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0iocwMhqEeKmlJkz37Cc-A" value="1"/>

+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_0i0qAMhqEeKmlJkz37Cc-A">

+        <value xsi:nil="true"/>

+      </defaultValue>

+    </ownedAttribute>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Class" xmi:id="_xZFR4MhqEeKmlJkz37Cc-A" name="B">

+    <generalization xmi:id="_7-CeYMhqEeKmlJkz37Cc-A" general="_uEswAMhqEeKmlJkz37Cc-A"/>

+  </packagedElement>

+</uml:Model>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Property/ADD/02_SourceLeft_ClassDiagram_Property_Added.di b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Property/ADD/02_SourceLeft_ClassDiagram_Property_Added.di
new file mode 100644
index 00000000000..1571c87d3d5
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Property/ADD/02_SourceLeft_ClassDiagram_Property_Added.di
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

+  <pageList>

+    <availablePage>

+      <emfPageIdentifier href="02_SourceLeft_ClassDiagram_Property_Added.notation#_r-5hIMhqEeKmlJkz37Cc-A"/>

+    </availablePage>

+  </pageList>

+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

+    <windows>

+      <children xsi:type="di:TabFolder">

+        <children>

+          <emfPageIdentifier href="02_SourceLeft_ClassDiagram_Property_Added.notation#_r-5hIMhqEeKmlJkz37Cc-A"/>

+        </children>

+      </children>

+    </windows>

+  </sashModel>

+</di:SashWindowsMngr>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Property/ADD/02_SourceLeft_ClassDiagram_Property_Added.notation b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Property/ADD/02_SourceLeft_ClassDiagram_Property_Added.notation
new file mode 100644
index 00000000000..34c05d4aaa7
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Property/ADD/02_SourceLeft_ClassDiagram_Property_Added.notation
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_r-5hIMhqEeKmlJkz37Cc-A" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

+  <children xmi:type="notation:Shape" xmi:id="_uGCMwMhqEeKmlJkz37Cc-A" type="2008">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zONAc8hqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAdMhqEeKmlJkz37Cc-A" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_uGCMwshqEeKmlJkz37Cc-A" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_uGCMw8hqEeKmlJkz37Cc-A" type="7017">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uGCM0shqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uGCM08hqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAdchqEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <children xmi:type="notation:Shape" xmi:id="_0XXn8MhqEeKmlJkz37Cc-A" type="3012">

+        <element xmi:type="uml:Property" href="02_SourceLeft_ClassDiagram_Property_Added.uml#_0W_NcMhqEeKmlJkz37Cc-A"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_0XXn8chqEeKmlJkz37Cc-A"/>

+      </children>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_uGCMxMhqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_uGCMxchqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uGCMxshqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCMx8hqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_uGCMyMhqEeKmlJkz37Cc-A" visible="false" type="7018">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uGCM1MhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uGCM1chqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_uGCMychqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_uGCMyshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uGCMy8hqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCMzMhqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_uGCMzchqEeKmlJkz37Cc-A" visible="false" type="7019">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uGCM1shqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uGCM18hqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_uGCMzshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_uGCMz8hqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uGCM0MhqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCM0chqEeKmlJkz37Cc-A"/>

+    </children>

+    <element xmi:type="uml:Class" href="02_SourceLeft_ClassDiagram_Property_Added.uml#_uEswAMhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCMwchqEeKmlJkz37Cc-A" x="115" y="85" width="286" height="63"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_xZRfIMhqEeKmlJkz37Cc-A" type="2008">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zONAcMhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAcchqEeKmlJkz37Cc-A" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_xZRfIshqEeKmlJkz37Cc-A" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_xZRfI8hqEeKmlJkz37Cc-A" type="7017">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xZRfMshqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZRfM8hqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAcshqEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_xZRfJMhqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_xZRfJchqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xZRfJshqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfJ8hqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_xZRfKMhqEeKmlJkz37Cc-A" visible="false" type="7018">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xZRfNMhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZRfNchqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_xZRfKchqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_xZRfKshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xZRfK8hqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfLMhqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_xZRfLchqEeKmlJkz37Cc-A" visible="false" type="7019">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xZXlwMhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZXlwchqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_xZRfLshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_xZRfL8hqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xZRfMMhqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfMchqEeKmlJkz37Cc-A"/>

+    </children>

+    <element xmi:type="uml:Class" href="02_SourceLeft_ClassDiagram_Property_Added.uml#_xZFR4MhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfIchqEeKmlJkz37Cc-A" x="115" y="215" width="286" height="63"/>

+  </children>

+  <styles xmi:type="notation:DiagramStyle" xmi:id="_r-5hIchqEeKmlJkz37Cc-A"/>

+  <element xmi:type="uml:Model" href="02_SourceLeft_ClassDiagram_Property_Added.uml#_r-nNQMhqEeKmlJkz37Cc-A"/>

+</notation:Diagram>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Property/ADD/02_SourceLeft_ClassDiagram_Property_Added.uml b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Property/ADD/02_SourceLeft_ClassDiagram_Property_Added.uml
new file mode 100644
index 00000000000..b307d57b5d0
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Property/ADD/02_SourceLeft_ClassDiagram_Property_Added.uml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_r-nNQMhqEeKmlJkz37Cc-A" name="model">

+  <packagedElement xmi:type="uml:Class" xmi:id="_uEswAMhqEeKmlJkz37Cc-A" name="A">

+    <ownedAttribute xmi:id="_0W_NcMhqEeKmlJkz37Cc-A" name="p" visibility="public">

+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0iiWIMhqEeKmlJkz37Cc-A" value="1"/>

+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0iocwMhqEeKmlJkz37Cc-A" value="1"/>

+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_0i0qAMhqEeKmlJkz37Cc-A">

+        <value xsi:nil="true"/>

+      </defaultValue>

+    </ownedAttribute>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Class" xmi:id="_xZFR4MhqEeKmlJkz37Cc-A" name="B"/>

+</uml:Model>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Property/DELETE/01_SourceLeft_ClassDiagram_Property_Deleted.di b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Property/DELETE/01_SourceLeft_ClassDiagram_Property_Deleted.di
new file mode 100644
index 00000000000..e4a48e5c3f7
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Property/DELETE/01_SourceLeft_ClassDiagram_Property_Deleted.di
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

+  <pageList>

+    <availablePage>

+      <emfPageIdentifier href="01_SourceLeft_ClassDiagram_Property_Deleted.notation#_r-5hIMhqEeKmlJkz37Cc-A"/>

+    </availablePage>

+  </pageList>

+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

+    <windows>

+      <children xsi:type="di:TabFolder">

+        <children>

+          <emfPageIdentifier href="01_SourceLeft_ClassDiagram_Property_Deleted.notation#_r-5hIMhqEeKmlJkz37Cc-A"/>

+        </children>

+      </children>

+    </windows>

+  </sashModel>

+</di:SashWindowsMngr>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Property/DELETE/01_SourceLeft_ClassDiagram_Property_Deleted.notation b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Property/DELETE/01_SourceLeft_ClassDiagram_Property_Deleted.notation
new file mode 100644
index 00000000000..c9153a2226a
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Property/DELETE/01_SourceLeft_ClassDiagram_Property_Deleted.notation
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_r-5hIMhqEeKmlJkz37Cc-A" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

+  <children xmi:type="notation:Shape" xmi:id="_uGCMwMhqEeKmlJkz37Cc-A" type="2008">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zONAc8hqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAdMhqEeKmlJkz37Cc-A" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_uGCMwshqEeKmlJkz37Cc-A" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_uGCMw8hqEeKmlJkz37Cc-A" type="7017">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uGCM0shqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uGCM08hqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAdchqEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <children xmi:type="notation:Shape" xmi:id="_0XXn8MhqEeKmlJkz37Cc-A" type="3012">

+        <element xmi:type="uml:Property" href="01_SourceLeft_ClassDiagram_Property_Deleted.uml#_0W_NcMhqEeKmlJkz37Cc-A"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_0XXn8chqEeKmlJkz37Cc-A"/>

+      </children>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_uGCMxMhqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_uGCMxchqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uGCMxshqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCMx8hqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_uGCMyMhqEeKmlJkz37Cc-A" visible="false" type="7018">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uGCM1MhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uGCM1chqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_uGCMychqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_uGCMyshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uGCMy8hqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCMzMhqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_uGCMzchqEeKmlJkz37Cc-A" visible="false" type="7019">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uGCM1shqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uGCM18hqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_uGCMzshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_uGCMz8hqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uGCM0MhqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCM0chqEeKmlJkz37Cc-A"/>

+    </children>

+    <element xmi:type="uml:Class" href="01_SourceLeft_ClassDiagram_Property_Deleted.uml#_uEswAMhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCMwchqEeKmlJkz37Cc-A" x="115" y="85" width="286" height="63"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_xZRfIMhqEeKmlJkz37Cc-A" type="2008">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zONAcMhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAcchqEeKmlJkz37Cc-A" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_xZRfIshqEeKmlJkz37Cc-A" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_xZRfI8hqEeKmlJkz37Cc-A" type="7017">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xZRfMshqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZRfM8hqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAcshqEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_xZRfJMhqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_xZRfJchqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xZRfJshqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfJ8hqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_xZRfKMhqEeKmlJkz37Cc-A" visible="false" type="7018">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xZRfNMhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZRfNchqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_xZRfKchqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_xZRfKshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xZRfK8hqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfLMhqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_xZRfLchqEeKmlJkz37Cc-A" visible="false" type="7019">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xZXlwMhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZXlwchqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_xZRfLshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_xZRfL8hqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xZRfMMhqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfMchqEeKmlJkz37Cc-A"/>

+    </children>

+    <element xmi:type="uml:Class" href="01_SourceLeft_ClassDiagram_Property_Deleted.uml#_xZFR4MhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfIchqEeKmlJkz37Cc-A" x="115" y="215" width="286" height="63"/>

+  </children>

+  <styles xmi:type="notation:DiagramStyle" xmi:id="_r-5hIchqEeKmlJkz37Cc-A"/>

+  <element xmi:type="uml:Model" href="01_SourceLeft_ClassDiagram_Property_Deleted.uml#_r-nNQMhqEeKmlJkz37Cc-A"/>

+</notation:Diagram>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Property/DELETE/01_SourceLeft_ClassDiagram_Property_Deleted.uml b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Property/DELETE/01_SourceLeft_ClassDiagram_Property_Deleted.uml
new file mode 100644
index 00000000000..b307d57b5d0
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Property/DELETE/01_SourceLeft_ClassDiagram_Property_Deleted.uml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_r-nNQMhqEeKmlJkz37Cc-A" name="model">

+  <packagedElement xmi:type="uml:Class" xmi:id="_uEswAMhqEeKmlJkz37Cc-A" name="A">

+    <ownedAttribute xmi:id="_0W_NcMhqEeKmlJkz37Cc-A" name="p" visibility="public">

+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0iiWIMhqEeKmlJkz37Cc-A" value="1"/>

+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0iocwMhqEeKmlJkz37Cc-A" value="1"/>

+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_0i0qAMhqEeKmlJkz37Cc-A">

+        <value xsi:nil="true"/>

+      </defaultValue>

+    </ownedAttribute>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Class" xmi:id="_xZFR4MhqEeKmlJkz37Cc-A" name="B"/>

+</uml:Model>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Property/DELETE/02_SourceLeft_ClassDiagram_Property_Deleted.di b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Property/DELETE/02_SourceLeft_ClassDiagram_Property_Deleted.di
new file mode 100644
index 00000000000..c96e6388aea
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Property/DELETE/02_SourceLeft_ClassDiagram_Property_Deleted.di
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

+  <pageList>

+    <availablePage>

+      <emfPageIdentifier href="02_SourceLeft_ClassDiagram_Property_Deleted.notation#_r-5hIMhqEeKmlJkz37Cc-A"/>

+    </availablePage>

+  </pageList>

+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

+    <windows>

+      <children xsi:type="di:TabFolder">

+        <children>

+          <emfPageIdentifier href="02_SourceLeft_ClassDiagram_Property_Deleted.notation#_r-5hIMhqEeKmlJkz37Cc-A"/>

+        </children>

+      </children>

+    </windows>

+  </sashModel>

+</di:SashWindowsMngr>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Property/DELETE/02_SourceLeft_ClassDiagram_Property_Deleted.notation b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Property/DELETE/02_SourceLeft_ClassDiagram_Property_Deleted.notation
new file mode 100644
index 00000000000..a7948cdadb9
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Property/DELETE/02_SourceLeft_ClassDiagram_Property_Deleted.notation
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_r-5hIMhqEeKmlJkz37Cc-A" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

+  <children xmi:type="notation:Shape" xmi:id="_uGCMwMhqEeKmlJkz37Cc-A" type="2008">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zONAc8hqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAdMhqEeKmlJkz37Cc-A" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_uGCMwshqEeKmlJkz37Cc-A" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_uGCMw8hqEeKmlJkz37Cc-A" type="7017">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uGCM0shqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uGCM08hqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAdchqEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <children xmi:type="notation:Shape" xmi:id="_0XXn8MhqEeKmlJkz37Cc-A" type="3012">

+        <element xmi:type="uml:Property" href="02_SourceLeft_ClassDiagram_Property_Deleted.uml#_0W_NcMhqEeKmlJkz37Cc-A"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_0XXn8chqEeKmlJkz37Cc-A"/>

+      </children>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_uGCMxMhqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_uGCMxchqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uGCMxshqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCMx8hqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_uGCMyMhqEeKmlJkz37Cc-A" visible="false" type="7018">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uGCM1MhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uGCM1chqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_uGCMychqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_uGCMyshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uGCMy8hqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCMzMhqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_uGCMzchqEeKmlJkz37Cc-A" visible="false" type="7019">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uGCM1shqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uGCM18hqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_uGCMzshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_uGCMz8hqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uGCM0MhqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCM0chqEeKmlJkz37Cc-A"/>

+    </children>

+    <element xmi:type="uml:Class" href="02_SourceLeft_ClassDiagram_Property_Deleted.uml#_uEswAMhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCMwchqEeKmlJkz37Cc-A" x="115" y="85" width="286" height="63"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_xZRfIMhqEeKmlJkz37Cc-A" type="2008">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zONAcMhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAcchqEeKmlJkz37Cc-A" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_xZRfIshqEeKmlJkz37Cc-A" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_xZRfI8hqEeKmlJkz37Cc-A" type="7017">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xZRfMshqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZRfM8hqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAcshqEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <children xmi:type="notation:Shape" xmi:id="_84CBcMhqEeKmlJkz37Cc-A" type="3012">

+        <element xmi:type="uml:Property" href="02_SourceLeft_ClassDiagram_Property_Deleted.uml#_0W_NcMhqEeKmlJkz37Cc-A"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_84CBcchqEeKmlJkz37Cc-A"/>

+      </children>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_xZRfJMhqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_xZRfJchqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xZRfJshqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfJ8hqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_xZRfKMhqEeKmlJkz37Cc-A" visible="false" type="7018">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xZRfNMhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZRfNchqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_xZRfKchqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_xZRfKshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xZRfK8hqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfLMhqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_xZRfLchqEeKmlJkz37Cc-A" visible="false" type="7019">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xZXlwMhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZXlwchqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_xZRfLshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_xZRfL8hqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xZRfMMhqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfMchqEeKmlJkz37Cc-A"/>

+    </children>

+    <element xmi:type="uml:Class" href="02_SourceLeft_ClassDiagram_Property_Deleted.uml#_xZFR4MhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfIchqEeKmlJkz37Cc-A" x="115" y="215" width="286" height="63"/>

+  </children>

+  <styles xmi:type="notation:DiagramStyle" xmi:id="_r-5hIchqEeKmlJkz37Cc-A"/>

+  <element xmi:type="uml:Model" href="02_SourceLeft_ClassDiagram_Property_Deleted.uml#_r-nNQMhqEeKmlJkz37Cc-A"/>

+</notation:Diagram>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Property/DELETE/02_SourceLeft_ClassDiagram_Property_Deleted.uml b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Property/DELETE/02_SourceLeft_ClassDiagram_Property_Deleted.uml
new file mode 100644
index 00000000000..3f069a0ba1c
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Property/DELETE/02_SourceLeft_ClassDiagram_Property_Deleted.uml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_r-nNQMhqEeKmlJkz37Cc-A" name="model">

+  <packagedElement xmi:type="uml:Class" xmi:id="_uEswAMhqEeKmlJkz37Cc-A" name="A">

+    <ownedAttribute xmi:id="_0W_NcMhqEeKmlJkz37Cc-A" name="p" visibility="public">

+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0iiWIMhqEeKmlJkz37Cc-A" value="1"/>

+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0iocwMhqEeKmlJkz37Cc-A" value="1"/>

+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_0i0qAMhqEeKmlJkz37Cc-A">

+        <value xsi:nil="true"/>

+      </defaultValue>

+    </ownedAttribute>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Class" xmi:id="_xZFR4MhqEeKmlJkz37Cc-A" name="B">

+    <generalization xmi:id="_7-CeYMhqEeKmlJkz37Cc-A" general="_uEswAMhqEeKmlJkz37Cc-A"/>

+  </packagedElement>

+</uml:Model>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Reception/ADD/01_SourceLeft_ClassDiagram_Reception_Added.di b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Reception/ADD/01_SourceLeft_ClassDiagram_Reception_Added.di
new file mode 100644
index 00000000000..753da91dbea
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Reception/ADD/01_SourceLeft_ClassDiagram_Reception_Added.di
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

+  <pageList>

+    <availablePage>

+      <emfPageIdentifier href="01_SourceLeft_ClassDiagram_Reception_Added.notation#_r-5hIMhqEeKmlJkz37Cc-A"/>

+    </availablePage>

+  </pageList>

+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

+    <windows>

+      <children xsi:type="di:TabFolder">

+        <children>

+          <emfPageIdentifier href="01_SourceLeft_ClassDiagram_Reception_Added.notation#_r-5hIMhqEeKmlJkz37Cc-A"/>

+        </children>

+      </children>

+    </windows>

+  </sashModel>

+</di:SashWindowsMngr>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Reception/ADD/01_SourceLeft_ClassDiagram_Reception_Added.notation b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Reception/ADD/01_SourceLeft_ClassDiagram_Reception_Added.notation
new file mode 100644
index 00000000000..ffab0663791
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Reception/ADD/01_SourceLeft_ClassDiagram_Reception_Added.notation
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_r-5hIMhqEeKmlJkz37Cc-A" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

+  <children xmi:type="notation:Shape" xmi:id="_uGCMwMhqEeKmlJkz37Cc-A" type="2008">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zONAc8hqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAdMhqEeKmlJkz37Cc-A" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_uGCMwshqEeKmlJkz37Cc-A" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_uGCMw8hqEeKmlJkz37Cc-A" visible="false" type="7017">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uGCM0shqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uGCM08hqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAdchqEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_uGCMxMhqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_uGCMxchqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uGCMxshqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCMx8hqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_uGCMyMhqEeKmlJkz37Cc-A" type="7018">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uGCM1MhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uGCM1chqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rkcu4MhsEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <children xmi:type="notation:Shape" xmi:id="_uJZvMMh9EeKwLPTeb1CTLg" type="3011">

+        <element xmi:type="uml:Reception" href="01_SourceLeft_ClassDiagram_Reception_Added.uml#_uI9DQMh9EeKwLPTeb1CTLg"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_uJZvMch9EeKwLPTeb1CTLg"/>

+      </children>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_uGCMychqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_uGCMyshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uGCMy8hqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCMzMhqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_uGCMzchqEeKmlJkz37Cc-A" visible="false" type="7019">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uGCM1shqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uGCM18hqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_uGCMzshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_uGCMz8hqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uGCM0MhqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCM0chqEeKmlJkz37Cc-A"/>

+    </children>

+    <element xmi:type="uml:Class" href="01_SourceLeft_ClassDiagram_Reception_Added.uml#_uEswAMhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCMwchqEeKmlJkz37Cc-A" x="115" y="85" width="286" height="63"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_xZRfIMhqEeKmlJkz37Cc-A" type="2008">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zONAcMhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAcchqEeKmlJkz37Cc-A" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_xZRfIshqEeKmlJkz37Cc-A" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_xZRfI8hqEeKmlJkz37Cc-A" visible="false" type="7017">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xZRfMshqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZRfM8hqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAcshqEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_xZRfJMhqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_xZRfJchqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xZRfJshqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfJ8hqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_xZRfKMhqEeKmlJkz37Cc-A" type="7018">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xZRfNMhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZRfNchqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_w7TpYMhtEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <children xmi:type="notation:Shape" xmi:id="_wQ8DcMh9EeKwLPTeb1CTLg" type="3011">

+        <element xmi:type="uml:Reception" href="01_SourceLeft_ClassDiagram_Reception_Added.uml#_uI9DQMh9EeKwLPTeb1CTLg"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_wQ8Dcch9EeKwLPTeb1CTLg"/>

+      </children>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_xZRfKchqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_xZRfKshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xZRfK8hqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfLMhqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_xZRfLchqEeKmlJkz37Cc-A" visible="false" type="7019">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xZXlwMhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZXlwchqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_xZRfLshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_xZRfL8hqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xZRfMMhqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfMchqEeKmlJkz37Cc-A"/>

+    </children>

+    <element xmi:type="uml:Class" href="01_SourceLeft_ClassDiagram_Reception_Added.uml#_xZFR4MhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfIchqEeKmlJkz37Cc-A" x="115" y="215" width="286" height="63"/>

+  </children>

+  <styles xmi:type="notation:DiagramStyle" xmi:id="_r-5hIchqEeKmlJkz37Cc-A"/>

+  <element xmi:type="uml:Model" href="01_SourceLeft_ClassDiagram_Reception_Added.uml#_r-nNQMhqEeKmlJkz37Cc-A"/>

+</notation:Diagram>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Reception/ADD/01_SourceLeft_ClassDiagram_Reception_Added.uml b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Reception/ADD/01_SourceLeft_ClassDiagram_Reception_Added.uml
new file mode 100644
index 00000000000..6c2d3480c29
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Reception/ADD/01_SourceLeft_ClassDiagram_Reception_Added.uml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_r-nNQMhqEeKmlJkz37Cc-A" name="model">

+  <packagedElement xmi:type="uml:Class" xmi:id="_uEswAMhqEeKmlJkz37Cc-A" name="A">

+    <ownedReception xmi:id="_uI9DQMh9EeKwLPTeb1CTLg" name="R"/>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Class" xmi:id="_xZFR4MhqEeKmlJkz37Cc-A" name="B">

+    <generalization xmi:id="_7-CeYMhqEeKmlJkz37Cc-A" general="_uEswAMhqEeKmlJkz37Cc-A"/>

+  </packagedElement>

+</uml:Model>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Reception/ADD/02_SourceLeft_ClassDiagram_Reception_Added.di b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Reception/ADD/02_SourceLeft_ClassDiagram_Reception_Added.di
new file mode 100644
index 00000000000..9e851d3a22a
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Reception/ADD/02_SourceLeft_ClassDiagram_Reception_Added.di
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

+  <pageList>

+    <availablePage>

+      <emfPageIdentifier href="02_SourceLeft_ClassDiagram_Reception_Added.notation#_r-5hIMhqEeKmlJkz37Cc-A"/>

+    </availablePage>

+  </pageList>

+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

+    <windows>

+      <children xsi:type="di:TabFolder">

+        <children>

+          <emfPageIdentifier href="02_SourceLeft_ClassDiagram_Reception_Added.notation#_r-5hIMhqEeKmlJkz37Cc-A"/>

+        </children>

+      </children>

+    </windows>

+  </sashModel>

+</di:SashWindowsMngr>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Reception/ADD/02_SourceLeft_ClassDiagram_Reception_Added.notation b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Reception/ADD/02_SourceLeft_ClassDiagram_Reception_Added.notation
new file mode 100644
index 00000000000..70e47e079ed
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Reception/ADD/02_SourceLeft_ClassDiagram_Reception_Added.notation
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_r-5hIMhqEeKmlJkz37Cc-A" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

+  <children xmi:type="notation:Shape" xmi:id="_uGCMwMhqEeKmlJkz37Cc-A" type="2008">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zONAc8hqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAdMhqEeKmlJkz37Cc-A" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_uGCMwshqEeKmlJkz37Cc-A" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_uGCMw8hqEeKmlJkz37Cc-A" visible="false" type="7017">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uGCM0shqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uGCM08hqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAdchqEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_uGCMxMhqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_uGCMxchqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uGCMxshqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCMx8hqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_uGCMyMhqEeKmlJkz37Cc-A" type="7018">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uGCM1MhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uGCM1chqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rkcu4MhsEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <children xmi:type="notation:Shape" xmi:id="_uJZvMMh9EeKwLPTeb1CTLg" type="3011">

+        <element xmi:type="uml:Reception" href="02_SourceLeft_ClassDiagram_Reception_Added.uml#_uI9DQMh9EeKwLPTeb1CTLg"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_uJZvMch9EeKwLPTeb1CTLg"/>

+      </children>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_uGCMychqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_uGCMyshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uGCMy8hqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCMzMhqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_uGCMzchqEeKmlJkz37Cc-A" visible="false" type="7019">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uGCM1shqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uGCM18hqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_uGCMzshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_uGCMz8hqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uGCM0MhqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCM0chqEeKmlJkz37Cc-A"/>

+    </children>

+    <element xmi:type="uml:Class" href="02_SourceLeft_ClassDiagram_Reception_Added.uml#_uEswAMhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCMwchqEeKmlJkz37Cc-A" x="115" y="85" width="286" height="63"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_xZRfIMhqEeKmlJkz37Cc-A" type="2008">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zONAcMhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAcchqEeKmlJkz37Cc-A" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_xZRfIshqEeKmlJkz37Cc-A" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_xZRfI8hqEeKmlJkz37Cc-A" visible="false" type="7017">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xZRfMshqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZRfM8hqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAcshqEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_xZRfJMhqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_xZRfJchqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xZRfJshqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfJ8hqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_xZRfKMhqEeKmlJkz37Cc-A" type="7018">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xZRfNMhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZRfNchqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_w7TpYMhtEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_xZRfKchqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_xZRfKshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xZRfK8hqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfLMhqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_xZRfLchqEeKmlJkz37Cc-A" visible="false" type="7019">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xZXlwMhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZXlwchqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_xZRfLshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_xZRfL8hqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xZRfMMhqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfMchqEeKmlJkz37Cc-A"/>

+    </children>

+    <element xmi:type="uml:Class" href="02_SourceLeft_ClassDiagram_Reception_Added.uml#_xZFR4MhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfIchqEeKmlJkz37Cc-A" x="115" y="215" width="286" height="63"/>

+  </children>

+  <styles xmi:type="notation:DiagramStyle" xmi:id="_r-5hIchqEeKmlJkz37Cc-A"/>

+  <element xmi:type="uml:Model" href="02_SourceLeft_ClassDiagram_Reception_Added.uml#_r-nNQMhqEeKmlJkz37Cc-A"/>

+</notation:Diagram>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Reception/ADD/02_SourceLeft_ClassDiagram_Reception_Added.uml b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Reception/ADD/02_SourceLeft_ClassDiagram_Reception_Added.uml
new file mode 100644
index 00000000000..e44764a383a
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Reception/ADD/02_SourceLeft_ClassDiagram_Reception_Added.uml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_r-nNQMhqEeKmlJkz37Cc-A" name="model">

+  <packagedElement xmi:type="uml:Class" xmi:id="_uEswAMhqEeKmlJkz37Cc-A" name="A">

+    <ownedReception xmi:id="_uI9DQMh9EeKwLPTeb1CTLg" name="R"/>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Class" xmi:id="_xZFR4MhqEeKmlJkz37Cc-A" name="B"/>

+</uml:Model>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Reception/DELETE/01_SourceLeft_ClassDiagram_Reception_Deleted.di b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Reception/DELETE/01_SourceLeft_ClassDiagram_Reception_Deleted.di
new file mode 100644
index 00000000000..9ff10e9b805
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Reception/DELETE/01_SourceLeft_ClassDiagram_Reception_Deleted.di
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

+  <pageList>

+    <availablePage>

+      <emfPageIdentifier href="01_SourceLeft_ClassDiagram_Reception_Deleted.notation#_r-5hIMhqEeKmlJkz37Cc-A"/>

+    </availablePage>

+  </pageList>

+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

+    <windows>

+      <children xsi:type="di:TabFolder">

+        <children>

+          <emfPageIdentifier href="01_SourceLeft_ClassDiagram_Reception_Deleted.notation#_r-5hIMhqEeKmlJkz37Cc-A"/>

+        </children>

+      </children>

+    </windows>

+  </sashModel>

+</di:SashWindowsMngr>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Reception/DELETE/01_SourceLeft_ClassDiagram_Reception_Deleted.notation b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Reception/DELETE/01_SourceLeft_ClassDiagram_Reception_Deleted.notation
new file mode 100644
index 00000000000..96097a74867
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Reception/DELETE/01_SourceLeft_ClassDiagram_Reception_Deleted.notation
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_r-5hIMhqEeKmlJkz37Cc-A" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

+  <children xmi:type="notation:Shape" xmi:id="_uGCMwMhqEeKmlJkz37Cc-A" type="2008">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zONAc8hqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAdMhqEeKmlJkz37Cc-A" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_uGCMwshqEeKmlJkz37Cc-A" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_uGCMw8hqEeKmlJkz37Cc-A" visible="false" type="7017">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uGCM0shqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uGCM08hqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAdchqEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_uGCMxMhqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_uGCMxchqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uGCMxshqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCMx8hqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_uGCMyMhqEeKmlJkz37Cc-A" type="7018">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uGCM1MhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uGCM1chqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rkcu4MhsEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <children xmi:type="notation:Shape" xmi:id="_uJZvMMh9EeKwLPTeb1CTLg" type="3011">

+        <element xmi:type="uml:Reception" href="01_SourceLeft_ClassDiagram_Reception_Deleted.uml#_uI9DQMh9EeKwLPTeb1CTLg"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_uJZvMch9EeKwLPTeb1CTLg"/>

+      </children>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_uGCMychqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_uGCMyshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uGCMy8hqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCMzMhqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_uGCMzchqEeKmlJkz37Cc-A" visible="false" type="7019">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uGCM1shqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uGCM18hqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_uGCMzshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_uGCMz8hqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uGCM0MhqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCM0chqEeKmlJkz37Cc-A"/>

+    </children>

+    <element xmi:type="uml:Class" href="01_SourceLeft_ClassDiagram_Reception_Deleted.uml#_uEswAMhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCMwchqEeKmlJkz37Cc-A" x="115" y="85" width="286" height="63"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_xZRfIMhqEeKmlJkz37Cc-A" type="2008">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zONAcMhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAcchqEeKmlJkz37Cc-A" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_xZRfIshqEeKmlJkz37Cc-A" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_xZRfI8hqEeKmlJkz37Cc-A" visible="false" type="7017">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xZRfMshqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZRfM8hqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAcshqEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_xZRfJMhqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_xZRfJchqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xZRfJshqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfJ8hqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_xZRfKMhqEeKmlJkz37Cc-A" type="7018">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xZRfNMhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZRfNchqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_w7TpYMhtEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_xZRfKchqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_xZRfKshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xZRfK8hqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfLMhqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_xZRfLchqEeKmlJkz37Cc-A" visible="false" type="7019">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xZXlwMhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZXlwchqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_xZRfLshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_xZRfL8hqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xZRfMMhqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfMchqEeKmlJkz37Cc-A"/>

+    </children>

+    <element xmi:type="uml:Class" href="01_SourceLeft_ClassDiagram_Reception_Deleted.uml#_xZFR4MhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfIchqEeKmlJkz37Cc-A" x="115" y="215" width="286" height="63"/>

+  </children>

+  <styles xmi:type="notation:DiagramStyle" xmi:id="_r-5hIchqEeKmlJkz37Cc-A"/>

+  <element xmi:type="uml:Model" href="01_SourceLeft_ClassDiagram_Reception_Deleted.uml#_r-nNQMhqEeKmlJkz37Cc-A"/>

+</notation:Diagram>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Reception/DELETE/01_SourceLeft_ClassDiagram_Reception_Deleted.uml b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Reception/DELETE/01_SourceLeft_ClassDiagram_Reception_Deleted.uml
new file mode 100644
index 00000000000..e44764a383a
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Reception/DELETE/01_SourceLeft_ClassDiagram_Reception_Deleted.uml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_r-nNQMhqEeKmlJkz37Cc-A" name="model">

+  <packagedElement xmi:type="uml:Class" xmi:id="_uEswAMhqEeKmlJkz37Cc-A" name="A">

+    <ownedReception xmi:id="_uI9DQMh9EeKwLPTeb1CTLg" name="R"/>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Class" xmi:id="_xZFR4MhqEeKmlJkz37Cc-A" name="B"/>

+</uml:Model>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Reception/DELETE/02_SourceLeft_ClassDiagram_Reception_Deleted.di b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Reception/DELETE/02_SourceLeft_ClassDiagram_Reception_Deleted.di
new file mode 100644
index 00000000000..7b6f8c45adc
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Reception/DELETE/02_SourceLeft_ClassDiagram_Reception_Deleted.di
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

+  <pageList>

+    <availablePage>

+      <emfPageIdentifier href="02_SourceLeft_ClassDiagram_Reception_Deleted.notation#_r-5hIMhqEeKmlJkz37Cc-A"/>

+    </availablePage>

+  </pageList>

+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

+    <windows>

+      <children xsi:type="di:TabFolder">

+        <children>

+          <emfPageIdentifier href="02_SourceLeft_ClassDiagram_Reception_Deleted.notation#_r-5hIMhqEeKmlJkz37Cc-A"/>

+        </children>

+      </children>

+    </windows>

+  </sashModel>

+</di:SashWindowsMngr>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Reception/DELETE/02_SourceLeft_ClassDiagram_Reception_Deleted.notation b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Reception/DELETE/02_SourceLeft_ClassDiagram_Reception_Deleted.notation
new file mode 100644
index 00000000000..915f5f18eb3
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Reception/DELETE/02_SourceLeft_ClassDiagram_Reception_Deleted.notation
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_r-5hIMhqEeKmlJkz37Cc-A" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

+  <children xmi:type="notation:Shape" xmi:id="_uGCMwMhqEeKmlJkz37Cc-A" type="2008">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zONAc8hqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAdMhqEeKmlJkz37Cc-A" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_uGCMwshqEeKmlJkz37Cc-A" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_uGCMw8hqEeKmlJkz37Cc-A" visible="false" type="7017">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uGCM0shqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uGCM08hqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAdchqEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_uGCMxMhqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_uGCMxchqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uGCMxshqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCMx8hqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_uGCMyMhqEeKmlJkz37Cc-A" type="7018">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uGCM1MhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uGCM1chqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rkcu4MhsEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <children xmi:type="notation:Shape" xmi:id="_uJZvMMh9EeKwLPTeb1CTLg" type="3011">

+        <element xmi:type="uml:Reception" href="02_SourceLeft_ClassDiagram_Reception_Deleted.uml#_uI9DQMh9EeKwLPTeb1CTLg"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_uJZvMch9EeKwLPTeb1CTLg"/>

+      </children>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_uGCMychqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_uGCMyshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uGCMy8hqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCMzMhqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_uGCMzchqEeKmlJkz37Cc-A" visible="false" type="7019">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uGCM1shqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uGCM18hqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_uGCMzshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_uGCMz8hqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_uGCM0MhqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCM0chqEeKmlJkz37Cc-A"/>

+    </children>

+    <element xmi:type="uml:Class" href="02_SourceLeft_ClassDiagram_Reception_Deleted.uml#_uEswAMhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uGCMwchqEeKmlJkz37Cc-A" x="115" y="85" width="286" height="63"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_xZRfIMhqEeKmlJkz37Cc-A" type="2008">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zONAcMhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAcchqEeKmlJkz37Cc-A" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_xZRfIshqEeKmlJkz37Cc-A" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_xZRfI8hqEeKmlJkz37Cc-A" visible="false" type="7017">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xZRfMshqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZRfM8hqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zONAcshqEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_xZRfJMhqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_xZRfJchqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xZRfJshqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfJ8hqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_xZRfKMhqEeKmlJkz37Cc-A" type="7018">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xZRfNMhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZRfNchqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_w7TpYMhtEeKmlJkz37Cc-A" key="visible" value="true"/>

+      </eAnnotations>

+      <children xmi:type="notation:Shape" xmi:id="_wQ8DcMh9EeKwLPTeb1CTLg" type="3011">

+        <element xmi:type="uml:Reception" href="02_SourceLeft_ClassDiagram_Reception_Deleted.uml#_uI9DQMh9EeKwLPTeb1CTLg"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_wQ8Dcch9EeKwLPTeb1CTLg"/>

+      </children>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_xZRfKchqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_xZRfKshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xZRfK8hqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfLMhqEeKmlJkz37Cc-A"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_xZRfLchqEeKmlJkz37Cc-A" visible="false" type="7019">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xZXlwMhqEeKmlJkz37Cc-A" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xZXlwchqEeKmlJkz37Cc-A" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_xZRfLshqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_xZRfL8hqEeKmlJkz37Cc-A"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_xZRfMMhqEeKmlJkz37Cc-A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfMchqEeKmlJkz37Cc-A"/>

+    </children>

+    <element xmi:type="uml:Class" href="02_SourceLeft_ClassDiagram_Reception_Deleted.uml#_xZFR4MhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZRfIchqEeKmlJkz37Cc-A" x="115" y="215" width="286" height="63"/>

+  </children>

+  <styles xmi:type="notation:DiagramStyle" xmi:id="_r-5hIchqEeKmlJkz37Cc-A"/>

+  <element xmi:type="uml:Model" href="02_SourceLeft_ClassDiagram_Reception_Deleted.uml#_r-nNQMhqEeKmlJkz37Cc-A"/>

+</notation:Diagram>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Reception/DELETE/02_SourceLeft_ClassDiagram_Reception_Deleted.uml b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Reception/DELETE/02_SourceLeft_ClassDiagram_Reception_Deleted.uml
new file mode 100644
index 00000000000..6c2d3480c29
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/ClassDiagram/Reception/DELETE/02_SourceLeft_ClassDiagram_Reception_Deleted.uml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_r-nNQMhqEeKmlJkz37Cc-A" name="model">

+  <packagedElement xmi:type="uml:Class" xmi:id="_uEswAMhqEeKmlJkz37Cc-A" name="A">

+    <ownedReception xmi:id="_uI9DQMh9EeKwLPTeb1CTLg" name="R"/>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Class" xmi:id="_xZFR4MhqEeKmlJkz37Cc-A" name="B">

+    <generalization xmi:id="_7-CeYMhqEeKmlJkz37Cc-A" general="_uEswAMhqEeKmlJkz37Cc-A"/>

+  </packagedElement>

+</uml:Model>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Connector/ADD/01_SourceLeft_CompositeDiagram_Connector_Added.di b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Connector/ADD/01_SourceLeft_CompositeDiagram_Connector_Added.di
new file mode 100644
index 00000000000..40ffb6f80c1
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Connector/ADD/01_SourceLeft_CompositeDiagram_Connector_Added.di
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

+  <pageList>

+    <availablePage>

+      <emfPageIdentifier href="01_SourceLeft_CompositeDiagram_Connector_Added.notation#_H4mVsHegEeOvq8ZFMULkbQ"/>

+    </availablePage>

+  </pageList>

+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

+    <windows>

+      <children xsi:type="di:TabFolder">

+        <children>

+          <emfPageIdentifier href="01_SourceLeft_CompositeDiagram_Connector_Added.notation#_H4mVsHegEeOvq8ZFMULkbQ"/>

+        </children>

+      </children>

+    </windows>

+  </sashModel>

+</di:SashWindowsMngr>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Connector/ADD/01_SourceLeft_CompositeDiagram_Connector_Added.notation b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Connector/ADD/01_SourceLeft_CompositeDiagram_Connector_Added.notation
new file mode 100644
index 00000000000..335482644e8
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Connector/ADD/01_SourceLeft_CompositeDiagram_Connector_Added.notation
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_H4mVsHegEeOvq8ZFMULkbQ" type="CompositeStructure" name="NewDiagram" measurementUnit="Pixel">

+  <children xmi:type="notation:Shape" xmi:id="_JAntsHegEeOvq8ZFMULkbQ" type="2073" fontName="Segoe UI" lineColor="0">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_JAxesHegEeOvq8ZFMULkbQ" source="ShadowFigure">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_JAxesXegEeOvq8ZFMULkbQ" key="ShadowFigure_Value" value="false"/>

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_JAxesnegEeOvq8ZFMULkbQ" source="displayNameLabelIcon">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_JAxes3egEeOvq8ZFMULkbQ" key="displayNameLabelIcon_value" value="false"/>

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_JAxetHegEeOvq8ZFMULkbQ" source="QualifiedName">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_JAxetXegEeOvq8ZFMULkbQ" key="QualifiedNameDepth" value="1000"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_JAxetnegEeOvq8ZFMULkbQ" type="5156"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_JAxet3egEeOvq8ZFMULkbQ" type="7073">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_JAxeuHegEeOvq8ZFMULkbQ"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JAxeuXegEeOvq8ZFMULkbQ"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_JBNjkHegEeOvq8ZFMULkbQ" visible="false" type="compartment_shape_display">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_JBNjkXegEeOvq8ZFMULkbQ"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JBNjknegEeOvq8ZFMULkbQ"/>

+    </children>

+    <children xmi:type="notation:Shape" xmi:id="_KKuwYHegEeOvq8ZFMULkbQ" type="3069" fontName="Segoe UI" lineColor="0">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_KKuwYnegEeOvq8ZFMULkbQ" source="ShadowFigure">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_KKuwY3egEeOvq8ZFMULkbQ" key="ShadowFigure_Value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_KKuwZHegEeOvq8ZFMULkbQ" source="displayNameLabelIcon">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_KKuwZXegEeOvq8ZFMULkbQ" key="displayNameLabelIcon_value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_KKuwZnegEeOvq8ZFMULkbQ" source="QualifiedName">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_KKuwZ3egEeOvq8ZFMULkbQ" key="QualifiedNameDepth" value="1000"/>

+      </eAnnotations>

+      <children xmi:type="notation:DecorationNode" xmi:id="_KKuwaHegEeOvq8ZFMULkbQ" type="5125">

+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ThSQEHegEeOvq8ZFMULkbQ" source="CustomAppearance_Annotation">

+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UObC4HegEeOvq8ZFMULkbQ" key="CustomAppearance_MaskValue" value="524300"/>

+        </eAnnotations>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_KKuwaXegEeOvq8ZFMULkbQ" x="-15" y="24"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_KKuwanegEeOvq8ZFMULkbQ" type="6029">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_KKuwa3egEeOvq8ZFMULkbQ" x="25" y="-10"/>

+      </children>

+      <element xmi:type="uml:Port" href="01_SourceLeft_CompositeDiagram_Connector_Added.uml#_KKI6gHegEeOvq8ZFMULkbQ"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KKuwYXegEeOvq8ZFMULkbQ" x="-10" y="75" width="20" height="20"/>

+    </children>

+    <element xmi:type="uml:Class" href="01_SourceLeft_CompositeDiagram_Connector_Added.uml#_I9zDMHegEeOvq8ZFMULkbQ"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JAntsXegEeOvq8ZFMULkbQ" x="100" y="135" width="281" height="121"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_iyHV0XegEeOvq8ZFMULkbQ" type="2073" fontName="Segoe UI" lineColor="0">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iyHV03egEeOvq8ZFMULkbQ" source="ShadowFigure">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iyHV1HegEeOvq8ZFMULkbQ" key="ShadowFigure_Value" value="false"/>

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iyHV1XegEeOvq8ZFMULkbQ" source="displayNameLabelIcon">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iyHV1negEeOvq8ZFMULkbQ" key="displayNameLabelIcon_value" value="false"/>

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iyHV13egEeOvq8ZFMULkbQ" source="QualifiedName">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iyHV2HegEeOvq8ZFMULkbQ" key="QualifiedNameDepth" value="1000"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_iyHV2XegEeOvq8ZFMULkbQ" type="5156"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_iyHV2negEeOvq8ZFMULkbQ" type="7073">

+      <children xmi:type="notation:Shape" xmi:id="_vOIxoHegEeOvq8ZFMULkbQ" type="3070" fontName="Segoe UI" lineColor="0">

+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_vOIxonegEeOvq8ZFMULkbQ" source="ShadowFigure">

+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vOIxo3egEeOvq8ZFMULkbQ" key="ShadowFigure_Value" value="false"/>

+        </eAnnotations>

+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_vOIxpHegEeOvq8ZFMULkbQ" source="displayNameLabelIcon">

+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vOIxpXegEeOvq8ZFMULkbQ" key="displayNameLabelIcon_value" value="false"/>

+        </eAnnotations>

+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_vOIxpnegEeOvq8ZFMULkbQ" source="QualifiedName">

+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vOIxp3egEeOvq8ZFMULkbQ" key="QualifiedNameDepth" value="1000"/>

+        </eAnnotations>

+        <children xmi:type="notation:DecorationNode" xmi:id="_vOIxqHegEeOvq8ZFMULkbQ" type="5126"/>

+        <children xmi:type="notation:BasicCompartment" xmi:id="_vOIxqXegEeOvq8ZFMULkbQ" visible="false" type="7077">

+          <styles xmi:type="notation:TitleStyle" xmi:id="_vOIxqnegEeOvq8ZFMULkbQ" showTitle="true"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vOIxq3egEeOvq8ZFMULkbQ"/>

+        </children>

+        <children xmi:type="notation:BasicCompartment" xmi:id="_vOR7kHegEeOvq8ZFMULkbQ" visible="false" type="compartment_shape_display">

+          <styles xmi:type="notation:TitleStyle" xmi:id="_vOR7kXegEeOvq8ZFMULkbQ"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vOR7knegEeOvq8ZFMULkbQ"/>

+        </children>

+        <element xmi:type="uml:Property" href="01_SourceLeft_CompositeDiagram_Connector_Added.uml#_MAR8wHegEeOvq8ZFMULkbQ"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vOIxoXegEeOvq8ZFMULkbQ" x="75" y="25" width="171"/>

+      </children>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_iyHV23egEeOvq8ZFMULkbQ"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iyHV3HegEeOvq8ZFMULkbQ"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_iyaQwHegEeOvq8ZFMULkbQ" visible="false" type="compartment_shape_display">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_iyaQwXegEeOvq8ZFMULkbQ"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iyaQwnegEeOvq8ZFMULkbQ"/>

+    </children>

+    <children xmi:type="notation:Shape" xmi:id="_vOIxrHegEeOvq8ZFMULkbQ" type="3069" fontName="Segoe UI" lineColor="0">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_vOIxrnegEeOvq8ZFMULkbQ" source="ShadowFigure">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vOIxr3egEeOvq8ZFMULkbQ" key="ShadowFigure_Value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_vOIxsHegEeOvq8ZFMULkbQ" source="displayNameLabelIcon">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vOIxsXegEeOvq8ZFMULkbQ" key="displayNameLabelIcon_value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_vOIxsnegEeOvq8ZFMULkbQ" source="QualifiedName">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vOIxs3egEeOvq8ZFMULkbQ" key="QualifiedNameDepth" value="1000"/>

+      </eAnnotations>

+      <children xmi:type="notation:DecorationNode" xmi:id="_vOIxtHegEeOvq8ZFMULkbQ" type="5125">

+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_07QFcHegEeOvq8ZFMULkbQ" source="CustomAppearance_Annotation">

+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1QsJ8HegEeOvq8ZFMULkbQ" key="CustomAppearance_MaskValue" value="524300"/>

+        </eAnnotations>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_vOIxtXegEeOvq8ZFMULkbQ" x="-20" y="30"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_vOIxtnegEeOvq8ZFMULkbQ" type="6029">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_vOIxt3egEeOvq8ZFMULkbQ" x="25" y="-10"/>

+      </children>

+      <element xmi:type="uml:Port" href="01_SourceLeft_CompositeDiagram_Connector_Added.uml#_KKI6gHegEeOvq8ZFMULkbQ"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vOIxrXegEeOvq8ZFMULkbQ" x="-10" y="60"/>

+    </children>

+    <element xmi:type="uml:Class" href="01_SourceLeft_CompositeDiagram_Connector_Added.uml#_iyHV0HegEeOvq8ZFMULkbQ"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iyHV0negEeOvq8ZFMULkbQ" x="100" y="320" width="281" height="121"/>

+  </children>

+  <styles xmi:type="notation:DiagramStyle" xmi:id="_H4mVsXegEeOvq8ZFMULkbQ"/>

+  <element xmi:type="uml:Model" href="01_SourceLeft_CompositeDiagram_Connector_Added.uml#_H3ap8HegEeOvq8ZFMULkbQ"/>

+  <edges xmi:type="notation:Connector" xmi:id="_3Arg4HegEeOvq8ZFMULkbQ" type="4013" source="_vOIxrHegEeOvq8ZFMULkbQ" target="_vOIxoHegEeOvq8ZFMULkbQ" lineColor="0">

+    <children xmi:type="notation:DecorationNode" xmi:id="_3Arg43egEeOvq8ZFMULkbQ" type="6025">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_3Arg5HegEeOvq8ZFMULkbQ" y="60"/>

+    </children>

+    <children xmi:type="notation:DecorationNode" xmi:id="_3Arg5XegEeOvq8ZFMULkbQ" visible="false" type="6050">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_3Arg5negEeOvq8ZFMULkbQ" y="-20"/>

+    </children>

+    <children xmi:type="notation:DecorationNode" xmi:id="_3Arg53egEeOvq8ZFMULkbQ" visible="false" type="6051">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_3Arg6HegEeOvq8ZFMULkbQ" y="20"/>

+    </children>

+    <children xmi:type="notation:DecorationNode" xmi:id="_3Arg6XegEeOvq8ZFMULkbQ" visible="false" type="6052">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_3Arg6negEeOvq8ZFMULkbQ" y="20"/>

+    </children>

+    <styles xmi:type="notation:FontStyle" xmi:id="_3Arg4XegEeOvq8ZFMULkbQ" fontName="Segoe UI"/>

+    <element xmi:type="uml:Connector" href="01_SourceLeft_CompositeDiagram_Connector_Added.uml#_OGBhQHegEeOvq8ZFMULkbQ"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3Arg4negEeOvq8ZFMULkbQ" points="[10, 0, -155, 0]$[80, 0, -85, 0]"/>

+  </edges>

+</notation:Diagram>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Connector/ADD/01_SourceLeft_CompositeDiagram_Connector_Added.uml b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Connector/ADD/01_SourceLeft_CompositeDiagram_Connector_Added.uml
new file mode 100644
index 00000000000..7b5c1cca06d
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Connector/ADD/01_SourceLeft_CompositeDiagram_Connector_Added.uml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_H3ap8HegEeOvq8ZFMULkbQ" name="model">

+  <packagedElement xmi:type="uml:Class" xmi:id="_I9zDMHegEeOvq8ZFMULkbQ" name="A">

+    <ownedAttribute xmi:type="uml:Port" xmi:id="_KKI6gHegEeOvq8ZFMULkbQ" name="p" aggregation="composite"/>

+    <ownedAttribute xmi:type="uml:Property" xmi:id="_MAR8wHegEeOvq8ZFMULkbQ" name="q"/>

+    <ownedConnector xmi:type="uml:Connector" xmi:id="_OGBhQHegEeOvq8ZFMULkbQ" name="Connector1">

+      <end xmi:type="uml:ConnectorEnd" xmi:id="_OGKrMHegEeOvq8ZFMULkbQ" role="_KKI6gHegEeOvq8ZFMULkbQ">

+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_OGKrMXegEeOvq8ZFMULkbQ" value="1"/>

+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OGKrMnegEeOvq8ZFMULkbQ" value="1"/>

+      </end>

+      <end xmi:type="uml:ConnectorEnd" xmi:id="_OGKrM3egEeOvq8ZFMULkbQ" role="_MAR8wHegEeOvq8ZFMULkbQ">

+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_OGKrNHegEeOvq8ZFMULkbQ" value="1"/>

+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OGKrNXegEeOvq8ZFMULkbQ" value="1"/>

+      </end>

+    </ownedConnector>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Class" xmi:id="_iyHV0HegEeOvq8ZFMULkbQ" name="B">

+    <generalization xmi:type="uml:Generalization" xmi:id="_rYsKEHegEeOvq8ZFMULkbQ" general="_I9zDMHegEeOvq8ZFMULkbQ"/>

+  </packagedElement>

+</uml:Model>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Connector/ADD/02_SourceLeft_CompositeDiagram_Connector_Added.di b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Connector/ADD/02_SourceLeft_CompositeDiagram_Connector_Added.di
new file mode 100644
index 00000000000..035ee089d98
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Connector/ADD/02_SourceLeft_CompositeDiagram_Connector_Added.di
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

+  <pageList>

+    <availablePage>

+      <emfPageIdentifier href="02_SourceLeft_CompositeDiagram_Connector_Added.notation#_H4mVsHegEeOvq8ZFMULkbQ"/>

+    </availablePage>

+  </pageList>

+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

+    <windows>

+      <children xsi:type="di:TabFolder">

+        <children>

+          <emfPageIdentifier href="02_SourceLeft_CompositeDiagram_Connector_Added.notation#_H4mVsHegEeOvq8ZFMULkbQ"/>

+        </children>

+      </children>

+    </windows>

+  </sashModel>

+</di:SashWindowsMngr>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Connector/ADD/02_SourceLeft_CompositeDiagram_Connector_Added.notation b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Connector/ADD/02_SourceLeft_CompositeDiagram_Connector_Added.notation
new file mode 100644
index 00000000000..f66c66dc6e6
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Connector/ADD/02_SourceLeft_CompositeDiagram_Connector_Added.notation
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_H4mVsHegEeOvq8ZFMULkbQ" type="CompositeStructure" name="NewDiagram" measurementUnit="Pixel">

+  <children xmi:type="notation:Shape" xmi:id="_JAntsHegEeOvq8ZFMULkbQ" type="2073" fontName="Segoe UI" lineColor="0">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_JAxesHegEeOvq8ZFMULkbQ" source="ShadowFigure">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_JAxesXegEeOvq8ZFMULkbQ" key="ShadowFigure_Value" value="false"/>

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_JAxesnegEeOvq8ZFMULkbQ" source="displayNameLabelIcon">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_JAxes3egEeOvq8ZFMULkbQ" key="displayNameLabelIcon_value" value="false"/>

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_JAxetHegEeOvq8ZFMULkbQ" source="QualifiedName">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_JAxetXegEeOvq8ZFMULkbQ" key="QualifiedNameDepth" value="1000"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_JAxetnegEeOvq8ZFMULkbQ" type="5156"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_JAxet3egEeOvq8ZFMULkbQ" type="7073">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_JAxeuHegEeOvq8ZFMULkbQ"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JAxeuXegEeOvq8ZFMULkbQ"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_JBNjkHegEeOvq8ZFMULkbQ" visible="false" type="compartment_shape_display">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_JBNjkXegEeOvq8ZFMULkbQ"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JBNjknegEeOvq8ZFMULkbQ"/>

+    </children>

+    <children xmi:type="notation:Shape" xmi:id="_KKuwYHegEeOvq8ZFMULkbQ" type="3069" fontName="Segoe UI" lineColor="0">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_KKuwYnegEeOvq8ZFMULkbQ" source="ShadowFigure">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_KKuwY3egEeOvq8ZFMULkbQ" key="ShadowFigure_Value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_KKuwZHegEeOvq8ZFMULkbQ" source="displayNameLabelIcon">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_KKuwZXegEeOvq8ZFMULkbQ" key="displayNameLabelIcon_value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_KKuwZnegEeOvq8ZFMULkbQ" source="QualifiedName">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_KKuwZ3egEeOvq8ZFMULkbQ" key="QualifiedNameDepth" value="1000"/>

+      </eAnnotations>

+      <children xmi:type="notation:DecorationNode" xmi:id="_KKuwaHegEeOvq8ZFMULkbQ" type="5125">

+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ThSQEHegEeOvq8ZFMULkbQ" source="CustomAppearance_Annotation">

+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UObC4HegEeOvq8ZFMULkbQ" key="CustomAppearance_MaskValue" value="524300"/>

+        </eAnnotations>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_KKuwaXegEeOvq8ZFMULkbQ" x="-15" y="24"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_KKuwanegEeOvq8ZFMULkbQ" type="6029">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_KKuwa3egEeOvq8ZFMULkbQ" x="25" y="-10"/>

+      </children>

+      <element xmi:type="uml:Port" href="02_SourceLeft_CompositeDiagram_Connector_Added.uml#_KKI6gHegEeOvq8ZFMULkbQ"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KKuwYXegEeOvq8ZFMULkbQ" x="-10" y="75" width="20" height="20"/>

+    </children>

+    <element xmi:type="uml:Class" href="02_SourceLeft_CompositeDiagram_Connector_Added.uml#_I9zDMHegEeOvq8ZFMULkbQ"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JAntsXegEeOvq8ZFMULkbQ" x="100" y="135" width="281" height="121"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_iyHV0XegEeOvq8ZFMULkbQ" type="2073" fontName="Segoe UI" lineColor="0">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iyHV03egEeOvq8ZFMULkbQ" source="ShadowFigure">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iyHV1HegEeOvq8ZFMULkbQ" key="ShadowFigure_Value" value="false"/>

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iyHV1XegEeOvq8ZFMULkbQ" source="displayNameLabelIcon">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iyHV1negEeOvq8ZFMULkbQ" key="displayNameLabelIcon_value" value="false"/>

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iyHV13egEeOvq8ZFMULkbQ" source="QualifiedName">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iyHV2HegEeOvq8ZFMULkbQ" key="QualifiedNameDepth" value="1000"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_iyHV2XegEeOvq8ZFMULkbQ" type="5156"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_iyHV2negEeOvq8ZFMULkbQ" type="7073">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_iyHV23egEeOvq8ZFMULkbQ"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iyHV3HegEeOvq8ZFMULkbQ"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_iyaQwHegEeOvq8ZFMULkbQ" visible="false" type="compartment_shape_display">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_iyaQwXegEeOvq8ZFMULkbQ"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iyaQwnegEeOvq8ZFMULkbQ"/>

+    </children>

+    <element xmi:type="uml:Class" href="02_SourceLeft_CompositeDiagram_Connector_Added.uml#_iyHV0HegEeOvq8ZFMULkbQ"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iyHV0negEeOvq8ZFMULkbQ" x="100" y="320" width="281" height="121"/>

+  </children>

+  <styles xmi:type="notation:DiagramStyle" xmi:id="_H4mVsXegEeOvq8ZFMULkbQ"/>

+  <element xmi:type="uml:Model" href="02_SourceLeft_CompositeDiagram_Connector_Added.uml#_H3ap8HegEeOvq8ZFMULkbQ"/>

+</notation:Diagram>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Connector/ADD/02_SourceLeft_CompositeDiagram_Connector_Added.uml b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Connector/ADD/02_SourceLeft_CompositeDiagram_Connector_Added.uml
new file mode 100644
index 00000000000..ba7c48eca7f
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Connector/ADD/02_SourceLeft_CompositeDiagram_Connector_Added.uml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_H3ap8HegEeOvq8ZFMULkbQ" name="model">

+  <packagedElement xmi:type="uml:Class" xmi:id="_I9zDMHegEeOvq8ZFMULkbQ" name="A">

+    <ownedAttribute xmi:type="uml:Port" xmi:id="_KKI6gHegEeOvq8ZFMULkbQ" name="p" aggregation="composite"/>

+    <ownedAttribute xmi:type="uml:Property" xmi:id="_MAR8wHegEeOvq8ZFMULkbQ" name="q"/>

+    <ownedConnector xmi:type="uml:Connector" xmi:id="_OGBhQHegEeOvq8ZFMULkbQ" name="Connector1">

+      <end xmi:type="uml:ConnectorEnd" xmi:id="_OGKrMHegEeOvq8ZFMULkbQ" role="_KKI6gHegEeOvq8ZFMULkbQ">

+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_OGKrMXegEeOvq8ZFMULkbQ" value="1"/>

+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OGKrMnegEeOvq8ZFMULkbQ" value="1"/>

+      </end>

+      <end xmi:type="uml:ConnectorEnd" xmi:id="_OGKrM3egEeOvq8ZFMULkbQ" role="_MAR8wHegEeOvq8ZFMULkbQ">

+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_OGKrNHegEeOvq8ZFMULkbQ" value="1"/>

+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OGKrNXegEeOvq8ZFMULkbQ" value="1"/>

+      </end>

+    </ownedConnector>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Class" xmi:id="_iyHV0HegEeOvq8ZFMULkbQ" name="B"/>

+</uml:Model>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Connector/DELETE/01_SourceLeft_CompositeDiagram_Connector_Deleted.di b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Connector/DELETE/01_SourceLeft_CompositeDiagram_Connector_Deleted.di
new file mode 100644
index 00000000000..36b7ad68bf9
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Connector/DELETE/01_SourceLeft_CompositeDiagram_Connector_Deleted.di
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

+  <pageList>

+    <availablePage>

+      <emfPageIdentifier href="01_SourceLeft_CompositeDiagram_Connector_Deleted.notation#_H4mVsHegEeOvq8ZFMULkbQ"/>

+    </availablePage>

+  </pageList>

+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

+    <windows>

+      <children xsi:type="di:TabFolder">

+        <children>

+          <emfPageIdentifier href="01_SourceLeft_CompositeDiagram_Connector_Deleted.notation#_H4mVsHegEeOvq8ZFMULkbQ"/>

+        </children>

+      </children>

+    </windows>

+  </sashModel>

+</di:SashWindowsMngr>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Connector/DELETE/01_SourceLeft_CompositeDiagram_Connector_Deleted.notation b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Connector/DELETE/01_SourceLeft_CompositeDiagram_Connector_Deleted.notation
new file mode 100644
index 00000000000..d8d95528c62
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Connector/DELETE/01_SourceLeft_CompositeDiagram_Connector_Deleted.notation
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_H4mVsHegEeOvq8ZFMULkbQ" type="CompositeStructure" name="NewDiagram" measurementUnit="Pixel">

+  <children xmi:type="notation:Shape" xmi:id="_JAntsHegEeOvq8ZFMULkbQ" type="2073" fontName="Segoe UI" lineColor="0">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_JAxesHegEeOvq8ZFMULkbQ" source="ShadowFigure">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_JAxesXegEeOvq8ZFMULkbQ" key="ShadowFigure_Value" value="false"/>

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_JAxesnegEeOvq8ZFMULkbQ" source="displayNameLabelIcon">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_JAxes3egEeOvq8ZFMULkbQ" key="displayNameLabelIcon_value" value="false"/>

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_JAxetHegEeOvq8ZFMULkbQ" source="QualifiedName">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_JAxetXegEeOvq8ZFMULkbQ" key="QualifiedNameDepth" value="1000"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_JAxetnegEeOvq8ZFMULkbQ" type="5156"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_JAxet3egEeOvq8ZFMULkbQ" type="7073">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_JAxeuHegEeOvq8ZFMULkbQ"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JAxeuXegEeOvq8ZFMULkbQ"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_JBNjkHegEeOvq8ZFMULkbQ" visible="false" type="compartment_shape_display">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_JBNjkXegEeOvq8ZFMULkbQ"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JBNjknegEeOvq8ZFMULkbQ"/>

+    </children>

+    <children xmi:type="notation:Shape" xmi:id="_KKuwYHegEeOvq8ZFMULkbQ" type="3069" fontName="Segoe UI" lineColor="0">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_KKuwYnegEeOvq8ZFMULkbQ" source="ShadowFigure">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_KKuwY3egEeOvq8ZFMULkbQ" key="ShadowFigure_Value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_KKuwZHegEeOvq8ZFMULkbQ" source="displayNameLabelIcon">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_KKuwZXegEeOvq8ZFMULkbQ" key="displayNameLabelIcon_value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_KKuwZnegEeOvq8ZFMULkbQ" source="QualifiedName">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_KKuwZ3egEeOvq8ZFMULkbQ" key="QualifiedNameDepth" value="1000"/>

+      </eAnnotations>

+      <children xmi:type="notation:DecorationNode" xmi:id="_KKuwaHegEeOvq8ZFMULkbQ" type="5125">

+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ThSQEHegEeOvq8ZFMULkbQ" source="CustomAppearance_Annotation">

+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UObC4HegEeOvq8ZFMULkbQ" key="CustomAppearance_MaskValue" value="524300"/>

+        </eAnnotations>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_KKuwaXegEeOvq8ZFMULkbQ" x="-15" y="24"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_KKuwanegEeOvq8ZFMULkbQ" type="6029">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_KKuwa3egEeOvq8ZFMULkbQ" x="25" y="-10"/>

+      </children>

+      <element xmi:type="uml:Port" href="01_SourceLeft_CompositeDiagram_Connector_Deleted.uml#_KKI6gHegEeOvq8ZFMULkbQ"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KKuwYXegEeOvq8ZFMULkbQ" x="-10" y="75" width="20" height="20"/>

+    </children>

+    <element xmi:type="uml:Class" href="01_SourceLeft_CompositeDiagram_Connector_Deleted.uml#_I9zDMHegEeOvq8ZFMULkbQ"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JAntsXegEeOvq8ZFMULkbQ" x="100" y="135" width="281" height="121"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_iyHV0XegEeOvq8ZFMULkbQ" type="2073" fontName="Segoe UI" lineColor="0">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iyHV03egEeOvq8ZFMULkbQ" source="ShadowFigure">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iyHV1HegEeOvq8ZFMULkbQ" key="ShadowFigure_Value" value="false"/>

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iyHV1XegEeOvq8ZFMULkbQ" source="displayNameLabelIcon">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iyHV1negEeOvq8ZFMULkbQ" key="displayNameLabelIcon_value" value="false"/>

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iyHV13egEeOvq8ZFMULkbQ" source="QualifiedName">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iyHV2HegEeOvq8ZFMULkbQ" key="QualifiedNameDepth" value="1000"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_iyHV2XegEeOvq8ZFMULkbQ" type="5156"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_iyHV2negEeOvq8ZFMULkbQ" type="7073">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_iyHV23egEeOvq8ZFMULkbQ"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iyHV3HegEeOvq8ZFMULkbQ"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_iyaQwHegEeOvq8ZFMULkbQ" visible="false" type="compartment_shape_display">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_iyaQwXegEeOvq8ZFMULkbQ"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iyaQwnegEeOvq8ZFMULkbQ"/>

+    </children>

+    <element xmi:type="uml:Class" href="01_SourceLeft_CompositeDiagram_Connector_Deleted.uml#_iyHV0HegEeOvq8ZFMULkbQ"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iyHV0negEeOvq8ZFMULkbQ" x="100" y="320" width="281" height="121"/>

+  </children>

+  <styles xmi:type="notation:DiagramStyle" xmi:id="_H4mVsXegEeOvq8ZFMULkbQ"/>

+  <element xmi:type="uml:Model" href="01_SourceLeft_CompositeDiagram_Connector_Deleted.uml#_H3ap8HegEeOvq8ZFMULkbQ"/>

+</notation:Diagram>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Connector/DELETE/01_SourceLeft_CompositeDiagram_Connector_Deleted.uml b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Connector/DELETE/01_SourceLeft_CompositeDiagram_Connector_Deleted.uml
new file mode 100644
index 00000000000..ba7c48eca7f
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Connector/DELETE/01_SourceLeft_CompositeDiagram_Connector_Deleted.uml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_H3ap8HegEeOvq8ZFMULkbQ" name="model">

+  <packagedElement xmi:type="uml:Class" xmi:id="_I9zDMHegEeOvq8ZFMULkbQ" name="A">

+    <ownedAttribute xmi:type="uml:Port" xmi:id="_KKI6gHegEeOvq8ZFMULkbQ" name="p" aggregation="composite"/>

+    <ownedAttribute xmi:type="uml:Property" xmi:id="_MAR8wHegEeOvq8ZFMULkbQ" name="q"/>

+    <ownedConnector xmi:type="uml:Connector" xmi:id="_OGBhQHegEeOvq8ZFMULkbQ" name="Connector1">

+      <end xmi:type="uml:ConnectorEnd" xmi:id="_OGKrMHegEeOvq8ZFMULkbQ" role="_KKI6gHegEeOvq8ZFMULkbQ">

+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_OGKrMXegEeOvq8ZFMULkbQ" value="1"/>

+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OGKrMnegEeOvq8ZFMULkbQ" value="1"/>

+      </end>

+      <end xmi:type="uml:ConnectorEnd" xmi:id="_OGKrM3egEeOvq8ZFMULkbQ" role="_MAR8wHegEeOvq8ZFMULkbQ">

+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_OGKrNHegEeOvq8ZFMULkbQ" value="1"/>

+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OGKrNXegEeOvq8ZFMULkbQ" value="1"/>

+      </end>

+    </ownedConnector>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Class" xmi:id="_iyHV0HegEeOvq8ZFMULkbQ" name="B"/>

+</uml:Model>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Connector/DELETE/02_SourceLeft_CompositeDiagram_Connector_Deleted.di b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Connector/DELETE/02_SourceLeft_CompositeDiagram_Connector_Deleted.di
new file mode 100644
index 00000000000..f9d848b4353
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Connector/DELETE/02_SourceLeft_CompositeDiagram_Connector_Deleted.di
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

+  <pageList>

+    <availablePage>

+      <emfPageIdentifier href="02_SourceLeft_CompositeDiagram_Connector_Deleted.notation#_H4mVsHegEeOvq8ZFMULkbQ"/>

+    </availablePage>

+  </pageList>

+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

+    <windows>

+      <children xsi:type="di:TabFolder">

+        <children>

+          <emfPageIdentifier href="02_SourceLeft_CompositeDiagram_Connector_Deleted.notation#_H4mVsHegEeOvq8ZFMULkbQ"/>

+        </children>

+      </children>

+    </windows>

+  </sashModel>

+</di:SashWindowsMngr>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Connector/DELETE/02_SourceLeft_CompositeDiagram_Connector_Deleted.notation b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Connector/DELETE/02_SourceLeft_CompositeDiagram_Connector_Deleted.notation
new file mode 100644
index 00000000000..2f3f3af6039
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Connector/DELETE/02_SourceLeft_CompositeDiagram_Connector_Deleted.notation
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_H4mVsHegEeOvq8ZFMULkbQ" type="CompositeStructure" name="NewDiagram" measurementUnit="Pixel">

+  <children xmi:type="notation:Shape" xmi:id="_JAntsHegEeOvq8ZFMULkbQ" type="2073" fontName="Segoe UI" lineColor="0">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_JAxesHegEeOvq8ZFMULkbQ" source="ShadowFigure">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_JAxesXegEeOvq8ZFMULkbQ" key="ShadowFigure_Value" value="false"/>

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_JAxesnegEeOvq8ZFMULkbQ" source="displayNameLabelIcon">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_JAxes3egEeOvq8ZFMULkbQ" key="displayNameLabelIcon_value" value="false"/>

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_JAxetHegEeOvq8ZFMULkbQ" source="QualifiedName">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_JAxetXegEeOvq8ZFMULkbQ" key="QualifiedNameDepth" value="1000"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_JAxetnegEeOvq8ZFMULkbQ" type="5156"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_JAxet3egEeOvq8ZFMULkbQ" type="7073">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_JAxeuHegEeOvq8ZFMULkbQ"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JAxeuXegEeOvq8ZFMULkbQ"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_JBNjkHegEeOvq8ZFMULkbQ" visible="false" type="compartment_shape_display">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_JBNjkXegEeOvq8ZFMULkbQ"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JBNjknegEeOvq8ZFMULkbQ"/>

+    </children>

+    <children xmi:type="notation:Shape" xmi:id="_KKuwYHegEeOvq8ZFMULkbQ" type="3069" fontName="Segoe UI" lineColor="0">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_KKuwYnegEeOvq8ZFMULkbQ" source="ShadowFigure">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_KKuwY3egEeOvq8ZFMULkbQ" key="ShadowFigure_Value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_KKuwZHegEeOvq8ZFMULkbQ" source="displayNameLabelIcon">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_KKuwZXegEeOvq8ZFMULkbQ" key="displayNameLabelIcon_value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_KKuwZnegEeOvq8ZFMULkbQ" source="QualifiedName">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_KKuwZ3egEeOvq8ZFMULkbQ" key="QualifiedNameDepth" value="1000"/>

+      </eAnnotations>

+      <children xmi:type="notation:DecorationNode" xmi:id="_KKuwaHegEeOvq8ZFMULkbQ" type="5125">

+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ThSQEHegEeOvq8ZFMULkbQ" source="CustomAppearance_Annotation">

+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UObC4HegEeOvq8ZFMULkbQ" key="CustomAppearance_MaskValue" value="524300"/>

+        </eAnnotations>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_KKuwaXegEeOvq8ZFMULkbQ" x="-15" y="24"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_KKuwanegEeOvq8ZFMULkbQ" type="6029">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_KKuwa3egEeOvq8ZFMULkbQ" x="25" y="-10"/>

+      </children>

+      <element xmi:type="uml:Port" href="02_SourceLeft_CompositeDiagram_Connector_Deleted.uml#_KKI6gHegEeOvq8ZFMULkbQ"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KKuwYXegEeOvq8ZFMULkbQ" x="-10" y="75" width="20" height="20"/>

+    </children>

+    <element xmi:type="uml:Class" href="02_SourceLeft_CompositeDiagram_Connector_Deleted.uml#_I9zDMHegEeOvq8ZFMULkbQ"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JAntsXegEeOvq8ZFMULkbQ" x="100" y="135" width="281" height="121"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_iyHV0XegEeOvq8ZFMULkbQ" type="2073" fontName="Segoe UI" lineColor="0">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iyHV03egEeOvq8ZFMULkbQ" source="ShadowFigure">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iyHV1HegEeOvq8ZFMULkbQ" key="ShadowFigure_Value" value="false"/>

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iyHV1XegEeOvq8ZFMULkbQ" source="displayNameLabelIcon">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iyHV1negEeOvq8ZFMULkbQ" key="displayNameLabelIcon_value" value="false"/>

+    </eAnnotations>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iyHV13egEeOvq8ZFMULkbQ" source="QualifiedName">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iyHV2HegEeOvq8ZFMULkbQ" key="QualifiedNameDepth" value="1000"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_iyHV2XegEeOvq8ZFMULkbQ" type="5156"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_iyHV2negEeOvq8ZFMULkbQ" type="7073">

+      <children xmi:type="notation:Shape" xmi:id="_vOIxoHegEeOvq8ZFMULkbQ" type="3070" fontName="Segoe UI" lineColor="0">

+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_vOIxonegEeOvq8ZFMULkbQ" source="ShadowFigure">

+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vOIxo3egEeOvq8ZFMULkbQ" key="ShadowFigure_Value" value="false"/>

+        </eAnnotations>

+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_vOIxpHegEeOvq8ZFMULkbQ" source="displayNameLabelIcon">

+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vOIxpXegEeOvq8ZFMULkbQ" key="displayNameLabelIcon_value" value="false"/>

+        </eAnnotations>

+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_vOIxpnegEeOvq8ZFMULkbQ" source="QualifiedName">

+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vOIxp3egEeOvq8ZFMULkbQ" key="QualifiedNameDepth" value="1000"/>

+        </eAnnotations>

+        <children xmi:type="notation:DecorationNode" xmi:id="_vOIxqHegEeOvq8ZFMULkbQ" type="5126"/>

+        <children xmi:type="notation:BasicCompartment" xmi:id="_vOIxqXegEeOvq8ZFMULkbQ" visible="false" type="7077">

+          <styles xmi:type="notation:TitleStyle" xmi:id="_vOIxqnegEeOvq8ZFMULkbQ" showTitle="true"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vOIxq3egEeOvq8ZFMULkbQ"/>

+        </children>

+        <children xmi:type="notation:BasicCompartment" xmi:id="_vOR7kHegEeOvq8ZFMULkbQ" visible="false" type="compartment_shape_display">

+          <styles xmi:type="notation:TitleStyle" xmi:id="_vOR7kXegEeOvq8ZFMULkbQ"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vOR7knegEeOvq8ZFMULkbQ"/>

+        </children>

+        <element xmi:type="uml:Property" href="02_SourceLeft_CompositeDiagram_Connector_Deleted.uml#_MAR8wHegEeOvq8ZFMULkbQ"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vOIxoXegEeOvq8ZFMULkbQ" x="75" y="25" width="171"/>

+      </children>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_iyHV23egEeOvq8ZFMULkbQ"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iyHV3HegEeOvq8ZFMULkbQ"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_iyaQwHegEeOvq8ZFMULkbQ" visible="false" type="compartment_shape_display">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_iyaQwXegEeOvq8ZFMULkbQ"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iyaQwnegEeOvq8ZFMULkbQ"/>

+    </children>

+    <children xmi:type="notation:Shape" xmi:id="_vOIxrHegEeOvq8ZFMULkbQ" type="3069" fontName="Segoe UI" lineColor="0">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_vOIxrnegEeOvq8ZFMULkbQ" source="ShadowFigure">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vOIxr3egEeOvq8ZFMULkbQ" key="ShadowFigure_Value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_vOIxsHegEeOvq8ZFMULkbQ" source="displayNameLabelIcon">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vOIxsXegEeOvq8ZFMULkbQ" key="displayNameLabelIcon_value" value="false"/>

+      </eAnnotations>

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_vOIxsnegEeOvq8ZFMULkbQ" source="QualifiedName">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vOIxs3egEeOvq8ZFMULkbQ" key="QualifiedNameDepth" value="1000"/>

+      </eAnnotations>

+      <children xmi:type="notation:DecorationNode" xmi:id="_vOIxtHegEeOvq8ZFMULkbQ" type="5125">

+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_07QFcHegEeOvq8ZFMULkbQ" source="CustomAppearance_Annotation">

+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1QsJ8HegEeOvq8ZFMULkbQ" key="CustomAppearance_MaskValue" value="524300"/>

+        </eAnnotations>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_vOIxtXegEeOvq8ZFMULkbQ" x="-20" y="30"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_vOIxtnegEeOvq8ZFMULkbQ" type="6029">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_vOIxt3egEeOvq8ZFMULkbQ" x="25" y="-10"/>

+      </children>

+      <element xmi:type="uml:Port" href="02_SourceLeft_CompositeDiagram_Connector_Deleted.uml#_KKI6gHegEeOvq8ZFMULkbQ"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vOIxrXegEeOvq8ZFMULkbQ" x="-10" y="60"/>

+    </children>

+    <element xmi:type="uml:Class" href="02_SourceLeft_CompositeDiagram_Connector_Deleted.uml#_iyHV0HegEeOvq8ZFMULkbQ"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iyHV0negEeOvq8ZFMULkbQ" x="100" y="320" width="281" height="121"/>

+  </children>

+  <styles xmi:type="notation:DiagramStyle" xmi:id="_H4mVsXegEeOvq8ZFMULkbQ"/>

+  <element xmi:type="uml:Model" href="02_SourceLeft_CompositeDiagram_Connector_Deleted.uml#_H3ap8HegEeOvq8ZFMULkbQ"/>

+  <edges xmi:type="notation:Connector" xmi:id="_3Arg4HegEeOvq8ZFMULkbQ" type="4013" source="_vOIxrHegEeOvq8ZFMULkbQ" target="_vOIxoHegEeOvq8ZFMULkbQ" lineColor="0">

+    <children xmi:type="notation:DecorationNode" xmi:id="_3Arg43egEeOvq8ZFMULkbQ" type="6025">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_3Arg5HegEeOvq8ZFMULkbQ" y="60"/>

+    </children>

+    <children xmi:type="notation:DecorationNode" xmi:id="_3Arg5XegEeOvq8ZFMULkbQ" visible="false" type="6050">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_3Arg5negEeOvq8ZFMULkbQ" y="-20"/>

+    </children>

+    <children xmi:type="notation:DecorationNode" xmi:id="_3Arg53egEeOvq8ZFMULkbQ" visible="false" type="6051">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_3Arg6HegEeOvq8ZFMULkbQ" y="20"/>

+    </children>

+    <children xmi:type="notation:DecorationNode" xmi:id="_3Arg6XegEeOvq8ZFMULkbQ" visible="false" type="6052">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_3Arg6negEeOvq8ZFMULkbQ" y="20"/>

+    </children>

+    <styles xmi:type="notation:FontStyle" xmi:id="_3Arg4XegEeOvq8ZFMULkbQ" fontName="Segoe UI"/>

+    <element xmi:type="uml:Connector" href="02_SourceLeft_CompositeDiagram_Connector_Deleted.uml#_OGBhQHegEeOvq8ZFMULkbQ"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3Arg4negEeOvq8ZFMULkbQ" points="[10, 0, -155, 0]$[80, 0, -85, 0]"/>

+  </edges>

+</notation:Diagram>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Connector/DELETE/02_SourceLeft_CompositeDiagram_Connector_Deleted.uml b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Connector/DELETE/02_SourceLeft_CompositeDiagram_Connector_Deleted.uml
new file mode 100644
index 00000000000..7b5c1cca06d
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Connector/DELETE/02_SourceLeft_CompositeDiagram_Connector_Deleted.uml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_H3ap8HegEeOvq8ZFMULkbQ" name="model">

+  <packagedElement xmi:type="uml:Class" xmi:id="_I9zDMHegEeOvq8ZFMULkbQ" name="A">

+    <ownedAttribute xmi:type="uml:Port" xmi:id="_KKI6gHegEeOvq8ZFMULkbQ" name="p" aggregation="composite"/>

+    <ownedAttribute xmi:type="uml:Property" xmi:id="_MAR8wHegEeOvq8ZFMULkbQ" name="q"/>

+    <ownedConnector xmi:type="uml:Connector" xmi:id="_OGBhQHegEeOvq8ZFMULkbQ" name="Connector1">

+      <end xmi:type="uml:ConnectorEnd" xmi:id="_OGKrMHegEeOvq8ZFMULkbQ" role="_KKI6gHegEeOvq8ZFMULkbQ">

+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_OGKrMXegEeOvq8ZFMULkbQ" value="1"/>

+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OGKrMnegEeOvq8ZFMULkbQ" value="1"/>

+      </end>

+      <end xmi:type="uml:ConnectorEnd" xmi:id="_OGKrM3egEeOvq8ZFMULkbQ" role="_MAR8wHegEeOvq8ZFMULkbQ">

+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_OGKrNHegEeOvq8ZFMULkbQ" value="1"/>

+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_OGKrNXegEeOvq8ZFMULkbQ" value="1"/>

+      </end>

+    </ownedConnector>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Class" xmi:id="_iyHV0HegEeOvq8ZFMULkbQ" name="B">

+    <generalization xmi:type="uml:Generalization" xmi:id="_rYsKEHegEeOvq8ZFMULkbQ" general="_I9zDMHegEeOvq8ZFMULkbQ"/>

+  </packagedElement>

+</uml:Model>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Port/ADD/01_SourceLeft_CompositeDiagram_Property_Added.di b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Port/ADD/01_SourceLeft_CompositeDiagram_Property_Added.di
new file mode 100644
index 00000000000..f9f95c5e5c3
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Port/ADD/01_SourceLeft_CompositeDiagram_Property_Added.di
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

+  <pageList>

+    <availablePage>

+      <emfPageIdentifier href="01_SourceLeft_CompositeDiagram_Property_Added.notation#_MolOcMh-EeKwLPTeb1CTLg"/>

+    </availablePage>

+  </pageList>

+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

+    <windows>

+      <children xsi:type="di:TabFolder">

+        <children>

+          <emfPageIdentifier href="01_SourceLeft_CompositeDiagram_Property_Added.notation#_MolOcMh-EeKwLPTeb1CTLg"/>

+        </children>

+      </children>

+    </windows>

+  </sashModel>

+</di:SashWindowsMngr>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Port/ADD/01_SourceLeft_CompositeDiagram_Property_Added.notation b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Port/ADD/01_SourceLeft_CompositeDiagram_Property_Added.notation
new file mode 100644
index 00000000000..dc9db4b9a47
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Port/ADD/01_SourceLeft_CompositeDiagram_Property_Added.notation
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_MolOcMh-EeKwLPTeb1CTLg" type="CompositeStructure" name="CompositeDiagram" measurementUnit="Pixel">

+  <children xmi:type="notation:Shape" xmi:id="_Nnz20Mh-EeKwLPTeb1CTLg" type="2073">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TL6Ylch-EeKwLPTeb1CTLg" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6Ylsh-EeKwLPTeb1CTLg" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_Nnz20sh-EeKwLPTeb1CTLg" type="5156"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_Nnz208h-EeKwLPTeb1CTLg" type="7073">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PWPHgMh-EeKwLPTeb1CTLg" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PWPHgch-EeKwLPTeb1CTLg" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6Yl8h-EeKwLPTeb1CTLg" key="visible" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_Nnz21Mh-EeKwLPTeb1CTLg"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Nnz21ch-EeKwLPTeb1CTLg"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_v9L4UMnuEeKThIJF6ZPKoA" visible="false" type="compartment_shape_display">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v9L4U8nuEeKThIJF6ZPKoA" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v9L4VMnuEeKThIJF6ZPKoA" key="mutable" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_v9L4UcnuEeKThIJF6ZPKoA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_v9L4UsnuEeKThIJF6ZPKoA"/>

+    </children>

+    <children xmi:type="notation:Shape" xmi:id="_xzerkMnuEeKThIJF6ZPKoA" type="3069">

+      <children xmi:type="notation:DecorationNode" xmi:id="_xzerksnuEeKThIJF6ZPKoA" type="5125">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xzerk8nuEeKThIJF6ZPKoA" x="25" y="3"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_xzerlMnuEeKThIJF6ZPKoA" type="6029">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xzerlcnuEeKThIJF6ZPKoA" x="25" y="-10"/>

+      </children>

+      <element xmi:type="uml:Port" href="01_SourceLeft_CompositeDiagram_Property_Added.uml#_xycJwMnuEeKThIJF6ZPKoA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xzerkcnuEeKThIJF6ZPKoA" x="-10" y="61" width="20" height="20"/>

+    </children>

+    <element xmi:type="uml:Class" href="01_SourceLeft_CompositeDiagram_Property_Added.uml#_uEswAMhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Nnz20ch-EeKwLPTeb1CTLg" x="295" y="158" width="421" height="118"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_ShWYoMh-EeKwLPTeb1CTLg" type="2073">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TL6YkMh-EeKwLPTeb1CTLg" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6Ykch-EeKwLPTeb1CTLg" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_ShWYosh-EeKwLPTeb1CTLg" type="5156"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_ShWYo8h-EeKwLPTeb1CTLg" type="7073">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TL6Yksh-EeKwLPTeb1CTLg" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6Yk8h-EeKwLPTeb1CTLg" key="visible" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6YlMh-EeKwLPTeb1CTLg" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_ShWYpMh-EeKwLPTeb1CTLg"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ShWYpch-EeKwLPTeb1CTLg"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_v9L4WsnuEeKThIJF6ZPKoA" visible="false" type="compartment_shape_display">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v9L4XcnuEeKThIJF6ZPKoA" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v9L4XsnuEeKThIJF6ZPKoA" key="mutable" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_v9L4W8nuEeKThIJF6ZPKoA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_v9L4XMnuEeKThIJF6ZPKoA"/>

+    </children>

+    <children xmi:type="notation:Shape" xmi:id="_zKF5MMnuEeKThIJF6ZPKoA" type="3069">

+      <children xmi:type="notation:DecorationNode" xmi:id="_zKF5MsnuEeKThIJF6ZPKoA" type="5125">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_zKF5M8nuEeKThIJF6ZPKoA" x="25" y="3"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_zKF5NMnuEeKThIJF6ZPKoA" type="6029">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_zKF5NcnuEeKThIJF6ZPKoA" x="25" y="-10"/>

+      </children>

+      <element xmi:type="uml:Port" href="01_SourceLeft_CompositeDiagram_Property_Added.uml#_xycJwMnuEeKThIJF6ZPKoA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zKF5McnuEeKThIJF6ZPKoA" x="-10" y="60"/>

+    </children>

+    <element xmi:type="uml:Class" href="01_SourceLeft_CompositeDiagram_Property_Added.uml#_xZFR4MhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ShWYoch-EeKwLPTeb1CTLg" x="295" y="315" width="421" height="118"/>

+  </children>

+  <styles xmi:type="notation:DiagramStyle" xmi:id="_MolOcch-EeKwLPTeb1CTLg"/>

+  <element xmi:type="uml:Model" href="01_SourceLeft_CompositeDiagram_Property_Added.uml#_r-nNQMhqEeKmlJkz37Cc-A"/>

+</notation:Diagram>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Port/ADD/01_SourceLeft_CompositeDiagram_Property_Added.uml b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Port/ADD/01_SourceLeft_CompositeDiagram_Property_Added.uml
new file mode 100644
index 00000000000..aa00740f772
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Port/ADD/01_SourceLeft_CompositeDiagram_Property_Added.uml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_r-nNQMhqEeKmlJkz37Cc-A" name="model">

+  <packagedElement xmi:type="uml:Class" xmi:id="_uEswAMhqEeKmlJkz37Cc-A" name="A">

+    <ownedAttribute xmi:type="uml:Port" xmi:id="_xycJwMnuEeKThIJF6ZPKoA" name="Port1" visibility="public" aggregation="composite">

+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_x9TV8MnuEeKThIJF6ZPKoA" value="1"/>

+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_x9TV8cnuEeKThIJF6ZPKoA" value="1"/>

+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_x9m38MnuEeKThIJF6ZPKoA">

+        <value xsi:nil="true"/>

+      </defaultValue>

+    </ownedAttribute>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Class" xmi:id="_xZFR4MhqEeKmlJkz37Cc-A" name="B">

+    <generalization xmi:type="uml:Generalization" xmi:id="_7-CeYMhqEeKmlJkz37Cc-A" general="_uEswAMhqEeKmlJkz37Cc-A"/>

+  </packagedElement>

+</uml:Model>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Port/ADD/02_SourceLeft_CompositeDiagram_Property_Added.di b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Port/ADD/02_SourceLeft_CompositeDiagram_Property_Added.di
new file mode 100644
index 00000000000..ef940497cad
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Port/ADD/02_SourceLeft_CompositeDiagram_Property_Added.di
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

+  <pageList>

+    <availablePage>

+      <emfPageIdentifier href="02_SourceLeft_CompositeDiagram_Property_Added.notation#_MolOcMh-EeKwLPTeb1CTLg"/>

+    </availablePage>

+  </pageList>

+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

+    <windows>

+      <children xsi:type="di:TabFolder">

+        <children>

+          <emfPageIdentifier href="02_SourceLeft_CompositeDiagram_Property_Added.notation#_MolOcMh-EeKwLPTeb1CTLg"/>

+        </children>

+      </children>

+    </windows>

+  </sashModel>

+</di:SashWindowsMngr>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Port/ADD/02_SourceLeft_CompositeDiagram_Property_Added.notation b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Port/ADD/02_SourceLeft_CompositeDiagram_Property_Added.notation
new file mode 100644
index 00000000000..36c68aecd7d
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Port/ADD/02_SourceLeft_CompositeDiagram_Property_Added.notation
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_MolOcMh-EeKwLPTeb1CTLg" type="CompositeStructure" name="CompositeDiagram" measurementUnit="Pixel">

+  <children xmi:type="notation:Shape" xmi:id="_Nnz20Mh-EeKwLPTeb1CTLg" type="2073">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TL6Ylch-EeKwLPTeb1CTLg" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6Ylsh-EeKwLPTeb1CTLg" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_Nnz20sh-EeKwLPTeb1CTLg" type="5156"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_Nnz208h-EeKwLPTeb1CTLg" type="7073">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PWPHgMh-EeKwLPTeb1CTLg" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PWPHgch-EeKwLPTeb1CTLg" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6Yl8h-EeKwLPTeb1CTLg" key="visible" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_Nnz21Mh-EeKwLPTeb1CTLg"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Nnz21ch-EeKwLPTeb1CTLg"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_v9L4UMnuEeKThIJF6ZPKoA" visible="false" type="compartment_shape_display">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v9L4U8nuEeKThIJF6ZPKoA" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v9L4VMnuEeKThIJF6ZPKoA" key="mutable" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_v9L4UcnuEeKThIJF6ZPKoA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_v9L4UsnuEeKThIJF6ZPKoA"/>

+    </children>

+    <children xmi:type="notation:Shape" xmi:id="_xzerkMnuEeKThIJF6ZPKoA" type="3069">

+      <children xmi:type="notation:DecorationNode" xmi:id="_xzerksnuEeKThIJF6ZPKoA" type="5125">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xzerk8nuEeKThIJF6ZPKoA" x="25" y="3"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_xzerlMnuEeKThIJF6ZPKoA" type="6029">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xzerlcnuEeKThIJF6ZPKoA" x="25" y="-10"/>

+      </children>

+      <element xmi:type="uml:Port" href="02_SourceLeft_CompositeDiagram_Property_Added.uml#_xycJwMnuEeKThIJF6ZPKoA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xzerkcnuEeKThIJF6ZPKoA" x="-10" y="61" width="20" height="20"/>

+    </children>

+    <element xmi:type="uml:Class" href="02_SourceLeft_CompositeDiagram_Property_Added.uml#_uEswAMhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Nnz20ch-EeKwLPTeb1CTLg" x="295" y="158" width="421" height="118"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_ShWYoMh-EeKwLPTeb1CTLg" type="2073">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TL6YkMh-EeKwLPTeb1CTLg" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6Ykch-EeKwLPTeb1CTLg" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_ShWYosh-EeKwLPTeb1CTLg" type="5156"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_ShWYo8h-EeKwLPTeb1CTLg" type="7073">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TL6Yksh-EeKwLPTeb1CTLg" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6Yk8h-EeKwLPTeb1CTLg" key="visible" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6YlMh-EeKwLPTeb1CTLg" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_ShWYpMh-EeKwLPTeb1CTLg"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ShWYpch-EeKwLPTeb1CTLg"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_v9L4WsnuEeKThIJF6ZPKoA" visible="false" type="compartment_shape_display">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v9L4XcnuEeKThIJF6ZPKoA" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v9L4XsnuEeKThIJF6ZPKoA" key="mutable" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_v9L4W8nuEeKThIJF6ZPKoA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_v9L4XMnuEeKThIJF6ZPKoA"/>

+    </children>

+    <element xmi:type="uml:Class" href="02_SourceLeft_CompositeDiagram_Property_Added.uml#_xZFR4MhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ShWYoch-EeKwLPTeb1CTLg" x="295" y="315" width="421" height="118"/>

+  </children>

+  <styles xmi:type="notation:DiagramStyle" xmi:id="_MolOcch-EeKwLPTeb1CTLg"/>

+  <element xmi:type="uml:Model" href="02_SourceLeft_CompositeDiagram_Property_Added.uml#_r-nNQMhqEeKmlJkz37Cc-A"/>

+</notation:Diagram>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Port/ADD/02_SourceLeft_CompositeDiagram_Property_Added.uml b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Port/ADD/02_SourceLeft_CompositeDiagram_Property_Added.uml
new file mode 100644
index 00000000000..6afbcf7769e
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Port/ADD/02_SourceLeft_CompositeDiagram_Property_Added.uml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_r-nNQMhqEeKmlJkz37Cc-A" name="model">

+  <packagedElement xmi:type="uml:Class" xmi:id="_uEswAMhqEeKmlJkz37Cc-A" name="A">

+    <ownedAttribute xmi:type="uml:Port" xmi:id="_xycJwMnuEeKThIJF6ZPKoA" name="Port1" visibility="public" aggregation="composite">

+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_x9TV8MnuEeKThIJF6ZPKoA" value="1"/>

+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_x9TV8cnuEeKThIJF6ZPKoA" value="1"/>

+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_x9m38MnuEeKThIJF6ZPKoA">

+        <value xsi:nil="true"/>

+      </defaultValue>

+    </ownedAttribute>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Class" xmi:id="_xZFR4MhqEeKmlJkz37Cc-A" name="B"/>

+</uml:Model>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Port/DELETE/01_SourceLeft_CompositeDiagram_Property_Deleted.di b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Port/DELETE/01_SourceLeft_CompositeDiagram_Property_Deleted.di
new file mode 100644
index 00000000000..d390dd643b6
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Port/DELETE/01_SourceLeft_CompositeDiagram_Property_Deleted.di
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

+  <pageList>

+    <availablePage>

+      <emfPageIdentifier href="01_SourceLeft_CompositeDiagram_Property_Deleted.notation#_MolOcMh-EeKwLPTeb1CTLg"/>

+    </availablePage>

+  </pageList>

+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

+    <windows>

+      <children xsi:type="di:TabFolder">

+        <children>

+          <emfPageIdentifier href="01_SourceLeft_CompositeDiagram_Property_Deleted.notation#_MolOcMh-EeKwLPTeb1CTLg"/>

+        </children>

+      </children>

+    </windows>

+  </sashModel>

+</di:SashWindowsMngr>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Port/DELETE/01_SourceLeft_CompositeDiagram_Property_Deleted.notation b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Port/DELETE/01_SourceLeft_CompositeDiagram_Property_Deleted.notation
new file mode 100644
index 00000000000..15893437164
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Port/DELETE/01_SourceLeft_CompositeDiagram_Property_Deleted.notation
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_MolOcMh-EeKwLPTeb1CTLg" type="CompositeStructure" name="CompositeDiagram" measurementUnit="Pixel">

+  <children xmi:type="notation:Shape" xmi:id="_Nnz20Mh-EeKwLPTeb1CTLg" type="2073">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TL6Ylch-EeKwLPTeb1CTLg" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6Ylsh-EeKwLPTeb1CTLg" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_Nnz20sh-EeKwLPTeb1CTLg" type="5156"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_Nnz208h-EeKwLPTeb1CTLg" type="7073">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PWPHgMh-EeKwLPTeb1CTLg" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PWPHgch-EeKwLPTeb1CTLg" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6Yl8h-EeKwLPTeb1CTLg" key="visible" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_Nnz21Mh-EeKwLPTeb1CTLg"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Nnz21ch-EeKwLPTeb1CTLg"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_v9L4UMnuEeKThIJF6ZPKoA" visible="false" type="compartment_shape_display">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v9L4U8nuEeKThIJF6ZPKoA" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v9L4VMnuEeKThIJF6ZPKoA" key="mutable" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_v9L4UcnuEeKThIJF6ZPKoA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_v9L4UsnuEeKThIJF6ZPKoA"/>

+    </children>

+    <children xmi:type="notation:Shape" xmi:id="_xzerkMnuEeKThIJF6ZPKoA" type="3069">

+      <children xmi:type="notation:DecorationNode" xmi:id="_xzerksnuEeKThIJF6ZPKoA" type="5125">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xzerk8nuEeKThIJF6ZPKoA" x="25" y="3"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_xzerlMnuEeKThIJF6ZPKoA" type="6029">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xzerlcnuEeKThIJF6ZPKoA" x="25" y="-10"/>

+      </children>

+      <element xmi:type="uml:Port" href="01_SourceLeft_CompositeDiagram_Property_Deleted.uml#_xycJwMnuEeKThIJF6ZPKoA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xzerkcnuEeKThIJF6ZPKoA" x="-10" y="61" width="20" height="20"/>

+    </children>

+    <element xmi:type="uml:Class" href="01_SourceLeft_CompositeDiagram_Property_Deleted.uml#_uEswAMhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Nnz20ch-EeKwLPTeb1CTLg" x="295" y="158" width="421" height="118"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_ShWYoMh-EeKwLPTeb1CTLg" type="2073">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TL6YkMh-EeKwLPTeb1CTLg" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6Ykch-EeKwLPTeb1CTLg" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_ShWYosh-EeKwLPTeb1CTLg" type="5156"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_ShWYo8h-EeKwLPTeb1CTLg" type="7073">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TL6Yksh-EeKwLPTeb1CTLg" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6Yk8h-EeKwLPTeb1CTLg" key="visible" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6YlMh-EeKwLPTeb1CTLg" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_ShWYpMh-EeKwLPTeb1CTLg"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ShWYpch-EeKwLPTeb1CTLg"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_v9L4WsnuEeKThIJF6ZPKoA" visible="false" type="compartment_shape_display">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v9L4XcnuEeKThIJF6ZPKoA" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v9L4XsnuEeKThIJF6ZPKoA" key="mutable" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_v9L4W8nuEeKThIJF6ZPKoA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_v9L4XMnuEeKThIJF6ZPKoA"/>

+    </children>

+    <element xmi:type="uml:Class" href="01_SourceLeft_CompositeDiagram_Property_Deleted.uml#_xZFR4MhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ShWYoch-EeKwLPTeb1CTLg" x="295" y="315" width="421" height="118"/>

+  </children>

+  <styles xmi:type="notation:DiagramStyle" xmi:id="_MolOcch-EeKwLPTeb1CTLg"/>

+  <element xmi:type="uml:Model" href="01_SourceLeft_CompositeDiagram_Property_Deleted.uml#_r-nNQMhqEeKmlJkz37Cc-A"/>

+</notation:Diagram>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Port/DELETE/01_SourceLeft_CompositeDiagram_Property_Deleted.uml b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Port/DELETE/01_SourceLeft_CompositeDiagram_Property_Deleted.uml
new file mode 100644
index 00000000000..6afbcf7769e
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Port/DELETE/01_SourceLeft_CompositeDiagram_Property_Deleted.uml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_r-nNQMhqEeKmlJkz37Cc-A" name="model">

+  <packagedElement xmi:type="uml:Class" xmi:id="_uEswAMhqEeKmlJkz37Cc-A" name="A">

+    <ownedAttribute xmi:type="uml:Port" xmi:id="_xycJwMnuEeKThIJF6ZPKoA" name="Port1" visibility="public" aggregation="composite">

+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_x9TV8MnuEeKThIJF6ZPKoA" value="1"/>

+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_x9TV8cnuEeKThIJF6ZPKoA" value="1"/>

+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_x9m38MnuEeKThIJF6ZPKoA">

+        <value xsi:nil="true"/>

+      </defaultValue>

+    </ownedAttribute>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Class" xmi:id="_xZFR4MhqEeKmlJkz37Cc-A" name="B"/>

+</uml:Model>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Port/DELETE/02_SourceLeft_CompositeDiagram_Property_Deleted.di b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Port/DELETE/02_SourceLeft_CompositeDiagram_Property_Deleted.di
new file mode 100644
index 00000000000..2ef4b34b184
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Port/DELETE/02_SourceLeft_CompositeDiagram_Property_Deleted.di
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

+  <pageList>

+    <availablePage>

+      <emfPageIdentifier href="02_SourceLeft_CompositeDiagram_Property_Deleted.notation#_MolOcMh-EeKwLPTeb1CTLg"/>

+    </availablePage>

+  </pageList>

+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

+    <windows>

+      <children xsi:type="di:TabFolder">

+        <children>

+          <emfPageIdentifier href="02_SourceLeft_CompositeDiagram_Property_Deleted.notation#_MolOcMh-EeKwLPTeb1CTLg"/>

+        </children>

+      </children>

+    </windows>

+  </sashModel>

+</di:SashWindowsMngr>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Port/DELETE/02_SourceLeft_CompositeDiagram_Property_Deleted.notation b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Port/DELETE/02_SourceLeft_CompositeDiagram_Property_Deleted.notation
new file mode 100644
index 00000000000..977ef08f566
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Port/DELETE/02_SourceLeft_CompositeDiagram_Property_Deleted.notation
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_MolOcMh-EeKwLPTeb1CTLg" type="CompositeStructure" name="CompositeDiagram" measurementUnit="Pixel">

+  <children xmi:type="notation:Shape" xmi:id="_Nnz20Mh-EeKwLPTeb1CTLg" type="2073">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TL6Ylch-EeKwLPTeb1CTLg" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6Ylsh-EeKwLPTeb1CTLg" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_Nnz20sh-EeKwLPTeb1CTLg" type="5156"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_Nnz208h-EeKwLPTeb1CTLg" type="7073">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PWPHgMh-EeKwLPTeb1CTLg" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PWPHgch-EeKwLPTeb1CTLg" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6Yl8h-EeKwLPTeb1CTLg" key="visible" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_Nnz21Mh-EeKwLPTeb1CTLg"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Nnz21ch-EeKwLPTeb1CTLg"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_v9L4UMnuEeKThIJF6ZPKoA" visible="false" type="compartment_shape_display">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v9L4U8nuEeKThIJF6ZPKoA" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v9L4VMnuEeKThIJF6ZPKoA" key="mutable" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_v9L4UcnuEeKThIJF6ZPKoA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_v9L4UsnuEeKThIJF6ZPKoA"/>

+    </children>

+    <children xmi:type="notation:Shape" xmi:id="_xzerkMnuEeKThIJF6ZPKoA" type="3069">

+      <children xmi:type="notation:DecorationNode" xmi:id="_xzerksnuEeKThIJF6ZPKoA" type="5125">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xzerk8nuEeKThIJF6ZPKoA" x="25" y="3"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_xzerlMnuEeKThIJF6ZPKoA" type="6029">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xzerlcnuEeKThIJF6ZPKoA" x="25" y="-10"/>

+      </children>

+      <element xmi:type="uml:Port" href="02_SourceLeft_CompositeDiagram_Property_Deleted.uml#_xycJwMnuEeKThIJF6ZPKoA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xzerkcnuEeKThIJF6ZPKoA" x="-10" y="61" width="20" height="20"/>

+    </children>

+    <element xmi:type="uml:Class" href="02_SourceLeft_CompositeDiagram_Property_Deleted.uml#_uEswAMhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Nnz20ch-EeKwLPTeb1CTLg" x="295" y="158" width="421" height="118"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_ShWYoMh-EeKwLPTeb1CTLg" type="2073">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TL6YkMh-EeKwLPTeb1CTLg" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6Ykch-EeKwLPTeb1CTLg" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_ShWYosh-EeKwLPTeb1CTLg" type="5156"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_ShWYo8h-EeKwLPTeb1CTLg" type="7073">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TL6Yksh-EeKwLPTeb1CTLg" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6Yk8h-EeKwLPTeb1CTLg" key="visible" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6YlMh-EeKwLPTeb1CTLg" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_ShWYpMh-EeKwLPTeb1CTLg"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ShWYpch-EeKwLPTeb1CTLg"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_v9L4WsnuEeKThIJF6ZPKoA" visible="false" type="compartment_shape_display">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v9L4XcnuEeKThIJF6ZPKoA" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v9L4XsnuEeKThIJF6ZPKoA" key="mutable" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_v9L4W8nuEeKThIJF6ZPKoA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_v9L4XMnuEeKThIJF6ZPKoA"/>

+    </children>

+    <children xmi:type="notation:Shape" xmi:id="_zKF5MMnuEeKThIJF6ZPKoA" type="3069">

+      <children xmi:type="notation:DecorationNode" xmi:id="_zKF5MsnuEeKThIJF6ZPKoA" type="5125">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_zKF5M8nuEeKThIJF6ZPKoA" x="25" y="3"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_zKF5NMnuEeKThIJF6ZPKoA" type="6029">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_zKF5NcnuEeKThIJF6ZPKoA" x="25" y="-10"/>

+      </children>

+      <element xmi:type="uml:Port" href="02_SourceLeft_CompositeDiagram_Property_Deleted.uml#_xycJwMnuEeKThIJF6ZPKoA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zKF5McnuEeKThIJF6ZPKoA" x="-10" y="60"/>

+    </children>

+    <element xmi:type="uml:Class" href="02_SourceLeft_CompositeDiagram_Property_Deleted.uml#_xZFR4MhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ShWYoch-EeKwLPTeb1CTLg" x="295" y="315" width="421" height="118"/>

+  </children>

+  <styles xmi:type="notation:DiagramStyle" xmi:id="_MolOcch-EeKwLPTeb1CTLg"/>

+  <element xmi:type="uml:Model" href="02_SourceLeft_CompositeDiagram_Property_Deleted.uml#_r-nNQMhqEeKmlJkz37Cc-A"/>

+</notation:Diagram>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Port/DELETE/02_SourceLeft_CompositeDiagram_Property_Deleted.uml b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Port/DELETE/02_SourceLeft_CompositeDiagram_Property_Deleted.uml
new file mode 100644
index 00000000000..aa00740f772
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Port/DELETE/02_SourceLeft_CompositeDiagram_Property_Deleted.uml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_r-nNQMhqEeKmlJkz37Cc-A" name="model">

+  <packagedElement xmi:type="uml:Class" xmi:id="_uEswAMhqEeKmlJkz37Cc-A" name="A">

+    <ownedAttribute xmi:type="uml:Port" xmi:id="_xycJwMnuEeKThIJF6ZPKoA" name="Port1" visibility="public" aggregation="composite">

+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_x9TV8MnuEeKThIJF6ZPKoA" value="1"/>

+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_x9TV8cnuEeKThIJF6ZPKoA" value="1"/>

+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_x9m38MnuEeKThIJF6ZPKoA">

+        <value xsi:nil="true"/>

+      </defaultValue>

+    </ownedAttribute>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Class" xmi:id="_xZFR4MhqEeKmlJkz37Cc-A" name="B">

+    <generalization xmi:type="uml:Generalization" xmi:id="_7-CeYMhqEeKmlJkz37Cc-A" general="_uEswAMhqEeKmlJkz37Cc-A"/>

+  </packagedElement>

+</uml:Model>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/ADD/01_SourceLeft_CompositeDiagram_Property_Added.di b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/ADD/01_SourceLeft_CompositeDiagram_Property_Added.di
new file mode 100644
index 00000000000..f9f95c5e5c3
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/ADD/01_SourceLeft_CompositeDiagram_Property_Added.di
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

+  <pageList>

+    <availablePage>

+      <emfPageIdentifier href="01_SourceLeft_CompositeDiagram_Property_Added.notation#_MolOcMh-EeKwLPTeb1CTLg"/>

+    </availablePage>

+  </pageList>

+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

+    <windows>

+      <children xsi:type="di:TabFolder">

+        <children>

+          <emfPageIdentifier href="01_SourceLeft_CompositeDiagram_Property_Added.notation#_MolOcMh-EeKwLPTeb1CTLg"/>

+        </children>

+      </children>

+    </windows>

+  </sashModel>

+</di:SashWindowsMngr>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/ADD/01_SourceLeft_CompositeDiagram_Property_Added.notation b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/ADD/01_SourceLeft_CompositeDiagram_Property_Added.notation
new file mode 100644
index 00000000000..b62eedfdbc7
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/ADD/01_SourceLeft_CompositeDiagram_Property_Added.notation
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_MolOcMh-EeKwLPTeb1CTLg" type="CompositeStructure" name="CompositeDiagram" measurementUnit="Pixel">

+  <children xmi:type="notation:Shape" xmi:id="_Nnz20Mh-EeKwLPTeb1CTLg" type="2073">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TL6Ylch-EeKwLPTeb1CTLg" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6Ylsh-EeKwLPTeb1CTLg" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_Nnz20sh-EeKwLPTeb1CTLg" type="5156"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_Nnz208h-EeKwLPTeb1CTLg" type="7073">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PWPHgMh-EeKwLPTeb1CTLg" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PWPHgch-EeKwLPTeb1CTLg" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6Yl8h-EeKwLPTeb1CTLg" key="visible" value="true"/>

+      </eAnnotations>

+      <children xmi:type="notation:Shape" xmi:id="_QRw7oMh-EeKwLPTeb1CTLg" type="3070">

+        <children xmi:type="notation:DecorationNode" xmi:id="_QRw7osh-EeKwLPTeb1CTLg" type="5126"/>

+        <children xmi:type="notation:BasicCompartment" xmi:id="_QRw7o8h-EeKwLPTeb1CTLg" type="7077">

+          <styles xmi:type="notation:TitleStyle" xmi:id="_QRw7pMh-EeKwLPTeb1CTLg" showTitle="true"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QRw7pch-EeKwLPTeb1CTLg"/>

+        </children>

+        <element xmi:type="uml:Property" href="01_SourceLeft_CompositeDiagram_Property_Added.uml#_0W_NcMhqEeKmlJkz37Cc-A"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QRw7och-EeKwLPTeb1CTLg" x="10" y="10"/>

+      </children>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_Nnz21Mh-EeKwLPTeb1CTLg"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Nnz21ch-EeKwLPTeb1CTLg"/>

+    </children>

+    <element xmi:type="uml:Class" href="01_SourceLeft_CompositeDiagram_Property_Added.uml#_uEswAMhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Nnz20ch-EeKwLPTeb1CTLg" x="295" y="158" width="421" height="118"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_ShWYoMh-EeKwLPTeb1CTLg" type="2073">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TL6YkMh-EeKwLPTeb1CTLg" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6Ykch-EeKwLPTeb1CTLg" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_ShWYosh-EeKwLPTeb1CTLg" type="5156"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_ShWYo8h-EeKwLPTeb1CTLg" type="7073">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TL6Yksh-EeKwLPTeb1CTLg" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6Yk8h-EeKwLPTeb1CTLg" key="visible" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6YlMh-EeKwLPTeb1CTLg" key="showTitle" value="true"/>

+      </eAnnotations>

+      <children xmi:type="notation:Shape" xmi:id="_Uq_lsMh-EeKwLPTeb1CTLg" type="3070">

+        <children xmi:type="notation:DecorationNode" xmi:id="_Uq_lssh-EeKwLPTeb1CTLg" type="5126"/>

+        <children xmi:type="notation:BasicCompartment" xmi:id="_Uq_ls8h-EeKwLPTeb1CTLg" type="7077">

+          <styles xmi:type="notation:TitleStyle" xmi:id="_Uq_ltMh-EeKwLPTeb1CTLg" showTitle="true"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Uq_ltch-EeKwLPTeb1CTLg"/>

+        </children>

+        <element xmi:type="uml:Property" href="01_SourceLeft_CompositeDiagram_Property_Added.uml#_0W_NcMhqEeKmlJkz37Cc-A"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Uq_lsch-EeKwLPTeb1CTLg" x="10" y="10"/>

+      </children>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_ShWYpMh-EeKwLPTeb1CTLg"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ShWYpch-EeKwLPTeb1CTLg"/>

+    </children>

+    <element xmi:type="uml:Class" href="01_SourceLeft_CompositeDiagram_Property_Added.uml#_xZFR4MhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ShWYoch-EeKwLPTeb1CTLg" x="295" y="315" width="421" height="118"/>

+  </children>

+  <styles xmi:type="notation:DiagramStyle" xmi:id="_MolOcch-EeKwLPTeb1CTLg"/>

+  <element xmi:type="uml:Model" href="01_SourceLeft_CompositeDiagram_Property_Added.uml#_r-nNQMhqEeKmlJkz37Cc-A"/>

+</notation:Diagram>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/ADD/01_SourceLeft_CompositeDiagram_Property_Added.uml b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/ADD/01_SourceLeft_CompositeDiagram_Property_Added.uml
new file mode 100644
index 00000000000..3f069a0ba1c
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/ADD/01_SourceLeft_CompositeDiagram_Property_Added.uml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_r-nNQMhqEeKmlJkz37Cc-A" name="model">

+  <packagedElement xmi:type="uml:Class" xmi:id="_uEswAMhqEeKmlJkz37Cc-A" name="A">

+    <ownedAttribute xmi:id="_0W_NcMhqEeKmlJkz37Cc-A" name="p" visibility="public">

+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0iiWIMhqEeKmlJkz37Cc-A" value="1"/>

+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0iocwMhqEeKmlJkz37Cc-A" value="1"/>

+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_0i0qAMhqEeKmlJkz37Cc-A">

+        <value xsi:nil="true"/>

+      </defaultValue>

+    </ownedAttribute>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Class" xmi:id="_xZFR4MhqEeKmlJkz37Cc-A" name="B">

+    <generalization xmi:id="_7-CeYMhqEeKmlJkz37Cc-A" general="_uEswAMhqEeKmlJkz37Cc-A"/>

+  </packagedElement>

+</uml:Model>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/ADD/01_SourceLeft_CompositeDiagram_Property_Added_Indirect.di b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/ADD/01_SourceLeft_CompositeDiagram_Property_Added_Indirect.di
new file mode 100644
index 00000000000..ff731abb870
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/ADD/01_SourceLeft_CompositeDiagram_Property_Added_Indirect.di
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

+  <pageList>

+    <availablePage>

+      <emfPageIdentifier href="01_SourceLeft_CompositeDiagram_Property_Added_Indirect.notation#_MolOcMh-EeKwLPTeb1CTLg"/>

+    </availablePage>

+  </pageList>

+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

+    <windows>

+      <children xsi:type="di:TabFolder">

+        <children>

+          <emfPageIdentifier href="01_SourceLeft_CompositeDiagram_Property_Added_Indirect.notation#_MolOcMh-EeKwLPTeb1CTLg"/>

+        </children>

+      </children>

+    </windows>

+  </sashModel>

+</di:SashWindowsMngr>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/ADD/01_SourceLeft_CompositeDiagram_Property_Added_Indirect.notation b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/ADD/01_SourceLeft_CompositeDiagram_Property_Added_Indirect.notation
new file mode 100644
index 00000000000..4ba3f00045a
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/ADD/01_SourceLeft_CompositeDiagram_Property_Added_Indirect.notation
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_MolOcMh-EeKwLPTeb1CTLg" type="CompositeStructure" name="CompositeDiagram" measurementUnit="Pixel">

+  <children xmi:type="notation:Shape" xmi:id="_Nnz20Mh-EeKwLPTeb1CTLg" type="2073">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TL6Ylch-EeKwLPTeb1CTLg" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6Ylsh-EeKwLPTeb1CTLg" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_Nnz20sh-EeKwLPTeb1CTLg" type="5156"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_Nnz208h-EeKwLPTeb1CTLg" type="7073">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PWPHgMh-EeKwLPTeb1CTLg" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PWPHgch-EeKwLPTeb1CTLg" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6Yl8h-EeKwLPTeb1CTLg" key="visible" value="true"/>

+      </eAnnotations>

+      <children xmi:type="notation:Shape" xmi:id="_QRw7oMh-EeKwLPTeb1CTLg" type="3070">

+        <children xmi:type="notation:DecorationNode" xmi:id="_QRw7osh-EeKwLPTeb1CTLg" type="5126"/>

+        <children xmi:type="notation:BasicCompartment" xmi:id="_QRw7o8h-EeKwLPTeb1CTLg" type="7077">

+          <styles xmi:type="notation:TitleStyle" xmi:id="_QRw7pMh-EeKwLPTeb1CTLg" showTitle="true"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QRw7pch-EeKwLPTeb1CTLg"/>

+        </children>

+        <element xmi:type="uml:Property" href="01_SourceLeft_CompositeDiagram_Property_Added_Indirect.uml#_0W_NcMhqEeKmlJkz37Cc-A"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QRw7och-EeKwLPTeb1CTLg" x="10" y="10"/>

+      </children>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_Nnz21Mh-EeKwLPTeb1CTLg"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Nnz21ch-EeKwLPTeb1CTLg"/>

+    </children>

+    <element xmi:type="uml:Class" href="01_SourceLeft_CompositeDiagram_Property_Added_Indirect.uml#_uEswAMhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Nnz20ch-EeKwLPTeb1CTLg" x="295" y="158" width="421" height="118"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_ShWYoMh-EeKwLPTeb1CTLg" type="2073">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TL6YkMh-EeKwLPTeb1CTLg" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6Ykch-EeKwLPTeb1CTLg" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_ShWYosh-EeKwLPTeb1CTLg" type="5156"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_ShWYo8h-EeKwLPTeb1CTLg" type="7073">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TL6Yksh-EeKwLPTeb1CTLg" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6Yk8h-EeKwLPTeb1CTLg" key="visible" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6YlMh-EeKwLPTeb1CTLg" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_ShWYpMh-EeKwLPTeb1CTLg"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ShWYpch-EeKwLPTeb1CTLg"/>

+    </children>

+    <element xmi:type="uml:Class" href="01_SourceLeft_CompositeDiagram_Property_Added_Indirect.uml#_xZFR4MhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ShWYoch-EeKwLPTeb1CTLg" x="295" y="315" width="421" height="118"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_f3h9AMnmEeKThIJF6ZPKoA" type="2073">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iiK-UMnmEeKThIJF6ZPKoA" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iiK-UcnmEeKThIJF6ZPKoA" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_f3h9AsnmEeKThIJF6ZPKoA" type="5156"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_f3h9A8nmEeKThIJF6ZPKoA" type="7073">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iiK-UsnmEeKThIJF6ZPKoA" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iiK-U8nmEeKThIJF6ZPKoA" key="visible" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iiK-VMnmEeKThIJF6ZPKoA" key="showTitle" value="true"/>

+      </eAnnotations>

+      <children xmi:type="notation:Shape" xmi:id="_oDD0AMnmEeKThIJF6ZPKoA" type="3070">

+        <children xmi:type="notation:DecorationNode" xmi:id="_oDD0AsnmEeKThIJF6ZPKoA" type="5126"/>

+        <children xmi:type="notation:BasicCompartment" xmi:id="_oDD0A8nmEeKThIJF6ZPKoA" type="7077">

+          <styles xmi:type="notation:TitleStyle" xmi:id="_oDD0BMnmEeKThIJF6ZPKoA" showTitle="true"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oDD0BcnmEeKThIJF6ZPKoA"/>

+        </children>

+        <element xmi:type="uml:Property" href="01_SourceLeft_CompositeDiagram_Property_Added_Indirect.uml#_0W_NcMhqEeKmlJkz37Cc-A"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oDD0AcnmEeKThIJF6ZPKoA" x="10" y="10"/>

+      </children>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_f3h9BMnmEeKThIJF6ZPKoA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f3h9BcnmEeKThIJF6ZPKoA"/>

+    </children>

+    <element xmi:type="uml:Class" href="01_SourceLeft_CompositeDiagram_Property_Added_Indirect.uml#_f2yWIMnmEeKThIJF6ZPKoA"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f3h9AcnmEeKThIJF6ZPKoA" x="295" y="475" width="421" height="118"/>

+  </children>

+  <styles xmi:type="notation:DiagramStyle" xmi:id="_MolOcch-EeKwLPTeb1CTLg"/>

+  <element xmi:type="uml:Model" href="01_SourceLeft_CompositeDiagram_Property_Added_Indirect.uml#_r-nNQMhqEeKmlJkz37Cc-A"/>

+</notation:Diagram>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/ADD/01_SourceLeft_CompositeDiagram_Property_Added_Indirect.uml b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/ADD/01_SourceLeft_CompositeDiagram_Property_Added_Indirect.uml
new file mode 100644
index 00000000000..8fac89d0741
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/ADD/01_SourceLeft_CompositeDiagram_Property_Added_Indirect.uml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_r-nNQMhqEeKmlJkz37Cc-A" name="model">

+  <packagedElement xmi:type="uml:Class" xmi:id="_uEswAMhqEeKmlJkz37Cc-A" name="A">

+    <ownedAttribute xmi:type="uml:Property" xmi:id="_0W_NcMhqEeKmlJkz37Cc-A" name="p" visibility="public">

+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0iiWIMhqEeKmlJkz37Cc-A" value="1"/>

+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0iocwMhqEeKmlJkz37Cc-A" value="1"/>

+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_0i0qAMhqEeKmlJkz37Cc-A">

+        <value xsi:nil="true"/>

+      </defaultValue>

+    </ownedAttribute>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Class" xmi:id="_xZFR4MhqEeKmlJkz37Cc-A" name="B">

+    <generalization xmi:type="uml:Generalization" xmi:id="_7-CeYMhqEeKmlJkz37Cc-A" general="_uEswAMhqEeKmlJkz37Cc-A"/>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Class" xmi:id="_f2yWIMnmEeKThIJF6ZPKoA" name="C">

+    <generalization xmi:type="uml:Generalization" xmi:id="_lb16IMnmEeKThIJF6ZPKoA" general="_xZFR4MhqEeKmlJkz37Cc-A"/>

+  </packagedElement>

+</uml:Model>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/ADD/02_SourceLeft_CompositeDiagram_Property_Added.di b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/ADD/02_SourceLeft_CompositeDiagram_Property_Added.di
new file mode 100644
index 00000000000..ef940497cad
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/ADD/02_SourceLeft_CompositeDiagram_Property_Added.di
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

+  <pageList>

+    <availablePage>

+      <emfPageIdentifier href="02_SourceLeft_CompositeDiagram_Property_Added.notation#_MolOcMh-EeKwLPTeb1CTLg"/>

+    </availablePage>

+  </pageList>

+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

+    <windows>

+      <children xsi:type="di:TabFolder">

+        <children>

+          <emfPageIdentifier href="02_SourceLeft_CompositeDiagram_Property_Added.notation#_MolOcMh-EeKwLPTeb1CTLg"/>

+        </children>

+      </children>

+    </windows>

+  </sashModel>

+</di:SashWindowsMngr>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/ADD/02_SourceLeft_CompositeDiagram_Property_Added.notation b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/ADD/02_SourceLeft_CompositeDiagram_Property_Added.notation
new file mode 100644
index 00000000000..988a9c453f4
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/ADD/02_SourceLeft_CompositeDiagram_Property_Added.notation
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_MolOcMh-EeKwLPTeb1CTLg" type="CompositeStructure" name="CompositeDiagram" measurementUnit="Pixel">

+  <children xmi:type="notation:Shape" xmi:id="_Nnz20Mh-EeKwLPTeb1CTLg" type="2073">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TL6Ylch-EeKwLPTeb1CTLg" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6Ylsh-EeKwLPTeb1CTLg" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_Nnz20sh-EeKwLPTeb1CTLg" type="5156"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_Nnz208h-EeKwLPTeb1CTLg" type="7073">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PWPHgMh-EeKwLPTeb1CTLg" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PWPHgch-EeKwLPTeb1CTLg" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6Yl8h-EeKwLPTeb1CTLg" key="visible" value="true"/>

+      </eAnnotations>

+      <children xmi:type="notation:Shape" xmi:id="_QRw7oMh-EeKwLPTeb1CTLg" type="3070">

+        <children xmi:type="notation:DecorationNode" xmi:id="_QRw7osh-EeKwLPTeb1CTLg" type="5126"/>

+        <children xmi:type="notation:BasicCompartment" xmi:id="_QRw7o8h-EeKwLPTeb1CTLg" type="7077">

+          <styles xmi:type="notation:TitleStyle" xmi:id="_QRw7pMh-EeKwLPTeb1CTLg" showTitle="true"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QRw7pch-EeKwLPTeb1CTLg"/>

+        </children>

+        <element xmi:type="uml:Property" href="02_SourceLeft_CompositeDiagram_Property_Added.uml#_0W_NcMhqEeKmlJkz37Cc-A"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QRw7och-EeKwLPTeb1CTLg" x="10" y="10"/>

+      </children>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_Nnz21Mh-EeKwLPTeb1CTLg"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Nnz21ch-EeKwLPTeb1CTLg"/>

+    </children>

+    <element xmi:type="uml:Class" href="02_SourceLeft_CompositeDiagram_Property_Added.uml#_uEswAMhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Nnz20ch-EeKwLPTeb1CTLg" x="295" y="158" width="421" height="118"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_ShWYoMh-EeKwLPTeb1CTLg" type="2073">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TL6YkMh-EeKwLPTeb1CTLg" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6Ykch-EeKwLPTeb1CTLg" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_ShWYosh-EeKwLPTeb1CTLg" type="5156"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_ShWYo8h-EeKwLPTeb1CTLg" type="7073">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TL6Yksh-EeKwLPTeb1CTLg" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6Yk8h-EeKwLPTeb1CTLg" key="visible" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6YlMh-EeKwLPTeb1CTLg" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_ShWYpMh-EeKwLPTeb1CTLg"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ShWYpch-EeKwLPTeb1CTLg"/>

+    </children>

+    <element xmi:type="uml:Class" href="02_SourceLeft_CompositeDiagram_Property_Added.uml#_xZFR4MhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ShWYoch-EeKwLPTeb1CTLg" x="295" y="315" width="421" height="118"/>

+  </children>

+  <styles xmi:type="notation:DiagramStyle" xmi:id="_MolOcch-EeKwLPTeb1CTLg"/>

+  <element xmi:type="uml:Model" href="02_SourceLeft_CompositeDiagram_Property_Added.uml#_r-nNQMhqEeKmlJkz37Cc-A"/>

+</notation:Diagram>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/ADD/02_SourceLeft_CompositeDiagram_Property_Added.uml b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/ADD/02_SourceLeft_CompositeDiagram_Property_Added.uml
new file mode 100644
index 00000000000..b307d57b5d0
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/ADD/02_SourceLeft_CompositeDiagram_Property_Added.uml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_r-nNQMhqEeKmlJkz37Cc-A" name="model">

+  <packagedElement xmi:type="uml:Class" xmi:id="_uEswAMhqEeKmlJkz37Cc-A" name="A">

+    <ownedAttribute xmi:id="_0W_NcMhqEeKmlJkz37Cc-A" name="p" visibility="public">

+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0iiWIMhqEeKmlJkz37Cc-A" value="1"/>

+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0iocwMhqEeKmlJkz37Cc-A" value="1"/>

+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_0i0qAMhqEeKmlJkz37Cc-A">

+        <value xsi:nil="true"/>

+      </defaultValue>

+    </ownedAttribute>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Class" xmi:id="_xZFR4MhqEeKmlJkz37Cc-A" name="B"/>

+</uml:Model>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/ADD/02_SourceLeft_CompositeDiagram_Property_Added_Indirect.di b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/ADD/02_SourceLeft_CompositeDiagram_Property_Added_Indirect.di
new file mode 100644
index 00000000000..5e7b1f54730
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/ADD/02_SourceLeft_CompositeDiagram_Property_Added_Indirect.di
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

+  <pageList>

+    <availablePage>

+      <emfPageIdentifier href="02_SourceLeft_CompositeDiagram_Property_Added_Indirect.notation#_MolOcMh-EeKwLPTeb1CTLg"/>

+    </availablePage>

+  </pageList>

+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

+    <windows>

+      <children xsi:type="di:TabFolder">

+        <children>

+          <emfPageIdentifier href="02_SourceLeft_CompositeDiagram_Property_Added_Indirect.notation#_MolOcMh-EeKwLPTeb1CTLg"/>

+        </children>

+      </children>

+    </windows>

+  </sashModel>

+</di:SashWindowsMngr>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/ADD/02_SourceLeft_CompositeDiagram_Property_Added_Indirect.notation b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/ADD/02_SourceLeft_CompositeDiagram_Property_Added_Indirect.notation
new file mode 100644
index 00000000000..85507a177fe
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/ADD/02_SourceLeft_CompositeDiagram_Property_Added_Indirect.notation
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_MolOcMh-EeKwLPTeb1CTLg" type="CompositeStructure" name="CompositeDiagram" measurementUnit="Pixel">

+  <children xmi:type="notation:Shape" xmi:id="_Nnz20Mh-EeKwLPTeb1CTLg" type="2073">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TL6Ylch-EeKwLPTeb1CTLg" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6Ylsh-EeKwLPTeb1CTLg" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_Nnz20sh-EeKwLPTeb1CTLg" type="5156"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_Nnz208h-EeKwLPTeb1CTLg" type="7073">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PWPHgMh-EeKwLPTeb1CTLg" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PWPHgch-EeKwLPTeb1CTLg" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6Yl8h-EeKwLPTeb1CTLg" key="visible" value="true"/>

+      </eAnnotations>

+      <children xmi:type="notation:Shape" xmi:id="_QRw7oMh-EeKwLPTeb1CTLg" type="3070">

+        <children xmi:type="notation:DecorationNode" xmi:id="_QRw7osh-EeKwLPTeb1CTLg" type="5126"/>

+        <children xmi:type="notation:BasicCompartment" xmi:id="_QRw7o8h-EeKwLPTeb1CTLg" type="7077">

+          <styles xmi:type="notation:TitleStyle" xmi:id="_QRw7pMh-EeKwLPTeb1CTLg" showTitle="true"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QRw7pch-EeKwLPTeb1CTLg"/>

+        </children>

+        <element xmi:type="uml:Property" href="02_SourceLeft_CompositeDiagram_Property_Added_Indirect.uml#_0W_NcMhqEeKmlJkz37Cc-A"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QRw7och-EeKwLPTeb1CTLg" x="10" y="10"/>

+      </children>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_Nnz21Mh-EeKwLPTeb1CTLg"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Nnz21ch-EeKwLPTeb1CTLg"/>

+    </children>

+    <element xmi:type="uml:Class" href="02_SourceLeft_CompositeDiagram_Property_Added_Indirect.uml#_uEswAMhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Nnz20ch-EeKwLPTeb1CTLg" x="295" y="158" width="421" height="118"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_ShWYoMh-EeKwLPTeb1CTLg" type="2073">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TL6YkMh-EeKwLPTeb1CTLg" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6Ykch-EeKwLPTeb1CTLg" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_ShWYosh-EeKwLPTeb1CTLg" type="5156"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_ShWYo8h-EeKwLPTeb1CTLg" type="7073">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TL6Yksh-EeKwLPTeb1CTLg" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6Yk8h-EeKwLPTeb1CTLg" key="visible" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6YlMh-EeKwLPTeb1CTLg" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_ShWYpMh-EeKwLPTeb1CTLg"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ShWYpch-EeKwLPTeb1CTLg"/>

+    </children>

+    <element xmi:type="uml:Class" href="02_SourceLeft_CompositeDiagram_Property_Added_Indirect.uml#_xZFR4MhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ShWYoch-EeKwLPTeb1CTLg" x="295" y="315" width="421" height="118"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_f3h9AMnmEeKThIJF6ZPKoA" type="2073">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iiK-UMnmEeKThIJF6ZPKoA" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iiK-UcnmEeKThIJF6ZPKoA" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_f3h9AsnmEeKThIJF6ZPKoA" type="5156"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_f3h9A8nmEeKThIJF6ZPKoA" type="7073">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iiK-UsnmEeKThIJF6ZPKoA" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iiK-U8nmEeKThIJF6ZPKoA" key="visible" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iiK-VMnmEeKThIJF6ZPKoA" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_f3h9BMnmEeKThIJF6ZPKoA"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f3h9BcnmEeKThIJF6ZPKoA"/>

+    </children>

+    <element xmi:type="uml:Class" href="02_SourceLeft_CompositeDiagram_Property_Added_Indirect.uml#_f2yWIMnmEeKThIJF6ZPKoA"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f3h9AcnmEeKThIJF6ZPKoA" x="295" y="475" width="421" height="118"/>

+  </children>

+  <styles xmi:type="notation:DiagramStyle" xmi:id="_MolOcch-EeKwLPTeb1CTLg"/>

+  <element xmi:type="uml:Model" href="02_SourceLeft_CompositeDiagram_Property_Added_Indirect.uml#_r-nNQMhqEeKmlJkz37Cc-A"/>

+</notation:Diagram>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/ADD/02_SourceLeft_CompositeDiagram_Property_Added_Indirect.uml b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/ADD/02_SourceLeft_CompositeDiagram_Property_Added_Indirect.uml
new file mode 100644
index 00000000000..35199bd1bdd
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/ADD/02_SourceLeft_CompositeDiagram_Property_Added_Indirect.uml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_r-nNQMhqEeKmlJkz37Cc-A" name="model">

+  <packagedElement xmi:type="uml:Class" xmi:id="_uEswAMhqEeKmlJkz37Cc-A" name="A">

+    <ownedAttribute xmi:type="uml:Property" xmi:id="_0W_NcMhqEeKmlJkz37Cc-A" name="p" visibility="public">

+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0iiWIMhqEeKmlJkz37Cc-A" value="1"/>

+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0iocwMhqEeKmlJkz37Cc-A" value="1"/>

+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_0i0qAMhqEeKmlJkz37Cc-A">

+        <value xsi:nil="true"/>

+      </defaultValue>

+    </ownedAttribute>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Class" xmi:id="_xZFR4MhqEeKmlJkz37Cc-A" name="B">

+    <generalization xmi:type="uml:Generalization" xmi:id="_7-CeYMhqEeKmlJkz37Cc-A" general="_uEswAMhqEeKmlJkz37Cc-A"/>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Class" xmi:id="_f2yWIMnmEeKThIJF6ZPKoA" name="C"/>

+</uml:Model>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/DELETE/01_SourceLeft_CompositeDiagram_Property_Deleted.di b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/DELETE/01_SourceLeft_CompositeDiagram_Property_Deleted.di
new file mode 100644
index 00000000000..d390dd643b6
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/DELETE/01_SourceLeft_CompositeDiagram_Property_Deleted.di
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

+  <pageList>

+    <availablePage>

+      <emfPageIdentifier href="01_SourceLeft_CompositeDiagram_Property_Deleted.notation#_MolOcMh-EeKwLPTeb1CTLg"/>

+    </availablePage>

+  </pageList>

+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

+    <windows>

+      <children xsi:type="di:TabFolder">

+        <children>

+          <emfPageIdentifier href="01_SourceLeft_CompositeDiagram_Property_Deleted.notation#_MolOcMh-EeKwLPTeb1CTLg"/>

+        </children>

+      </children>

+    </windows>

+  </sashModel>

+</di:SashWindowsMngr>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/DELETE/01_SourceLeft_CompositeDiagram_Property_Deleted.notation b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/DELETE/01_SourceLeft_CompositeDiagram_Property_Deleted.notation
new file mode 100644
index 00000000000..bc7dafe76f4
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/DELETE/01_SourceLeft_CompositeDiagram_Property_Deleted.notation
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_MolOcMh-EeKwLPTeb1CTLg" type="CompositeStructure" name="CompositeDiagram" measurementUnit="Pixel">

+  <children xmi:type="notation:Shape" xmi:id="_Nnz20Mh-EeKwLPTeb1CTLg" type="2073">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TL6Ylch-EeKwLPTeb1CTLg" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6Ylsh-EeKwLPTeb1CTLg" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_Nnz20sh-EeKwLPTeb1CTLg" type="5156"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_Nnz208h-EeKwLPTeb1CTLg" type="7073">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PWPHgMh-EeKwLPTeb1CTLg" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PWPHgch-EeKwLPTeb1CTLg" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6Yl8h-EeKwLPTeb1CTLg" key="visible" value="true"/>

+      </eAnnotations>

+      <children xmi:type="notation:Shape" xmi:id="_QRw7oMh-EeKwLPTeb1CTLg" type="3070">

+        <children xmi:type="notation:DecorationNode" xmi:id="_QRw7osh-EeKwLPTeb1CTLg" type="5126"/>

+        <children xmi:type="notation:BasicCompartment" xmi:id="_QRw7o8h-EeKwLPTeb1CTLg" type="7077">

+          <styles xmi:type="notation:TitleStyle" xmi:id="_QRw7pMh-EeKwLPTeb1CTLg" showTitle="true"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QRw7pch-EeKwLPTeb1CTLg"/>

+        </children>

+        <element xmi:type="uml:Property" href="01_SourceLeft_CompositeDiagram_Property_Deleted.uml#_0W_NcMhqEeKmlJkz37Cc-A"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QRw7och-EeKwLPTeb1CTLg" x="10" y="10"/>

+      </children>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_Nnz21Mh-EeKwLPTeb1CTLg"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Nnz21ch-EeKwLPTeb1CTLg"/>

+    </children>

+    <element xmi:type="uml:Class" href="01_SourceLeft_CompositeDiagram_Property_Deleted.uml#_uEswAMhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Nnz20ch-EeKwLPTeb1CTLg" x="295" y="158" width="421" height="118"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_ShWYoMh-EeKwLPTeb1CTLg" type="2073">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TL6YkMh-EeKwLPTeb1CTLg" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6Ykch-EeKwLPTeb1CTLg" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_ShWYosh-EeKwLPTeb1CTLg" type="5156"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_ShWYo8h-EeKwLPTeb1CTLg" type="7073">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TL6Yksh-EeKwLPTeb1CTLg" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6Yk8h-EeKwLPTeb1CTLg" key="visible" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6YlMh-EeKwLPTeb1CTLg" key="showTitle" value="true"/>

+      </eAnnotations>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_ShWYpMh-EeKwLPTeb1CTLg"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ShWYpch-EeKwLPTeb1CTLg"/>

+    </children>

+    <element xmi:type="uml:Class" href="01_SourceLeft_CompositeDiagram_Property_Deleted.uml#_xZFR4MhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ShWYoch-EeKwLPTeb1CTLg" x="295" y="315" width="421" height="118"/>

+  </children>

+  <styles xmi:type="notation:DiagramStyle" xmi:id="_MolOcch-EeKwLPTeb1CTLg"/>

+  <element xmi:type="uml:Model" href="01_SourceLeft_CompositeDiagram_Property_Deleted.uml#_r-nNQMhqEeKmlJkz37Cc-A"/>

+</notation:Diagram>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/DELETE/01_SourceLeft_CompositeDiagram_Property_Deleted.uml b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/DELETE/01_SourceLeft_CompositeDiagram_Property_Deleted.uml
new file mode 100644
index 00000000000..b307d57b5d0
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/DELETE/01_SourceLeft_CompositeDiagram_Property_Deleted.uml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_r-nNQMhqEeKmlJkz37Cc-A" name="model">

+  <packagedElement xmi:type="uml:Class" xmi:id="_uEswAMhqEeKmlJkz37Cc-A" name="A">

+    <ownedAttribute xmi:id="_0W_NcMhqEeKmlJkz37Cc-A" name="p" visibility="public">

+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0iiWIMhqEeKmlJkz37Cc-A" value="1"/>

+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0iocwMhqEeKmlJkz37Cc-A" value="1"/>

+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_0i0qAMhqEeKmlJkz37Cc-A">

+        <value xsi:nil="true"/>

+      </defaultValue>

+    </ownedAttribute>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Class" xmi:id="_xZFR4MhqEeKmlJkz37Cc-A" name="B"/>

+</uml:Model>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/DELETE/02_SourceLeft_CompositeDiagram_Property_Deleted.di b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/DELETE/02_SourceLeft_CompositeDiagram_Property_Deleted.di
new file mode 100644
index 00000000000..2ef4b34b184
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/DELETE/02_SourceLeft_CompositeDiagram_Property_Deleted.di
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

+  <pageList>

+    <availablePage>

+      <emfPageIdentifier href="02_SourceLeft_CompositeDiagram_Property_Deleted.notation#_MolOcMh-EeKwLPTeb1CTLg"/>

+    </availablePage>

+  </pageList>

+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

+    <windows>

+      <children xsi:type="di:TabFolder">

+        <children>

+          <emfPageIdentifier href="02_SourceLeft_CompositeDiagram_Property_Deleted.notation#_MolOcMh-EeKwLPTeb1CTLg"/>

+        </children>

+      </children>

+    </windows>

+  </sashModel>

+</di:SashWindowsMngr>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/DELETE/02_SourceLeft_CompositeDiagram_Property_Deleted.notation b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/DELETE/02_SourceLeft_CompositeDiagram_Property_Deleted.notation
new file mode 100644
index 00000000000..93dadf23d32
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/DELETE/02_SourceLeft_CompositeDiagram_Property_Deleted.notation
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_MolOcMh-EeKwLPTeb1CTLg" type="CompositeStructure" name="CompositeDiagram" measurementUnit="Pixel">

+  <children xmi:type="notation:Shape" xmi:id="_Nnz20Mh-EeKwLPTeb1CTLg" type="2073">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TL6Ylch-EeKwLPTeb1CTLg" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6Ylsh-EeKwLPTeb1CTLg" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_Nnz20sh-EeKwLPTeb1CTLg" type="5156"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_Nnz208h-EeKwLPTeb1CTLg" type="7073">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PWPHgMh-EeKwLPTeb1CTLg" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PWPHgch-EeKwLPTeb1CTLg" key="showTitle" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6Yl8h-EeKwLPTeb1CTLg" key="visible" value="true"/>

+      </eAnnotations>

+      <children xmi:type="notation:Shape" xmi:id="_QRw7oMh-EeKwLPTeb1CTLg" type="3070">

+        <children xmi:type="notation:DecorationNode" xmi:id="_QRw7osh-EeKwLPTeb1CTLg" type="5126"/>

+        <children xmi:type="notation:BasicCompartment" xmi:id="_QRw7o8h-EeKwLPTeb1CTLg" type="7077">

+          <styles xmi:type="notation:TitleStyle" xmi:id="_QRw7pMh-EeKwLPTeb1CTLg" showTitle="true"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QRw7pch-EeKwLPTeb1CTLg"/>

+        </children>

+        <element xmi:type="uml:Property" href="02_SourceLeft_CompositeDiagram_Property_Deleted.uml#_0W_NcMhqEeKmlJkz37Cc-A"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QRw7och-EeKwLPTeb1CTLg" x="10" y="10"/>

+      </children>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_Nnz21Mh-EeKwLPTeb1CTLg"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Nnz21ch-EeKwLPTeb1CTLg"/>

+    </children>

+    <element xmi:type="uml:Class" href="02_SourceLeft_CompositeDiagram_Property_Deleted.uml#_uEswAMhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Nnz20ch-EeKwLPTeb1CTLg" x="295" y="158" width="421" height="118"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_ShWYoMh-EeKwLPTeb1CTLg" type="2073">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TL6YkMh-EeKwLPTeb1CTLg" source="PapyrusCSSForceValue">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6Ykch-EeKwLPTeb1CTLg" key="visible" value="true"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_ShWYosh-EeKwLPTeb1CTLg" type="5156"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_ShWYo8h-EeKwLPTeb1CTLg" type="7073">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TL6Yksh-EeKwLPTeb1CTLg" source="PapyrusCSSForceValue">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6Yk8h-EeKwLPTeb1CTLg" key="visible" value="true"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TL6YlMh-EeKwLPTeb1CTLg" key="showTitle" value="true"/>

+      </eAnnotations>

+      <children xmi:type="notation:Shape" xmi:id="_Uq_lsMh-EeKwLPTeb1CTLg" type="3070">

+        <children xmi:type="notation:DecorationNode" xmi:id="_Uq_lssh-EeKwLPTeb1CTLg" type="5126"/>

+        <children xmi:type="notation:BasicCompartment" xmi:id="_Uq_ls8h-EeKwLPTeb1CTLg" type="7077">

+          <styles xmi:type="notation:TitleStyle" xmi:id="_Uq_ltMh-EeKwLPTeb1CTLg" showTitle="true"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Uq_ltch-EeKwLPTeb1CTLg"/>

+        </children>

+        <element xmi:type="uml:Property" href="02_SourceLeft_CompositeDiagram_Property_Deleted.uml#_0W_NcMhqEeKmlJkz37Cc-A"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Uq_lsch-EeKwLPTeb1CTLg" x="10" y="10"/>

+      </children>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_ShWYpMh-EeKwLPTeb1CTLg"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ShWYpch-EeKwLPTeb1CTLg"/>

+    </children>

+    <element xmi:type="uml:Class" href="02_SourceLeft_CompositeDiagram_Property_Deleted.uml#_xZFR4MhqEeKmlJkz37Cc-A"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ShWYoch-EeKwLPTeb1CTLg" x="295" y="315" width="421" height="118"/>

+  </children>

+  <styles xmi:type="notation:DiagramStyle" xmi:id="_MolOcch-EeKwLPTeb1CTLg"/>

+  <element xmi:type="uml:Model" href="02_SourceLeft_CompositeDiagram_Property_Deleted.uml#_r-nNQMhqEeKmlJkz37Cc-A"/>

+</notation:Diagram>

diff --git a/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/DELETE/02_SourceLeft_CompositeDiagram_Property_Deleted.uml b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/DELETE/02_SourceLeft_CompositeDiagram_Property_Deleted.uml
new file mode 100644
index 00000000000..5b60000e107
--- /dev/null
+++ b/tests/recipes/extraplugins/uml/compare/CompareTestCases/CompositeDiagram/Property/DELETE/02_SourceLeft_CompositeDiagram_Property_Deleted.uml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_r-nNQMhqEeKmlJkz37Cc-A" name="model">

+  <packagedElement xmi:type="uml:Class" xmi:id="_uEswAMhqEeKmlJkz37Cc-A" name="A">

+    <ownedAttribute xmi:type="uml:Property" xmi:id="_0W_NcMhqEeKmlJkz37Cc-A" name="p" visibility="public">

+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0iiWIMhqEeKmlJkz37Cc-A" value="1"/>

+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0iocwMhqEeKmlJkz37Cc-A" value="1"/>

+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_0i0qAMhqEeKmlJkz37Cc-A">

+        <value xsi:nil="true"/>

+      </defaultValue>

+    </ownedAttribute>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Class" xmi:id="_xZFR4MhqEeKmlJkz37Cc-A" name="B">

+    <generalization xmi:type="uml:Generalization" xmi:id="_7-CeYMhqEeKmlJkz37Cc-A" general="_uEswAMhqEeKmlJkz37Cc-A"/>

+  </packagedElement>

+</uml:Model>

diff --git a/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/.classpath b/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/.classpath
new file mode 100644
index 00000000000..2d1a4302f04
--- /dev/null
+++ b/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<classpath>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

+	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="output" path="bin"/>

+</classpath>

diff --git a/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/.project b/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/.project
new file mode 100644
index 00000000000..46f5a161cf8
--- /dev/null
+++ b/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.papyrus.infra.newchild.test</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.jdt.core.javabuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.ManifestBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.SchemaBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.pde.PluginNature</nature>

+		<nature>org.eclipse.jdt.core.javanature</nature>

+	</natures>

+</projectDescription>

diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/.settings/org.eclipse.jdt.core.prefs b/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/.settings/org.eclipse.jdt.core.prefs
index af0f20f97a5..44217f8c068 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+eclipse.preferences.version=1

+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

+org.eclipse.jdt.core.compiler.compliance=1.5

+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

+org.eclipse.jdt.core.compiler.source=1.5

diff --git a/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/META-INF/MANIFEST.MF b/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..ec87b07512d
--- /dev/null
+++ b/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/META-INF/MANIFEST.MF
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: NewChildTest
+Bundle-SymbolicName: org.eclipse.papyrus.infra.newchild.test;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.eclipse.papyrus.infra.newchild.test.Activator
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.infra.newchild;bundle-version="1.0.0"
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/TestModel/TestCreateModifyElementCreationModel/SysMLAndSampleUML.xmi b/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/TestModel/TestCreateModifyElementCreationModel/SysMLAndSampleUML.xmi
new file mode 100644
index 00000000000..6220960d81b
--- /dev/null
+++ b/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/TestModel/TestCreateModifyElementCreationModel/SysMLAndSampleUML.xmi
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="ASCII"?>

+<ElementCreationMenuModel:Folder

+    xmi:version="2.0"

+    xmlns:xmi="http://www.omg.org/XMI"

+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:ElementCreationMenuModel="http://ElementCreationMenuModel"

+    xsi:schemaLocation="http://ElementCreationMenuModel ../../../org.eclipse.papyrus.infra.newchild/resource/elementCreationMenuModel.ecore"

+    label="MixedTest">

+  <menu xsi:type="ElementCreationMenuModel:CreationMenu"

+      label="Package"

+      elementTypeIdRef="org.eclipse.papyrus.uml.Package"/>

+  <menu xsi:type="ElementCreationMenuModel:CreationMenu"

+      label="Class"

+      elementTypeIdRef="org.eclipse.papyrus.uml.Class"/>

+  <menu xsi:type="ElementCreationMenuModel:CreationMenu"

+      label="MyClass"

+      elementTypeIdRef="org.eclipse.papyrus.uml.Class"/>

+  <menu xsi:type="ElementCreationMenuModel:CreationMenu"

+      label="Block"

+      elementTypeIdRef="org.eclipse.papyrus.sysml.Block"/>

+</ElementCreationMenuModel:Folder>

diff --git a/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/TestModel/TestCreateModifyElementCreationModel/TestSampleUML.xmi b/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/TestModel/TestCreateModifyElementCreationModel/TestSampleUML.xmi
new file mode 100644
index 00000000000..2249ced3c53
--- /dev/null
+++ b/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/TestModel/TestCreateModifyElementCreationModel/TestSampleUML.xmi
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="ASCII"?>

+<ElementCreationMenuModel:Folder

+    xmi:version="2.0"

+    xmlns:xmi="http://www.omg.org/XMI"

+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:ElementCreationMenuModel="http://ElementCreationMenuModel"

+    xsi:schemaLocation="http://ElementCreationMenuModel ../../../org.eclipse.papyrus.infra.newchild/resource/elementCreationMenuModel.ecore"

+    label="SimpleUMLTest">

+  <menu xsi:type="ElementCreationMenuModel:CreationMenu"

+      label="Package"

+      icon="platform:/plugin/org.eclipse.papyrus.infra.newchild.test/icon/O.gif"

+      elementTypeIdRef="org.eclipse.papyrus.uml.Package"/>

+  <menu xsi:type="ElementCreationMenuModel:CreationMenu"

+      label="Class"

+      elementTypeIdRef="org.eclipse.papyrus.uml.Class"/>

+  <menu xsi:type="ElementCreationMenuModel:Folder"

+      label="ElementWithFeature">

+    <menu xsi:type="ElementCreationMenuModel:CreationMenu"

+        label="NestedClass"

+        icon="platform:/plugin/org.eclipse.papyrus.infra.newchild.test/icon/M.gif"

+        elementTypeIdRef="org.eclipse.papyrus.uml.Class"

+        role="nestedClassifier"/>

+    <menu xsi:type="ElementCreationMenuModel:CreationMenu"

+        label="Integer"

+        elementTypeIdRef="org.eclipse.papyrus.uml.LiteralInteger"/>

+    <menu xsi:type="ElementCreationMenuModel:CreationMenu"

+        label="MyActivity"

+        icon="platform:/plugin/org.eclipse.papyrus.infra.newchild.test/icon/O.gif"

+        elementTypeIdRef="org.eclipse.papyrus.uml.Activity"/>

+  </menu>

+</ElementCreationMenuModel:Folder>

diff --git a/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/about.html b/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/about.html
new file mode 100644
index 00000000000..82d49bf5f81
--- /dev/null
+++ b/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

+<title>About</title>

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>June 5, 2007</p>	

+<h3>License</h3>

+

+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

+indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

+apply to your use of any object code in the Content.  Check the Redistributor's license that was 

+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

+indicated below, the terms and conditions of the EPL still apply to any source code in the Content

+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

+

+</body>

+</html>

diff --git a/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/build.properties b/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/build.properties
new file mode 100644
index 00000000000..6f20375d6c7
--- /dev/null
+++ b/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/build.properties
@@ -0,0 +1,5 @@
+source.. = src/

+output.. = bin/

+bin.includes = META-INF/,\

+               .,\

+               plugin.xml

diff --git a/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/icon/M.gif b/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/icon/M.gif
new file mode 100644
index 00000000000..f9a5b239d6c
--- /dev/null
+++ b/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/icon/M.gif
diff --git a/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/icon/O.gif b/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/icon/O.gif
new file mode 100644
index 00000000000..e6ce0916227
--- /dev/null
+++ b/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/icon/O.gif
diff --git a/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/icon/Values.gif b/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/icon/Values.gif
new file mode 100644
index 00000000000..f1f019535ea
--- /dev/null
+++ b/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/icon/Values.gif
diff --git a/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/plugin.properties b/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/plugin.properties
new file mode 100644
index 00000000000..199d38a1363
--- /dev/null
+++ b/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################

+# Copyright (c) 2012 Cedric Dumoulin.

+# 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:

+#     Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

+##################################################################################

+pluginName=Papyrus EMF Tests (Incubation)

+providerName=Eclipse Modeling Project

diff --git a/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/plugin.xml b/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/plugin.xml
new file mode 100644
index 00000000000..6785e5ae25e
--- /dev/null
+++ b/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/plugin.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<?eclipse version="3.4"?>

+<plugin>

+   <extension

+         point="org.eclipse.papyrus.infra.newchild">

+      <menuCreationModel

+            model="TestModel/TestCreateModifyElementCreationModel/TestSampleUML.xmi">

+      </menuCreationModel>

+      <menuCreationModel

+            model="TestModel/TestCreateModifyElementCreationModel/SysMLAndSampleUML.xmi">

+      </menuCreationModel>

+   </extension>

+

+</plugin>

diff --git a/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/src/org/eclipse/papyrus/infra/newchild/test/Activator.java b/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/src/org/eclipse/papyrus/infra/newchild/test/Activator.java
new file mode 100644
index 00000000000..6832ff2fb47
--- /dev/null
+++ b/tests/recipes/plugins/infra/org.eclipse.papyrus.infra.newchild.test/src/org/eclipse/papyrus/infra/newchild/test/Activator.java
@@ -0,0 +1,50 @@
+package org.eclipse.papyrus.infra.newchild.test;

+

+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.infra.newchild.test"; //$NON-NLS-1$

+

+	// The shared instance

+	private static Activator plugin;

+	

+	/**

+	 * The constructor

+	 */

+	public Activator() {

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

+	 */

+	public void start(BundleContext context) throws Exception {

+		super.start(context);

+		plugin = this;

+	}

+

+	/*

+	 * (non-Javadoc)

+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

+	 */

+	public void stop(BundleContext context) throws Exception {

+		plugin = null;

+		super.stop(context);

+	}

+

+	/**

+	 * Returns the shared instance

+	 *

+	 * @return the shared instance

+	 */

+	public static Activator getDefault() {

+		return plugin;

+	}

+

+}